Changeset 108153 in vbox

Timestamp:

Feb 11, 2025 11:38:51 AM (10 days ago)

Author:

vboxsync

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

167464

Message:

FE/Qt: bugref:10814: VBox Manager: Replace obsolete meaning of global item selected with global tool selected; That should fix the menu shown for various tools.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (3 diffs)
• UIVirtualBoxManagerAdvancedWidget.cpp (modified) (1 diff)
• UIVirtualBoxManagerAdvancedWidget.h (modified) (1 diff)
• chooser/UIChooser.cpp (modified) (1 diff)
• chooser/UIChooser.h (modified) (1 diff)
• chooser/UIChooserModel.cpp (modified) (1 diff)
• chooser/UIChooserModel.h (modified) (1 diff)

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

@@ -3416 +3416 @@
 {
     /* Determine whether Machine or Group menu should be shown at all: */
-    const bool fGlobalMenuShown  = m_pWidget->isGlobalItemSelected();
-    const bool fGroupMenuShown   = m_pWidget->isGroupItemSelected()   &&  isSingleGroupSelected();
-    const bool fMachineMenuShown = m_pWidget->isMachineItemSelected() && !isSingleGroupSelected();
-    actionPool()->action(UIActionIndexMN_M_Home)->setVisible(fGlobalMenuShown);
+    const bool fMachinesToolShown  = m_pWidget->currentGlobalTool() == UIToolType_Machines;
+    const bool fGlobalToolShown    = !fMachinesToolShown;
+    const bool fGroupMenuShown   = fMachinesToolShown && m_pWidget->isGroupItemSelected() && isSingleGroupSelected();
+    const bool fMachineMenuShown = fMachinesToolShown && m_pWidget->isMachineItemSelected() && !isSingleGroupSelected();
+    actionPool()->action(UIActionIndexMN_M_Home)->setVisible(fGlobalToolShown);
     actionPool()->action(UIActionIndexMN_M_Group)->setVisible(fGroupMenuShown);
     actionPool()->action(UIActionIndexMN_M_Machine)->setVisible(fMachineMenuShown);
 
     /* Determine whether Extensions menu should be visible: */
-    const bool fExtensionsMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Extensions;
+    const bool fExtensionsMenuShown = fGlobalToolShown && m_pWidget->currentGlobalTool() == UIToolType_Extensions;
     actionPool()->action(UIActionIndexMN_M_Extension)->setVisible(fExtensionsMenuShown);
     /* Determine whether Media menu should be visible: */
-    const bool fMediumMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Media;
+    const bool fMediumMenuShown = fGlobalToolShown && m_pWidget->currentGlobalTool() == UIToolType_Media;
     actionPool()->action(UIActionIndexMN_M_Medium)->setVisible(fMediumMenuShown);
     /* Determine whether Network menu should be visible: */
-    const bool fNetworkMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Network;
+    const bool fNetworkMenuShown = fGlobalToolShown && m_pWidget->currentGlobalTool() == UIToolType_Network;
     actionPool()->action(UIActionIndexMN_M_Network)->setVisible(fNetworkMenuShown);
     /* Determine whether Cloud menu should be visible: */
-    const bool fCloudMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Cloud;
+    const bool fCloudMenuShown = fGlobalToolShown && m_pWidget->currentGlobalTool() == UIToolType_Cloud;
     actionPool()->action(UIActionIndexMN_M_Cloud)->setVisible(fCloudMenuShown);
     /* Determine whether Activities menu should be visible: */
-    const bool fResourcesMenuShown = fGlobalMenuShown && m_pWidget->currentGlobalTool() == UIToolType_Activities;
+    const bool fResourcesMenuShown = fGlobalToolShown && m_pWidget->currentGlobalTool() == UIToolType_Activities;
     actionPool()->action(UIActionIndexMN_M_VMActivityOverview)->setVisible(fResourcesMenuShown);
 
@@ -3457 +3458 @@
 
     /* Hide action shortcuts: */
-    if (!fGlobalMenuShown)
+    if (!fGlobalToolShown)
         actionPool()->setShortcutsVisible(UIActionIndexMN_M_Home, false);
     if (!fGroupMenuShown)
@@ -3465 +3466 @@
 
     /* Show action shortcuts: */
-    if (fGlobalMenuShown)
+    if (fGlobalToolShown)
         actionPool()->setShortcutsVisible(UIActionIndexMN_M_Home, true);
     if (fGroupMenuShown)

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

@@ -95 +95 @@
     AssertPtrReturn(chooser(), false);
     return chooser()->isGroupItemSelected();
-}
-
-bool UIVirtualBoxManagerAdvancedWidget::isGlobalItemSelected() const
-{
-    AssertPtrReturn(chooser(), false);
-    return chooser()->isGlobalItemSelected();
 }
 

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

@@ -137 +137 @@
         /** Returns whether group item is selected. */
         bool isGroupItemSelected() const;
-        /** Returns whether global item is selected. */
-        bool isGlobalItemSelected() const;
         /** Returns whether machine item is selected. */
         bool isMachineItemSelected() const;

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp

@@ -90 +90 @@
     AssertPtrReturn(model(), false);
     return model()->isGroupItemSelected();
-}
-
-bool UIChooser::isGlobalItemSelected() const
-{
-    AssertPtrReturn(model(), false);
-    return model()->isGlobalItemSelected();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.h

@@ -146 +146 @@
         /** Returns whether group item is selected. */
         bool isGroupItemSelected() const;
-        /** Returns whether global item is selected. */
-        bool isGlobalItemSelected() const;
         /** Returns whether machine item is selected. */
         bool isMachineItemSelected() const;

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -285 +285 @@
 {
     return firstSelectedItem() && firstSelectedItem()->type() == UIChooserNodeType_Group;
-}
-
-bool UIChooserModel::isGlobalItemSelected() const
-{
-    return firstSelectedItem() && firstSelectedItem()->type() == UIChooserNodeType_Global;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.h

@@ -151 +151 @@
         /** Returns whether group item is selected. */
         bool isGroupItemSelected() const;
-        /** Returns whether global item is selected. */
-        bool isGlobalItemSelected() const;
         /** Returns whether machine item is selected. */
         bool isMachineItemSelected() const;