Changeset 94056 in vbox for trunk/src/VBox

Timestamp:

Mar 2, 2022 2:10:40 PM (3 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• editors/UIGraphicsControllerEditor.cpp (modified) (4 diffs)
• editors/UIGraphicsControllerEditor.h (modified) (2 diffs)
• machine/UIMachineSettingsDisplay.cpp (modified) (2 diffs)

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

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QComboBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
@@ -22 +23 @@
 
 /* GUI includes: */
-#include "QIComboBox.h"
 #include "UICommon.h"
 #include "UIConverter.h"
@@ -76 +76 @@
             m_pCombo->setItemText(i, gpConverter->toString(enmType));
         }
+        m_pCombo->setToolTip(tr("Selects the graphics adapter type the virtual machine will use."));
     }
 }
@@ -105 +106 @@
         {
             /* 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, &UIGraphicsControllerEditor::sltHandleCurrentIndexChanged);
                 pComboLayout->addWidget(m_pCombo);

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

@@ -33 +33 @@
 
 /* Forward declarations: */
+class QComboBox;
 class QLabel;
-class QIComboBox;
 
 /** QWidget subclass used as a graphics controller editor. */
@@ -87 +87 @@
 
     /** 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/UIMachineSettingsDisplay.cpp

@@ -786 +786 @@
     m_pEditorScaleFactor->setToolTip(tr("Controls the guest screen scale factor."));
     m_pLabelGraphicsController->setText(tr("&Graphics Controller:"));
-    m_pEditorGraphicsController->setToolTip(tr("Selects the graphics adapter type the virtual machine will use."));
     m_pLabelAcceleration->setText(tr("Acceleration:"));
     m_pCheckbox3D->setToolTip(tr("When checked, the virtual machine will be given access "
@@ -1213 +1212 @@
             {
                 if (m_pLabelGraphicsController)
-                    m_pLabelGraphicsController->setBuddy(m_pEditorGraphicsController->focusProxy());
+                    m_pLabelGraphicsController->setBuddy(m_pEditorGraphicsController);
                 pLayoutScreen->addWidget(m_pEditorGraphicsController, 6, 1, 1, 2);
             }