Changeset 79999 in vbox

Timestamp:

Jul 26, 2019 11:28:40 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7720: VM settings / System page: Wipe out leftovers of old heavily distributed across system page widgets related to boot-order editing functionality; Adjusting UIBootOrderEditor layout a bit.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/machine/UIMachineSettingsSystem.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsSystem.ui (modified) (10 diffs)
• widgets/UIBootOrderEditor.cpp (modified) (2 diffs)

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

@@ -597 +597 @@
     m_pBaseMemoryLabel->setEnabled(isMachineOffline());
     m_pBaseMemoryEditor->setEnabled(isMachineOffline());
-    m_pLabelBootOrder->setEnabled(isMachineOffline());
+    m_pBootOrderLabel->setEnabled(isMachineOffline());
     m_pBootOrderEditor->setEnabled(isMachineOffline());
     m_pLabelChipsetType->setEnabled(isMachineOffline());
@@ -728 +728 @@
         }
 
-        /* Boot-order layout created in the .ui file. */
-        AssertPtrReturnVoid(m_pLayoutBootOrder);
-        {
-            /* Configure layout: */
-#ifdef VBOX_WS_MAC
-            /* We need a little space for the focus rect: */
-            m_pLayoutBootOrder->setContentsMargins(3, 3, 3, 3);
-            m_pLayoutBootOrder->setSpacing(3);
-#else
-            m_pLayoutBootOrder->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 3);
-#endif
+        /* Boot-order label and editor created in the .ui file. */
+        AssertPtrReturnVoid(m_pBootOrderLabel);
+        AssertPtrReturnVoid(m_pBootOrderEditor);
+        {
+            /* Configure label & editor: */
+            m_pBootOrderLabel->setBuddy(m_pBootOrderEditor->focusProxy());
         }
 

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

@@ -56 +56 @@
        </item>
        <item row="2" column="0">
-        <widget class="QLabel" name="m_pLabelBootOrder">
+        <widget class="QLabel" name="m_pBootOrderLabel">
          <property name="text">
           <string>&amp;Boot Order:</string>
@@ -68 +68 @@
         </widget>
        </item>
-       <item row="2" column="1" rowspan="2" colspan="2">
-        <layout class="QHBoxLayout" name="m_pLayoutBootOrder">
-         <property name="spacing">
-          <number>1</number>
-         </property>
-         <item>
-          <widget class="UIBootOrderEditor" name="m_pBootOrderEditor">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="whatsThis">
-            <string>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="m_pSpacerHorizontal2">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="0">
+       <item row="2" column="1" rowspan="3" colspan="3">
+        <widget class="UIBootOrderEditor" name="m_pBootOrderEditor">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="whatsThis">
+          <string>Defines the boot device order. Use the checkboxes on the left to enable or disable individual boot devices. Move items up and down to change the device order.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
         <widget class="QLabel" name="m_pLabelChipsetType">
          <property name="text">
@@ -114 +94 @@
         </widget>
        </item>
-       <item row="4" column="1" colspan="3">
+       <item row="5" column="1" colspan="3">
         <layout class="QHBoxLayout">
          <item>
@@ -144 +124 @@
         </layout>
        </item>
-       <item row="5" column="0">
+       <item row="6" column="0">
         <widget class="QLabel" name="m_pLabelPointingHIDType">
          <property name="text">
@@ -157 +137 @@
         </widget>
        </item>
-       <item row="5" column="1" colspan="3">
+       <item row="6" column="1" colspan="3">
         <layout class="QHBoxLayout">
          <item>
@@ -187 +167 @@
         </layout>
        </item>
-       <item row="6" column="0">
+       <item row="7" column="0">
         <widget class="QLabel" name="m_pLabelMotherboardExtended">
          <property name="text">
@@ -197 +177 @@
         </widget>
        </item>
-       <item row="6" column="1" colspan="3">
+       <item row="7" column="1" colspan="3">
         <widget class="QCheckBox" name="m_pCheckBoxApic">
          <property name="whatsThis">
@@ -207 +187 @@
         </widget>
        </item>
-       <item row="7" column="1" colspan="3">
+       <item row="8" column="1" colspan="3">
         <widget class="QCheckBox" name="m_pCheckBoxEFI">
          <property name="whatsThis">
@@ -217 +197 @@
         </widget>
        </item>
-       <item row="8" column="1" colspan="3">
+       <item row="9" column="1" colspan="3">
         <widget class="QCheckBox" name="m_pCheckBoxUseUTC" >
          <property name="whatsThis" >
@@ -227 +207 @@
         </widget>
        </item>
-       <item row="9" column="0" colspan="4">
+       <item row="10" column="0" colspan="4">
         <spacer name="m_pSpacerVertical2">
          <property name="orientation">

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootOrderEditor.cpp

@@ -508 +508 @@
             if (m_pTable)
             {
+                setFocusProxy(m_pTable);
                 if (m_pLabel)
                     m_pLabel->setBuddy(m_pTable);
@@ -539 +540 @@
 
             /* Add table layout to main layout: */
-            pMainLayout->addLayout(pTableLayout, 0, iRow++, 2, 1);
+            pMainLayout->addLayout(pTableLayout, 0, iRow++, 3, 1);
         }
     }