Changeset 29133 in vbox for trunk/src

Timestamp:

May 6, 2010 11:20:42 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: show view menu in fs/seamless toolbar if more than one monitor is connected

Location:

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

Files:

• fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

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

@@ -200 +200 @@
         m_pMiniToolBar->updateDisplay(true, true);
         QList<QMenu*> menus;
-        menus << uisession()->actionsPool()->action(UIActionIndex_Menu_Machine)->menu();
-        menus << uisession()->actionsPool()->action(UIActionIndex_Menu_Devices)->menu();
+        UIMainMenuType fMenu = UIMainMenuType(UIMainMenuType_Machine | UIMainMenuType_Devices);
+        if (QApplication::desktop()->numScreens() > 1)
+            fMenu = UIMainMenuType(fMenu | UIMainMenuType_View);
+        QList<QAction*> actions = uisession()->newMenu(fMenu)->actions();
+        for (int i=0; i < actions.size(); ++i)
+            menus << actions.at(i)->menu();
         *m_pMiniToolBar << menus;
         connect(m_pMiniToolBar, SIGNAL(exitAction()),

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

@@ -249 +249 @@
         m_pMiniToolBar->updateDisplay(true, true);
         QList<QMenu*> menus;
-        menus << uisession()->actionsPool()->action(UIActionIndex_Menu_Machine)->menu();
-        menus << uisession()->actionsPool()->action(UIActionIndex_Menu_Devices)->menu();
+        UIMainMenuType fMenu = UIMainMenuType(UIMainMenuType_Machine | UIMainMenuType_Devices);
+        if (QApplication::desktop()->numScreens() > 1)
+            fMenu = UIMainMenuType(fMenu | UIMainMenuType_View);
+        QList<QAction*> actions = uisession()->newMenu(fMenu)->actions();
+        for (int i=0; i < actions.size(); ++i)
+            menus << actions.at(i)->menu();
         *m_pMiniToolBar << menus;
         connect(m_pMiniToolBar, SIGNAL(exitAction()),