Changeset 108289 in vbox

Timestamp:

Feb 19, 2025 12:41:58 PM (2 months ago)

Author:

vboxsync

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

167632

Message:

FE/Qt: bugref:10814: VBox Manager / Tool-pane: Split restricted tool list into Global and Machine lists; That is useful since each tool menu now supports items of both classes.

Location:

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

Files:

• UIGlobalToolsManagerWidget.cpp (modified) (1 diff)
• UIMachineToolsManagerWidget.cpp (modified) (1 diff)
• tools/UITools.cpp (modified) (1 diff)
• tools/UITools.h (modified) (1 diff)
• tools/UIToolsModel.cpp (modified) (2 diffs)
• tools/UIToolsModel.h (modified) (2 diffs)

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

@@ -351 +351 @@
     /* Hide restricted tools in the menu: */
     const QList restrictions(restrictedTypes.begin(), restrictedTypes.end());
-    toolMenu()->setRestrictedToolTypes(restrictions);
+    toolMenu()->setRestrictedToolTypes(UIToolClass_Global, restrictions);
 
     /* Close all restricted tools (besides the Machines): */

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

@@ -574 +574 @@
 void UIMachineToolsManagerWidget::updateToolsMenu(UIVirtualMachineItem *pItem)
 {
-    /* Get current item state: */
-    const bool fCurrentItemIsOk = isItemAccessible(pItem);
-
-    /* Update machine tools restrictions: */
+    /* Prepare tool restrictions: */
     QSet<UIToolType> restrictedTypes;
+
+    /* Restrict some types for Basic mode: */
     const bool fExpertMode = gEDataManager->isSettingsInExpertMode();
     if (!fExpertMode)
         restrictedTypes << UIToolType_FileManager;
+
+    /* Make sure local VM tools are hidden for cloud VMs: */
     if (pItem && pItem->itemType() != UIVirtualMachineItemType_Local)
         restrictedTypes << UIToolType_Snapshots
                         << UIToolType_Logs
                         << UIToolType_FileManager;
+
+    /* Make sure no restricted tool is selected: */
     if (restrictedTypes.contains(toolMenu()->toolsType(UIToolClass_Machine)))
-        toolMenu()->setToolsType(UIToolType_Details);
+        setMenuToolType(UIToolType_Details);
+
+    /* Hide restricted tools in the menu: */
     const QList restrictions(restrictedTypes.begin(), restrictedTypes.end());
-    toolMenu()->setRestrictedToolTypes(restrictions);
+    toolMenu()->setRestrictedToolTypes(UIToolClass_Machine, restrictions);
+
+    /* Disable even unrestricted tools for inacccessible VMs: */
+    const bool fCurrentItemIsOk = isItemAccessible(pItem);
     toolMenu()->setItemsEnabled(fCurrentItemIsOk);
 
-    /* Take restrictions into account, closing all restricted tools: */
+    /* Close all restricted tools: */
     foreach (const UIToolType &enmRestrictedType, restrictedTypes)
         toolPane()->closeTool(enmRestrictedType);

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp

@@ -78 +78 @@
 }
 
-void UITools::setRestrictedToolTypes(const QList<UIToolType> &types)
+void UITools::setRestrictedToolTypes(UIToolClass enmClass, const QList<UIToolType> &types)
 {
-    m_pToolsModel->setRestrictedToolTypes(types);
-}
-
-QList<UIToolType> UITools::restrictedToolTypes() const
-{
-    return m_pToolsModel->restrictedToolTypes();
+    m_pToolsModel->setRestrictedToolTypes(enmClass, types);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.h

@@ -83 +83 @@
         bool isItemsEnabled() const;
 
-        /** Defines restructed tool @a types. */
-        void setRestrictedToolTypes(const QList<UIToolType> &types);
-        /** Returns restricted tool types. */
-        QList<UIToolType> restrictedToolTypes() const;
+        /** Defines restructed tool @a types for the @a enmClass specified. */
+        void setRestrictedToolTypes(UIToolClass enmClass, const QList<UIToolType> &types);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp

@@ -132 +132 @@
 }
 
-void UIToolsModel::setRestrictedToolTypes(const QList<UIToolType> &types)
-{
-    if (m_restrictedToolTypes != types)
-    {
-        m_restrictedToolTypes = types;
+void UIToolsModel::setRestrictedToolTypes(UIToolClass enmClass, const QList<UIToolType> &types)
+{
+    if (m_mapRestrictedToolTypes.value(enmClass) != types)
+    {
+        m_mapRestrictedToolTypes[enmClass] = types;
         foreach (UIToolsItem *pItem, items())
-            pItem->setVisible(!m_restrictedToolTypes.contains(pItem->itemType()));
+        {
+            if (pItem->itemClass() != enmClass)
+                continue;
+            const bool fRestricted = m_mapRestrictedToolTypes.value(enmClass).contains(pItem->itemType());
+            pItem->setVisible(!fRestricted);
+        }
 
         /* Update linked values: */
@@ -145 +150 @@
         sltItemMinimumHeightHintChanged();
     }
-}
-
-QList<UIToolType> UIToolsModel::restrictedToolTypes() const
-{
-    return m_restrictedToolTypes;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.h

@@ -119 +119 @@
         bool isItemsEnabled() const;
 
-        /** Defines restructed tool @a types. */
-        void setRestrictedToolTypes(const QList<UIToolType> &types);
-        /** Returns restricted tool types. */
-        QList<UIToolType> restrictedToolTypes() const;
+        /** Defines restructed tool @a types for the @a enmClass specified. */
+        void setRestrictedToolTypes(UIToolClass enmClass, const QList<UIToolType> &types);
 
         /** Asks parent to close. */
@@ -243 +241 @@
 
         /** Holds a list of restricted tool types. */
-        QList<UIToolType>  m_restrictedToolTypes;
+        QMap<UIToolClass, QList<UIToolType> >  m_mapRestrictedToolTypes;
     /** @} */