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

Timestamp:

Apr 18, 2007 1:50:16 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Added Qt translation sources from the Qt distribution; created untranslated sources for existing languages; added code to load Qt translations on language change.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile (modified) (3 diffs)
• nls/qt_ar.ts (added)
• nls/qt_cs.ts (added)
• nls/qt_de.ts (added)
• nls/qt_es.ts (added)
• nls/qt_fr.ts (added)
• nls/qt_it.ts (added)
• nls/qt_iw.ts (added)
• nls/qt_ro.ts (added)
• nls/qt_ru.ts (added)
• nls/qt_sk.ts (added)
• nls/qt_xx_YY.ts (added)
• nls/qt_zh_CN.ts (added)
• nls/qt_zh_TW.ts (added)
• src/VBoxGlobal.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile

@@ -51 +51 @@
 VirtualBox_SDKS.win = WINPSDK DXSDK
 VirtualBox_SDKS.linux = LIBSDL
+
+# Each nls/VirtualBox_xx_YY.ts file must have a qt_xx_YY.ts counterpart
+VirtualBox_QT_TRANSLATIONS_QT := \
+        $(patsubst nls/VirtualBox_%.ts,nls/qt_%.ts,\
+                $(filter nls/VirtualBox_%.ts,$(VirtualBox_QT_TRANSLATIONS)))
 
 # QDesigner UI sources are imported from VBoxUI.pro as VirtualBox_QT_UISRC
@@ -247 +252 @@
 
 VirtualBox.nls_INST = $(INST_BIN)nls/
-VirtualBox.nls_SOURCES = $(patsubst %.ts,$(PATH_VirtualBox)/nls/%.qm,$(notdir $(VirtualBox_QT_TRANSLATIONS)))
+VirtualBox.nls_SOURCES =  $(patsubst %.ts,$(PATH_VirtualBox)/nls/%.qm,$(notdir $(VirtualBox_QT_TRANSLATIONS)))
+VirtualBox.nls_SOURCES += $(patsubst %.ts,$(PATH_VirtualBox)/nls/%.qm,$(notdir $(VirtualBox_QT_TRANSLATIONS_QT)))
 VirtualBox.nls_MODE = 644
 
@@ -378 +384 @@
 # NLS files
 $(foreach tsfile,$($(target)_QT_TRANSLATIONS),$(eval $(def_qt_gen_nls)))
+$(foreach tsfile,$($(target)_QT_TRANSLATIONS_QT),$(eval $(def_qt_gen_nls)))
 # dirs
 $$(call DIRDEP,$(PATH_$(target))/ui/) \

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

@@ -1912 +1912 @@
     QString selectedLangId = gVBoxBuiltInLangName;
 
+    QString nlsPath = qApp->applicationDirPath() + gVBoxLangSubDir;
+    QDir nlsDir (nlsPath);
+
     Assert (!langId.isEmpty());
     if (!langId.isEmpty() && langId != gVBoxBuiltInLangName)
@@ -1922 +1925 @@
         QString lang = regExp.cap (2);
 
-        QString nlsPath = qApp->applicationDirPath() + gVBoxLangSubDir;
-        QDir nlsDir (nlsPath);
         if (nlsDir.exists (gVBoxLangFileBase + langId + gVBoxLangFileExt))
         {
@@ -1978 +1979 @@
         vboxProblem().cannotLoadLanguage (languageFileName);
         sLoadedLangId = gVBoxBuiltInLangName;
+    }
+
+    /* Try to load the corresponding Qt translation */
+    QTranslator *qtTr = new QTranslator (sTranslator);
+    Assert (qtTr);
+    if (sLoadedLangId != gVBoxBuiltInLangName)
+    {
+#ifdef Q_OS_UNIX
+        /* We use system installations of Qt on Linux systems, so first, try
+         * to load the Qt translation from the system location. */
+        languageFileName = QString (qInstallPathTranslations()) + "/qt_" +
+                           sLoadedLangId + gVBoxLangFileExt;
+        loadOk = qtTr->load (languageFileName);
+        if (!loadOk)
+#endif
+        {
+            languageFileName =  nlsDir.absFilePath (QString ("qt_") +
+                                                    sLoadedLangId +
+                                                    gVBoxLangFileExt);
+            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)
+         * but the load failure is so rare here that it's not worth a separate
+         * message (but still, having something is better than having none) */
+        if (!loadOk && !aLangId.isNull())
+            vboxProblem().cannotLoadLanguage (languageFileName);
     }
 }