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

Timestamp:

Mar 9, 2022 8:59:05 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Global preferences: Reworking Interface page to increase page accessibility.

Location:

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

Files:

• editors/UIColorThemeEditor.cpp (modified) (5 diffs)
• editors/UIColorThemeEditor.h (modified) (1 diff)
• global/UIGlobalSettingsInterface.cpp (modified) (3 diffs)
• global/UIGlobalSettingsInterface.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.cpp

@@ -27 +27 @@
 
 
-UIColorThemeEditor::UIColorThemeEditor(QWidget *pParent /* = 0 */, bool fWithLabel /* = false */)
+UIColorThemeEditor::UIColorThemeEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fWithLabel(fWithLabel)
     , m_enmValue(UIColorThemeType_Auto)
     , m_pLabel(0)
@@ -72 +71 @@
             m_pCombo->setItemText(i, gpConverter->toString(enmType));
         }
+        m_pCombo->setToolTip(tr("Selects the color theme. It can be Light, Dark or automatically detected (default)."));
     }
 }
@@ -88 +88 @@
     {
         pMainLayout->setContentsMargins(0, 0, 0, 0);
-        int iRow = 0;
 
         /* Create label: */
-        if (m_fWithLabel)
-            m_pLabel = new QLabel(this);
+        m_pLabel = new QLabel(this);
         if (m_pLabel)
-            pMainLayout->addWidget(m_pLabel, 0, iRow++, 1, 1);
+            pMainLayout->addWidget(m_pLabel, 0, 0);
 
         /* Create combo layout: */
@@ -104 +102 @@
             if (m_pCombo)
             {
-                setFocusProxy(m_pCombo->focusProxy());
                 /* This is necessary since contents is dynamical now: */
                 m_pCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
                 if (m_pLabel)
-                    m_pLabel->setBuddy(m_pCombo->focusProxy());
+                    m_pLabel->setBuddy(m_pCombo);
                 connect(m_pCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                         this, &UIColorThemeEditor::sltHandleCurrentIndexChanged);
@@ -118 +115 @@
 
             /* Add combo-layout into main-layout: */
-            pMainLayout->addLayout(pComboLayout, 0, iRow++, 1, 1);
+            pMainLayout->addLayout(pComboLayout, 0, 1);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIColorThemeEditor.h

@@ -46 +46 @@
 public:
 
-    /** Constructs color theme editor passing @a pParent to the base-class.
-      * @param  fWithLabel  Brings whether we should add label ourselves. */
-    UIColorThemeEditor(QWidget *pParent = 0, bool fWithLabel = false);
+    /** Constructs color theme editor passing @a pParent to the base-class. */
+    UIColorThemeEditor(QWidget *pParent = 0);
 
     /** Defines editor @a enmValue. */

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

@@ -57 +57 @@
 UIGlobalSettingsInterface::UIGlobalSettingsInterface()
     : m_pCache(0)
-    , m_pLabelColorTheme(0)
     , m_pEditorColorTheme(0)
 {
@@ -119 +118 @@
 void UIGlobalSettingsInterface::retranslateUi()
 {
-    m_pLabelColorTheme->setText(tr("Color &Theme:"));
-    m_pEditorColorTheme->setToolTip(tr("Selects the color theme. It can be Light, Dark or automatically detected (default)."));
 }
 
@@ -142 +139 @@
     if (pLayoutMain)
     {
-        pLayoutMain->setColumnStretch(1, 1);
         pLayoutMain->setRowStretch(1, 1);
 
-        /* Prepare color-theme label: */
-        m_pLabelColorTheme = new QLabel(this);
-        if (m_pLabelColorTheme)
-        {
-            m_pLabelColorTheme->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-            pLayoutMain->addWidget(m_pLabelColorTheme, 0, 0);
-        }
         /* Prepare color-theme editor: */
         m_pEditorColorTheme = new UIColorThemeEditor(this);
         if (m_pEditorColorTheme)
-        {
-            m_pLabelColorTheme->setBuddy(m_pEditorColorTheme->focusProxy());
-            pLayoutMain->addWidget(m_pEditorColorTheme, 0, 1);
-        }
+            pLayoutMain->addWidget(m_pEditorColorTheme, 0, 0);
     }
 }

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

@@ -80 +80 @@
      * @{ */
         /** Holds the color theme label instance. */
-        QLabel             *m_pLabelColorTheme;
-        /** Holds the color theme label instance. */
         UIColorThemeEditor *m_pEditorColorTheme;
     /** @} */