Changeset 51768 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 1, 2014 1:11:22 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Details-pane: Load/Save settings as part of prepare/cleanup logic only.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details

Files:

• UIGDetailsGroup.cpp (modified) (3 diffs)
• UIGDetailsGroup.h (modified) (3 diffs)
• UIGDetailsModel.cpp (modified) (7 diffs)
• UIGDetailsModel.h (modified) (3 diffs)

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

@@ -66 +66 @@
 void UIGDetailsGroup::rebuildGroup()
 {
-    /* Load settings: */
-    loadSettings();
-
     /* Cleanup build-step: */
     delete m_pBuildStep;
@@ -111 +108 @@
 
         /* Build set: */
-        pSet->buildSet(m_machineItems[iStepNumber], m_machineItems.size() == 1, m_settings);
+        pSet->buildSet(m_machineItems[iStepNumber], m_machineItems.size() == 1, model()->settings());
     }
     else
@@ -191 +188 @@
     connect(this, SIGNAL(sigMinimumHeightHintChanged(int)),
             model(), SIGNAL(sigRootItemMinimumHeightHintChanged(int)));
-}
-
-void UIGDetailsGroup::loadSettings()
-{
-    /* Load settings: */
-    m_settings = gEDataManager->selectorWindowDetailsElements();
-    /* If settings are empty: */
-    if (m_settings.isEmpty())
-    {
-        /* Propose the defaults: */
-        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: */
@@ -82 +81 @@
     /* Helpers: Prepare stuff: */
     void prepareConnections();
-    void loadSettings();
 
     /* Helpers: Layout stuff: */
@@ -97 +95 @@
     UIBuildStep *m_pBuildStep;
     QString m_strGroupId;
-    QMap<DetailsElementType, bool> m_settings;
 
     /* Friends: */

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

@@ -43 +43 @@
     prepareRoot();
 
+    /* Load settings: */
+    loadSettings();
+
     /* Register meta-type: */
     qRegisterMetaType<DetailsElementType>();
@@ -49 +52 @@
 UIGDetailsModel::~UIGDetailsModel()
 {
+    /* Save settings: */
+    saveSettings();
+
     /* Cleanup root: */
     cleanupRoot();
@@ -157 +163 @@
     updateLayout();
 
-    /* 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);
-    }
+    /* Update element open/close status: */
+    if (m_settings.contains(type))
+        m_settings[type] = fToggled;
 }
 
@@ -175 +174 @@
     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);
+    /* Toggle element visibility status: */
+    if (m_settings.contains(type))
+        m_settings.remove(type);
     else
-        settings[type] = true;
-    /* Save elements settings back: */
-    gEDataManager->setSelectorWindowDetailsElements(settings);
+        m_settings[type] = true;
 
     /* Rebuild group: */
@@ -223 +218 @@
 {
     m_pRoot = new UIGDetailsGroup(scene());
+}
+
+void UIGDetailsModel::loadSettings()
+{
+    /* Load settings: */
+    m_settings = gEDataManager->selectorWindowDetailsElements();
+}
+
+void UIGDetailsModel::saveSettings()
+{
+    /* If settings are empty: */
+    if (m_settings.isEmpty())
+    {
+        /* Propose the defaults: */
+        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;
+    }
+
+    /* Save settings: */
+    gEDataManager->setSelectorWindowDetailsElements(m_settings);
 }
 
@@ -260 +283 @@
     /* Prepare context-menu: */
     QMenu contextMenu;
-    /* Load elements settings: */
-    QMap<DetailsElementType, bool> settings = gEDataManager->selectorWindowDetailsElements();
+    /* Enumerate elements settings: */
     for (int iType = DetailsElementType_General; iType <= DetailsElementType_Description; ++iType)
     {
@@ -267 +289 @@
         QAction *pAction = contextMenu.addAction(gpConverter->toString(currentElementType), this, SLOT(sltElementTypeToggled()));
         pAction->setCheckable(true);
-        pAction->setChecked(settings.contains(currentElementType));
+        pAction->setChecked(m_settings.contains(currentElementType));
         pAction->setData(QVariant::fromValue(currentElementType));
     }

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

@@ -73 +73 @@
     void setItems(const QList<UIVMItem*> &items);
 
+    /** Returns the details settings. */
+    const QMap<DetailsElementType, bool>& settings() const { return m_settings; }
+
 private slots:
 
@@ -103 +106 @@
     void prepareScene();
     void prepareRoot();
+    void loadSettings();
 
     /* Helpers: Cleanup stuff: */
+    void saveSettings();
     void cleanupRoot();
     void cleanupScene();
@@ -118 +123 @@
     UIGDetailsGroup *m_pRoot;
     UIGDetailsElementAnimationCallback *m_pAnimationCallback;
+    /** Holds the details settings. */
+    QMap<DetailsElementType, bool> m_settings;
 };