Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp	(revision 33925)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp	(revision 33926)
@@ -25,32 +25,35 @@
 #include "VBoxGlobal.h"
 
+/* General page constructor: */
 UIGlobalSettingsGeneral::UIGlobalSettingsGeneral()
 {
-    /* Apply UI decorations */
-    Ui::UIGlobalSettingsGeneral::setupUi (this);
+    /* Apply UI decorations: */
+    Ui::UIGlobalSettingsGeneral::setupUi(this);
 
 #ifndef VBOX_GUI_WITH_SYSTRAY
-    mCbCheckTrayIcon->hide();
-    mWtSpacer1->hide();
+    m_pEnableTrayIconCheckbox->hide();
+    m_pSpacerWidget1->hide();
 #endif /* !VBOX_GUI_WITH_SYSTRAY */
 #ifndef Q_WS_MAC
-    mCbCheckPresentationMode->hide();
-    mWtSpacer2->hide();
+    m_pEnablePresentationModeCheckbox->hide();
+    m_pSpacerWidget2->hide();
 #endif /* !Q_WS_MAC */
 //#ifndef Q_WS_WIN /* Checkbox hidden for now! */
-    mCbDisableHostScreenSaver->hide();
-    mWtSpacer3->hide();
+    m_pDisableHostScreenSaverCheckbox->hide();
+    m_pSpacerWidget3->hide();
 //#endif /* !Q_WS_WIN */
 
-    if (mCbCheckTrayIcon->isHidden() &&
-        mCbCheckPresentationMode->isHidden() &&
-        mCbDisableHostScreenSaver->isHidden())
-        mLnSeparator2->hide();
+    /* If all checkboxes hidden, hide separator too: */
+    if (m_pEnableTrayIconCheckbox->isHidden() &&
+        m_pEnablePresentationModeCheckbox->isHidden() &&
+        m_pDisableHostScreenSaverCheckbox->isHidden())
+        m_pLineSeparator2->hide();
 
-    mPsMach->setHomeDir (vboxGlobal().virtualBox().GetHomeFolder());
-    mPsVRDP->setHomeDir (vboxGlobal().virtualBox().GetHomeFolder());
-    mPsVRDP->setMode (VBoxFilePathSelectorWidget::Mode_File_Open);
+    /* Setup widgets: */
+    m_pMachineFolderSelector->setHomeDir(vboxGlobal().virtualBox().GetHomeFolder());
+    m_pVRDPLibNameSelector->setHomeDir(vboxGlobal().virtualBox().GetHomeFolder());
+    m_pVRDPLibNameSelector->setMode(VBoxFilePathSelectorWidget::Mode_File_Open);
 
-    /* Applying language settings */
+    /* Apply language settings: */
     retranslateUi();
 }
@@ -81,11 +84,11 @@
 {
     /* Fetch from cache: */
-    mPsMach->setPath(m_cache.m_strDefaultMachineFolder);
-    mPsVRDP->setPath(m_cache.m_strVRDEAuthLibrary);
-    mCbCheckTrayIcon->setChecked(m_cache.m_fTrayIconEnabled);
+    m_pMachineFolderSelector->setPath(m_cache.m_strDefaultMachineFolder);
+    m_pVRDPLibNameSelector->setPath(m_cache.m_strVRDEAuthLibrary);
+    m_pEnableTrayIconCheckbox->setChecked(m_cache.m_fTrayIconEnabled);
 #ifdef Q_WS_MAC
-    mCbCheckPresentationMode->setChecked(m_cache.m_fPresentationModeEnabled);
+    m_pEnablePresentationModeCheckbox->setChecked(m_cache.m_fPresentationModeEnabled);
 #endif /* Q_WS_MAC */
-    mCbDisableHostScreenSaver->setChecked(m_cache.m_fHostScreenSaverDisables);
+    m_pDisableHostScreenSaverCheckbox->setChecked(m_cache.m_fHostScreenSaverDisables);
 }
 
@@ -95,11 +98,11 @@
 {
     /* Upload to cache: */
-    m_cache.m_strDefaultMachineFolder = mPsMach->path();
-    m_cache.m_strVRDEAuthLibrary = mPsVRDP->path();
-    m_cache.m_fTrayIconEnabled = mCbCheckTrayIcon->isChecked();
+    m_cache.m_strDefaultMachineFolder = m_pMachineFolderSelector->path();
+    m_cache.m_strVRDEAuthLibrary = m_pVRDPLibNameSelector->path();
+    m_cache.m_fTrayIconEnabled = m_pEnableTrayIconCheckbox->isChecked();
 #ifdef Q_WS_MAC
-    m_cache.m_fPresentationModeEnabled = mCbCheckPresentationMode->isChecked();
+    m_cache.m_fPresentationModeEnabled = m_pEnablePresentationModeCheckbox->isChecked();
 #endif /* Q_WS_MAC */
-    m_cache.m_fHostScreenSaverDisables = mCbDisableHostScreenSaver->isChecked();
+    m_cache.m_fHostScreenSaverDisables = m_pDisableHostScreenSaverCheckbox->isChecked();
 }
 
@@ -112,7 +115,7 @@
 
     /* Save from cache: */
-    if (m_properties.isOk() && mPsMach->isModified())
+    if (m_properties.isOk() && m_pMachineFolderSelector->isModified())
         m_properties.SetDefaultMachineFolder(m_cache.m_strDefaultMachineFolder);
-    if (m_properties.isOk() && mPsVRDP->isModified())
+    if (m_properties.isOk() && m_pVRDPLibNameSelector->isModified())
         m_properties.SetVRDEAuthLibrary(m_cache.m_strVRDEAuthLibrary);
     m_settings.setTrayIconEnabled(m_cache.m_fTrayIconEnabled);
@@ -126,25 +129,27 @@
 }
 
-void UIGlobalSettingsGeneral::setOrderAfter (QWidget *aWidget)
+/* Navigation stuff: */
+void UIGlobalSettingsGeneral::setOrderAfter(QWidget *pWidget)
 {
-    setTabOrder (aWidget, mPsMach);
-    setTabOrder (mPsMach, mPsVRDP);
-    setTabOrder (mPsVRDP, mCbCheckTrayIcon);
-    setTabOrder (mCbCheckTrayIcon, mCbCheckPresentationMode);
-    setTabOrder (mCbCheckPresentationMode, mCbDisableHostScreenSaver);
+    setTabOrder(pWidget, m_pMachineFolderSelector);
+    setTabOrder(m_pMachineFolderSelector, m_pVRDPLibNameSelector);
+    setTabOrder(m_pVRDPLibNameSelector, m_pEnableTrayIconCheckbox);
+    setTabOrder(m_pEnableTrayIconCheckbox, m_pEnablePresentationModeCheckbox);
+    setTabOrder(m_pEnablePresentationModeCheckbox, m_pDisableHostScreenSaverCheckbox);
 }
 
+/* Translation stuff: */
 void UIGlobalSettingsGeneral::retranslateUi()
 {
-    /* Translate uic generated strings */
-    Ui::UIGlobalSettingsGeneral::retranslateUi (this);
+    /* Translate uic generated strings: */
+    Ui::UIGlobalSettingsGeneral::retranslateUi(this);
 
-    mPsMach->setWhatsThis (tr ("Displays the path to the default virtual "
-                               "machine folder. This folder is used, if not "
-                               "explicitly specified otherwise, when creating "
-                               "new virtual machines."));
-    mPsVRDP->setWhatsThis (tr ("Displays the path to the library that "
-                               "provides authentication for Remote Display "
-                               "(VRDP) clients."));
+    m_pMachineFolderSelector->setWhatsThis(tr("Displays the path to the default virtual "
+                                              "machine folder. This folder is used, if not "
+                                              "explicitly specified otherwise, when creating "
+                                              "new virtual machines."));
+    m_pVRDPLibNameSelector->setWhatsThis(tr("Displays the path to the library that "
+                                            "provides authentication for Remote Display "
+                                            "(VRDP) clients."));
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h	(revision 33925)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h	(revision 33926)
@@ -20,4 +20,5 @@
 #define __UIGlobalSettingsGeneral_h__
 
+/* Local includes */
 #include "UISettingsPage.h"
 #include "UIGlobalSettingsGeneral.gen.h"
@@ -36,6 +37,5 @@
 
 /* Global settings / General page: */
-class UIGlobalSettingsGeneral : public UISettingsPageGlobal,
-                              public Ui::UIGlobalSettingsGeneral
+class UIGlobalSettingsGeneral : public UISettingsPageGlobal, public Ui::UIGlobalSettingsGeneral
 {
     Q_OBJECT;
@@ -43,4 +43,5 @@
 public:
 
+    /* Constructor: */
     UIGlobalSettingsGeneral();
 
@@ -61,6 +62,8 @@
     void saveFromCacheTo(QVariant &data);
 
+    /* Navigation stuff: */
     void setOrderAfter (QWidget *aWidget);
 
+    /* Translation stuff: */
     void retranslateUi();
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.ui	(revision 33925)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.ui	(revision 33926)
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <comment>
- VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
+ VBox frontends: Qt4 GUI ("VirtualBox"):
 
      Copyright (C) 2008-2010 Oracle Corporation
@@ -29,5 +28,5 @@
    </property>
    <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="mLbMach">
+    <widget class="QLabel" name="m_pMachineFolderLabel">
      <property name="text">
       <string>Default &amp;Machine Folder:</string>
@@ -37,10 +36,10 @@
      </property>
      <property name="buddy">
-      <cstring>mPsMach</cstring>
+      <cstring>m_pMachineFolderSelector</cstring>
      </property>
     </widget>
    </item>
    <item row="0" column="2">
-    <widget class="VBoxFilePathSelectorWidget" name="mPsMach">
+    <widget class="VBoxFilePathSelectorWidget" name="m_pMachineFolderSelector">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -52,5 +51,5 @@
    </item>
    <item row="1" column="0" colspan="3">
-    <widget class="Line" name="mLnSeparator">
+    <widget class="Line" name="m_pLineSeparator1">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -59,5 +58,5 @@
    </item>
    <item row="2" column="0" colspan="2">
-    <widget class="QLabel" name="mLbVRDP">
+    <widget class="QLabel" name="m_pVRDPLibLabel">
      <property name="text">
       <string>V&amp;RDP Authentication Library:</string>
@@ -67,10 +66,10 @@
      </property>
      <property name="buddy">
-      <cstring>mPsVRDP</cstring>
+      <cstring>m_pVRDPLibNameSelector</cstring>
      </property>
     </widget>
    </item>
    <item row="2" column="2">
-    <widget class="VBoxFilePathSelectorWidget" name="mPsVRDP">
+    <widget class="VBoxFilePathSelectorWidget" name="m_pVRDPLibNameSelector">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -82,5 +81,5 @@
    </item>
    <item row="3" column="0" colspan="3">
-    <widget class="Line" name="mLnSeparator2">
+    <widget class="Line" name="m_pLineSeparator2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -89,5 +88,5 @@
    </item>
    <item row="4" column="0">
-    <widget class="QWidget" name="mWtSpacer1">
+    <widget class="QWidget" name="m_pSpacerWidget1">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -102,5 +101,5 @@
    </item>
    <item row="4" column="1" colspan="2">
-    <widget class="QCheckBox" name="mCbCheckTrayIcon">
+    <widget class="QCheckBox" name="m_pEnableTrayIconCheckbox">
      <property name="whatsThis">
       <string>When checked, the application will provide an icon with the context menu in the system tray.</string>
@@ -115,5 +114,5 @@
    </item>
    <item row="5" column="0">
-    <widget class="QWidget" name="mWtSpacer2">
+    <widget class="QWidget" name="m_pSpacerWidget2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -128,5 +127,5 @@
    </item>
    <item row="5" column="1" colspan="2">
-    <widget class="QCheckBox" name="mCbCheckPresentationMode">
+    <widget class="QCheckBox" name="m_pEnablePresentationModeCheckbox">
      <property name="text">
       <string>&amp;Auto show Dock and Menubar in fullscreen</string>
@@ -135,5 +134,5 @@
    </item>
    <item row="6" column="0">
-    <widget class="QWidget" name="mWtSpacer3">
+    <widget class="QWidget" name="m_pSpacerWidget3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -148,5 +147,5 @@
    </item>
    <item row="6" column="1" colspan="2">
-    <widget class="QCheckBox" name="mCbDisableHostScreenSaver">
+    <widget class="QCheckBox" name="m_pDisableHostScreenSaverCheckbox">
      <property name="whatsThis">
       <string>When checked, the host screen saver will be disabled whenever a virtual machine is running.</string>