Changeset 108266 in vbox

Timestamp:

Feb 17, 2025 8:11:25 PM (3 weeks ago)

Author:

vboxsync

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

167591

Message:

FE/Qt: bugref:10814: VBox Manager / Tool-pane: Rework for loading/saving current global/machine tool types; A bit of corresponding rework in prepare/cleanup cascade.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• manager/tools/UIToolsModel.cpp (modified) (6 diffs)
• manager/tools/UIToolsModel.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -2873 +2873 @@
 }
 
-QList<UIToolType> UIExtraDataManager::toolsPaneLastItemsChosen()
+void UIExtraDataManager::toolsPaneLastItemsChosen(UIToolType &enmTypeGlobal, UIToolType &enmTypeMachine)
 {
     /* Parse loaded data: */
@@ -2884 +2884 @@
     }
 
-    /* Return result: */
-    return result;
-}
-
-void UIExtraDataManager::setToolsPaneLastItemsChosen(const QList<UIToolType> &set)
+    /* Assign values: */
+    enmTypeGlobal = result.value(0);
+    if (!UIToolStuff::isTypeOfClass(enmTypeGlobal, UIToolClass_Global))
+        enmTypeGlobal = UIToolType_Home;
+    enmTypeMachine = result.value(1);
+    if (!UIToolStuff::isTypeOfClass(enmTypeMachine, UIToolClass_Machine))
+        enmTypeMachine = UIToolType_Details;
+}
+
+void UIExtraDataManager::setToolsPaneLastItemsChosen(UIToolType enmTypeGlobal, UIToolType enmTypeMachine)
 {
     /* Serialize passed values: */
+    const QList<UIToolType> currentTypes = QList<UIToolType>() << enmTypeGlobal << enmTypeMachine;
     QStringList data;
-    foreach (const UIToolType &enmType, set)
+    foreach (const UIToolType &enmType, currentTypes)
         data << gpConverter->toInternalString(enmType);
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -400 +400 @@
 
         /** Returns last selected tool set of VirtualBox Manager. */
-        QList<UIToolType> toolsPaneLastItemsChosen();
+        void toolsPaneLastItemsChosen(UIToolType &enmTypeGlobal, UIToolType &enmTypeMachine);
         /** Defines last selected tool @a set of VirtualBox Manager. */
-        void setToolsPaneLastItemsChosen(const QList<UIToolType> &set);
+        void setToolsPaneLastItemsChosen(UIToolType enmTypeGlobal, UIToolType enmTypeMachine);
         /** Returns the list of detached tools of VirtualBox Manager. */
         QList<UIToolType> detachedTools();

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

@@ -35 +35 @@
 /* GUI includes: */
 #include "UIActionPoolManager.h"
+#include "UICommon.h"
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
@@ -74 +75 @@
     sltItemMinimumHeightHintChanged();
 
-    /* Load settings: */
-    loadSettings();
+    /* Load current items finally: */
+    loadCurrentItems();
 }
 
@@ -166 +167 @@
     UIToolsItem *pOldCurrentItem = m_pCurrentItem;
 
-    /* If there is item: */
-    if (pItem)
-    {
-        /* Set this item as current: */
-        m_pCurrentItem = pItem;
-
-        /* Load last tool types: */
-        UIToolType enmTypeGlobal, enmTypeMachine;
-        loadLastToolTypes(enmTypeGlobal, enmTypeMachine);
-
-        /* Depending on tool class: */
-        switch (m_enmClass)
-        {
-            case UIToolClass_Global: enmTypeGlobal = m_pCurrentItem->itemType(); break;
-            case UIToolClass_Machine: enmTypeMachine = m_pCurrentItem->itemType(); break;
-            default: break;
-        }
-
-        /* Save selected items data: */
-        const QList<UIToolType> currentTypes = QList<UIToolType>() << enmTypeGlobal << enmTypeMachine;
-        LogRel2(("GUI: UIToolsModel: Saving tool items as: Global=%d, Machine=%d\n",
-                 (int)enmTypeGlobal, (int)enmTypeMachine));
-        gEDataManager->setToolsPaneLastItemsChosen(currentTypes);
-    }
-    /* Otherwise reset current item: */
-    else
-        m_pCurrentItem = 0;
+    /* Update current item: */
+    m_pCurrentItem = pItem;
 
     /* Update old item (if any): */
@@ -431 +407 @@
 }
 
+void UIToolsModel::sltHandleCommitData()
+{
+    /* Save current items first of all: */
+    saveCurrentItems();
+}
+
 void UIToolsModel::sltRetranslateUI()
 {
@@ -558 +540 @@
 void UIToolsModel::prepareConnections()
 {
+    /* UICommon connections: */
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIToolsModel::sltHandleCommitData);
+
     /* Translation stuff: */
     connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
@@ -563 +549 @@
 }
 
-void UIToolsModel::loadSettings()
+void UIToolsModel::loadCurrentItems()
 {
     /* Load last tool types: */
     UIToolType enmTypeGlobal, enmTypeMachine;
-    loadLastToolTypes(enmTypeGlobal, enmTypeMachine);
-
-    /* Depending on tool class: */
-    UIToolsItem *pCurrentItem = 0;
-    switch (m_enmClass)
-    {
-        case UIToolClass_Global:
-        {
-            foreach (UIToolsItem *pItem, items())
-                if (pItem->itemType() == enmTypeGlobal)
-                    pCurrentItem = pItem;
-            if (!pCurrentItem)
-                pCurrentItem = item(UIToolType_Home);
-            break;
-        }
-        case UIToolClass_Machine:
-        {
-            foreach (UIToolsItem *pItem, items())
-                if (pItem->itemType() == enmTypeMachine)
-                    pCurrentItem = pItem;
-            if (!pCurrentItem)
-                pCurrentItem = item(UIToolType_Details);
-            break;
-        }
-        default:
-            break;
-    }
-    setCurrentItem(pCurrentItem);
-}
-
-/* static */
-void UIToolsModel::loadLastToolTypes(UIToolType &enmTypeGlobal, UIToolType &enmTypeMachine)
-{
-    /* Load selected items data: */
-    const QList<UIToolType> data = gEDataManager->toolsPaneLastItemsChosen();
-    enmTypeGlobal = data.value(0);
-    if (!UIToolStuff::isTypeOfClass(enmTypeGlobal, UIToolClass_Global))
-        enmTypeGlobal = UIToolType_Home;
-    enmTypeMachine = data.value(1);
-    if (!UIToolStuff::isTypeOfClass(enmTypeMachine, UIToolClass_Machine))
-        enmTypeMachine = UIToolType_Details;
+    gEDataManager->toolsPaneLastItemsChosen(enmTypeGlobal, enmTypeMachine);
     LogRel2(("GUI: UIToolsModel: Restoring tool items as: Global=%d, Machine=%d\n",
              (int)enmTypeGlobal, (int)enmTypeMachine));
+
+    /* Assign values depending on model class: */
+    if (m_enmClass == UIToolClass_Global)
+    {
+        UIToolsItem *pItem = item(enmTypeGlobal);
+        if (!pItem)
+            pItem = item(UIToolType_Home);
+        setCurrentItem(pItem);
+    }
+    else if (m_enmClass == UIToolClass_Machine)
+    {
+        UIToolsItem *pItem = item(enmTypeMachine);
+        if (!pItem)
+            pItem = item(UIToolType_Details);
+        setCurrentItem(pItem);
+    }
+}
+
+void UIToolsModel::saveCurrentItems()
+{
+    /* Load last tool types: */
+    UIToolType enmTypeGlobal, enmTypeMachine;
+    gEDataManager->toolsPaneLastItemsChosen(enmTypeGlobal, enmTypeMachine);
+
+    /* Update values depending on model class: */
+    if (m_pCurrentItem)
+    {
+        if (m_enmClass == UIToolClass_Global)
+            enmTypeGlobal = m_pCurrentItem->itemType();
+        else if (m_enmClass == UIToolClass_Machine)
+            enmTypeMachine = m_pCurrentItem->itemType();
+    }
+
+    /* Save selected items data: */
+    LogRel2(("GUI: UIToolsModel: Saving tool items as: Global=%d, Machine=%d\n",
+             (int)enmTypeGlobal, (int)enmTypeMachine));
+    gEDataManager->setToolsPaneLastItemsChosen(enmTypeGlobal, enmTypeMachine);
 }
 

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

@@ -186 +186 @@
     /** @name Event handling stuff.
      * @{ */
-       /** Handles translation event. */
-       void sltRetranslateUI();
+        /** Handles request to commit data. */
+        void sltHandleCommitData();
+
+        /** Handles translation event. */
+        void sltRetranslateUI();
     /** @} */
 
@@ -210 +213 @@
         /** Prepare connections. */
         void prepareConnections();
-        /** Loads settings. */
-        void loadSettings();
-
-        /** Loads last tool types. */
-        static void loadLastToolTypes(UIToolType &enmTypeGlobal, UIToolType &enmTypeMachine);
+
+        /** Loads current items from extra-data. */
+        void loadCurrentItems();
+        /** Saves current items to extra-data. */
+        void saveCurrentItems();
 
         /** Cleanups items. */