Changeset 95233 in vbox

Timestamp:

Jun 8, 2022 3:46:27 PM (3 years ago)

Author:

vboxsync

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

151762

Message:

FE/Qt/Ds: bugref:6899: Machine settings: System page accessibility improvements (part 11); Reworking UIBootOrderEditor to be based on QITreeWidget instead of QListWidget; QITreeWidget is accessible comparing to previous base-class.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (1 diff)
• settings/editors/UIBootOrderEditor.cpp (modified) (18 diffs)
• settings/editors/UIBootOrderEditor.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.cpp

@@ -19 +19 @@
 #include <QApplication>
 #include <QDir>
+#include <QRegularExpression>
 
 /* GUI includes: */

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

@@ -18 +18 @@
 /* Qt includes: */
 #include <QGridLayout>
+#include <QHeaderView>
 #include <QLabel>
 #include <QRegularExpression>
@@ -28 +29 @@
 #include "UIIconPool.h"
 #include "QIToolBar.h"
+#include "QITreeWidget.h"
 
 /* COM includes: */
@@ -35 +37 @@
 
 
-/** QListWidgetItem extension for our UIBootListWidget. */
-class UIBootListWidgetItem : public QListWidgetItem
-{
+/** QITreeWidgetItem extension for our UIBootListWidget. */
+class UIBootListWidgetItem : public QITreeWidgetItem
+{
+    Q_OBJECT;
+
 public:
 
@@ -44 +48 @@
 
     /** Returns the item type. */
-    KDeviceType type() const;
+    KDeviceType deviceType() const;
 
     /** Performs item translation. */
@@ -56 +60 @@
 
 
-/** QListWidget subclass used as system settings boot-table. */
-class UIBootListWidget : public QIWithRetranslateUI<QListWidget>
+/** QITreeWidget subclass used as system settings boot-table. */
+class UIBootListWidget : public QIWithRetranslateUI<QITreeWidget>
 {
     Q_OBJECT;
@@ -63 +67 @@
 signals:
 
-    /** Notifies listeners about current table row changed.
-      * @note  Same as base-class currentRowChanged but in wider cases. */
-    void sigRowChanged(int iRow);
+    /** Notifies listeners about current table row changed. */
+    void sigRowChanged();
 
 public:
@@ -117 +120 @@
     : m_enmType(enmType)
 {
-    setCheckState(Qt::Unchecked);
+    setCheckState(0, Qt::Unchecked);
     switch(enmType)
     {
-        case KDeviceType_Floppy:   setIcon(UIIconPool::iconSet(":/fd_16px.png")); break;
-        case KDeviceType_DVD:      setIcon(UIIconPool::iconSet(":/cd_16px.png")); break;
-        case KDeviceType_HardDisk: setIcon(UIIconPool::iconSet(":/hd_16px.png")); break;
-        case KDeviceType_Network:  setIcon(UIIconPool::iconSet(":/nw_16px.png")); break;
+        case KDeviceType_Floppy:   setIcon(0, UIIconPool::iconSet(":/fd_16px.png")); break;
+        case KDeviceType_DVD:      setIcon(0, UIIconPool::iconSet(":/cd_16px.png")); break;
+        case KDeviceType_HardDisk: setIcon(0, UIIconPool::iconSet(":/hd_16px.png")); break;
+        case KDeviceType_Network:  setIcon(0, UIIconPool::iconSet(":/nw_16px.png")); break;
         default: break; /* Shut up, MSC! */
     }
@@ -129 +132 @@
 }
 
-KDeviceType UIBootListWidgetItem::type() const
+KDeviceType UIBootListWidgetItem::deviceType() const
 {
     return m_enmType;
@@ -136 +139 @@
 void UIBootListWidgetItem::retranslateUi()
 {
-    setText(gpConverter->toString(m_enmType));
+    setText(0, gpConverter->toString(m_enmType));
 }
 
@@ -145 +148 @@
 
 UIBootListWidget::UIBootListWidget(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QListWidget>(pParent)
+    : QIWithRetranslateUI<QITreeWidget>(pParent)
 {
     prepare();
@@ -159 +162 @@
     {
         UIBootListWidgetItem *pItem = new UIBootListWidgetItem(data.m_enmType);
-        pItem->setCheckState(data.m_fEnabled ? Qt::Checked : Qt::Unchecked);
-        addItem(pItem);
-    }
+        pItem->setCheckState(0, data.m_fEnabled ? Qt::Checked : Qt::Unchecked);
+        addTopLevelItem(pItem);
+    }
+
+    /* Make sure at least one is chosen: */
+    if (topLevelItemCount())
+        setCurrentItem(topLevelItem(0));
 
     /* Adjust table size after change: */
@@ -173 +180 @@
 
     /* Enumerate all the items we have: */
-    for (int i = 0; i < count(); ++i)
-    {
-        QListWidgetItem *pItem = item(i);
+    for (int i = 0; i < topLevelItemCount(); ++i)
+    {
+        QTreeWidgetItem *pItem = topLevelItem(i);
         UIBootItemData bootData;
-        bootData.m_enmType = static_cast<UIBootListWidgetItem*>(pItem)->type();
-        bootData.m_fEnabled = pItem->checkState() == Qt::Checked;
+        bootData.m_enmType = static_cast<UIBootListWidgetItem*>(pItem)->deviceType();
+        bootData.m_fEnabled = pItem->checkState(0) == Qt::Checked;
         bootItems << bootData;
     }
@@ -200 +207 @@
 void UIBootListWidget::retranslateUi()
 {
-    for (int i = 0; i < count(); ++i)
-        static_cast<UIBootListWidgetItem*>(item(i))->retranslateUi();
+    for (int i = 0; i < topLevelItemCount(); ++i)
+        static_cast<UIBootListWidgetItem*>(topLevelItem(i))->retranslateUi();
 
     adjustSizeToFitContent();
@@ -209 +216 @@
 {
     /* Call to base-class: */
-    QListWidget::dropEvent(pEvent);
+    QITreeWidget::dropEvent(pEvent);
     /* Separately notify listeners: */
-    emit sigRowChanged(currentRow());
+    emit sigRowChanged();
 }
 
@@ -248 +255 @@
         }
     }
-    return QListWidget::moveCursor(cursorAction, fModifiers);
+    return QITreeWidget::moveCursor(cursorAction, fModifiers);
 }
 
 void UIBootListWidget::prepare()
 {
+    header()->hide();
+    setRootIsDecorated(false);
     setDragDropMode(QAbstractItemView::InternalMove);
     setSelectionMode(QAbstractItemView::SingleSelection);
     setDropIndicatorShown(true);
-    setUniformItemSizes(true);
-    connect(this, &UIBootListWidget::currentRowChanged,
+    connect(this, &UIBootListWidget::currentItemChanged,
             this, &UIBootListWidget::sigRowChanged);
 }
@@ -266 +274 @@
     const int iW = iH;
     setFixedSize(sizeHintForColumn(0) + iW,
-                 sizeHintForRow(0) * count() + iH);
-}
-
-QModelIndex UIBootListWidget::moveItemTo(const QModelIndex &index, int row)
+                 sizeHintForRow(0) * topLevelItemCount() + iH);
+}
+
+QModelIndex UIBootListWidget::moveItemTo(const QModelIndex &index, int iRow)
 {
     /* Check validity: */
@@ -276 +284 @@
 
     /* Check sanity: */
-    if (row < 0 || row > model()->rowCount())
+    if (iRow < 0 || iRow > model()->rowCount())
         return QModelIndex();
 
     QPersistentModelIndex oldIndex(index);
     UIBootListWidgetItem *pItem = static_cast<UIBootListWidgetItem*>(itemFromIndex(oldIndex));
-    insertItem(row, new UIBootListWidgetItem(*pItem));
-    QPersistentModelIndex newIndex = model()->index(row, 0);
-    delete takeItem(oldIndex.row());
-    setCurrentRow(newIndex.row());
+    insertTopLevelItem(iRow, new UIBootListWidgetItem(pItem->deviceType()));
+    topLevelItem(iRow)->setCheckState(0, pItem->checkState(0));
+    QPersistentModelIndex newIndex = model()->index(iRow, 0);
+    delete takeTopLevelItem(oldIndex.row());
+    setCurrentItem(topLevelItem(newIndex.row()));
     return QModelIndex(newIndex);
 }
@@ -573 +582 @@
 {
     /* Update move up/down actions: */
-    if (m_pTable && m_pMoveUp)
-        m_pMoveUp->setEnabled(m_pTable->hasFocus() && m_pTable->currentRow() > 0);
-    if (m_pTable && m_pMoveDown)
-        m_pMoveDown->setEnabled(m_pTable->hasFocus() && m_pTable->currentRow() < m_pTable->count() - 1);
+    QTreeWidgetItem *pCurrentTopLevelItem = m_pTable->currentItem();
+    const int iCurrentTopLevelItem = m_pTable->indexOfTopLevelItem(pCurrentTopLevelItem);
+    if (m_pTable && m_pMoveUp && iCurrentTopLevelItem != -1)
+        m_pMoveUp->setEnabled(m_pTable->hasFocus() && iCurrentTopLevelItem > 0);
+    if (m_pTable && m_pMoveDown && iCurrentTopLevelItem != -1)
+        m_pMoveDown->setEnabled(m_pTable->hasFocus() && iCurrentTopLevelItem < m_pTable->topLevelItemCount() - 1);
 }
 

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

@@ -21 +21 @@
 # pragma once
 #endif
-
-/* Qt includes: */
-#include <QListWidget>
 
 /* GUI includes: */