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

Timestamp:

Apr 24, 2007 12:43:41 PM (18 years ago)

Author:

vboxsync

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

20702

Message:

FE/Qt: Load the InnoTek supplied Qt translation anyway on Linux (after loading the system supplied translation if it's available) because the InnoTek version may contain important corrections.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (3 diffs)

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

@@ -1923 +1923 @@
     }
 
-    /* load the language file */
+    /* delete the old translator if there is one */
     if (sTranslator)
     {
-        qApp->removeTranslator (sTranslator);
+        /* QTranslator destructor will call qApp->removeTranslator() for
+         * us. It will also delete all its child translations we attach to it
+         * below, so we don't have to care about them specially. */
         delete sTranslator;
     }
+
+    /* load new language files */
     sTranslator = new VBoxTranslator (qApp);
     Assert (sTranslator);
@@ -1956 +1960 @@
 
     /* Try to load the corresponding Qt translation */
-    QTranslator *qtTr = new QTranslator (sTranslator);
-    Assert (qtTr);
     if (sLoadedLangId != gVBoxBuiltInLangName)
     {
@@ -1965 +1967 @@
         languageFileName = QString (qInstallPathTranslations()) + "/qt_" +
                            sLoadedLangId + gVBoxLangFileExt;
-        loadOk = qtTr->load (languageFileName);
-        if (!loadOk)
+        QTranslator *qtSysTr = new QTranslator (sTranslator);
+        Assert (qtSysTr);
+        if (qtSysTr && qtSysTr->load (languageFileName))
+            qApp->installTranslator (qtSysTr);
+        /* Note that the Qt translation supplied by InnoTek is always loaded
+         * afterwards to make sure it will take precedence over the system
+         * translation (it may contain more decent variants of translation
+         * that better correspond to VirtualBox UI). We need to load both
+         * because a newer version of Qt may be installed on the user computer
+         * and the InnoTek version may not fully support it. We don't do it on
+         * Win32 because we supply a Qt library there and therefore the
+         * InnoTek translation is always the best one. */
 #endif
-        {
-            languageFileName =  nlsDir.absFilePath (QString ("qt_") +
-                                                    sLoadedLangId +
-                                                    gVBoxLangFileExt);
-            loadOk = qtTr->load (languageFileName);
-        }
-        qApp->installTranslator (qtTr);
+        languageFileName =  nlsDir.absFilePath (QString ("qt_") +
+                                                sLoadedLangId +
+                                                gVBoxLangFileExt);
+        QTranslator *qtTr = new QTranslator (sTranslator);
+        Assert (qtTr);
+        if (qtTr && (loadOk = qtTr->load (languageFileName)))
+            qApp->installTranslator (qtTr);
         /* The below message doesn't fit 100% (because it's an additonal
          * language and the main one won't be reset to built-in on failure)