Changeset 64495 in vbox for trunk/src

Timestamp:

Oct 31, 2016 3:32:19 PM (8 years ago)

Author:

vboxsync

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

111631

Message:

FE/Qt: bugref:6899: Accessibility support (step 119): Selector UI: Move snapshot pane onto QITreeWidget rails.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISnapshotPane.cpp (modified) (16 diffs)
• UISnapshotPane.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.cpp

@@ -28 +28 @@
 # include <QPointer>
 # include <QScrollBar>
-# include <QTreeWidget>
 # include <QWriteLocker>
 
 /* GUI includes: */
+# include "QITreeWidget.h"
 # include "UIConverter.h"
 # include "UIExtraDataManager.h"
@@ -55 +55 @@
 
 
-/** QTreeWidgetItem subclass for snapshots items. */
-class UISnapshotItem : public QObject, public QTreeWidgetItem
+/** QITreeWidgetItem subclass for snapshots items. */
+class UISnapshotItem : public QITreeWidgetItem
 {
     Q_OBJECT;
@@ -67 +67 @@
     static const UISnapshotItem *toSnapshotItem(const QTreeWidgetItem *pItem);
 
-    /** Item type for UISnapshotItem. */
-    enum { ItemType = QTreeWidgetItem::UserType + 1 };
-
     /** Constructs normal snapshot item (child of tree-widget). */
-    UISnapshotItem(UISnapshotPane *pSnapshotWidget, QTreeWidget *pTreeWidget, const CSnapshot &comSnapshot);
+    UISnapshotItem(UISnapshotPane *pSnapshotWidget, QITreeWidget *pTreeWidget, const CSnapshot &comSnapshot);
     /** Constructs normal snapshot item (child of tree-widget-item). */
-    UISnapshotItem(UISnapshotPane *pSnapshotWidget, QTreeWidgetItem *pRootItem, const CSnapshot &comSnapshot);
+    UISnapshotItem(UISnapshotPane *pSnapshotWidget, QITreeWidgetItem *pRootItem, const CSnapshot &comSnapshot);
 
     /** Constructs "current state" item (child of tree-widget). */
-    UISnapshotItem(UISnapshotPane *pSnapshotWidget, QTreeWidget *pTreeWidget, const CMachine &comMachine);
+    UISnapshotItem(UISnapshotPane *pSnapshotWidget, QITreeWidget *pTreeWidget, const CMachine &comMachine);
     /** Constructs "current state" item (child of tree-widget-item). */
-    UISnapshotItem(UISnapshotPane *pSnapshotWidget, QTreeWidgetItem *pRootItem, const CMachine &comMachine);
+    UISnapshotItem(UISnapshotPane *pSnapshotWidget, QITreeWidgetItem *pRootItem, const CMachine &comMachine);
 
     /** Returns item machine. */
@@ -87 +84 @@
     QString snapshotID() const { return m_strSnapshotID; }
 
-    /** Returns the parent snapshot tree. */
-    UISnapshotTree *parentSnapshotTree() const;
-    /** Returns the parent snapshot item. */
-    UISnapshotItem *parentSnapshotItem() const;
-    /** Returns the child snapshot item with @a iIndex. */
-    UISnapshotItem *childSnapshotItem(int iIndex) const;
-
     /** Returns item data for corresponding @a iColumn and @a iRole. */
     QVariant data(int iColumn, int iRole) const;
@@ -166 +156 @@
 
 
-/** QTreeWidget subclass for snapshots items. */
-class UISnapshotTree : public QTreeWidget
+/** QITreeWidget subclass for snapshots items. */
+class UISnapshotTree : public QITreeWidget
 {
     Q_OBJECT;
@@ -175 +165 @@
     /** Constructs snapshot tree passing @a pParent to the base-class. */
     UISnapshotTree(QWidget *pParent);
-
-    /** Returns the number of children. */
-    int childCount() const;
-    /** Returns the child snapshot item with @a iIndex. */
-    UISnapshotItem *childSnapshotItem(int iIndex) const;
 };
 
@@ -190 +175 @@
 UISnapshotItem *UISnapshotItem::toSnapshotItem(QTreeWidgetItem *pItem)
 {
-    /* Make sure alive UISnapshotItem passed: */
-    if (!pItem || pItem->type() != UISnapshotItem::ItemType)
+    /* Get QITreeWidgetItem item first: */
+    QITreeWidgetItem *pIItem = QITreeWidgetItem::toItem(pItem);
+    if (!pIItem)
         return 0;
 
     /* Return casted UISnapshotItem then: */
-    return static_cast<UISnapshotItem*>(pItem);
+    return qobject_cast<UISnapshotItem*>(pIItem);
 }
 
@@ -201 +187 @@
 const UISnapshotItem *UISnapshotItem::toSnapshotItem(const QTreeWidgetItem *pItem)
 {
-    /* Make sure alive UISnapshotItem passed: */
-    if (!pItem || pItem->type() != UISnapshotItem::ItemType)
+    /* Get QITreeWidgetItem item first: */
+    const QITreeWidgetItem *pIItem = QITreeWidgetItem::toItem(pItem);
+    if (!pIItem)
         return 0;
 
     /* Return casted UISnapshotItem then: */
-    return static_cast<const UISnapshotItem*>(pItem);
-}
-
-UISnapshotItem::UISnapshotItem(UISnapshotPane *pSnapshotWidget, QTreeWidget *pTreeWidget, const CSnapshot &comSnapshot)
-    : QTreeWidgetItem(pTreeWidget, ItemType)
+    return qobject_cast<const UISnapshotItem*>(pIItem);
+}
+
+UISnapshotItem::UISnapshotItem(UISnapshotPane *pSnapshotWidget, QITreeWidget *pTreeWidget, const CSnapshot &comSnapshot)
+    : QITreeWidgetItem(pTreeWidget)
     , m_pSnapshotWidget(pSnapshotWidget)
     , m_fCurrentState(false)
@@ -217 +204 @@
 }
 
-UISnapshotItem::UISnapshotItem(UISnapshotPane *pSnapshotWidget, QTreeWidgetItem *pRootItem, const CSnapshot &comSnapshot)
-    : QTreeWidgetItem(pRootItem, ItemType)
+UISnapshotItem::UISnapshotItem(UISnapshotPane *pSnapshotWidget, QITreeWidgetItem *pRootItem, const CSnapshot &comSnapshot)
+    : QITreeWidgetItem(pRootItem)
     , m_pSnapshotWidget(pSnapshotWidget)
     , m_fCurrentState(false)
@@ -225 +212 @@
 }
 
-UISnapshotItem::UISnapshotItem(UISnapshotPane *pSnapshotWidget, QTreeWidget *pTreeWidget, const CMachine &comMachine)
-    : QTreeWidgetItem(pTreeWidget, ItemType)
+UISnapshotItem::UISnapshotItem(UISnapshotPane *pSnapshotWidget, QITreeWidget *pTreeWidget, const CMachine &comMachine)
+    : QITreeWidgetItem(pTreeWidget)
     , m_pSnapshotWidget(pSnapshotWidget)
     , m_fCurrentState(true)
@@ -235 +222 @@
 }
 
-UISnapshotItem::UISnapshotItem(UISnapshotPane *pSnapshotWidget, QTreeWidgetItem *pRootItem, const CMachine &comMachine)
-    : QTreeWidgetItem(pRootItem, ItemType)
+UISnapshotItem::UISnapshotItem(UISnapshotPane *pSnapshotWidget, QITreeWidgetItem *pRootItem, const CMachine &comMachine)
+    : QITreeWidgetItem(pRootItem)
     , m_pSnapshotWidget(pSnapshotWidget)
     , m_fCurrentState(true)
@@ -243 +230 @@
     /* Fetch current machine state: */
     updateCurrentState(m_comMachine.GetState());
-}
-
-UISnapshotTree *UISnapshotItem::parentSnapshotTree() const
-{
-    /* Return the parent snapshot tree if any: */
-    return treeWidget() ? qobject_cast<UISnapshotTree*>(treeWidget()) : 0;
-}
-
-UISnapshotItem *UISnapshotItem::parentSnapshotItem() const
-{
-    /* Return the parent snapshot item if any: */
-    return QTreeWidgetItem::parent() ? toSnapshotItem(QTreeWidgetItem::parent()) : 0;
-}
-
-UISnapshotItem *UISnapshotItem::childSnapshotItem(int iIndex) const
-{
-    /* Return the child snapshot item with iIndex if any: */
-    return QTreeWidgetItem::child(iIndex) ? toSnapshotItem(QTreeWidgetItem::child(iIndex)) : 0;
 }
 
@@ -531 +500 @@
 
 UISnapshotTree::UISnapshotTree(QWidget *pParent)
-    : QTreeWidget(pParent)
+    : QITreeWidget(pParent)
 {
     /* No header: */
@@ -555 +524 @@
 // #endif
 #endif /* QT_VERSION < 0x050000 */
-}
-
-int UISnapshotTree::childCount() const
-{
-    /* Return the number of children: */
-    return invisibleRootItem()->childCount();
-}
-
-UISnapshotItem *UISnapshotTree::childSnapshotItem(int iIndex) const
-{
-    /* Return the child snapshot item with iIndex if any: */
-    return invisibleRootItem()->child(iIndex) ? UISnapshotItem::toSnapshotItem(invisibleRootItem()->child(iIndex)) : 0;
 }
 
@@ -709 +666 @@
 {
     /* Translate snapshot tree: */
-    m_pSnapshotTree->setToolTip(tr("Contains snapshot tree of current virtual machine"));
+    m_pSnapshotTree->setWhatsThis(tr("Contains snapshot tree of current virtual machine"));
 
     /* Translate actions names: */
@@ -1281 +1238 @@
 }
 
-void UISnapshotPane::populateSnapshots(const CSnapshot &comSnapshot, QTreeWidgetItem *pItem)
+void UISnapshotPane::populateSnapshots(const CSnapshot &comSnapshot, QITreeWidgetItem *pItem)
 {
     /* Create a child of passed item: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.h

@@ -35 +35 @@
 class UISnapshotItem;
 class QTreeWidgetItem;
+class QITreeWidgetItem;
 
 
@@ -132 +133 @@
     void refreshAll();
     /** Populates snapshot items for corresponding @a comSnapshot using @a pItem as parent. */
-    void populateSnapshots(const CSnapshot &comSnapshot, QTreeWidgetItem *pItem);
+    void populateSnapshots(const CSnapshot &comSnapshot, QITreeWidgetItem *pItem);
 
     /** Searches for an item with corresponding @a strSnapshotID. */