← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
  variables. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp
39
39
    : VBoxToolBar(pParent)
40
40
    , m_pAutoHideAction(0)
41
41
    , m_pDisplayLabel(0)
 
42
    , m_pMinimizeAction(0)
42
43
    , m_pRestoreAction(0)
43
44
    , m_pCloseAction(0)
44
45
    , m_fActive(fActive)
94
95
    /* Right label margin: */
95
96
    m_LabelMargins << widgetForAction(addWidget(new QWidget(this)));
96
97
 
 
98
    /* Minimize action: */
 
99
    m_pMinimizeAction = new QAction(this);
 
100
    m_pMinimizeAction->setIcon(VBoxGlobal::iconSet(":/minimize_16px.png"));
 
101
    m_pMinimizeAction->setToolTip(tr("Minimize Window"));
 
102
    connect(m_pMinimizeAction, SIGNAL(triggered()), this, SIGNAL(minimizeAction()));
 
103
    addAction(m_pMinimizeAction);
 
104
 
97
105
    /* Exit action: */
98
106
    m_pRestoreAction = new QAction(this);
99
107
    m_pRestoreAction->setIcon(VBoxGlobal::iconSet(":/restore_16px.png"));
454
462
        m_pDisplayLabel->setMouseTracking(fEnabled);
455
463
    if (m_pAutoHideAction && widgetForAction(m_pAutoHideAction))
456
464
        widgetForAction(m_pAutoHideAction)->setMouseTracking(fEnabled);
 
465
    if (m_pMinimizeAction && widgetForAction(m_pMinimizeAction))
 
466
        widgetForAction(m_pMinimizeAction)->setMouseTracking(fEnabled);
457
467
    if (m_pRestoreAction && widgetForAction(m_pRestoreAction))
458
468
        widgetForAction(m_pRestoreAction)->setMouseTracking(fEnabled);
459
469
    if (m_pCloseAction && widgetForAction(m_pCloseAction))