Changeset 64491 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 31, 2016 2:20:42 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 115): Settings: Storage page: Finally connect storage-view to accessibility interface.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QITreeView.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp

@@ -408 +408 @@
 void QITreeView::prepare()
 {
-//    /* Install QITreeViewItem accessibility interface factory: */
-//    QAccessible::installFactory(QIAccessibilityInterfaceForQITreeViewItem::pFactory);
-//    /* Install QITreeView accessibility interface factory: */
-//    QAccessible::installFactory(QIAccessibilityInterfaceForQITreeView::pFactory);
+    /* Install QITreeViewItem accessibility interface factory: */
+    QAccessible::installFactory(QIAccessibilityInterfaceForQITreeViewItem::pFactory);
+    /* Install QITreeView accessibility interface factory: */
+    QAccessible::installFactory(QIAccessibilityInterfaceForQITreeView::pFactory);
 
     /* Mark header hidden: */

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

@@ -1858 +1858 @@
 }
 
+/* Storage view */
+int StorageView::childCount() const
+{
+    StorageModel *pModel = qobject_cast<StorageModel*>(model());
+    AssertPtrReturn(pModel, 0);
+    return pModel->rowCount(pModel->root());
+}
+
+QITreeViewItem *StorageView::childItem(int iIndex) const
+{
+    StorageModel *pModel = qobject_cast<StorageModel*>(model());
+    AssertPtrReturn(pModel, 0);
+    return (AbstractItem*)pModel->index(iIndex, 0, pModel->root()).internalPointer();
+}
+
 /* Storage Delegate */
 StorageDelegate::StorageDelegate (QObject *aParent)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -582 +582 @@
     /** Constructs storage-view passing @a pParent to the base-class. */
     StorageView(QWidget *pParent) : QITreeView(pParent) {}
+
+protected:
+
+    /** Returns the number of children. */
+    virtual int childCount() const /* override */;
+    /** Returns the child item with @a iIndex. */
+    virtual QITreeViewItem *childItem(int iIndex) const /* override */;
 };