Changeset 88585 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 19, 2021 4:35:03 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: A bit of rework for Chooser pane; Much more selective definition saving policy, saves only changed and removes only excessive values.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (4 diffs)

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

@@ -2788 +2788 @@
 }
 
-void UIExtraDataManager::clearSelectorWindowGroupsDefinitions()
-{
-    /* Wipe-out each the group definition record: */
+QStringList UIExtraDataManager::knownMachineGroupDefinitionKeys()
+{
+    /* Acquire a list of known group definition keys: */
+    QStringList result;
     foreach (const QString &strKey, m_data.value(GlobalID).keys())
         if (strKey.startsWith(GUI_GroupDefinitions))
-            setExtraDataString(strKey, QString());
-}
-
-QStringList UIExtraDataManager::selectorWindowGroupsDefinitions(const QString &strGroupID)
+        {
+            QString strGroupID = strKey;
+            strGroupID.remove(GUI_GroupDefinitions);
+            result << strGroupID;
+        }
+
+    /* Return result: */
+    return result;
+}
+
+QStringList UIExtraDataManager::machineGroupDefinitions(const QString &strGroupID)
 {
     return extraDataStringList(GUI_GroupDefinitions + strGroupID);
 }
 
-void UIExtraDataManager::setSelectorWindowGroupsDefinitions(const QString &strGroupID, const QStringList &definitions)
+void UIExtraDataManager::setMachineGroupDefinitions(const QString &strGroupID, const QStringList &definitions)
 {
     setExtraDataStringList(GUI_GroupDefinitions + strGroupID, definitions);

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

@@ -344 +344 @@
         void setSelectorWindowStatusBarVisible(bool fVisible);
 
-        /** Clears all the existing selector-window chooser-pane' group definitions. */
-        void clearSelectorWindowGroupsDefinitions();
-        /** Returns selector-window chooser-pane' groups definitions for passed @a strGroupID. */
-        QStringList selectorWindowGroupsDefinitions(const QString &strGroupID);
-        /** Defines selector-window chooser-pane' groups @a definitions for passed @a strGroupID. */
-        void setSelectorWindowGroupsDefinitions(const QString &strGroupID, const QStringList &definitions);
+        /** Returns all the existing selector-window chooser-pane' group definition keys. */
+        QStringList knownMachineGroupDefinitionKeys();
+        /** Returns selector-window chooser-pane' group definitions for passed @a strGroupID. */
+        QStringList machineGroupDefinitions(const QString &strGroupID);
+        /** Defines selector-window chooser-pane' group @a definitions for passed @a strGroupID. */
+        void setMachineGroupDefinitions(const QString &strGroupID, const QStringList &definitions);
 
         /** Returns last-item ID of the item chosen in selector-window chooser-pane. */

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

@@ -334 +334 @@
     COMBase::InitializeCOM(false);
 
-    /* Clear all the extra-data records related to group definitions: */
-    gEDataManager->clearSelectorWindowGroupsDefinitions();
-    /* For every particular group definition: */
+    /* Acquire a list of known group definition keys: */
+    QStringList knownKeys = gEDataManager->knownMachineGroupDefinitionKeys();
+    /* For every group definition to be saved: */
     foreach (const QString &strId, m_lists.keys())
-        gEDataManager->setSelectorWindowGroupsDefinitions(strId, m_lists.value(strId));
+    {
+        /* Save definition only if there is a change: */
+        if (gEDataManager->machineGroupDefinitions(strId) != m_lists.value(strId))
+            gEDataManager->setMachineGroupDefinitions(strId, m_lists.value(strId));
+        /* Remove it from known keys: */
+        knownKeys.removeAll(strId);
+    }
+    /* Wipe out rest of known group definitions: */
+    foreach (const QString strId, knownKeys)
+        gEDataManager->setMachineGroupDefinitions(strId, QStringList());
 
     /* Notify listeners about completeness: */
@@ -1397 +1406 @@
 {
     /* Read group definitions: */
-    const QStringList definitions = gEDataManager->selectorWindowGroupsDefinitions(pParentNode->fullName());
+    const QStringList definitions = gEDataManager->machineGroupDefinitions(pParentNode->fullName());
     /* Return 'false' if no definitions found: */
     if (definitions.isEmpty())
@@ -1427 +1436 @@
 {
     /* Read group definitions: */
-    const QStringList definitions = gEDataManager->selectorWindowGroupsDefinitions(pParentNode->fullName());
+    const QStringList definitions = gEDataManager->machineGroupDefinitions(pParentNode->fullName());
     /* Return 'false' if no definitions found: */
     if (definitions.isEmpty())
@@ -1548 +1557 @@
 {
     /* Read group definitions: */
-    const QStringList definitions = gEDataManager->selectorWindowGroupsDefinitions(pParentNode->fullName());
+    const QStringList definitions = gEDataManager->machineGroupDefinitions(pParentNode->fullName());
     /* Return 'false' if no definitions found: */
     if (definitions.isEmpty())