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

Timestamp:

Feb 8, 2017 4:06:25 PM (8 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• UIGlobalSettingsProxy.cpp (modified) (5 diffs)
• UIGlobalSettingsProxy.h (modified) (2 diffs)

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

@@ -59 +59 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Load to cache: */
+    /* Clear cache initially: */
+    m_cache.clear();
+
+    /* Prepare old data: */
+    UIDataSettingsGlobalProxy oldData;
+
+    /* Gather old data: */
     UIProxyManager proxyManager(m_settings.proxySettings());
-    m_cache.m_enmProxyState = proxyManager.proxyState();
-    m_cache.m_strProxyHost = proxyManager.proxyHost();
-    m_cache.m_strProxyPort = proxyManager.proxyPort();
+    oldData.m_enmProxyState = proxyManager.proxyState();
+    oldData.m_strProxyHost = proxyManager.proxyHost();
+    oldData.m_strProxyPort = proxyManager.proxyPort();
+
+    /* Cache old data: */
+    m_cache.cacheInitialData(oldData);
 
     /* Upload properties & settings to data: */
@@ -71 +80 @@
 void UIGlobalSettingsProxy::getFromCache()
 {
-    /* Fetch from cache: */
-    switch (m_cache.m_enmProxyState)
+    /* Get old data from cache: */
+    const UIDataSettingsGlobalProxy &oldData = m_cache.base();
+
+    /* Load old data from cache: */
+    switch (oldData.m_enmProxyState)
     {
         case UIProxyManager::ProxyState_Auto:     m_pRadioProxyAuto->setChecked(true); break;
@@ -78 +90 @@
         case UIProxyManager::ProxyState_Enabled:  m_pRadioProxyEnabled->setChecked(true); break;
     }
-    m_pHostEditor->setText(m_cache.m_strProxyHost);
-    m_pPortEditor->setText(m_cache.m_strProxyPort);
+    m_pHostEditor->setText(oldData.m_strProxyHost);
+    m_pPortEditor->setText(oldData.m_strProxyPort);
     sltProxyToggled();
 
@@ -88 +100 @@
 void UIGlobalSettingsProxy::putToCache()
 {
-    /* Upload to cache: */
-    m_cache.m_enmProxyState = m_pRadioProxyEnabled->isChecked()  ? UIProxyManager::ProxyState_Enabled :
+    /* Prepare new data: */
+    UIDataSettingsGlobalProxy newData = m_cache.base();
+
+    /* Gather new data: */
+    newData.m_enmProxyState = m_pRadioProxyEnabled->isChecked()  ? UIProxyManager::ProxyState_Enabled :
                               m_pRadioProxyDisabled->isChecked() ? UIProxyManager::ProxyState_Disabled :
                                                                    UIProxyManager::ProxyState_Auto;
-    m_cache.m_strProxyHost = m_pHostEditor->text();
-    m_cache.m_strProxyPort = m_pPortEditor->text();
+    newData.m_strProxyHost = m_pHostEditor->text();
+    newData.m_strProxyPort = m_pPortEditor->text();
+
+    /* Cache new data: */
+    m_cache.cacheCurrentData(newData);
 }
 
@@ -101 +119 @@
     UISettingsPageGlobal::fetchData(data);
 
-    /* Save from cache: */
-    UIProxyManager proxyManager;
-    proxyManager.setProxyState(m_cache.m_enmProxyState);
-    proxyManager.setProxyHost(m_cache.m_strProxyHost);
-    proxyManager.setProxyPort(m_cache.m_strProxyPort);
-    m_settings.setProxySettings(proxyManager.toString());
+    /* Save new data from cache: */
+    if (m_cache.wasChanged())
+    {
+        UIProxyManager proxyManager;
+        proxyManager.setProxyState(m_cache.data().m_enmProxyState);
+        proxyManager.setProxyHost(m_cache.data().m_strProxyHost);
+        proxyManager.setProxyPort(m_cache.data().m_strProxyPort);
+        m_settings.setProxySettings(proxyManager.toString());
+    }
 
     /* Upload properties & settings to data: */

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

@@ -25 +25 @@
 
 
-/** Global settings: Proxy page cache structure. */
-struct UISettingsCacheGlobalProxy
+/** Global settings: Proxy page data structure. */
+struct UIDataSettingsGlobalProxy
 {
     /** Constructs data. */
-    UISettingsCacheGlobalProxy()
+    UIDataSettingsGlobalProxy()
         : m_enmProxyState(UIProxyManager::ProxyState_Auto)
         , m_strProxyHost(QString())
         , m_strProxyPort(QString())
     {}
+
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool equal(const UIDataSettingsGlobalProxy &other) const
+    {
+        return true
+               && (m_enmProxyState == other.m_enmProxyState)
+               && (m_strProxyHost == other.m_strProxyHost)
+               && (m_strProxyPort == other.m_strProxyPort)
+               ;
+    }
+
+    /** Returns whether the @a other passed data is equal to this one. */
+    bool operator==(const UIDataSettingsGlobalProxy &other) const { return equal(other); }
+    /** Returns whether the @a other passed data is different from this one. */
+    bool operator!=(const UIDataSettingsGlobalProxy &other) const { return !equal(other); }
 
     /** Holds the proxy state. */
@@ -42 +57 @@
     QString m_strProxyPort;
 };
+typedef UISettingsCache<UIDataSettingsGlobalProxy> UISettingsCacheGlobalProxy;