Changeset 44982 in vbox

Timestamp:

Mar 11, 2013 12:58:09 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84203

Message:

FE/Qt: Runtime UI: Multi-screen support: Make sure view-menu is updated properly under mac-host.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (4 diffs)
• UIMachineLogic.h (modified) (2 diffs)
• UIMultiScreenLayout.cpp (modified) (2 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineLogicFullscreen.h (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (2 diffs)
• seamless/UIMachineLogicSeamless.h (modified) (1 diff)

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

@@ -178 +178 @@
     prepareMachineWindows();
 
+    /* Prepare menu: */
+    prepareMenu();
+
 #ifdef Q_WS_MAC
-    /* Prepare menu-bar: */
-    prepareMenuBar();
     /* Prepare dock: */
     prepareDock();
@@ -212 +213 @@
     /* Cleanup dock: */
     cleanupDock();
-    /* Cleanup menu-bar: */
-    cleanupMenuBar();
 #endif /* Q_WS_MAC */
+
+    /* Cleanup menu: */
+    cleanupMenu();
 
     /* Cleanup machine window(s): */
@@ -731 +733 @@
 }
 
+void UIMachineLogic::prepareMenu()
+{
 #ifdef Q_WS_MAC
-void UIMachineLogic::prepareMenuBar()
-{
     m_pMenuBar = uisession()->newMenuBar();
-}
-
+#endif /* Q_WS_MAC */
+}
+
+#ifdef Q_WS_MAC
 void UIMachineLogic::prepareDock()
 {
@@ -850 +854 @@
     }
 }
-
-void UIMachineLogic::cleanupMenuBar()
-{
+#endif /* Q_WS_MAC */
+
+void UIMachineLogic::cleanupMenu()
+{
+#ifdef Q_WS_MAC
     delete m_pMenuBar;
     m_pMenuBar = 0;
-}
 #endif /* Q_WS_MAC */
+}
 
 void UIMachineLogic::cleanupHandlers()

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

@@ -133 +133 @@
     virtual void prepareHandlers();
     virtual void prepareMachineWindows() = 0;
-#ifdef Q_WS_MAC
-    virtual void prepareMenuBar();
+    virtual void prepareMenu();
+#ifdef Q_WS_MAC
     virtual void prepareDock();
 #endif /* Q_WS_MAC */
@@ -147 +147 @@
 #ifdef Q_WS_MAC
     virtual void cleanupDock();
-    virtual void cleanupMenuBar();
-#endif /* Q_WS_MAC */
+#endif /* Q_WS_MAC */
+    virtual void cleanupMenu();
     virtual void cleanupMachineWindows() = 0;
     virtual void cleanupHandlers();

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

@@ -270 +270 @@
     cleanupViewMenu();
 
-    /* If we do have more than one host screen: */
-    if (m_cHostScreens > 1)
-    {
+    /* If we do have more than one host/guest screen: */
+    if (m_cHostScreens > 1 || m_guestScreens.size() > 1)
+    {
+        m_pViewMenu->addSeparator();
         foreach (int iGuestScreen, m_guestScreens)
         {
@@ -289 +290 @@
         }
     }
+
+    /* Update menu actions: */
+    updateMenuActions(false);
 }
 

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

@@ -141 +141 @@
     /* Adjust-window action isn't allowed in fullscreen: */
     gActionPool->action(UIActionIndexRuntime_Simple_AdjustWindow)->setVisible(false);
-
-    /* Add the view menu: */
-    QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_View)->menu();
-    m_pScreenLayout->setViewMenu(pMenu);
-    pMenu->setVisible(true);
 }
 
@@ -192 +187 @@
     /* Remember what machine window(s) created: */
     setMachineWindowsCreated(true);
+}
+
+void UIMachineLogicFullscreen::prepareMenu()
+{
+    /* Call to base-class: */
+    UIMachineLogic::prepareMenu();
+
+    /* Finally update view-menu: */
+    m_pScreenLayout->setViewMenu(gActionPool->action(UIActionIndexRuntime_Menu_View)->menu());
 }
 

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

@@ -61 +61 @@
 #endif /* Q_WS_MAC */
     void prepareMachineWindows();
+    void prepareMenu();
 
     /* Cleanup helpers: */
+    //void cleanupMenu() {}
     void cleanupMachineWindows();
 #ifdef Q_WS_MAC

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

@@ -132 +132 @@
     /* Disable mouse-integration isn't allowed in seamless: */
     gActionPool->action(UIActionIndexRuntime_Toggle_MouseIntegration)->setVisible(false);
-
-    /* Add the view menu: */
-    QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_View)->menu();
-    m_pScreenLayout->setViewMenu(pMenu);
-    pMenu->setVisible(true);
 }
 
@@ -167 +162 @@
 }
 
+void UIMachineLogicSeamless::prepareMenu()
+{
+    /* Call to base-class: */
+    UIMachineLogic::prepareMenu();
+
+    /* Finally update view-menu: */
+    m_pScreenLayout->setViewMenu(gActionPool->action(UIActionIndexRuntime_Menu_View)->menu());
+}
+
 void UIMachineLogicSeamless::cleanupMachineWindows()
 {

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

@@ -54 +54 @@
     void prepareActionGroups();
     void prepareMachineWindows();
+    void prepareMenu();
 
     /* Cleanup helpers: */
+    //void cleanupMenu() {}
     void cleanupMachineWindows();
     void cleanupActionGroups();