Changeset 64744 in vbox

Timestamp:

Nov 24, 2016 4:36:28 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 137): Make UIApplianceModel know about own root index, though still keep it hidden.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIApplianceEditorWidget.cpp (modified) (3 diffs)
• UIApplianceEditorWidget.h (modified) (1 diff)
• UIApplianceExportEditorWidget.cpp (modified) (1 diff)
• UIApplianceImportEditorWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -965 +965 @@
 }
 
+QModelIndex UIApplianceModel::root() const
+{
+    return index(0, 0);
+}
+
 QModelIndex UIApplianceModel::index(int iRow, int iColumn, const QModelIndex &parentIdx /* = QModelIndex() */) const
 {
@@ -970 +975 @@
         return QModelIndex();
 
-    UIApplianceModelItem *pParentItem;
-
-    if (!parentIdx.isValid())
-        pParentItem = m_pRootItem;
-    else
-        pParentItem = static_cast<UIApplianceModelItem*>(parentIdx.internalPointer());
-
-    UIApplianceModelItem *pChildItem = pParentItem->child(iRow);
-    if (pChildItem)
-        return createIndex(iRow, iColumn, pChildItem);
+    UIApplianceModelItem *pItem = !parentIdx.isValid() ? m_pRootItem :
+                                  static_cast<UIApplianceModelItem*>(parentIdx.internalPointer())->child(iRow);
+
+    return pItem ? createIndex(iRow, iColumn, pItem) : QModelIndex();
+}
+
+QModelIndex UIApplianceModel::parent(const QModelIndex &idx) const
+{
+    if (!idx.isValid())
+        return QModelIndex();
+
+    UIApplianceModelItem *pItem = static_cast<UIApplianceModelItem*>(idx.internalPointer());
+    UIApplianceModelItem *pParentItem = pItem->parent();
+
+    if (pParentItem)
+        return createIndex(pParentItem->row(), 0, pParentItem);
     else
         return QModelIndex();
 }
 
-QModelIndex UIApplianceModel::parent(const QModelIndex &idx) const
-{
-    if (!idx.isValid())
-        return QModelIndex();
-
-    UIApplianceModelItem *pChildItem = static_cast<UIApplianceModelItem*>(idx.internalPointer());
-    UIApplianceModelItem *pParentItem = pChildItem->parent();
-
-    if (pParentItem == m_pRootItem)
-        return QModelIndex();
-
-    return createIndex(pParentItem->row(), 0, pParentItem);
-}
-
 int UIApplianceModel::rowCount(const QModelIndex &parentIdx /* = QModelIndex() */) const
 {
-    UIApplianceModelItem *pParentItem;
-    if (parentIdx.column() > 0)
-        return 0;
-
-    if (!parentIdx.isValid())
-        pParentItem = m_pRootItem;
-    else
-        pParentItem = static_cast<UIApplianceModelItem*>(parentIdx.internalPointer());
-
-    return pParentItem->childCount();
+    return !parentIdx.isValid() ? 1 /* only root item has invalid parent */ :
+           static_cast<UIApplianceModelItem*>(parentIdx.internalPointer())->childCount();
 }
 
 int UIApplianceModel::columnCount(const QModelIndex &parentIdx /* = QModelIndex() */) const
 {
-    if (parentIdx.isValid())
-        return static_cast<UIApplianceModelItem*>(parentIdx.internalPointer())->columnCount();
-    else
-        return m_pRootItem->columnCount();
+    return !parentIdx.isValid() ? m_pRootItem->columnCount() :
+           static_cast<UIApplianceModelItem*>(parentIdx.internalPointer())->columnCount();
 }
 
@@ -1326 +1313 @@
                 {
                     /* Configure tree-view: */
-                    m_pTreeViewSettings->setRootIsDecorated(false);
                     m_pTreeViewSettings->setAlternatingRowColors(true);
                     m_pTreeViewSettings->setAllColumnsShowFocus(true);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h

@@ -71 +71 @@
     ~UIApplianceModel();
 
+    /** Returns the root index in the model. */
+    virtual QModelIndex root() const;
     /** Returns the index of the item in the model specified by the given @a iRow, @a iColumn and @a parentIdx. */
     virtual QModelIndex index(int iRow, int iColumn, const QModelIndex &parentIdx = QModelIndex()) const /* override */;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp

@@ -102 +102 @@
     m_pTreeViewSettings->setColumnHidden(ApplianceViewSection_OriginalValue, true);
     m_pTreeViewSettings->expandAll();
+    /* Set model root index and make it current: */
+    m_pTreeViewSettings->setRootIndex(pProxy->mapFromSource(m_pModel->root()));
+    m_pTreeViewSettings->setCurrentIndex(pProxy->mapFromSource(m_pModel->root()));
 
     /* Check for warnings & if there are one display them. */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp

@@ -108 +108 @@
                         m_pTreeViewSettings->setColumnHidden(ApplianceViewSection_OriginalValue, true);
                         m_pTreeViewSettings->expandAll();
+                        /* Set model root index and make it current: */
+                        m_pTreeViewSettings->setRootIndex(pProxy->mapFromSource(m_pModel->root()));
+                        m_pTreeViewSettings->setCurrentIndex(pProxy->mapFromSource(m_pModel->root()));
 
                         /* Check for warnings & if there are one display them. */