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

Timestamp:

Nov 11, 2010 10:00:58 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Global settings / Language page refactoring.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsLanguage.cpp (modified) (8 diffs)
• UIGlobalSettingsLanguage.h (modified) (4 diffs)
• UIGlobalSettingsLanguage.ui (modified) (4 diffs)

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

@@ -18 +18 @@
  */
 
-#include "UIGlobalSettingsLanguage.h"
-#include "VBoxGlobalSettings.h"
-#include "VBoxGlobal.h"
-
+/* Global includes */
+#include <QDir>
 #include <QHeaderView>
+#include <QPainter>
 #include <QTranslator>
-#include <QDir>
-#include <QPainter>
 
 #include <iprt/err.h>
@@ -31 +28 @@
 #include <iprt/path.h>
 #include <VBox/version.h>
+
+/* Local includes */
+#include "UIGlobalSettingsLanguage.h"
+#include "VBoxGlobalSettings.h"
+#include "VBoxGlobal.h"
 
 extern const char *gVBoxLangSubDir;
@@ -38 +40 @@
 extern const char *gVBoxBuiltInLangName;
 
-class LanguageItem : public QTreeWidgetItem
+/* Language item: */
+class UILanguageItem : public QTreeWidgetItem
 {
 public:
 
-    enum { LanguageItemType = QTreeWidgetItem::UserType + 1 };
-
-    LanguageItem (QTreeWidget *aParent, const QTranslator &aTranslator,
-                  const QString &aId, bool aBuiltIn = false)
-        : QTreeWidgetItem (aParent, LanguageItemType), mBuiltIn (aBuiltIn)
-    {
-        Assert (!aId.isEmpty());
+    /* Language item type: */
+    enum { UILanguageItemType = QTreeWidgetItem::UserType + 1 };
+
+    /* Language item constructor: */
+    UILanguageItem(QTreeWidget *pParent, const QTranslator &translator,
+                   const QString &strId, bool fBuiltIn = false)
+        : QTreeWidgetItem(pParent, UILanguageItemType), m_fBuiltIn(fBuiltIn)
+    {
+        Assert (!strId.isEmpty());
 
         /* Note: context/source/comment arguments below must match strings
@@ -55 +60 @@
          * 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,
-            "@@@", "Oracle Corporation", "Comma-separated list of translators");
-
-        QString itemName = nativeLanguage;
-        QString langName = englishLanguage;
-
-        if (!aBuiltIn)
+        QString strNativeLanguage = tratra(translator, "@@@", "English", "Native language name");
+        QString strNativeCountry = tratra(translator, "@@@", "--", "Native language country name "
+                                                                   "(empty if this language is for all countries)");
+
+        QString strEnglishLanguage = tratra(translator, "@@@", "English", "Language name, in English");
+        QString strEnglishCountry = tratra(translator, "@@@", "--", "Language country name, in English "
+                                                                    "(empty if native country name is empty)");
+
+        QString strTranslatorsName = tratra(translator, "@@@", "Oracle Corporation", "Comma-separated list of translators");
+
+        QString strItemName = strNativeLanguage;
+        QString strLanguageName = strEnglishLanguage;
+
+        if (!m_fBuiltIn)
         {
-            if (nativeCountry != "--")
-                itemName += " (" + nativeCountry + ")";
-
-            if (englishCountry != "--")
-                langName += " (" + englishCountry + ")";
-
-            if (itemName != langName)
-                langName = itemName + " / " + langName;
+            if (strNativeCountry != "--")
+                strItemName += " (" + strNativeCountry + ")";
+
+            if (strEnglishCountry != "--")
+                strLanguageName += " (" + strEnglishCountry + ")";
+
+            if (strItemName != strLanguageName)
+                strLanguageName = strItemName + " / " + strLanguageName;
         }
         else
         {
-            itemName += UIGlobalSettingsLanguage::tr (" (built-in)", "Language");
-            langName += UIGlobalSettingsLanguage::tr (" (built-in)", "Language");
+            strItemName += UIGlobalSettingsLanguage::tr(" (built-in)", "Language");
+            strLanguageName += UIGlobalSettingsLanguage::tr(" (built-in)", "Language");
         }
 
-        setText (0, itemName);
-        setText (1, aId);
-        setText (2, langName);
-        setText (3, translatorsName);
-
-        /* Current language appears in bold */
-        if (text (1) == VBoxGlobal::languageId())
+        setText(0, strItemName);
+        setText(1, strId);
+        setText(2, strLanguageName);
+        setText(3, strTranslatorsName);
+
+        /* Current language appears in bold: */
+        if (text(1) == VBoxGlobal::languageId())
         {
-            QFont fnt = font (0);
-            fnt.setBold (true);
-            setFont (0, fnt);
+            QFont fnt = font(0);
+            fnt.setBold(true);
+            setFont(0, fnt);
         }
     }
 
-    /* Constructs an item for an invalid language ID (i.e. when a language
-     * file is missing or corrupt). */
-    LanguageItem (QTreeWidget *aParent, const QString &aId)
-        : QTreeWidgetItem (aParent, LanguageItemType), mBuiltIn (false)
-    {
-        Assert (!aId.isEmpty());
-
-        setText (0, QString ("<%1>").arg (aId));
-        setText (1, aId);
-        setText (2, UIGlobalSettingsLanguage::tr ("<unavailable>", "Language"));
-        setText (3, UIGlobalSettingsLanguage::tr ("<unknown>", "Author(s)"));
-
-        /* Invalid language appears in italic */
-        QFont fnt = font (0);
-        fnt.setItalic (true);
-        setFont (0, fnt);
-    }
-
-    /* Constructs an item for the default language ID (column 1 will be set
-     * to QString::null) */
-    LanguageItem (QTreeWidget *aParent)
-        : QTreeWidgetItem (aParent, LanguageItemType), mBuiltIn (false)
-    {
-        setText (0, UIGlobalSettingsLanguage::tr ("Default", "Language"));
-        setText (1, QString::null);
+    /* Constructs an item for an invalid language ID
+     * (i.e. when a language file is missing or corrupt): */
+    UILanguageItem(QTreeWidget *pParent, const QString &strId)
+        : QTreeWidgetItem(pParent, UILanguageItemType), m_fBuiltIn(false)
+    {
+        Assert(!strId.isEmpty());
+
+        setText(0, QString("<%1>").arg(strId));
+        setText(1, strId);
+        setText(2, UIGlobalSettingsLanguage::tr("<unavailable>", "Language"));
+        setText(3, UIGlobalSettingsLanguage::tr("<unknown>", "Author(s)"));
+
+        /* Invalid language appears in italic: */
+        QFont fnt = font(0);
+        fnt.setItalic(true);
+        setFont(0, fnt);
+    }
+
+    /* Constructs an item for the default language ID
+     * (column 1 will be set to QString::null): */
+    UILanguageItem(QTreeWidget *pParent)
+        : QTreeWidgetItem(pParent, UILanguageItemType), m_fBuiltIn(false)
+    {
+        setText(0, UIGlobalSettingsLanguage::tr("Default", "Language"));
+        setText(1, QString::null);
         /* Empty strings of some reasonable length to prevent the info part
          * from being shrinked too much when the list wants to be wider */
-        setText (2, "                ");
-        setText (3, "                ");
-    }
-
-    bool isBuiltIn() const { return mBuiltIn; }
-
-    bool operator< (const QTreeWidgetItem &aOther) const
-    {
-        QString thisId = text (1);
-        QString thatId = aOther.text (1);
+        setText(2, "                ");
+        setText(3, "                ");
+    }
+
+    bool isBuiltIn() const { return m_fBuiltIn; }
+
+    bool operator<(const QTreeWidgetItem &other) const
+    {
+        QString thisId = text(1);
+        QString thatId = other.text(1);
         if (thisId.isNull())
             return true;
         if (thatId.isNull())
             return false;
-        if (mBuiltIn)
+        if (m_fBuiltIn)
             return true;
-        if (aOther.type() == LanguageItemType && ((LanguageItem*) &aOther)->mBuiltIn)
+        if (other.type() == UILanguageItemType && ((UILanguageItem*)&other)->m_fBuiltIn)
             return false;
-        return QTreeWidgetItem::operator< (aOther);
+        return QTreeWidgetItem::operator<(other);
     }
 
 private:
 
-    QString tratra (const QTranslator &aTranslator, const char *aCtxt,
-                    const char *aSrc, const char *aCmnt)
-    {
-        QString msg = aTranslator.translate (aCtxt, aSrc, aCmnt);
-        /* return the source text if no translation is found */
-        if (msg.isEmpty())
-            msg = QString (aSrc);
-        return msg;
-    }
-
-    bool mBuiltIn : 1;
+    QString tratra(const QTranslator &translator, const char *pCtxt,
+                   const char *pSrc, const char *pCmnt)
+    {
+        QString strMsg = translator.translate(pCtxt, pSrc, pCmnt);
+        /* Return the source text if no translation is found: */
+        if (strMsg.isEmpty())
+            strMsg = QString(pSrc);
+        return strMsg;
+    }
+
+    bool m_fBuiltIn : 1;
 };
 
-
+/* Language page constructor: */
 UIGlobalSettingsLanguage::UIGlobalSettingsLanguage()
-    : mLanguageChanged(false)
-{
-    /* Apply UI decorations */
-    Ui::UIGlobalSettingsLanguage::setupUi (this);
-
-    /* Setup dialog */
-    mTwLanguage->header()->hide();
-    mTwLanguage->hideColumn (1);
-    mTwLanguage->hideColumn (2);
-    mTwLanguage->hideColumn (3);
-
-    /* Setup Connections */
-    connect (mTwLanguage, SIGNAL (painted (QTreeWidgetItem *, QPainter *)),
-             this, SLOT (mTwItemPainted (QTreeWidgetItem *, QPainter *)));
-    connect (mTwLanguage, SIGNAL (currentItemChanged (QTreeWidgetItem *, QTreeWidgetItem *)),
-             this, SLOT (mTwLanguageChanged (QTreeWidgetItem *)));
-
-    /* Applying language settings */
+    : m_fIsLanguageChanged(false)
+{
+    /* Apply UI decorations: */
+    Ui::UIGlobalSettingsLanguage::setupUi(this);
+
+    /* Setup widgets: */
+    m_pLanguageTree->header()->hide();
+    m_pLanguageTree->hideColumn(1);
+    m_pLanguageTree->hideColumn(2);
+    m_pLanguageTree->hideColumn(3);
+
+    /* Setup connections: */
+    connect(m_pLanguageTree, SIGNAL(painted(QTreeWidgetItem*, QPainter*)),
+            this, SLOT(sltLanguageItemPainted(QTreeWidgetItem*, QPainter*)));
+    connect(m_pLanguageTree, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
+            this, SLOT(sltCurrentLanguageChanged(QTreeWidgetItem*)));
+
+    /* Apply language settings: */
     retranslateUi();
 }
@@ -210 +210 @@
     /* Fetch from cache: */
     reload(m_cache.m_strLanguageId);
-    mTxName->setFixedHeight(fontMetrics().height() * 4);
+    m_pLanguageInfo->setFixedHeight(fontMetrics().height() * 4);
 }
 
@@ -218 +218 @@
 {
     /* Upload to cache: */
-    QTreeWidgetItem *pCurrentItem = mTwLanguage->currentItem();
+    QTreeWidgetItem *pCurrentItem = m_pLanguageTree->currentItem();
     Assert(pCurrentItem);
     if (pCurrentItem)
@@ -232 +232 @@
 
     /* Save from cache: */
-    if (mLanguageChanged)
+    if (m_fIsLanguageChanged)
     {
         m_settings.setLanguageId(m_cache.m_strLanguageId);
@@ -242 +242 @@
 }
 
-void UIGlobalSettingsLanguage::setOrderAfter (QWidget *aWidget)
-{
-    setTabOrder (aWidget, mTwLanguage);
-}
-
-void UIGlobalSettingsLanguage::reload (const QString &aLangId)
-{
-    /* Clear languages list */
-    mTwLanguage->clear();
-
-    /* Load languages list */
-    char szNlsPath [RTPATH_MAX];
-    int rc = RTPathAppPrivateNoArch (szNlsPath, sizeof(szNlsPath));
-    AssertRC (rc);
-    QString nlsPath = QString (szNlsPath) + gVBoxLangSubDir;
-    QDir nlsDir (nlsPath);
-    QStringList files = nlsDir.entryList (QStringList (QString ("%1*%2")
-        .arg (gVBoxLangFileBase, gVBoxLangFileExt)), QDir::Files);
+/* Navigation stuff: */
+void UIGlobalSettingsLanguage::setOrderAfter(QWidget *pWidget)
+{
+    setTabOrder(pWidget, m_pLanguageTree);
+}
+
+/* Translation stuff: */
+void UIGlobalSettingsLanguage::retranslateUi()
+{
+    /* Translate uic generated strings: */
+    Ui::UIGlobalSettingsLanguage::retranslateUi(this);
+
+    /* Reload language tree: */
+    reload(VBoxGlobal::languageId());
+}
+
+/* Reload language tree: */
+void UIGlobalSettingsLanguage::reload(const QString &strLangId)
+{
+    /* Clear languages tree: */
+    m_pLanguageTree->clear();
+
+    /* Load languages tree: */
+    char szNlsPath[RTPATH_MAX];
+    int rc = RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
+    AssertRC(rc);
+    QString strNlsPath = QString(szNlsPath) + gVBoxLangSubDir;
+    QDir nlsDir(strNlsPath);
+    QStringList files = nlsDir.entryList(QStringList(QString("%1*%2").arg(gVBoxLangFileBase, gVBoxLangFileExt)), QDir::Files);
 
     QTranslator translator;
-    /* Add the default language */
-    new LanguageItem (mTwLanguage);
-    /* Add the built-in language */
-    new LanguageItem (mTwLanguage, translator, gVBoxBuiltInLangName, true /* built-in */);
+    /* Add the default language: */
+    new UILanguageItem(m_pLanguageTree);
+    /* Add the built-in language: */
+    new UILanguageItem(m_pLanguageTree, 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.indexIn (fileName);
-        if (pos == -1)
+    for (QStringList::Iterator it = files.begin(); it != files.end(); ++it)
+    {
+        QString strFileName = *it;
+        QRegExp regExp(QString(gVBoxLangFileBase) + gVBoxLangIDRegExp);
+        int iPos = regExp.indexIn(strFileName);
+        if (iPos == -1)
             continue;
 
-        /* Skip any English version, cause this is extra handled. */
-        QString lang = regExp.cap (2);
-        if (lang.toLower() == "en")
+        /* Skip any English version, cause this is extra handled: */
+        QString strLanguage = regExp.cap(2);
+        if (strLanguage.toLower() == "en")
             continue;
 
-        bool loadOk = translator.load (fileName, nlsPath);
-        if (!loadOk)
+        bool fLoadOk = translator.load(strFileName, strNlsPath);
+        if (!fLoadOk)
             continue;
 
-        new LanguageItem (mTwLanguage, translator, regExp.cap (1));
-    }
-
-    /* Adjust selector list */
+        new UILanguageItem(m_pLanguageTree, translator, regExp.cap(1));
+    }
+
+    /* Adjust selector list: */
 #ifdef Q_WS_MAC
-    int width = qMax (static_cast<QAbstractItemView*> (mTwLanguage)
-        ->sizeHintForColumn (0) + 2 * mTwLanguage->frameWidth() +
-        QApplication::style()->pixelMetric (QStyle::PM_ScrollBarExtent),
-        220);
-    mTwLanguage->setFixedWidth (width);
+    int width = qMax(static_cast<QAbstractItemView*>(m_pLanguageTree)->sizeHintForColumn(0) +
+                     2 * m_pLanguageTree->frameWidth() + QApplication::style()->pixelMetric(QStyle::PM_ScrollBarExtent),
+                     220);
+    m_pLanguageTree->setFixedWidth(width);
 #else /* Q_WS_MAC */
-    mTwLanguage->setMinimumWidth (static_cast<QAbstractItemView*> (mTwLanguage)
-        ->sizeHintForColumn (0) + 2 * mTwLanguage->frameWidth() +
-        QApplication::style()->pixelMetric (QStyle::PM_ScrollBarExtent));
+    m_pLanguageTree->setMinimumWidth(static_cast<QAbstractItemView*>(m_pLanguageTree)->sizeHintForColumn(0) +
+                                     2 * m_pLanguageTree->frameWidth() + QApplication::style()->pixelMetric(QStyle::PM_ScrollBarExtent));
 #endif /* Q_WS_MAC */
-    mTwLanguage->resizeColumnToContents (0);
-
-    /* Search for necessary language */
-    QList<QTreeWidgetItem*> itemsList =
-        mTwLanguage->findItems (aLangId, Qt::MatchExactly, 1);
-    QTreeWidgetItem *item = itemsList.isEmpty() ? 0 : itemsList [0];
-    if (!item)
-    {
-        /* Add an item for an invalid language to represent it in the list */
-        item = new LanguageItem (mTwLanguage, aLangId);
-        mTwLanguage->resizeColumnToContents (0);
-    }
-    Assert (item);
-    if (item)
-        mTwLanguage->setCurrentItem (item);
-
-    mTwLanguage->sortItems (0, Qt::AscendingOrder);
-    mTwLanguage->scrollToItem (item);
-    mLanguageChanged = false;
-}
-
-void UIGlobalSettingsLanguage::retranslateUi()
-{
-    /* Translate uic generated strings */
-    Ui::UIGlobalSettingsLanguage::retranslateUi (this);
-    reload (VBoxGlobal::languageId());
-}
-
-void UIGlobalSettingsLanguage::mTwItemPainted (QTreeWidgetItem *aItem, QPainter *aPainter)
-{
-    if (aItem && aItem->type() == LanguageItem::LanguageItemType)
-    {
-        LanguageItem *item = static_cast <LanguageItem*> (aItem);
-        if (item->isBuiltIn())
+    m_pLanguageTree->resizeColumnToContents(0);
+
+    /* Search for necessary language: */
+    QList<QTreeWidgetItem*> itemsList = m_pLanguageTree->findItems(strLangId, Qt::MatchExactly, 1);
+    QTreeWidgetItem *pItem = itemsList.isEmpty() ? 0 : itemsList[0];
+    if (!pItem)
+    {
+        /* Add an pItem for an invalid language to represent it in the list: */
+        pItem = new UILanguageItem(m_pLanguageTree, strLangId);
+        m_pLanguageTree->resizeColumnToContents(0);
+    }
+    Assert(pItem);
+    if (pItem)
+        m_pLanguageTree->setCurrentItem(pItem);
+
+    m_pLanguageTree->sortItems(0, Qt::AscendingOrder);
+    m_pLanguageTree->scrollToItem(pItem);
+    m_fIsLanguageChanged = false;
+}
+
+/* Routine to paint language items: */
+void UIGlobalSettingsLanguage::sltLanguageItemPainted(QTreeWidgetItem *pItem, QPainter *pPainter)
+{
+    if (pItem && pItem->type() == UILanguageItem::UILanguageItemType)
+    {
+        UILanguageItem *pLanguageItem = static_cast<UILanguageItem*>(pItem);
+        if (pLanguageItem->isBuiltIn())
         {
-            QRect rect = mTwLanguage->visualItemRect (item);
-            aPainter->setPen (mTwLanguage->palette().color (QPalette::Mid));
-            aPainter->drawLine (rect.x(), rect.y() + rect.height() - 1,
-                                rect.x() + rect.width(), rect.y() + rect.height() - 1);
+            QRect rect = m_pLanguageTree->visualItemRect(pLanguageItem);
+            pPainter->setPen(m_pLanguageTree->palette().color(QPalette::Mid));
+            pPainter->drawLine(rect.x(), rect.y() + rect.height() - 1,
+                               rect.x() + rect.width(), rect.y() + rect.height() - 1);
         }
     }
 }
 
-void UIGlobalSettingsLanguage::mTwLanguageChanged (QTreeWidgetItem *aItem)
-{
-    if (!aItem) return;
-
-    /* Disable labels for the Default language item */
-    bool enabled = !aItem->text (1).isNull();
-
-    mTxName->setEnabled (enabled);
-    mTxName->setText (QString ("<table>"
-                               "<tr><td>%1&nbsp;</td><td>%2</td></tr>"
-                               "<tr><td>%3&nbsp;</td><td>%4</td></tr>"
-                               "</table>")
-                      .arg (tr ("Language:"))
-                      .arg (aItem->text (2))
-                      .arg (tr ("Author(s):"))
-                      .arg (aItem->text (3)));
-
-    mLanguageChanged = true;
-}
-
+/* Slot to handle currentl language change fact: */
+void UIGlobalSettingsLanguage::sltCurrentLanguageChanged(QTreeWidgetItem *pItem)
+{
+    if (!pItem) return;
+
+    /* Disable labels for the Default language item: */
+    bool fEnabled = !pItem->text (1).isNull();
+
+    m_pLanguageInfo->setEnabled(fEnabled);
+    m_pLanguageInfo->setText(QString("<table>"
+                             "<tr><td>%1&nbsp;</td><td>%2</td></tr>"
+                             "<tr><td>%3&nbsp;</td><td>%4</td></tr>"
+                             "</table>")
+                             .arg(tr("Language:"))
+                             .arg(pItem->text(2))
+                             .arg(tr("Author(s):"))
+                             .arg(pItem->text(3)));
+
+    m_fIsLanguageChanged = true;
+}
+

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

@@ -20 +20 @@
 #define __UIGlobalSettingsLanguage_h__
 
+/* Local includes */
 #include "UISettingsPage.h"
 #include "UIGlobalSettingsLanguage.gen.h"
@@ -30 +31 @@
 
 /* Global settings / Language page: */
-class UIGlobalSettingsLanguage : public UISettingsPageGlobal,
-                               public Ui::UIGlobalSettingsLanguage
+class UIGlobalSettingsLanguage : public UISettingsPageGlobal, public Ui::UIGlobalSettingsLanguage
 {
     Q_OBJECT;
@@ -37 +37 @@
 public:
 
+    /* Constructor: */
     UIGlobalSettingsLanguage();
 
@@ -55 +56 @@
     void saveFromCacheTo(QVariant &data);
 
-    void setOrderAfter (QWidget *aWidget);
+    /* Navigation stuff: */
+    void setOrderAfter(QWidget *pWidget);
 
-    void reload (const QString &aLangId);
+    /* Translation stuff: */
+    void retranslateUi();
 
-    void retranslateUi();
+    /* Reload language tree: */
+    void reload(const QString &strLangId);
 
 private slots:
 
-    void mTwItemPainted (QTreeWidgetItem *aItem, QPainter *aPainter);
-    void mTwLanguageChanged (QTreeWidgetItem *aItem);
+    /* Routine to paint language items: */
+    void sltLanguageItemPainted(QTreeWidgetItem *pItem, QPainter *pPainter);
+
+    /* Slot to handle current language change signal: */
+    void sltCurrentLanguageChanged(QTreeWidgetItem *pItem);
 
 private:
 
-    bool mLanguageChanged;
+    /* Edited flag: */
+    bool m_fIsLanguageChanged;
 
     /* Cache: */

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

@@ -3 +3 @@
  VBox frontends: Qt4 GUI ("VirtualBox"):
 
-     Copyright (C) 2008 Oracle Corporation
+     Copyright (C) 2008-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
@@ -41 +41 @@
    </item>
    <item row="0" column="1" colspan="2" >
-    <widget class="QLabel" name="mGbLanguage" >
+    <widget class="QLabel" name="m_pLanguageLabel" >
      <property name="text" >
       <string>&amp;Interface Language:</string>
      </property>
      <property name="buddy" >
-      <cstring>mTwLanguage</cstring>
+      <cstring>m_pLanguageTree</cstring>
      </property>
     </widget>
@@ -67 +67 @@
    </item>
    <item row="1" column="2" >
-    <widget class="QITreeWidget" name="mTwLanguage" >
+    <widget class="QITreeWidget" name="m_pLanguageTree" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@@ -109 +109 @@
    </item>
    <item row="2" column="2" >
-    <widget class="QILabel" name="mTxName" >
+    <widget class="QILabel" name="m_pLanguageInfo" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >