Changeset 75357 in vbox for trunk/src

Timestamp:

Nov 9, 2018 12:17:37 PM (7 years ago)

Author:

vboxsync

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

126490

Message:

FE/Qt: bugref:9254: View / Screen menu actions reordering, adding separator between different groups; Some logic code reordering.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPoolRuntime.cpp (modified) (2 diffs)
• runtime/normal/UIMachineLogicNormal.cpp (modified) (2 diffs)

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

@@ -3230 +3230 @@
     AssertPtrReturnVoid(pMenu);
 
+    /* Do we have to show resize, multiscreen or scale factor actions? */
     const bool fAllowToShowActionResize = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Resize);
+    const bool fAllowToShowActionMultiscreen = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Multiscreen);
     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: */
+    /* Separator: */
+    bool fSeparator = false;
+
+    /* Resize actions: */
     if (fAllowToShowActionResize)
+    {
         updateMenuViewScreen(pMenu);
+        fSeparator = true;
+    }
+
+    /* Separator: */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
+    /* Multiscreen actions: */
+    if (fAllowToShowActionMultiscreen && (m_cHostScreens > 1 || m_cGuestScreens > 1))
+    {
+        updateMenuViewMultiscreen(pMenu);
+        fSeparator = true;
+    }
+
+    /* Separator: */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
+    /* Scale factor actions: */
     if (fAllowToShowActionScaleFactor)
+    {
         updateMenuViewScaleFactor(pMenu);
-    if (fAllowToShowActionMultiscreen && m_cHostScreens > 1)
-        updateMenuViewMultiscreen(pMenu);
+        fSeparator = true;
+    }
 }
 
@@ -3689 +3720 @@
     }
 
-    /* Do we have to show resize, scale factor, or multiscreen menu? */
+    /* Do we have to show resize, multiscreen or scale factor actions? */
     const bool fAllowToShowActionResize = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Resize);
+    const bool fAllowToShowActionMultiscreen = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Multiscreen);
     const bool fAllowToShowActionScaleFactor = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_ScaleFactor);
-    const bool fAllowToShowActionMultiscreen = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Multiscreen);
-
-    if (fAllowToShowActionResize || fAllowToShowActionScaleFactor || fAllowToShowActionMultiscreen)
+
+    if (fAllowToShowActionResize || fAllowToShowActionMultiscreen || fAllowToShowActionScaleFactor)
     {
         for (int iGuestScreenIndex = 0; iGuestScreenIndex < m_cGuestScreens; ++iGuestScreenIndex)

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

@@ -269 +269 @@
 }
 
+void UIMachineLogicNormal::prepareActionGroups()
+{
+    /* Call to base-class: */
+    UIMachineLogic::prepareActionGroups();
+
+    /* Restrict 'Multiscreen' actions for 'View' menu: */
+    actionPool()->toRuntime()->setRestrictionForMenuView(UIActionRestrictionLevel_Logic,
+                                                         (UIExtraDataMetaDefs::RuntimeMenuViewActionType)
+                                                         (UIExtraDataMetaDefs::RuntimeMenuViewActionType_Multiscreen));
+}
+
 void UIMachineLogicNormal::prepareActionConnections()
 {
@@ -351 +362 @@
 #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()
 {