Changeset 66590 in vbox

Timestamp:

Apr 17, 2017 2:17:24 PM (8 years ago)

Author:

vboxsync

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

114617

Message:

FE/Qt: Get rid of VBoxGlobalSettings: Moving VBox proxy settings handling into extra-data manager.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobalSettings.cpp (modified) (4 diffs)
• VBoxGlobalSettings.h (modified) (3 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• net/UINetworkReply.cpp (modified) (2 diffs)
• settings/global/UIGlobalSettingsProxy.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp

@@ -51 +51 @@
 {
     /* default settings */
-    proxySettings = QString::null;
     hostScreenSaverDisabled = false;
 }
@@ -57 +56 @@
 VBoxGlobalSettingsData::VBoxGlobalSettingsData (const VBoxGlobalSettingsData &that)
 {
-    proxySettings = that.proxySettings;
     hostScreenSaverDisabled = that.hostScreenSaverDisabled;
 }
@@ -68 +66 @@
 {
     return this == &that ||
-        (proxySettings == that.proxySettings &&
-         hostScreenSaverDisabled == that.hostScreenSaverDisabled
+        (hostScreenSaverDisabled == that.hostScreenSaverDisabled
         );
 }
@@ -88 +85 @@
 gPropertyMap[] =
 {
-    { "GUI/ProxySettings",                         "proxySettings",           "[\\s\\S]*", true },
     { "GUI/HostScreenSaverDisabled",               "hostScreenSaverDisabled", "true|false", true }
 };

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h

@@ -37 +37 @@
 private:
 
-    QString proxySettings;
     bool hostScreenSaverDisabled;
 
@@ -48 +47 @@
 {
     Q_OBJECT
-    Q_PROPERTY (QString proxySettings READ proxySettings WRITE setProxySettings)
     Q_PROPERTY (bool hostScreenSaverDisabled READ hostScreenSaverDisabled WRITE setHostScreenSaverDisabled)
 
@@ -63 +61 @@
 
     // Properties
-
-    QString proxySettings() const { return data()->proxySettings; }
-    void setProxySettings (const QString &aProxySettings)
-    {
-        mData()->proxySettings = aProxySettings;
-    }
 
     bool hostScreenSaverDisabled() const { return data()->hostScreenSaverDisabled; }

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

@@ -61 +61 @@
 const char* UIExtraDataDefs::GUI_Input_AutoCapture = "GUI/Input/AutoCapture";
 const char* UIExtraDataDefs::GUI_RemapScancodes = "GUI/RemapScancodes";
+
+/* Settings: Proxy: */
+const char* UIExtraDataDefs::GUI_ProxySettings = "GUI/ProxySettings";
 
 /* Settings: Storage: */

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

@@ -96 +96 @@
         /** Holds Runtime UI remapped scan codes. */
         extern const char* GUI_RemapScancodes;
+    /** @} */
+
+    /** @name Settings: Proxy
+      * @{ */
+        /** Holds VBox proxy settings. */
+        extern const char* GUI_ProxySettings;
     /** @} */
 

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

@@ -2492 +2492 @@
 }
 
+QString UIExtraDataManager::proxySettings()
+{
+    return extraDataString(GUI_ProxySettings);
+}
+
+void UIExtraDataManager::setProxySettings(const QString &strSettings)
+{
+    setExtraDataString(GUI_ProxySettings, strSettings);
+}
+
 QString UIExtraDataManager::recentFolderForHardDrives()
 {

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

@@ -231 +231 @@
         /** Returns the Runtime UI remapped scan codes. */
         QString remappedScanCodes();
+    /** @} */
+
+    /** @name Settings: Proxy
+      * @{ */
+        /** Returns VBox proxy settings. */
+        QString proxySettings();
+        /** Defines VBox proxy @a strSettings. */
+        void setProxySettings(const QString &strSettings);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp

@@ -31 +31 @@
 # include "UINetworkReply.h"
 # include "UINetworkManager.h"
+# include "UIExtraDataManager.h"
 # ifndef VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
 #  include "VBoxGlobal.h"
@@ -387 +388 @@
 #ifndef VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
     /* Get the proxy-manager: */
-    UIProxyManager proxyManager(vboxGlobal().settings().proxySettings());
+    UIProxyManager proxyManager(gEDataManager->proxySettings());
 
     /* If the specific proxy settings are enabled, we'll use them

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

@@ -26 +26 @@
 # include "QIWidgetValidator.h"
 # include "UIGlobalSettingsProxy.h"
+# include "UIExtraDataManager.h"
 # include "VBoxUtils.h"
 
@@ -90 +91 @@
 
     /* Gather old proxy data: */
-    UIProxyManager proxyManager(m_settings.proxySettings());
+    UIProxyManager proxyManager(gEDataManager->proxySettings());
     oldProxyData.m_enmProxyState = proxyManager.proxyState();
     oldProxyData.m_strProxyHost = proxyManager.proxyHost();
@@ -151 +152 @@
         proxyManager.setProxyHost(m_pCache->data().m_strProxyHost);
         proxyManager.setProxyPort(m_pCache->data().m_strProxyPort);
-        m_settings.setProxySettings(proxyManager.toString());
+        gEDataManager->setProxySettings(proxyManager.toString());
     }