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

Timestamp:

May 20, 2020 5:29:53 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Light cleanup in machine group definitions saving functionality.

Location:

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

Files:

• UIChooserAbstractModel.cpp (modified) (16 diffs)
• UIChooserAbstractModel.h (modified) (6 diffs)

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

@@ -189 +189 @@
     // Currently we are not saving group descriptors
     // (which reflecting group toggle-state) on-the-fly,
-    // so for now we are additionally save group orders
+    // so for now we are additionally save group definitions
     // when exiting application:
-    saveGroupOrders();
+    saveGroupDefinitions();
 
     /* Make sure all saving steps complete: */
     makeSureGroupSettingsSaveIsFinished();
-    makeSureGroupOrdersSaveIsFinished();
+    makeSureGroupDefinitionsSaveIsFinished();
 
     /* Delete tree: */
@@ -307 +307 @@
 {
     return    UIThreadGroupSettingsSave::instance()
-           || UIThreadGroupOrderSave::instance();
+           || UIThreadGroupDefinitionsSave::instance();
 }
 
@@ -470 +470 @@
 {
     saveGroupSettings();
-    saveGroupOrders();
+    saveGroupDefinitions();
 }
 
@@ -532 +532 @@
 }
 
-void UIChooserAbstractModel::sltGroupOrdersSaveComplete()
-{
-    makeSureGroupOrdersSaveIsFinished();
+void UIChooserAbstractModel::sltGroupDefinitionsSaveComplete()
+{
+    makeSureGroupDefinitionsSaveIsFinished();
     emit sigGroupSavingStateChanged();
 }
@@ -1012 +1012 @@
 }
 
-void UIChooserAbstractModel::saveGroupOrders()
-{
-    /* Make sure there is no group save activity: */
-    if (UIThreadGroupOrderSave::instance())
+void UIChooserAbstractModel::saveGroupDefinitions()
+{
+    /* Make sure there is no group definitions save activity: */
+    if (UIThreadGroupDefinitionsSave::instance())
         return;
 
     /* Prepare full group map: */
     QMap<QString, QStringList> groups;
-    gatherGroupOrders(groups, invisibleRoot());
+    gatherGroupDefinitions(groups, invisibleRoot());
 
     /* Save information in other thread: */
-    UIThreadGroupOrderSave::prepare();
+    UIThreadGroupDefinitionsSave::prepare();
     emit sigGroupSavingStateChanged();
-    UIThreadGroupOrderSave::instance()->configure(this, groups);
-    UIThreadGroupOrderSave::instance()->start();
+    UIThreadGroupDefinitionsSave::instance()->configure(this, groups);
+    UIThreadGroupDefinitionsSave::instance()->start();
 }
 
@@ -1049 +1049 @@
 }
 
-void UIChooserAbstractModel::gatherGroupOrders(QMap<QString, QStringList> &orders,
-                                               UIChooserNode *pParentGroup)
+void UIChooserAbstractModel::gatherGroupDefinitions(QMap<QString, QStringList> &definitions,
+                                                    UIChooserNode *pParentGroup)
 {
     /* Prepare extra-data key for current group: */
@@ -1059 +1059 @@
         /* Append node definition: */
         AssertPtrReturnVoid(pNode);
-        orders[strExtraDataKey] << pNode->definition(true /* full */);
+        definitions[strExtraDataKey] << pNode->definition(true /* full */);
     }
     /* Iterate over all the group-nodes: */
@@ -1066 +1066 @@
         /* Append node definition: */
         AssertPtrReturnVoid(pNode);
-        orders[strExtraDataKey] << pNode->definition(true /* full */);
+        definitions[strExtraDataKey] << pNode->definition(true /* full */);
         /* Go recursively through children: */
-        gatherGroupOrders(orders, pNode);
+        gatherGroupDefinitions(definitions, pNode);
     }
     /* Iterate over all the machine-nodes: */
@@ -1080 +1080 @@
         if (   pMachineNode->cacheType() == UIVirtualMachineItemType_Local
             || pMachineNode->cacheType() == UIVirtualMachineItemType_CloudReal)
-            orders[strExtraDataKey] << pNode->definition(true /* full */);
+            definitions[strExtraDataKey] << pNode->definition(true /* full */);
     }
 }
@@ -1091 +1091 @@
 }
 
-void UIChooserAbstractModel::makeSureGroupOrdersSaveIsFinished()
+void UIChooserAbstractModel::makeSureGroupDefinitionsSaveIsFinished()
 {
     /* Cleanup if necessary: */
-    if (UIThreadGroupOrderSave::instance())
-        UIThreadGroupOrderSave::cleanup();
+    if (UIThreadGroupDefinitionsSave::instance())
+        UIThreadGroupDefinitionsSave::cleanup();
 }
 
@@ -1140 +1140 @@
     m_oldLists = oldLists;
     m_newLists = newLists;
-    UIChooserAbstractModel* pChooserAbstractModel = qobject_cast<UIChooserAbstractModel*>(pParent);
+    UIChooserAbstractModel *pChooserAbstractModel = qobject_cast<UIChooserAbstractModel*>(pParent);
     AssertPtrReturnVoid(pChooserAbstractModel);
     {
@@ -1232 +1232 @@
 
 /*********************************************************************************************************************************
-*   Class UIThreadGroupOrderSave implementation.                                                                                 *
+*   Class UIThreadGroupDefinitionsSave implementation.                                                                           *
 *********************************************************************************************************************************/
 
 /* static */
-UIThreadGroupOrderSave *UIThreadGroupOrderSave::s_pInstance = 0;
+UIThreadGroupDefinitionsSave *UIThreadGroupDefinitionsSave::s_pInstance = 0;
 
 /* static */
-UIThreadGroupOrderSave *UIThreadGroupOrderSave::instance()
+UIThreadGroupDefinitionsSave *UIThreadGroupDefinitionsSave::instance()
 {
     return s_pInstance;
@@ -1245 +1245 @@
 
 /* static */
-void UIThreadGroupOrderSave::prepare()
-{
-    /* Make sure instance not prepared: */
+void UIThreadGroupDefinitionsSave::prepare()
+{
+    /* Make sure instance is not prepared: */
     if (s_pInstance)
         return;
 
     /* Crate instance: */
-    new UIThreadGroupOrderSave;
+    new UIThreadGroupDefinitionsSave;
 }
 
 /* static */
-void UIThreadGroupOrderSave::cleanup()
-{
-    /* Make sure instance prepared: */
+void UIThreadGroupDefinitionsSave::cleanup()
+{
+    /* Make sure instance is prepared: */
     if (!s_pInstance)
         return;
 
-    /* Crate instance: */
+    /* Delete instance: */
     delete s_pInstance;
 }
 
-void UIThreadGroupOrderSave::configure(QObject *pParent,
-                                       const QMap<QString, QStringList> &groups)
-{
-    m_groups = groups;
+void UIThreadGroupDefinitionsSave::configure(QObject *pParent,
+                                             const QMap<QString, QStringList> &groups)
+{
+    m_lists = groups;
     UIChooserAbstractModel *pChooserAbstractModel = qobject_cast<UIChooserAbstractModel*>(pParent);
     AssertPtrReturnVoid(pChooserAbstractModel);
     {
-        connect(this, &UIThreadGroupOrderSave::sigComplete,
-                pChooserAbstractModel, &UIChooserAbstractModel::sltGroupOrdersSaveComplete);
-    }
-}
-
-UIThreadGroupOrderSave::UIThreadGroupOrderSave()
+        connect(this, &UIThreadGroupDefinitionsSave::sigComplete,
+                pChooserAbstractModel, &UIChooserAbstractModel::sltGroupDefinitionsSaveComplete);
+    }
+}
+
+UIThreadGroupDefinitionsSave::UIThreadGroupDefinitionsSave()
 {
     /* Assign instance: */
@@ -1284 +1284 @@
 }
 
-UIThreadGroupOrderSave::~UIThreadGroupOrderSave()
-{
-    /* Wait: */
+UIThreadGroupDefinitionsSave::~UIThreadGroupDefinitionsSave()
+{
+    /* Make sure thread work is complete: */
     wait();
 
@@ -1293 +1293 @@
 }
 
-void UIThreadGroupOrderSave::run()
+void UIThreadGroupDefinitionsSave::run()
 {
     /* COM prepare: */
@@ -1301 +1301 @@
     gEDataManager->clearSelectorWindowGroupsDefinitions();
     /* For every particular group definition: */
-    foreach (const QString &strId, m_groups.keys())
-        gEDataManager->setSelectorWindowGroupsDefinitions(strId, m_groups[strId]);
+    foreach (const QString &strId, m_lists.keys())
+        gEDataManager->setSelectorWindowGroupsDefinitions(strId, m_lists[strId]);
 
     /* Notify listeners about completeness: */

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

@@ -130 +130 @@
         /** Handles group settings saving complete. */
         void sltGroupSettingsSaveComplete();
-        /** Handles group order saving complete. */
-        void sltGroupOrdersSaveComplete();
+        /** Handles group definitions saving complete. */
+        void sltGroupDefinitionsSaveComplete();
     /** @} */
 
@@ -227 +227 @@
         /** Saves group settings. */
         void saveGroupSettings();
-        /** Saves group orders. */
-        void saveGroupOrders();
+        /** Saves group definitions. */
+        void saveGroupDefinitions();
 
         /** Gathers group @a settings of @a pParentGroup. */
         void gatherGroupSettings(QMap<QString, QStringList> &settings, UIChooserNode *pParentGroup);
-        /** Gathers group @a orders of @a pParentGroup. */
-        void gatherGroupOrders(QMap<QString, QStringList> &orders, UIChooserNode *pParentGroup);
+        /** Gathers group @a definitions of @a pParentGroup. */
+        void gatherGroupDefinitions(QMap<QString, QStringList> &definitions, UIChooserNode *pParentGroup);
 
         /** Makes sure group settings saving is finished. */
         void makeSureGroupSettingsSaveIsFinished();
-        /** Makes sure group orders saving is finished. */
-        void makeSureGroupOrdersSaveIsFinished();
+        /** Makes sure group definitions saving is finished. */
+        void makeSureGroupDefinitionsSaveIsFinished();
     /** @} */
 
@@ -261 +261 @@
     /** @name Group saving stuff.
       * @{ */
-        /** Holds the consolidated map of group settings/orders. */
+        /** Holds the consolidated map of group settings/definitions. */
         QMap<QString, QStringList>  m_groups;
     /** @} */
@@ -316 +316 @@
 
 
-/** QThread subclass allowing to save group order asynchronously. */
-class UIThreadGroupOrderSave : public QThread
+/** QThread subclass allowing to save group definitions asynchronously. */
+class UIThreadGroupDefinitionsSave : public QThread
 {
     Q_OBJECT;
@@ -328 +328 @@
 public:
 
-    /** Returns group saving thread instance. */
-    static UIThreadGroupOrderSave *instance();
-    /** Prepares group saving thread instance. */
+    /** Returns group definitions saving thread instance. */
+    static UIThreadGroupDefinitionsSave *instance();
+    /** Prepares group definitions saving thread instance. */
     static void prepare();
-    /** Cleanups group saving thread instance. */
+    /** Cleanups group definitions saving thread instance. */
     static void cleanup();
 
-    /** Configures group saving thread with corresponding @a pListener.
-      * @param  groups  Brings the groups to be saved. */
+    /** Configures group definitions saving thread with corresponding @a pListener.
+      * @param  lists  Brings definitions lists to be saved. */
     void configure(QObject *pListener,
-                   const QMap<QString, QStringList> &groups);
+                   const QMap<QString, QStringList> &lists);
 
 protected:
 
-    /** Constructs group saving thread. */
-    UIThreadGroupOrderSave();
-    /** Destructs group saving thread. */
-    virtual ~UIThreadGroupOrderSave() /* override */;
+    /** Constructs group definitions saving thread. */
+    UIThreadGroupDefinitionsSave();
+    /** Destructs group definitions saving thread. */
+    virtual ~UIThreadGroupDefinitionsSave() /* override */;
 
     /** Contains a thread task to be executed. */
@@ -351 +351 @@
 
     /** Holds the singleton instance. */
-    static UIThreadGroupOrderSave *s_pInstance;
-
-    /** Holds the map of groups to be saved. */
-    QMap<QString, QStringList>  m_groups;
+    static UIThreadGroupDefinitionsSave *s_pInstance;
+
+    /** Holds the map of group definitions to be saved. */
+    QMap<QString, QStringList>  m_lists;
 };