Changeset 102107 in vbox for trunk

Timestamp:

Nov 15, 2023 2:09:46 PM (17 months ago)

Author:

vboxsync

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

160228

Message:

FE/Qt: bugref:10513: VBox Manager / Tools pane: Wipe out stuff related to tool class enabling/disabling, cause it's fixed now; This had to be done separately from previous one commit since it was complicated enough.

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

@@ -1130 +1130 @@
         m_pMenuToolsMachine->setToolsType(UIToolType_Details);
     m_pMenuToolsMachine->setRestrictedToolTypes(retrictedTypes);
-    /* Update machine tools availability: */
-    m_pMenuToolsMachine->setToolClassEnabled(UIToolClass_Machine, fCurrentItemIsOk);
+    /* Update machine menu items availability: */
+    m_pMenuToolsMachine->setItemsEnabled(fCurrentItemIsOk);
 
     /* Take restrictions into account, closing all restricted tools: */

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

@@ -63 +63 @@
 }
 
-void UITools::setToolClassEnabled(UIToolClass enmClass, bool fEnabled)
+void UITools::setItemsEnabled(bool fEnabled)
 {
-    m_pToolsModel->setToolClassEnabled(enmClass, fEnabled);
+    m_pToolsModel->setItemsEnabled(fEnabled);
 }
 
-bool UITools::toolClassEnabled(UIToolClass enmClass) const
+bool UITools::isItemsEnabled() const
 {
-    return m_pToolsModel->toolClassEnabled(enmClass);
+    return m_pToolsModel->isItemsEnabled();
 }
 

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

@@ -88 +88 @@
         UIToolType toolsType() const;
 
-        /** Defines whether certain @a enmClass of tools is @a fEnabled.*/
-        void setToolClassEnabled(UIToolClass enmClass, bool fEnabled);
-        /** Returns whether certain class of tools is enabled.*/
-        bool toolClassEnabled(UIToolClass enmClass) const;
+        /** Defines whether tool items @a fEnabled.*/
+        void setItemsEnabled(bool fEnabled);
+        /** Returns whether tool items enabled.*/
+        bool isItemsEnabled() const;
 
         /** Defines restructed tool @a types. */

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

@@ -68 +68 @@
     , m_pMouseHandler(0)
     , m_pKeyboardHandler(0)
+    , m_fItemsEnabled(true)
 {
     prepare();
@@ -134 +135 @@
 }
 
-void UIToolsModel::setToolClassEnabled(UIToolClass enmClass, bool fEnabled)
-{
-    if (m_enabledToolClasses.value(enmClass) != fEnabled)
-    {
-        m_enabledToolClasses[enmClass] = fEnabled;
+void UIToolsModel::setItemsEnabled(bool fEnabled)
+{
+    if (m_fItemsEnabled != fEnabled)
+    {
+        m_fItemsEnabled = fEnabled;
         foreach (UIToolsItem *pItem, items())
-            pItem->setEnabled(   m_enabledToolClasses.value(pItem->itemClass())
-                              && !m_restrictedToolTypes.contains(pItem->itemType()));
-    }
-}
-
-bool UIToolsModel::toolClassEnabled(UIToolClass enmClass) const
-{
-    return m_enabledToolClasses.value(enmClass);
+            pItem->setEnabled(m_fItemsEnabled && !m_restrictedToolTypes.contains(pItem->itemType()));
+    }
+}
+
+bool UIToolsModel::isItemsEnabled() const
+{
+    return m_fItemsEnabled;
 }
 
@@ -156 +156 @@
         m_restrictedToolTypes = types;
         foreach (UIToolsItem *pItem, items())
-            pItem->setEnabled(   m_enabledToolClasses.value(pItem->itemClass())
-                              && !m_restrictedToolTypes.contains(pItem->itemType()));
+            pItem->setEnabled(m_fItemsEnabled && !m_restrictedToolTypes.contains(pItem->itemType()));
     }
 }
@@ -462 +461 @@
 void UIToolsModel::prepareItems()
 {
-    /* Enable both classes of tools initially: */
-    m_enabledToolClasses[UIToolClass_Global] = true;
-    m_enabledToolClasses[UIToolClass_Machine] = true;
-
     /* Depending on tool class: */
     switch (m_enmClass)

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

@@ -115 +115 @@
         UIToolType toolsType() const;
 
-        /** Defines whether certain @a enmClass of tools is @a fEnabled.*/
-        void setToolClassEnabled(UIToolClass enmClass, bool fEnabled);
-        /** Returns whether certain class of tools is enabled.*/
-        bool toolClassEnabled(UIToolClass enmClass) const;
+        /** Defines whether tool items @a fEnabled.*/
+        void setItemsEnabled(bool fEnabled);
+        /** Returns whether tool items enabled.*/
+        bool isItemsEnabled() const;
 
         /** Defines restructed tool @a types. */
@@ -264 +264 @@
         UIToolsHandlerKeyboard *m_pKeyboardHandler;
 
-        /** Holds whether tools of particular class are enabled. */
-        QMap<UIToolClass, bool>  m_enabledToolClasses;
+        /** Holds whether items enabled. */
+        bool  m_fItemsEnabled;
 
         /** Holds a list of restricted tool types. */