Changeset 94530 in vbox

Timestamp:

Apr 8, 2022 12:20:59 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:6899: Machine settings: Network page accessibility improvements (part 2); A bit of cleanup for attachment type editor.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/details/UIDetailsElement.cpp (modified) (1 diff)
• settings/editors/UINetworkAttachmentEditor.cpp (modified) (10 diffs)
• settings/editors/UINetworkAttachmentEditor.h (modified) (2 diffs)
• settings/machine/UIMachineSettingsNetwork.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -1145 +1145 @@
     {
         /* Prepare editor: */
-        UINetworkAttachmentEditor *pEditor = new UINetworkAttachmentEditor(pPopup, true /* with label */);
+        UINetworkAttachmentEditor *pEditor = new UINetworkAttachmentEditor(pPopup);
         if (pEditor)
         {

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

@@ -43 +43 @@
 QString UINetworkAttachmentEditor::s_strEmptyItemId = QString("#empty#");
 
-UINetworkAttachmentEditor::UINetworkAttachmentEditor(QWidget *pParent /* = 0 */, bool fWithLabels /* = false */)
+UINetworkAttachmentEditor::UINetworkAttachmentEditor(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
-    , m_fWithLabels(fWithLabels)
     , m_enmRestrictedNetworkAttachmentTypes(UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_Invalid)
     , m_enmType(KNetworkAttachmentType_Max)
@@ -58 +57 @@
 void UINetworkAttachmentEditor::setValueType(KNetworkAttachmentType enmType)
 {
-    /* Make sure combo is there: */
-    if (!m_pComboType)
-        return;
-    /* Make sure type is changed: */
-    if (m_enmType == enmType)
-        return;
-
-    /* Remember requested type: */
-    m_enmType = enmType;
-    /* Repopulate finally, supported values might change: */
-    populateTypeCombo();
+    if (m_enmType != enmType)
+    {
+        m_enmType = enmType;
+        populateTypeCombo();
+    }
 }
 
@@ -91 +84 @@
     m_name[enmType] = strName;
 
-    /* Make sure combo is there: */
-    if (!m_pComboName)
-        return;
-
     /* If value type is the same, update the combo as well: */
     if (valueType() == enmType)
     {
-        const int iIndex = m_pComboName->findText(strName);
-        if (iIndex != -1)
-            m_pComboName->setCurrentIndex(iIndex);
+        /* Make sure combo is there: */
+        if (m_pComboName)
+        {
+            const int iIndex = m_pComboName->findText(strName);
+            if (iIndex != -1)
+                m_pComboName->setCurrentIndex(iIndex);
+        }
     }
 }
@@ -194 +187 @@
         {
             const KNetworkAttachmentType enmType = m_pComboType->itemData(i).value<KNetworkAttachmentType>();
-            const QString strName = gpConverter->toString(enmType);
-            m_pComboType->setItemData(i, strName, Qt::ToolTipRole);
-            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."));
+            m_pComboType->setItemText(i, gpConverter->toString(enmType));
+        }
+        m_pComboType->setToolTip(tr("Holds how this virtual adapter is attached to the real network of the Host OS."));
+    }
 
     /* Translate name combo: */
@@ -273 +260 @@
         pMainLayout->setContentsMargins(0, 0, 0, 0);
 
-        int iColumn = 0;
-
         /* Create type label: */
-        if (m_fWithLabels)
-        {
-            m_pLabelType = new QLabel(this);
+        m_pLabelType = new QLabel(this);
+        if (m_pLabelType)
+        {
             m_pLabelType->setAlignment(Qt::AlignVCenter | Qt::AlignRight);
-        }
-        if (m_pLabelType)
-            pMainLayout->addWidget(m_pLabelType, 0, iColumn++);
-
+            pMainLayout->addWidget(m_pLabelType, 0, 0);
+        }
         /* Create type combo layout: */
         QHBoxLayout *pComboLayout = new QHBoxLayout;
@@ -303 +286 @@
 
             /* Add combo-layout into main-layout: */
-            pMainLayout->addLayout(pComboLayout, 0, iColumn++);
-        }
-
-        iColumn = 0;
+            pMainLayout->addLayout(pComboLayout, 0, 1);
+        }
 
         /* Create name label: */
-        if (m_fWithLabels)
-        {
-            m_pLabelName = new QLabel(this);
-            m_pLabelName->setAlignment(Qt::AlignVCenter | Qt::AlignRight);
-        }
+        m_pLabelName = new QLabel(this);
+        m_pLabelName->setAlignment(Qt::AlignVCenter | Qt::AlignRight);
         if (m_pLabelName)
-            pMainLayout->addWidget(m_pLabelName, 1, iColumn++);
-
+            pMainLayout->addWidget(m_pLabelName, 1, 0);
         /* Create name combo: */
         m_pComboName = new QComboBox(this);
@@ -328 +305 @@
             connect(m_pComboName, &QComboBox::editTextChanged,
                     this, &UINetworkAttachmentEditor::sltHandleCurrentNameChanged);
-            pMainLayout->addWidget(m_pComboName, 1, iColumn++);
+            pMainLayout->addWidget(m_pComboName, 1, 1);
         }
     }
@@ -354 +331 @@
     CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
     QVector<KNetworkAttachmentType> supportedTypes = comProperties.GetSupportedNetworkAttachmentTypes();
-    /* Take currently requested type into account if it's sane: */
+    /* Take currently requested type into account if it's different from initial one: */
     if (!supportedTypes.contains(m_enmType) && m_enmType != KNetworkAttachmentType_Max)
         supportedTypes.prepend(m_enmType);
@@ -367 +344 @@
         m_pComboType->insertItem(iAttachmentTypeIndex, gpConverter->toString(enmType));
         m_pComboType->setItemData(iAttachmentTypeIndex, QVariant::fromValue(enmType));
-        m_pComboType->setItemData(iAttachmentTypeIndex, m_pComboType->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
         ++iAttachmentTypeIndex;
     }
@@ -450 +426 @@
     {
         case KNetworkAttachmentType_Bridged:
-            m_pComboName->setWhatsThis(tr("Selects the network adapter on the host system that traffic "
-                                          "to and from this network card will go through."));
+            m_pComboName->setToolTip(tr("Holds the network adapter on the host system that traffic "
+                                        "to and from this network card will go through."));
             break;
         case KNetworkAttachmentType_Internal:
-            m_pComboName->setWhatsThis(tr("Holds the name of the internal network that this network card "
-                                          "will be connected to. You can create a new internal network by "
-                                          "choosing a name which is not used by any other network cards "
-                                          "in this virtual machine or others."));
+            m_pComboName->setToolTip(tr("Holds the name of the internal network that this network card "
+                                        "will be connected to. You can create a new internal network by "
+                                        "choosing a name which is not used by any other network cards "
+                                        "in this virtual machine or others."));
             break;
         case KNetworkAttachmentType_HostOnly:
-            m_pComboName->setWhatsThis(tr("Selects the virtual network adapter on the host system that traffic "
-                                          "to and from this network card will go through. "
-                                          "You can create and remove adapters using the global network "
-                                          "settings in the virtual machine manager window."));
+            m_pComboName->setToolTip(tr("Holds the virtual network adapter on the host system that traffic "
+                                        "to and from this network card will go through. "
+                                        "You can create and remove adapters using the global network "
+                                        "settings in the virtual machine manager window."));
             break;
         case KNetworkAttachmentType_Generic:
-            m_pComboName->setWhatsThis(tr("Selects the driver to be used with this network card."));
+            m_pComboName->setToolTip(tr("Holds the driver to be used with this network card."));
             break;
         case KNetworkAttachmentType_NATNetwork:
-            m_pComboName->setWhatsThis(tr("Holds the name of the NAT network that this network card "
-                                          "will be connected to. You can create and remove networks "
-                                          "using the Network Manager tool in the virtual machine "
-                                          "manager window."));
+            m_pComboName->setToolTip(tr("Holds the name of the NAT network that this network card "
+                                        "will be connected to. You can create and remove networks "
+                                        "using the Network Manager tool in the virtual machine "
+                                        "manager window."));
             break;
 #ifdef VBOX_WITH_CLOUD_NET
         case KNetworkAttachmentType_Cloud:
-            m_pComboName->setWhatsThis(tr("(experimental) Holds the name of the cloud network that this network card "
-                                          "will be connected to. You can add and remove networks "
-                                          "using the Cloud Profile Manager tool in the virtual machine "
-                                          "manager window."));
+            m_pComboName->setToolTip(tr("(experimental) Holds the name of the cloud network that this network card "
+                                        "will be connected to. You can add and remove networks "
+                                        "using the Cloud Profile Manager tool in the virtual machine "
+                                        "manager window."));
             break;
 #endif /* VBOX_WITH_CLOUD_NET */
 #ifdef VBOX_WITH_VMNET
         case KNetworkAttachmentType_HostOnlyNetwork:
-            m_pComboName->setWhatsThis(tr("Holds the name of the host-only network that this network card "
-                                          "will be connected to. You can add and remove networks "
-                                          "using the Network Manager tool in the virtual machine "
-                                          "manager window."));
+            m_pComboName->setToolTip(tr("Holds the name of the host-only network that this network card "
+                                        "will be connected to. You can add and remove networks "
+                                        "using the Network Manager tool in the virtual machine "
+                                        "manager window."));
             break;
 #endif /* VBOX_WITH_VMNET */
         default:
-            m_pComboName->setWhatsThis(QString());
+            m_pComboName->setToolTip(QString());
             break;
     }

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

@@ -54 +54 @@
 public:
 
-    /** Constructs editor passing @a pParent to the base-class.
-      * @param  fWithLabels  Brings whether we should add labels ourselves. */
-    UINetworkAttachmentEditor(QWidget *pParent = 0, bool fWithLabels = false);
+    /** Constructs editor passing @a pParent to the base-class. */
+    UINetworkAttachmentEditor(QWidget *pParent = 0);
 
     /** Defines value @a enmType. */
@@ -120 +119 @@
 
     /** Holds the empty item data id. */
-    static QString s_strEmptyItemId;
-
-    /** Holds whether descriptive labels should be created. */
-    bool  m_fWithLabels;
+    static QString  s_strEmptyItemId;
 
     /** Holds the attachment type restrictions. */

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

@@ -643 +643 @@
 
                 /* Prepare attachment type editor: */
-                m_pEditorAttachmentType = new UINetworkAttachmentEditor(m_pWidgetAdapterSettings, true);
+                m_pEditorAttachmentType = new UINetworkAttachmentEditor(m_pWidgetAdapterSettings);
                 if (m_pEditorAttachmentType)
                     pLayoutAdapterSettings->addWidget(m_pEditorAttachmentType);