Changeset 102760 in vbox for trunk/src

Timestamp:

Jan 4, 2024 2:05:36 PM (13 months ago)

Author:

vboxsync

Message:

FE/Qt: UIVirtualBoxManager: A bit of refactoring for Tool switch code; Mostly moving code to approprivate places, needs for further improvements.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UIVirtualBoxManager.cpp (modified) (3 diffs)
• UIVirtualBoxManager.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -1186 +1186 @@
     /* Remove instance if exist: */
     delete m_settings.take(UIAdvancedSettingsDialog::Type_Global);
+}
+
+void UIVirtualBoxManager::sltPerformShowGlobalTool(QAction *pAction)
+{
+    /* Sanity checks: */
+    AssertPtrReturnVoid(pAction);
+    AssertPtrReturnVoid(m_pWidget);
+
+    /* Acquire tool type: */
+    const UIToolType enmType = pAction->property("UIToolType").value<UIToolType>();
+    AssertReturnVoid(enmType != UIToolType_Invalid);
+
+    /* Make sure global item is selected: */
+    m_pWidget->switchToGlobalItem();
+
+    /* Make sure corresponding manager window is closed (if any): */
+    sltCloseManagerWindow(enmType);
+
+    /* Open the tool finally: */
+    m_pWidget->setToolsTypeGlobal(enmType);
 }
 
@@ -2250 +2270 @@
 }
 
-void UIVirtualBoxManager::sltPerformShowGlobalTool(QAction *pAction)
-{
-    /* Sanity checks: */
-    AssertPtrReturnVoid(pAction);
-    AssertPtrReturnVoid(m_pWidget);
-
-    /* Acquire tool type: */
-    const UIToolType enmType = pAction->property("UIToolType").value<UIToolType>();
-    AssertReturnVoid(enmType != UIToolType_Invalid);
-
-    /* Make sure global item is selected: */
-    m_pWidget->switchToGlobalItem();
-
-    /* Make sure corresponding manager window is closed (if any): */
-    sltCloseManagerWindow(enmType);
-
-    /* Open the tool finally: */
-    m_pWidget->setToolsTypeGlobal(enmType);
-}
-
 void UIVirtualBoxManager::sltPerformShowMachineTool(QAction *pAction)
 {
@@ -2562 +2562 @@
     connect(actionPool()->action(UIActionIndexMN_M_File_S_Close), &UIAction::triggered,
             this, &UIVirtualBoxManager::sltPerformExit);
+
+    /* 'File/Tools' menu connections: */
     connect(actionPool()->actionGroup(UIActionIndexMN_M_File_M_Tools), &QActionGroup::triggered,
             this, &UIVirtualBoxManager::sltPerformShowGlobalTool);

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -216 +216 @@
         /** Handles call to close Preferences dialog. */
         void sltClosePreferencesDialog();
+
+        /** Handles call to show global tool corresponding to passed @a pAction. */
+        void sltPerformShowGlobalTool(QAction *pAction);
 
         /** Handles call to exit application. */
@@ -322 +325 @@
         void sltHandlePoweredOffMachine(bool fSuccess, bool fIncludingDiscard);
 
-        /** Handles call to show global tool corresponding to passed @a pAction. */
-        void sltPerformShowGlobalTool(QAction *pAction);
         /** Handles call to show machine tool corresponding to passed @a pAction. */
         void sltPerformShowMachineTool(QAction *pAction);