Changeset 71367 in vbox

Timestamp:

Mar 16, 2018 1:51:58 PM (7 years ago)

Author:

vboxsync

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

121319

Message:

FE/Qt: bugref:9049: Detach VBoxGlobal dependencies from Global settings / Language page.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (21 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• settings/global/UIGlobalSettingsLanguage.cpp (modified) (3 diffs)

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

@@ -187 +187 @@
 
 /* static */
-bool VBoxGlobal::m_sfCleanupInProgress = false;
-VBoxGlobal* VBoxGlobal::m_spInstance = 0;
-VBoxGlobal* VBoxGlobal::instance() { return m_spInstance; }
+VBoxGlobal *VBoxGlobal::s_pInstance = 0;
+bool        VBoxGlobal::s_fCleanupInProgress = false;
+QString     VBoxGlobal::s_strLoadedLanguageId = vboxBuiltInLanguageName();
 
 /* static */
@@ -195 +195 @@
 {
     /* Make sure instance is NOT created yet: */
-    if (m_spInstance)
+    if (s_pInstance)
     {
         AssertMsgFailed(("VBoxGlobal instance is already created!"));
@@ -204 +204 @@
     new VBoxGlobal;
     /* Prepare instance: */
-    m_spInstance->prepare();
+    s_pInstance->prepare();
 }
 
@@ -211 +211 @@
 {
     /* Make sure instance is NOT destroyed yet: */
-    if (!m_spInstance)
+    if (!s_pInstance)
     {
         AssertMsgFailed(("VBoxGlobal instance is already destroyed!"));
@@ -221 +221 @@
      * 2. But if QApplication was not started at all and we perform
      *    early shutdown, we should do cleanup ourselves. */
-    if (m_spInstance->isValid())
-        m_spInstance->cleanup();
+    if (s_pInstance->isValid())
+        s_pInstance->cleanup();
     /* Destroy instance: */
-    delete m_spInstance;
+    delete s_pInstance;
 }
 
@@ -260 +260 @@
 {
     /* Assign instance: */
-    m_spInstance = this;
+    s_pInstance = this;
 }
 
@@ -266 +266 @@
 {
     /* Unassign instance: */
-    m_spInstance = 0;
+    s_pInstance = 0;
 }
 
@@ -1274 +1274 @@
 
     /* Ignore the request during VBoxGlobal cleanup: */
-    if (m_sfCleanupInProgress)
+    if (s_fCleanupInProgress)
         return;
 
@@ -1748 +1748 @@
 }
 
-const char *gVBoxLangSubDir = "/nls";
-const char *gVBoxLangFileBase = "VirtualBox_";
-const char *gVBoxLangFileExt = ".qm";
-const char *gVBoxLangIDRegExp = "(([a-z]{2})(?:_([A-Z]{2}))?)|(C)";
-const char *gVBoxBuiltInLangName   = "C";
-
 class VBoxTranslator : public QTranslator
 {
@@ -1776 +1770 @@
 
 static VBoxTranslator *sTranslator = 0;
-static QString sLoadedLangId = gVBoxBuiltInLangName;
+
+/* static */
+QString VBoxGlobal::vboxLanguageSubDirectory()
+{
+    return "/nls";
+}
+
+/* static */
+QString VBoxGlobal::vboxLanguageFileBase()
+{
+    return "VirtualBox_";
+}
+
+/* static */
+QString VBoxGlobal::vboxLanguageFileExtension()
+{
+    return ".qm";
+}
+
+/* static */
+QString VBoxGlobal::vboxLanguageIdRegExp()
+{
+    return "(([a-z]{2})(?:_([A-Z]{2}))?)|(C)";
+}
+
+/* static */
+QString VBoxGlobal::vboxBuiltInLanguageName()
+{
+    return "C";
+}
 
 /**
@@ -1793 +1816 @@
 QString VBoxGlobal::languageId()
 {
-    return sLoadedLangId;
+    return s_strLoadedLanguageId;
 }
 
@@ -1808 +1831 @@
         VBoxGlobal::systemLanguageId() : aLangId;
     QString languageFileName;
-    QString selectedLangId = gVBoxBuiltInLangName;
+    QString selectedLangId = vboxBuiltInLanguageName();
 
     /* If C is selected we change it temporary to en. This makes sure any extra
@@ -1826 +1849 @@
     AssertRC (rc);
 
-    QString nlsPath = QString(szNlsPath) + gVBoxLangSubDir;
+    QString nlsPath = QString(szNlsPath) + vboxLanguageSubDirectory();
     QDir nlsDir (nlsPath);
 
     Assert (!langId.isEmpty());
-    if (!langId.isEmpty() && langId != gVBoxBuiltInLangName)
-    {
-        QRegExp regExp (gVBoxLangIDRegExp);
+    if (!langId.isEmpty() && langId != vboxBuiltInLanguageName())
+    {
+        QRegExp regExp (vboxLanguageIdRegExp());
         int pos = regExp.indexIn (langId);
         /* the language ID should match the regexp completely */
@@ -1839 +1862 @@
         QString lang = regExp.cap (2);
 
-        if (nlsDir.exists (gVBoxLangFileBase + langId + gVBoxLangFileExt))
-        {
-            languageFileName = nlsDir.absoluteFilePath (gVBoxLangFileBase + langId +
-                                                        gVBoxLangFileExt);
+        if (nlsDir.exists (vboxLanguageFileBase() + langId + vboxLanguageFileExtension()))
+        {
+            languageFileName = nlsDir.absoluteFilePath (vboxLanguageFileBase() + langId +
+                                                        vboxLanguageFileExtension());
             selectedLangId = langId;
         }
-        else if (nlsDir.exists (gVBoxLangFileBase + lang + gVBoxLangFileExt))
-        {
-            languageFileName = nlsDir.absoluteFilePath (gVBoxLangFileBase + lang +
-                                                        gVBoxLangFileExt);
+        else if (nlsDir.exists (vboxLanguageFileBase() + lang + vboxLanguageFileExtension()))
+        {
+            languageFileName = nlsDir.absoluteFilePath (vboxLanguageFileBase() + lang +
+                                                        vboxLanguageFileExtension());
             selectedLangId = lang;
         }
@@ -1859 +1882 @@
                 msgCenter().cannotFindLanguage (langId, nlsPath);
             /* selectedLangId remains built-in here */
-            AssertReturnVoid (selectedLangId == gVBoxBuiltInLangName);
+            AssertReturnVoid (selectedLangId == vboxBuiltInLanguageName());
         }
     }
@@ -1878 +1901 @@
     if (sTranslator)
     {
-        if (selectedLangId != gVBoxBuiltInLangName)
+        if (selectedLangId != vboxBuiltInLanguageName())
         {
             Assert (!languageFileName.isNull());
@@ -1892 +1915 @@
 
     if (loadOk)
-        sLoadedLangId = selectedLangId;
+        s_strLoadedLanguageId = selectedLangId;
     else
     {
         msgCenter().cannotLoadLanguage (languageFileName);
-        sLoadedLangId = gVBoxBuiltInLangName;
+        s_strLoadedLanguageId = vboxBuiltInLanguageName();
     }
 
     /* Try to load the corresponding Qt translation */
-    if (sLoadedLangId != gVBoxBuiltInLangName && sLoadedLangId != "en")
+    if (languageId() != vboxBuiltInLanguageName() && languageId() != "en")
     {
 #ifdef Q_OS_UNIX
@@ -1906 +1929 @@
          * to load the Qt translation from the system location. */
         languageFileName = QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_" +
-                           sLoadedLangId + gVBoxLangFileExt;
+                           languageId() + vboxLanguageFileExtension();
         QTranslator *qtSysTr = new QTranslator (sTranslator);
         Assert (qtSysTr);
@@ -1921 +1944 @@
 #endif
         languageFileName =  nlsDir.absoluteFilePath (QString ("qt_") +
-                                                     sLoadedLangId +
-                                                     gVBoxLangFileExt);
+                                                     languageId() +
+                                                     vboxLanguageFileExtension());
         QTranslator *qtTr = new QTranslator (sTranslator);
         Assert (qtTr);
@@ -1935 +1958 @@
     }
     if (fResetToC)
-        sLoadedLangId = "C";
+        s_strLoadedLanguageId = vboxBuiltInLanguageName();
 #ifdef VBOX_WS_MAC
     /* Qt doesn't translate the items in the Application menu initially.
@@ -4044 +4067 @@
     /* Remember that the cleanup is in progress preventing any unwanted
      * stuff which could be called from the other threads: */
-    m_sfCleanupInProgress = true;
+    s_fCleanupInProgress = true;
 
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER

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

@@ -82 +82 @@
 
     /* Static API: Create/destroy stuff: */
-    static VBoxGlobal* instance();
+    static VBoxGlobal *instance() { return s_pInstance; }
     static void create();
     static void destroy();
 
     bool isValid() { return mValid; }
-    bool isCleaningUp() { return m_sfCleanupInProgress; }
+    bool isCleaningUp() { return s_fCleanupInProgress; }
 
     static QString qtRTVersionString();
@@ -339 +339 @@
     static bool isDOSType (const QString &aOSTypeId);
 
+    /** Returns VBox language sub-directory. */
+    static QString vboxLanguageSubDirectory();
+    /** Returns VBox language file-base. */
+    static QString vboxLanguageFileBase();
+    /** Returns VBox language file-extension. */
+    static QString vboxLanguageFileExtension();
+    /** Returns VBox language ID reg-exp. */
+    static QString vboxLanguageIdRegExp();
+    /** Returns built in language name. */
+    static QString vboxBuiltInLanguageName();
     static QString languageId();
     static void loadLanguage (const QString &aLangId = QString::null);
@@ -634 +644 @@
     UIThreadPool *m_pThreadPool;
 
-    /* API: Instance stuff: */
-    static bool m_sfCleanupInProgress;
-    static VBoxGlobal* m_spInstance;
-    friend VBoxGlobal& vboxGlobal();
+    /** Holds the singleton VBoxGlobal instance. */
+    static VBoxGlobal *s_pInstance;
+    /** Holds whether VBoxGlobal cleanup is in progress. */
+    static bool        s_fCleanupInProgress;
+    /** Holds the currently loaded language ID. */
+    static QString     s_strLoadedLanguageId;
+
+    /** Allows for shortcut access. */
+    friend VBoxGlobal &vboxGlobal();
 };
 
-/* Shortcut to the static VBoxGlobal::instance() method: */
-inline VBoxGlobal& vboxGlobal() { return *VBoxGlobal::instance(); }
+/** Singleton VBoxGlobal 'official' name. */
+inline VBoxGlobal &vboxGlobal() { return *VBoxGlobal::instance(); }
 
 #endif /* !___VBoxGlobal_h___ */

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

@@ -43 +43 @@
 
 
-extern const char *gVBoxLangSubDir;
-extern const char *gVBoxLangFileBase;
-extern const char *gVBoxLangFileExt;
-extern const char *gVBoxLangIDRegExp;
-extern const char *gVBoxBuiltInLangName;
-
-
 /** Global settings: Language page data structure. */
 struct UIDataSettingsGlobalLanguage
@@ -395 +388 @@
     int rc = RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
     AssertRC(rc);
-    QString strNlsPath = QString(szNlsPath) + gVBoxLangSubDir;
+    QString strNlsPath = QString(szNlsPath) + VBoxGlobal::vboxLanguageSubDirectory();
     QDir nlsDir(strNlsPath);
-    QStringList files = nlsDir.entryList(QStringList(QString("%1*%2").arg(gVBoxLangFileBase, gVBoxLangFileExt)), QDir::Files);
+    QStringList files = nlsDir.entryList(QStringList(QString("%1*%2").arg(VBoxGlobal::vboxLanguageFileBase(),
+                                                                          VBoxGlobal::vboxLanguageFileExtension())),
+                                         QDir::Files);
 
     QTranslator translator;
@@ -403 +398 @@
     new UILanguageItem(m_pLanguageTree);
     /* Add the built-in language: */
-    new UILanguageItem(m_pLanguageTree, translator, gVBoxBuiltInLangName, true /* built-in */);
+    new UILanguageItem(m_pLanguageTree, translator, VBoxGlobal::vboxBuiltInLanguageName(), true /* built-in */);
     /* Add all existing languages */
     for (QStringList::Iterator it = files.begin(); it != files.end(); ++it)
     {
         QString strFileName = *it;
-        QRegExp regExp(QString(gVBoxLangFileBase) + gVBoxLangIDRegExp);
+        QRegExp regExp(VBoxGlobal::vboxLanguageFileBase() + VBoxGlobal::vboxLanguageIdRegExp());
         int iPos = regExp.indexIn(strFileName);
         if (iPos == -1)