Changeset 94534 in vbox for trunk

Timestamp:

Apr 8, 2022 6:18:43 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: bugref:6899: Machine settings: Network page accessibility improvements (part 3); Layout and NLS stuff for attachment type and advanced network options editor.

Location:

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

Files:

• editors/UIMachineNetworkFeaturesEditor.cpp (modified) (2 diffs)
• editors/UINetworkAttachmentEditor.cpp (modified) (7 diffs)
• editors/UINetworkAttachmentEditor.h (modified) (3 diffs)
• machine/UIMachineSettingsNetwork.cpp (modified) (1 diff)

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

@@ -246 +246 @@
             m_pComboAdapterType->setItemText(i, gpConverter->toString(enmType));
         }
-        m_pComboAdapterType->setToolTip(tr("Selects the type of the virtual network adapter. Depending on this value, VirtualBox "
+        m_pComboAdapterType->setToolTip(tr("Holds the type of the virtual network adapter. Depending on this value, VirtualBox "
                                            "will provide different network hardware to the virtual machine."));
     }
@@ -259 +259 @@
             m_pComboPromiscuousMode->setItemText(i, gpConverter->toString(enmType));
         }
-        m_pComboPromiscuousMode->setToolTip(tr("Selects the promiscuous mode policy of the network adapter when attached to an "
+        m_pComboPromiscuousMode->setToolTip(tr("Holds the promiscuous mode policy of the network adapter when attached to an "
                                                "internal network, host only network or a bridge."));
     }

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

@@ -47 +47 @@
     , m_enmRestrictedNetworkAttachmentTypes(UIExtraDataMetaDefs::DetailsElementOptionTypeNetwork_Invalid)
     , m_enmType(KNetworkAttachmentType_Max)
+    , m_pLayout(0)
     , m_pLabelType(0)
     , m_pComboType(0)
@@ -100 +101 @@
 {
     return m_name.value(enmType);
+}
+
+int UINetworkAttachmentEditor::minimumLabelHorizontalHint() const
+{
+    int iMinimumLabelHorizontalHint = 0;
+    if (m_pLabelType)
+        iMinimumLabelHorizontalHint = qMax(iMinimumLabelHorizontalHint, m_pLabelType->minimumSizeHint().width());
+    if (m_pLabelName)
+        iMinimumLabelHorizontalHint = qMax(iMinimumLabelHorizontalHint, m_pLabelName->minimumSizeHint().width());
+    return iMinimumLabelHorizontalHint;
+}
+
+void UINetworkAttachmentEditor::setMinimumLayoutIndent(int iIndent)
+{
+    if (m_pLayout)
+        m_pLayout->setColumnMinimumWidth(0, iIndent);
 }
 
@@ -255 +272 @@
 
     /* Create main layout: */
-    QGridLayout *pMainLayout = new QGridLayout(this);
-    if (pMainLayout)
-    {
-        pMainLayout->setContentsMargins(0, 0, 0, 0);
+    m_pLayout = new QGridLayout(this);
+    if (m_pLayout)
+    {
+        m_pLayout->setContentsMargins(0, 0, 0, 0);
 
         /* Create type label: */
@@ -265 +282 @@
         {
             m_pLabelType->setAlignment(Qt::AlignVCenter | Qt::AlignRight);
-            pMainLayout->addWidget(m_pLabelType, 0, 0);
+            m_pLayout->addWidget(m_pLabelType, 0, 0);
         }
         /* Create type combo layout: */
@@ -286 +303 @@
 
             /* Add combo-layout into main-layout: */
-            pMainLayout->addLayout(pComboLayout, 0, 1);
+            m_pLayout->addLayout(pComboLayout, 0, 1);
         }
 
@@ -293 +310 @@
         m_pLabelName->setAlignment(Qt::AlignVCenter | Qt::AlignRight);
         if (m_pLabelName)
-            pMainLayout->addWidget(m_pLabelName, 1, 0);
+            m_pLayout->addWidget(m_pLabelName, 1, 0);
         /* Create name combo: */
         m_pComboName = new QComboBox(this);
@@ -305 +322 @@
             connect(m_pComboName, &QComboBox::editTextChanged,
                     this, &UINetworkAttachmentEditor::sltHandleCurrentNameChanged);
-            pMainLayout->addWidget(m_pComboName, 1, 1);
+            m_pLayout->addWidget(m_pComboName, 1, 1);
         }
     }

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

@@ -35 +35 @@
 /* Forward declarations: */
 class QComboBox;
+class QGridLayout;
 class QLabel;
 
@@ -68 +69 @@
     /** Returns current name for specified @a enmType. */
     QString valueName(KNetworkAttachmentType enmType) const;
+
+    /** Returns minimum layout hint. */
+    int minimumLabelHorizontalHint() const;
+    /** Defines minimum layout @a iIndent. */
+    void setMinimumLayoutIndent(int iIndent);
 
     /** Returns bridged adapter list. */
@@ -132 +138 @@
     KNetworkAttachmentType  m_enmType;
 
+    /** Holds the main layout instance. */
+    QGridLayout *m_pLayout;
     /** Holds the type label instance. */
-    QLabel    *m_pLabelType;
+    QLabel      *m_pLabelType;
     /** Holds the type combo instance. */
-    QComboBox *m_pComboType;
+    QComboBox   *m_pComboType;
     /** Holds the name label instance. */
-    QLabel    *m_pLabelName;
+    QLabel      *m_pLabelName;
     /** Holds the name combo instance. */
-    QComboBox *m_pComboName;
+    QComboBox   *m_pComboName;
 };
 

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

@@ -551 +551 @@
     /* Reapply attachment info: */
     sltHandleAttachmentTypeChange();
+
+    /* These editors have own labels, but we want them to be properly layouted according to each other: */
+    int iMinimumLayoutHint = 0;
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorAttachmentType->minimumLabelHorizontalHint());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorNetworkFeatures->minimumLabelHorizontalHint());
+    m_pEditorAttachmentType->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pEditorNetworkFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
 }