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

Timestamp:

Dec 10, 2024 2:59:20 PM (5 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10814: VBox Manager: Make sure Manager isn't aware of global item concept which only Manager widget should know about; That is necessary to be able to implement another widget working different way.

Location:

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

Files:

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

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

@@ -1180 +1180 @@
     AssertReturnVoid(enmType != UIToolType_Invalid);
 
-    /* Make sure global item is selected: */
-    m_pWidget->switchToGlobalItem();
-
     /* Open the tool finally: */
-    m_pWidget->setToolsTypeGlobal(enmType);
+    m_pWidget->setToolsTypeGlobal(enmType, true /* make sure it's visible */);
 }
 
@@ -1300 +1297 @@
     UIVirtualMachineItem *pItem = currentItem();
 
-    /* For global item or local machine: */
-    if (   !pItem
-        || pItem->itemType() == UIVirtualMachineItemType_Local)
+    /* If there is no items at all or first selected item is a local machine: */
+    if (!pItem || pItem->itemType() == UIVirtualMachineItemType_Local)
         openNewMachineWizard();
-    /* For cloud machine: */
+    /* Otherwise we guess it's cloud related item selected: */
     else
         sltOpenWizard(WizardType_NewCloudVM);
@@ -1314 +1310 @@
     UIVirtualMachineItem *pItem = currentItem();
 
-    /* For global item or local machine: */
-    if (   !pItem
-        || pItem->itemType() == UIVirtualMachineItemType_Local)
+    /* If there is no items at all or first selected item is a local machine: */
+    if (!pItem || pItem->itemType() == UIVirtualMachineItemType_Local)
         openAddMachineDialog();
-    /* For cloud machine: */
+    /* Otherwise we guess it's cloud related item selected: */
     else
         sltOpenWizard(WizardType_AddCloudVM);

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

@@ -199 +199 @@
 }
 
-void UIVirtualBoxManagerWidget::switchToGlobalItem()
-{
-    AssertPtrReturnVoid(m_pPaneChooser);
-    m_pPaneChooser->setCurrentGlobal();
-}
-
 void UIVirtualBoxManagerWidget::openGroupNameEditor()
 {
@@ -250 +244 @@
 }
 
-void UIVirtualBoxManagerWidget::setToolsTypeGlobal(UIToolType enmType)
-{
+void UIVirtualBoxManagerWidget::setToolsTypeGlobal(UIToolType enmType, bool fMakeSureItsVisible /* = false */)
+{
+    /* Make sure global item is selected if requested: */
+    if (fMakeSureItsVisible)
+    {
+        AssertPtrReturnVoid(m_pPaneChooser);
+        m_pPaneChooser->setCurrentGlobal();
+    }
+
+    /* Change the tool to requested type: */
+    AssertPtrReturnVoid(m_pMenuToolsGlobal);
     m_pMenuToolsGlobal->setToolsType(enmType);
 }
@@ -262 +265 @@
 void UIVirtualBoxManagerWidget::setToolsTypeMachine(UIToolType enmType)
 {
+    /* Change the tool to requested type: */
+    AssertPtrReturnVoid(m_pMenuToolsMachine);
     m_pMenuToolsMachine->setToolsType(enmType);
 }

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

@@ -191 +191 @@
         bool isCloudProfileUpdateInProgress() const;
 
-        /** Switches to global item. */
-        void switchToGlobalItem();
         /** Opens group name editor. */
         void openGroupNameEditor();
@@ -215 +213 @@
     /** @name Tools pane stuff.
       * @{ */
-        /** Defines Global tools @a enmType. */
-        void setToolsTypeGlobal(UIToolType enmType);
+        /** Defines Global tools @a enmType and @a fMakeSureItsVisible if requested. */
+        void setToolsTypeGlobal(UIToolType enmType, bool fMakeSureItsVisible = false);
         /** Returns Global tools type. */
         UIToolType toolsTypeGlobal() const;