Changeset 76006 in vbox

Timestamp:

Dec 6, 2018 9:49:09 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: UIActionPoolRuntime: Few more refactoring bits for rescale actions code (s.a. r127226).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIActionPoolRuntime.cpp (modified) (2 diffs)
• UIActionPoolRuntime.h (modified) (2 diffs)

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

@@ -3213 +3213 @@
 }
 
-void UIActionPoolRuntime::sltHandleActionTriggerViewScaleFactor(QAction *pAction)
+void UIActionPoolRuntime::sltPrepareMenuViewScreen()
+{
+    /* Make sure sender is valid: */
+    QMenu *pMenu = qobject_cast<QMenu*>(sender());
+    AssertPtrReturnVoid(pMenu);
+
+    /* Do we have to show resize, remap or rescale actions? */
+    const bool fAllowToShowActionResize = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Resize);
+    const bool fAllowToShowActionRemap = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Remap);
+    const bool fAllowToShowActionRescale = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Rescale);
+
+    /* Clear contents: */
+    pMenu->clear();
+
+    /* Separator: */
+    bool fSeparator = false;
+
+    /* Resize actions: */
+    if (fAllowToShowActionResize)
+    {
+        updateMenuViewResize(pMenu);
+        fSeparator = true;
+    }
+
+    /* Separator: */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
+    /* Remap actions: */
+    if (fAllowToShowActionRemap && (m_cHostScreens > 1 || m_cGuestScreens > 1))
+    {
+        updateMenuViewRemap(pMenu);
+        fSeparator = true;
+    }
+
+    /* Separator: */
+    if (fSeparator)
+    {
+        pMenu->addSeparator();
+        fSeparator = false;
+    }
+
+    /* Rescale actions: */
+    if (fAllowToShowActionRescale)
+    {
+        updateMenuViewRescale(pMenu);
+        fSeparator = true;
+    }
+}
+
+void UIActionPoolRuntime::sltHandleActionTriggerViewScreenToggle()
+{
+    /* Make sure sender is valid: */
+    QAction *pAction = qobject_cast<QAction*>(sender());
+    AssertPtrReturnVoid(pAction);
+
+    /* Send request to enable/disable guest-screen: */
+    const int iGuestScreenIndex = pAction->property("Guest Screen Index").toInt();
+    const bool fScreenEnabled = pAction->isChecked();
+    emit sigNotifyAboutTriggeringViewScreenToggle(iGuestScreenIndex, fScreenEnabled);
+}
+
+void UIActionPoolRuntime::sltHandleActionTriggerViewScreenResize(QAction *pAction)
+{
+    /* Make sure sender is valid: */
+    AssertPtrReturnVoid(pAction);
+
+    /* Send request to resize guest-screen to required size: */
+    const int iGuestScreenIndex = pAction->property("Guest Screen Index").toInt();
+    const QSize size = pAction->property("Requested Size").toSize();
+    emit sigNotifyAboutTriggeringViewScreenResize(iGuestScreenIndex, size);
+}
+
+void UIActionPoolRuntime::sltHandleActionTriggerViewScreenRemap(QAction *pAction)
+{
+    /* Make sure sender is valid: */
+    AssertPtrReturnVoid(pAction);
+
+    /* Send request to remap guest-screen to required host-screen: */
+    const int iGuestScreenIndex = pAction->property("Guest Screen Index").toInt();
+    const int iHostScreenIndex = pAction->property("Host Screen Index").toInt();
+    emit sigNotifyAboutTriggeringViewScreenRemap(iGuestScreenIndex, iHostScreenIndex);
+}
+
+void UIActionPoolRuntime::sltHandleActionTriggerViewRescale(QAction *pAction)
 {
     /* Make sure sender is valid: */
@@ -3222 +3309 @@
     const int iGuestScreenIndex = pAction->property("Guest Screen Index").toInt();
     gEDataManager->setScaleFactor(dScaleFactor, vboxGlobal().managedVMUuid(), iGuestScreenIndex);
-}
-
-void UIActionPoolRuntime::sltPrepareMenuViewScreen()
-{
-    /* Make sure sender is valid: */
-    QMenu *pMenu = qobject_cast<QMenu*>(sender());
-    AssertPtrReturnVoid(pMenu);
-
-    /* Do we have to show resize, remap or rescale actions? */
-    const bool fAllowToShowActionResize = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Resize);
-    const bool fAllowToShowActionRemap = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Remap);
-    const bool fAllowToShowActionRescale = isAllowedInMenuView(UIExtraDataMetaDefs::RuntimeMenuViewActionType_Rescale);
-
-    /* Clear contents: */
-    pMenu->clear();
-
-    /* Separator: */
-    bool fSeparator = false;
-
-    /* Resize actions: */
-    if (fAllowToShowActionResize)
-    {
-        updateMenuViewResize(pMenu);
-        fSeparator = true;
-    }
-
-    /* Separator: */
-    if (fSeparator)
-    {
-        pMenu->addSeparator();
-        fSeparator = false;
-    }
-
-    /* Remap actions: */
-    if (fAllowToShowActionRemap && (m_cHostScreens > 1 || m_cGuestScreens > 1))
-    {
-        updateMenuViewRemap(pMenu);
-        fSeparator = true;
-    }
-
-    /* Separator: */
-    if (fSeparator)
-    {
-        pMenu->addSeparator();
-        fSeparator = false;
-    }
-
-    /* Rescale actions: */
-    if (fAllowToShowActionRescale)
-    {
-        updateMenuViewRescale(pMenu);
-        fSeparator = true;
-    }
-}
-
-void UIActionPoolRuntime::sltHandleActionTriggerViewScreenToggle()
-{
-    /* Make sure sender is valid: */
-    QAction *pAction = qobject_cast<QAction*>(sender());
-    AssertPtrReturnVoid(pAction);
-
-    /* Send request to enable/disable guest-screen: */
-    const int iGuestScreenIndex = pAction->property("Guest Screen Index").toInt();
-    const bool fScreenEnabled = pAction->isChecked();
-    emit sigNotifyAboutTriggeringViewScreenToggle(iGuestScreenIndex, fScreenEnabled);
-}
-
-void UIActionPoolRuntime::sltHandleActionTriggerViewScreenResize(QAction *pAction)
-{
-    /* Make sure sender is valid: */
-    AssertPtrReturnVoid(pAction);
-
-    /* Send request to resize guest-screen to required size: */
-    const int iGuestScreenIndex = pAction->property("Guest Screen Index").toInt();
-    const QSize size = pAction->property("Requested Size").toSize();
-    emit sigNotifyAboutTriggeringViewScreenResize(iGuestScreenIndex, size);
-}
-
-void UIActionPoolRuntime::sltHandleActionTriggerViewScreenRemap(QAction *pAction)
-{
-    /* Make sure sender is valid: */
-    AssertPtrReturnVoid(pAction);
-
-    /* Send request to remap guest-screen to required host-screen: */
-    const int iGuestScreenIndex = pAction->property("Guest Screen Index").toInt();
-    const int iHostScreenIndex = pAction->property("Host Screen Index").toInt();
-    emit sigNotifyAboutTriggeringViewScreenRemap(iGuestScreenIndex, iHostScreenIndex);
 }
 

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

@@ -201 +201 @@
     void sltHandleConfigurationChange(const QUuid &uMachineID);
 
-    /** Handles 'View' : 'Scale Factor' menu : @a pAction trigger. */
-    void sltHandleActionTriggerViewScaleFactor(QAction *pAction);
-
     /** Prepares 'View' : 'Virtual Screen #' menu (Normal, Scale). */
     void sltPrepareMenuViewScreen();
@@ -213 +210 @@
     /** Handles 'View' : 'Virtual Screen #' menu : 'Remap' @a pAction trigger. */
     void sltHandleActionTriggerViewScreenRemap(QAction *pAction);
+    /** Handles 'View' : 'Virtual Screen #' menu : 'Rescale' @a pAction trigger. */
+    void sltHandleActionTriggerViewRescale(QAction *pAction);
 
 protected: