Changeset 51532 in vbox

Timestamp:

Jun 4, 2014 3:07:21 PM (11 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• selector/graphics/details/UIGDetailsGroup.cpp (modified) (2 diffs)
• selector/graphics/details/UIGDetailsGroup.h (modified) (2 diffs)
• selector/graphics/details/UIGDetailsModel.cpp (modified) (5 diffs)
• selector/graphics/details/UIGDetailsSet.cpp (modified) (4 diffs)
• selector/graphics/details/UIGDetailsSet.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -747 +747 @@
 template<> DetailsElementType fromString<DetailsElementType>(const QString &strDetailsElementType)
 {
-    QHash<QString, DetailsElementType> list;
-    list.insert(QApplication::translate("VBoxGlobal", "General", "DetailsElementType"),        DetailsElementType_General);
-    list.insert(QApplication::translate("VBoxGlobal", "Preview", "DetailsElementType"),        DetailsElementType_Preview);
-    list.insert(QApplication::translate("VBoxGlobal", "System", "DetailsElementType"),         DetailsElementType_System);
-    list.insert(QApplication::translate("VBoxGlobal", "Display", "DetailsElementType"),        DetailsElementType_Display);
-    list.insert(QApplication::translate("VBoxGlobal", "Storage", "DetailsElementType"),        DetailsElementType_Storage);
-    list.insert(QApplication::translate("VBoxGlobal", "Audio", "DetailsElementType"),          DetailsElementType_Audio);
-    list.insert(QApplication::translate("VBoxGlobal", "Network", "DetailsElementType"),        DetailsElementType_Network);
-    list.insert(QApplication::translate("VBoxGlobal", "Serial ports", "DetailsElementType"),   DetailsElementType_Serial);
+    /* Here we have some fancy stuff allowing us
+     * to search through the keys using 'case-insensitive' rule: */
+    QStringList keys;                                                                      QList<DetailsElementType> values;
+    keys << QApplication::translate("VBoxGlobal", "General", "DetailsElementType");        values << DetailsElementType_General;
+    keys << QApplication::translate("VBoxGlobal", "Preview", "DetailsElementType");        values << DetailsElementType_Preview;
+    keys << QApplication::translate("VBoxGlobal", "System", "DetailsElementType");         values << DetailsElementType_System;
+    keys << QApplication::translate("VBoxGlobal", "Display", "DetailsElementType");        values << DetailsElementType_Display;
+    keys << QApplication::translate("VBoxGlobal", "Storage", "DetailsElementType");        values << DetailsElementType_Storage;
+    keys << QApplication::translate("VBoxGlobal", "Audio", "DetailsElementType");          values << DetailsElementType_Audio;
+    keys << QApplication::translate("VBoxGlobal", "Network", "DetailsElementType");        values << DetailsElementType_Network;
+    keys << QApplication::translate("VBoxGlobal", "Serial ports", "DetailsElementType");   values << DetailsElementType_Serial;
 #ifdef VBOX_WITH_PARALLEL_PORTS
-    list.insert(QApplication::translate("VBoxGlobal", "Parallel ports", "DetailsElementType"), DetailsElementType_Parallel);
+    keys << QApplication::translate("VBoxGlobal", "Parallel ports", "DetailsElementType"); values << DetailsElementType_Parallel;
 #endif /* VBOX_WITH_PARALLEL_PORTS */
-    list.insert(QApplication::translate("VBoxGlobal", "USB", "DetailsElementType"),            DetailsElementType_USB);
-    list.insert(QApplication::translate("VBoxGlobal", "Shared folders", "DetailsElementType"), DetailsElementType_SF);
-    list.insert(QApplication::translate("VBoxGlobal", "Description", "DetailsElementType"),    DetailsElementType_Description);
-    if (!list.contains(strDetailsElementType))
-    {
-        AssertMsgFailed(("No value for '%s'", strDetailsElementType.toAscii().constData()));
-    }
-    return list.value(strDetailsElementType);
+    keys << QApplication::translate("VBoxGlobal", "USB", "DetailsElementType");            values << DetailsElementType_USB;
+    keys << QApplication::translate("VBoxGlobal", "Shared folders", "DetailsElementType"); values << DetailsElementType_SF;
+    keys << QApplication::translate("VBoxGlobal", "Description", "DetailsElementType");    values << DetailsElementType_Description;
+    /* Invalid type for unknown words: */
+    if (!keys.contains(strDetailsElementType, Qt::CaseInsensitive))
+        return DetailsElementType_Invalid;
+    /* Corresponding type for known words: */
+    return values.at(keys.indexOf(QRegExp(strDetailsElementType, Qt::CaseInsensitive)));
 }
 
@@ -801 +803 @@
 template<> DetailsElementType fromInternalString<DetailsElementType>(const QString &strDetailsElementType)
 {
-    QHash<QString, DetailsElementType> list;
-    list.insert("general",       DetailsElementType_General);
-    list.insert("preview",       DetailsElementType_Preview);
-    list.insert("system",        DetailsElementType_System);
-    list.insert("display",       DetailsElementType_Display);
-    list.insert("storage",       DetailsElementType_Storage);
-    list.insert("audio",         DetailsElementType_Audio);
-    list.insert("network",       DetailsElementType_Network);
-    list.insert("serialPorts",   DetailsElementType_Serial);
+    /* Here we have some fancy stuff allowing us
+     * to search through the keys using 'case-insensitive' rule: */
+    QStringList keys;        QList<DetailsElementType> values;
+    keys << "general";       values << DetailsElementType_General;
+    keys << "preview";       values << DetailsElementType_Preview;
+    keys << "system";        values << DetailsElementType_System;
+    keys << "display";       values << DetailsElementType_Display;
+    keys << "storage";       values << DetailsElementType_Storage;
+    keys << "audio";         values << DetailsElementType_Audio;
+    keys << "network";       values << DetailsElementType_Network;
+    keys << "serialPorts";   values << DetailsElementType_Serial;
 #ifdef VBOX_WITH_PARALLEL_PORTS
-    list.insert("parallelPorts", DetailsElementType_Parallel);
+    keys << "parallelPorts"; values << DetailsElementType_Parallel;
 #endif /* VBOX_WITH_PARALLEL_PORTS */
-    list.insert("usb",           DetailsElementType_USB);
-    list.insert("sharedFolders", DetailsElementType_SF);
-    list.insert("description",   DetailsElementType_Description);
-    if (!list.contains(strDetailsElementType))
-    {
-        AssertMsgFailed(("No value for '%s'", strDetailsElementType.toAscii().constData()));
-    }
-    return list.value(strDetailsElementType);
+    keys << "usb";           values << DetailsElementType_USB;
+    keys << "sharedFolders"; values << DetailsElementType_SF;
+    keys << "description";   values << DetailsElementType_Description;
+    /* Invalid type for unknown words: */
+    if (!keys.contains(strDetailsElementType, Qt::CaseInsensitive))
+        return DetailsElementType_Invalid;
+    /* Corresponding type for known words: */
+    return values.at(keys.indexOf(QRegExp(strDetailsElementType, Qt::CaseInsensitive)));
 }
 

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

@@ -210 +210 @@
 enum DetailsElementType
 {
+    DetailsElementType_Invalid,
     DetailsElementType_General,
     DetailsElementType_System,

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

@@ -427 +427 @@
 }
 
+QMap<DetailsElementType, bool> UIExtraDataManager::selectorWindowDetailsElements()
+{
+    /* Load corresponding extra-data: */
+    const QStringList data = extraDataStringList(GUI_DetailsPageBoxes);
+
+    /* Prepare elements: */
+    QMap<DetailsElementType, bool> elements;
+    /* Enumerate all the data items: */
+    foreach (QString strItem, data)
+    {
+        bool fOpened = true;
+        if (strItem.endsWith("Closed", Qt::CaseInsensitive))
+        {
+            fOpened = false;
+            strItem.remove("Closed");
+        }
+        DetailsElementType type = gpConverter->fromInternalString<DetailsElementType>(strItem);
+        if (type != DetailsElementType_Invalid)
+            elements[type] = fOpened;
+    }
+
+    /* Return elements: */
+    return elements;
+}
+
+void UIExtraDataManager::setSelectorWindowDetailsElements(const QMap<DetailsElementType, bool> &elements)
+{
+    /* Prepare corresponding extra-data: */
+    QStringList data;
+
+    /* Searialize passed elements: */
+    foreach (DetailsElementType type, elements.keys())
+    {
+        QString strValue = gpConverter->toInternalString(type);
+        if (!elements[type])
+            strValue += "Closed";
+        data << strValue;
+    }
+
+    /* Save corresponding extra-data: */
+    setExtraDataStringList(GUI_DetailsPageBoxes, data);
+}
+
 PreviewUpdateIntervalType UIExtraDataManager::selectorWindowPreviewUpdateInterval() const
 {

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

@@ -151 +151 @@
     /** Defines whether selector-window status-bar @a fVisible. */
     void setSelectorWindowStatusBarVisible(bool fVisible);
+
+    /** Returns selector-window details-pane elements. */
+    QMap<DetailsElementType, bool> selectorWindowDetailsElements();
+    /** Defines selector-window details-pane @a elements. */
+    void setSelectorWindowDetailsElements(const QMap<DetailsElementType, bool> &elements);
 
     /** Returns selector-window preview update interval. */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.cpp

@@ -25 +25 @@
 #include "UIGDetailsSet.h"
 #include "UIGDetailsModel.h"
-#include "UIConverter.h"
+#include "UIExtraDataManager.h"
 #include "VBoxGlobal.h"
 #include "UIVMItem.h"
@@ -196 +196 @@
 {
     /* Load settings: */
-    m_settings = vboxGlobal().virtualBox().GetExtraDataStringList(GUI_DetailsPageBoxes);
+    m_settings = gEDataManager->selectorWindowDetailsElements();
     /* If settings are empty: */
     if (m_settings.isEmpty())
     {
         /* Propose the defaults: */
-        m_settings << gpConverter->toInternalString(DetailsElementType_General);
-        m_settings << gpConverter->toInternalString(DetailsElementType_Preview);
-        m_settings << gpConverter->toInternalString(DetailsElementType_System);
-        m_settings << gpConverter->toInternalString(DetailsElementType_Display);
-        m_settings << gpConverter->toInternalString(DetailsElementType_Storage);
-        m_settings << gpConverter->toInternalString(DetailsElementType_Audio);
-        m_settings << gpConverter->toInternalString(DetailsElementType_Network);
-        m_settings << gpConverter->toInternalString(DetailsElementType_USB);
-        m_settings << gpConverter->toInternalString(DetailsElementType_SF);
-        m_settings << gpConverter->toInternalString(DetailsElementType_Description);
-        vboxGlobal().virtualBox().SetExtraDataStringList(GUI_DetailsPageBoxes, m_settings);
+        m_settings[DetailsElementType_General] = true;
+        m_settings[DetailsElementType_Preview] = true;
+        m_settings[DetailsElementType_System] = true;
+        m_settings[DetailsElementType_Display] = true;
+        m_settings[DetailsElementType_Storage] = true;
+        m_settings[DetailsElementType_Audio] = true;
+        m_settings[DetailsElementType_Network] = true;
+        m_settings[DetailsElementType_USB] = true;
+        m_settings[DetailsElementType_SF] = true;
+        m_settings[DetailsElementType_Description] = true;
+        gEDataManager->setSelectorWindowDetailsElements(m_settings);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.h

@@ -22 +22 @@
 /* GUI includes: */
 #include "UIGDetailsItem.h"
+#include "UIExtraDataDefs.h"
 
 /* Forward declarations: */
@@ -96 +97 @@
     UIBuildStep *m_pBuildStep;
     QString m_strGroupId;
-    QStringList m_settings;
+    QMap<DetailsElementType, bool> m_settings;
 
     /* Friends: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.cpp

@@ -27 +27 @@
 #include "UIGDetailsGroup.h"
 #include "UIGDetailsElement.h"
+#include "UIExtraDataManager.h"
 #include "VBoxGlobal.h"
 #include "UIConverter.h"
@@ -156 +157 @@
     updateLayout();
 
-    /* Update details settings: */
-    QStringList detailsSettings = vboxGlobal().virtualBox().GetExtraDataStringList(GUI_DetailsPageBoxes);
-    QString strOldElementName = gpConverter->toInternalString(type);
-    QString strNewElementName = strOldElementName;
-    if (fToggled)
-        strOldElementName += "Closed";
-    else
-        strNewElementName += "Closed";
-    int iIndex = detailsSettings.indexOf(strOldElementName);
-    if (iIndex != -1)
-    {
-        detailsSettings[iIndex] = strNewElementName;
-        vboxGlobal().virtualBox().SetExtraDataStringList(GUI_DetailsPageBoxes, detailsSettings);
+    /* Load elements settings to modify: */
+    QMap<DetailsElementType, bool> settings = gEDataManager->selectorWindowDetailsElements();
+    /* If setting for corresponding element type exists: */
+    if (settings.contains(type))
+    {
+        /* Update element open/close status: */
+        settings[type] = fToggled;
+        /* Save elements settings back: */
+        gEDataManager->setSelectorWindowDetailsElements(settings);
     }
 }
@@ -176 +173 @@
     /* Which item was toggled? */
     QAction *pAction = qobject_cast<QAction*>(sender());
-    DetailsElementType elementType = pAction->data().value<DetailsElementType>();
-    QString strElementTypeOpened = gpConverter->toInternalString(elementType);
-    QString strElementTypeClosed = strElementTypeOpened + "Closed";
-    QStringList detailsSettings = vboxGlobal().virtualBox().GetExtraDataStringList(GUI_DetailsPageBoxes);
-    /* Update details settings: */
-    bool fElementExists = detailsSettings.contains(strElementTypeOpened) ||
-                          detailsSettings.contains(strElementTypeClosed);
-    if (fElementExists)
-    {
-        detailsSettings.removeAll(strElementTypeOpened);
-        detailsSettings.removeAll(strElementTypeClosed);
-    }
+    DetailsElementType type = pAction->data().value<DetailsElementType>();
+
+    /* Load elements settings to modify: */
+    QMap<DetailsElementType, bool> settings = gEDataManager->selectorWindowDetailsElements();
+    /* Toggle element visibility setting: */
+    if (settings.contains(type))
+        settings.remove(type);
     else
-    {
-        detailsSettings.append(strElementTypeOpened);
-    }
-    vboxGlobal().virtualBox().SetExtraDataStringList(GUI_DetailsPageBoxes, detailsSettings);
+        settings[type] = true;
+    /* Save elements settings back: */
+    gEDataManager->setSelectorWindowDetailsElements(settings);
+
+    /* Rebuild group: */
     m_pRoot->rebuildGroup();
 }
@@ -267 +260 @@
     /* Prepare context-menu: */
     QMenu contextMenu;
-    QStringList detailsSettings = vboxGlobal().virtualBox().GetExtraDataStringList(GUI_DetailsPageBoxes);
+    /* Load elements settings: */
+    QMap<DetailsElementType, bool> settings = gEDataManager->selectorWindowDetailsElements();
     for (int iType = DetailsElementType_General; iType <= DetailsElementType_Description; ++iType)
     {
@@ -273 +267 @@
         QAction *pAction = contextMenu.addAction(gpConverter->toString(currentElementType), this, SLOT(sltElementTypeToggled()));
         pAction->setCheckable(true);
-        QString strTypeIdOpened = gpConverter->toInternalString(currentElementType);
-        QString strTypeIdClosed = strTypeIdOpened + "Closed";
-        pAction->setChecked(detailsSettings.contains(strTypeIdOpened) || detailsSettings.contains(strTypeIdClosed));
+        pAction->setChecked(settings.contains(currentElementType));
         pAction->setData(QVariant::fromValue(currentElementType));
     }

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp

@@ -23 +23 @@
 #include "UIGDetailsElements.h"
 #include "UIVMItem.h"
-#include "UIConverter.h"
 #include "UIVirtualBoxEventHandler.h"
 #include "VBoxGlobal.h"
@@ -59 +58 @@
 }
 
-void UIGDetailsSet::buildSet(UIVMItem *pMachineItem, bool fFullSet, const QStringList &settings)
+void UIGDetailsSet::buildSet(UIVMItem *pMachineItem, bool fFullSet, const QMap<DetailsElementType, bool> &settings)
 {
     /* Remember passed arguments: */
@@ -100 +99 @@
     const CUSBDeviceFilters &filters = m_machine.GetUSBDeviceFilters();
     if (filters.isNull() || !m_machine.GetUSBProxyAvailable())
-    {
-        QString strElementTypeOpened = gpConverter->toInternalString(DetailsElementType_USB);
-        QString strElementTypeClosed = strElementTypeOpened + "Closed";
-        m_settings.removeAll(strElementTypeOpened);
-        m_settings.removeAll(strElementTypeClosed);
-    }
+        m_settings.remove(DetailsElementType_USB);
 
     /* Start building set: */
@@ -126 +120 @@
         /* Load details settings: */
         DetailsElementType elementType = (DetailsElementType)iStepNumber;
-        QString strElementTypeOpened = gpConverter->toInternalString(elementType);
-        QString strElementTypeClosed = strElementTypeOpened + "Closed";
         /* Should the element be visible? */
-        bool fVisible = m_settings.contains(strElementTypeOpened) || m_settings.contains(strElementTypeClosed);
+        bool fVisible = m_settings.contains(elementType);
         /* Should the element be opened? */
-        bool fOpen = m_settings.contains(strElementTypeOpened);
+        bool fOpen = fVisible && m_settings[elementType];
 
         /* Check if element is present already: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.h

@@ -52 +52 @@
 
     /* API: Build stuff: */
-    void buildSet(UIVMItem *pMachineItem, bool fFullSet, const QStringList &settings);
+    void buildSet(UIVMItem *pMachineItem, bool fFullSet, const QMap<DetailsElementType, bool> &settings);
 
     /* API: Machine stuff: */
@@ -123 +123 @@
     int m_iLastStepNumber;
     QString m_strSetId;
-    QStringList m_settings;
+    QMap<DetailsElementType, bool> m_settings;
 };