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

Timestamp:

May 3, 2024 6:15:42 PM (12 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163039

Message:

FE/Qt: bugref:10681: Accessibility fixes for Export Appliance wizard; Switching from QListWidget to own QIListWidget, using proper what's this for the list.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance

Files:

• UIWizardExportAppPageExpert.cpp (modified) (5 diffs)
• UIWizardExportAppPageExpert.h (modified) (2 diffs)
• UIWizardExportAppPageVMs.cpp (modified) (12 diffs)
• UIWizardExportAppPageVMs.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp

@@ -34 +34 @@
 #include <QLabel>
 #include <QLineEdit>
-#include <QListWidget>
 #include <QPushButton>
 #include <QRadioButton>
@@ -43 +42 @@
 /* GUI includes: */
 #include "QIComboBox.h"
+#include "QIListWidget.h"
 #include "QIToolButton.h"
 #include "UICommon.h"
@@ -108 +108 @@
         {
             /* Create VM selector: */
-            m_pVMSelector = new QListWidget(m_pToolBox);
+            m_pVMSelector = new QIListWidget(m_pToolBox);
             if (m_pVMSelector)
             {
@@ -407 +407 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileChanged,
             this, &UIWizardExportAppPageExpert::sltHandleFormatComboChange);
-    connect(m_pVMSelector, &QListWidget::itemSelectionChanged,
+    connect(m_pVMSelector, &QIListWidget::itemSelectionChanged,
             this, &UIWizardExportAppPageExpert::sltHandleVMItemSelectionChanged);
     connect(m_pFileSelector, &UIEmptyFilePathSelector::pathChanged,
@@ -443 +443 @@
     m_pToolBox->setPageTitle(1, UIWizardExportApp::tr("Format &settings"));
     m_pToolBox->setPageTitle(2, UIWizardExportApp::tr("&Appliance settings"));
+
+    /* Translate Machine list: */
+    m_pVMSelector->setWhatsThis(UIWizardExportApp::tr("Contains a list of Virtual Machines"));
 
     /* Translate File selector: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h

@@ -50 +50 @@
 class QGroupBox;
 class QLabel;
-class QListWidget;
+class QIListWidget;
 class QStackedWidget;
 class QIComboBox;
@@ -146 +146 @@
 
     /** Holds the VM selector instance. */
-    QListWidget *m_pVMSelector;
+    QIListWidget *m_pVMSelector;
 
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageVMs.cpp

@@ -28 +28 @@
 /* Qt includes: */
 #include <QApplication>
-#include <QListWidget>
 #include <QVBoxLayout>
 
 /* GUI includes: */
+#include "QIListWidget.h"
 #include "QIRichTextLabel.h"
 #include "UICommon.h"
@@ -47 +47 @@
 
 
-/** QListWidgetItem subclass for Export Appliance wizard VM list. */
-class UIVMListWidgetItem : public QListWidgetItem
+/** QIListWidgetItem subclass for Export Appliance wizard VM list. */
+class UIVMListWidgetItem : public QIListWidgetItem
 {
 public:
@@ -55 +55 @@
       * @param  strUuid       Brings the machine ID.
       * @param  fInSaveState  Brings whether machine is in Saved state. */
-    UIVMListWidgetItem(QPixmap &pixIcon, QString &strText, QUuid uUuid, bool fInSaveState, QListWidget *pParent)
-        : QListWidgetItem(pixIcon, strText, pParent)
+    UIVMListWidgetItem(QPixmap &pixIcon, QString &strText, QUuid uUuid, bool fInSaveState, QIListWidget *pParent)
+        : QIListWidgetItem(pixIcon, strText, pParent)
         , m_uUuid(uUuid)
         , m_fInSaveState(fInSaveState)
@@ -62 +62 @@
 
     /** Returns whether this item is less than @a other. */
-    bool operator<(const QListWidgetItem &other) const RT_OVERRIDE RT_FINAL
+    bool operator<(const QIListWidgetItem &other) const
     {
         return text().toLower() < other.text().toLower();
@@ -85 +85 @@
 *********************************************************************************************************************************/
 
-void UIWizardExportAppVMs::populateVMItems(QListWidget *pVMSelector, const QStringList &selectedVMNames)
+void UIWizardExportAppVMs::populateVMItems(QIListWidget *pVMSelector, const QStringList &selectedVMNames)
 {
     /* Add all VM items into VM selector: */
@@ -112 +112 @@
             pixIcon = QPixmap(":/os_other.png").scaled(iIconMetric, iIconMetric, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
         }
-        QListWidgetItem *pItem = new UIVMListWidgetItem(pixIcon, strName, uUuid, fInSaveState, pVMSelector);
+        QIListWidgetItem *pItem = new UIVMListWidgetItem(pixIcon, strName, uUuid, fInSaveState, pVMSelector);
         if (!fEnabled)
             pItem->setFlags(Qt::ItemFlags());
@@ -122 +122 @@
     foreach (const QString &strSelectedVMName, selectedVMNames)
     {
-        const QList<QListWidgetItem*> list = pVMSelector->findItems(strSelectedVMName, Qt::MatchExactly);
+        const QList<QIListWidgetItem*> list = pVMSelector->findItems(strSelectedVMName, Qt::MatchExactly);
         if (list.size() > 0)
         {
@@ -133 +133 @@
 }
 
-void UIWizardExportAppVMs::refreshSavedMachines(QStringList &savedMachines, QListWidget *pVMSelector)
+void UIWizardExportAppVMs::refreshSavedMachines(QStringList &savedMachines, QIListWidget *pVMSelector)
 {
     savedMachines.clear();
-    foreach (QListWidgetItem *pItem, pVMSelector->selectedItems())
+    foreach (QIListWidgetItem *pItem, pVMSelector->selectedItems())
         if (static_cast<UIVMListWidgetItem*>(pItem)->isInSaveState())
             savedMachines << pItem->text();
 }
 
-QStringList UIWizardExportAppVMs::machineNames(QListWidget *pVMSelector)
+QStringList UIWizardExportAppVMs::machineNames(QIListWidget *pVMSelector)
 {
     /* Prepare list: */
     QStringList names;
     /* Iterate over all the selected items: */
-    foreach (QListWidgetItem *pItem, pVMSelector->selectedItems())
+    foreach (QIListWidgetItem *pItem, pVMSelector->selectedItems())
         names << pItem->text();
     /* Return result list: */
@@ -152 +152 @@
 }
 
-QList<QUuid> UIWizardExportAppVMs::machineIDs(QListWidget *pVMSelector)
+QList<QUuid> UIWizardExportAppVMs::machineIDs(QIListWidget *pVMSelector)
 {
     /* Prepare list: */
     QList<QUuid> ids;
     /* Iterate over all the selected items: */
-    foreach (QListWidgetItem *pItem, pVMSelector->selectedItems())
+    foreach (QIListWidgetItem *pItem, pVMSelector->selectedItems())
         ids.append(static_cast<UIVMListWidgetItem*>(pItem)->uuid());
     /* Return result list: */
@@ -184 +184 @@
 
         /* Prepare VM selector: */
-        m_pVMSelector = new QListWidget(this);
+        m_pVMSelector = new QIListWidget(this);
         if (m_pVMSelector)
         {
@@ -194 +194 @@
 
     /* Setup connections: */
-    connect(m_pVMSelector, &QListWidget::itemSelectionChanged,
+    connect(m_pVMSelector, &QIListWidget::itemSelectionChanged,
             this, &UIWizardExportAppPageVMs::sltHandleVMItemSelectionChanged);
 }
@@ -212 +212 @@
                                                 "You can select more than one. Please note that these machines have to be "
                                                 "turned off before they can be exported.</p>"));
+
+    /* Translate Machine list: */
+    m_pVMSelector->setWhatsThis(UIWizardExportApp::tr("Contains a list of Virtual Machines"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageVMs.h

@@ -39 +39 @@
 
 /* Forward declarations: */
-class QListWidget;
+class QIListWidget;
 class QIRichTextLabel;
 class UIWizardExportApp;
@@ -47 +47 @@
 {
     /** Populates @a pVMSelector with items on the basis of passed @a selectedVMNames. */
-    void populateVMItems(QListWidget *pVMSelector, const QStringList &selectedVMNames);
+    void populateVMItems(QIListWidget *pVMSelector, const QStringList &selectedVMNames);
 
     /** Refresh a list of saved machines selected in @a pVMSelector. */
-    void refreshSavedMachines(QStringList &savedMachines, QListWidget *pVMSelector);
+    void refreshSavedMachines(QStringList &savedMachines, QIListWidget *pVMSelector);
 
     /** Returns a list of machine names selected in @a pVMSelector. */
-    QStringList machineNames(QListWidget *pVMSelector);
+    QStringList machineNames(QIListWidget *pVMSelector);
     /** Returns a list of machine IDs selected in @a pVMSelector. */
-    QList<QUuid> machineIDs(QListWidget *pVMSelector);
+    QList<QUuid> machineIDs(QIListWidget *pVMSelector);
 }
 
@@ -103 +103 @@
 
     /** Holds the VM selector instance. */
-    QListWidget *m_pVMSelector;
+    QIListWidget *m_pVMSelector;
 };