Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.cpp	(revision 94395)
@@ -42,18 +42,10 @@
 void UIAudioControllerEditor::setValue(KAudioControllerType enmValue)
 {
-    if (m_pCombo)
+    /* Update cached value and
+     * combo if value has changed: */
+    if (m_enmValue != enmValue)
     {
-        /* Update cached value and
-         * combo if value has changed: */
-        if (m_enmValue != enmValue)
-        {
-            m_enmValue = enmValue;
-            populateCombo();
-        }
-
-        /* Look for proper index to choose: */
-        int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
-        if (iIndex != -1)
-            m_pCombo->setCurrentIndex(iIndex);
+        m_enmValue = enmValue;
+        populateCombo();
     }
 }
@@ -66,5 +58,5 @@
 int UIAudioControllerEditor::minimumLabelHorizontalHint() const
 {
-    return m_pLabel->minimumSizeHint().width();
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
@@ -89,10 +81,4 @@
                                 "VirtualBox will provide different audio hardware to the virtual machine."));
     }
-}
-
-void UIAudioControllerEditor::sltHandleCurrentIndexChanged()
-{
-    if (m_pCombo)
-        emit sigValueChanged(m_pCombo->itemData(m_pCombo->currentIndex()).value<KAudioControllerType>());
 }
 
@@ -125,6 +111,4 @@
                 if (m_pLabel)
                     m_pLabel->setBuddy(m_pCombo);
-                connect(m_pCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-                        this, &UIAudioControllerEditor::sltHandleCurrentIndexChanged);
                 pComboLayout->addWidget(m_pCombo);
             }
@@ -165,4 +149,9 @@
             m_pCombo->addItem(QString(), QVariant::fromValue(enmType));
 
+        /* Look for proper index to choose: */
+        const int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
+        if (iIndex != -1)
+            m_pCombo->setCurrentIndex(iIndex);
+
         /* Retranslate finally: */
         retranslateUi();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioControllerEditor.h	(revision 94395)
@@ -42,12 +42,7 @@
     Q_OBJECT;
 
-signals:
-
-    /** Notifies listeners about @a enmValue change. */
-    void sigValueChanged(KAudioControllerType enmValue);
-
 public:
 
-    /** Constructs audio controller editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIAudioControllerEditor(QWidget *pParent = 0);
 
@@ -69,9 +64,4 @@
     /** Handles translation event. */
     virtual void retranslateUi() RT_OVERRIDE;
-
-private slots:
-
-    /** Handles current index change. */
-    void sltHandleCurrentIndexChanged();
 
 private:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.cpp	(revision 94395)
@@ -42,18 +42,10 @@
 void UIAudioHostDriverEditor::setValue(KAudioDriverType enmValue)
 {
-    if (m_pCombo)
+    /* Update cached value and
+     * combo if value has changed: */
+    if (m_enmValue != enmValue)
     {
-        /* Update cached value and
-         * combo if value has changed: */
-        if (m_enmValue != enmValue)
-        {
-            m_enmValue = enmValue;
-            populateCombo();
-        }
-
-        /* Look for proper index to choose: */
-        int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
-        if (iIndex != -1)
-            m_pCombo->setCurrentIndex(iIndex);
+        m_enmValue = enmValue;
+        populateCombo();
     }
 }
@@ -66,5 +58,5 @@
 int UIAudioHostDriverEditor::minimumLabelHorizontalHint() const
 {
-    return m_pLabel->minimumSizeHint().width();
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
@@ -89,10 +81,4 @@
                                 "see an audio card, however every access to it will be ignored."));
     }
-}
-
-void UIAudioHostDriverEditor::sltHandleCurrentIndexChanged()
-{
-    if (m_pCombo)
-        emit sigValueChanged(m_pCombo->itemData(m_pCombo->currentIndex()).value<KAudioDriverType>());
 }
 
@@ -125,6 +111,4 @@
                 if (m_pLabel)
                     m_pLabel->setBuddy(m_pCombo);
-                connect(m_pCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-                        this, &UIAudioHostDriverEditor::sltHandleCurrentIndexChanged);
                 pComboLayout->addWidget(m_pCombo);
             }
@@ -165,4 +149,9 @@
             m_pCombo->addItem(QString(), QVariant::fromValue(enmType));
 
+        /* Look for proper index to choose: */
+        const int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
+        if (iIndex != -1)
+            m_pCombo->setCurrentIndex(iIndex);
+
         /* Retranslate finally: */
         retranslateUi();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAudioHostDriverEditor.h	(revision 94395)
@@ -42,12 +42,7 @@
     Q_OBJECT;
 
-signals:
-
-    /** Notifies listeners about @a enmValue change. */
-    void sigValueChanged(KAudioDriverType enmValue);
-
 public:
 
-    /** Constructs audio host driver editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIAudioHostDriverEditor(QWidget *pParent = 0);
 
@@ -69,9 +64,4 @@
     /** Handles translation event. */
     virtual void retranslateUi() RT_OVERRIDE;
-
-private slots:
-
-    /** Handles current index change. */
-    void sltHandleCurrentIndexChanged();
 
 private:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.cpp	(revision 94395)
@@ -36,13 +36,11 @@
 void UIAutoCaptureKeyboardEditor::setValue(bool fValue)
 {
-    if (m_pCheckBox)
+    /* Update cached value and
+     * check-box if value has changed: */
+    if (m_fValue != fValue)
     {
-        /* Update cached value and
-         * check-box if value has changed: */
-        if (m_fValue != fValue)
-        {
-            m_fValue = fValue;
-            m_pCheckBox->setCheckState(fValue ? Qt::Checked : Qt::Unchecked);
-        }
+        m_fValue = fValue;
+        if (m_pCheckBox)
+            m_pCheckBox->setCheckState(m_fValue ? Qt::Checked : Qt::Unchecked);
     }
 }
@@ -59,8 +57,8 @@
     if (m_pCheckBox)
     {
+        m_pCheckBox->setText(tr("&Auto Capture Keyboard"));
         m_pCheckBox->setToolTip(tr("When checked, the keyboard is automatically captured every time the VM window is "
                                    "activated. When the keyboard is captured, all keystrokes (including system ones like "
                                    "Alt-Tab) are directed to the VM."));
-        m_pCheckBox->setText(tr("&Auto Capture Keyboard"));
     }
 }
@@ -69,18 +67,18 @@
 {
     /* Prepare main layout: */
-    QGridLayout *pLayoutMain = new QGridLayout(this);
-    if (pLayoutMain)
+    QGridLayout *pLayout = new QGridLayout(this);
+    if (pLayout)
     {
-        pLayoutMain->setContentsMargins(0, 0, 0, 0);
-        pLayoutMain->setColumnStretch(1, 1);
+        pLayout->setContentsMargins(0, 0, 0, 0);
+        pLayout->setColumnStretch(1, 1);
 
         /* Prepare label: */
         m_pLabel = new QLabel(this);
         if (m_pLabel)
-            pLayoutMain->addWidget(m_pLabel, 0, 0);
+            pLayout->addWidget(m_pLabel, 0, 0);
         /* Prepare check-box: */
         m_pCheckBox = new QCheckBox(this);
         if (m_pCheckBox)
-            pLayoutMain->addWidget(m_pCheckBox, 0, 1);
+            pLayout->addWidget(m_pCheckBox, 0, 1);
     }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIAutoCaptureKeyboardEditor.h	(revision 94395)
@@ -36,5 +36,5 @@
 public:
 
-    /** Constructs auto capture keyboard editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIAutoCaptureKeyboardEditor(QWidget *pParent = 0);
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.cpp	(revision 94395)
@@ -62,11 +62,11 @@
 
     /** Holds the minimum RAM. */
-    uint m_uMinRAM;
+    uint  m_uMinRAM;
     /** Holds the maximum optimal RAM. */
-    uint m_uMaxRAMOpt;
+    uint  m_uMaxRAMOpt;
     /** Holds the maximum allowed RAM. */
-    uint m_uMaxRAMAlw;
+    uint  m_uMaxRAMAlw;
     /** Holds the maximum possible RAM. */
-    uint m_uMaxRAM;
+    uint  m_uMaxRAM;
 };
 
@@ -83,5 +83,4 @@
   , m_uMaxRAM(0)
 {
-    /* Prepare: */
     prepare();
 }
@@ -94,5 +93,4 @@
   , m_uMaxRAM(0)
 {
-    /* Prepare: */
     prepare();
 }
@@ -243,4 +241,5 @@
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fWithLabel(fWithLabel)
+    , m_iValue(0)
     , m_pLabelMemory(0)
     , m_pSlider(0)
@@ -254,11 +253,17 @@
 void UIBaseMemoryEditor::setValue(int iValue)
 {
-    if (m_pSlider)
-        m_pSlider->setValue(iValue);
+    /* Update cached value and
+     * slider if value has changed: */
+    if (m_iValue != iValue)
+    {
+        m_iValue = iValue;
+        if (m_pSlider)
+            m_pSlider->setValue(m_iValue);
+    }
 }
 
 int UIBaseMemoryEditor::value() const
 {
-    return m_pSlider ? m_pSlider->value() : 0;
+    return m_pSlider ? m_pSlider->value() : m_iValue;
 }
 
@@ -324,8 +329,8 @@
 {
     /* Create main layout: */
-    QGridLayout *pMainLayout = new QGridLayout(this);
-    if (pMainLayout)
-    {
-        pMainLayout->setContentsMargins(0, 0, 0, 0);
+    QGridLayout *pLayout = new QGridLayout(this);
+    if (pLayout)
+    {
+        pLayout->setContentsMargins(0, 0, 0, 0);
         int iRow = 0;
 
@@ -334,5 +339,5 @@
             m_pLabelMemory = new QLabel(this);
         if (m_pLabelMemory)
-            pMainLayout->addWidget(m_pLabelMemory, 0, iRow++, 1, 1);
+            pLayout->addWidget(m_pLabelMemory, 0, iRow++, 1, 1);
 
         /* Create slider layout: */
@@ -376,5 +381,5 @@
 
             /* Add slider layout to main layout: */
-            pMainLayout->addLayout(pSliderLayout, 0, iRow++, 2, 1);
+            pLayout->addLayout(pSliderLayout, 0, iRow++, 2, 1);
         }
 
@@ -390,5 +395,5 @@
             connect(m_pSpinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
                     this, &UIBaseMemoryEditor::sltHandleSpinBoxChange);
-            pMainLayout->addWidget(m_pSpinBox, 0, iRow++, 1, 1);
+            pLayout->addWidget(m_pSpinBox, 0, iRow++, 1, 1);
         }
     }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBaseMemoryEditor.h	(revision 94395)
@@ -43,9 +43,10 @@
     /** Notifies listeners about value has became @a fValid. */
     void sigValidChanged(bool fValid);
+    /** Notifies listeners about @a iValue has changed. */
     void sigValueChanged(int iValue);
 
 public:
 
-    /** Constructs base-memory editor passing @a pParent to the base-class.
+    /** Constructs editor passing @a pParent to the base-class.
       * @param  fWithLabel  Brings whether we should add label ourselves. */
     UIBaseMemoryEditor(QWidget *pParent = 0, bool fWithLabel = false);
@@ -84,14 +85,20 @@
     bool  m_fWithLabel;
 
-    /** Holds the memory label instance. */
-    QLabel             *m_pLabelMemory;
-    /** Holds the memory slider instance. */
-    UIBaseMemorySlider *m_pSlider;
-    /** Holds minimum memory label instance. */
-    QLabel             *m_pLabelMemoryMin;
-    /** Holds maximum memory label instance. */
-    QLabel             *m_pLabelMemoryMax;
-    /** Holds the memory spin-box instance. */
-    QSpinBox           *m_pSpinBox;
+    /** Holds the value to be selected. */
+    int  m_iValue;
+
+    /** @name Widgets
+     * @{ */
+        /** Holds the memory label instance. */
+        QLabel             *m_pLabelMemory;
+        /** Holds the memory slider instance. */
+        UIBaseMemorySlider *m_pSlider;
+        /** Holds minimum memory label instance. */
+        QLabel             *m_pLabelMemoryMin;
+        /** Holds maximum memory label instance. */
+        QLabel             *m_pLabelMemoryMax;
+        /** Holds the memory spin-box instance. */
+        QSpinBox           *m_pSpinBox;
+    /** @} */
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.cpp	(revision 94395)
@@ -486,8 +486,8 @@
 {
     /* Create main layout: */
-    QGridLayout *pMainLayout = new QGridLayout(this);
-    if (pMainLayout)
-    {
-        pMainLayout->setContentsMargins(0, 0, 0, 0);
+    QGridLayout *pLayout = new QGridLayout(this);
+    if (pLayout)
+    {
+        pLayout->setContentsMargins(0, 0, 0, 0);
         int iRow = 0;
 
@@ -496,5 +496,5 @@
             m_pLabel = new QLabel(this);
         if (m_pLabel)
-            pMainLayout->addWidget(m_pLabel, 0, iRow++, 1, 1);
+            pLayout->addWidget(m_pLabel, 0, iRow++, 1, 1);
 
         /* Create table layout: */
@@ -541,5 +541,5 @@
 
             /* Add table layout to main layout: */
-            pMainLayout->addLayout(pTableLayout, 0, iRow++, 3, 1);
+            pLayout->addLayout(pTableLayout, 0, iRow++, 3, 1);
         }
     }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIBootOrderEditor.h	(revision 94395)
@@ -42,5 +42,5 @@
 struct UIBootItemData
 {
-    /** Constructs boot item data. */
+    /** Constructs item data. */
     UIBootItemData()
         : m_enmType(KDeviceType_Null)
@@ -57,7 +57,7 @@
     }
 
-    /** Holds the boot device type. */
+    /** Holds the device type. */
     KDeviceType  m_enmType;
-    /** Holds whether the boot device enabled. */
+    /** Holds whether the device enabled. */
     bool         m_fEnabled;
 };
@@ -69,5 +69,5 @@
 namespace UIBootDataTools
 {
-    /** Loads boot item list for passed @a comMachine. */
+    /** Loads item list for passed @a comMachine. */
     SHARED_LIBRARY_STUFF UIBootItemDataList loadBootItems(const CMachine &comMachine);
     /** Saves @a bootItems list to passed @a comMachine. */
@@ -92,5 +92,5 @@
 public:
 
-    /** Constructs boot order editor passing @a pParent to the base-class.
+    /** Constructs editor passing @a pParent to the base-class.
       * @param  fWithLabel  Brings whether we should add label ourselves. */
     UIBootOrderEditor(QWidget *pParent = 0, bool fWithLabel = false);
@@ -111,5 +111,5 @@
 private slots:
 
-    /** Handles current boot item change. */
+    /** Handles current item change. */
     void sltHandleCurrentBootItemChange();
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.cpp	(revision 94395)
@@ -38,18 +38,10 @@
 void UIColorThemeEditor::setValue(UIColorThemeType enmValue)
 {
-    if (m_pCombo)
+    /* Update cached value and
+     * combo if value has changed: */
+    if (m_enmValue != enmValue)
     {
-        /* Update cached value and
-         * combo if value has changed: */
-        if (m_enmValue != enmValue)
-        {
-            m_enmValue = enmValue;
-            populateCombo();
-        }
-
-        /* Look for proper index to choose: */
-        int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
-        if (iIndex != -1)
-            m_pCombo->setCurrentIndex(iIndex);
+        m_enmValue = enmValue;
+        populateCombo();
     }
 }
@@ -75,22 +67,16 @@
 }
 
-void UIColorThemeEditor::sltHandleCurrentIndexChanged()
-{
-    if (m_pCombo)
-        emit sigValueChanged(m_pCombo->itemData(m_pCombo->currentIndex()).value<UIColorThemeType>());
-}
-
 void UIColorThemeEditor::prepare()
 {
     /* Create main layout: */
-    QGridLayout *pMainLayout = new QGridLayout(this);
-    if (pMainLayout)
+    QGridLayout *pLayout = new QGridLayout(this);
+    if (pLayout)
     {
-        pMainLayout->setContentsMargins(0, 0, 0, 0);
+        pLayout->setContentsMargins(0, 0, 0, 0);
 
         /* Create label: */
         m_pLabel = new QLabel(this);
         if (m_pLabel)
-            pMainLayout->addWidget(m_pLabel, 0, 0);
+            pLayout->addWidget(m_pLabel, 0, 0);
 
         /* Create combo layout: */
@@ -106,6 +92,4 @@
                 if (m_pLabel)
                     m_pLabel->setBuddy(m_pCombo);
-                connect(m_pCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-                        this, &UIColorThemeEditor::sltHandleCurrentIndexChanged);
                 pComboLayout->addWidget(m_pCombo);
             }
@@ -115,5 +99,5 @@
 
             /* Add combo-layout into main-layout: */
-            pMainLayout->addLayout(pComboLayout, 0, 1);
+            pLayout->addLayout(pComboLayout, 0, 1);
         }
     }
@@ -143,4 +127,9 @@
             m_pCombo->addItem(QString(), QVariant::fromValue(enmType));
 
+        /* Look for proper index to choose: */
+        const int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
+        if (iIndex != -1)
+            m_pCombo->setCurrentIndex(iIndex);
+
         /* Retranslate finally: */
         retranslateUi();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.h	(revision 94395)
@@ -39,12 +39,7 @@
     Q_OBJECT;
 
-signals:
-
-    /** Notifies listeners about @a enmValue change. */
-    void sigValueChanged(UIColorThemeType enmValue);
-
 public:
 
-    /** Constructs color theme editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIColorThemeEditor(QWidget *pParent = 0);
 
@@ -59,9 +54,4 @@
     virtual void retranslateUi() RT_OVERRIDE;
 
-private slots:
-
-    /** Handles current index change. */
-    void sltHandleCurrentIndexChanged();
-
 private:
 
@@ -70,7 +60,4 @@
     /** Populates combo. */
     void populateCombo();
-
-    /** Holds whether descriptive label should be created. */
-    bool  m_fWithLabel;
 
     /** Holds the value to be selected. */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.cpp	(revision 94395)
@@ -38,13 +38,11 @@
 void UIDefaultMachineFolderEditor::setValue(const QString &strValue)
 {
-    if (m_pSelector)
+    /* Update cached value and editor
+     * if value has changed: */
+    if (m_strValue != strValue)
     {
-        /* Update cached value and editor
-         * if value has changed: */
-        if (m_strValue != strValue)
-        {
-            m_strValue = strValue;
-            m_pSelector->setPath(strValue);
-        }
+        m_strValue = strValue;
+        if (m_pSelector)
+            m_pSelector->setPath(m_strValue);
     }
 }
@@ -57,5 +55,5 @@
 int UIDefaultMachineFolderEditor::minimumLabelHorizontalHint() const
 {
-    return m_pLabel->minimumSizeHint().width();
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
@@ -73,10 +71,4 @@
         m_pSelector->setToolTip(tr("Holds the path to the default virtual machine folder. This folder is used, "
                                    "if not explicitly specified otherwise, when creating new virtual machines."));
-}
-
-void UIDefaultMachineFolderEditor::sltHandleSelectorPathChanged()
-{
-    if (m_pSelector)
-        emit sigValueChanged(m_pSelector->path());
 }
 
@@ -105,6 +97,4 @@
                 m_pLabel->setBuddy(m_pSelector);
             m_pSelector->setInitialPath(uiCommon().homeFolder());
-            connect(m_pSelector, &UIFilePathSelector::pathChanged,
-                    this, &UIDefaultMachineFolderEditor::sltHandleSelectorPathChanged);
 
             m_pLayout->addWidget(m_pSelector, 0, 1);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIDefaultMachineFolderEditor.h	(revision 94395)
@@ -39,9 +39,4 @@
     Q_OBJECT;
 
-signals:
-
-    /** Notifies listeners about @a enmValue change. */
-    void sigValueChanged(const QString &strValue);
-
 public:
 
@@ -64,9 +59,4 @@
     virtual void retranslateUi() RT_OVERRIDE;
 
-private slots:
-
-    /** Handles selector path change. */
-    void sltHandleSelectorPathChanged();
-
 private:
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalDisplayFeaturesEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalDisplayFeaturesEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalDisplayFeaturesEditor.cpp	(revision 94395)
@@ -41,13 +41,11 @@
 void UIGlobalDisplayFeaturesEditor::setActivateOnMouseHover(bool fOn)
 {
-    if (m_pCheckBoxActivateOnMouseHover)
+    /* Update cached value and
+     * check-box if value has changed: */
+    if (m_fActivateOnMouseHover != fOn)
     {
-        /* Update cached value and
-         * check-box if value has changed: */
-        if (m_fActivateOnMouseHover != fOn)
-        {
-            m_fActivateOnMouseHover = fOn;
-            m_pCheckBoxActivateOnMouseHover->setCheckState(fOn ? Qt::Checked : Qt::Unchecked);
-        }
+        m_fActivateOnMouseHover = fOn;
+        if (m_pCheckBoxActivateOnMouseHover)
+            m_pCheckBoxActivateOnMouseHover->setCheckState(m_fActivateOnMouseHover ? Qt::Checked : Qt::Unchecked);
     }
 }
@@ -62,13 +60,11 @@
 void UIGlobalDisplayFeaturesEditor::setDisableHostScreenSaver(bool fOn)
 {
-    if (m_pCheckBoxDisableHostScreenSaver)
+    /* Update cached value and
+     * check-box if value has changed: */
+    if (m_fDisableHostScreenSaver != fOn)
     {
-        /* Update cached value and
-         * check-box if value has changed: */
-        if (m_fDisableHostScreenSaver != fOn)
-        {
-            m_fDisableHostScreenSaver = fOn;
-            m_pCheckBoxDisableHostScreenSaver->setCheckState(fOn ? Qt::Checked : Qt::Unchecked);
-        }
+        m_fDisableHostScreenSaver = fOn;
+        if (m_pCheckBoxDisableHostScreenSaver)
+            m_pCheckBoxDisableHostScreenSaver->setCheckState(m_fDisableHostScreenSaver ? Qt::Checked : Qt::Unchecked);
     }
 }
@@ -83,5 +79,5 @@
 int UIGlobalDisplayFeaturesEditor::minimumLabelHorizontalHint() const
 {
-    return m_pLabel->minimumSizeHint().width();
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
@@ -96,15 +92,17 @@
     if (m_pLabel)
         m_pLabel->setText(tr("Extended Features:"));
+
     if (m_pCheckBoxActivateOnMouseHover)
     {
+        m_pCheckBoxActivateOnMouseHover->setText(tr("&Raise Window Under Mouse Pointer"));
         m_pCheckBoxActivateOnMouseHover->setToolTip(tr("When checked, machine windows will be raised "
                                                        "when the mouse pointer moves over them."));
-        m_pCheckBoxActivateOnMouseHover->setText(tr("&Raise Window Under Mouse Pointer"));
     }
+
     if (m_pCheckBoxDisableHostScreenSaver)
     {
+        m_pCheckBoxDisableHostScreenSaver->setText(tr("&Disable Host Screen Saver"));
         m_pCheckBoxDisableHostScreenSaver->setToolTip(tr("When checked, screen saver of "
                                                          "the host OS is disabled."));
-        m_pCheckBoxDisableHostScreenSaver->setText(tr("&Disable Host Screen Saver"));
     }
 }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalDisplayFeaturesEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalDisplayFeaturesEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalDisplayFeaturesEditor.h	(revision 94395)
@@ -37,5 +37,5 @@
 public:
 
-    /** Constructs global display features editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIGlobalDisplayFeaturesEditor(QWidget *pParent = 0);
 
@@ -65,17 +65,23 @@
     void prepare();
 
-    /** Holds the 'activate on mouse hover' feature value. */
-    bool  m_fActivateOnMouseHover;
-    /** Holds the 'disable host screen-saver' feature value. */
-    bool  m_fDisableHostScreenSaver;
+    /** @name Values
+     * @{ */
+        /** Holds the 'activate on mouse hover' feature value. */
+        bool  m_fActivateOnMouseHover;
+        /** Holds the 'disable host screen-saver' feature value. */
+        bool  m_fDisableHostScreenSaver;
+    /** @} */
 
-    /** Holds the main layout instance. */
-    QGridLayout *m_pLayout;
-    /** Holds the label instance. */
-    QLabel      *m_pLabel;
-    /** Holds the check-box instance. */
-    QCheckBox   *m_pCheckBoxActivateOnMouseHover;
-    /** Holds the check-box instance. */
-    QCheckBox   *m_pCheckBoxDisableHostScreenSaver;
+    /** @name Widgets
+     * @{ */
+        /** Holds the main layout instance. */
+        QGridLayout *m_pLayout;
+        /** Holds the label instance. */
+        QLabel      *m_pLabel;
+        /** Holds the check-box instance. */
+        QCheckBox   *m_pCheckBoxActivateOnMouseHover;
+        /** Holds the check-box instance. */
+        QCheckBox   *m_pCheckBoxDisableHostScreenSaver;
+    /** @} */
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalProxyFeaturesEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalProxyFeaturesEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalProxyFeaturesEditor.cpp	(revision 94395)
@@ -105,19 +105,19 @@
     if (m_pRadioButtonProxyAuto)
     {
+        m_pRadioButtonProxyAuto->setText(tr("&Auto-detect Host Proxy Settings"));
         m_pRadioButtonProxyAuto->setToolTip(tr("When chosen, VirtualBox will try to auto-detect host proxy settings for tasks "
                                                "like downloading Guest Additions from the network or checking for updates."));
-        m_pRadioButtonProxyAuto->setText(tr("&Auto-detect Host Proxy Settings"));
     }
     if (m_pRadioButtonProxyDisabled)
     {
+        m_pRadioButtonProxyDisabled->setText(tr("&Direct Connection to the Internet"));
         m_pRadioButtonProxyDisabled->setToolTip(tr("When chosen, VirtualBox will use direct Internet connection for tasks like "
                                                    "downloading Guest Additions from the network or checking for updates."));
-        m_pRadioButtonProxyDisabled->setText(tr("&Direct Connection to the Internet"));
     }
     if (m_pRadioButtonProxyEnabled)
     {
+        m_pRadioButtonProxyEnabled->setText(tr("&Manual Proxy Configuration"));
         m_pRadioButtonProxyEnabled->setToolTip(tr("When chosen, VirtualBox will use the proxy settings supplied for tasks like "
                                                   "downloading Guest Additions from the network or checking for updates."));
-        m_pRadioButtonProxyEnabled->setText(tr("&Manual Proxy Configuration"));
     }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalProxyFeaturesEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalProxyFeaturesEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGlobalProxyFeaturesEditor.h	(revision 94395)
@@ -48,5 +48,5 @@
 public:
 
-    /** Constructs global proxy features editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIGlobalProxyFeaturesEditor(QWidget *pParent = 0);
 
@@ -76,23 +76,29 @@
     void prepare();
 
-    /** Holds the proxy mode. */
-    KProxyMode  m_enmProxyMode;
-    /** Holds the proxy host. */
-    QString     m_strProxyHost;
+    /** @name Values
+     * @{ */
+        /** Holds the proxy mode. */
+        KProxyMode  m_enmProxyMode;
+        /** Holds the proxy host. */
+        QString     m_strProxyHost;
+    /** @} */
 
-    /** Holds the button-group instance. */
-    QButtonGroup *m_pButtonGroup;
-    /** Holds the 'proxy auto' radio-button instance. */
-    QRadioButton *m_pRadioButtonProxyAuto;
-    /** Holds the 'proxy disabled' radio-button instance. */
-    QRadioButton *m_pRadioButtonProxyDisabled;
-    /** Holds the 'proxy enabled' radio-button instance. */
-    QRadioButton *m_pRadioButtonProxyEnabled;
-    /** Holds the settings widget instance. */
-    QWidget      *m_pWidgetSettings;
-    /** Holds the host label instance. */
-    QLabel       *m_pLabelHost;
-    /** Holds the host editor instance. */
-    QILineEdit   *m_pEditorHost;
+    /** @name Widgets
+     * @{ */
+        /** Holds the button-group instance. */
+        QButtonGroup *m_pButtonGroup;
+        /** Holds the 'proxy auto' radio-button instance. */
+        QRadioButton *m_pRadioButtonProxyAuto;
+        /** Holds the 'proxy disabled' radio-button instance. */
+        QRadioButton *m_pRadioButtonProxyDisabled;
+        /** Holds the 'proxy enabled' radio-button instance. */
+        QRadioButton *m_pRadioButtonProxyEnabled;
+        /** Holds the settings widget instance. */
+        QWidget      *m_pWidgetSettings;
+        /** Holds the host label instance. */
+        QLabel       *m_pLabelHost;
+        /** Holds the host editor instance. */
+        QILineEdit   *m_pEditorHost;
+    /** @} */
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.cpp	(revision 94395)
@@ -43,18 +43,10 @@
 void UIGraphicsControllerEditor::setValue(KGraphicsControllerType enmValue)
 {
-    if (m_pCombo)
+    /* Update cached value and
+     * combo if value has changed: */
+    if (m_enmValue != enmValue)
     {
-        /* Update cached value and
-         * combo if value has changed: */
-        if (m_enmValue != enmValue)
-        {
-            m_enmValue = enmValue;
-            populateCombo();
-        }
-
-        /* Look for proper index to choose: */
-        int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
-        if (iIndex != -1)
-            m_pCombo->setCurrentIndex(iIndex);
+        m_enmValue = enmValue;
+        populateCombo();
     }
 }
@@ -67,5 +59,5 @@
 int UIGraphicsControllerEditor::minimumLabelHorizontalHint() const
 {
-    return m_pLabel->minimumSizeHint().width();
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
@@ -166,4 +158,9 @@
             m_pCombo->addItem(QString(), QVariant::fromValue(enmType));
 
+        /* Look for proper index to choose: */
+        const int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
+        if (iIndex != -1)
+            m_pCombo->setCurrentIndex(iIndex);
+
         /* Retranslate finally: */
         retranslateUi();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIGraphicsControllerEditor.h	(revision 94395)
@@ -49,5 +49,5 @@
 public:
 
-    /** Constructs graphics controller editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIGraphicsControllerEditor(QWidget *pParent = 0);
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHostComboEditor.h	(revision 94395)
@@ -100,5 +100,5 @@
 public:
 
-    /** Constructs host-combo wrapper on the basis of passed @a strHostCombo. */
+    /** Constructs wrapper on the basis of passed @a strHostCombo. */
     UIHostComboWrapper(const QString &strHostCombo = QString())
         : m_strHostCombo(strHostCombo)
@@ -129,5 +129,5 @@
 public:
 
-    /** Constructs host-combo editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIHostComboEditor(QWidget *pParent);
 
@@ -171,7 +171,7 @@
 public:
 
-    /** Constructs host-combo editor private part. */
+    /** Constructs editor private part. */
     UIHostComboEditorPrivate();
-    /** Destructs host-combo editor private part. */
+    /** Destructs editor private part. */
     ~UIHostComboEditorPrivate();
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHotKeyEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHotKeyEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIHotKeyEditor.h	(revision 94395)
@@ -111,5 +111,5 @@
 public:
 
-    /** Constructs hot-key editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIHotKeyEditor(QWidget *pParent);
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.cpp	(revision 94395)
@@ -212,11 +212,9 @@
 void UILanguageSettingsEditor::setValue(const QString &strValue)
 {
-    /* Update value if changed: */
+    /* Update cached value and
+     * tree-widget if value has changed: */
     if (m_strValue != strValue)
     {
-        /* Update value itself: */
         m_strValue = strValue;
-
-        /* Update tree-widget if present: */
         if (m_pTreeWidget)
             reloadLanguageTree(m_strValue);
@@ -321,14 +319,4 @@
 
 void UILanguageSettingsEditor::prepare()
-{
-    /* Prepare everything: */
-    prepareWidgets();
-    prepareConnections();
-
-    /* Apply language settings: */
-    retranslateUi();
-}
-
-void UILanguageSettingsEditor::prepareWidgets()
 {
     /* Prepare main layout: */
@@ -369,10 +357,11 @@
         }
     }
-}
-
-void UILanguageSettingsEditor::prepareConnections()
-{
+
+    /* Prepare connections: */
     connect(m_pTreeWidget, &QITreeWidget::painted, this, &UILanguageSettingsEditor::sltHandleItemPainting);
     connect(m_pTreeWidget, &QITreeWidget::currentItemChanged, this, &UILanguageSettingsEditor::sltHandleCurrentItemChange);
+
+    /* Apply language settings: */
+    retranslateUi();
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.h	(revision 94395)
@@ -38,5 +38,5 @@
 public:
 
-    /** Constructs language settings editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UILanguageSettingsEditor(QWidget *pParent = 0);
 
@@ -68,8 +68,4 @@
     /** Prepares all. */
     void prepare();
-    /** Prepares widgets. */
-    void prepareWidgets();
-    /** Prepares connections. */
-    void prepareConnections();
     /** Cleanups all. */
     void cleanup();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineAudioFeaturesEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineAudioFeaturesEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineAudioFeaturesEditor.cpp	(revision 94395)
@@ -41,13 +41,11 @@
 void UIMachineAudioFeaturesEditor::setEnableOutput(bool fOn)
 {
-    if (m_pCheckBoxEnableOutput)
+    /* Update cached value and
+     * check-box if value has changed: */
+    if (m_fEnableOutput != fOn)
     {
-        /* Update cached value and
-         * check-box if value has changed: */
-        if (m_fEnableOutput != fOn)
-        {
-            m_fEnableOutput = fOn;
-            m_pCheckBoxEnableOutput->setCheckState(fOn ? Qt::Checked : Qt::Unchecked);
-        }
+        m_fEnableOutput = fOn;
+        if (m_pCheckBoxEnableOutput)
+            m_pCheckBoxEnableOutput->setCheckState(m_fEnableOutput ? Qt::Checked : Qt::Unchecked);
     }
 }
@@ -62,13 +60,11 @@
 void UIMachineAudioFeaturesEditor::setEnableInput(bool fOn)
 {
-    if (m_pCheckBoxEnableInput)
+    /* Update cached value and
+     * check-box if value has changed: */
+    if (m_fEnableInput != fOn)
     {
-        /* Update cached value and
-         * check-box if value has changed: */
-        if (m_fEnableInput != fOn)
-        {
-            m_fEnableInput = fOn;
-            m_pCheckBoxEnableInput->setCheckState(fOn ? Qt::Checked : Qt::Unchecked);
-        }
+        m_fEnableInput = fOn;
+        if (m_pCheckBoxEnableInput)
+            m_pCheckBoxEnableInput->setCheckState(m_fEnableInput ? Qt::Checked : Qt::Unchecked);
     }
 }
@@ -83,5 +79,5 @@
 int UIMachineAudioFeaturesEditor::minimumLabelHorizontalHint() const
 {
-    return m_pLabel->minimumSizeHint().width();
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineAudioFeaturesEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineAudioFeaturesEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineAudioFeaturesEditor.h	(revision 94395)
@@ -37,5 +37,5 @@
 public:
 
-    /** Constructs machine audio features editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIMachineAudioFeaturesEditor(QWidget *pParent = 0);
 
@@ -65,17 +65,23 @@
     void prepare();
 
-    /** Holds the 'enable output' feature value. */
-    bool  m_fEnableOutput;
-    /** Holds the 'enable input' feature value. */
-    bool  m_fEnableInput;
+    /** @name Values
+     * @{ */
+        /** Holds the 'enable output' feature value. */
+        bool  m_fEnableOutput;
+        /** Holds the 'enable input' feature value. */
+        bool  m_fEnableInput;
+    /** @} */
 
-    /** Holds the main layout instance. */
-    QGridLayout *m_pLayout;
-    /** Holds the label instance. */
-    QLabel      *m_pLabel;
-    /** Holds the 'enable output' check-box instance. */
-    QCheckBox   *m_pCheckBoxEnableOutput;
-    /** Holds the 'enable input' check-box instance. */
-    QCheckBox   *m_pCheckBoxEnableInput;
+    /** @name Widgets
+     * @{ */
+        /** Holds the main layout instance. */
+        QGridLayout *m_pLayout;
+        /** Holds the label instance. */
+        QLabel      *m_pLabel;
+        /** Holds the 'enable output' check-box instance. */
+        QCheckBox   *m_pCheckBoxEnableOutput;
+        /** Holds the 'enable input' check-box instance. */
+        QCheckBox   *m_pCheckBoxEnableInput;
+    /** @} */
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineDisplayScreenFeaturesEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineDisplayScreenFeaturesEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineDisplayScreenFeaturesEditor.cpp	(revision 94395)
@@ -43,5 +43,5 @@
         {
             m_fEnable3DAcceleration = fOn;
-            m_pCheckBoxEnable3DAcceleration->setCheckState(fOn ? Qt::Checked : Qt::Unchecked);
+            m_pCheckBoxEnable3DAcceleration->setCheckState(m_fEnable3DAcceleration ? Qt::Checked : Qt::Unchecked);
         }
     }
@@ -57,5 +57,5 @@
 int UIMachineDisplayScreenFeaturesEditor::minimumLabelHorizontalHint() const
 {
-    return m_pLabel->minimumSizeHint().width();
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineDisplayScreenFeaturesEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineDisplayScreenFeaturesEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMachineDisplayScreenFeaturesEditor.h	(revision 94395)
@@ -42,5 +42,5 @@
 public:
 
-    /** Constructs machine display screen features editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIMachineDisplayScreenFeaturesEditor(QWidget *pParent = 0);
 
@@ -65,13 +65,19 @@
     void prepare();
 
-    /** Holds the 'enable 3D acceleration' feature value. */
-    bool  m_fEnable3DAcceleration;
+    /** @name Values
+     * @{ */
+        /** Holds the 'enable 3D acceleration' feature value. */
+        bool  m_fEnable3DAcceleration;
+    /** @} */
 
-    /** Holds the main layout instance. */
-    QGridLayout *m_pLayout;
-    /** Holds the label instance. */
-    QLabel      *m_pLabel;
-    /** Holds the 'enable 3D acceleration' check-box instance. */
-    QCheckBox   *m_pCheckBoxEnable3DAcceleration;
+    /** @name Widgets
+     * @{ */
+        /** Holds the main layout instance. */
+        QGridLayout *m_pLayout;
+        /** Holds the label instance. */
+        QLabel      *m_pLabel;
+        /** Holds the 'enable 3D acceleration' check-box instance. */
+        QCheckBox   *m_pCheckBoxEnable3DAcceleration;
+    /** @} */
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.cpp	(revision 94395)
@@ -75,5 +75,5 @@
     if (m_pComboPolicy)
     {
-        const int iIndex = m_pComboPolicy->findData(QVariant::fromValue(guiValue.m_enmPolicy));
+        const int iIndex = m_pComboPolicy->findData(QVariant::fromValue(m_guiValue.m_enmPolicy));
         if (iIndex != -1)
         {
@@ -85,8 +85,8 @@
     if (m_pSpinboxMaxWidth && m_pSpinboxMaxHeight)
     {
-        if (guiValue.m_enmPolicy == MaximumGuestScreenSizePolicy_Fixed)
-        {
-            m_pSpinboxMaxWidth->setValue(guiValue.m_size.width());
-            m_pSpinboxMaxHeight->setValue(guiValue.m_size.height());
+        if (m_guiValue.m_enmPolicy == MaximumGuestScreenSizePolicy_Fixed)
+        {
+            m_pSpinboxMaxWidth->setValue(m_guiValue.m_size.width());
+            m_pSpinboxMaxHeight->setValue(m_guiValue.m_size.height());
         }
     }
@@ -161,16 +161,4 @@
         if (m_pSpinboxMaxHeight)
             m_pSpinboxMaxHeight->setEnabled(fComboLevelWidgetsEnabled);
-
-        /* Notify listeners: */
-        emit sigValueChanged(value());
-    }
-}
-
-void UIMaximumGuestScreenSizeEditor::sltHandleSizeChanged()
-{
-    if (m_pSpinboxMaxWidth && m_pSpinboxMaxHeight)
-    {
-        /* Notify listeners: */
-        emit sigValueChanged(value());
     }
 }
@@ -223,6 +211,4 @@
             m_pSpinboxMaxWidth->setMinimum(iMinWidth);
             m_pSpinboxMaxWidth->setMaximum(iMaxSize);
-            connect(m_pSpinboxMaxWidth, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-                    this, &UIMaximumGuestScreenSizeEditor::sltHandleSizeChanged);
 
             m_pLayout->addWidget(m_pSpinboxMaxWidth, 1, 1);
@@ -244,6 +230,4 @@
             m_pSpinboxMaxHeight->setMinimum(iMinHeight);
             m_pSpinboxMaxHeight->setMaximum(iMaxSize);
-            connect(m_pSpinboxMaxHeight, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-                    this, &UIMaximumGuestScreenSizeEditor::sltHandleSizeChanged);
 
             m_pLayout->addWidget(m_pSpinboxMaxHeight, 2, 1);
@@ -266,8 +250,8 @@
 
         /* Init currently supported maximum guest size policy types: */
-        QList<MaximumGuestScreenSizePolicy> supportedValues = QList<MaximumGuestScreenSizePolicy>()
-                                                          << MaximumGuestScreenSizePolicy_Automatic
-                                                          << MaximumGuestScreenSizePolicy_Any
-                                                          << MaximumGuestScreenSizePolicy_Fixed;
+        const QList<MaximumGuestScreenSizePolicy> supportedValues  = QList<MaximumGuestScreenSizePolicy>()
+                                                                  << MaximumGuestScreenSizePolicy_Automatic
+                                                                  << MaximumGuestScreenSizePolicy_Any
+                                                                  << MaximumGuestScreenSizePolicy_Fixed;
 
         /* Update combo with all the supported values: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMaximumGuestScreenSizeEditor.h	(revision 94395)
@@ -64,12 +64,7 @@
     Q_OBJECT;
 
-signals:
-
-    /** Notifies listeners about @a guiValue change. */
-    void sigValueChanged(const UIMaximumGuestScreenSizeValue &guiValue);
-
 public:
 
-    /** Constructs maximum guest screen size editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIMaximumGuestScreenSizeEditor(QWidget *pParent = 0);
 
@@ -93,6 +88,4 @@
     /** Handles current policy index change. */
     void sltHandleCurrentPolicyIndexChanged();
-    /** Handles size change. */
-    void sltHandleSizeChanged();
 
 private:
@@ -106,18 +99,21 @@
     UIMaximumGuestScreenSizeValue  m_guiValue;
 
-    /** Holds the main layout: */
-    QGridLayout *m_pLayout;
-    /** Holds the policy label instance. */
-    QLabel      *m_pLabelPolicy;
-    /** Holds the policy combo instance. */
-    QComboBox   *m_pComboPolicy;
-    /** Holds the max width label instance. */
-    QLabel      *m_pLabelMaxWidth;
-    /** Holds the max width spinbox instance. */
-    QSpinBox    *m_pSpinboxMaxWidth;
-    /** Holds the max height label instance. */
-    QLabel      *m_pLabelMaxHeight;
-    /** Holds the max height spinbox instance. */
-    QSpinBox    *m_pSpinboxMaxHeight;
+    /** @name Widgets
+     * @{ */
+        /** Holds the main layout: */
+        QGridLayout *m_pLayout;
+        /** Holds the policy label instance. */
+        QLabel      *m_pLabelPolicy;
+        /** Holds the policy combo instance. */
+        QComboBox   *m_pComboPolicy;
+        /** Holds the max width label instance. */
+        QLabel      *m_pLabelMaxWidth;
+        /** Holds the max width spinbox instance. */
+        QSpinBox    *m_pSpinboxMaxWidth;
+        /** Holds the max height label instance. */
+        QLabel      *m_pLabelMaxHeight;
+        /** Holds the max height spinbox instance. */
+        QSpinBox    *m_pSpinboxMaxHeight;
+    /** @} */
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.cpp	(revision 94395)
@@ -64,5 +64,5 @@
 int UIMonitorCountEditor::minimumLabelHorizontalHint() const
 {
-    return m_pLabel->minimumSizeHint().width();
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIMonitorCountEditor.h	(revision 94395)
@@ -47,5 +47,5 @@
 public:
 
-    /** Constructs monitor count editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIMonitorCountEditor(QWidget *pParent = 0);
 
@@ -83,16 +83,19 @@
     int  m_iValue;
 
-    /** Holds the main layout instance. */
-    QGridLayout      *m_pLayout;
-    /** Holds the main label instance. */
-    QLabel           *m_pLabel;
-    /** Holds the slider instance. */
-    QIAdvancedSlider *m_pSlider;
-    /** Holds the spin-box instance. */
-    QSpinBox         *m_pSpinBox;
-    /** Holds minimum label instance. */
-    QLabel           *m_pLabelMin;
-    /** Holds maximum label instance. */
-    QLabel           *m_pLabelMax;
+    /** @name Widgets
+     * @{ */
+        /** Holds the main layout instance. */
+        QGridLayout      *m_pLayout;
+        /** Holds the main label instance. */
+        QLabel           *m_pLabel;
+        /** Holds the slider instance. */
+        QIAdvancedSlider *m_pSlider;
+        /** Holds the spin-box instance. */
+        QSpinBox         *m_pSpinBox;
+        /** Holds minimum label instance. */
+        QLabel           *m_pLabelMin;
+        /** Holds maximum label instance. */
+        QLabel           *m_pLabelMax;
+    /** @} */
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.h	(revision 94395)
@@ -76,5 +76,5 @@
 public:
 
-    /** Constructs VM parameters editor passing @a pParent to the base-class.
+    /** Constructs editor passing @a pParent to the base-class.
      * @param  fChooseName    Controls whether we should propose to choose name.
      * @param  fChoosePath    Controls whether we should propose to choose path.
@@ -173,63 +173,76 @@
     ulong selectedEditionIndex() const;
 
-    /** Holds the current family ID list. */
-    QStringList  m_familyIDs;
-
-    /** Holds the current type cache. */
-    QMap<QString, QList<UIGuestOSType> >  m_types;
-
-    /** Holds the VM OS type ID. */
-    QString  m_strTypeId;
-    /** Holds the VM OS family ID. */
-    QString  m_strFamilyId;
-
-    /** Holds the currently chosen OS type IDs on per-family basis. */
-    QMap<QString, QString>  m_currentIds;
-
-    /** Holds whether we should propose to choose a name. */
-    bool  m_fChooseName;
-    /** Holds whether we should propose to choose a path. */
-    bool  m_fChoosePath;
-    /** Holds whether we should propose to choose an image. */
-    bool  m_fChooseImage;
-    /** Holds whether we should propose to choose an edition. */
-    bool  m_fChooseEdition;
-    /** Holds whether we should propose to choose a type. */
-    bool  m_fChooseType;
-    /** Holds whether host supports hardware virtualization. */
-    bool  m_fSupportsHWVirtEx;
-    /** Holds whether host supports long mode. */
-    bool  m_fSupportsLongMode;
-
-    /** Holds the main layout instance. */
-    QGridLayout *m_pLayout;
-
-    /** Holds the VM name label instance. */
-    QLabel *m_pLabelName;
-    /** Holds the VM path label instance. */
-    QLabel *m_pLabelPath;
-    /** Holds the ISO image label instance. */
-    QLabel *m_pLabelImage;
-    /** Holds the edition label instance. */
-    QLabel *m_pLabelEdition;
-    /** Holds the VM OS family label instance. */
-    QLabel *m_pLabelFamily;
-    /** Holds the VM OS type label instance. */
-    QLabel *m_pLabelType;
-    /** Holds the VM OS type icon instance. */
-    QLabel *m_pIconType;
-
-    /** Holds the VM name editor instance. */
-    QILineEdit         *m_pEditorName;
-    /** Holds the VM path editor instance. */
-    UIFilePathSelector *m_pSelectorPath;
-    /** Holds the file selector for ISO image (either for unattended install or to be attached to vm). */
-    UIFilePathSelector *m_pSelectorImage;
-    /** Holds the VM OS edition combo (currently only Windows ISO have this). */
-    QComboBox          *m_pComboEdition;
-    /** Holds the VM OS family combo instance. */
-    QComboBox          *m_pComboFamily;
-    /** Holds the VM OS type combo instance. */
-    QComboBox          *m_pComboType;
+    /** @name Arguments
+     * @{ */
+        /** Holds whether we should propose to choose a name. */
+        bool  m_fChooseName;
+        /** Holds whether we should propose to choose a path. */
+        bool  m_fChoosePath;
+        /** Holds whether we should propose to choose an image. */
+        bool  m_fChooseImage;
+        /** Holds whether we should propose to choose an edition. */
+        bool  m_fChooseEdition;
+        /** Holds whether we should propose to choose a type. */
+        bool  m_fChooseType;
+    /** @} */
+
+    /** @name Options
+     * @{ */
+        /** Holds whether host supports hardware virtualization. */
+        bool  m_fSupportsHWVirtEx;
+        /** Holds whether host supports long mode. */
+        bool  m_fSupportsLongMode;
+    /** @} */
+
+    /** @name Values
+     * @{ */
+        /** Holds the current family ID list. */
+        QStringList  m_familyIDs;
+
+        /** Holds the current type cache. */
+        QMap<QString, QList<UIGuestOSType> >  m_types;
+
+        /** Holds the VM OS type ID. */
+        QString  m_strTypeId;
+        /** Holds the VM OS family ID. */
+        QString  m_strFamilyId;
+
+        /** Holds the currently chosen OS type IDs on per-family basis. */
+        QMap<QString, QString>  m_currentIds;
+    /** @} */
+
+    /** @name Widgets
+     * @{ */
+        /** Holds the main layout instance. */
+        QGridLayout *m_pLayout;
+
+        /** Holds the VM name label instance. */
+        QLabel *m_pLabelName;
+        /** Holds the VM path label instance. */
+        QLabel *m_pLabelPath;
+        /** Holds the ISO image label instance. */
+        QLabel *m_pLabelImage;
+        /** Holds the edition label instance. */
+        QLabel *m_pLabelEdition;
+        /** Holds the VM OS family label instance. */
+        QLabel *m_pLabelFamily;
+        /** Holds the VM OS type label instance. */
+        QLabel *m_pLabelType;
+        /** Holds the VM OS type icon instance. */
+        QLabel *m_pIconType;
+
+        /** Holds the VM name editor instance. */
+        QILineEdit         *m_pEditorName;
+        /** Holds the VM path editor instance. */
+        UIFilePathSelector *m_pSelectorPath;
+        /** Holds the file selector for ISO image (either for unattended install or to be attached to vm). */
+        UIFilePathSelector *m_pSelectorImage;
+        /** Holds the VM OS edition combo (currently only Windows ISO have this). */
+        QComboBox          *m_pComboEdition;
+        /** Holds the VM OS family combo instance. */
+        QComboBox          *m_pComboFamily;
+        /** Holds the VM OS type combo instance. */
+        QComboBox          *m_pComboType;
+    /** @} */
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkAttachmentEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkAttachmentEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINetworkAttachmentEditor.h	(revision 94395)
@@ -54,5 +54,5 @@
 public:
 
-    /** Constructs network attachment editor passing @a pParent to the base-class.
+    /** Constructs editor passing @a pParent to the base-class.
       * @param  fWithLabels  Brings whether we should add labels ourselves. */
     UINetworkAttachmentEditor(QWidget *pParent = 0, bool fWithLabels = false);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIScaleFactorEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIScaleFactorEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIScaleFactorEditor.h	(revision 94395)
@@ -43,5 +43,5 @@
 public:
 
-    /** Creates scale factor editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIScaleFactorEditor(QWidget *pParent);
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.h	(revision 94395)
@@ -37,5 +37,5 @@
 public:
 
-    /** Constructs shortcut search functor. */
+    /** Constructs search functor. */
     UIShortcutSearchFunctor() {}
 
@@ -59,5 +59,5 @@
 public:
 
-    /** Constructs shortcut configuration item on the basis of passed arguments.
+    /** Constructs item on the basis of passed arguments.
       * @param  strKey              Brings the unique key identifying held sequence.
       * @param  strScope            Brings the scope of the held sequence.
@@ -77,5 +77,5 @@
     {}
 
-    /** Constructs shortcut configuration item on the basis of @a another one. */
+    /** Constructs item on the basis of @a another one. */
     UIShortcutConfigurationItem(const UIShortcutConfigurationItem &another)
         : m_strKey(another.key())
@@ -157,5 +157,5 @@
 public:
 
-    /** Constructs shortcut configuration editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIShortcutConfigurationEditor(QWidget *pParent = 0);
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.cpp	(revision 94395)
@@ -44,11 +44,10 @@
 void UIUpdateSettingsEditor::setValue(const VBoxUpdateData &guiValue)
 {
-    /* Update value if changed: */
+    /* Update cached value and
+     * widgets if value has changed: */
     if (m_guiValue != guiValue)
     {
-        /* Update value itself: */
         m_guiValue = guiValue;
 
-        /* Update check-box if present: */
         if (m_pCheckBox)
         {
@@ -57,14 +56,10 @@
             if (m_pCheckBox->isChecked())
             {
-                /* Update period combo if present: */
                 if (m_pComboUpdatePeriod)
                     m_pComboUpdatePeriod->setCurrentIndex(m_guiValue.periodIndex());
-
-                /* Update branch radio-buttons if present: */
                 if (m_mapRadioButtons.value(m_guiValue.branchIndex()))
                     m_mapRadioButtons.value(m_guiValue.branchIndex())->setChecked(true);
             }
 
-            /* Update other related widgets: */
             sltHandleUpdateToggle(m_pCheckBox->isChecked());
         }
@@ -162,19 +157,19 @@
 {
     /* Prepare main layout: */
-    QGridLayout *pLayoutMain = new QGridLayout(this);
-    if (pLayoutMain)
-    {
-        pLayoutMain->setContentsMargins(0, 0, 0, 0);
-        pLayoutMain->setRowStretch(2, 1);
+    QGridLayout *pLayout = new QGridLayout(this);
+    if (pLayout)
+    {
+        pLayout->setContentsMargins(0, 0, 0, 0);
+        pLayout->setRowStretch(2, 1);
 
         /* Prepare update check-box: */
         m_pCheckBox = new QCheckBox(this);
         if (m_pCheckBox)
-            pLayoutMain->addWidget(m_pCheckBox, 0, 0, 1, 2);
+            pLayout->addWidget(m_pCheckBox, 0, 0, 1, 2);
 
         /* Prepare 20-px shifting spacer: */
         QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
         if (pSpacerItem)
-            pLayoutMain->addItem(pSpacerItem, 1, 0);
+            pLayout->addItem(pSpacerItem, 1, 0);
 
         /* Prepare update settings widget: */
@@ -256,5 +251,5 @@
             }
 
-            pLayoutMain->addWidget(m_pWidgetUpdateSettings, 1, 1);
+            pLayout->addWidget(m_pWidgetUpdateSettings, 1, 1);
         }
     }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIUpdateSettingsEditor.h	(revision 94395)
@@ -43,5 +43,5 @@
 public:
 
-    /** Constructs update settings editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIUpdateSettingsEditor(QWidget *pParent = 0);
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.cpp	(revision 94395)
@@ -37,13 +37,11 @@
 void UIVRDEAuthLibraryEditor::setValue(const QString &strValue)
 {
-    if (m_pSelector)
+    /* Update cached value and
+     * editor if value has changed: */
+    if (m_strValue != strValue)
     {
-        /* Update cached value and editor
-         * if value has changed: */
-        if (m_strValue != strValue)
-        {
-            m_strValue = strValue;
+        m_strValue = strValue;
+        if (m_pSelector)
             m_pSelector->setPath(strValue);
-        }
     }
 }
@@ -56,5 +54,5 @@
 int UIVRDEAuthLibraryEditor::minimumLabelHorizontalHint() const
 {
-    return m_pLabel->minimumSizeHint().width();
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
@@ -72,10 +70,4 @@
         m_pSelector->setToolTip(tr("Holds the path to the library that provides "
                                    "authentication for Remote Display (VRDP) clients."));
-}
-
-void UIVRDEAuthLibraryEditor::sltHandleSelectorPathChanged()
-{
-    if (m_pSelector)
-        emit sigValueChanged(m_pSelector->path());
 }
 
@@ -105,6 +97,4 @@
             m_pSelector->setInitialPath(uiCommon().homeFolder());
             m_pSelector->setMode(UIFilePathSelector::Mode_File_Open);
-            connect(m_pSelector, &UIFilePathSelector::pathChanged,
-                    this, &UIVRDEAuthLibraryEditor::sltHandleSelectorPathChanged);
 
             m_pLayout->addWidget(m_pSelector, 0, 1);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDEAuthLibraryEditor.h	(revision 94395)
@@ -39,9 +39,4 @@
     Q_OBJECT;
 
-signals:
-
-    /** Notifies listeners about @a enmValue change. */
-    void sigValueChanged(const QString &strValue);
-
 public:
 
@@ -64,9 +59,4 @@
     virtual void retranslateUi() RT_OVERRIDE;
 
-private slots:
-
-    /** Handles selector path change. */
-    void sltHandleSelectorPathChanged();
-
 private:
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.cpp	(revision 94395)
@@ -49,4 +49,6 @@
 void UIVRDESettingsEditor::setFeatureEnabled(bool fEnabled)
 {
+    /* Update cached value and
+     * check-box if value has changed: */
     if (m_fFeatureEnabled != fEnabled)
     {
@@ -75,4 +77,6 @@
 void UIVRDESettingsEditor::setPort(const QString &strPort)
 {
+    /* Update cached value and
+     * line-edit if value has changed: */
     if (m_strPort != strPort)
     {
@@ -90,16 +94,10 @@
 void UIVRDESettingsEditor::setAuthType(const KAuthType &enmType)
 {
+    /* Update cached value and
+     * combo if value has changed: */
     if (m_enmAuthType != enmType)
     {
         m_enmAuthType = enmType;
-        if (m_pComboAuthType)
-        {
-            /* We are doing that *now* because this combo have
-             * dynamical content which depends on cashed value: */
-            repopulateComboAuthType();
-
-            const int iAuthTypePosition = m_pComboAuthType->findData(enmType);
-            m_pComboAuthType->setCurrentIndex(iAuthTypePosition == -1 ? 0 : iAuthTypePosition);
-        }
+        repopulateComboAuthType();
     }
 }
@@ -112,4 +110,6 @@
 void UIVRDESettingsEditor::setTimeout(const QString &strTimeout)
 {
+    /* Update cached value and
+     * line-edit if value has changed: */
     if (m_strTimeout != strTimeout)
     {
@@ -127,4 +127,6 @@
 void UIVRDESettingsEditor::setMultipleConnectionsAllowed(bool fAllowed)
 {
+    /* Update cached value and
+     * check-box if value has changed: */
     if (m_fMultipleConnectionsAllowed != fAllowed)
     {
@@ -226,7 +228,4 @@
         if (m_pWidgetSettings)
         {
-            /* Update widget availability: */
-            sltHandleFeatureToggled(m_pCheckboxFeature->isChecked());
-
             /* Prepare 'settings' layout: */
             QGridLayout *pLayoutRemoteDisplaySettings = new QGridLayout(m_pWidgetSettings);
@@ -307,4 +306,8 @@
         }
     }
+
+    /* Update widget availability: */
+    if (m_pCheckboxFeature)
+        sltHandleFeatureToggled(m_pCheckboxFeature->isChecked());
 }
 
@@ -338,4 +341,9 @@
         foreach (const KAuthType &enmType, authTypes)
             m_pComboAuthType->addItem(gpConverter->toString(enmType), QVariant::fromValue(enmType));
-    }
-}
+
+        /* Look for proper index to choose: */
+        const int iIndex = m_pComboAuthType->findData(QVariant::fromValue(m_enmAuthType));
+        if (iIndex != -1)
+            m_pComboAuthType->setCurrentIndex(iIndex);
+    }
+}
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVRDESettingsEditor.h	(revision 94395)
@@ -21,7 +21,4 @@
 # pragma once
 #endif
-
-/* Qt includes: */
-#include <QMap>
 
 /* GUI includes: */
@@ -50,5 +47,5 @@
 public:
 
-    /** Constructs VRDE settings editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIVRDESettingsEditor(QWidget *pParent = 0);
 
@@ -103,5 +100,5 @@
     void repopulateComboAuthType();
 
-    /** @name Variables
+    /** @name Values
      * @{ */
         /** Holds whether feature is enabled. */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.cpp	(revision 94395)
@@ -34,4 +34,5 @@
 UIVideoMemoryEditor::UIVideoMemoryEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
+    , m_iValue(0)
     , m_comGuestOSType(CGuestOSType())
     , m_cGuestScreenCount(1)
@@ -44,5 +45,4 @@
     , m_iMaxVRAM(0)
     , m_iMaxVRAMVisible(0)
-    , m_iInitialVRAM(0)
     , m_pLayout(0)
     , m_pLabelMemory(0)
@@ -57,8 +57,14 @@
 void UIVideoMemoryEditor::setValue(int iValue)
 {
-    if (m_pSlider)
-    {
-        m_iInitialVRAM = RT_MIN(iValue, m_iMaxVRAM);
-        m_pSlider->setValue(m_iInitialVRAM);
+    /* Update cached value and
+     * slider if value has changed: */
+    if (m_iValue != iValue)
+    {
+        m_iValue = RT_MIN(iValue, m_iMaxVRAM);
+        if (m_pSlider)
+            m_pSlider->setValue(m_iValue);
+
+        /* Update requirements: */
+        updateRequirements();
     }
 }
@@ -66,44 +72,47 @@
 int UIVideoMemoryEditor::value() const
 {
-    return m_pSlider ? m_pSlider->value() : 0;
+    return m_pSlider ? m_pSlider->value() : m_iValue;
 }
 
 void UIVideoMemoryEditor::setGuestOSType(const CGuestOSType &comGuestOSType)
 {
-    /* Check if guest OS type really changed: */
-    if (m_comGuestOSType == comGuestOSType)
-        return;
-
-    /* Remember new guest OS type: */
-    m_comGuestOSType = comGuestOSType;
-
-    /* Update requirements: */
-    updateRequirements();
+    /* Update cached value and
+     * requirements if value has changed: */
+    if (m_comGuestOSType != comGuestOSType)
+    {
+        /* Remember new guest OS type: */
+        m_comGuestOSType = comGuestOSType;
+
+        /* Update requirements: */
+        updateRequirements();
+    }
 }
 
 void UIVideoMemoryEditor::setGuestScreenCount(int cGuestScreenCount)
 {
-    /* Check if guest screen count really changed: */
-    if (m_cGuestScreenCount == cGuestScreenCount)
-        return;
-
-    /* Remember new guest screen count: */
-    m_cGuestScreenCount = cGuestScreenCount;
-
-    /* Update requirements: */
-    updateRequirements();
+    /* Update cached value and
+     * requirements if value has changed: */
+    if (m_cGuestScreenCount != cGuestScreenCount)
+    {
+        /* Remember new guest screen count: */
+        m_cGuestScreenCount = cGuestScreenCount;
+
+        /* Update requirements: */
+        updateRequirements();
+    }
 }
 
 void UIVideoMemoryEditor::setGraphicsControllerType(const KGraphicsControllerType &enmGraphicsControllerType)
 {
-    /* Check if graphics controller type really changed: */
-    if (m_enmGraphicsControllerType == enmGraphicsControllerType)
-        return;
-
-    /* Remember new graphics controller type: */
-    m_enmGraphicsControllerType = enmGraphicsControllerType;
-
-    /* Update requirements: */
-    updateRequirements();
+    /* Update cached value and
+     * requirements if value has changed: */
+    if (m_enmGraphicsControllerType != enmGraphicsControllerType)
+    {
+        /* Remember new graphics controller type: */
+        m_enmGraphicsControllerType = enmGraphicsControllerType;
+
+        /* Update requirements: */
+        updateRequirements();
+    }
 }
 
@@ -111,26 +120,28 @@
 void UIVideoMemoryEditor::set3DAccelerationSupported(bool fSupported)
 {
-    /* Check if 3D acceleration really changed: */
-    if (m_f3DAccelerationSupported == fSupported)
-        return;
-
-    /* Remember new 3D acceleration: */
-    m_f3DAccelerationSupported = fSupported;
-
-    /* Update requirements: */
-    updateRequirements();
+    /* Update cached value and
+     * requirements if value has changed: */
+    if (m_f3DAccelerationSupported != fSupported)
+    {
+        /* Remember new 3D acceleration: */
+        m_f3DAccelerationSupported = fSupported;
+
+        /* Update requirements: */
+        updateRequirements();
+    }
 }
 
 void UIVideoMemoryEditor::set3DAccelerationEnabled(bool fEnabled)
 {
-    /* Check if 3D acceleration really changed: */
-    if (m_f3DAccelerationEnabled == fEnabled)
-        return;
-
-    /* Remember new 3D acceleration: */
-    m_f3DAccelerationEnabled = fEnabled;
-
-    /* Update requirements: */
-    updateRequirements();
+    /* Update cached value and
+     * requirements if value has changed: */
+    if (m_f3DAccelerationEnabled != fEnabled)
+    {
+        /* Remember new 3D acceleration: */
+        m_f3DAccelerationEnabled = fEnabled;
+
+        /* Update requirements: */
+        updateRequirements();
+    }
 }
 #endif /* VBOX_WITH_3D_ACCELERATION */
@@ -315,8 +326,8 @@
             m_iMaxVRAMVisible = 256;
     }
-#endif
+#endif /* VBOX_WITH_3D_ACCELERATION */
 
     /* Adjust visible maximum VRAM to be no less than initial VRAM: */
-    m_iMaxVRAMVisible = qMax(m_iMaxVRAMVisible, m_iInitialVRAM);
+    m_iMaxVRAMVisible = qMax(m_iMaxVRAMVisible, m_iValue);
     /* Adjust visible maximum VRAM to be no less than recommended VRAM: */
     m_iMaxVRAMVisible = qMax(m_iMaxVRAMVisible, iNeedMBytes);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVideoMemoryEditor.h	(revision 94395)
@@ -51,5 +51,5 @@
 public:
 
-    /** Constructs video-memory editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIVideoMemoryEditor(QWidget *pParent = 0);
 
@@ -106,40 +106,47 @@
     static int calculatePageStep(int iMax);
 
-    /** Holds the guest OS type ID. */
-    CGuestOSType             m_comGuestOSType;
-    /** Holds the guest screen count. */
-    int                      m_cGuestScreenCount;
-    /** Holds the graphics controller type. */
-    KGraphicsControllerType  m_enmGraphicsControllerType;
+    /** Holds the value to be selected. */
+    int  m_iValue;
+
+    /** @name Options
+     * @{ */
+        /** Holds the guest OS type ID. */
+        CGuestOSType             m_comGuestOSType;
+        /** Holds the guest screen count. */
+        int                      m_cGuestScreenCount;
+        /** Holds the graphics controller type. */
+        KGraphicsControllerType  m_enmGraphicsControllerType;
 #ifdef VBOX_WITH_3D_ACCELERATION
-    /** Holds whether 3D acceleration is supported. */
-    bool                     m_f3DAccelerationSupported;
-    /** Holds whether 3D acceleration is enabled. */
-    bool                     m_f3DAccelerationEnabled;
+        /** Holds whether 3D acceleration is supported. */
+        bool                     m_f3DAccelerationSupported;
+        /** Holds whether 3D acceleration is enabled. */
+        bool                     m_f3DAccelerationEnabled;
 #endif
 
-    /** Holds the minimum lower limit of VRAM (MiB). */
-    int  m_iMinVRAM;
-    /** Holds the maximum upper limit of VRAM (MiB). */
-    int  m_iMaxVRAM;
-    /** Holds the upper limit of VRAM (MiB) for this dialog.
-      * @note This value is lower than m_iMaxVRAM to save
-      *       careless users from setting useless big values. */
-    int  m_iMaxVRAMVisible;
-    /** Holds the initial VRAM value when the dialog is opened. */
-    int  m_iInitialVRAM;
+        /** Holds the minimum lower limit of VRAM (MiB). */
+        int  m_iMinVRAM;
+        /** Holds the maximum upper limit of VRAM (MiB). */
+        int  m_iMaxVRAM;
+        /** Holds the upper limit of VRAM (MiB) for this dialog.
+          * @note This value is lower than m_iMaxVRAM to save
+          *       careless users from setting useless big values. */
+        int  m_iMaxVRAMVisible;
+    /** @} */
 
-    /** Holds the main layout instance. */
-    QGridLayout      *m_pLayout;
-    /** Holds the memory label instance. */
-    QLabel           *m_pLabelMemory;
-    /** Holds the memory slider instance. */
-    QIAdvancedSlider *m_pSlider;
-    /** Holds minimum memory label instance. */
-    QLabel           *m_pLabelMemoryMin;
-    /** Holds maximum memory label instance. */
-    QLabel           *m_pLabelMemoryMax;
-    /** Holds the memory spin-box instance. */
-    QSpinBox         *m_pSpinBox;
+    /** @name Widgets
+     * @{ */
+        /** Holds the main layout instance. */
+        QGridLayout      *m_pLayout;
+        /** Holds the memory label instance. */
+        QLabel           *m_pLabelMemory;
+        /** Holds the memory slider instance. */
+        QIAdvancedSlider *m_pSlider;
+        /** Holds minimum memory label instance. */
+        QLabel           *m_pLabelMemoryMin;
+        /** Holds maximum memory label instance. */
+        QLabel           *m_pLabelMemoryMax;
+        /** Holds the memory spin-box instance. */
+        QSpinBox         *m_pSpinBox;
+    /** @} */
 };
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVirtualCPUEditor.h	(revision 94395)
@@ -46,5 +46,6 @@
 public:
 
-    /** @param  fWithLabel  Determines whether we should add label ourselves. */
+    /** Constructs editor passing @a pParent to the base-class.
+      * @param  fWithLabel  Determines whether we should add label ourselves. */
     UIVirtualCPUEditor(QWidget *pParent = 0, bool fWithLabel = false);
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.cpp	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.cpp	(revision 94395)
@@ -41,23 +41,21 @@
 void UIVisualStateEditor::setMachineId(const QUuid &uMachineId)
 {
-    m_uMachineId = uMachineId;
+    /* Update cached value and
+     * combo if value has changed: */
+    if (m_uMachineId != uMachineId)
+    {
+        m_uMachineId = uMachineId;
+        populateCombo();
+    }
 }
 
 void UIVisualStateEditor::setValue(UIVisualStateType enmValue)
 {
-    if (m_pCombo)
+    /* Update cached value and
+     * combo if value has changed: */
+    if (m_enmValue != enmValue)
     {
-        /* Update cached value and
-         * combo if value has changed: */
-        if (m_enmValue != enmValue)
-        {
-            m_enmValue = enmValue;
-            populateCombo();
-        }
-
-        /* Look for proper index to choose: */
-        int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
-        if (iIndex != -1)
-            m_pCombo->setCurrentIndex(iIndex);
+        m_enmValue = enmValue;
+        populateCombo();
     }
 }
@@ -70,5 +68,5 @@
 int UIVisualStateEditor::minimumLabelHorizontalHint() const
 {
-    return m_pLabel->minimumSizeHint().width();
+    return m_pLabel ? m_pLabel->minimumSizeHint().width() : 0;
 }
 
@@ -93,10 +91,4 @@
                                 "as soon as possible, otherwise desired one will be defined."));
     }
-}
-
-void UIVisualStateEditor::sltHandleCurrentIndexChanged()
-{
-    if (m_pCombo)
-        emit sigValueChanged(m_pCombo->itemData(m_pCombo->currentIndex()).value<UIVisualStateType>());
 }
 
@@ -129,6 +121,4 @@
                 if (m_pLabel)
                     m_pLabel->setBuddy(m_pCombo);
-                connect(m_pCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-                        this, &UIVisualStateEditor::sltHandleCurrentIndexChanged);
                 pComboLayout->addWidget(m_pCombo);
             }
@@ -181,4 +171,9 @@
             m_pCombo->addItem(QString(), QVariant::fromValue(enmType));
 
+        /* Look for proper index to choose: */
+        const int iIndex = m_pCombo->findData(QVariant::fromValue(m_enmValue));
+        if (iIndex != -1)
+            m_pCombo->setCurrentIndex(iIndex);
+
         /* Retranslate finally: */
         retranslateUi();
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.h	(revision 94394)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIVisualStateEditor.h	(revision 94395)
@@ -41,12 +41,7 @@
     Q_OBJECT;
 
-signals:
-
-    /** Notifies listeners about @a enmValue change. */
-    void sigValueChanged(UIVisualStateType enmValue);
-
 public:
 
-    /** Constructs visual state editor passing @a pParent to the base-class. */
+    /** Constructs editor passing @a pParent to the base-class. */
     UIVisualStateEditor(QWidget *pParent = 0);
 
@@ -71,9 +66,4 @@
     /** Handles translation event. */
     virtual void retranslateUi() RT_OVERRIDE;
-
-private slots:
-
-    /** Handles current index change. */
-    void sltHandleCurrentIndexChanged();
 
 private:
