Changeset 56870 in vbox

Timestamp:

Jul 8, 2015 3:12:32 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 5978: Runtime UI: Mini-toolbar: Unify minimize window functionality with corresponding action; Also on x11 adjust it to minimize mini-toolbar as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineWindow.h (modified) (1 diff)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineWindowFullscreen.h (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (2 diffs)
• seamless/UIMachineWindowSeamless.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1053 +1053 @@
 #ifndef Q_WS_MAC
     connect(actionPool()->action(UIActionIndexRT_M_View_S_MinimizeWindow), SIGNAL(triggered()),
-            this, SLOT(sltMinimizeActiveMachineWindow()));
+            this, SLOT(sltMinimizeActiveMachineWindow()), Qt::QueuedConnection);
 #endif /* !Q_WS_MAC */
     connect(actionPool()->action(UIActionIndexRT_M_View_S_AdjustWindow), SIGNAL(triggered()),
@@ -1112 +1112 @@
     /* 'Window' action connections: */
     connect(actionPool()->action(UIActionIndex_M_Window_S_Minimize), SIGNAL(triggered()),
-            this, SLOT(sltMinimizeActiveMachineWindow()));
+            this, SLOT(sltMinimizeActiveMachineWindow()), Qt::QueuedConnection);
 #endif /* Q_WS_MAC */
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h

@@ -98 +98 @@
     virtual void sltMachineStateChanged();
 
+    /** Shows window minimized. */
+    virtual void showMinimized() { QMainWindow::showMinimized(); }
+
 protected:
 

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

@@ -187 +187 @@
     activateWindow();
 #endif /* Q_WS_MAC || Q_WS_X11 */
+}
+
+void UIMachineWindowFullscreen::showMinimized()
+{
+#ifdef Q_WS_X11
+    /* If there is mini-toolbar: */
+    if (m_pMiniToolBar)
+    {
+        /* Minimize it first: */
+        m_pMiniToolBar->showMinimized();
+    }
+#endif /* Q_WS_X11 */
+
+    /* Call to base-class: */
+    UIMachineWindow::showMinimized();
 }
 
@@ -247 +262 @@
                                               gEDataManager->autoHideMiniToolbar(vboxGlobal().managedVMUuid()));
     m_pMiniToolBar->addMenus(actionPool()->menus());
-    connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), this, SLOT(showMinimized()));
+    connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), this, SLOT(showMinimized()), Qt::QueuedConnection);
     connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
             actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SLOT(trigger()));

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

@@ -75 +75 @@
     void sltRevokeFocus();
 
+    /** Shows window minimized. */
+    void showMinimized();
+
 private:
 

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

@@ -78 +78 @@
     activateWindow();
 #endif /* Q_WS_MAC || Q_WS_X11 */
+}
+
+void UIMachineWindowSeamless::showMinimized()
+{
+#ifdef Q_WS_X11
+    /* If there is mini-toolbar: */
+    if (m_pMiniToolBar)
+    {
+        /* Minimize it first: */
+        m_pMiniToolBar->showMinimized();
+    }
+#endif /* Q_WS_X11 */
+
+    /* Call to base-class: */
+    UIMachineWindow::showMinimized();
 }
 
@@ -131 +146 @@
     m_pMiniToolBar->show();
     m_pMiniToolBar->addMenus(actionPool()->menus());
-    connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), this, SLOT(showMinimized()));
+    connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()), this, SLOT(showMinimized()), Qt::QueuedConnection);
     connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
             actionPool()->action(UIActionIndexRT_M_View_T_Seamless), SLOT(trigger()));

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

@@ -46 +46 @@
     /** Revokes keyboard-focus. */
     void sltRevokeFocus();
+
+    /** Shows window minimized. */
+    void showMinimized();
 
 private: