Changeset 2022 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Apr 11, 2007 7:25:07 AM (18 years ago)

Author:

vboxsync

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

20314

Message:

1908: UI for language selection:
Feature implemented with minor changes in design.

Base Feature description:

1. Default system language is loading during VBox starting.
2. After that, predefined user language (pointed in VBox configuration file, GUI/LanguageID key) is loading during VBox initializing.
3. User can switch one language to another from the Global Settings interface language list. Language change applying just after the Global Settings dialog will be closed.
4. If the configuration file has the local language predefined (en_US) and this language is not presented in necessary *.qm file then the global language similar to local will be applied (en), but the settings for local language will be left in the configuration file. Configuration file will be rewritten with this new global language selected only if the user changes language in the selection list himself.
5. If naiver local language pointed in configuration file nor global language similar to local could be found then the user will be proposed with this fact and asked for changing language to built-in.

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxGlobal.h (modified) (2 diffs)
• VMGlobalSettings.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -375 +375 @@
     bool openURL (const QString &aURL);
 
+    static const QString& languageID();
+    static void loadLanguage (const QString &aLangId = QString::null);
+    static bool loadLanguageFile (const QString &);
+
     QString languageName() const;
     QString languageCountry() const;
@@ -506 +510 @@
 
     QString verString;
+
+    static QString mLoadedLangId;
 
     QValueVector <CGuestOSType> vm_os_types;

trunk/src/VBox/Frontends/VirtualBox/include/VMGlobalSettings.h

@@ -44 +44 @@
     bool autoCapture;
     QString guiFeatures;
+    QString languageId;
 
     friend class VMGlobalSettings;
@@ -56 +57 @@
     Q_PROPERTY (bool autoCapture READ autoCapture WRITE setAutoCapture)
     Q_PROPERTY (QString guiFeatures READ guiFeatures WRITE setGuiFeatures)
+    Q_PROPERTY (QString languageId READ languageId WRITE setLanguageId)
 
 public:
@@ -85 +87 @@
     }
     bool isFeatureActive (const char*) const;
+
+    QString languageId() const { return data()->languageId; }
+    void setLanguageId (const QString &aLanguageId)
+    {
+        mData()->languageId = aLanguageId;
+    }
 
     //