Changeset 94288 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 17, 2022 12:20:06 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: A bit of cleanup for Global preferences layout code.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsGeneral.cpp (modified) (1 diff)
• UIGlobalSettingsInput.cpp (modified) (1 diff)
• UIGlobalSettingsInterface.cpp (modified) (2 diffs)
• UIGlobalSettingsLanguage.cpp (modified) (1 diff)
• UIGlobalSettingsUpdate.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp

@@ -149 +149 @@
 {
     /* Prepare main layout: */
-    QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
-    if (pLayoutMain)
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    if (pLayout)
     {
         /* Prepare 'default machine folder' editor: */
         m_pEditorDefaultMachineFolder = new UIDefaultMachineFolderEditor(this);
         if (m_pEditorDefaultMachineFolder)
-            pLayoutMain->addWidget(m_pEditorDefaultMachineFolder);
+            pLayout->addWidget(m_pEditorDefaultMachineFolder);
 
         /* Prepare 'VRDE auth library' editor: */
         m_pEditorVRDEAuthLibrary = new UIVRDEAuthLibraryEditor(this);
         if (m_pEditorVRDEAuthLibrary)
-            pLayoutMain->addWidget(m_pEditorVRDEAuthLibrary);
+            pLayout->addWidget(m_pEditorVRDEAuthLibrary);
 
         /* Add stretch to the end: */
-        pLayoutMain->addStretch();
+        pLayout->addStretch();
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp

@@ -196 +196 @@
 {
     /* Prepare main layout: */
-    QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
-    if (pLayoutMain)
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    if (pLayout)
     {
         /* Prepare 'shortcut configuration' editor: */
         m_pEditorShortcutConfiguration = new UIShortcutConfigurationEditor(this);
         if (m_pEditorShortcutConfiguration)
-            pLayoutMain->addWidget(m_pEditorShortcutConfiguration);
+            pLayout->addWidget(m_pEditorShortcutConfiguration);
 
         /* Prepare 'auto capture keyboard' editor: */
         m_pEditorAutoCaptureKeyboard = new UIAutoCaptureKeyboardEditor(this);
         if (m_pEditorAutoCaptureKeyboard)
-            pLayoutMain->addWidget(m_pEditorAutoCaptureKeyboard);
+            pLayout->addWidget(m_pEditorAutoCaptureKeyboard);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInterface.cpp

@@ -17 +17 @@
 
 /* Qt includes: */
-#include <QGridLayout>
 #include <QLabel>
+#include <QVBoxLayout>
 
 /* GUI includes: */
@@ -136 +136 @@
 {
     /* Prepare main layout: */
-    QGridLayout *pLayoutMain = new QGridLayout(this);
-    if (pLayoutMain)
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    if (pLayout)
     {
-        pLayoutMain->setRowStretch(1, 1);
-
         /* Prepare color-theme editor: */
         m_pEditorColorTheme = new UIColorThemeEditor(this);
         if (m_pEditorColorTheme)
-            pLayoutMain->addWidget(m_pEditorColorTheme, 0, 0);
+            pLayout->addWidget(m_pEditorColorTheme);
+
+        /* Add stretch to the end: */
+        pLayout->addStretch();
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp

@@ -133 +133 @@
 {
     /* Prepare main layout: */
-    QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
-    if (pLayoutMain)
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    if (pLayout)
     {
         /* Prepare language settings editor: */
         m_pEditorLanguageSettings = new UILanguageSettingsEditor(this);
         if (m_pEditorLanguageSettings)
-            pLayoutMain->addWidget(m_pEditorLanguageSettings);
+            pLayout->addWidget(m_pEditorLanguageSettings);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp

@@ -133 +133 @@
 {
     /* Prepare main layout: */
-    QVBoxLayout *pLayoutMain = new QVBoxLayout(this);
-    if (pLayoutMain)
+    QVBoxLayout *pLayout = new QVBoxLayout(this);
+    if (pLayout)
     {
         /* Prepare update settings editor: */
         m_pEditorUpdateSettings = new UIUpdateSettingsEditor(this);
         if (m_pEditorUpdateSettings)
-            pLayoutMain->addWidget(m_pEditorUpdateSettings);
+            pLayout->addWidget(m_pEditorUpdateSettings);
+
+        /* Add stretch to the end: */
+        pLayout->addStretch();
     }
 }