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

Timestamp:

Feb 8, 2017 3:42:47 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Global preferences: General page: Integrate settings caching.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsGeneral.cpp (modified) (3 diffs)
• UIGlobalSettingsGeneral.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp

@@ -53 +53 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Load to cache: */
-    m_cache.m_strDefaultMachineFolder = m_properties.GetDefaultMachineFolder();
-    m_cache.m_strVRDEAuthLibrary = m_properties.GetVRDEAuthLibrary();
-    m_cache.m_fHostScreenSaverDisabled = m_settings.hostScreenSaverDisabled();
+    /* Clear cache initially: */
+    m_cache.clear();
+
+    /* Prepare old data: */
+    UIDataSettingsGlobalGeneral oldData;
+
+    /* Gather old data: */
+    oldData.m_strDefaultMachineFolder = m_properties.GetDefaultMachineFolder();
+    oldData.m_strVRDEAuthLibrary = m_properties.GetVRDEAuthLibrary();
+    oldData.m_fHostScreenSaverDisabled = m_settings.hostScreenSaverDisabled();
+
+    /* Cache old data: */
+    m_cache.cacheInitialData(oldData);
 
     /* Upload properties & settings to data: */
@@ -64 +73 @@
 void UIGlobalSettingsGeneral::getFromCache()
 {
-    /* Fetch from cache: */
-    m_pSelectorMachineFolder->setPath(m_cache.m_strDefaultMachineFolder);
-    m_pSelectorVRDPLibName->setPath(m_cache.m_strVRDEAuthLibrary);
-    m_pCheckBoxHostScreenSaver->setChecked(m_cache.m_fHostScreenSaverDisabled);
+    /* Get old data from cache: */
+    const UIDataSettingsGlobalGeneral &oldData = m_cache.base();
+
+    /* Load old data from cache: */
+    m_pSelectorMachineFolder->setPath(oldData.m_strDefaultMachineFolder);
+    m_pSelectorVRDPLibName->setPath(oldData.m_strVRDEAuthLibrary);
+    m_pCheckBoxHostScreenSaver->setChecked(oldData.m_fHostScreenSaverDisabled);
 }
 
 void UIGlobalSettingsGeneral::putToCache()
 {
-    /* Upload to cache: */
-    m_cache.m_strDefaultMachineFolder = m_pSelectorMachineFolder->path();
-    m_cache.m_strVRDEAuthLibrary = m_pSelectorVRDPLibName->path();
-    m_cache.m_fHostScreenSaverDisabled = m_pCheckBoxHostScreenSaver->isChecked();
+    /* Prepare new data: */
+    UIDataSettingsGlobalGeneral newData = m_cache.base();
+
+    /* Gather new data: */
+    newData.m_strDefaultMachineFolder = m_pSelectorMachineFolder->path();
+    newData.m_strVRDEAuthLibrary = m_pSelectorVRDPLibName->path();
+    newData.m_fHostScreenSaverDisabled = m_pCheckBoxHostScreenSaver->isChecked();
+
+    /* Cache new data: */
+    m_cache.cacheCurrentData(newData);
 }
 
@@ -83 +101 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Save from cache: */
-    if (m_properties.isOk() && m_pSelectorMachineFolder->isModified())
-        m_properties.SetDefaultMachineFolder(m_cache.m_strDefaultMachineFolder);
-    if (m_properties.isOk() && m_pSelectorVRDPLibName->isModified())
-        m_properties.SetVRDEAuthLibrary(m_cache.m_strVRDEAuthLibrary);
-    m_settings.setHostScreenSaverDisabled(m_cache.m_fHostScreenSaverDisabled);
+    /* Save new data from cache: */
+    if (m_cache.wasChanged())
+    {
+        if (   m_properties.isOk()
+            && m_cache.data().m_strDefaultMachineFolder != m_cache.base().m_strDefaultMachineFolder)
+            m_properties.SetDefaultMachineFolder(m_cache.data().m_strDefaultMachineFolder);
+        if (   m_properties.isOk()
+            && m_cache.data().m_strVRDEAuthLibrary != m_cache.base().m_strVRDEAuthLibrary)
+            m_properties.SetVRDEAuthLibrary(m_cache.data().m_strVRDEAuthLibrary);
+        if (m_cache.data().m_fHostScreenSaverDisabled != m_cache.base().m_fHostScreenSaverDisabled)
+            m_settings.setHostScreenSaverDisabled(m_cache.data().m_fHostScreenSaverDisabled);
+    }
 
     /* Upload properties & settings to data: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h

@@ -24 +24 @@
 
 
-/** Global settings: General page cache structure. */
-struct UISettingsCacheGlobalGeneral
+/** Global settings: General page data structure. */
+struct UIDataSettingsGlobalGeneral
 {
+    /** Constructs data. */
+    UIDataSettingsGlobalGeneral()
+        : m_strDefaultMachineFolder(QString())
+        , m_strVRDEAuthLibrary(QString())
+        , m_fHostScreenSaverDisabled(false)
+    {}
+
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool equal(const UIDataSettingsGlobalGeneral &other) const
+    {
+        return true
+               && (m_strDefaultMachineFolder == other.m_strDefaultMachineFolder)
+               && (m_strVRDEAuthLibrary == other.m_strVRDEAuthLibrary)
+               && (m_fHostScreenSaverDisabled == other.m_fHostScreenSaverDisabled)
+               ;
+    }
+
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool operator==(const UIDataSettingsGlobalGeneral &other) const { return equal(other); }
+    /** Returns whether the @a other passed data is different from this one. */
+    bool operator!=(const UIDataSettingsGlobalGeneral &other) const { return !equal(other); }
+
     /** Holds the default machine folder path. */
     QString m_strDefaultMachineFolder;
@@ -34 +56 @@
     bool m_fHostScreenSaverDisabled;
 };
+typedef UISettingsCache<UIDataSettingsGlobalGeneral> UISettingsCacheGlobalGeneral;