Changeset 51548 in vbox for trunk/src/VBox

Timestamp:

Jun 5, 2014 10:02:39 AM (11 years ago)

Author:

vboxsync

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

94195

Message:

FE/Qt: 6660: Advanced extra-data management framework: Integrate GUI_GroupDefinitions.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (6 diffs)

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

@@ -427 +427 @@
 }
 
+void UIExtraDataManager::clearSelectorWindowGroupsDefinitions()
+{
+    /* Read-only access global extra-data map: */
+    const ExtraDataMap &data = m_data[m_sstrGlobalID];
+    /* Wipe-out each the group definition record: */
+    foreach (const QString &strKey, data.keys())
+        if (strKey.startsWith(GUI_GroupDefinitions))
+            setExtraDataString(strKey, QString());
+}
+
+QStringList UIExtraDataManager::selectorWindowGroupsDefinitions(const QString &strGroupID) const
+{
+    return extraDataStringList(GUI_GroupDefinitions + strGroupID);
+}
+
+void UIExtraDataManager::setSelectorWindowGroupsDefinitions(const QString &strGroupID, const QStringList &definitions)
+{
+    setExtraDataStringList(GUI_GroupDefinitions + strGroupID, definitions);
+}
+
 QString UIExtraDataManager::selectorWindowLastItemChosen() const
 {

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

@@ -152 +152 @@
     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) const;
+    /** Defines selector-window chooser-pane' groups definitions for passed @a strGroupID as @a definitions. */
+    void setSelectorWindowGroupsDefinitions(const QString &strGroupID, const QStringList &definitions);
+
     /** Returns last item chosen in selector-window chooser-pane. */
     QString selectorWindowLastItemChosen() const;
-    /** Returns last item chosen in selector-window chooser-pane as @a strItemID. */
+    /** Defines last item chosen in selector-window chooser-pane as @a strItemID. */
     void setSelectorWindowLastItemChosen(const QString &strItemID);
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -1704 +1704 @@
 bool UIGChooserModel::shouldBeGroupOpened(UIGChooserItem *pParentItem, const QString &strName)
 {
-    /* Prepare extra-data key for the parent-item: */
-    QString strExtraDataKey = GUI_GroupDefinitions + pParentItem->fullName();
     /* Read group definitions: */
-    QStringList definitions = vboxGlobal().virtualBox().GetExtraDataStringList(strExtraDataKey);
+    const QStringList definitions = gEDataManager->selectorWindowGroupsDefinitions(pParentItem->fullName());
     /* Return 'false' if no definitions found: */
     if (definitions.isEmpty())
@@ -1716 +1714 @@
     QRegExp definitionRegExp(strDefinitionTemplate);
     /* For each the group definition: */
-    for (int i = 0; i < definitions.size(); ++i)
-    {
-        /* Get current definition: */
-        const QString &strDefinition = definitions[i];
+    foreach (const QString &strDefinition, definitions)
+    {
         /* Check if this is required definition: */
         if (definitionRegExp.indexIn(strDefinition) == 0)
@@ -1775 +1771 @@
 int UIGChooserModel::positionFromDefinitions(UIGChooserItem *pParentItem, UIGChooserItemType type, const QString &strName)
 {
-    /* Prepare extra-data key for the parent-item: */
-    QString strExtraDataKey = GUI_GroupDefinitions + pParentItem->fullName();
     /* Read group definitions: */
-    QStringList definitions = vboxGlobal().virtualBox().GetExtraDataStringList(strExtraDataKey);
+    const QStringList definitions = gEDataManager->selectorWindowGroupsDefinitions(pParentItem->fullName());
     /* Return 'false' if no definitions found: */
     if (definitions.isEmpty())
@@ -1803 +1797 @@
     /* For each the definition: */
     int iDefinitionIndex = -1;
-    for (int i = 0; i < definitions.size(); ++i)
-    {
-        /* Get current definition: */
-        QString strDefinition = definitions[i];
+    foreach (const QString &strDefinition, definitions)
+    {
         /* Check if this definition is of required type: */
         if (definitionRegExpShort.indexIn(strDefinition) == 0)
@@ -1884 +1876 @@
 {
     /* Prepare extra-data key for current group: */
-    QString strExtraDataKey = GUI_GroupDefinitions + pParentItem->fullName();
+    const QString strExtraDataKey = pParentItem->fullName();
     /* Iterate over all the group-items: */
     foreach (UIGChooserItem *pItem, pParentItem->items(UIGChooserItemType_Group))
@@ -2091 +2083 @@
     COMBase::InitializeCOM(false);
 
-    /* Clear all the extra-data records related to group-definitions: */
-    const QVector<QString> extraDataKeys = vboxGlobal().virtualBox().GetExtraDataKeys();
-    foreach (const QString &strKey, extraDataKeys)
-        if (strKey.startsWith(GUI_GroupDefinitions))
-            vboxGlobal().virtualBox().SetExtraData(strKey, QString());
-
+    /* Clear all the extra-data records related to group definitions: */
+    gEDataManager->clearSelectorWindowGroupsDefinitions();
     /* For every particular group definition: */
     foreach (const QString &strId, m_groups.keys())
-        vboxGlobal().virtualBox().SetExtraDataStringList(strId, m_groups[strId]);
+        gEDataManager->setSelectorWindowGroupsDefinitions(strId, m_groups[strId]);
 
     /* Notify listeners about completeness: */