Changeset 75339 in vbox for trunk

Timestamp:

Nov 9, 2018 7:02:36 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9254. Add scale-factor to the machine window menu in fullscreen/seamless

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolRuntime.cpp (modified) (7 diffs)
• globals/UIActionPoolRuntime.h (modified) (1 diff)
• runtime/normal/UIMachineLogicNormal.cpp (modified) (2 diffs)
• runtime/normal/UIMachineLogicNormal.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp

@@ -3230 +3230 @@
     AssertPtrReturnVoid(pMenu);
 
-    /* Call to corresponding handler: */
-    updateMenuViewScreen(pMenu);
-}
-
-void UIActionPoolRuntime::sltPrepareMenuViewMultiscreen()
-{
-    /* Make sure sender is valid: */
-    QMenu *pMenu = qobject_cast<QMenu*>(sender());
-    AssertPtrReturnVoid(pMenu);
-
-    /* Call to corresponding handler: */
-    updateMenuViewMultiscreen(pMenu);
+    const bool fAllowToShowActionResize = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Resize);
+    const bool fAllowToShowActionScaleFactor = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_ScaleFactor);
+    const bool fAllowToShowActionMultiscreen = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Multiscreen);
+
+    /* Clear contents: */
+    pMenu->clear();
+
+    /* Resize, scale factor, and multiscreen menu items are inserted into the same sub-menu: */
+    if (fAllowToShowActionResize)
+        updateMenuViewScreen(pMenu);
+    if (fAllowToShowActionScaleFactor)
+        updateMenuViewScaleFactor(pMenu);
+    if (fAllowToShowActionMultiscreen && m_cHostScreens > 1)
+        updateMenuViewMultiscreen(pMenu);
 }
 
@@ -3687 +3689 @@
     }
 
-    /* Do we have to show resize or multiscreen menu? */
+    /* Do we have to show resize, scale factor, or multiscreen menu? */
     const bool fAllowToShowActionResize = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Resize);
+    const bool fAllowToShowActionScaleFactor = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_ScaleFactor);
     const bool fAllowToShowActionMultiscreen = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Multiscreen);
-    if (fAllowToShowActionResize)
+
+    if (fAllowToShowActionResize || fAllowToShowActionScaleFactor || fAllowToShowActionMultiscreen)
     {
         for (int iGuestScreenIndex = 0; iGuestScreenIndex < m_cGuestScreens; ++iGuestScreenIndex)
@@ -3702 +3706 @@
         }
     }
-    else if (fAllowToShowActionMultiscreen)
-    {
-        /* Only for multi-screen host case: */
-        if (m_cHostScreens > 1)
-        {
-            for (int iGuestScreenIndex = 0; iGuestScreenIndex < m_cGuestScreens; ++iGuestScreenIndex)
-            {
-                /* Add 'Virtual Screen %1' menu: */
-                QMenu *pSubMenu = pMenu->addMenu(UIIconPool::iconSet(":/virtual_screen_16px.png",
-                                                                     ":/virtual_screen_disabled_16px.png"),
-                                                 QApplication::translate("UIMultiScreenLayout", "Virtual Screen %1").arg(iGuestScreenIndex + 1));
-                pSubMenu->setProperty("Guest Screen Index", iGuestScreenIndex);
-                connect(pSubMenu, SIGNAL(aboutToShow()), this, SLOT(sltPrepareMenuViewMultiscreen()));
-            }
-        }
-    }
 
     /* Mark menu as valid: */
@@ -3748 +3736 @@
     /* Do we have to show resize menu? */
     const bool fAllowToShowActionResize = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Resize);
-    if (fAllowToShowActionResize)
+    const bool fAllowToShowActionScaleFactor = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_ScaleFactor);
+    if (fAllowToShowActionResize || fAllowToShowActionScaleFactor)
     {
         for (int iGuestScreenIndex = 0; iGuestScreenIndex < m_cGuestScreens; ++iGuestScreenIndex)
@@ -3760 +3749 @@
         }
     }
-
     /* Mark menu as valid: */
     m_invalidations.remove(UIActionIndexRT_M_ViewPopup);
@@ -3913 +3901 @@
 void UIActionPoolRuntime::updateMenuViewScreen(QMenu *pMenu)
 {
-    /* Clear contents: */
-    pMenu->clear();
-
+    AssertPtrReturnVoid(pMenu);
     /* Prepare new contents: */
     const QList<QSize> sizes = QList<QSize>()
@@ -3984 +3970 @@
                 this, SLOT(sltHandleActionTriggerViewScreenResize(QAction*)));
     }
-    updateMenuViewScaleFactor(pMenu);
 }
 
 void UIActionPoolRuntime::updateMenuViewMultiscreen(QMenu *pMenu)
 {
-    /* Clear contents: */
-    pMenu->clear();
-
+    AssertPtrReturnVoid(pMenu);
     /* Get corresponding screen index and size: */
     const int iGuestScreenIndex = pMenu->property("Guest Screen Index").toInt();

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.h

@@ -206 +206 @@
     /** Prepares 'View' : 'Virtual Screen #' menu (Normal, Scale). */
     void sltPrepareMenuViewScreen();
-    /** Prepares 'View' : 'Virtual Screen #' menu (Fullscreen, Seamless). */
-    void sltPrepareMenuViewMultiscreen();
 
     /** Handles 'View' : 'Virtual Screen #' menu : 'Toggle' action trigger. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -351 +351 @@
 #endif /* !VBOX_WS_MAC */
 
+void UIMachineLogicNormal::prepareActionGroups()
+{
+    /* Call to base-class: */
+    UIMachineLogic::prepareActionGroups();
+
+    /* Restrict 'Adjust Window', 'Guest Autoresize', 'Status Bar' and 'Resize' actions for 'View' menu: */
+    actionPool()->toRuntime()->setRestrictionForMenuView(UIActionRestrictionLevel_Logic,
+                                                         (UIExtraDataMetaDefs::RuntimeMenuViewActionType)
+                                                         (UIExtraDataMetaDefs::RuntimeMenuViewActionType_Multiscreen));
+}
+
 void UIMachineLogicNormal::cleanupMachineWindows()
 {
@@ -388 +399 @@
     UIMachineLogic::cleanupActionConnections();
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.h

@@ -75 +75 @@
 
     /* Prepare helpers: */
+    virtual void prepareActionGroups() /* override */;
     void prepareActionConnections();
     void prepareMachineWindows();
@@ -98 +99 @@
 
 #endif /* !___UIMachineLogicNormal_h___ */
-