Changeset 86045 in vbox for trunk/src

Timestamp:

Sep 7, 2020 2:58:04 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9812: Cumulative cleanup for layout rework done before for VM settings.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsAudio.cpp (modified) (8 diffs)
• UIMachineSettingsAudio.h (modified) (1 diff)
• UIMachineSettingsDisplay.cpp (modified) (21 diffs)
• UIMachineSettingsGeneral.cpp (modified) (7 diffs)
• UIMachineSettingsInterface.cpp (modified) (9 diffs)
• UIMachineSettingsInterface.h (modified) (1 diff)
• UIMachineSettingsNetwork.cpp (modified) (5 diffs)
• UIMachineSettingsSF.cpp (modified) (4 diffs)
• UIMachineSettingsSF.h (modified) (1 diff)
• UIMachineSettingsSFDetails.cpp (modified) (6 diffs)
• UIMachineSettingsSFDetails.h (modified) (1 diff)
• UIMachineSettingsSerial.cpp (modified) (5 diffs)
• UIMachineSettingsStorage.cpp (modified) (51 diffs)
• UIMachineSettingsStorage.h (modified) (3 diffs)
• UIMachineSettingsSystem.cpp (modified) (13 diffs)
• UIMachineSettingsSystem.h (modified) (1 diff)
• UIMachineSettingsUSB.cpp (modified) (8 diffs)
• UIMachineSettingsUSB.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp

@@ -78 +78 @@
     , m_pCheckBoxAudio(0)
     , m_pWidgetAudioSettings(0)
-    , m_pAudioHostDriverLabel(0)
-    , m_pAudioHostDriverEditor(0)
-    , m_pAudioControllerLabel(0)
-    , m_pAudioControllerEditor(0)
+    , m_pLabelAudioHostDriver(0)
+    , m_pEditorAudioHostDriver(0)
+    , m_pLabelAudioController(0)
+    , m_pEditorAudioController(0)
     , m_pLabelAudioExtended(0)
     , m_pCheckBoxAudioOutput(0)
@@ -138 +138 @@
     /* Load old audio data from the cache: */
     m_pCheckBoxAudio->setChecked(oldAudioData.m_fAudioEnabled);
-    m_pAudioHostDriverEditor->setValue(oldAudioData.m_audioDriverType);
-    m_pAudioControllerEditor->setValue(oldAudioData.m_audioControllerType);
+    m_pEditorAudioHostDriver->setValue(oldAudioData.m_audioDriverType);
+    m_pEditorAudioController->setValue(oldAudioData.m_audioControllerType);
     m_pCheckBoxAudioOutput->setChecked(oldAudioData.m_fAudioOutputEnabled);
     m_pCheckBoxAudioInput->setChecked(oldAudioData.m_fAudioInputEnabled);
@@ -154 +154 @@
     /* Gather new audio data: */
     newAudioData.m_fAudioEnabled = m_pCheckBoxAudio->isChecked();
-    newAudioData.m_audioDriverType = m_pAudioHostDriverEditor->value();
-    newAudioData.m_audioControllerType = m_pAudioControllerEditor->value();
+    newAudioData.m_audioDriverType = m_pEditorAudioHostDriver->value();
+    newAudioData.m_audioControllerType = m_pEditorAudioController->value();
     newAudioData.m_fAudioOutputEnabled = m_pCheckBoxAudioOutput->isChecked();
     newAudioData.m_fAudioInputEnabled = m_pCheckBoxAudioInput->isChecked();
@@ -181 +181 @@
                                       "the host audio system using the specified driver."));
     m_pCheckBoxAudio->setText(tr("Enable &Audio"));
-    m_pAudioHostDriverLabel->setText(tr("Host Audio &Driver:"));
-    m_pAudioHostDriverEditor->setWhatsThis(tr("Selects the audio output driver."
+    m_pLabelAudioHostDriver->setText(tr("Host Audio &Driver:"));
+    m_pEditorAudioHostDriver->setWhatsThis(tr("Selects the audio output driver."
                                               "The <b>Null Audio Driver</b> makes the guest see an audio card,"
                                               "however every access to it will be ignored."));
-    m_pAudioControllerLabel->setText(tr("Audio &Controller:"));
-    m_pAudioControllerEditor->setWhatsThis(tr("Selects the type of the virtual sound"
+    m_pLabelAudioController->setText(tr("Audio &Controller:"));
+    m_pEditorAudioController->setWhatsThis(tr("Selects the type of the virtual sound"
                                               "card. Depending on this value, VirtualBox will provide different"
                                               "audio hardware to the virtual machine."));
@@ -204 +204 @@
     /* Polish audio page availability: */
     m_pCheckBoxAudio->setEnabled(isMachineOffline());
-    m_pAudioHostDriverLabel->setEnabled(isMachineOffline() || isMachineSaved());
-    m_pAudioHostDriverEditor->setEnabled(isMachineOffline() || isMachineSaved());
-    m_pAudioControllerLabel->setEnabled(isMachineOffline());
-    m_pAudioControllerEditor->setEnabled(isMachineOffline());
+    m_pLabelAudioHostDriver->setEnabled(isMachineOffline() || isMachineSaved());
+    m_pEditorAudioHostDriver->setEnabled(isMachineOffline() || isMachineSaved());
+    m_pLabelAudioController->setEnabled(isMachineOffline());
+    m_pEditorAudioController->setEnabled(isMachineOffline());
     m_pLabelAudioExtended->setEnabled(isMachineInValidMode());
     m_pCheckBoxAudioOutput->setEnabled(isMachineInValidMode());
@@ -255 +255 @@
             {
                 pLayoutAudioSettings->setContentsMargins(0, 0, 0, 0);
-
-                /* Prepare host driver label: */
-                m_pAudioHostDriverLabel = new QLabel(m_pWidgetAudioSettings);
-                if (m_pAudioHostDriverLabel)
-                {
-                    m_pAudioHostDriverLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    pLayoutAudioSettings->addWidget(m_pAudioHostDriverLabel, 0, 0);
-                }
-                /* Prepare host driver editor: */
-                m_pAudioHostDriverEditor = new UIAudioHostDriverEditor(m_pWidgetAudioSettings);
-                if (m_pAudioHostDriverEditor)
-                {
-                    m_pAudioHostDriverLabel->setBuddy(m_pAudioHostDriverEditor->focusProxy());
-                    pLayoutAudioSettings->addWidget(m_pAudioHostDriverEditor, 0, 1);
-                }
-
-                /* Prepare host controller label: */
-                m_pAudioControllerLabel = new QLabel(m_pWidgetAudioSettings);
-                if (m_pAudioControllerLabel)
-                {
-                    m_pAudioControllerLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                    pLayoutAudioSettings->addWidget(m_pAudioControllerLabel, 1, 0);
-                }
-                /* Prepare host controller editor: */
-                m_pAudioControllerEditor = new UIAudioControllerEditor(m_pWidgetAudioSettings);
-                if (m_pAudioControllerEditor)
-                {
-                    m_pAudioControllerLabel->setBuddy(m_pAudioControllerEditor->focusProxy());
-                    pLayoutAudioSettings->addWidget(m_pAudioControllerEditor, 1, 1);
-                }
-
-                /* Prepare extended label: */
+                pLayoutAudioSettings->setColumnStretch(1, 1);
+
+                /* Prepare audio host driver label: */
+                m_pLabelAudioHostDriver = new QLabel(m_pWidgetAudioSettings);
+                if (m_pLabelAudioHostDriver)
+                {
+                    m_pLabelAudioHostDriver->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    pLayoutAudioSettings->addWidget(m_pLabelAudioHostDriver, 0, 0);
+                }
+                /* Prepare audio host driver editor: */
+                m_pEditorAudioHostDriver = new UIAudioHostDriverEditor(m_pWidgetAudioSettings);
+                if (m_pEditorAudioHostDriver)
+                {
+                    if (m_pLabelAudioHostDriver)
+                        m_pLabelAudioHostDriver->setBuddy(m_pEditorAudioHostDriver->focusProxy());
+                    pLayoutAudioSettings->addWidget(m_pEditorAudioHostDriver, 0, 1, 1, 2);
+                }
+
+                /* Prepare audio host controller label: */
+                m_pLabelAudioController = new QLabel(m_pWidgetAudioSettings);
+                if (m_pLabelAudioController)
+                {
+                    m_pLabelAudioController->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+                    pLayoutAudioSettings->addWidget(m_pLabelAudioController, 1, 0);
+                }
+                /* Prepare audio host controller editor: */
+                m_pEditorAudioController = new UIAudioControllerEditor(m_pWidgetAudioSettings);
+                if (m_pEditorAudioController)
+                {
+                    if (m_pLabelAudioController)
+                        m_pLabelAudioController->setBuddy(m_pEditorAudioController->focusProxy());
+                    pLayoutAudioSettings->addWidget(m_pEditorAudioController, 1, 1, 1, 2);
+                }
+
+                /* Prepare audio extended label: */
                 m_pLabelAudioExtended = new QLabel(m_pWidgetAudioSettings);
                 if (m_pLabelAudioExtended)
@@ -293 +296 @@
                     pLayoutAudioSettings->addWidget(m_pLabelAudioExtended, 2, 0);
                 }
-                /* Prepare output check-box: */
+                /* Prepare audio output check-box: */
                 m_pCheckBoxAudioOutput = new QCheckBox(m_pWidgetAudioSettings);
                 if (m_pCheckBoxAudioOutput)
                     pLayoutAudioSettings->addWidget(m_pCheckBoxAudioOutput, 2, 1);
-                /* Prepare input check-box: */
+                /* Prepare audio input check-box: */
                 m_pCheckBoxAudioInput = new QCheckBox(m_pWidgetAudioSettings);
                 if (m_pCheckBoxAudioInput)
                     pLayoutAudioSettings->addWidget(m_pCheckBoxAudioInput, 3, 1);
-
-                pLayoutMain->addWidget(m_pWidgetAudioSettings, 1, 1, 1, 1);
-            }
+            }
+
+            pLayoutMain->addWidget(m_pWidgetAudioSettings, 1, 1);
         }
     }
@@ -310 +313 @@
 void UIMachineSettingsAudio::prepareConnections()
 {
-    QObject::connect(m_pCheckBoxAudio, &QCheckBox::toggled, m_pWidgetAudioSettings, &QWidget::setEnabled);
+    connect(m_pCheckBoxAudio, &QCheckBox::toggled, m_pWidgetAudioSettings, &QWidget::setEnabled);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h

@@ -93 +93 @@
         /** Holds the audio settings widget instance. */
         QWidget                 *m_pWidgetAudioSettings;
-        /** Holds the host audio driver label instance. */
-        QLabel                  *m_pAudioHostDriverLabel;
-        /** Holds the host audio driver editor instance. */
-        UIAudioHostDriverEditor *m_pAudioHostDriverEditor;
-        /** Holds the host audio controller label instance. */
-        QLabel                  *m_pAudioControllerLabel;
-        /** Holds the host audio controller instance instance. */
-        UIAudioControllerEditor *m_pAudioControllerEditor;
+        /** Holds the audio host driver label instance. */
+        QLabel                  *m_pLabelAudioHostDriver;
+        /** Holds the audio host driver editor instance. */
+        UIAudioHostDriverEditor *m_pEditorAudioHostDriver;
+        /** Holds the audio host controller label instance. */
+        QLabel                  *m_pLabelAudioController;
+        /** Holds the audio host controller instance instance. */
+        UIAudioControllerEditor *m_pEditorAudioController;
         /** Holds the audio extended label instance. */
         QLabel                  *m_pLabelAudioExtended;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -1080 +1080 @@
     const CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
 
-    /* Prepare Screen tab: */
+    /* Prepare 'Screen' tab: */
     m_pTabScreen = new QWidget;
     if (m_pTabScreen)
     {
-        /* Prepare Screen tab layout: */
+        /* Prepare 'Screen' tab layout: */
         QGridLayout *pLayoutScreen = new QGridLayout(m_pTabScreen);
         if (pLayoutScreen)
@@ -1101 +1101 @@
             if (m_pEditorVideoMemorySize)
             {
-                m_pLabelVideoMemorySize->setBuddy(m_pEditorVideoMemorySize->focusProxy());
+                if (m_pLabelVideoMemorySize)
+                    m_pLabelVideoMemorySize->setBuddy(m_pEditorVideoMemorySize->focusProxy());
                 pLayoutScreen->addWidget(m_pEditorVideoMemorySize, 0, 1, 2, 2);
             }
@@ -1162 +1163 @@
             if (m_pSpinboxMonitorCount)
             {
-                m_pLabelMonitorCount->setBuddy(m_pSpinboxMonitorCount);
+                if (m_pLabelMonitorCount)
+                    m_pLabelMonitorCount->setBuddy(m_pSpinboxMonitorCount);
                 m_pSpinboxMonitorCount->setMinimum(1);
                 m_pSpinboxMonitorCount->setMaximum(comProperties.GetMaxGuestMonitors());
@@ -1180 +1182 @@
             if (m_pEditorScaleFactor)
             {
-                m_pLabelScaleFactor->setBuddy(m_pEditorScaleFactor->focusProxy());
+                if (m_pLabelScaleFactor)
+                    m_pLabelScaleFactor->setBuddy(m_pEditorScaleFactor->focusProxy());
                 pLayoutScreen->addWidget(m_pEditorScaleFactor, 4, 1, 2, 2);
             }
@@ -1195 +1198 @@
             if (m_pEditorGraphicsController)
             {
-                m_pLabelGraphicsController->setBuddy(m_pEditorGraphicsController->focusProxy());
+                if (m_pLabelGraphicsController)
+                    m_pLabelGraphicsController->setBuddy(m_pEditorGraphicsController->focusProxy());
                 pLayoutScreen->addWidget(m_pEditorGraphicsController, 6, 1, 1, 2);
             }
@@ -1218 +1222 @@
 void UIMachineSettingsDisplay::prepareTabRemoteDisplay()
 {
-    /* Prepare Remote Display tab: */
+    /* Prepare 'Remote Display' tab: */
     m_pTabRemoteDisplay = new QWidget;
     if (m_pTabRemoteDisplay)
     {
-        /* Prepare Remote Display tab layout: */
-        QGridLayout *pLayoutTabRemoteDisplay = new QGridLayout(m_pTabRemoteDisplay);
-        if (pLayoutTabRemoteDisplay)
+        /* Prepare 'Remote Display' tab layout: */
+        QGridLayout *pLayoutRemoteDisplay = new QGridLayout(m_pTabRemoteDisplay);
+        if (pLayoutRemoteDisplay)
         {
-            pLayoutTabRemoteDisplay->setRowStretch(2, 1);
+            pLayoutRemoteDisplay->setRowStretch(2, 1);
 
             /* Prepare remote display check-box: */
             m_pCheckboxRemoteDisplay = new QCheckBox(m_pTabRemoteDisplay);
             if (m_pCheckboxRemoteDisplay)
-                pLayoutTabRemoteDisplay->addWidget(m_pCheckboxRemoteDisplay, 0, 0, 1, 2);
+                pLayoutRemoteDisplay->addWidget(m_pCheckboxRemoteDisplay, 0, 0, 1, 2);
 
             /* Prepare 20-px shifting spacer: */
             QSpacerItem *pSpacerItem = new QSpacerItem(20, 0, QSizePolicy::Fixed, QSizePolicy::Minimum);
             if (pSpacerItem)
-                pLayoutTabRemoteDisplay->addItem(pSpacerItem, 1, 0);
+                pLayoutRemoteDisplay->addItem(pSpacerItem, 1, 0);
 
             /* Prepare remote display settings widget: */
@@ -1259 +1263 @@
                     if (m_pEditorRemoteDisplayPort)
                     {
-                        m_pLabelRemoteDisplayPort->setBuddy(m_pEditorRemoteDisplayPort);
+                        if (m_pLabelRemoteDisplayPort)
+                            m_pLabelRemoteDisplayPort->setBuddy(m_pEditorRemoteDisplayPort);
                         m_pEditorRemoteDisplayPort->setValidator(new QRegExpValidator(
                             QRegExp("(([0-9]{1,5}(\\-[0-9]{1,5}){0,1}),)*([0-9]{1,5}(\\-[0-9]{1,5}){0,1})"), this));
@@ -1277 +1282 @@
                     if (m_pComboRemoteDisplayAuthMethod)
                     {
-                        m_pLabelRemoteDisplayAuthMethod->setBuddy(m_pComboRemoteDisplayAuthMethod);
+                        if (m_pLabelRemoteDisplayAuthMethod)
+                            m_pLabelRemoteDisplayAuthMethod->setBuddy(m_pComboRemoteDisplayAuthMethod);
                         m_pComboRemoteDisplayAuthMethod->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 
@@ -1294 +1300 @@
                     if (m_pEditorRemoteDisplayTimeout)
                     {
-                        m_pLabelRemoteDisplayTimeout->setBuddy(m_pEditorRemoteDisplayTimeout);
+                        if (m_pLabelRemoteDisplayTimeout)
+                            m_pLabelRemoteDisplayTimeout->setBuddy(m_pEditorRemoteDisplayTimeout);
                         m_pEditorRemoteDisplayTimeout->setValidator(new QIntValidator(this));
 
@@ -1313 +1320 @@
                 }
 
-                pLayoutTabRemoteDisplay->addWidget(m_pWidgetRemoteDisplaySettings, 1, 1);
+                pLayoutRemoteDisplay->addWidget(m_pWidgetRemoteDisplaySettings, 1, 1);
             }
         }
@@ -1323 +1330 @@
 void UIMachineSettingsDisplay::prepareTabRecording()
 {
-    /* Prepare Recording tab: */
+    /* Prepare 'Recording' tab: */
     m_pTabRecording = new QWidget;
     if (m_pTabRecording)
     {
-        /* Prepare Recording tab layout: */
+        /* Prepare 'Recording' tab layout: */
         QGridLayout *pLayoutRecording = new QGridLayout(m_pTabRecording);
         if (pLayoutRecording)
@@ -1364 +1371 @@
                     if (m_pComboRecordingMode)
                     {
-                        m_pLabelRecordingMode->setBuddy(m_pComboRecordingMode);
+                        if (m_pLabelRecordingMode)
+                            m_pLabelRecordingMode->setBuddy(m_pComboRecordingMode);
                         m_pComboRecordingMode->insertItem(0, ""); /* UISettingsDefs::RecordingMode_VideoAudio */
                         m_pComboRecordingMode->insertItem(1, ""); /* UISettingsDefs::RecordingMode_VideoOnly */
@@ -1383 +1391 @@
                     if (m_pEditorRecordingFilePath)
                     {
-                        m_pLabelRecordingFilePath->setBuddy(m_pEditorRecordingFilePath->focusProxy());
+                        if (m_pLabelRecordingFilePath)
+                            m_pLabelRecordingFilePath->setBuddy(m_pEditorRecordingFilePath->focusProxy());
                         m_pEditorRecordingFilePath->setEditable(false);
                         m_pEditorRecordingFilePath->setMode(UIFilePathSelector::Mode_File_Save);
@@ -1401 +1410 @@
                     if (m_pComboRecordingFrameSize)
                     {
-                        m_pLabelRecordingFrameSize->setBuddy(m_pComboRecordingFrameSize);
+                        if (m_pLabelRecordingFrameSize)
+                            m_pLabelRecordingFrameSize->setBuddy(m_pComboRecordingFrameSize);
                         m_pComboRecordingFrameSize->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
                         m_pComboRecordingFrameSize->addItem(""); /* User Defined */
@@ -1508 +1518 @@
                     if (m_pSpinboxRecordingFrameRate)
                     {
-                        m_pLabelRecordingFrameRate->setBuddy(m_pSpinboxRecordingFrameRate);
+                        if (m_pLabelRecordingFrameRate)
+                            m_pLabelRecordingFrameRate->setBuddy(m_pSpinboxRecordingFrameRate);
                         uiCommon().setMinimumWidthAccordingSymbolCount(m_pSpinboxRecordingFrameRate, 3);
                         m_pSpinboxRecordingFrameRate->setMinimum(1);
@@ -1581 +1592 @@
                     if (m_pSpinboxRecordingVideoQuality)
                     {
-                        m_pLabelRecordingVideoQuality->setBuddy(m_pSpinboxRecordingVideoQuality);
+                        if (m_pLabelRecordingVideoQuality)
+                            m_pLabelRecordingVideoQuality->setBuddy(m_pSpinboxRecordingVideoQuality);
                         uiCommon().setMinimumWidthAccordingSymbolCount(m_pSpinboxRecordingVideoQuality, 5);
                         m_pSpinboxRecordingVideoQuality->setMinimum(VIDEO_CAPTURE_BIT_RATE_MIN);
@@ -1610 +1622 @@
                             if (m_pSliderRecordingAudioQuality)
                             {
-                                m_pLabelRecordingAudioQuality->setBuddy(m_pSliderRecordingAudioQuality);
+                                if (m_pLabelRecordingAudioQuality)
+                                    m_pLabelRecordingAudioQuality->setBuddy(m_pSliderRecordingAudioQuality);
                                 m_pSliderRecordingAudioQuality->setOrientation(Qt::Horizontal);
                                 m_pSliderRecordingAudioQuality->setMinimum(1);
@@ -1620 +1633 @@
                                 m_pSliderRecordingAudioQuality->setOptimalHint(1, 2);
                                 m_pSliderRecordingAudioQuality->setWarningHint(2, 3);
+
                                 pLayoutRecordingAudioQuality->addWidget(m_pSliderRecordingAudioQuality);
                             }
@@ -1666 +1680 @@
                     if (m_pScrollerRecordingScreens)
                     {
-                        m_pLabelRecordingScreens->setBuddy(m_pScrollerRecordingScreens);
+                        if (m_pLabelRecordingScreens)
+                            m_pLabelRecordingScreens->setBuddy(m_pScrollerRecordingScreens);
                         pLayoutRecordingSettings->addWidget(m_pScrollerRecordingScreens, 10, 1, 1, 3);
                     }
@@ -1704 +1719 @@
     connect(m_pCheckboxRecording, &QCheckBox::toggled,
             this, &UIMachineSettingsDisplay::sltHandleRecordingCheckboxToggle);
+    connect(m_pComboRecordingMode, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &UIMachineSettingsDisplay::sltHandleRecordingComboBoxChange);
     connect(m_pComboRecordingFrameSize, static_cast<void(QComboBox::*)(int)>(&QComboBox:: currentIndexChanged),
             this, &UIMachineSettingsDisplay::sltHandleRecordingVideoFrameSizeComboboxChange);
@@ -1718 +1735 @@
     connect(m_pSpinboxRecordingVideoQuality, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
             this, &UIMachineSettingsDisplay::sltHandleRecordingVideoBitRateEditorChange);
-
-    connect(m_pComboRecordingMode, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-                this, &UIMachineSettingsDisplay::sltHandleRecordingComboBoxChange);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -611 +611 @@
 void UIMachineSettingsGeneral::prepareTabBasic()
 {
-    /* Prepare Basic tab: */
+    /* Prepare 'Basic' tab: */
     m_pTabBasic = new QWidget;
     if (m_pTabBasic)
     {
-        /* Prepare Basic tab layout: */
+        /* Prepare 'Basic' tab layout: */
         QVBoxLayout *pLayoutBasic = new QVBoxLayout(m_pTabBasic);
         if (pLayoutBasic)
@@ -637 +637 @@
 void UIMachineSettingsGeneral::prepareTabAdvanced()
 {
-    /* Prepare Advanced tab: */
+    /* Prepare 'Advanced' tab: */
     m_pTabAdvanced = new QWidget;
     if (m_pTabAdvanced)
     {
-        /* Prepare Advanced tab layout: */
+        /* Prepare 'Advanced' tab layout: */
         QGridLayout *pLayoutAdvanced = new QGridLayout(m_pTabAdvanced);
         if (pLayoutAdvanced)
@@ -703 +703 @@
 void UIMachineSettingsGeneral::prepareTabDescription()
 {
-    /* Prepare Description tab: */
+    /* Prepare 'Description' tab: */
     m_pTabDescription = new QWidget;
     if (m_pTabDescription)
     {
-        /* Prepare Description tab layout: */
+        /* Prepare 'Description' tab layout: */
         QVBoxLayout *pLayoutDescription = new QVBoxLayout(m_pTabDescription);
         if (pLayoutDescription)
@@ -731 +731 @@
 void UIMachineSettingsGeneral::prepareTabEncryption()
 {
-    /* Prepare Encryption tab: */
+    /* Prepare 'Encryption' tab: */
     m_pTabEncryption = new QWidget;
     if (m_pTabEncryption)
     {
-        /* Prepare Encryption tab layout: */
+        /* Prepare 'Encryption' tab layout: */
         QGridLayout *pLayoutEncryption = new QGridLayout(m_pTabEncryption);
         if (pLayoutEncryption)
@@ -772 +772 @@
                     if (m_pComboCipher)
                     {
+                        if (m_pLabelCipher)
+                            m_pLabelCipher->setBuddy(m_pComboCipher);
                         m_encryptionCiphers << QString()
                                             << "AES-XTS256-PLAIN64"
                                             << "AES-XTS128-PLAIN64";
                         m_pComboCipher->addItems(m_encryptionCiphers);
-                        if (m_pLabelCipher)
-                            m_pLabelCipher->setBuddy(m_pComboCipher);
                         m_pLayoutEncryptionSettings->addWidget(m_pComboCipher, 0, 1);
                     }
@@ -792 +792 @@
                     if (m_pEditorEncryptionPassword)
                     {
-                        m_pEditorEncryptionPassword->setEchoMode(QLineEdit::Password);
                         if (m_pLabelEncryptionPassword)
                             m_pLabelEncryptionPassword->setBuddy(m_pEditorEncryptionPassword);
+                        m_pEditorEncryptionPassword->setEchoMode(QLineEdit::Password);
                         m_pLayoutEncryptionSettings->addWidget(m_pEditorEncryptionPassword, 1, 1);
                     }
@@ -809 +809 @@
                     if (m_pEditorEncryptionPasswordConfirm)
                     {
-                        m_pEditorEncryptionPasswordConfirm->setEchoMode(QLineEdit::Password);
                         if (m_pLabelEncryptionPasswordConfirm)
                             m_pLabelEncryptionPasswordConfirm->setBuddy(m_pEditorEncryptionPasswordConfirm);
+                        m_pEditorEncryptionPasswordConfirm->setEchoMode(QLineEdit::Password);
                         m_pLayoutEncryptionSettings->addWidget(m_pEditorEncryptionPasswordConfirm, 2, 1);
                     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp

@@ -149 +149 @@
     , m_pLabelMiniToolBar(0)
     , m_pCheckBoxShowMiniToolBar(0)
-    , m_pCheckBoxToolBarAlignment(0)
+    , m_pCheckBoxMiniToolBarAlignment(0)
     , m_pEditorStatusBar(0)
 {
@@ -238 +238 @@
 #ifndef VBOX_WS_MAC
     m_pCheckBoxShowMiniToolBar->setChecked(oldInterfaceData.m_fShowMiniToolBar);
-    m_pCheckBoxToolBarAlignment->setChecked(oldInterfaceData.m_fMiniToolBarAtTop);
+    m_pCheckBoxMiniToolBarAlignment->setChecked(oldInterfaceData.m_fMiniToolBarAtTop);
 #endif
     m_pEditorVisualState->setMachineId(m_machine.GetId());
@@ -277 +277 @@
 #ifndef VBOX_WS_MAC
     newInterfaceData.m_fShowMiniToolBar = m_pCheckBoxShowMiniToolBar->isChecked();
-    newInterfaceData.m_fMiniToolBarAtTop = m_pCheckBoxToolBarAlignment->isChecked();
+    newInterfaceData.m_fMiniToolBarAtTop = m_pCheckBoxMiniToolBarAlignment->isChecked();
 #endif
     newInterfaceData.m_enmVisualState = m_pEditorVisualState->value();
@@ -306 +306 @@
     m_pCheckBoxShowMiniToolBar->setWhatsThis(tr("When checked, show the Mini ToolBar in full-screen and seamless modes."));
     m_pCheckBoxShowMiniToolBar->setText(tr("Show in &Full-screen/Seamless"));
-    m_pCheckBoxToolBarAlignment->setWhatsThis(tr("When checked, show the Mini ToolBar at the top of the screen, rather than in its"
+    m_pCheckBoxMiniToolBarAlignment->setWhatsThis(tr("When checked, show the Mini ToolBar at the top of the screen, rather than in its"
                                               "default position at the bottom of the screen."));
-    m_pCheckBoxToolBarAlignment->setText(tr("Show at &Top of Screen"));
+    m_pCheckBoxMiniToolBarAlignment->setText(tr("Show at &Top of Screen"));
     m_pEditorStatusBar->setWhatsThis(tr("Allows to modify VM status-bar contents."));
 }
@@ -319 +319 @@
     m_pLabelMiniToolBar->hide();
     m_pCheckBoxShowMiniToolBar->hide();
-    m_pCheckBoxToolBarAlignment->hide();
+    m_pCheckBoxMiniToolBarAlignment->hide();
 #else /* !VBOX_WS_MAC */
     m_pLabelMiniToolBar->setEnabled(isMachineInValidMode());
     m_pCheckBoxShowMiniToolBar->setEnabled(isMachineInValidMode());
-    m_pCheckBoxToolBarAlignment->setEnabled(isMachineInValidMode() && m_pCheckBoxShowMiniToolBar->isChecked());
+    m_pCheckBoxMiniToolBarAlignment->setEnabled(isMachineInValidMode() && m_pCheckBoxShowMiniToolBar->isChecked());
 #endif /* !VBOX_WS_MAC */
     m_pEditorStatusBar->setEnabled(isMachineInValidMode());
@@ -361 +361 @@
             m_pEditorMenuBar->setMachineID(m_uMachineId);
 
-            pLayoutMain->addWidget(m_pEditorMenuBar, 0, 0, 1, 2);
+            pLayoutMain->addWidget(m_pEditorMenuBar, 0, 0, 1, 3);
         }
 
@@ -383 +383 @@
             pLayoutMain->addWidget(m_pLabelMiniToolBar, 2, 0);
         }
-        /* Prepare show mini-toolbar check-box: */
+        /* Prepare 'show mini-toolbar' check-box: */
         m_pCheckBoxShowMiniToolBar = new QCheckBox(this);
         if (m_pCheckBoxShowMiniToolBar)
             pLayoutMain->addWidget(m_pCheckBoxShowMiniToolBar, 2, 1);
-        /* Prepare mini-toolbar alignment check-box: */
-        m_pCheckBoxToolBarAlignment = new QCheckBox(this);
-        if (m_pCheckBoxToolBarAlignment)
-            pLayoutMain->addWidget(m_pCheckBoxToolBarAlignment, 3, 1);
+        /* Prepare 'mini-toolbar alignment' check-box: */
+        m_pCheckBoxMiniToolBarAlignment = new QCheckBox(this);
+        if (m_pCheckBoxMiniToolBarAlignment)
+            pLayoutMain->addWidget(m_pCheckBoxMiniToolBarAlignment, 3, 1);
 
         /* Prepare status-bar editor: */
@@ -397 +397 @@
         {
             m_pEditorStatusBar->setMachineID(m_uMachineId);
-            pLayoutMain->addWidget(m_pEditorStatusBar, 5, 0, 1, 2);
+            pLayoutMain->addWidget(m_pEditorStatusBar, 5, 0, 1, 3);
         }
     }
@@ -405 +405 @@
 {
     connect(m_pCheckBoxShowMiniToolBar, &QCheckBox::toggled,
-            m_pCheckBoxToolBarAlignment, &UIMachineSettingsInterface::setEnabled);
+            m_pCheckBoxMiniToolBarAlignment, &UIMachineSettingsInterface::setEnabled);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h

@@ -112 +112 @@
         /** Holds the mini-toolbar label instance. */
         QLabel                  *m_pLabelMiniToolBar;
-        /** Holds the show mini-toolbar check-box instance. */
+        /** Holds the 'show mini-toolbar' check-box instance. */
         QCheckBox               *m_pCheckBoxShowMiniToolBar;
-        /** Holds the mini-toolbar alignment check-box instance. */
-        QCheckBox               *m_pCheckBoxToolBarAlignment;
+        /** Holds the 'mini-toolbar alignment' check-box instance. */
+        QCheckBox               *m_pCheckBoxMiniToolBarAlignment;
         /** Holds the status-bar editor instance. */
         UIStatusBarEditorWidget *m_pEditorStatusBar;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -787 +787 @@
                 if (m_pEditorAttachmentType)
                 {
-                    m_pLabelAttachmentType->setBuddy(m_pEditorAttachmentType->focusProxy1());
-                    m_pLabelAdapterName->setBuddy(m_pEditorAttachmentType->focusProxy2());
+                    if (m_pLabelAttachmentType)
+                        m_pLabelAttachmentType->setBuddy(m_pEditorAttachmentType->focusProxy1());
+                    if (m_pLabelAdapterName)
+                        m_pLabelAdapterName->setBuddy(m_pEditorAttachmentType->focusProxy2());
+
                     pLayoutAdapterSettings->addWidget(m_pEditorAttachmentType, 0, 1, 2, 3);
                 }
 
-                /* Prepare advanced arraow button: */
+                /* Prepare advanced arrow button: */
                 m_pButtonAdvanced = new QIArrowButtonSwitch(m_pWidgetAdapterSettings);
                 if (m_pButtonAdvanced)
@@ -816 +819 @@
                 if (m_pComboAdapterType)
                 {
-                    m_pLabelAdapterType->setBuddy(m_pComboAdapterType);
+                    if (m_pLabelAdapterType)
+                        m_pLabelAdapterType->setBuddy(m_pComboAdapterType);
                     pLayoutAdapterSettings->addWidget(m_pComboAdapterType, 3, 1, 1, 3);
                 }
@@ -831 +835 @@
                 if (m_pComboPromiscuousMode)
                 {
-                    m_pLabelPromiscuousMode->setBuddy(m_pComboPromiscuousMode);
+                    if (m_pLabelPromiscuousMode)
+                        m_pLabelPromiscuousMode->setBuddy(m_pComboPromiscuousMode);
                     pLayoutAdapterSettings->addWidget(m_pComboPromiscuousMode, 4, 1, 1, 3);
                 }
@@ -846 +851 @@
                 if (m_pEditorMAC)
                 {
-                    m_pLabelMAC->setBuddy(m_pEditorMAC);
+                    if (m_pLabelMAC)
+                        m_pLabelMAC->setBuddy(m_pEditorMAC);
                     m_pEditorMAC->setValidator(new QRegExpValidator(QRegExp("[0-9A-Fa-f]{12}"), this));
                     m_pEditorMAC->setMinimumWidthByText(QString().fill('0', 12));
@@ -875 +881 @@
                 m_pCheckBoxCableConnected = new QCheckBox(m_pWidgetAdapterSettings);
                 if (m_pCheckBoxCableConnected)
-                    pLayoutAdapterSettings->addWidget(m_pCheckBoxCableConnected, 7, 1, 1, 3);
+                    pLayoutAdapterSettings->addWidget(m_pCheckBoxCableConnected, 7, 1, 1, 2);
 
                 /* Prepare port forwarding button: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp

@@ -283 +283 @@
     , m_pLayoutTree(0)
     , m_pTreeWidget(0)
-    , m_pToolBar(0)
+    , m_pToolbar(0)
     , m_pActionAdd(0)
     , m_pActionEdit(0)
@@ -450 +450 @@
     /* Polish shared folders page availability: */
     m_pLabelSeparator->setEnabled(isMachineInValidMode());
-    m_pToolBar->setEnabled(isMachineInValidMode());
-    m_pToolBar->setEnabled(isMachineInValidMode());
+    m_pToolbar->setEnabled(isMachineInValidMode());
+    m_pToolbar->setEnabled(isMachineInValidMode());
 
     /* Update root items visibility: */
@@ -711 +711 @@
     if (pLayoutMain)
     {
-        pLayoutMain->setContentsMargins(0, 0, 0, 0);
-
         /* Prepare separator: */
         m_pLabelSeparator = new QILabelSeparator(this);
@@ -756 +754 @@
 {
     /* Prepare shared folders toolbar: */
-    m_pToolBar = new UIToolBar(this);
-    if (m_pToolBar)
+    m_pToolbar = new UIToolBar(this);
+    if (m_pToolbar)
     {
         const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-        m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
-        m_pToolBar->setOrientation(Qt::Vertical);
-
-        /* Prepare 'Add Shared Folder' action: */
-        m_pActionAdd = m_pToolBar->addAction(UIIconPool::iconSet(":/sf_add_16px.png",
-                                                                        ":/sf_add_disabled_16px.png"),
-                                                    QString(), this, SLOT(sltAddFolder()));
+        m_pToolbar->setIconSize(QSize(iIconMetric, iIconMetric));
+        m_pToolbar->setOrientation(Qt::Vertical);
+
+        /* Prepare 'add shared folder' action: */
+        m_pActionAdd = m_pToolbar->addAction(UIIconPool::iconSet(":/sf_add_16px.png",
+                                                                 ":/sf_add_disabled_16px.png"),
+                                             QString(), this, SLOT(sltAddFolder()));
         if (m_pActionAdd)
             m_pActionAdd->setShortcuts(QList<QKeySequence>() << QKeySequence("Ins") << QKeySequence("Ctrl+N"));
 
-        /* Prepare 'Edit Shared Folder' action: */
-        m_pActionEdit = m_pToolBar->addAction(UIIconPool::iconSet(":/sf_edit_16px.png",
-                                                                         ":/sf_edit_disabled_16px.png"),
-                                                     QString(), this, SLOT(sltEditFolder()));
+        /* Prepare 'edit shared folder' action: */
+        m_pActionEdit = m_pToolbar->addAction(UIIconPool::iconSet(":/sf_edit_16px.png",
+                                                                  ":/sf_edit_disabled_16px.png"),
+                                              QString(), this, SLOT(sltEditFolder()));
         if (m_pActionEdit)
             m_pActionEdit->setShortcuts(QList<QKeySequence>() << QKeySequence("Space") << QKeySequence("F2"));
 
-        /* Prepare 'Remove Shared Folder' action: */
-        m_pActionRemove = m_pToolBar->addAction(UIIconPool::iconSet(":/sf_remove_16px.png",
-                                                                           ":/sf_remove_disabled_16px.png"),
-                                                       QString(), this, SLOT(sltRemoveFolder()));
+        /* Prepare 'remove shared folder' action: */
+        m_pActionRemove = m_pToolbar->addAction(UIIconPool::iconSet(":/sf_remove_16px.png",
+                                                                    ":/sf_remove_disabled_16px.png"),
+                                                QString(), this, SLOT(sltRemoveFolder()));
         if (m_pActionRemove)
             m_pActionRemove->setShortcuts(QList<QKeySequence>() << QKeySequence("Del") << QKeySequence("Ctrl+R"));
 
-        m_pLayoutTree->addWidget(m_pToolBar);
+        m_pLayoutTree->addWidget(m_pToolbar);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h

@@ -163 +163 @@
         QITreeWidget     *m_pTreeWidget;
         /** Holds the toolbar instance. */
-        UIToolBar        *m_pToolBar;
-        /** Holds the Add action instance. */
+        UIToolBar        *m_pToolbar;
+        /** Holds the 'add shared folder' action instance. */
         QAction          *m_pActionAdd;
-        /** Holds the Edit action instance. */
+        /** Holds the 'edit shared folder' action instance. */
         QAction          *m_pActionEdit;
-        /** Holds the Remove action instance. */
+        /** Holds the 'remove shared folder' action instance. */
         QAction          *m_pActionRemove;
     /** @} */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp

@@ -46 +46 @@
     , m_pLabelAutoMountPoint(0)
     , m_pEditorAutoMountPoint(0)
-    , m_pReadonlyCheckBox(0)
-    , m_pAutoMountCheckBox(0)
-    , m_pPermanentCheckBox(0)
+    , m_pCheckBoxReadonly(0)
+    , m_pCheckBoxAutoMount(0)
+    , m_pCheckBoxPermanent(0)
     , m_pButtonBox(0)
 {
@@ -76 +76 @@
 void UIMachineSettingsSFDetails::setWriteable(bool fWritable)
 {
-    m_pReadonlyCheckBox->setChecked(!fWritable);
+    m_pCheckBoxReadonly->setChecked(!fWritable);
 }
 
 bool UIMachineSettingsSFDetails::isWriteable() const
 {
-    return !m_pReadonlyCheckBox->isChecked();
+    return !m_pCheckBoxReadonly->isChecked();
 }
 
 void UIMachineSettingsSFDetails::setAutoMount(bool fAutoMount)
 {
-    m_pAutoMountCheckBox->setChecked(fAutoMount);
+    m_pCheckBoxAutoMount->setChecked(fAutoMount);
 }
 
 bool UIMachineSettingsSFDetails::isAutoMounted() const
 {
-    return m_pAutoMountCheckBox->isChecked();
+    return m_pCheckBoxAutoMount->isChecked();
 }
 
@@ -106 +106 @@
 void UIMachineSettingsSFDetails::setPermanent(bool fPermanent)
 {
-    m_pPermanentCheckBox->setChecked(fPermanent);
+    m_pCheckBoxPermanent->setChecked(fPermanent);
 }
 
 bool UIMachineSettingsSFDetails::isPermanent() const
 {
-    return m_fUsePermanent ? m_pPermanentCheckBox->isChecked() : true;
+    return m_fUsePermanent ? m_pCheckBoxPermanent->isChecked() : true;
 }
 
@@ -119 +119 @@
     m_pLabelName->setText(tr("Folder Name:"));
     m_pEditorName->setToolTip(tr("Holds the name of the shared folder (as it will be seen by the guest OS)."));
-    m_pReadonlyCheckBox->setToolTip(tr("When checked, the guest OS will not be able to write to the specified shared folder."));
-    m_pReadonlyCheckBox->setText(tr("&Read-only"));
-    m_pAutoMountCheckBox->setToolTip(tr("When checked, the guest OS will try to automatically mount the shared folder on startup."));
-    m_pAutoMountCheckBox->setText(tr("&Auto-mount"));
+    m_pCheckBoxReadonly->setToolTip(tr("When checked, the guest OS will not be able to write to the specified shared folder."));
+    m_pCheckBoxReadonly->setText(tr("&Read-only"));
+    m_pCheckBoxAutoMount->setToolTip(tr("When checked, the guest OS will try to automatically mount the shared folder on startup."));
+    m_pCheckBoxAutoMount->setText(tr("&Auto-mount"));
     m_pLabelAutoMountPoint->setText(tr("Mount point:"));
     m_pEditorAutoMountPoint->setToolTip(tr("Where to automatically mount the folder in the guest.  A drive letter (e.g. 'G:') for Windows and OS/2 guests, path for the others.  If left empty the guest will pick something fitting."));
-    m_pPermanentCheckBox->setToolTip(tr("When checked, this shared folder will be permanent."));
-    m_pPermanentCheckBox->setText(tr("&Make Permanent"));
+    m_pCheckBoxPermanent->setToolTip(tr("When checked, this shared folder will be permanent."));
+    m_pCheckBoxPermanent->setText(tr("&Make Permanent"));
 
     switch (m_type)
@@ -255 +255 @@
 
         /* Prepare read-only check-box: */
-        m_pReadonlyCheckBox = new QCheckBox;
-        if (m_pReadonlyCheckBox)
-            pLayoutMain->addWidget(m_pReadonlyCheckBox, 3, 1);
+        m_pCheckBoxReadonly = new QCheckBox;
+        if (m_pCheckBoxReadonly)
+            pLayoutMain->addWidget(m_pCheckBoxReadonly, 3, 1);
         /* Prepare auto-mount check-box: */
-        m_pAutoMountCheckBox = new QCheckBox;
-        if (m_pAutoMountCheckBox)
-            pLayoutMain->addWidget(m_pAutoMountCheckBox, 4, 1);
+        m_pCheckBoxAutoMount = new QCheckBox;
+        if (m_pCheckBoxAutoMount)
+            pLayoutMain->addWidget(m_pCheckBoxAutoMount, 4, 1);
         /* Prepare permanent check-box: */
-        m_pPermanentCheckBox = new QCheckBox;
-        if (m_pPermanentCheckBox)
-        {
-            m_pPermanentCheckBox->setHidden(!m_fUsePermanent);
-            pLayoutMain->addWidget(m_pPermanentCheckBox, 5, 1);
+        m_pCheckBoxPermanent = new QCheckBox;
+        if (m_pCheckBoxPermanent)
+        {
+            m_pCheckBoxPermanent->setHidden(!m_fUsePermanent);
+            pLayoutMain->addWidget(m_pCheckBoxPermanent, 5, 1);
         }
 
@@ -287 +287 @@
     connect(m_pEditorName, &QLineEdit::textChanged, this, &UIMachineSettingsSFDetails::sltValidate);
     if (m_fUsePermanent)
-        connect(m_pPermanentCheckBox, &QCheckBox::toggled, this, &UIMachineSettingsSFDetails::sltValidate);
+        connect(m_pCheckBoxPermanent, &QCheckBox::toggled, this, &UIMachineSettingsSFDetails::sltValidate);
     connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIMachineSettingsSFDetails::accept);
     connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIMachineSettingsSFDetails::reject);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.h

@@ -107 +107 @@
         QLineEdit          *m_pEditorAutoMountPoint;
         /** Holds the read-only check-box instance. */
-        QCheckBox          *m_pReadonlyCheckBox;
+        QCheckBox          *m_pCheckBoxReadonly;
         /** Holds the auto-mount check-box instance. */
-        QCheckBox          *m_pAutoMountCheckBox;
+        QCheckBox          *m_pCheckBoxAutoMount;
         /** Holds the permanent check-box instance. */
-        QCheckBox          *m_pPermanentCheckBox;
+        QCheckBox          *m_pCheckBoxPermanent;
         /** Holds the button-box instance. */
         QIDialogButtonBox  *m_pButtonBox;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp

@@ -414 +414 @@
                 if (m_pComboNumber)
                 {
-                    m_pLabelNumber->setBuddy(m_pComboNumber);
+                    if (m_pLabelNumber)
+                        m_pLabelNumber->setBuddy(m_pComboNumber);
                     m_pComboNumber->insertItem(0, uiCommon().toCOMPortName(0, 0));
                     m_pComboNumber->insertItems(0, uiCommon().COMPortNames());
@@ -427 +428 @@
                 if (m_pLineEditIRQ)
                 {
-                    m_pLabelIRQ->setBuddy(m_pLineEditIRQ);
+                    if (m_pLabelIRQ)
+                        m_pLabelIRQ->setBuddy(m_pLineEditIRQ);
                     m_pLineEditIRQ->setFixedWidth(m_pLineEditIRQ->fontMetrics().width("8888"));
                     m_pLineEditIRQ->setValidator(new QIULongValidator(0, 255, this));
@@ -440 +442 @@
                 if (m_pLineEditIOPort)
                 {
-                    m_pLabelIOPort->setBuddy(m_pLineEditIOPort);
+                    if (m_pLabelIOPort)
+                        m_pLabelIOPort->setBuddy(m_pLineEditIOPort);
                     m_pLineEditIOPort->setFixedWidth(m_pLineEditIOPort->fontMetrics().width("8888888"));
                     m_pLineEditIOPort->setValidator(new QIULongValidator(0, 0xFFFF, this));
@@ -457 +460 @@
                 if (m_pComboMode)
                 {
-                    m_pLabelMode->setBuddy(m_pComboMode);
+                    if (m_pLabelMode)
+                        m_pLabelMode->setBuddy(m_pComboMode);
                     pLayoutPortSettings->addWidget(m_pComboMode, 1, 1);
                 }
@@ -477 +481 @@
                 if (m_pEditorPath)
                 {
-                    m_pLabelPath->setBuddy(m_pEditorPath);
+                    if (m_pLabelPath)
+                        m_pLabelPath->setBuddy(m_pEditorPath);
                     m_pEditorPath->setValidator(new QRegExpValidator(QRegExp(".+"), this));
                     pLayoutPortSettings->addWidget(m_pEditorPath, 3, 1, 1, 6);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -2945 +2945 @@
 UIMachineSettingsStorage::UIMachineSettingsStorage()
     : m_pModelStorage(0)
-    , m_pActionAddController(0), m_pActionRemoveController(0)
-    , m_pActionAddAttachment(0), m_pActionRemoveAttachment(0)
-    , m_pActionAddAttachmentHD(0), m_pActionAddAttachmentCD(0), m_pActionAddAttachmentFD(0)
     , m_pMediumIdHolder(new UIMediumIDHolder(this))
     , m_fLoadingInProgress(0)
@@ -2954 +2951 @@
     , m_pWidgetLeftPane(0)
     , m_pLabelSeparatorLeftPane(0)
-    , m_pLayoutTreeView(0)
-    , m_pTreeStorage(0)
-    , m_pLayoutToolBar(0)
-    , m_pToolBar(0)
+    , m_pLayoutTree(0)
+    , m_pTreeViewStorage(0)
+    , m_pLayoutToolbar(0)
+    , m_pToolbar(0)
+    , m_pActionAddController(0)
+    , m_pActionRemoveController(0)
+    , m_pActionAddAttachment(0)
+    , m_pActionRemoveAttachment(0)
+    , m_pActionAddAttachmentHD(0)
+    , m_pActionAddAttachmentCD(0)
+    , m_pActionAddAttachmentFD(0)
     , m_pStackRightPane(0)
     , m_pLabelSeparatorEmpty(0)
@@ -2967 +2971 @@
     , m_pComboType(0)
     , m_pLabelPortCount(0)
-    , m_pSpinBoxPortCount(0)
+    , m_pSpinboxPortCount(0)
     , m_pCheckBoxIoCache(0)
     , m_pLabelSeparatorAttributes(0)
@@ -3166 +3170 @@
     /* Choose first controller as current: */
     if (m_pModelStorage->rowCount(m_pModelStorage->root()) > 0)
-        m_pTreeStorage->setCurrentIndex(m_pModelStorage->index(0, 0, m_pModelStorage->root()));
+        m_pTreeViewStorage->setCurrentIndex(m_pModelStorage->index(0, 0, m_pModelStorage->root()));
 
     /* Fetch recent information: */
@@ -3356 +3360 @@
     m_pComboType->setWhatsThis(tr("Selects the sub-type of the storage controller currently selected in the Storage Tree."));
     m_pLabelPortCount->setText(tr("&Port Count:"));
-    m_pSpinBoxPortCount->setWhatsThis(tr("Selects the port count of the SATA storage controller currently selected in the"
+    m_pSpinboxPortCount->setWhatsThis(tr("Selects the port count of the SATA storage controller currently selected in the"
                                          "Storage Tree. This must be at least one more than the highest port number you need to use."));
     m_pCheckBoxIoCache->setWhatsThis(tr("When checked, allows to use host I/O caching capabilities."));
@@ -3386 +3390 @@
 
     /* Translate storage-view: */
-    m_pTreeStorage->setWhatsThis(tr("Lists all storage controllers for this machine and "
+    m_pTreeViewStorage->setWhatsThis(tr("Lists all storage controllers for this machine and "
                                     "the virtual images and host drives attached to them."));
 
@@ -3428 +3432 @@
 {
     /* Declare required variables: */
-    const QModelIndex index = m_pTreeStorage->currentIndex();
+    const QModelIndex index = m_pTreeViewStorage->currentIndex();
     const KDeviceType enmDeviceType = m_pModelStorage->data(index, StorageModel::R_AttDevice).value<KDeviceType>();
 
     /* Polish left pane availability: */
     m_pLabelSeparatorLeftPane->setEnabled(isMachineInValidMode());
-    m_pTreeStorage->setEnabled(isMachineInValidMode());
+    m_pTreeViewStorage->setEnabled(isMachineInValidMode());
 
     /* Polish empty information pane availability: */
@@ -3446 +3450 @@
     m_pComboType->setEnabled(isMachineOffline());
     m_pLabelPortCount->setEnabled(isMachineOffline());
-    m_pSpinBoxPortCount->setEnabled(isMachineOffline());
+    m_pSpinboxPortCount->setEnabled(isMachineOffline());
     m_pCheckBoxIoCache->setEnabled(isMachineOffline());
 
@@ -3604 +3608 @@
 void UIMachineSettingsStorage::sltRemoveController()
 {
-    const QModelIndex index = m_pTreeStorage->currentIndex();
+    const QModelIndex index = m_pTreeViewStorage->currentIndex();
     if (!m_pModelStorage->data(index, StorageModel::R_IsController).toBool())
         return;
@@ -3617 +3621 @@
 void UIMachineSettingsStorage::sltAddAttachment()
 {
-    const QModelIndex index = m_pTreeStorage->currentIndex();
+    const QModelIndex index = m_pTreeViewStorage->currentIndex();
     Assert(m_pModelStorage->data(index, StorageModel::R_IsController).toBool());
 
@@ -3671 +3675 @@
 void UIMachineSettingsStorage::sltRemoveAttachment()
 {
-    const QModelIndex index = m_pTreeStorage->currentIndex();
+    const QModelIndex index = m_pTreeViewStorage->currentIndex();
 
     const KDeviceType enmDeviceType = m_pModelStorage->data(index, StorageModel::R_AttDevice).value<KDeviceType>();
@@ -3700 +3704 @@
     m_fLoadingInProgress = true;
 
-    const QModelIndex index = m_pTreeStorage->currentIndex();
+    const QModelIndex index = m_pTreeViewStorage->currentIndex();
     if (!index.isValid() || index == m_pModelStorage->root())
     {
@@ -3738 +3742 @@
                 const KStorageBus enmBus = m_pModelStorage->data(index, StorageModel::R_CtrBusType).value<KStorageBus>();
                 m_pLabelPortCount->setVisible(enmBus == KStorageBus_SATA || enmBus == KStorageBus_SAS);
-                m_pSpinBoxPortCount->setVisible(enmBus == KStorageBus_SATA || enmBus == KStorageBus_SAS);
+                m_pSpinboxPortCount->setVisible(enmBus == KStorageBus_SATA || enmBus == KStorageBus_SAS);
                 const uint uPortCount = m_pModelStorage->data(index, StorageModel::R_CtrPortCount).toUInt();
                 const uint uMaxPortCount = m_pModelStorage->data(index, StorageModel::R_CtrMaxPortCount).toUInt();
-                m_pSpinBoxPortCount->setMaximum(uMaxPortCount);
-                m_pSpinBoxPortCount->setValue(uPortCount);
+                m_pSpinboxPortCount->setMaximum(uMaxPortCount);
+                m_pSpinboxPortCount->setValue(uPortCount);
 
                 const bool fUseIoCache = m_pModelStorage->data(index, StorageModel::R_CtrIoCache).toBool();
@@ -3853 +3857 @@
 void UIMachineSettingsStorage::sltSetInformation()
 {
-    const QModelIndex index = m_pTreeStorage->currentIndex();
+    const QModelIndex index = m_pTreeViewStorage->currentIndex();
     if (m_fLoadingInProgress || !index.isValid() || index == m_pModelStorage->root())
         return;
@@ -3877 +3881 @@
                                              StorageModel::R_CtrType);
             }
-            else if (pSender == m_pSpinBoxPortCount)
-                m_pModelStorage->setData(index, m_pSpinBoxPortCount->value(), StorageModel::R_CtrPortCount);
+            else if (pSender == m_pSpinboxPortCount)
+                m_pModelStorage->setData(index, m_pSpinboxPortCount->value(), StorageModel::R_CtrPortCount);
             else if (pSender == m_pCheckBoxIoCache)
                 m_pModelStorage->setData(index, m_pCheckBoxIoCache->isChecked(), StorageModel::R_CtrIoCache);
@@ -3893 +3897 @@
                 QModelIndex theSameIndexAtNewPosition = m_pModelStorage->attachmentBySlot(controllerIndex, attachmentStorageSlot);
                 AssertMsg(theSameIndexAtNewPosition.isValid(), ("Current attachment disappears!\n"));
-                m_pTreeStorage->setCurrentIndex(theSameIndexAtNewPosition);
+                m_pTreeViewStorage->setCurrentIndex(theSameIndexAtNewPosition);
             }
             /* Setting Attachment Medium: */
@@ -4054 +4058 @@
 void UIMachineSettingsStorage::sltUpdateActionStates()
 {
-    const QModelIndex index = m_pTreeStorage->currentIndex();
+    const QModelIndex index = m_pTreeViewStorage->currentIndex();
 
     const bool fIDEPossible = m_pModelStorage->data(index, StorageModel::R_IsMoreIDEControllersPossible).toBool();
@@ -4109 +4113 @@
         {
             /* Select the newly created Controller Item: */
-            m_pTreeStorage->setCurrentIndex(index);
+            m_pTreeViewStorage->setCurrentIndex(index);
             break;
         }
@@ -4115 +4119 @@
         {
             /* Expand parent if it is not expanded yet: */
-            if (!m_pTreeStorage->isExpanded(parentIndex))
-                m_pTreeStorage->setExpanded(parentIndex, true);
+            if (!m_pTreeViewStorage->isExpanded(parentIndex))
+                m_pTreeViewStorage->setExpanded(parentIndex, true);
             break;
         }
@@ -4130 +4134 @@
 {
     if (m_pModelStorage->rowCount (m_pModelStorage->root()) == 0)
-        m_pTreeStorage->setCurrentIndex (m_pModelStorage->root());
+        m_pTreeViewStorage->setCurrentIndex (m_pModelStorage->root());
 
     sltUpdateActionStates();
@@ -4147 +4151 @@
     m_mousePressPosition = QPoint();
 
-    const QModelIndex index = m_pTreeStorage->indexAt(position);
+    const QModelIndex index = m_pTreeViewStorage->indexAt(position);
     if (!index.isValid())
         return sltAddController();
@@ -4186 +4190 @@
     }
     if (!menu.isEmpty())
-        menu.exec(m_pTreeStorage->viewport()->mapToGlobal(position));
+        menu.exec(m_pTreeViewStorage->viewport()->mapToGlobal(position));
 }
 
@@ -4196 +4200 @@
     pPainter->save();
     QStyleOption options;
-    options.initFrom(m_pTreeStorage);
+    options.initFrom(m_pTreeViewStorage);
     options.rect = rect;
     options.state |= QStyle::State_Item;
@@ -4216 +4220 @@
     AssertPtrReturnVoid(pEvent);
 
-    const QModelIndex index = m_pTreeStorage->indexAt(pEvent->pos());
-    const QRect indexRect = m_pTreeStorage->visualRect(index);
+    const QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->pos());
+    const QRect indexRect = m_pTreeViewStorage->visualRect(index);
 
     /* Expander tool-tip: */
@@ -4235 +4239 @@
     /* Adder tool-tip: */
     if (m_pModelStorage->data(index, StorageModel::R_IsController).toBool() &&
-        m_pTreeStorage->currentIndex() == index)
+        m_pTreeViewStorage->currentIndex() == index)
     {
         const DeviceTypeList devicesList(m_pModelStorage->data(index, StorageModel::R_CtrDevices).value<DeviceTypeList>());
@@ -4308 +4312 @@
 
         /* Check what item we are hovering currently: */
-        QModelIndex index = m_pTreeStorage->indexAt(pEvent->pos());
+        QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->pos());
         AbstractItem *pItem = static_cast<AbstractItem*>(index.internalPointer());
         /* And make sure this is attachment item, we are supporting dragging for this kind only: */
@@ -4344 +4348 @@
     m_mousePressPosition = pEvent->globalPos();
 
-    const QModelIndex index = m_pTreeStorage->indexAt(pEvent->pos());
-    const QRect indexRect = m_pTreeStorage->visualRect(index);
+    const QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->pos());
+    const QRect indexRect = m_pTreeViewStorage->visualRect(index);
 
     /* Expander icon: */
@@ -4355 +4359 @@
         {
             pEvent->setAccepted(true);
-            m_pTreeStorage->setExpanded(index, !m_pTreeStorage->isExpanded(index));
+            m_pTreeViewStorage->setExpanded(index, !m_pTreeViewStorage->isExpanded(index));
             return;
         }
@@ -4362 +4366 @@
     /* Adder icons: */
     if (m_pModelStorage->data(index, StorageModel::R_IsController).toBool() &&
-        m_pTreeStorage->currentIndex() == index)
+        m_pTreeViewStorage->currentIndex() == index)
     {
         const DeviceTypeList devicesList(m_pModelStorage->data(index, StorageModel::R_CtrDevices).value<DeviceTypeList>());
@@ -4436 +4440 @@
 
     /* Check what item we are hovering currently: */
-    QModelIndex index = m_pTreeStorage->indexAt(pEvent->pos());
+    QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->pos());
     AbstractItem *pItem = static_cast<AbstractItem*>(index.internalPointer());
     /* And make sure this is controller item, we are supporting dropping for this kind only: */
@@ -4464 +4468 @@
 
     /* Check what item we are hovering currently: */
-    QModelIndex index = m_pTreeStorage->indexAt(pEvent->pos());
+    QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->pos());
     AbstractItem *pItem = static_cast<AbstractItem*>(index.internalPointer());
     /* And make sure this is controller item, we are supporting dropping for this kind only: */
@@ -4542 +4546 @@
 
             /* Prepare storage layout: */
-            m_pLayoutTreeView = new QVBoxLayout;
-            if (m_pLayoutTreeView)
+            m_pLayoutTree = new QVBoxLayout;
+            if (m_pLayoutTree)
             {
 #ifdef VBOX_WS_MAC
-                m_pLayoutTreeView->setContentsMargins(3, 0, 3, 0);
-                m_pLayoutTreeView->setSpacing(3);
+                m_pLayoutTree->setContentsMargins(3, 0, 3, 0);
+                m_pLayoutTree->setSpacing(3);
 #else
-                m_pLayoutTreeView->setContentsMargins(0, 0, 0, 0);
-                m_pLayoutTreeView->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 3);
+                m_pLayoutTree->setContentsMargins(0, 0, 0, 0);
+                m_pLayoutTree->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 3);
 #endif
 
@@ -4557 +4561 @@
 
                 /* Prepare toolbar layout: */
-                m_pLayoutToolBar = new QHBoxLayout;
-                if (m_pLayoutToolBar)
+                m_pLayoutToolbar = new QHBoxLayout;
+                if (m_pLayoutToolbar)
                 {
-                    m_pLayoutToolBar->addStretch();
+                    m_pLayoutToolbar->addStretch();
 
                     /* Prepare toolbar: */
                     prepareToolBar();
 
-                    m_pLayoutTreeView->addLayout(m_pLayoutToolBar);
+                    m_pLayoutTree->addLayout(m_pLayoutToolbar);
                 }
 
-                pLayoutLeftPane->addLayout(m_pLayoutTreeView);
+                pLayoutLeftPane->addLayout(m_pLayoutTree);
             }
         }
@@ -4579 +4583 @@
 {
     /* Prepare tree-view: */
-    m_pTreeStorage = new QITreeView;
-    if (m_pTreeStorage)
+    m_pTreeViewStorage = new QITreeView(m_pWidgetLeftPane);
+    if (m_pTreeViewStorage)
     {
         if (m_pLabelSeparatorLeftPane)
-            m_pLabelSeparatorLeftPane->setBuddy(m_pTreeStorage);
-        m_pTreeStorage->setMouseTracking(true);
-        m_pTreeStorage->setAcceptDrops(true);
-        m_pTreeStorage->setContextMenuPolicy(Qt::CustomContextMenu);
+            m_pLabelSeparatorLeftPane->setBuddy(m_pTreeViewStorage);
+        m_pTreeViewStorage->setMouseTracking(true);
+        m_pTreeViewStorage->setAcceptDrops(true);
+        m_pTreeViewStorage->setContextMenuPolicy(Qt::CustomContextMenu);
 
         /* Prepare storage model: */
-        m_pModelStorage = new StorageModel(m_pTreeStorage);
+        m_pModelStorage = new StorageModel(m_pTreeViewStorage);
         if (m_pModelStorage)
         {
-            m_pTreeStorage->setModel(m_pModelStorage);
-            m_pTreeStorage->setRootIndex(m_pModelStorage->root());
-            m_pTreeStorage->setCurrentIndex(m_pModelStorage->root());
+            m_pTreeViewStorage->setModel(m_pModelStorage);
+            m_pTreeViewStorage->setRootIndex(m_pModelStorage->root());
+            m_pTreeViewStorage->setCurrentIndex(m_pModelStorage->root());
         }
 
         /* Prepare storage delegate: */
-        StorageDelegate *pStorageDelegate = new StorageDelegate(m_pTreeStorage);
+        StorageDelegate *pStorageDelegate = new StorageDelegate(m_pTreeViewStorage);
         if (pStorageDelegate)
-            m_pTreeStorage->setItemDelegate(pStorageDelegate);
-
-        m_pLayoutTreeView->addWidget(m_pTreeStorage);
+            m_pTreeViewStorage->setItemDelegate(pStorageDelegate);
+
+        m_pLayoutTree->addWidget(m_pTreeViewStorage);
     }
 }
@@ -4609 +4613 @@
 {
     /* Prepare toolbar: */
-    m_pToolBar = new UIToolBar(m_pWidgetLeftPane);
-    if (m_pToolBar)
+    m_pToolbar = new UIToolBar(m_pWidgetLeftPane);
+    if (m_pToolbar)
     {
         /* Configure toolbar: */
         const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-        m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
+        m_pToolbar->setIconSize(QSize(iIconMetric, iIconMetric));
 
         /* Prepare 'Add Controller' action: */
@@ -4621 +4625 @@
         {
             m_pActionAddController->setIcon(iconPool()->icon(ControllerAddEn, ControllerAddDis));
-            m_pToolBar->addAction(m_pActionAddController);
+            m_pToolbar->addAction(m_pActionAddController);
         }
 
@@ -4674 +4678 @@
         {
             m_pActionRemoveController->setIcon(iconPool()->icon(ControllerDelEn, ControllerDelDis));
-            m_pToolBar->addAction(m_pActionRemoveController);
+            m_pToolbar->addAction(m_pActionRemoveController);
         }
 
@@ -4682 +4686 @@
         {
             m_pActionAddAttachment->setIcon(iconPool()->icon(AttachmentAddEn, AttachmentAddDis));
-            m_pToolBar->addAction(m_pActionAddAttachment);
+            m_pToolbar->addAction(m_pActionAddAttachment);
         }
 
@@ -4703 +4707 @@
         {
             m_pActionRemoveAttachment->setIcon(iconPool()->icon(AttachmentDelEn, AttachmentDelDis));
-            m_pToolBar->addAction(m_pActionRemoveAttachment);
-        }
-
-        m_pLayoutToolBar->addWidget(m_pToolBar);
+            m_pToolbar->addAction(m_pActionRemoveAttachment);
+        }
+
+        m_pLayoutToolbar->addWidget(m_pToolbar);
     }
 }
@@ -4748 +4752 @@
             {
                 m_pLabelInfo->setWordWrap(true);
-                pLayoutEmpty->addWidget(m_pLabelInfo, 1, 1, 1, 1);
+                pLayoutEmpty->addWidget(m_pLabelInfo, 1, 1);
             }
 
@@ -4781 +4785 @@
             {
                 m_pLabelName->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                m_pLayoutController->addWidget(m_pLabelName, 1, 1, 1, 1);
+                m_pLayoutController->addWidget(m_pLabelName, 1, 1);
             }
             /* Prepare name editor: */
@@ -4787 +4791 @@
             if (m_pEditorName)
             {
-                m_pLabelName->setBuddy(m_pEditorName);
-                m_pLayoutController->addWidget(m_pEditorName, 1, 2, 1, 1);
+                if (m_pLabelName)
+                    m_pLabelName->setBuddy(m_pEditorName);
+                m_pLayoutController->addWidget(m_pEditorName, 1, 2);
             }
 
@@ -4796 +4801 @@
             {
                 m_pLabelType->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                m_pLayoutController->addWidget(m_pLabelType, 2, 1, 1, 1);
+                m_pLayoutController->addWidget(m_pLabelType, 2, 1);
             }
             /* Prepare type combo: */
@@ -4802 +4807 @@
             if (m_pComboType)
             {
-                m_pLabelType->setBuddy(m_pComboType);
+                if (m_pLabelType)
+                    m_pLabelType->setBuddy(m_pComboType);
                 m_pComboType->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-                m_pLayoutController->addWidget(m_pComboType, 2, 2, 1, 1);
+                m_pLayoutController->addWidget(m_pComboType, 2, 2);
             }
 
@@ -4812 +4818 @@
             {
                 m_pLabelPortCount->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-                m_pLayoutController->addWidget(m_pLabelPortCount, 3, 1, 1, 1);
+                m_pLayoutController->addWidget(m_pLabelPortCount, 3, 1);
             }
             /* Prepare port count spinbox: */
-            m_pSpinBoxPortCount = new QSpinBox(pWidgetController);
-            if (m_pSpinBoxPortCount)
-            {
-                m_pLabelPortCount->setBuddy(m_pSpinBoxPortCount);
-                m_pLayoutController->addWidget(m_pSpinBoxPortCount, 3, 2, 1, 1);
+            m_pSpinboxPortCount = new QSpinBox(pWidgetController);
+            if (m_pSpinboxPortCount)
+            {
+                if (m_pLabelPortCount)
+                    m_pLabelPortCount->setBuddy(m_pSpinboxPortCount);
+                m_pLayoutController->addWidget(m_pSpinboxPortCount, 3, 2);
             }
 
@@ -4825 +4832 @@
             m_pCheckBoxIoCache = new QCheckBox(pWidgetController);
             if (m_pCheckBoxIoCache)
-                m_pLayoutController->addWidget(m_pCheckBoxIoCache, 4, 2, 1, 1);
+                m_pLayoutController->addWidget(m_pCheckBoxIoCache, 4, 2);
 
             m_pLayoutController->setColumnMinimumWidth(0, 10);
@@ -4918 +4925 @@
                     pLayoutAttachmentSettings->addWidget(m_pCheckBoxHotPluggable);
 
-                m_pLayoutAttachment->addLayout(pLayoutAttachmentSettings, 2, 2, 1, 1);
+                m_pLayoutAttachment->addLayout(pLayoutAttachmentSettings, 2, 2);
             }
 
@@ -5077 +5084 @@
 
     /* Configure tree-view: */
-    connect(m_pTreeStorage, &QITreeView::currentItemChanged,
+    connect(m_pTreeViewStorage, &QITreeView::currentItemChanged,
              this, &UIMachineSettingsStorage::sltHandleCurrentItemChange);
-    connect(m_pTreeStorage, &QITreeView::customContextMenuRequested,
+    connect(m_pTreeViewStorage, &QITreeView::customContextMenuRequested,
             this, &UIMachineSettingsStorage::sltHandleContextMenuRequest);
-    connect(m_pTreeStorage, &QITreeView::drawItemBranches,
+    connect(m_pTreeViewStorage, &QITreeView::drawItemBranches,
             this, &UIMachineSettingsStorage::sltHandleDrawItemBranches);
-    connect(m_pTreeStorage, &QITreeView::mouseMoved,
+    connect(m_pTreeViewStorage, &QITreeView::mouseMoved,
             this, &UIMachineSettingsStorage::sltHandleMouseMove);
-    connect(m_pTreeStorage, &QITreeView::mousePressed,
+    connect(m_pTreeViewStorage, &QITreeView::mousePressed,
             this, &UIMachineSettingsStorage::sltHandleMouseClick);
-    connect(m_pTreeStorage, &QITreeView::mouseReleased,
+    connect(m_pTreeViewStorage, &QITreeView::mouseReleased,
             this, &UIMachineSettingsStorage::sltHandleMouseRelease);
-    connect(m_pTreeStorage, &QITreeView::mouseDoubleClicked,
+    connect(m_pTreeViewStorage, &QITreeView::mouseDoubleClicked,
             this, &UIMachineSettingsStorage::sltHandleMouseClick);
-    connect(m_pTreeStorage, &QITreeView::dragEntered,
+    connect(m_pTreeViewStorage, &QITreeView::dragEntered,
             this, &UIMachineSettingsStorage::sltHandleDragEnter);
-    connect(m_pTreeStorage, &QITreeView::dragMoved,
+    connect(m_pTreeViewStorage, &QITreeView::dragMoved,
             this, &UIMachineSettingsStorage::sltHandleDragMove);
-    connect(m_pTreeStorage, &QITreeView::dragDropped,
+    connect(m_pTreeViewStorage, &QITreeView::dragDropped,
             this, &UIMachineSettingsStorage::sltHandleDragDrop);
 
@@ -5132 +5139 @@
     connect(m_pMediumIdHolder, &UIMediumIDHolder::sigChanged,
             this, &UIMachineSettingsStorage::sltSetInformation);
-    connect(m_pSpinBoxPortCount, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
+    connect(m_pSpinboxPortCount, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
             this, &UIMachineSettingsStorage::sltSetInformation);
     connect(m_pEditorName, &QLineEdit::textEdited,
@@ -5165 +5172 @@
 {
 #ifdef RT_STRICT
-    const QModelIndex index = m_pTreeStorage->currentIndex();
+    const QModelIndex index = m_pTreeViewStorage->currentIndex();
     switch (enmBus)
     {
@@ -5203 +5210 @@
 void UIMachineSettingsStorage::addAttachmentWrapper(KDeviceType enmDeviceType)
 {
-    const QModelIndex index = m_pTreeStorage->currentIndex();
+    const QModelIndex index = m_pTreeViewStorage->currentIndex();
     Assert(m_pModelStorage->data(index, StorageModel::R_IsController).toBool());
     Assert(m_pModelStorage->data(index, StorageModel::R_IsMoreAttachmentsPossible).toBool());

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -285 +285 @@
     StorageModel *m_pModelStorage;
 
-    /** Holds the 'Add Controller' action instance. */
-    QAction *m_pActionAddController;
-    /** Holds the 'Remove Controller' action instance. */
-    QAction *m_pActionRemoveController;
-    /** Holds the map of add controller action instances. */
-    QMap<KStorageControllerType, QAction*> m_addControllerActions;
-
-    /** Holds the 'Add Attachment' action instance. */
-    QAction *m_pActionAddAttachment;
-    /** Holds the 'Remove Attachment' action instance. */
-    QAction *m_pActionRemoveAttachment;
-    /** Holds the 'Add HD Attachment' action instance. */
-    QAction *m_pActionAddAttachmentHD;
-    /** Holds the 'Add CD Attachment' action instance. */
-    QAction *m_pActionAddAttachmentCD;
-    /** Holds the 'Add FD Attachment' action instance. */
-    QAction *m_pActionAddAttachmentFD;
-
     /** Holds the medium ID wrapper instance. */
     UIMediumIDHolder *m_pMediumIdHolder;
@@ -318 +300 @@
      * @{ */
         /** Holds the splitter instance. */
-        QISplitter       *m_pSplitter;
+        QISplitter *m_pSplitter;
+
         /** Holds the left pane instance. */
-        QWidget          *m_pWidgetLeftPane;
+        QWidget                                *m_pWidgetLeftPane;
         /** Holds the left pane separator instance. */
-        QILabelSeparator *m_pLabelSeparatorLeftPane;
+        QILabelSeparator                       *m_pLabelSeparatorLeftPane;
         /** Holds the tree-view layout instance. */
-        QVBoxLayout      *m_pLayoutTreeView;
+        QVBoxLayout                            *m_pLayoutTree;
         /** Holds the tree-view instance. */
-        QITreeView       *m_pTreeStorage;
+        QITreeView                             *m_pTreeViewStorage;
         /** Holds the toolbar layout instance. */
-        QHBoxLayout      *m_pLayoutToolBar;
+        QHBoxLayout                            *m_pLayoutToolbar;
         /** Holds the toolbar instance. */
-        UIToolBar        *m_pToolBar;
+        UIToolBar                              *m_pToolbar;
+        /** Holds the 'Add Controller' action instance. */
+        QAction                                *m_pActionAddController;
+        /** Holds the 'Remove Controller' action instance. */
+        QAction                                *m_pActionRemoveController;
+        /** Holds the map of add controller action instances. */
+        QMap<KStorageControllerType, QAction*>  m_addControllerActions;
+        /** Holds the 'Add Attachment' action instance. */
+        QAction                                *m_pActionAddAttachment;
+        /** Holds the 'Remove Attachment' action instance. */
+        QAction                                *m_pActionRemoveAttachment;
+        /** Holds the 'Add HD Attachment' action instance. */
+        QAction                                *m_pActionAddAttachmentHD;
+        /** Holds the 'Add CD Attachment' action instance. */
+        QAction                                *m_pActionAddAttachmentCD;
+        /** Holds the 'Add FD Attachment' action instance. */
+        QAction                                *m_pActionAddAttachmentFD;
 
         /** Holds the right pane instance. */
@@ -351 +350 @@
         QLabel           *m_pLabelPortCount;
         /** Holds the port count spinbox instance. */
-        QSpinBox         *m_pSpinBoxPortCount;
+        QSpinBox         *m_pSpinboxPortCount;
         /** Holds the IO cache check-box instance. */
         QCheckBox        *m_pCheckBoxIoCache;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -839 +839 @@
 void UIMachineSettingsSystem::prepareTabMotherboard()
 {
-    /* Prepare Motherboard tab: */
+    /* Prepare 'Motherboard' tab: */
     m_pTabMotherboard = new QWidget;
     if (m_pTabMotherboard)
     {
-        /* Prepare Motherboard tab layout: */
+        /* Prepare 'Motherboard' tab layout: */
         QGridLayout *pLayoutMotherboard = new QGridLayout(m_pTabMotherboard);
         if (pLayoutMotherboard)
@@ -861 +861 @@
             if (m_pEditorBaseMemory)
             {
-                m_pLabelBaseMemory->setBuddy(m_pEditorBaseMemory->focusProxy());
+                if (m_pLabelBaseMemory)
+                    m_pLabelBaseMemory->setBuddy(m_pEditorBaseMemory->focusProxy());
                 m_pEditorBaseMemory->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed));
 
@@ -878 +879 @@
             if (m_pEditorBootOrder)
             {
-                m_pLabelBootOrder->setBuddy(m_pEditorBootOrder->focusProxy());
+                if (m_pLabelBootOrder)
+                    m_pLabelBootOrder->setBuddy(m_pEditorBootOrder->focusProxy());
                 m_pEditorBootOrder->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 
@@ -895 +897 @@
             if (m_pComboChipset)
             {
-                m_pLabelChipset->setBuddy(m_pComboChipset);
+                if (m_pLabelChipset)
+                    m_pLabelChipset->setBuddy(m_pComboChipset);
                 m_pComboChipset->setSizeAdjustPolicy(QComboBox::AdjustToContents);
                 m_pComboChipset->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
@@ -913 +916 @@
             if (m_pComboPointingHID)
             {
-                m_pLabelPointingHID->setBuddy(m_pComboPointingHID);
+                if (m_pLabelPointingHID)
+                    m_pLabelPointingHID->setBuddy(m_pComboPointingHID);
                 m_pComboPointingHID->setSizeAdjustPolicy(QComboBox::AdjustToContents);
                 m_pComboPointingHID->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
@@ -965 +969 @@
     m_uMaxGuestCPUExecCap = 100;
 
-    /* Prepare Processor tab: */
+    /* Prepare 'Processor' tab: */
     m_pTabProcessor = new QWidget;
     if (m_pTabProcessor)
     {
-        /* Prepare Processor tab layout: */
+        /* Prepare 'Processor' tab layout: */
         QGridLayout *pLayoutProcessor = new QGridLayout(m_pTabProcessor);
         if (pLayoutProcessor)
         {
+            pLayoutProcessor->setColumnStretch(1, 1);
             pLayoutProcessor->setRowStretch(6, 1);
 
@@ -1020 +1025 @@
                 }
 
-                pLayoutProcessor->addLayout(pLayoutProcessorCount, 0, 1, 2, 1);
+                pLayoutProcessor->addLayout(pLayoutProcessorCount, 0, 1, 2, 2);
             }
             /* Prepare processor count spinbox: */
@@ -1026 +1031 @@
             if (m_pSpinboxProcessorCount)
             {
-                m_pLabelProcessorCount->setBuddy(m_pSpinboxProcessorCount);
+                if (m_pLabelProcessorCount)
+                    m_pLabelProcessorCount->setBuddy(m_pSpinboxProcessorCount);
                 m_pSpinboxProcessorCount->setMinimum(m_uMinGuestCPU);
                 m_pSpinboxProcessorCount->setMaximum(m_uMaxGuestCPU);
                 uiCommon().setMinimumWidthAccordingSymbolCount(m_pSpinboxProcessorCount, 4);
 
-                pLayoutProcessor->addWidget(m_pSpinboxProcessorCount, 0, 2);
+                pLayoutProcessor->addWidget(m_pSpinboxProcessorCount, 0, 3);
             }
 
@@ -1079 +1085 @@
                 }
 
-                pLayoutProcessor->addLayout(pLayoutProcessorExecCap, 2, 1, 2, 1);
+                pLayoutProcessor->addLayout(pLayoutProcessorExecCap, 2, 1, 2, 2);
             }
             /* Prepare processor exec cap spinbox: */
@@ -1085 +1091 @@
             if (m_pSpinboxProcessorExecCap)
             {
-                m_pLabelProcessorExecCap->setBuddy(m_pSpinboxProcessorExecCap);
+                if (m_pLabelProcessorExecCap)
+                    m_pLabelProcessorExecCap->setBuddy(m_pSpinboxProcessorExecCap);
                 m_pSpinboxProcessorExecCap->setMinimum(m_uMinGuestCPUExecCap);
                 m_pSpinboxProcessorExecCap->setMaximum(m_uMaxGuestCPUExecCap);
                 uiCommon().setMinimumWidthAccordingSymbolCount(m_pSpinboxProcessorExecCap, 4);
 
-                pLayoutProcessor->addWidget(m_pSpinboxProcessorExecCap, 2, 2);
+                pLayoutProcessor->addWidget(m_pSpinboxProcessorExecCap, 2, 3);
             }
 
@@ -1103 +1110 @@
             m_pCheckBoxPAE = new QCheckBox(m_pTabProcessor);
             if (m_pCheckBoxPAE)
-                pLayoutProcessor->addWidget(m_pCheckBoxPAE, 4, 1, 1, 2);
+                pLayoutProcessor->addWidget(m_pCheckBoxPAE, 4, 1);
             /* Prepare nested virtualization check-box: */
             m_pCheckBoxNestedVirtualization = new QCheckBox(m_pTabProcessor);
             if (m_pCheckBoxNestedVirtualization)
-                pLayoutProcessor->addWidget(m_pCheckBoxNestedVirtualization, 5, 1, 1, 2);
+                pLayoutProcessor->addWidget(m_pCheckBoxNestedVirtualization, 5, 1);
         }
 
@@ -1116 +1123 @@
 void UIMachineSettingsSystem::prepareTabAcceleration()
 {
-    /* Prepare Acceleration tab: */
+    /* Prepare 'Acceleration' tab: */
     m_pTabAcceleration = new QWidget;
     if (m_pTabAcceleration)
     {
-        /* Prepare Acceleration tab layout: */
+        /* Prepare 'Acceleration' tab layout: */
         QGridLayout *pLayoutAcceleration = new QGridLayout(m_pTabAcceleration);
         if (pLayoutAcceleration)
@@ -1138 +1145 @@
             if (m_pComboParavirtProvider)
             {
-                m_pLabelParavirtProvider->setBuddy(m_pComboParavirtProvider);
+                if (m_pLabelParavirtProvider)
+                    m_pLabelParavirtProvider->setBuddy(m_pComboParavirtProvider);
                 m_pComboParavirtProvider->setSizeAdjustPolicy(QComboBox::AdjustToContents);
                 m_pComboParavirtProvider->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 
-                pLayoutAcceleration->addWidget(m_pComboParavirtProvider, 0, 1);
+                pLayoutAcceleration->addWidget(m_pComboParavirtProvider, 0, 1, 1, 2);
             }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h

@@ -244 +244 @@
         QComboBox *m_pComboParavirtProvider;
         /** Holds the virtualization label instance. */
-        QLabel *m_pLabelVirtualization;
+        QLabel    *m_pLabelVirtualization;
         /** Holds the virtualization check-box instance. */
         QCheckBox *m_pCheckBoxVirtualization;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -341 +341 @@
     , m_pLayoutFilters(0)
     , m_pTreeWidgetFilters(0)
-    , m_pToolBarFilters(0)
+    , m_pToolbarFilters(0)
     , m_pActionNew(0)
     , m_pActionAdd(0)
@@ -961 +961 @@
 {
     /* Prepare USB filters toolbar: */
-    m_pToolBarFilters = new UIToolBar(m_pWidgetUSBSettings);
-    if (m_pToolBarFilters)
+    m_pToolbarFilters = new UIToolBar(m_pWidgetUSBSettings);
+    if (m_pToolbarFilters)
     {
         const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-        m_pToolBarFilters->setIconSize(QSize(iIconMetric, iIconMetric));
-        m_pToolBarFilters->setOrientation(Qt::Vertical);
+        m_pToolbarFilters->setIconSize(QSize(iIconMetric, iIconMetric));
+        m_pToolbarFilters->setOrientation(Qt::Vertical);
 
         /* Prepare 'New USB Filter' action: */
-        m_pActionNew = m_pToolBarFilters->addAction(UIIconPool::iconSet(":/usb_new_16px.png",
+        m_pActionNew = m_pToolbarFilters->addAction(UIIconPool::iconSet(":/usb_new_16px.png",
                                                                         ":/usb_new_disabled_16px.png"),
                                                     QString(), this, SLOT(sltNewFilter()));
@@ -976 +976 @@
 
         /* Prepare 'Add USB Filter' action: */
-        m_pActionAdd = m_pToolBarFilters->addAction(UIIconPool::iconSet(":/usb_add_16px.png",
+        m_pActionAdd = m_pToolbarFilters->addAction(UIIconPool::iconSet(":/usb_add_16px.png",
                                                                         ":/usb_add_disabled_16px.png"),
                                                     QString(), this, SLOT(sltAddFilter()));
@@ -983 +983 @@
 
         /* Prepare 'Edit USB Filter' action: */
-        m_pActionEdit = m_pToolBarFilters->addAction(UIIconPool::iconSet(":/usb_filter_edit_16px.png",
+        m_pActionEdit = m_pToolbarFilters->addAction(UIIconPool::iconSet(":/usb_filter_edit_16px.png",
                                                                          ":/usb_filter_edit_disabled_16px.png"),
                                                      QString(), this, SLOT(sltEditFilter()));
@@ -990 +990 @@
 
         /* Prepare 'Remove USB Filter' action: */
-        m_pActionRemove = m_pToolBarFilters->addAction(UIIconPool::iconSet(":/usb_remove_16px.png",
+        m_pActionRemove = m_pToolbarFilters->addAction(UIIconPool::iconSet(":/usb_remove_16px.png",
                                                                            ":/usb_remove_disabled_16px.png"),
                                                        QString(), this, SLOT(sltRemoveFilter()));
@@ -997 +997 @@
 
         /* Prepare 'Move USB Filter Up' action: */
-        m_pActionMoveUp = m_pToolBarFilters->addAction(UIIconPool::iconSet(":/usb_moveup_16px.png",
+        m_pActionMoveUp = m_pToolbarFilters->addAction(UIIconPool::iconSet(":/usb_moveup_16px.png",
                                                                            ":/usb_moveup_disabled_16px.png"),
                                                        QString(), this, SLOT(sltMoveFilterUp()));
@@ -1004 +1004 @@
 
         /* Prepare 'Move USB Filter Down' action: */
-        m_pActionMoveDown = m_pToolBarFilters->addAction(UIIconPool::iconSet(":/usb_movedown_16px.png",
+        m_pActionMoveDown = m_pToolbarFilters->addAction(UIIconPool::iconSet(":/usb_movedown_16px.png",
                                                                              ":/usb_movedown_disabled_16px.png"),
                                                          QString(), this, SLOT(sltMoveFilterDown()));
@@ -1013 +1013 @@
         m_pMenuUSBDevices = new VBoxUSBMenu(this);
 
-        m_pLayoutFilters->addWidget(m_pToolBarFilters);
+        m_pLayoutFilters->addWidget(m_pToolbarFilters);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h

@@ -174 +174 @@
         QITreeWidget     *m_pTreeWidgetFilters;
         /** Holds the USB filters toolbar instance. */
-        UIToolBar        *m_pToolBarFilters;
+        UIToolBar        *m_pToolbarFilters;
         /** Holds the New action instance. */
         QAction          *m_pActionNew;