Changeset 2044 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 12, 2007 1:04:20 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: A bunch of corrections and improvements to the Language selectior UI.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (4 diffs)
• include/VBoxProblemReporter.h (modified) (1 diff)
• nls/VirtualBox_de.ts (modified) (2 diffs)
• nls/VirtualBox_ru.ts (modified) (2 diffs)
• nls/VirtualBox_xx_YY.ts (modified) (2 diffs)
• nls/VirtualBox_zh_CN.ts (modified) (3 diffs)
• nls/VirtualBox_zh_TW.ts (modified) (3 diffs)
• src/VBoxGlobal.cpp (modified) (9 diffs)
• src/VBoxProblemReporter.cpp (modified) (1 diff)
• src/VMGlobalSettings.cpp (modified) (1 diff)
• ui/VBoxGlobalSettingsDlg.ui (modified) (11 diffs)
• ui/VBoxGlobalSettingsDlg.ui.h (modified) (9 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;
@@ -391 +387 @@
 
     /* public static stuff */
+
+    static QString languageId();
+    static void loadLanguage (const QString &aLangId = QString::null);
 
     static QIconSet iconSet (const char *aNormal,
@@ -413 +412 @@
     static QString highlight (const QString &aStr, bool aToolTip = false);
 
-    static QString systemLanguageID();
+    static QString systemLanguageId();
 
     static QString getExistingDirectory (const QString &aDir, QWidget *aParent,
@@ -510 +509 @@
 
     QString verString;
-
-    static QString mLoadedLangId;
 
     QValueVector <CGuestOSType> vm_os_types;

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

@@ -98 +98 @@
     void cannotOpenURL (const QString &aURL);
 
+    void cannotFindLanguage (const QString &aLangID, const QString &aNlsPath);
+    void cannotLoadLanguage (const QString &aLangFile);
+
     void cannotInitCOM (HRESULT rc);
     void cannotCreateVirtualBox (const CVirtualBox &vbox);

trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts

@@ -8 +8 @@
     </message>
     <message>
-        <source>built-in</source>
+        <source>--</source>
         <comment>Native language country name (empty if this language is for all countries)</comment>
         <translation></translation>
@@ -18 +18 @@
     </message>
     <message>
-        <source>built-in</source>
+        <source>--</source>
         <comment>Language country name, in English (empty if native country name is empty)</comment>
         <translation></translation>

trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts

@@ -8 +8 @@
     </message>
     <message>
-        <source>built-in</source>
+        <source>--</source>
         <comment>Native language country name (empty if this language is for all countries)</comment>
         <translation></translation>
@@ -18 +18 @@
     </message>
     <message>
-        <source>built-in</source>
+        <source>--</source>
         <comment>Language country name, in English (empty if native country name is empty)</comment>
         <translation></translation>

trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts

@@ -8 +8 @@
     </message>
     <message>
-        <source>built-in</source>
+        <source>--</source>
         <comment>Native language country name (empty if this language is for all countries)</comment>
         <translation type="unfinished"></translation>
@@ -18 +18 @@
     </message>
     <message>
-        <source>built-in</source>
+        <source>--</source>
         <comment>Language country name, in English (empty if native country name is empty)</comment>
         <translation type="unfinished"></translation>

trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts

@@ -8 +8 @@
     </message>
     <message>
-        <source>built-in</source>
+        <source>--</source>
         <comment>Native language country name (empty if this language is for all countries)</comment>
         <translation type="unfinished">China</translation>
@@ -18 +18 @@
     </message>
     <message>
-        <source>built-in</source>
+        <source>--</source>
         <comment>Language country name, in English (empty if native country name is empty)</comment>
         <translation type="unfinished">China</translation>
@@ -25 +25 @@
         <source>InnoTek</source>
         <comment>Comma-separated list of translators</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">victor</translation>
     </message>
 </context>

trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts

@@ -8 +8 @@
     </message>
     <message>
-        <source>built-in</source>
+        <source>--</source>
         <comment>Native language country name (empty if this language is for all countries)</comment>
         <translation type="unfinished">Taiwan</translation>
@@ -18 +18 @@
     </message>
     <message>
-        <source>built-in</source>
+        <source>--</source>
         <comment>Language country name, in English (empty if native country name is empty)</comment>
         <translation type="unfinished">Taiwan</translation>
@@ -25 +25 @@
         <source>InnoTek</source>
         <comment>Comma-separated list of translators</comment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">bluebat</translation>
     </message>
 </context>

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

@@ -471 +471 @@
 #endif /* Q_WS_WIN */
 
-// Helpers for VBoxGlobal::loadLanguage()
-/////////////////////////////////////////////////////////////////////////////
-
-extern const QString transFileName = "VirtualBox_";
-extern const QString langIdRegExp  = "(([a-z]{2})(_([A-Z]{2}))?)";
-extern const QString builtInName   = "built_in";
-static const QString transFileExt  = ".qm";
-class VBoxTranslator : public QTranslator
-{
-public:
-
-    VBoxTranslator (QObject *aParent = 0)
-        : QTranslator (aParent, "VBoxTranslatorObject") {}
-
-    bool loadFile (const QString &aFileName)
-    {
-        QFile file (aFileName);
-        if (!file.open (IO_ReadOnly))
-            return false;
-        mData = file.readAll();
-        return load ((uchar*)mData.data(), mData.size());
-    }
-
-private:
-
-    QByteArray mData;
-};
-static VBoxTranslator *mTranslator = 0;
-
 // VBoxGlobal
 ////////////////////////////////////////////////////////////////////////////////
@@ -515 +486 @@
 static void vboxGlobalCleanup()
 {
+    Assert (!vboxGlobal_cleanup);
     vboxGlobal_cleanup = true;
     vboxGlobal().cleanup();
@@ -1678 +1650 @@
 
 /**
- *  This variable used for storing loaded language id.
- */
-/* static */
-QString VBoxGlobal::mLoadedLangId = builtInName;
-
-/**
- *  This method returns loaded language id.
- */
-/* static */
-const QString& VBoxGlobal::languageID()
-{
-    return mLoadedLangId;
-}
-
-/**
- *  This method is used to load language by language id.
- */
-/* static */
-void VBoxGlobal::loadLanguage (const QString &aLang)
-{
-    const QString &langId = aLang.isNull() ?
-        VBoxGlobal::systemLanguageID() : aLang;
-    QString languageFileName = QString::null;
-    QString selectedLangId = builtInName;
-
-    if (aLang != builtInName)
-    {
-        QRegExp regExp (langIdRegExp);
-        int rule = regExp.search (langId);
-        /* this rule should match the language id completely */
-        Assert (!rule);
-        if (rule == -1) return;
-
-        QString mId1part = regExp.cap (2);
-        QString mId2part = regExp.cap (4);
-        /* language localization (second part) should not be empty? */
-        // Assert (!mId2part.isEmpty());
-
-        QString nlsPath = qApp->applicationDirPath() + "/nls";
-        QDir nlsDir (nlsPath);
-        if (nlsDir.exists (transFileName + langId + transFileExt))
-        {
-            languageFileName = nlsDir.absFilePath (transFileName + langId + transFileExt);
-            selectedLangId = langId;
-        }
-        else if (nlsDir.exists (transFileName + mId1part + transFileExt))
-        {
-            languageFileName = nlsDir.absFilePath (transFileName + mId1part + transFileExt);
-            selectedLangId = mId1part;
-        }
-
-        if (mTranslator && languageFileName.isNull())
-        {
-            /* process downgrade situation */
-            int loadLanguageQuest = vboxProblem().message (
-                0, VBoxProblemReporter::Question,
-                tr ("<p>Correct *.qm language file for language with "
-                    "<b>%1</b> id could not be found in the "
-                    "%2 location.</p> Do you want to use built-in language "
-                    "instead of it?</p>").arg (langId).arg (nlsPath),
-                0, /* autoConfirmId */
-                QIMessageBox::Ok | QIMessageBox::Default,
-                QIMessageBox::Cancel | QIMessageBox::Escape);
-            if (loadLanguageQuest == QIMessageBox::Cancel)
-                return;
-        }
-    }
-
-    if (loadLanguageFile (languageFileName))
-    {
-        mLoadedLangId = selectedLangId;
-    }
-    else
-    {
-        /* passed file is not loaded */
-        vboxProblem().message (
-            0, VBoxProblemReporter::Warning,
-            tr ("<p>Language file <b>%1</b> could not be loaded. This "
-                "issue could be caused by incorrect file content.</p>")
-                .arg (languageFileName),
-            0, /* autoConfirmId */
-            QIMessageBox::Ok | QIMessageBox::Default);
-    }
-}
-
-/**
- *  This method is used to load language file into translator
- *  and install loaded translator.
- */
-/* static */
-bool VBoxGlobal::loadLanguageFile (const QString &aFileName)
-{
-    if (mTranslator)
-        qApp->removeTranslator (mTranslator);
-    delete mTranslator;
-    mTranslator = new VBoxTranslator();
-    bool status = true;
-    if (!aFileName.isNull())
-        status = mTranslator->loadFile (aFileName);
-    qApp->installTranslator (mTranslator);
-    return status;
-}
-
-/**
  *  Native language name of the currently installed translation.
- *  Returns "English [built-in]" if no translation is installed
+ *  Returns "English" if no translation is installed
  *  or if the translation file is invalid.
  */
@@ -1795 +1663 @@
 /**
  *  Native language country name of the currently installed translation.
- *  Returns "" if no translation is installed or if the translation file is
+ *  Returns "--" if no translation is installed or if the translation file is
  *  invalid, or if the language is independent on the country.
  */
 QString VBoxGlobal::languageCountry() const
 {
-    return qApp->translate ("@@@", "built-in",
+    return qApp->translate ("@@@", "--",
                             "Native language country name "
                             "(empty if this language is for all countries)");
@@ -1807 +1675 @@
 /**
  *  Language name of the currently installed translation, in English.
- *  Returns "English [built-in]" if no translation is installed
+ *  Returns "English" if no translation is installed
  *  or if the translation file is invalid.
  */
@@ -1819 +1687 @@
 /**
  *  Language country name of the currently installed translation, in English.
- *  Returns "" if no translation is installed or if the translation file is
+ *  Returns "--" if no translation is installed or if the translation file is
  *  invalid, or if the language is independent on the country.
  */
 QString VBoxGlobal::languageCountryEnglish() const
 {
-    return qApp->translate ("@@@", "built-in",
+    return qApp->translate ("@@@", "--",
                             "Language country name, in English "
                             "(empty if native country name is empty)");
@@ -1953 +1821 @@
 // public static stuff
 ////////////////////////////////////////////////////////////////////////////////
+
+extern const char *gVBoxLangSubDir = "/nls";
+extern const char *gVBoxLangFileBase = "VirtualBox_";
+extern const char *gVBoxLangFileExt = ".qm";
+extern const char *gVBoxLangIDRegExp = "(([a-z]{2})(?:_([A-Z]{2}))?)";
+extern const char *gVBoxBuiltInLangName   = "built_in";
+
+class VBoxTranslator : public QTranslator
+{
+public:
+
+    VBoxTranslator (QObject *aParent = 0)
+        : QTranslator (aParent, "VBoxTranslatorObject") {}
+
+    bool loadFile (const QString &aFileName)
+    {
+        QFile file (aFileName);
+        if (!file.open (IO_ReadOnly))
+            return false;
+        mData = file.readAll();
+        return load ((uchar*) mData.data(), mData.size());
+    }
+
+private:
+
+    QByteArray mData;
+};
+
+static VBoxTranslator *sTranslator = 0;
+static QString sLoadedLangId = gVBoxBuiltInLangName;
+
+/**
+ *  Returns the loaded (active) language ID.
+ *  Note that it may not match with VMGlobalSettings::languageId() if the
+ *  specified language cannot be loaded.
+ *  If the built-in language is active, this method returns "built_in".
+ */
+/* static */
+QString VBoxGlobal::languageId()
+{
+    return sLoadedLangId;
+}
+
+/**
+ *  Loads the language by language ID.
+ *  @param aLang language ID in in form of xx_YY
+ */
+/* static */
+void VBoxGlobal::loadLanguage (const QString &aLang)
+{
+    QString langId = aLang.isNull() ?
+        VBoxGlobal::systemLanguageId() : aLang;
+    QString languageFileName = QString::null;
+    QString selectedLangId = gVBoxBuiltInLangName;
+
+    if (aLang != gVBoxBuiltInLangName)
+    {
+        QRegExp regExp (gVBoxLangIDRegExp);
+        int rule = regExp.search (langId);
+        /* this rule should match the language id completely */
+        Assert (!rule);
+        if (rule == -1) return;
+
+        QString mId1part = regExp.cap (2);
+        QString mId2part = regExp.cap (4);
+        /* language localization (second part) should not be empty? */
+        // Assert (!mId2part.isEmpty());
+
+        QString nlsPath = qApp->applicationDirPath() + gVBoxLangSubDir;
+        QDir nlsDir (nlsPath);
+        if (nlsDir.exists (gVBoxLangFileBase + langId + gVBoxLangFileExt))
+        {
+            languageFileName = nlsDir.absFilePath (gVBoxLangFileBase + langId +
+                                                   gVBoxLangFileExt);
+            selectedLangId = langId;
+        }
+        else if (nlsDir.exists (gVBoxLangFileBase + mId1part + gVBoxLangFileExt))
+        {
+            languageFileName = nlsDir.absFilePath (gVBoxLangFileBase + mId1part +
+                                                   gVBoxLangFileExt);
+            selectedLangId = mId1part;
+        }
+
+        if (sTranslator && languageFileName.isNull())
+        {
+            vboxProblem().cannotFindLanguage (langId, nlsPath);
+            return;
+        }
+    }
+
+    /* load the language file */
+    if (sTranslator)
+    {
+        qApp->removeTranslator (sTranslator);
+        delete sTranslator;
+    }
+    sTranslator = new VBoxTranslator (qApp);
+    Assert (sTranslator);
+    bool loadOk = true;
+    if (sTranslator)
+    {
+        /* an empty file name means built-in English*/
+        if (selectedLangId != gVBoxBuiltInLangName)
+        {
+            Assert (!languageFileName.isNull());
+            loadOk = sTranslator->loadFile (languageFileName);
+        }
+        /* we install the translator in any case: on failure, this will
+         * activate an empty (aka built-in) translator */
+        qApp->installTranslator (sTranslator);
+    }
+    else
+        loadOk = false;
+    
+    if (loadOk)
+        sLoadedLangId = selectedLangId;
+    else
+    {
+        vboxProblem().cannotLoadLanguage (languageFileName);
+        sLoadedLangId = gVBoxBuiltInLangName;
+    }
+}
 
 /* static */
@@ -2392 +2382 @@
  */
 /* static */
-QString VBoxGlobal::systemLanguageID()
+QString VBoxGlobal::systemLanguageId()
 {
 #ifdef Q_OS_UNIX
@@ -2899 +2889 @@
 
     /* Load predefined language */
-    const QString &languageId = gset.languageId();
+    QString languageId = gset.languageId();
     if (!languageId.isNull())
         loadLanguage (languageId);

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

@@ -446 +446 @@
 }
 
+void VBoxProblemReporter::cannotFindLanguage (const QString &aLangID,
+                                              const QString &aNlsPath)
+{
+    message
+        (0, VBoxProblemReporter::Error,
+         tr ("<p>Could not find a language file for the language "
+             "<b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p>"
+             "<p>The language will be temporarily reset to the system "
+             "default language. Please go to the <b>Global Settings</b> "
+             "dialog which you can open from the <b>File</b> menu of the "
+             "main VirtualBox window, and select one of the existing "
+             "languages on the <b>Language</b> page.</p>")
+         .arg (aLangID).arg (aNlsPath));
+}
+
+void VBoxProblemReporter::cannotLoadLanguage (const QString &aLangFile)
+{
+    message
+        (0, VBoxProblemReporter::Error,
+         tr ("<p>Could not load the language file <b><nobr>%1</nobr></b>. "
+             "<p>The language will be temporarily reset to English (built-in). "
+             "Please go to the <b>Global Settings</b> "
+             "dialog which you can open from the <b>File</b> menu of the "
+             "main VirtualBox window, and select one of the existing "
+             "languages on the <b>Language</b> page.</p>")
+         .arg (aLangFile));
+}
+
 void VBoxProblemReporter::cannotInitCOM (HRESULT rc)
 {

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

@@ -97 +97 @@
     { "GUI/Input/AutoCapture",  "autoCapture",  "true|false" },
     { "GUI/Customizations",     "guiFeatures",  "\\S+" },
-    { "GUI/LanguageID",         "languageId",   "([a-z]{2,5}(_[a-zA-Z]{2})?)?" },
+    /* LanguageID regexp must correlate with gVBoxLangIDRegExp in
+     * VBoxGlobal.cpp */
+    { "GUI/LanguageID",         "languageId",   "(([a-z]{2})(_([A-Z]{2}))?)|(built_in)" },
 };
 

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxGlobalSettingsDlg.ui

@@ -782 +782 @@
                                 <cstring>unnamed</cstring>
                             </property>
+                            <property name="spacing">
+                                <number>10</number>
+                            </property>
                             <widget class="QListView">
                                 <column>
@@ -791 +794 @@
                                     </property>
                                     <property name="resizable">
-                                        <bool>false</bool>
+                                        <bool>true</bool>
                                     </property>
                                 </column>
@@ -799 +802 @@
                                 <property name="sizePolicy">
                                     <sizepolicy>
-                                        <hsizetype>0</hsizetype>
+                                        <hsizetype>4</hsizetype>
                                         <vsizetype>7</vsizetype>
                                         <horstretch>0</horstretch>
@@ -806 +809 @@
                                 </property>
                                 <property name="resizeMode">
-                                    <enum>AllColumns</enum>
+                                    <enum>NoColumn</enum>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>The list of languages available for interface translation.</string>
+                                    <string>
+Lists all available user interface languages. The effective language
+is written in &lt;b&gt;bold&lt;/b&gt;.
+                                    </string>
                                 </property>
                             </widget>
@@ -834 +840 @@
                                                 <property name="sizePolicy">
                                                     <sizepolicy>
-                                                        <hsizetype>7</hsizetype>
-                                                        <vsizetype>5</vsizetype>
+                                                        <hsizetype>1</hsizetype>
+                                                        <vsizetype>1</vsizetype>
                                                         <horstretch>0</horstretch>
                                                         <verstretch>0</verstretch>
@@ -854 +860 @@
                                                     <sizepolicy>
                                                         <hsizetype>1</hsizetype>
-                                                        <vsizetype>5</vsizetype>
+                                                        <vsizetype>1</vsizetype>
                                                         <horstretch>0</horstretch>
                                                         <verstretch>0</verstretch>
@@ -873 +879 @@
                                                     <sizepolicy>
                                                         <hsizetype>1</hsizetype>
-                                                        <vsizetype>5</vsizetype>
+                                                        <vsizetype>1</vsizetype>
                                                         <horstretch>0</horstretch>
                                                         <verstretch>0</verstretch>
@@ -891 +897 @@
                                                 <property name="sizePolicy">
                                                     <sizepolicy>
-                                                        <hsizetype>7</hsizetype>
-                                                        <vsizetype>5</vsizetype>
+                                                        <hsizetype>1</hsizetype>
+                                                        <vsizetype>1</vsizetype>
                                                         <horstretch>0</horstretch>
                                                         <verstretch>0</verstretch>
@@ -919 +925 @@
                                             <size>
                                                 <width>20</width>
-                                                <height>121</height>
+                                                <height>0</height>
                                             </size>
                                         </property>
@@ -925 +931 @@
                                 </vbox>
                             </widget>
+                            <spacer>
+                                <property name="name">
+                                    <cstring>spacer8</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>0</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
                         </hbox>
                     </widget>
@@ -1214 +1237 @@
     <include location="global" impldecl="in implementation">qmessagebox.h</include>
     <include location="global" impldecl="in implementation">qfont.h</include>
+    <include location="global" impldecl="in implementation">qpainter.h</include>
     <include location="global" impldecl="in implementation">qobjectlist.h</include>
     <include location="global" impldecl="in implementation">qfiledialog.h</include>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxGlobalSettingsDlg.ui.h

@@ -31 +31 @@
 
 
-extern const QString transFileName;
-extern const QString langIdRegExp;
-extern const QString builtInName;
+/* defined in VBoxGlobal.cpp */
+extern const char *gVBoxLangSubDir;
+extern const char *gVBoxLangFileBase;
+extern const char *gVBoxLangFileExt;
+extern const char *gVBoxLangIDRegExp;
+extern const char *gVBoxBuiltInLangName;
 
 /**
@@ -83 +86 @@
     enum { TypeId = 1001 };
 
-    LanguageItem (QListView *aParent, const QString &aName)
-        : QListViewItem (aParent, aName)
-    {
-        /* making separator field */
-        if (aName == "-")
-        {
-            QString sepLine;
-            while (listView()->fontMetrics().width (sepLine) < listView()->width())
-                sepLine += "-";
-            setText (0, sepLine);
-            setSelectable (false);
-        }
-    }
-
     LanguageItem (QListView *aParent, const QTranslator &aTranslator,
                   const QString &aId, bool aBuiltIn = false)
-        : QListViewItem (aParent)
+        : QListViewItem (aParent), mBuiltIn (aBuiltIn), mInvalid (false)
     {
         QTranslatorMessage transMes;
 
-        QString nativeLanguage = translate (aTranslator,
-            "@@@", "English", "Native language name", aBuiltIn);
-        QString nativeCountry = translate (aTranslator,
-            "@@@", "built-in", "Native language country name "
-            "(empty if this language is for all countries)", aBuiltIn);
-
-        QString englishLanguage = translate (aTranslator,
-            "@@@", "English", "Language name, in English", aBuiltIn);
-        QString englishCountry = translate (aTranslator,
-            "@@@", "built-in", "Language country name, in English "
-            "(empty if native country name is empty)", aBuiltIn);
-
-        QString translatorsName = translate (aTranslator,
-            "@@@", "InnoTek", "Comma-separated list of translators", aBuiltIn);
-        if (translatorsName.isNull())
-            translatorsName = QListView::tr ("--", "no info");
+        /* Note: context/source/comment arguments below must match strings
+         * used in VBoxGlobal::languageName() and friends (the latter are the
+         * source of information for the lupdate tool that generates
+         * translation files) */
+
+        QString nativeLanguage = tratra (aTranslator,
+            "@@@", "English", "Native language name");
+        QString nativeCountry = tratra (aTranslator,
+            "@@@", "--", "Native language country name "
+            "(empty if this language is for all countries)");
+
+        QString englishLanguage = tratra (aTranslator,
+            "@@@", "English", "Language name, in English");
+        QString englishCountry = tratra (aTranslator,
+            "@@@", "--", "Language country name, in English "
+            "(empty if native country name is empty)");
+
+        QString translatorsName = tratra (aTranslator,
+            "@@@", "InnoTek", "Comma-separated list of translators");
 
         QString itemName = nativeLanguage;
-        if (!nativeCountry.isNull())
-            itemName += " (" + nativeCountry + ")";
-
         QString langName = englishLanguage;
-        if (!englishCountry.isNull())
-            langName += " (" + englishCountry + ")";
+
         if (!aBuiltIn)
-            langName = itemName + " / " + langName;
+        {
+            if (nativeCountry != "--")
+                itemName += " (" + nativeCountry + ")";
+
+            if (englishCountry != "--")
+                langName += " (" + englishCountry + ")";
+
+            if (itemName != langName)
+                langName = itemName + " / " + langName;
+        }
+        else
+        {
+            itemName += VBoxGlobalSettingsDlg::tr (" (built-in)", "Language");
+            langName += VBoxGlobalSettingsDlg::tr (" (built-in)", "Language");
+        }
 
         setText (0, itemName);
@@ -136 +138 @@
     }
 
+    /* Constructs an item for an invalid language ID (i.e. when a language
+     * file is missing or corrupt). */
+    LanguageItem (QListView *aParent, const QString &aId)
+        : QListViewItem (aParent), mBuiltIn (false), mInvalid (true)
+    {
+        setText (0, QString ("<%1>").arg (aId));
+        setText (1, aId);
+        setText (2, VBoxGlobalSettingsDlg::tr ("<unavailabie>", "Language"));
+        setText (3, VBoxGlobalSettingsDlg::tr ("<unknown>", "Author(s)"));
+    }
+
     int rtti() const { return TypeId; }
 
@@ -142 +155 @@
         QString thisValue = text (1);
         QString thatValue = aItem->text (1);
-        if (thisValue == builtInName)
+        if (thisValue == gVBoxBuiltInLangName)
             return -1;
-        else if (thatValue == builtInName)
+        else if (thatValue == gVBoxBuiltInLangName)
             return 1;
         else
@@ -151 +164 @@
 
     void paintCell (QPainter *aPainter, const QColorGroup &aGroup,
-                    int aColumn, int aWidth, int aSlign)
-    {
-        /* adjusting list-view width */
-        int fullwidth = width (listView()->fontMetrics(), listView(), 0) + 4;
-        if (listView()->width() < fullwidth)
-            listView()->setFixedWidth (fullwidth);
-        /* standard paint procedure */
-        QListViewItem::paintCell (aPainter, aGroup, aColumn, aWidth, aSlign);
+                    int aColumn, int aWidth, int aAlign)
+    {
+        QFont font = aPainter->font();
+
+        if (mInvalid)
+            font.setItalic (true);
+        /* mark the effectively active language */
+        if (text (1) == VBoxGlobal::languageId())
+            font.setBold (true);
+
+        if (aPainter->font() != font)
+            aPainter->setFont (font);
+
+        QListViewItem::paintCell (aPainter, aGroup, aColumn, aWidth, aAlign);
+        
+        if (mBuiltIn)
+        {
+            int y = height() - 1;
+            aPainter->setPen (aGroup.mid());
+            aPainter->drawLine (0, y, aWidth - 1, y);
+        }
+    }
+
+    int width (const QFontMetrics &aFM, const QListView *aLV, int aC) const
+    {
+        QFont font = aLV->font();
+
+        if (mInvalid)
+            font.setItalic (true);
+        /* mark the effectively active language */
+        if (text (1) == VBoxGlobal::languageId())
+            font.setBold (true);
+
+        QFontMetrics fm = aFM;
+        if (aLV->font() != font)
+            fm = QFontMetrics (font);
+
+        return QListViewItem::width (fm, aLV, aC);
+    }
+
+    void setup ()
+    {
+        QListViewItem::setup();
+        if (mBuiltIn)
+            setHeight (height() + 1);
     }
 
 private:
 
-    QString translate (const QTranslator &aTranslator, const char *aCtxt,
-                       const char *aSrc, const char *aCmnt, bool aBuiltIn)
-    {
-        QTranslatorMessage msg = aTranslator.findMessage (aCtxt, aSrc, aCmnt);
-        return msg.translation().isNull() && aBuiltIn ? QString (aSrc) : msg.translation();
-    }
+    QString tratra (const QTranslator &aTranslator, const char *aCtxt,
+                       const char *aSrc, const char *aCmnt)
+    {
+        QString msg = aTranslator.findMessage (aCtxt, aSrc, aCmnt).translation();
+        /* return the source text if no translation is found */
+        if (msg.isEmpty())
+            msg = QString (aSrc);
+        return msg;
+    }
+
+    bool mBuiltIn : 1;
+    bool mInvalid : 1;
 };
 
@@ -300 +356 @@
     lvLanguages->header()->hide();
     lvLanguages->setSorting (0);
-    QString nlsPath = qApp->applicationDirPath() + "/nls";
+    QString nlsPath = qApp->applicationDirPath() + gVBoxLangSubDir;
     QDir nlsDir (nlsPath);
-    QStringList files = nlsDir.entryList (transFileName + "*", QDir::Files);
+    QStringList files = nlsDir.entryList (QString ("%1*%2")
+                                          .arg (gVBoxLangFileBase, gVBoxLangFileExt),
+                                          QDir::Files);
     QTranslator translator;
-    new LanguageItem (lvLanguages, translator, builtInName, true /* built-in */);
-    new LanguageItem (lvLanguages, tr ("-"));
-    for (QStringList::Iterator it = files.begin(); it != files.end(); ++it)
-    {
-        const QString &fileName = *it;
-        bool status = translator.load (fileName, nlsPath);
-        if (!status) continue;
-
-        QRegExp regExp (transFileName + langIdRegExp);
+    /* add the built-in language */
+    new LanguageItem (lvLanguages, translator, gVBoxBuiltInLangName, true /* built-in */);
+    /* add all existing languages */
+    for (QStringList::Iterator it = files.begin(); it != files.end(); ++ it)
+    {
+        QString fileName = *it;
+        QRegExp regExp (QString (gVBoxLangFileBase) + gVBoxLangIDRegExp);
         int pos = regExp.search (fileName);
-        if (pos == -1) continue;
+        if (pos == -1)
+            continue;
+
+        bool loadOk = translator.load (fileName, nlsPath);
+        if (!loadOk)
+            continue;
 
         new LanguageItem (lvLanguages, translator, regExp.cap (1));
     }
+    lvLanguages->adjustColumn (0);
 
     /*
@@ -502 +564 @@
     /* language properties */
 
-    QListViewItem *item = lvLanguages->findItem (VBoxGlobal::languageID(), 1);
+    QString langId = gs.languageId();
+    QListViewItem *item = lvLanguages->findItem (langId, 1);
+    if (!item)
+    {
+        /* add an item for an invalid language to represent it in the list */
+        item = new LanguageItem (lvLanguages, langId);
+        lvLanguages->adjustColumn (0);
+    }
+    Assert (item);
     if (item)
     {
@@ -573 +643 @@
     if (mLanguageChanged && selItem)
     {
-        gs.setLanguageId (selItem->text (1) == VBoxGlobal::systemLanguageID() ?
+        gs.setLanguageId (selItem->text (1) == VBoxGlobal::systemLanguageId() ?
                           QString::null : selItem->text (1));
         VBoxGlobal::loadLanguage (selItem->text (1));
@@ -846 +916 @@
     tlLangData->setText (aItem->text (2));
     tlAuthorData->setText (aItem->text (3));
-    if (!mLanguageChanged)
-        mLanguageChanged = true;
-}
+    mLanguageChanged = true;
+}