Changeset 56060 in vbox

Timestamp:

May 25, 2015 2:21:49 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Action-pool: Yet another small code reordering to sync with actual action positions (s.a. r100579).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -568 +568 @@
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_Seamless:             strResult = "Seamless"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_Scale:                strResult = "Scale"; break;
-        case UIExtraDataMetaDefs::RuntimeMenuViewActionType_GuestAutoresize:      strResult = "GuestAutoresize"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_MinimizeWindow:       strResult = "MinimizeWindow"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_AdjustWindow:         strResult = "AdjustWindow"; break;
+        case UIExtraDataMetaDefs::RuntimeMenuViewActionType_GuestAutoresize:      strResult = "GuestAutoresize"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_TakeScreenshot:       strResult = "TakeScreenshot"; break;
         case UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCapture:         strResult = "VideoCapture"; break;
@@ -606 +606 @@
     keys << "Seamless";             values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_Seamless;
     keys << "Scale";                values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_Scale;
-    keys << "GuestAutoresize";      values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_GuestAutoresize;
     keys << "MinimizeWindow";       values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_MinimizeWindow;
     keys << "AdjustWindow";         values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_AdjustWindow;
+    keys << "GuestAutoresize";      values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_GuestAutoresize;
     keys << "TakeScreenshot";       values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_TakeScreenshot;
     keys << "VideoCapture";         values << UIExtraDataMetaDefs::RuntimeMenuViewActionType_VideoCapture;

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -377 +377 @@
         RuntimeMenuViewActionType_Seamless             = RT_BIT(1),
         RuntimeMenuViewActionType_Scale                = RT_BIT(2),
-        RuntimeMenuViewActionType_GuestAutoresize      = RT_BIT(3),
-        RuntimeMenuViewActionType_MinimizeWindow       = RT_BIT(4),
-        RuntimeMenuViewActionType_AdjustWindow         = RT_BIT(5),
+        RuntimeMenuViewActionType_MinimizeWindow       = RT_BIT(3),
+        RuntimeMenuViewActionType_AdjustWindow         = RT_BIT(4),
+        RuntimeMenuViewActionType_GuestAutoresize      = RT_BIT(5),
         RuntimeMenuViewActionType_TakeScreenshot       = RT_BIT(6),
         RuntimeMenuViewActionType_VideoCapture         = RT_BIT(7),

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

@@ -1538 +1538 @@
 }
 
+void UIMachineLogic::sltMinimizeWindow()
+{
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    /* Minimize currently active machine-window: */
+    activeMachineWindow()->showMinimized();
+}
+
+void UIMachineLogic::sltAdjustWindow()
+{
+    /* Do not process if window(s) missed! */
+    if (!isMachineWindowsCreated())
+        return;
+
+    /* Adjust all window(s)! */
+    foreach(UIMachineWindow *pMachineWindow, machineWindows())
+    {
+        /* Exit maximized window state if actual: */
+        if (pMachineWindow->isMaximized())
+            pMachineWindow->showNormal();
+
+        /* Normalize window geometry: */
+        pMachineWindow->normalizeGeometry(true /* adjust position */);
+    }
+}
+
 void UIMachineLogic::sltToggleGuestAutoresize(bool fEnabled)
 {
@@ -1547 +1575 @@
     foreach(UIMachineWindow *pMachineWindow, machineWindows())
         pMachineWindow->machineView()->setGuestAutoresizeEnabled(fEnabled);
-}
-
-void UIMachineLogic::sltMinimizeWindow()
-{
-    /* Do not process if window(s) missed! */
-    if (!isMachineWindowsCreated())
-        return;
-
-    /* Minimize currently active machine-window: */
-    activeMachineWindow()->showMinimized();
-}
-
-void UIMachineLogic::sltAdjustWindow()
-{
-    /* Do not process if window(s) missed! */
-    if (!isMachineWindowsCreated())
-        return;
-
-    /* Adjust all window(s)! */
-    foreach(UIMachineWindow *pMachineWindow, machineWindows())
-    {
-        /* Exit maximized window state if actual: */
-        if (pMachineWindow->isMaximized())
-            pMachineWindow->showNormal();
-
-        /* Normalize window geometry: */
-        pMachineWindow->normalizeGeometry(true /* adjust position */);
-    }
 }
 

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

@@ -266 +266 @@
 
     /* "View" menu functionality: */
-    void sltToggleGuestAutoresize(bool fEnabled);
     void sltMinimizeWindow();
     void sltAdjustWindow();
+    void sltToggleGuestAutoresize(bool fEnabled);
     void sltTakeScreenshot();
     void sltOpenVideoCaptureOptions();