Changeset 104558 in vbox

Timestamp:

May 8, 2024 2:49:25 PM (7 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10671: Accessibility fixes for Add Cloud VM wizard; Expert mode should have proper labels for text-fields it uses, it's required for JAWS screen-reader.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm

Files:

• UIWizardAddCloudVMPageExpert.cpp (modified) (5 diffs)
• UIWizardAddCloudVMPageExpert.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageExpert.cpp

@@ -27 +27 @@
 
 /* Qt includes: */
+#include <QGridLayout>
 #include <QHBoxLayout>
 #include <QHeaderView>
+#include <QLabel>
 #include <QListWidget>
 #include <QPushButton>
@@ -51 +53 @@
 UIWizardAddCloudVMPageExpert::UIWizardAddCloudVMPageExpert()
     : m_pToolBox(0)
+    , m_pLayoutProvider(0)
     , m_pProviderLabel(0)
     , m_pProviderComboBox(0)
@@ -77 +80 @@
                     pLayoutLocation->setContentsMargins(0, 0, 0, 0);
 
-                    /* Prepare provider combo-box: */
-                    m_pProviderComboBox = new QIComboBox(pWidgetLocation);
-                    if (m_pProviderComboBox)
-                        pLayoutLocation->addWidget(m_pProviderComboBox);
-
-                    /* Prepare profile layout: */
-                    QHBoxLayout *pLayoutProfile = new QHBoxLayout;
-                    if (pLayoutProfile)
+                    /* Prepare provider layout: */
+                    m_pLayoutProvider = new QGridLayout;
+                    if (m_pLayoutProvider)
                     {
-                        pLayoutProfile->setContentsMargins(0, 0, 0, 0);
-                        pLayoutProfile->setSpacing(1);
-
-                        /* Prepare profile combo-box: */
-                        m_pProfileComboBox = new QIComboBox(pWidgetLocation);
-                        if (m_pProfileComboBox)
-                            pLayoutProfile->addWidget(m_pProfileComboBox);
-
-                        /* Prepare profile tool-button: */
-                        m_pProfileToolButton = new QIToolButton(pWidgetLocation);
-                        if (m_pProfileToolButton)
+                        m_pLayoutProvider->setContentsMargins(0, 0, 0, 0);
+                        m_pLayoutProvider->setColumnStretch(0, 0);
+                        m_pLayoutProvider->setColumnStretch(1, 1);
+
+                        /* Prepare provider label: */
+                        m_pProviderLabel = new QLabel(this);
+                        if (m_pProviderLabel)
+                            m_pLayoutProvider->addWidget(m_pProviderLabel, 0, 0, Qt::AlignRight);
+
+                        /* Prepare provider combo-box: */
+                        m_pProviderComboBox = new QIComboBox(pWidgetLocation);
+                        if (m_pProviderComboBox)
                         {
-                            m_pProfileToolButton->setIcon(UIIconPool::iconSet(":/cloud_profile_manager_16px.png",
-                                                                              ":/cloud_profile_manager_disabled_16px.png"));
-                            pLayoutProfile->addWidget(m_pProfileToolButton);
+                            m_pProviderLabel->setBuddy(m_pProviderComboBox);
+                            m_pLayoutProvider->addWidget(m_pProviderComboBox, 0, 1);
                         }
 
+                        /* Prepare profile label: */
+                        m_pProfileLabel = new QLabel(this);
+                        if (m_pProfileLabel)
+                            m_pLayoutProvider->addWidget(m_pProfileLabel, 1, 0, Qt::AlignRight);
+
+                        /* Prepare profile layout: */
+                        QHBoxLayout *pLayoutProfile = new QHBoxLayout;
+                        if (pLayoutProfile)
+                        {
+                            pLayoutProfile->setContentsMargins(0, 0, 0, 0);
+                            pLayoutProfile->setSpacing(1);
+
+                            /* Prepare profile combo-box: */
+                            m_pProfileComboBox = new QIComboBox(pWidgetLocation);
+                            if (m_pProfileComboBox)
+                            {
+                                m_pProfileLabel->setBuddy(m_pProfileComboBox);
+                                pLayoutProfile->addWidget(m_pProfileComboBox);
+                            }
+
+                            /* Prepare profile tool-button: */
+                            m_pProfileToolButton = new QIToolButton(pWidgetLocation);
+                            if (m_pProfileToolButton)
+                            {
+                                m_pProfileToolButton->setIcon(UIIconPool::iconSet(":/cloud_profile_manager_16px.png",
+                                                                                  ":/cloud_profile_manager_disabled_16px.png"));
+                                pLayoutProfile->addWidget(m_pProfileToolButton);
+                            }
+
+                            /* Add into layout: */
+                            m_pLayoutProvider->addLayout(pLayoutProfile, 1, 1);
+                        }
+
                         /* Add into layout: */
-                        pLayoutLocation->addLayout(pLayoutProfile);
+                        pLayoutLocation->addLayout(m_pLayoutProvider);
                     }
                 }
@@ -174 +205 @@
     }
 
-    /* Translate profile stuff: */
-    if (m_pProfileToolButton)
-    {
-        m_pProfileToolButton->setText(UIWizardAddCloudVM::tr("Cloud Profile Manager"));
-        m_pProfileToolButton->setToolTip(UIWizardAddCloudVM::tr("Opens cloud profile manager..."));
-    }
-
+    /* Translate provider label: */
+    if (m_pProviderLabel)
+        m_pProviderLabel->setText(UIWizardAddCloudVM::tr("&Provider:"));
     /* Translate received values of Provider combo-box.
      * We are enumerating starting from 0 for simplicity: */
@@ -188 +215 @@
         for (int i = 0; i < m_pProviderComboBox->count(); ++i)
             m_pProviderComboBox->setItemText(i, m_pProviderComboBox->itemData(i, ProviderData_Name).toString());
+    }
+
+    /* Translate profile stuff: */
+    if (m_pProfileLabel)
+        m_pProfileLabel->setText(UIWizardAddCloudVM::tr("P&rofile:"));
+    if (m_pProfileToolButton)
+    {
+        m_pProfileToolButton->setText(UIWizardAddCloudVM::tr("Cloud Profile Manager"));
+        m_pProfileToolButton->setToolTip(UIWizardAddCloudVM::tr("Opens cloud profile manager..."));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageExpert.h

@@ -36 +36 @@
 
 /* Forward declarations: */
+class QGridLayout;
+class QLabel;
 class UIToolBox;
 class UIWizardAddCloudVM;
@@ -85 +87 @@
     UIToolBox *m_pToolBox;
 
-    /** Holds the provider type label instance. */
-    QLabel      *m_pProviderLabel;
-    /** Holds the provider type combo-box instance. */
-    QIComboBox  *m_pProviderComboBox;
-
+    /** Holds the source layout instance. */
+    QGridLayout  *m_pLayoutProvider;
+    /** Holds the source type label instance. */
+    QLabel       *m_pProviderLabel;
+    /** Holds the source type combo-box instance. */
+    QIComboBox   *m_pProviderComboBox;
     /** Holds the profile label instance. */
     QLabel       *m_pProfileLabel;