Changeset 102743 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 2, 2024 3:33:52 PM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: UIVirtualBoxManagerWidget: Simplify reaction for the tools pane index change; This can go easier now since r160219.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (5 diffs)
• UIVirtualBoxManagerWidget.h (modified) (1 diff)

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

@@ -519 +519 @@
             /* If Error-pane is chosen currently => open tool currently chosen in Tools-pane: */
             if (m_pPaneToolsMachine->currentTool() == UIToolType_Error)
-                sltHandleToolsPaneIndexChange();
+                sltHandleMachineToolsPaneIndexChange();
 
             /* If we still have same item selected: */
@@ -574 +574 @@
 }
 
-void UIVirtualBoxManagerWidget::sltHandleToolsPaneIndexChange()
-{
-    /* Determine sender: */
-    UITools *pMenu = qobject_cast<UITools*>(sender());
-    if (!pMenu)
-        pMenu = m_pMenuToolsMachine;
-
-    /* Acquire current class/type: */
-    UIToolClass enmCurrentClass = UIToolClass_Invalid;
-    if (pMenu == m_pMenuToolsGlobal)
-        enmCurrentClass = UIToolClass_Global;
-    else if (pMenu == m_pMenuToolsMachine)
-        enmCurrentClass = UIToolClass_Machine;
-    AssertReturnVoid(enmCurrentClass != UIToolClass_Invalid);
-    const UIToolType enmCurrentType = pMenu->toolsType();
-
-    /* Invent default for fallback case: */
-    const UIToolType enmDefaultType = enmCurrentClass == UIToolClass_Global ? UIToolType_Welcome
-                                    : enmCurrentClass == UIToolClass_Machine ? UIToolType_Details
-                                    : UIToolType_Invalid;
-    AssertReturnVoid(enmDefaultType != UIToolType_Invalid);
-
-    /* Calculate new type to choose: */
-    const UIToolType enmNewType = UIToolStuff::isTypeOfClass(enmCurrentType, enmCurrentClass)
-                                ? enmCurrentType : enmDefaultType;
-
-    /* Choose new type: */
-    switch (enmCurrentClass)
-    {
-        case UIToolClass_Global: switchToGlobalTool(enmNewType); break;
-        case UIToolClass_Machine: switchToMachineTool(enmNewType); break;
-        default: break;
-    }
+void UIVirtualBoxManagerWidget::sltHandleGlobalToolsPaneIndexChange()
+{
+    switchToGlobalTool(m_pMenuToolsGlobal->toolsType());
+}
+
+void UIVirtualBoxManagerWidget::sltHandleMachineToolsPaneIndexChange()
+{
+    switchToMachineTool(m_pMenuToolsMachine->toolsType());
 }
 
@@ -845 +820 @@
     /* Tools-pane connections: */
     connect(m_pMenuToolsGlobal, &UITools::sigSelectionChanged,
-            this, &UIVirtualBoxManagerWidget::sltHandleToolsPaneIndexChange);
+            this, &UIVirtualBoxManagerWidget::sltHandleGlobalToolsPaneIndexChange);
     connect(m_pMenuToolsMachine, &UITools::sigSelectionChanged,
-            this, &UIVirtualBoxManagerWidget::sltHandleToolsPaneIndexChange);
+            this, &UIVirtualBoxManagerWidget::sltHandleMachineToolsPaneIndexChange);
 }
 
@@ -1099 +1074 @@
     /* Tools-pane connections: */
     disconnect(m_pMenuToolsGlobal, &UITools::sigSelectionChanged,
-               this, &UIVirtualBoxManagerWidget::sltHandleToolsPaneIndexChange);
+               this, &UIVirtualBoxManagerWidget::sltHandleGlobalToolsPaneIndexChange);
     disconnect(m_pMenuToolsMachine, &UITools::sigSelectionChanged,
-               this, &UIVirtualBoxManagerWidget::sltHandleToolsPaneIndexChange);
+               this, &UIVirtualBoxManagerWidget::sltHandleMachineToolsPaneIndexChange);
 }
 
@@ -1177 +1152 @@
         /* If Error-pane is chosen currently => open tool currently chosen in Tools-pane: */
         if (m_pPaneToolsMachine->currentTool() == UIToolType_Error)
-            sltHandleToolsPaneIndexChange();
+            sltHandleMachineToolsPaneIndexChange();
 
         /* Propagate current items to the Tools pane: */

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

@@ -324 +324 @@
         void sltHandleToolMenuRequested(const QPoint &position, UIVirtualMachineItem *pItem);
 
-        /** Handles signal about Tools-pane index change. */
-        void sltHandleToolsPaneIndexChange();
+        /** Handles signal about global Tools-pane index change. */
+        void sltHandleGlobalToolsPaneIndexChange();
+        /** Handles signal about machine Tools-pane index change. */
+        void sltHandleMachineToolsPaneIndexChange();
 
         /** Handles signal requesting switch to Activity pane of machine with @a uMachineId. */