Changeset 88122 in vbox

Timestamp:

Mar 15, 2021 3:44:48 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager: Tools pane: Do not hide restricted tools, just disable them; Merge disabling logic for restricted tool types and disabled tool classes.

Location:

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

Files:

• UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• tools/UITools.cpp (modified) (1 diff)
• tools/UITools.h (modified) (1 diff)
• tools/UIToolsModel.cpp (modified) (4 diffs)
• tools/UIToolsModel.h (modified) (2 diffs)

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

@@ -1049 +1049 @@
     m_pPaneTools->setRestrictedToolTypes(retrictedTypes);
     /* Update machine tools availability: */
-    m_pPaneTools->setToolsEnabled(UIToolClass_Machine, fCurrentItemIsOk);
+    m_pPaneTools->setToolClassEnabled(UIToolClass_Machine, fCurrentItemIsOk);
 
     /* Propagate current item anyway: */

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

@@ -79 +79 @@
 }
 
-void UITools::setToolsEnabled(UIToolClass enmClass, bool fEnabled)
-{
-    m_pToolsModel->setToolsEnabled(enmClass, fEnabled);
-}
-
-bool UITools::areToolsEnabled(UIToolClass enmClass) const
-{
-    return m_pToolsModel->areToolsEnabled(enmClass);
+void UITools::setToolClassEnabled(UIToolClass enmClass, bool fEnabled)
+{
+    m_pToolsModel->setToolClassEnabled(enmClass, fEnabled);
+}
+
+bool UITools::toolClassEnabled(UIToolClass enmClass) const
+{
+    return m_pToolsModel->toolClassEnabled(enmClass);
 }
 

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

@@ -90 +90 @@
 
         /** Defines whether certain @a enmClass of tools is @a fEnabled.*/
-        void setToolsEnabled(UIToolClass enmClass, bool fEnabled);
+        void setToolClassEnabled(UIToolClass enmClass, bool fEnabled);
         /** Returns whether certain class of tools is enabled.*/
-        bool areToolsEnabled(UIToolClass enmClass) const;
+        bool toolClassEnabled(UIToolClass enmClass) const;
 
         /** Defines restructed tool @a types. */

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

@@ -163 +163 @@
 }
 
-void UIToolsModel::setToolsEnabled(UIToolClass enmClass, bool fEnabled)
+void UIToolsModel::setToolClassEnabled(UIToolClass enmClass, bool fEnabled)
 {
     /* Update linked values: */
-    m_statesToolsEnabled[enmClass] = fEnabled;
-    foreach (UIToolsItem *pItem, items())
-        if (pItem->itemClass() == enmClass)
-            pItem->setEnabled(m_statesToolsEnabled.value(enmClass));
-}
-
-bool UIToolsModel::areToolsEnabled(UIToolClass enmClass) const
-{
-    return m_statesToolsEnabled.value(enmClass);
+    if (m_enabledToolClasses.value(enmClass) != fEnabled)
+    {
+        m_enabledToolClasses[enmClass] = fEnabled;
+        foreach (UIToolsItem *pItem, items())
+            pItem->setEnabled(   m_enabledToolClasses.value(enmClass)
+                              && !m_restrictedToolTypes.contains(pItem->itemType()));
+    }
+}
+
+bool UIToolsModel::toolClassEnabled(UIToolClass enmClass) const
+{
+    return m_enabledToolClasses.value(enmClass);
 }
 
@@ -183 +186 @@
     {
         m_restrictedToolTypes = types;
-        updateLayout();
-        updateNavigation();
-        sltItemMinimumWidthHintChanged();
-        sltItemMinimumHeightHintChanged();
+        foreach (UIToolsItem *pItem, items())
+            pItem->setEnabled(   m_enabledToolClasses.value(pItem->itemClass())
+                              && !m_restrictedToolTypes.contains(pItem->itemType()));
     }
 }
@@ -354 +356 @@
     {
         /* Hide/skip unrelated items: */
-        if (   pItem->itemClass() != m_enmCurrentClass
-            || m_restrictedToolTypes.contains(pItem->itemType()))
+        if (pItem->itemClass() != m_enmCurrentClass)
         {
             pItem->hide();
@@ -496 +497 @@
 {
     /* Enable both classes of tools initially: */
-    m_statesToolsEnabled[UIToolClass_Global] = true;
-    m_statesToolsEnabled[UIToolClass_Machine] = true;
+    m_enabledToolClasses[UIToolClass_Global] = true;
+    m_enabledToolClasses[UIToolClass_Machine] = true;
 
     /* Welcome: */

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

@@ -117 +117 @@
 
         /** Defines whether certain @a enmClass of tools is @a fEnabled.*/
-        void setToolsEnabled(UIToolClass enmClass, bool fEnabled);
+        void setToolClassEnabled(UIToolClass enmClass, bool fEnabled);
         /** Returns whether certain class of tools is enabled.*/
-        bool areToolsEnabled(UIToolClass enmClass) const;
+        bool toolClassEnabled(UIToolClass enmClass) const;
 
         /** Defines restructed tool @a types. */
@@ -265 +265 @@
 
         /** Holds whether tools of particular class are enabled. */
-        QMap<UIToolClass, bool>  m_statesToolsEnabled;
+        QMap<UIToolClass, bool>  m_enabledToolClasses;
 
         /** Holds a list of restricted tool types. */