Changeset 66587 in vbox

Timestamp:

Apr 17, 2017 9:15:22 AM (8 years ago)

Author:

vboxsync

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

114614

Message:

FE/Qt: Get rid of VBoxGlobalSettings: Moving language ID handling into extra-data manager.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobalSettings.cpp (modified) (5 diffs)
• VBoxGlobalSettings.h (modified) (3 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (2 diffs)
• extradata/UIExtraDataManager.cpp (modified) (4 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsLanguage.cpp (modified) (3 diffs)

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

@@ -51 +51 @@
 {
     /* default settings */
-    languageId  = QString::null;
     maxGuestRes = QString::null;
     remapScancodes = QString::null;
@@ -60 +59 @@
 VBoxGlobalSettingsData::VBoxGlobalSettingsData (const VBoxGlobalSettingsData &that)
 {
-    languageId  = that.languageId;
     maxGuestRes = that.maxGuestRes;
     remapScancodes = that.remapScancodes;
@@ -74 +72 @@
 {
     return this == &that ||
-        (languageId  == that.languageId &&
-         maxGuestRes == that.maxGuestRes &&
+        (maxGuestRes == that.maxGuestRes &&
          remapScancodes == that.remapScancodes &&
          proxySettings == that.proxySettings &&
@@ -88 +85 @@
  */
 
-/* Defined in VBoxGlobal.cpp */
-extern const char *gVBoxLangIDRegExp;
-
 static struct
 {
@@ -100 +94 @@
 gPropertyMap[] =
 {
-    { "GUI/LanguageID",                            "languageId",              gVBoxLangIDRegExp, true },
     { "GUI/MaxGuestResolution",                    "maxGuestRes",             "\\d*[1-9]\\d*,\\d*[1-9]\\d*|any|auto", true },
     { "GUI/RemapScancodes",                        "remapScancodes",          "(\\d+=\\d+,)*\\d+=\\d+", true },

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

@@ -37 +37 @@
 private:
 
-    QString languageId;
     QString maxGuestRes;
     QString remapScancodes;
@@ -51 +50 @@
 {
     Q_OBJECT
-    Q_PROPERTY (QString languageId READ languageId WRITE setLanguageId)
     Q_PROPERTY (QString maxGuestRes READ maxGuestRes WRITE setMaxGuestRes)
     Q_PROPERTY (QString remapScancodes READ remapScancodes WRITE setRemapScancodes)
@@ -69 +67 @@
 
     // Properties
-
-    QString languageId() const { return data()->languageId; }
-    void setLanguageId (const QString &aLanguageId)
-    {
-        mData()->languageId = aLanguageId;
-    }
 
     QString maxGuestRes() const { return data()->maxGuestRes; }

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

@@ -27 +27 @@
 
 /* General: */
-const char* UIExtraDataDefs::GUI_LanguageId = "GUI/LanguageID";
 const char* UIExtraDataDefs::GUI_EventHandlingType = "GUI/EventHandlingType";
 
@@ -48 +47 @@
 const char* UIExtraDataDefs::GUI_RestrictedGlobalSettingsPages = "GUI/RestrictedGlobalSettingsPages";
 const char* UIExtraDataDefs::GUI_RestrictedMachineSettingsPages = "GUI/RestrictedMachineSettingsPages";
+
+/* Settings: Language: */
+const char* UIExtraDataDefs::GUI_LanguageID = "GUI/LanguageID";
 
 /* Settings: Display: */

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

@@ -32 +32 @@
     /** @name General
       * @{ */
-        /** VBox language ID. */
-        extern const char* GUI_LanguageId;
-
         /** Holds event handling type. */
         extern const char* GUI_EventHandlingType;
@@ -71 +68 @@
         /** Holds restricted Machine Settings pages. */
         extern const char* GUI_RestrictedMachineSettingsPages;
+    /** @} */
+
+    /** @name Settings: Language
+      * @{ */
+        /** Holds GUI language ID. */
+        extern const char* GUI_LanguageID;
     /** @} */
 

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

@@ -1947 +1947 @@
     return QStringList()
            << QString()
-           << GUI_LanguageId
            << GUI_EventHandlingType
            << GUI_SuppressMessages << GUI_InvertMessageOption
@@ -1954 +1953 @@
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
            << GUI_RestrictedGlobalSettingsPages << GUI_RestrictedMachineSettingsPages
+           << GUI_LanguageID
            << GUI_ActivateHoveredMachineWindow
            << GUI_Input_SelectorShortcuts << GUI_Input_MachineShortcuts
@@ -2337 +2337 @@
 }
 
+QString UIExtraDataManager::languageId()
+{
+    /* Load language ID: */
+    return extraDataString(GUI_LanguageID);
+}
+
+void UIExtraDataManager::setLanguageId(const QString &strLanguageId)
+{
+    /* Save language ID: */
+    setExtraDataString(GUI_LanguageID, strLanguageId);
+}
+
 bool UIExtraDataManager::activateHoveredMachineWindow()
 {
@@ -4051 +4063 @@
         {
             /* Language changed? */
-            if (strKey == GUI_LanguageId)
+            if (strKey == GUI_LanguageID)
                 emit sigLanguageChange(extraDataString(strKey));
             /* Selector UI shortcut changed? */

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

@@ -186 +186 @@
         /** Returns restricted machine settings pages. */
         QList<MachineSettingsPageType> restrictedMachineSettingsPages(const QString &strID);
+    /** @} */
+
+    /** @name Settings: Language
+      * @{ */
+        /** Returns the GUI language ID. */
+        QString languageId();
+        /** Defines the GUI @a strLanguageId. */
+        void setLanguageId(const QString &strLanguageId);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -4129 +4129 @@
 
     /* Load translation based on the user settings: */
-    QString sLanguageId = gset.languageId();
+    QString sLanguageId = gEDataManager->languageId();
     if (!sLanguageId.isNull())
         loadLanguage (sLanguageId);

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

@@ -28 +28 @@
 /* GUI includes: */
 # include "UIGlobalSettingsLanguage.h"
-# include "VBoxGlobalSettings.h"
+# include "UIExtraDataManager.h"
 # include "VBoxGlobal.h"
 
@@ -231 +231 @@
 
     /* Gather old language data: */
-    oldLanguageData.m_strLanguageId = m_settings.languageId();
+    oldLanguageData.m_strLanguageId = gEDataManager->languageId();
 
     /* Cache old language data: */
@@ -274 +274 @@
         /* Save new language data from the cache: */
         if (m_pCache->data().m_strLanguageId != m_pCache->base().m_strLanguageId)
-            m_settings.setLanguageId(m_pCache->data().m_strLanguageId);
+            gEDataManager->setLanguageId(m_pCache->data().m_strLanguageId);
     }