Changeset 108550 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 13, 2025 5:22:50 PM (5 weeks ago)

Author:

vboxsync

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

167947

Message:

FE/Qt: bugref:10814: VBox Manager: Cleanup for Global and Machine tool widgets.

Location:

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

Files:

• UIGlobalToolsWidget.cpp (modified) (7 diffs)
• UIGlobalToolsWidget.h (modified) (4 diffs)
• UIMachineToolsWidget.cpp (modified) (2 diffs)
• UIMachineToolsWidget.h (modified) (3 diffs)
• UIVirtualBoxWidget.cpp (modified) (1 diff)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2024 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2025 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -71 +71 @@
 }
 
-UIToolType UIGlobalToolsWidget::menuToolType() const
+UIToolType UIGlobalToolsWidget::menuToolType(UIToolClass enmClass) const
 {
     AssertPtrReturn(toolMenu(), UIToolType_Invalid);
-    return toolMenu()->toolsType(UIToolClass_Global);
+    return toolMenu()->toolsType(enmClass);
 }
 
@@ -114 +114 @@
     toolPane()->openTool(enmType);
 
-    /* Special handling for Machines global tool,
-     * notify Machine tool-pane it's active: */
-    if (enmType == UIToolType_Machines)
-    {
-        toolPane()->setActive(false);
-        toolPaneMachine()->setActive(true);
-    }
-    /* Otherwise, notify Global tool-pane it's active: */
-    else
-    {
-        toolPaneMachine()->setActive(false);
-        toolPane()->setActive(true);
-    }
+    /* Notify corresponding tool-pane it's active: */
+    toolPane()->setActive(enmType != UIToolType_Machines && enmType != UIToolType_Managers);
+    toolPaneMachine()->setActive(enmType == UIToolType_Machines);
 
     /* Special handling for Activities Global tool,
@@ -226 +216 @@
     toolMenu()->setRestrictedToolTypes(UIToolClass_Global, restrictions);
 
-    /* Close all restricted tools (besides the Machines): */
+    /* Close all restricted tools (besides the Machines and Management): */
     foreach (const UIToolType &enmRestrictedType, restrictedTypes)
-        if (enmRestrictedType != UIToolType_Machines)
+        if (   enmRestrictedType != UIToolType_Machines
+            && enmRestrictedType != UIToolType_Managers)
             toolPane()->closeTool(enmRestrictedType);
 }
@@ -256 +247 @@
     toolMenu()->setRestrictedToolTypes(UIToolClass_Machine, restrictions);
 
+    /// @todo finish that
     // /* Disable even unrestricted tools for inacccessible VMs: */
     // const bool fCurrentItemIsOk = isItemAccessible(pItem);
     // toolMenu()->setItemsEnabled(fCurrentItemIsOk);
+    
+    /* Close all restricted tools: */
+    foreach (const UIToolType &enmRestrictedType, restrictedTypes)
+        toolPaneMachine()->closeTool(enmRestrictedType);
 }
 
@@ -364 +360 @@
 {
     /* Acquire & select tools currently chosen in the menu: */
-    const UIToolType enmTypeGlobal = toolMenu()->toolsType(UIToolClass_Global);
-    const UIToolType enmTypeMachine = toolMenu()->toolsType(UIToolClass_Machine);
-    sltHandleToolsMenuIndexChange(enmTypeGlobal);
-    sltHandleToolsMenuIndexChange(enmTypeMachine);
+    sltHandleToolsMenuIndexChange(toolMenu()->toolsType(UIToolClass_Global));
+    sltHandleToolsMenuIndexChange(toolMenu()->toolsType(UIToolClass_Machine));
 
     /* Update tools restrictions: */
@@ -376 +370 @@
 {
     /* Global COM event handlers: */
+    disconnect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineRegistered,
+               this, &UIGlobalToolsWidget::sltHandleMachineRegistrationChanged);
     disconnect(gEDataManager, &UIExtraDataManager::sigSettingsExpertModeChange,
                this, &UIGlobalToolsWidget::sltHandleSettingsExpertModeChange);

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2024 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2025 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -70 +70 @@
     UIGlobalToolsWidget(QWidget *pParent, UIActionPool *pActionPool);
 
-    /** @name Common stuff.
-      * @{ */
-        /** Returns the action-pool reference. */
-        UIActionPool *actionPool() const { return m_pActionPool; }
-    /** @} */
-
     /** @name Tool-bar stuff.
       * @{ */
@@ -89 +83 @@
         UIMachineToolsWidget *machineToolsWidget() const;
 
-        /** Returns menu tool type. */
-        UIToolType menuToolType() const;
+        /** Returns menu tool type for the @a enmClass specified. */
+        UIToolType menuToolType(UIToolClass enmClass) const;
         /** Defines menu tool @a enmType. */
         void setMenuToolType(UIToolType enmType);
@@ -171 +165 @@
     /** @} */
 
+    /** @name Common stuff.
+      * @{ */
+        /** Returns the action-pool reference. */
+        UIActionPool *actionPool() const { return m_pActionPool; }
+    /** @} */
+
     /** @name Tools stuff.
       * @{ */

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2024 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2025 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -528 +528 @@
     }
 
-    /* Open tool last chosen in tools-menu: */
-    switchToolTo(toolMenu()->toolsType(UIToolClass_Machine));
+    /* Acquire & select tool currently chosen in the menu: */
+    sltHandleToolsMenuIndexChange(toolMenu()->toolsType(UIToolClass_Machine));
 }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2024 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2025 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -91 +91 @@
     UIMachineToolsWidget(UIToolPane *pParent, UIActionPool *pActionPool);
 
-    /** @name Common stuff.
-      * @{ */
-        /** Returns the action-pool reference. */
-        UIActionPool *actionPool() const { return m_pActionPool; }
-    /** @} */
-
     /** @name Chooser pane stuff.
       * @{ */
@@ -232 +226 @@
     /** @} */
 
+    /** @name Common stuff.
+      * @{ */
+        /** Returns the action-pool reference. */
+        UIActionPool *actionPool() const { return m_pActionPool; }
+    /** @} */
+
     /** @name Tools pane stuff.
       * @{ */

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

@@ -225 +225 @@
 {
     AssertPtrReturn(globalToolsWidget(), UIToolType_Invalid);
-    return globalToolsWidget()->menuToolType();
+    return globalToolsWidget()->menuToolType(UIToolClass_Global);
 }