Changeset 31866 in vbox for trunk

Timestamp:

Aug 23, 2010 2:52:35 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 5219: Minimize from fullscreen - Initial implementation, icon to be committed later.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)
• widgets/VBoxMiniToolBar.cpp (modified) (3 diffs)
• widgets/VBoxMiniToolBar.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -200 +200 @@
             menus << actions.at(i)->menu();
         *m_pMiniToolBar << menus;
+        connect(m_pMiniToolBar, SIGNAL(minimizeAction()), this, SLOT(showMinimized()));
         connect(m_pMiniToolBar, SIGNAL(exitAction()),
                 uisession()->actionsPool()->action(UIActionIndex_Toggle_Fullscreen), SLOT(trigger()));

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -251 +251 @@
             menus << actions.at(i)->menu();
         *m_pMiniToolBar << menus;
+        connect(m_pMiniToolBar, SIGNAL(minimizeAction()), this, SLOT(showMinimized()));
         connect(m_pMiniToolBar, SIGNAL(exitAction()),
                 uisession()->actionsPool()->action(UIActionIndex_Toggle_Seamless), SLOT(trigger()));

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.cpp

@@ -41 +41 @@
     , m_pAutoHideAction(0)
     , m_pDisplayLabel(0)
+    , m_pMinimizeAction(0)
     , m_pRestoreAction(0)
     , m_pCloseAction(0)
@@ -95 +96 @@
     /* Right label margin: */
     m_LabelMargins << widgetForAction(addWidget(new QWidget(this)));
+
+    /* Minimize action: */
+    m_pMinimizeAction = new QAction(this);
+    m_pMinimizeAction->setIcon(UIIconPool::iconSet(":/discard_16px.png"));
+    m_pMinimizeAction->setToolTip(tr("Minimize Window"));
+    connect(m_pMinimizeAction, SIGNAL(triggered()), this, SIGNAL(minimizeAction()));
+    addAction(m_pMinimizeAction);
 
     /* Exit action: */
@@ -456 +464 @@
     if (m_pAutoHideAction && widgetForAction(m_pAutoHideAction))
         widgetForAction(m_pAutoHideAction)->setMouseTracking(fEnabled);
+    if (m_pMinimizeAction && widgetForAction(m_pMinimizeAction))
+        widgetForAction(m_pMinimizeAction)->setMouseTracking(fEnabled);
     if (m_pRestoreAction && widgetForAction(m_pRestoreAction))
         widgetForAction(m_pRestoreAction)->setMouseTracking(fEnabled);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMiniToolBar.h

@@ -59 +59 @@
 signals:
 
+    void minimizeAction();
     void exitAction();
     void closeAction();
@@ -84 +85 @@
     QAction *m_pAutoHideAction;
     QLabel *m_pDisplayLabel;
+    QAction *m_pMinimizeAction;
     QAction *m_pRestoreAction;
     QAction *m_pCloseAction;