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

Timestamp:

Mar 2, 2022 3:41:28 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: VM settings: Get rid of QIComboBox objects for User Interface page.

Location:

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

Files:

• editors/UIVisualStateEditor.cpp (modified) (4 diffs)
• editors/UIVisualStateEditor.h (modified) (2 diffs)
• machine/UIMachineSettingsInterface.cpp (modified) (2 diffs)

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

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QComboBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
@@ -22 +23 @@
 
 /* GUI includes: */
-#include "QIComboBox.h"
 #include "UICommon.h"
 #include "UIConverter.h"
@@ -79 +79 @@
             m_pCombo->setItemText(i, gpConverter->toString(enmType));
         }
+        m_pCombo->setToolTip(tr("Selects the visual state. If machine is running it will be applied "
+                                "as soon as possible, otherwise desired one will be defined."));
     }
 }
@@ -108 +110 @@
         {
             /* Create combo: */
-            m_pCombo = new QIComboBox(this);
+            m_pCombo = new QComboBox(this);
             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());
-                connect(m_pCombo, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+                    m_pLabel->setBuddy(m_pCombo);
+                connect(m_pCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                         this, &UIVisualStateEditor::sltHandleCurrentIndexChanged);
                 pComboLayout->addWidget(m_pCombo);

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

@@ -32 +32 @@
 
 /* Forward declarations: */
+class QComboBox;
 class QLabel;
-class QIComboBox;
 
 /** QWidget subclass used as a visual state editor. */
@@ -92 +92 @@
 
     /** Holds the label instance. */
-    QLabel     *m_pLabel;
+    QLabel    *m_pLabel;
     /** Holds the combo instance. */
-    QIComboBox *m_pCombo;
+    QComboBox *m_pCombo;
 };
 

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

@@ -300 +300 @@
 {
     m_pEditorMenuBar->setToolTip(tr("Allows to modify VM menu-bar contents."));
-    m_pLabelVisualState->setText(tr("Visual State:"));
-    m_pEditorVisualState->setToolTip(tr("Selects the visual state. If machine is running it will be applied as soon as possible, "
-                                        "otherwise desired one will be defined."));
+    m_pLabelVisualState->setText(tr("&Visual State:"));
     m_pLabelMiniToolBar->setText(tr("Mini ToolBar:"));
     m_pCheckBoxShowMiniToolBar->setToolTip(tr("When checked, show the Mini ToolBar in full-screen and seamless modes."));
@@ -374 +372 @@
         m_pEditorVisualState = new UIVisualStateEditor(this);
         if (m_pEditorVisualState)
+        {
+            if (m_pLabelVisualState)
+                m_pLabelVisualState->setBuddy(m_pEditorVisualState);
             pLayoutMain->addWidget(m_pEditorVisualState, 1, 1);
+        }
 
         /* Prepare mini-toolbar label: */