Changeset 64479 in vbox

Timestamp:

Oct 28, 2016 4:01:01 PM (8 years ago)

Author:

vboxsync

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

111613

Message:

FE/Qt: bugref:6899: Accessibility support (step 108): Accessibility workaround cleanup for basic model/view classes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QITableView.cpp (modified) (1 diff)
• QITableView.h (modified) (1 diff)
• QITreeView.cpp (modified) (1 diff)
• QITreeWidget.cpp (modified) (3 diffs)
• QITreeWidget.h (modified) (1 diff)

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

@@ -397 +397 @@
     AssertPtrReturn(table(), QString());
 
-    /* Return tree whats-this: */
+    /* Return table whats-this: */
     return table()->whatsThis();
 }

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.h

@@ -102 +102 @@
     virtual int childCount() const { return 0; }
     /** Returns the child item with @a iIndex. */
-    virtual QITableViewRow *childItem(int iIndex) const { Q_UNUSED(iIndex); return 0; }
+    virtual QITableViewRow *childItem(int /* iIndex */) const { return 0; }
 
     /** Makes sure current editor data committed. */

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

@@ -231 +231 @@
     AssertPtrReturn(tree(), 0);
     /* Make sure index is valid: */
-    AssertReturn(iIndex >= 0 && iIndex < childCount(), 0);
+    AssertReturn(iIndex >= 0, 0);
+    if (iIndex >= childCount())
+    {
+        // WORKAROUND:
+        // Normally I would assert here, but Qt5 accessibility code has
+        // a hard-coded architecture for a tree-views which we do not like
+        // but have to live with and this architecture enumerates children
+        // of all levels as children of level 0, so Qt5 can try to address
+        // our interface with index which surely out of bounds by our laws.
+        // So let's assume that's exactly such case and try to enumerate
+        // visible children like they are a part of the list, not tree.
+        // printf("Invalid index: %d\n", iIndex);
+
+        // Take into account we also have header with 'column count' indexes,
+        // so we should start enumerating tree indexes since 'column count'.
+        const int iColumnCount = tree()->model()->columnCount();
+        int iCurrentIndex = iColumnCount;
+
+        // Set iterator to root-index initially:
+        const QModelIndex root = tree()->rootIndex();
+        QModelIndex index = root;
+
+        // But if root-index has child, go deeper:
+        if (index.child(0, 0).isValid())
+            index = index.child(0, 0);
+
+        // Search for sibling with corresponding index:
+        while (index.isValid() && iCurrentIndex < iIndex)
+        {
+            ++iCurrentIndex;
+            if (iCurrentIndex % iColumnCount == 0)
+                index = tree()->indexBelow(index);
+        }
+
+        // Return what we found:
+        // if (index.isValid())
+        //     printf("Item found: [%s]\n", ((QITreeViewItem*)index.internalPointer())->text().toUtf8().constData());
+        // else
+        //     printf("Item not found\n");
+        return index.isValid() ? QAccessible::queryAccessibleInterface((QITreeViewItem*)index.internalPointer()) : 0;
+    }
 
     /* Return the child with the passed iIndex: */

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

@@ -261 +261 @@
         // WORKAROUND:
         // Normally I would assert here, but Qt5 accessibility code has
-        // a hard-coded architecture for a tree-views which we do not like
+        // a hard-coded architecture for a tree-widgets which we do not like
         // but have to live with and this architecture enumerates children
         // of all levels as children of level 0, so Qt5 can try to address
@@ -269 +269 @@
         // printf("Invalid index: %d\n", iIndex);
 
+        // Take into account we also have header with 'column count' indexes,
+        // so we should start enumerating tree indexes since 'column count'.
+        const int iColumnCount = tree()->columnCount();
+        int iCurrentIndex = iColumnCount;
+
         // Do some sanity check as well, enough?
-        AssertReturn(iIndex >= tree()->columnCount(), 0);
-
-        // The enumeration step is column count:
-        int iCurrentIndex = tree()->columnCount();
+        AssertReturn(iIndex >= iColumnCount, 0);
+
+        // Search for sibling with corresponding index:
         QTreeWidgetItem *pItem = tree()->topLevelItem(0);
         while (pItem && iCurrentIndex < iIndex)
         {
             ++iCurrentIndex;
-            if (iCurrentIndex % tree()->columnCount() == 0)
+            if (iCurrentIndex % iColumnCount == 0)
                 pItem = tree()->itemBelow(pItem);
         }
@@ -284 +288 @@
         // Return what we found:
         // if (pItem)
-        //     printf("Item found: [%s]\n", pItem->defaultText().toUtf8().constData());
+        //     printf("Item found: [%s]\n", pItem->text(0).toUtf8().constData());
+        // else
+        //     printf("Item not found\n");
         return pItem ? QAccessible::queryAccessibleInterface(QITreeWidgetItem::toItem(pItem)) : 0;
     }

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.h

@@ -59 +59 @@
     /** Returns the parent tree-widget item. */
     QITreeWidgetItem *parentItem() const;
+
     /** Returns the child tree-widget item with @a iIndex. */
     QITreeWidgetItem *childItem(int iIndex) const;