Changeset 46411 in vbox for trunk/src

Timestamp:

Jun 6, 2013 1:38:34 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM settings: Display page: Overall cleanup (part 1): Variables/slots renaming.

Location:

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

Files:

• UIMachineSettingsDisplay.cpp (modified) (20 diffs)
• UIMachineSettingsDisplay.h (modified) (6 diffs)
• UIMachineSettingsDisplay.ui (modified) (27 diffs)

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

@@ -52 +52 @@
 
 UIMachineSettingsDisplay::UIMachineSettingsDisplay()
-    : mValidator(0)
-    , m_minVRAM(0)
-    , m_maxVRAM(0)
-    , m_maxVRAMVisible(0)
-    , m_initialVRAM(0)
+    : m_pValidator(0)
+    , m_iMinVRAM(0)
+    , m_iMaxVRAM(0)
+    , m_iMaxVRAMVisible(0)
+    , m_iInitialVRAM(0)
 #ifdef VBOX_WITH_VIDEOHWACCEL
     , m_f2DVideoAccelerationSupported(false)
@@ -69 +69 @@
     /* Setup constants */
     CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties();
-    m_minVRAM = sys.GetMinGuestVRAM();
-    m_maxVRAM = sys.GetMaxGuestVRAM();
-    m_maxVRAMVisible = m_maxVRAM;
-    const uint MinMonitors = 1;
+    m_iMinVRAM = sys.GetMinGuestVRAM();
+    m_iMaxVRAM = sys.GetMaxGuestVRAM();
+    m_iMaxVRAMVisible = m_iMaxVRAM;
+    const uint cMinGuestScreens = 1;
 #if (QT_VERSION >= 0x040600)
     const uint cHostScreens = QApplication::desktop()->screenCount();
@@ -78 +78 @@
     const uint cHostScreens = QApplication::desktop()->numScreens();
 #endif /* !(QT_VERSION >= 0x040600) */
-    const uint MaxMonitors = sys.GetMaxGuestMonitors();
+    const uint cMaxGuestScreens = sys.GetMaxGuestMonitors();
 
     /* Setup validators */
-    mLeMemory->setValidator (new QIntValidator (m_minVRAM, m_maxVRAMVisible, this));
-    mLeMonitors->setValidator (new QIntValidator (MinMonitors, MaxMonitors, this));
-    mLeVRDEPort->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));
-    mLeVRDETimeout->setValidator (new QIntValidator (this));
+    m_pEditorMemory->setValidator (new QIntValidator (m_iMinVRAM, m_iMaxVRAMVisible, this));
+    m_pEditorScreens->setValidator (new QIntValidator (cMinGuestScreens, cMaxGuestScreens, this));
+    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));
+    m_pEditorRemoteDisplayTimeout->setValidator (new QIntValidator (this));
 
     /* Setup connections */
-    connect (mSlMemory, SIGNAL (valueChanged (int)), this, SLOT (valueChangedVRAM (int)));
-    connect (mLeMemory, SIGNAL (textChanged (const QString&)), this, SLOT (textChangedVRAM (const QString&)));
-    connect (mSlMonitors, SIGNAL (valueChanged (int)), this, SLOT (valueChangedMonitors (int)));
-    connect (mLeMonitors, SIGNAL (textChanged (const QString&)), this, SLOT (textChangedMonitors (const QString&)));
+    connect (m_pSliderMemory, SIGNAL (valueChanged (int)), this, SLOT (sltValueChangedVRAM (int)));
+    connect (m_pEditorMemory, SIGNAL (textChanged (const QString&)), this, SLOT (sltTextChangedVRAM (const QString&)));
+    connect (m_pSliderScreeens, SIGNAL (valueChanged (int)), this, SLOT (sltValueChangedScreens (int)));
+    connect (m_pEditorScreens, SIGNAL (textChanged (const QString&)), this, SLOT (sltTextChangedScreens (const QString&)));
 
     /* Setup initial values */
-    mSlMemory->setPageStep (calcPageStep (m_maxVRAMVisible));
-    mSlMemory->setSingleStep (mSlMemory->pageStep() / 4);
-    mSlMemory->setTickInterval (mSlMemory->pageStep());
-    mSlMonitors->setPageStep (1);
-    mSlMonitors->setSingleStep (1);
-    mSlMonitors->setTickInterval (1);
+    m_pSliderMemory->setPageStep (calcPageStep (m_iMaxVRAMVisible));
+    m_pSliderMemory->setSingleStep (m_pSliderMemory->pageStep() / 4);
+    m_pSliderMemory->setTickInterval (m_pSliderMemory->pageStep());
+    m_pSliderScreeens->setPageStep (1);
+    m_pSliderScreeens->setSingleStep (1);
+    m_pSliderScreeens->setTickInterval (1);
     /* Setup the scale so that ticks are at page step boundaries */
-    mSlMemory->setMinimum ((m_minVRAM / mSlMemory->pageStep()) * mSlMemory->pageStep());
-    mSlMemory->setMaximum (m_maxVRAMVisible);
-    mSlMemory->setSnappingEnabled (true);
-    mSlMemory->setErrorHint (0, 1);
-    mSlMonitors->setMinimum (MinMonitors);
-    mSlMonitors->setMaximum (MaxMonitors);
-    mSlMonitors->setErrorHint (0, MinMonitors);
-    mSlMonitors->setOptimalHint (MinMonitors, cHostScreens);
-    mSlMonitors->setWarningHint (cHostScreens, MaxMonitors);
+    m_pSliderMemory->setMinimum ((m_iMinVRAM / m_pSliderMemory->pageStep()) * m_pSliderMemory->pageStep());
+    m_pSliderMemory->setMaximum (m_iMaxVRAMVisible);
+    m_pSliderMemory->setSnappingEnabled (true);
+    m_pSliderMemory->setErrorHint (0, 1);
+    m_pSliderScreeens->setMinimum (cMinGuestScreens);
+    m_pSliderScreeens->setMaximum (cMaxGuestScreens);
+    m_pSliderScreeens->setErrorHint (0, cMinGuestScreens);
+    m_pSliderScreeens->setOptimalHint (cMinGuestScreens, cHostScreens);
+    m_pSliderScreeens->setWarningHint (cHostScreens, cMaxGuestScreens);
     /* Limit min/max. size of QLineEdit */
-    mLeMemory->setFixedWidthByText (QString().fill ('8', 4));
-    mLeMonitors->setFixedWidthByText (QString().fill ('8', 4));
+    m_pEditorMemory->setFixedWidthByText (QString().fill ('8', 4));
+    m_pEditorScreens->setFixedWidthByText (QString().fill ('8', 4));
     /* Ensure value and validation is updated */
-    valueChangedVRAM (mSlMemory->value());
-    valueChangedMonitors (mSlMonitors->value());
+    sltValueChangedVRAM (m_pSliderMemory->value());
+    sltValueChangedScreens (m_pSliderScreeens->value());
     /* Setup VRDE widget */
-    mCbVRDEMethod->insertItem (0, ""); /* KAuthType_Null */
-    mCbVRDEMethod->insertItem (1, ""); /* KAuthType_External */
-    mCbVRDEMethod->insertItem (2, ""); /* KAuthType_Guest */
-    /* Initially disabled */
-    mCbVRDE->setChecked (false);
+    m_pComboRemoteDisplayAuthMethod->insertItem (0, ""); /* KAuthType_Null */
+    m_pComboRemoteDisplayAuthMethod->insertItem (1, ""); /* KAuthType_External */
+    m_pComboRemoteDisplayAuthMethod->insertItem (2, ""); /* KAuthType_Guest */
 
 #ifndef VBOX_WITH_VIDEOHWACCEL
     mCb2DVideo->setVisible (false);
-#endif
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 
     /* Applying language settings */
@@ -176 +174 @@
     /* Gather display data: */
     displayData.m_iCurrentVRAM = m_machine.GetVRAMSize();
-    displayData.m_cMonitorCount = m_machine.GetMonitorCount();
+    displayData.m_cGuestScreenCount = m_machine.GetMonitorCount();
     displayData.m_f3dAccelerationEnabled = m_machine.GetAccelerate3DEnabled();
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -182 +180 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
     /* Check if VRDE server is valid: */
-    CVRDEServer vrdeServer = m_machine.GetVRDEServer();
-    displayData.m_fVRDEServerSupported = !vrdeServer.isNull();
-    if (!vrdeServer.isNull())
-    {
-        displayData.m_fVRDEServerEnabled = vrdeServer.GetEnabled();
-        displayData.m_strVRDEPort = vrdeServer.GetVRDEProperty("TCP/Ports");
-        displayData.m_VRDEAuthType = vrdeServer.GetAuthType();
-        displayData.m_uVRDETimeout = vrdeServer.GetAuthTimeout();
-        displayData.m_fMultipleConnectionsAllowed = vrdeServer.GetAllowMultiConnection();
+    CVRDEServer remoteDisplayServer = m_machine.GetVRDEServer();
+    displayData.m_fRemoteDisplayServerSupported = !remoteDisplayServer.isNull();
+    if (!remoteDisplayServer.isNull())
+    {
+        displayData.m_fRemoteDisplayServerEnabled = remoteDisplayServer.GetEnabled();
+        displayData.m_strRemoteDisplayPort = remoteDisplayServer.GetVRDEProperty("TCP/Ports");
+        displayData.m_remoteDisplayAuthType = remoteDisplayServer.GetAuthType();
+        displayData.m_uRemoteDisplayTimeout = remoteDisplayServer.GetAuthTimeout();
+        displayData.m_fRemoteDisplayMultiConnAllowed = remoteDisplayServer.GetAllowMultiConnection();
     }
 
     /* Initialize other variables: */
-    m_initialVRAM = RT_MIN(displayData.m_iCurrentVRAM, m_maxVRAM);
+    m_iInitialVRAM = RT_MIN(displayData.m_iCurrentVRAM, m_iMaxVRAM);
 
     /* Cache display data: */
@@ -211 +209 @@
 
     /* Load display data to page: */
-    mSlMonitors->setValue(displayData.m_cMonitorCount);
+    m_pSliderScreeens->setValue(displayData.m_cGuestScreenCount);
     mCb3D->setChecked(displayData.m_f3dAccelerationEnabled);
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -217 +215 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
     checkVRAMRequirements();
-    mSlMemory->setValue(displayData.m_iCurrentVRAM);
-    if (displayData.m_fVRDEServerSupported)
-    {
-        mCbVRDE->setChecked(displayData.m_fVRDEServerEnabled);
-        mLeVRDEPort->setText(displayData.m_strVRDEPort);
-        mCbVRDEMethod->setCurrentIndex(mCbVRDEMethod->findText(gpConverter->toString(displayData.m_VRDEAuthType)));
-        mLeVRDETimeout->setText(QString::number(displayData.m_uVRDETimeout));
-        mCbMultipleConn->setChecked(displayData.m_fMultipleConnectionsAllowed);
+    m_pSliderMemory->setValue(displayData.m_iCurrentVRAM);
+    if (displayData.m_fRemoteDisplayServerSupported)
+    {
+        m_pCheckboxRemoteDisplay->setChecked(displayData.m_fRemoteDisplayServerEnabled);
+        m_pEditorRemoteDisplayPort->setText(displayData.m_strRemoteDisplayPort);
+        m_pComboRemoteDisplayAuthMethod->setCurrentIndex(m_pComboRemoteDisplayAuthMethod->findText(gpConverter->toString(displayData.m_remoteDisplayAuthType)));
+        m_pEditorRemoteDisplayTimeout->setText(QString::number(displayData.m_uRemoteDisplayTimeout));
+        m_pCheckboxMultipleConn->setChecked(displayData.m_fRemoteDisplayMultiConnAllowed);
     }
 
@@ -231 +229 @@
 
     /* Revalidate if possible: */
-    if (mValidator)
-        mValidator->revalidate();
+    if (m_pValidator)
+        m_pValidator->revalidate();
 }
 
@@ -243 +241 @@
 
     /* Gather display data: */
-    displayData.m_iCurrentVRAM = mSlMemory->value();
-    displayData.m_cMonitorCount = mSlMonitors->value();
+    displayData.m_iCurrentVRAM = m_pSliderMemory->value();
+    displayData.m_cGuestScreenCount = m_pSliderScreeens->value();
     displayData.m_f3dAccelerationEnabled = mCb3D->isChecked();
 #ifdef VBOX_WITH_VIDEOHWACCEL
     displayData.m_f2dAccelerationEnabled = mCb2DVideo->isChecked();
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-    if (displayData.m_fVRDEServerSupported)
-    {
-        displayData.m_fVRDEServerEnabled = mCbVRDE->isChecked();
-        displayData.m_strVRDEPort = mLeVRDEPort->text();
-        displayData.m_VRDEAuthType = gpConverter->fromString<KAuthType>(mCbVRDEMethod->currentText());
-        displayData.m_uVRDETimeout = mLeVRDETimeout->text().toULong();
-        displayData.m_fMultipleConnectionsAllowed = mCbMultipleConn->isChecked();
+    if (displayData.m_fRemoteDisplayServerSupported)
+    {
+        displayData.m_fRemoteDisplayServerEnabled = m_pCheckboxRemoteDisplay->isChecked();
+        displayData.m_strRemoteDisplayPort = m_pEditorRemoteDisplayPort->text();
+        displayData.m_remoteDisplayAuthType = gpConverter->fromString<KAuthType>(m_pComboRemoteDisplayAuthMethod->currentText());
+        displayData.m_uRemoteDisplayTimeout = m_pEditorRemoteDisplayTimeout->text().toULong();
+        displayData.m_fRemoteDisplayMultiConnAllowed = m_pCheckboxMultipleConn->isChecked();
     }
 
@@ -280 +278 @@
             /* Video tab: */
             m_machine.SetVRAMSize(displayData.m_iCurrentVRAM);
-            m_machine.SetMonitorCount(displayData.m_cMonitorCount);
+            m_machine.SetMonitorCount(displayData.m_cGuestScreenCount);
             m_machine.SetAccelerate3DEnabled(displayData.m_f3dAccelerationEnabled);
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -287 +285 @@
         }
         /* Check if VRDE server still valid: */
-        CVRDEServer vrdeServer = m_machine.GetVRDEServer();
-        if (!vrdeServer.isNull())
+        CVRDEServer remoteDisplayServer = m_machine.GetVRDEServer();
+        if (!remoteDisplayServer.isNull())
         {
             /* Store VRDE data: */
             if (isMachineInValidMode())
             {
-                vrdeServer.SetEnabled(displayData.m_fVRDEServerEnabled);
-                vrdeServer.SetVRDEProperty("TCP/Ports", displayData.m_strVRDEPort);
-                vrdeServer.SetAuthType(displayData.m_VRDEAuthType);
-                vrdeServer.SetAuthTimeout(displayData.m_uVRDETimeout);
+                remoteDisplayServer.SetEnabled(displayData.m_fRemoteDisplayServerEnabled);
+                remoteDisplayServer.SetVRDEProperty("TCP/Ports", displayData.m_strRemoteDisplayPort);
+                remoteDisplayServer.SetAuthType(displayData.m_remoteDisplayAuthType);
+                remoteDisplayServer.SetAuthTimeout(displayData.m_uRemoteDisplayTimeout);
             }
             if (isMachineOffline() || isMachineSaved())
             {
-                vrdeServer.SetAllowMultiConnection(displayData.m_fMultipleConnectionsAllowed);
+                remoteDisplayServer.SetAllowMultiConnection(displayData.m_fRemoteDisplayMultiConnAllowed);
             }
         }
@@ -309 +307 @@
 }
 
-void UIMachineSettingsDisplay::setValidator (QIWidgetValidator *aVal)
-{
-    mValidator = aVal;
+void UIMachineSettingsDisplay::setValidator(QIWidgetValidator *pValidator)
+{
+    m_pValidator = pValidator;
     connect (mCb3D, SIGNAL (stateChanged (int)),
-             mValidator, SLOT (revalidate()));
+             m_pValidator, SLOT (revalidate()));
 #ifdef VBOX_WITH_VIDEOHWACCEL
     connect (mCb2DVideo, SIGNAL (stateChanged (int)),
-             mValidator, SLOT (revalidate()));
-#endif
-    connect (mCbVRDE, SIGNAL (toggled (bool)),
-             mValidator, SLOT (revalidate()));
-    connect (mLeVRDEPort, SIGNAL (textChanged (const QString&)),
-             mValidator, SLOT (revalidate()));
-    connect (mLeVRDETimeout, SIGNAL (textChanged (const QString&)),
-             mValidator, SLOT (revalidate()));
-}
-
-bool UIMachineSettingsDisplay::revalidate(QString &strWarning, QString & /* strTitle */)
+             m_pValidator, SLOT (revalidate()));
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+    connect (m_pCheckboxRemoteDisplay, SIGNAL (toggled (bool)),
+             m_pValidator, SLOT (revalidate()));
+    connect (m_pEditorRemoteDisplayPort, SIGNAL (textChanged (const QString&)),
+             m_pValidator, SLOT (revalidate()));
+    connect (m_pEditorRemoteDisplayTimeout, SIGNAL (textChanged (const QString&)),
+             m_pValidator, SLOT (revalidate()));
+}
+
+bool UIMachineSettingsDisplay::revalidate(QString &strWarning, QString& /* strTitle */)
 {
     /* Check if video RAM requirement changed first: */
@@ -342 +340 @@
     if (shouldWeWarnAboutLowVideoMemory() && !m_guestOSType.isNull())
     {
-        quint64 uNeedBytes = VBoxGlobal::requiredVideoMemory(m_guestOSType.GetId(), mSlMonitors->value());
+        quint64 uNeedBytes = VBoxGlobal::requiredVideoMemory(m_guestOSType.GetId(), m_pSliderScreeens->value());
 
         /* Basic video RAM amount test: */
-        if ((quint64)mSlMemory->value() * _1M < uNeedBytes)
+        if ((quint64)m_pSliderMemory->value() * _1M < uNeedBytes)
         {
             strWarning = tr("you have assigned less than <b>%1</b> of video memory which is "
@@ -358 +356 @@
         {
             uNeedBytes += VBoxGlobal::required2DOffscreenVideoMemory();
-            if ((quint64)mSlMemory->value() * _1M < uNeedBytes)
+            if ((quint64)m_pSliderMemory->value() * _1M < uNeedBytes)
             {
                 strWarning = tr("you have assigned less than <b>%1</b> of video memory which is "
@@ -371 +369 @@
         if (mCb3D->isChecked() && m_fWddmModeSupported)
         {
-            int cMonitorsCount = mSlMonitors->value();
-            uNeedBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(m_guestOSType.GetId(), cMonitorsCount);
+            int cGuestScreenCount = m_pSliderScreeens->value();
+            uNeedBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(m_guestOSType.GetId(), cGuestScreenCount);
             uNeedBytes = RT_MAX(uNeedBytes, 128 * _1M);
             uNeedBytes = RT_MIN(uNeedBytes, 256 * _1M);
-            if ((quint64)mSlMemory->value() * _1M < uNeedBytes)
+            if ((quint64)m_pSliderMemory->value() * _1M < uNeedBytes)
             {
                 strWarning = tr("you have 3D Acceleration enabled for a operation system which uses the WDDM video driver. "
@@ -401 +399 @@
 }
 
-void UIMachineSettingsDisplay::setOrderAfter (QWidget *aWidget)
+void UIMachineSettingsDisplay::setOrderAfter (QWidget *pWidget)
 {
     /* Video tab-order */
-    setTabOrder (aWidget, mTwDisplay->focusProxy());
-    setTabOrder (mTwDisplay->focusProxy(), mSlMemory);
-    setTabOrder (mSlMemory, mLeMemory);
-    setTabOrder (mLeMemory, mSlMonitors);
-    setTabOrder (mSlMonitors, mLeMonitors);
-    setTabOrder (mLeMonitors, mCb3D);
+    setTabOrder (pWidget, m_pTabWidget->focusProxy());
+    setTabOrder (m_pTabWidget->focusProxy(), m_pSliderMemory);
+    setTabOrder (m_pSliderMemory, m_pEditorMemory);
+    setTabOrder (m_pEditorMemory, m_pSliderScreeens);
+    setTabOrder (m_pSliderScreeens, m_pEditorScreens);
+    setTabOrder (m_pEditorScreens, mCb3D);
 #ifdef VBOX_WITH_VIDEOHWACCEL
     setTabOrder (mCb3D, mCb2DVideo);
-    setTabOrder (mCb2DVideo, mCbVRDE);
-#else
-    setTabOrder (mCb3D, mCbVRDE);
-#endif
+    setTabOrder (mCb2DVideo, m_pCheckboxRemoteDisplay);
+#else /* VBOX_WITH_VIDEOHWACCEL */
+    setTabOrder (mCb3D, m_pCheckboxRemoteDisplay);
+#endif /* !VBOX_WITH_VIDEOHWACCEL */
 
     /* Remote display tab-order */
-    setTabOrder (mCbVRDE, mLeVRDEPort);
-    setTabOrder (mLeVRDEPort, mCbVRDEMethod);
-    setTabOrder (mCbVRDEMethod, mLeVRDETimeout);
-    setTabOrder (mLeVRDETimeout, mCbMultipleConn);
+    setTabOrder (m_pCheckboxRemoteDisplay, m_pEditorRemoteDisplayPort);
+    setTabOrder (m_pEditorRemoteDisplayPort, m_pComboRemoteDisplayAuthMethod);
+    setTabOrder (m_pComboRemoteDisplayAuthMethod, m_pEditorRemoteDisplayTimeout);
+    setTabOrder (m_pEditorRemoteDisplayTimeout, m_pCheckboxMultipleConn);
 }
 
@@ -430 +428 @@
 
     CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties();
-    mLbMemoryMin->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (m_minVRAM));
-    mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (m_maxVRAMVisible));
-    mLbMonitorsMin->setText (tr ("<qt>%1</qt>").arg (1));
-    mLbMonitorsMax->setText (tr ("<qt>%1</qt>").arg (sys.GetMaxGuestMonitors()));
-
-    mCbVRDEMethod->setItemText (0,
+    m_pLabelMemoryMin->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (m_iMinVRAM));
+    m_pLabelMemoryMin->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (m_iMaxVRAMVisible));
+    m_pLabelScreensMin->setText (tr ("<qt>%1</qt>").arg (1));
+    m_pLabelScreensMax->setText (tr ("<qt>%1</qt>").arg (sys.GetMaxGuestMonitors()));
+
+    m_pComboRemoteDisplayAuthMethod->setItemText (0,
         gpConverter->toString (KAuthType_Null));
-    mCbVRDEMethod->setItemText (1,
+    m_pComboRemoteDisplayAuthMethod->setItemText (1,
         gpConverter->toString (KAuthType_External));
-    mCbVRDEMethod->setItemText (2,
+    m_pComboRemoteDisplayAuthMethod->setItemText (2,
         gpConverter->toString (KAuthType_Guest));
 }
 
-void UIMachineSettingsDisplay::valueChangedVRAM (int aVal)
-{
-    mLeMemory->setText (QString().setNum (aVal));
-}
-
-void UIMachineSettingsDisplay::textChangedVRAM (const QString &aText)
-{
-    mSlMemory->setValue (aText.toInt());
-}
-
-void UIMachineSettingsDisplay::valueChangedMonitors (int aVal)
-{
-    mLeMonitors->setText (QString().setNum (aVal));
+void UIMachineSettingsDisplay::sltValueChangedVRAM (int iValue)
+{
+    m_pEditorMemory->setText (QString::number (iValue));
+}
+
+void UIMachineSettingsDisplay::sltTextChangedVRAM (const QString &strText)
+{
+    m_pSliderMemory->setValue (strText.toInt());
+}
+
+void UIMachineSettingsDisplay::sltValueChangedScreens (int iValue)
+{
+    m_pEditorScreens->setText (QString::number (iValue));
     checkVRAMRequirements();
 }
 
-void UIMachineSettingsDisplay::textChangedMonitors (const QString &aText)
-{
-    mSlMonitors->setValue (aText.toInt());
+void UIMachineSettingsDisplay::sltTextChangedScreens (const QString &strText)
+{
+    m_pSliderScreeens->setValue (strText.toInt());
 }
 
@@ -470 +468 @@
 
     /* Get monitors count and base video memory requirements: */
-    int cMonitorsCount = mSlMonitors->value();
-    quint64 uNeedMBytes = VBoxGlobal::requiredVideoMemory(m_guestOSType.GetId(), cMonitorsCount) / _1M;
+    int cGuestScreenCount = m_pSliderScreeens->value();
+    quint64 uNeedMBytes = VBoxGlobal::requiredVideoMemory(m_guestOSType.GetId(), cGuestScreenCount) / _1M;
 
     /* Initial values: */
-    m_maxVRAMVisible = cMonitorsCount * 32;
-    if (m_maxVRAMVisible < 128)
-        m_maxVRAMVisible = 128;
-    if (m_maxVRAMVisible < m_initialVRAM)
-        m_maxVRAMVisible = m_initialVRAM;
+    m_iMaxVRAMVisible = cGuestScreenCount * 32;
+    if (m_iMaxVRAMVisible < 128)
+        m_iMaxVRAMVisible = 128;
+    if (m_iMaxVRAMVisible < m_iInitialVRAM)
+        m_iMaxVRAMVisible = m_iInitialVRAM;
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -490 +488 @@
     {
 # if 0
-        uNeedMBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(m_guestOSType.GetId(), cMonitorsCount) / _1M;
+        uNeedMBytes += VBoxGlobal::required3DWddmOffscreenVideoMemory(m_guestOSType.GetId(), cGuestScreenCount) / _1M;
         uNeedMBytes = RT_MAX(uNeedMBytes, 128);
         uNeedMBytes = RT_MIN(uNeedMBytes, 256);
 # endif
-        m_maxVRAMVisible = 256;
+        m_iMaxVRAMVisible = 256;
     }
 #endif /* VBOX_WITH_CRHGSMI */
 
-    mSlMemory->setWarningHint(1, uNeedMBytes);
-    mSlMemory->setPageStep(calcPageStep(m_maxVRAMVisible));
-    mSlMemory->setMaximum(m_maxVRAMVisible);
-    mSlMemory->setOptimalHint(uNeedMBytes, m_maxVRAMVisible);
-    mLeMemory->setValidator(new QIntValidator(m_minVRAM, m_maxVRAMVisible, this));
-    mLbMemoryMax->setText(tr("<qt>%1&nbsp;MB</qt>").arg(m_maxVRAMVisible));
+    m_pSliderMemory->setWarningHint(1, uNeedMBytes);
+    m_pSliderMemory->setPageStep(calcPageStep(m_iMaxVRAMVisible));
+    m_pSliderMemory->setMaximum(m_iMaxVRAMVisible);
+    m_pSliderMemory->setOptimalHint(uNeedMBytes, m_iMaxVRAMVisible);
+    m_pEditorMemory->setValidator(new QIntValidator(m_iMinVRAM, m_iMaxVRAMVisible, this));
+    m_pLabelMemoryMin->setText(tr("<qt>%1&nbsp;MB</qt>").arg(m_iMaxVRAMVisible));
 }
 
@@ -524 +522 @@
 
     /* Video tab: */
-    mWtVideo->setEnabled(isMachineOffline());
+    m_pContainerVideo->setEnabled(isMachineOffline());
 #ifdef VBOX_WITH_VIDEOHWACCEL
     mCb2DVideo->setEnabled(VBoxGlobal::isAcceleration2DVideoAvailable());
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
-    /* VRDE tab: */
-    mTwDisplay->setTabEnabled(1, displayData.m_fVRDEServerSupported);
-    mWtVRDP->setEnabled(isMachineInValidMode());
-    mWtVRDPServer->setEnabled(mCbVRDE->isChecked());
-    mLbOptions2->setEnabled(isMachineOffline() || isMachineSaved());
-    mCbMultipleConn->setEnabled(isMachineOffline() || isMachineSaved());
-}
-
+    /* Remote Display tab: */
+    m_pTabWidget->setTabEnabled(1, displayData.m_fRemoteDisplayServerSupported);
+    m_pContainerRemoteDisplay->setEnabled(isMachineInValidMode());
+    m_pContainerRemoteDisplayOptions->setEnabled(m_pCheckboxRemoteDisplay->isChecked());
+    m_pLabelRemoteDisplayOptions->setEnabled(isMachineOffline() || isMachineSaved());
+    m_pCheckboxMultipleConn->setEnabled(isMachineOffline() || isMachineSaved());
+}
+

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
     UIDataSettingsMachineDisplay()
         : m_iCurrentVRAM(0)
-        , m_cMonitorCount(0)
+        , m_cGuestScreenCount(0)
         , m_f3dAccelerationEnabled(false)
 #ifdef VBOX_WITH_VIDEOHWACCEL
         , m_f2dAccelerationEnabled(false)
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-        , m_fVRDEServerSupported(false)
-        , m_fVRDEServerEnabled(false)
-        , m_strVRDEPort(QString())
-        , m_VRDEAuthType(KAuthType_Null)
-        , m_uVRDETimeout(0)
-        , m_fMultipleConnectionsAllowed(false) {}
+        , m_fRemoteDisplayServerSupported(false)
+        , m_fRemoteDisplayServerEnabled(false)
+        , m_strRemoteDisplayPort(QString())
+        , m_remoteDisplayAuthType(KAuthType_Null)
+        , m_uRemoteDisplayTimeout(0)
+        , m_fRemoteDisplayMultiConnAllowed(false) {}
     /* Functions: */
     bool equal(const UIDataSettingsMachineDisplay &other) const
     {
         return (m_iCurrentVRAM == other.m_iCurrentVRAM) &&
-               (m_cMonitorCount == other.m_cMonitorCount) &&
+               (m_cGuestScreenCount == other.m_cGuestScreenCount) &&
                (m_f3dAccelerationEnabled == other.m_f3dAccelerationEnabled) &&
 #ifdef VBOX_WITH_VIDEOHWACCEL
                (m_f2dAccelerationEnabled == other.m_f2dAccelerationEnabled) &&
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-               (m_fVRDEServerSupported == other.m_fVRDEServerSupported) &&
-               (m_fVRDEServerEnabled == other.m_fVRDEServerEnabled) &&
-               (m_strVRDEPort == other.m_strVRDEPort) &&
-               (m_VRDEAuthType == other.m_VRDEAuthType) &&
-               (m_uVRDETimeout == other.m_uVRDETimeout) &&
-               (m_fMultipleConnectionsAllowed == other.m_fMultipleConnectionsAllowed);
+               (m_fRemoteDisplayServerSupported == other.m_fRemoteDisplayServerSupported) &&
+               (m_fRemoteDisplayServerEnabled == other.m_fRemoteDisplayServerEnabled) &&
+               (m_strRemoteDisplayPort == other.m_strRemoteDisplayPort) &&
+               (m_remoteDisplayAuthType == other.m_remoteDisplayAuthType) &&
+               (m_uRemoteDisplayTimeout == other.m_uRemoteDisplayTimeout) &&
+               (m_fRemoteDisplayMultiConnAllowed == other.m_fRemoteDisplayMultiConnAllowed);
     }
     /* Operators: */
@@ -65 +65 @@
     /* Variables: */
     int m_iCurrentVRAM;
-    int m_cMonitorCount;
+    int m_cGuestScreenCount;
     bool m_f3dAccelerationEnabled;
 #ifdef VBOX_WITH_VIDEOHWACCEL
     bool m_f2dAccelerationEnabled;
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-    bool m_fVRDEServerSupported;
-    bool m_fVRDEServerEnabled;
-    QString m_strVRDEPort;
-    KAuthType m_VRDEAuthType;
-    ulong m_uVRDETimeout;
-    bool m_fMultipleConnectionsAllowed;
+    bool m_fRemoteDisplayServerSupported;
+    bool m_fRemoteDisplayServerEnabled;
+    QString m_strRemoteDisplayPort;
+    KAuthType m_remoteDisplayAuthType;
+    ulong m_uRemoteDisplayTimeout;
+    bool m_fRemoteDisplayMultiConnAllowed;
 };
 typedef UISettingsCache<UIDataSettingsMachineDisplay> UICacheSettingsMachineDisplay;
@@ -114 +114 @@
     bool changed() const { return m_cache.wasChanged(); }
 
-    void setValidator (QIWidgetValidator *aVal);
-    bool revalidate (QString &aWarning, QString &aTitle);
+    void setValidator(QIWidgetValidator *pValidator);
+    bool revalidate(QString &strWarning, QString &strTitle);
 
-    void setOrderAfter (QWidget *aWidget);
+    void setOrderAfter(QWidget *pWidget);
 
     void retranslateUi();
@@ -123 +123 @@
 private slots:
 
-    void valueChangedVRAM (int aVal);
-    void textChangedVRAM (const QString &aText);
-    void valueChangedMonitors (int aVal);
-    void textChangedMonitors (const QString &aText);
+    void sltValueChangedVRAM(int iValue);
+    void sltTextChangedVRAM(const QString &strText);
+    void sltValueChangedScreens(int iValue);
+    void sltTextChangedScreens(const QString &strText);
 
 private:
@@ -135 +135 @@
     void polishPage();
 
-    QIWidgetValidator *mValidator;
+    QIWidgetValidator *m_pValidator;
 
     /* Guest OS type id: */
     CGuestOSType m_guestOSType;
     /* System minimum lower limit of VRAM (MiB). */
-    int m_minVRAM;
+    int m_iMinVRAM;
     /* System maximum limit of VRAM (MiB). */
-    int m_maxVRAM;
+    int m_iMaxVRAM;
     /* Upper limit of VRAM in MiB for this dialog. This value is lower than
      * m_maxVRAM to save careless users from setting useless big values. */
-    int m_maxVRAMVisible;
+    int m_iMaxVRAMVisible;
     /* Initial VRAM value when the dialog is opened. */
-    int m_initialVRAM;
+    int m_iInitialVRAM;
 #ifdef VBOX_WITH_VIDEOHWACCEL
     /* Specifies whether the guest OS supports 2D video-acceleration: */

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

@@ -23 +23 @@
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="mLtMain">
+  <layout class="QVBoxLayout" name="m_pLayoutMain">
    <item>
-    <widget class="QITabWidget" name="mTwDisplay">
-     <widget class="QWidget" name="mTabVideo">
+    <widget class="QITabWidget" name="m_pTabWidget">
+     <widget class="QWidget" name="m_pTabVideo">
       <attribute name="title">
        <string>&amp;Video</string>
       </attribute>
-      <layout class="QVBoxLayout" name="mLtVideoPage">
+      <layout class="QVBoxLayout" name="m_pLayoutTabVideo">
        <item>
-        <widget class="QWidget" name="mWtVideo">
-         <layout class="QGridLayout" name="mLtVideoItems">
+        <widget class="QWidget" name="m_pContainerVideo">
+         <layout class="QGridLayout" name="m_pLayoutContainerVideo">
           <item row="0" column="0">
-           <widget class="QLabel" name="mLbMemory">
+           <widget class="QLabel" name="m_pLabelMemory">
             <property name="text">
              <string>Video &amp;Memory:</string>
@@ -43 +43 @@
             </property>
             <property name="buddy">
-             <cstring>mLeMemory</cstring>
+             <cstring>m_pEditorMemory</cstring>
             </property>
            </widget>
           </item>
           <item row="0" column="1" rowspan="2">
-           <layout class="QVBoxLayout" name="mLtMemorySlider">
+           <layout class="QVBoxLayout" name="m_pLayoutSliderMemory">
             <property name="spacing">
              <number>0</number>
             </property>
             <item>
-             <widget class="QIAdvancedSlider" name="mSlMemory">
+             <widget class="QIAdvancedSlider" name="m_pSliderMemory">
               <property name="whatsThis">
                <string>Controls the amount of video memory provided to the virtual machine.</string>
@@ -66 +66 @@
             </item>
             <item>
-             <layout class="QHBoxLayout" name="mLtMemoryLegend">
-              <item>
-               <widget class="QLabel" name="mLbMemoryMin">
+             <layout class="QHBoxLayout" name="m_pLayoutLegendMemory">
+              <item>
+               <widget class="QLabel" name="m_pLabelMemoryMin">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -78 +78 @@
               </item>
               <item>
-               <spacer name="mSpHor1">
+               <spacer name="m_pSpacerLegendMemory">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
@@ -91 +91 @@
               </item>
               <item>
-               <widget class="QLabel" name="mLbMemoryMax">
+               <widget class="QLabel" name="m_pLabelMemoryMax">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -105 +105 @@
           </item>
           <item row="0" column="2">
-           <layout class="QHBoxLayout" name="mLtMemorySize">
-            <item>
-             <widget class="QILineEdit" name="mLeMemory">
+           <layout class="QHBoxLayout" name="m_pLayoutEditorMemory">
+            <item>
+             <widget class="QILineEdit" name="m_pEditorMemory">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -120 +120 @@
             </item>
             <item>
-             <widget class="QLabel" name="mLbMemoryUnit">
+             <widget class="QLabel" name="m_pLabelMemoryUnit">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -135 +135 @@
           </item>
           <item row="2" column="0">
-           <widget class="QLabel" name="mLbMonitors">
+           <widget class="QLabel" name="m_pLabelScreens">
             <property name="text">
              <string>Mo&amp;nitor Count:</string>
@@ -143 +143 @@
             </property>
             <property name="buddy">
-             <cstring>mLeMonitors</cstring>
+             <cstring>m_pEditorScreens</cstring>
             </property>
            </widget>
           </item>
           <item row="2" column="1" rowspan="2">
-           <layout class="QVBoxLayout" name="mLtMonitorsSlider">
+           <layout class="QVBoxLayout" name="m_pLayoutSliderScreens">
             <property name="spacing">
              <number>0</number>
             </property>
             <item>
-             <widget class="QIAdvancedSlider" name="mSlMonitors">
+             <widget class="QIAdvancedSlider" name="m_pSliderScreeens">
               <property name="whatsThis">
                <string>Controls the amount of virtual monitors provided to the virtual machine.</string>
@@ -166 +166 @@
             </item>
             <item>
-             <layout class="QHBoxLayout" name="mLtMonitorsLegend">
-              <item>
-               <widget class="QLabel" name="mLbMonitorsMin">
+             <layout class="QHBoxLayout" name="m_pLayoutLegendScreens">
+              <item>
+               <widget class="QLabel" name="m_pLabelScreensMin">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -178 +178 @@
               </item>
               <item>
-               <spacer name="mSpHor2">
+               <spacer name="m_pSpacerLegendScreens">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
@@ -191 +191 @@
               </item>
               <item>
-               <widget class="QLabel" name="mLbMonitorsMax">
+               <widget class="QLabel" name="m_pLabelScreensMax">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -205 +205 @@
           </item>
           <item row="2" column="2">
-           <layout class="QHBoxLayout" name="mLtMonitorsSize">
-            <item>
-             <widget class="QILineEdit" name="mLeMonitors">
+           <layout class="QHBoxLayout" name="m_pLayoutEditorScreens">
+            <item>
+             <widget class="QILineEdit" name="m_pEditorScreens">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -220 +220 @@
             </item>
             <item>
-             <widget class="QLabel" name="mLbMonitorsUnit"/>
+             <widget class="QLabel" name="m_pLabelScreensUnit"/>
             </item>
            </layout>
           </item>
           <item row="4" column="0">
-           <widget class="QLabel" name="mLbOptions">
+           <widget class="QLabel" name="m_pLabelVideoOptions">
             <property name="text">
              <string>Extended Features:</string>
@@ -270 +270 @@
        </item>
        <item>
-        <spacer name="mSpVer1">
+        <spacer name="m_pStretchVideo">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -284 +284 @@
       </layout>
      </widget>
-     <widget class="QWidget" name="mTabVRDP">
+     <widget class="QWidget" name="m_pTabRemoteDisplay">
       <attribute name="title">
        <string>&amp;Remote Display</string>
       </attribute>
-      <layout class="QVBoxLayout" name="mLtVRDPPage">
+      <layout class="QVBoxLayout" name="m_pLayoutTabRemoteDisplay">
        <item>
-        <widget class="QWidget" name="mWtVRDP">
-         <layout class="QGridLayout" name="mLtVRDPItems">
+        <widget class="QWidget" name="m_pContainerRemoteDisplay">
+         <layout class="QGridLayout" name="m_pLayoutContainerRemoteDisplay">
           <item row="0" column="0" colspan="2">
-           <widget class="QCheckBox" name="mCbVRDE">
+           <widget class="QCheckBox" name="m_pCheckboxRemoteDisplay">
             <property name="whatsThis">
              <string>When checked, the VM will act as a Remote Desktop Protocol (RDP) server, allowing remote clients to connect and operate the VM (when it is running) using a standard RDP client.</string>
@@ -306 +306 @@
           </item>
           <item row="1" column="0">
-           <spacer name="mSpHor3">
+           <spacer name="m_pSpacerContainerRemoteDisplay">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -322 +322 @@
           </item>
           <item row="1" column="1">
-           <widget class="QWidget" name="mWtVRDPServer">
-            <layout class="QGridLayout" name="mLtVRDPServerItems">
+           <widget class="QWidget" name="m_pContainerRemoteDisplayOptions">
+            <layout class="QGridLayout" name="m_pLayoutContainerRemoteDisplayServer">
              <item row="0" column="0">
-              <widget class="QLabel" name="mLbVRDPPort">
+              <widget class="QLabel" name="m_pLabelRemoteDisplayPort">
                <property name="text">
                 <string>Server &amp;Port:</string>
@@ -333 +333 @@
                </property>
                <property name="buddy">
-                <cstring>mLeVRDEPort</cstring>
+                <cstring>m_pEditorRemoteDisplayPort</cstring>
                </property>
               </widget>
              </item>
              <item row="0" column="1">
-              <widget class="QLineEdit" name="mLeVRDEPort">
+              <widget class="QLineEdit" name="m_pEditorRemoteDisplayPort">
                <property name="whatsThis">
                 <string>The VRDP Server port number. You may specify &lt;tt&gt;0&lt;/tt&gt; (zero), to select port 3389, the standard port for RDP.</string>
@@ -345 +345 @@
              </item>
              <item row="1" column="0">
-              <widget class="QLabel" name="mLbVRDPMethod">
+              <widget class="QLabel" name="m_pLabelRemoteDisplayAuthMethod">
                <property name="text">
                 <string>Authentication &amp;Method:</string>
@@ -353 +353 @@
                </property>
                <property name="buddy">
-                <cstring>mCbVRDEMethod</cstring>
+                <cstring>m_pComboRemoteDisplayAuthMethod</cstring>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
-              <widget class="QComboBox" name="mCbVRDEMethod">
+              <widget class="QComboBox" name="m_pComboRemoteDisplayAuthMethod">
                <property name="whatsThis">
                 <string>Defines the VRDP authentication method.</string>
@@ -365 +365 @@
              </item>
              <item row="2" column="0">
-              <widget class="QLabel" name="mLbVRDPTimeout">
+              <widget class="QLabel" name="m_pLabelRemoteDisplayTimeout">
                <property name="text">
                 <string>Authentication &amp;Timeout:</string>
@@ -373 +373 @@
                </property>
                <property name="buddy">
-                <cstring>mLeVRDETimeout</cstring>
+                <cstring>m_pEditorRemoteDisplayTimeout</cstring>
                </property>
               </widget>
              </item>
              <item row="2" column="1">
-              <widget class="QLineEdit" name="mLeVRDETimeout">
+              <widget class="QLineEdit" name="m_pEditorRemoteDisplayTimeout">
                <property name="whatsThis">
                 <string>Specifies the timeout for guest authentication, in milliseconds.</string>
@@ -385 +385 @@
              </item>
              <item row="3" column="0">
-              <widget class="QLabel" name="mLbOptions2">
+              <widget class="QLabel" name="m_pLabelRemoteDisplayOptions">
                <property name="text">
                 <string>Extended Features:</string>
@@ -395 +395 @@
              </item>
              <item row="3" column="1">
-              <widget class="QCheckBox" name="mCbMultipleConn">
+              <widget class="QCheckBox" name="m_pCheckboxMultipleConn">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -417 +417 @@
        </item>
        <item>
-        <spacer name="mSpVer2">
+        <spacer name="m_pStretchRemoteDisplay">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -455 +455 @@
  <connections>
   <connection>
-   <sender>mCbVRDE</sender>
+   <sender>m_pCheckboxRemoteDisplay</sender>
    <signal>toggled(bool)</signal>
-   <receiver>mWtVRDPServer</receiver>
+   <receiver>m_pContainerRemoteDisplayOptions</receiver>
    <slot>setEnabled(bool)</slot>
   </connection>