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

Timestamp:

Mar 2, 2022 2:26:21 PM (3 years ago)

Author:

vboxsync

Message:

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

Location:

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

Files:

• editors/UINetworkAttachmentEditor.cpp (modified) (6 diffs)
• editors/UINetworkAttachmentEditor.h (modified) (3 diffs)
• machine/UIMachineSettingsNetwork.cpp (modified) (2 diffs)

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

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QComboBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
@@ -22 +23 @@
 
 /* GUI includes: */
-#include "QIComboBox.h"
 #include "UICommon.h"
 #include "UIConverter.h"
@@ -56 +56 @@
 }
 
-QWidget *UINetworkAttachmentEditor::focusProxy1() const
-{
-    return m_pComboType->focusProxy();
-}
-
-QWidget *UINetworkAttachmentEditor::focusProxy2() const
-{
-    return m_pComboName->focusProxy();
-}
-
 void UINetworkAttachmentEditor::setValueType(KNetworkAttachmentType enmType)
 {
@@ -208 +198 @@
             m_pComboType->setItemText(i, strName);
         }
-    }
+        m_pComboType->setToolTip(tr("Selects how this virtual adapter is attached to the real network of the Host OS."));
+    }
+
+    /* Translate name combo: */
+    if (m_pComboName)
+        m_pComboName->setToolTip(tr("Selects the network or adapter name associated with this virtual adapter."));
 
     /* Translate name combo: */
@@ -294 +289 @@
         {
             /* Create type combo: */
-            m_pComboType = new QIComboBox(this);
+            m_pComboType = new QComboBox(this);
             if (m_pComboType)
             {
-                setFocusProxy(m_pComboType->focusProxy());
                 if (m_pLabelType)
-                    m_pLabelType->setBuddy(m_pComboType->focusProxy());
-                connect(m_pComboType, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+                    m_pLabelType->setBuddy(m_pComboType);
+                connect(m_pComboType, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                         this, &UINetworkAttachmentEditor::sltHandleCurrentTypeChanged);
                 pComboLayout->addWidget(m_pComboType);
@@ -324 +318 @@
 
         /* Create name combo: */
-        m_pComboName = new QIComboBox(this);
+        m_pComboName = new QComboBox(this);
         if (m_pComboName)
         {
             if (m_pLabelName)
-                m_pLabelName->setBuddy(m_pComboName->focusProxy());
+                m_pLabelName->setBuddy(m_pComboName);
             m_pComboName->setInsertPolicy(QComboBox::NoInsert);
-            connect(m_pComboName, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+            connect(m_pComboName, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                     this, &UINetworkAttachmentEditor::sltHandleCurrentNameChanged);
-            connect(m_pComboName, &QIComboBox::editTextChanged,
+            connect(m_pComboName, &QComboBox::editTextChanged,
                     this, &UINetworkAttachmentEditor::sltHandleCurrentNameChanged);
             pMainLayout->addWidget(m_pComboName, 1, iColumn++);

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

@@ -34 +34 @@
 
 /* Forward declarations: */
+class QComboBox;
 class QLabel;
-class QIComboBox;
 
 /** QWidget subclass used as a network attachment editor. */
@@ -57 +57 @@
       * @param  fWithLabels  Brings whether we should add labels ourselves. */
     UINetworkAttachmentEditor(QWidget *pParent = 0, bool fWithLabels = false);
-
-    /** Returns focus proxy 1. */
-    QWidget *focusProxy1() const;
-    /** Returns focus proxy 2. */
-    QWidget *focusProxy2() const;
 
     /** Defines value @a enmType. */
@@ -142 +137 @@
 
     /** Holds the type label instance. */
-    QLabel     *m_pLabelType;
+    QLabel    *m_pLabelType;
     /** Holds the type combo instance. */
-    QIComboBox *m_pComboType;
+    QComboBox *m_pComboType;
     /** Holds the name label instance. */
-    QLabel     *m_pLabelName;
+    QLabel    *m_pLabelName;
     /** Holds the name combo instance. */
-    QIComboBox *m_pComboName;
+    QComboBox *m_pComboName;
 };
 

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

@@ -661 +661 @@
     m_pLabelAttachmentType->setText(tr("&Attached to:"));
     iFirstColumnWidth = qMax(iFirstColumnWidth, m_pLabelAttachmentType->minimumSizeHint().width());
-    m_pEditorAttachmentType->setToolTip(tr("Selects how this virtual adapter is attached to the real network of the Host OS."));
     m_pLabelNetworkName->setText(tr("&Name:"));
     iFirstColumnWidth = qMax(iFirstColumnWidth, m_pLabelNetworkName->minimumSizeHint().width());
@@ -840 +839 @@
                 {
                     if (m_pLabelAttachmentType)
-                        m_pLabelAttachmentType->setBuddy(m_pEditorAttachmentType->focusProxy1());
+                        m_pLabelAttachmentType->setBuddy(m_pEditorAttachmentType);
                     if (m_pLabelNetworkName)
-                        m_pLabelNetworkName->setBuddy(m_pEditorAttachmentType->focusProxy2());
+                        m_pLabelNetworkName->setBuddy(m_pEditorAttachmentType);
 
                     m_pLayoutAdapterSettings->addWidget(m_pEditorAttachmentType, 0, 1, 2, 3);