Changeset 2068 in vbox for trunk/src/VBox/Frontends/VirtualBox/ui

Timestamp:

Apr 13, 2007 10:01:20 AM (18 years ago)

Author:

vboxsync

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

20375

Message:

FE/Qt: Added the Default choice for to the language selection UI.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxGlobalSettingsDlg.ui (modified) (1 diff)
• VBoxGlobalSettingsDlg.ui.h (modified) (7 diffs)

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

@@ -813 +813 @@
                                 <property name="whatsThis" stdset="0">
                                     <string>
-Lists all available user interface languages. The effective language
-is written in &lt;b&gt;bold&lt;/b&gt;.
+Lists all available user interface languages. The effective language is
+written in &lt;b&gt;bold&lt;/b&gt;. Select &lt;i&gt;Default&lt;/i&gt; to reset
+to the system default language.
                                     </string>
                                 </property>

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

@@ -90 +90 @@
         : QListViewItem (aParent), mBuiltIn (aBuiltIn), mInvalid (false)
     {
+        Assert (!aId.isEmpty());
+
         QTranslatorMessage transMes;
 
@@ -143 +145 @@
         : QListViewItem (aParent), mBuiltIn (false), mInvalid (true)
     {
+        Assert (!aId.isEmpty());
+
         setText (0, QString ("<%1>").arg (aId));
         setText (1, aId);
@@ -149 +153 @@
     }
 
+    /* Constructs an item for the default language ID (column 1 will be set
+     * to QString::null) */
+    LanguageItem (QListView *aParent)
+        : QListViewItem (aParent), mBuiltIn (false), mInvalid (false)
+    {
+        setText (0, VBoxGlobalSettingsDlg::tr ("Default", "Language"));
+        setText (1, QString::null);
+        setText (2, QString::null);
+        setText (3, QString::null);
+    }
+
     int rtti() const { return TypeId; }
 
     int compare (QListViewItem *aItem, int aColumn, bool aAscending) const
     {
-        QString thisValue = text (1);
-        QString thatValue = aItem->text (1);
-        if (thisValue == gVBoxBuiltInLangName)
+        QString thisId = text (1);
+        QString thatId = aItem->text (1);
+        if (thisId.isNull())
             return -1;
-        else if (thatValue == gVBoxBuiltInLangName)
+        if (thatId.isNull())
             return 1;
-        else
-            return QListViewItem::compare (aItem, aColumn, aAscending);
+        if (mBuiltIn)
+            return -1;
+        if (aItem->rtti() == TypeId && ((LanguageItem *) aItem)->mBuiltIn)
+            return 1;
+        return QListViewItem::compare (aItem, aColumn, aAscending);
     }
 
@@ -362 +380 @@
                                           QDir::Files);
     QTranslator translator;
+    /* add the default language */
+    new LanguageItem (lvLanguages);
     /* add the built-in language */
     new LanguageItem (lvLanguages, translator, gVBoxBuiltInLangName, true /* built-in */);
@@ -565 +585 @@
 
     QString langId = gs.languageId();
-    if (langId.isNull())
-        langId = VBoxGlobal::languageId();
     QListViewItem *item = lvLanguages->findItem (langId, 1);
     if (!item)
@@ -643 +661 @@
 
     QListViewItem *selItem = lvLanguages->selectedItem();
+    Assert (selItem);
     if (mLanguageChanged && selItem)
     {
-        gs.setLanguageId (selItem->text (1) == VBoxGlobal::systemLanguageId() ?
-                          QString::null : selItem->text (1));
+        gs.setLanguageId (selItem->text (1));
         VBoxGlobal::loadLanguage (selItem->text (1));
     }
@@ -914 +932 @@
 void VBoxGlobalSettingsDlg::lvLanguages_currentChanged (QListViewItem *aItem)
 {
+    Assert (aItem);
     if (!aItem) return;
 
+    /* disable labels for the Default language item */
+    bool enabled = !aItem->text (1).isNull();
+
+    tlLangName->setEnabled (enabled);
+    tlAuthorName->setEnabled (enabled);
     tlLangData->setText (aItem->text (2));
     tlAuthorData->setText (aItem->text (3));
+
     mLanguageChanged = true;
 }