Changeset 46406 in vbox

Timestamp:

Jun 6, 2013 1:06:02 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM settings: Display page: .ui cleanup (part 2).

Location:

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

Files:

• UIMachineSettingsDisplay.cpp (modified) (2 diffs)
• UIMachineSettingsDisplay.ui (modified) (10 diffs)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -524 +524 @@
 
     /* Video tab: */
-    mLbMemory->setEnabled(isMachineOffline());
-    mLbMemoryMin->setEnabled(isMachineOffline());
-    mLbMemoryMax->setEnabled(isMachineOffline());
-    mLbMemoryUnit->setEnabled(isMachineOffline());
-    mSlMemory->setEnabled(isMachineOffline());
-    mLeMemory->setEnabled(isMachineOffline());
-    mLbMonitors->setEnabled(isMachineOffline());
-    mLbMonitorsMin->setEnabled(isMachineOffline());
-    mLbMonitorsMax->setEnabled(isMachineOffline());
-    mLbMonitorsUnit->setEnabled(isMachineOffline());
-    mSlMonitors->setEnabled(isMachineOffline());
-    mLeMonitors->setEnabled(isMachineOffline());
-    mLbOptions->setEnabled(isMachineOffline());
-    mCb3D->setEnabled(isMachineOffline());
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    mCb2DVideo->setEnabled(isMachineOffline() && VBoxGlobal::isAcceleration2DVideoAvailable());
-#endif /* VBOX_WITH_VIDEOHWACCEL */
+    mWtVideo->setEnabled(isMachineOffline());
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    mCb2DVideo->setEnabled(VBoxGlobal::isAcceleration2DVideoAvailable());
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+
     /* VRDE tab: */
     mTwDisplay->setTabEnabled(1, displayData.m_fVRDEServerSupported);
-    mCbVRDE->setEnabled(isMachineInValidMode());
-    mLbVRDPPort->setEnabled(isMachineInValidMode());
-    mLeVRDEPort->setEnabled(isMachineInValidMode());
-    mLbVRDPMethod->setEnabled(isMachineInValidMode());
-    mCbVRDEMethod->setEnabled(isMachineInValidMode());
-    mLbVRDPTimeout->setEnabled(isMachineInValidMode());
-    mLeVRDETimeout->setEnabled(isMachineInValidMode());
+    mWtVRDP->setEnabled(isMachineInValidMode());
+    mWtVRDPServer->setEnabled(mCbVRDE->isChecked());
     mLbOptions2->setEnabled(isMachineOffline() || isMachineSaved());
     mCbMultipleConn->setEnabled(isMachineOffline() || isMachineSaved());

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

@@ -276 +276 @@
          <property name="sizeHint" stdset="0">
           <size>
-           <width>20</width>
+           <width>0</width>
            <height>0</height>
           </size>
@@ -291 +291 @@
        <item>
         <widget class="QWidget" name="mWtVRDP">
-         <layout class="QVBoxLayout" name="mLtVRDPItems">
-          <item>
+         <layout class="QGridLayout" name="mLtVRDPItems">
+          <item row="0" column="0" colspan="2">
            <widget class="QCheckBox" name="mCbVRDE">
             <property name="whatsThis">
@@ -305 +305 @@
            </widget>
           </item>
-          <item>
+          <item row="1" column="0">
+           <spacer name="mSpHor3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>0</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="1">
            <widget class="QWidget" name="mWtVRDPServer">
             <layout class="QGridLayout" name="mLtVRDPServerItems">
-             <item row="1" column="0" rowspan="3">
-              <spacer name="mSpHor3">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Fixed</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item row="1" column="1">
+             <item row="0" column="0">
               <widget class="QLabel" name="mLbVRDPPort">
                <property name="text">
@@ -337 +337 @@
               </widget>
              </item>
-             <item row="1" column="2">
+             <item row="0" column="1">
               <widget class="QLineEdit" name="mLeVRDEPort">
                <property name="whatsThis">
@@ -344 +344 @@
               </widget>
              </item>
-             <item row="2" column="1">
+             <item row="1" column="0">
               <widget class="QLabel" name="mLbVRDPMethod">
                <property name="text">
@@ -357 +357 @@
               </widget>
              </item>
-             <item row="2" column="2">
+             <item row="1" column="1">
               <widget class="QComboBox" name="mCbVRDEMethod">
                <property name="whatsThis">
@@ -364 +364 @@
               </widget>
              </item>
-             <item row="3" column="1">
+             <item row="2" column="0">
               <widget class="QLabel" name="mLbVRDPTimeout">
                <property name="text">
@@ -377 +377 @@
               </widget>
              </item>
-             <item row="3" column="2">
+             <item row="2" column="1">
               <widget class="QLineEdit" name="mLeVRDETimeout">
                <property name="whatsThis">
@@ -384 +384 @@
               </widget>
              </item>
-             <item row="4" column="1">
+             <item row="3" column="0">
               <widget class="QLabel" name="mLbOptions2">
                <property name="text">
@@ -394 +394 @@
               </widget>
              </item>
-             <item row="4" column="2">
+             <item row="3" column="1">
               <widget class="QCheckBox" name="mCbMultipleConn">
                <property name="sizePolicy">