Changeset 64802 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 7, 2016 2:39:02 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 153): UIPortForwardingTable rework: Use the table as a parent for it's model, required for accessibility support; Reordering table vs model creation and configuration accordingly.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp (modified) (5 diffs)

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

@@ -292 +292 @@
 public:
 
-    /* Constructor: */
-    UIPortForwardingModel(QObject *pParent = 0, const UIPortForwardingDataList &rules = UIPortForwardingDataList())
+    /** Constructs Port Forwarding model passing @a pParent to the base-class.
+      * @param  rules  Brings the list of port forwarding rules to load initially. */
+    UIPortForwardingModel(QITableView *pParent, const UIPortForwardingDataList &rules = UIPortForwardingDataList())
         : QAbstractTableModel(pParent)
         , m_dataList(rules) {}
@@ -319 +320 @@
 
 private:
+
+    /** Return the parent table-view reference. */
+    QITableView *parentTable() const;
 
     /* Variable: Data stuff: */
@@ -509 +513 @@
 }
 
+QITableView *UIPortForwardingModel::parentTable() const
+{
+    return qobject_cast<QITableView*>(parent());
+}
+
 
 /*********************************************************************************************************************************
@@ -534 +543 @@
 #endif /* !VBOX_WS_WIN */
         pMainLayout->setSpacing(3);
-        /* Create model: */
-        m_pModel = new UIPortForwardingModel(this, rules);
-        {
-            /* Configure model: */
-            connect(m_pModel, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(sltTableDataChanged()));
-            connect(m_pModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)), this, SLOT(sltTableDataChanged()));
-            connect(m_pModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), this, SLOT(sltTableDataChanged()));
-        }
         /* Create table: */
         m_pTableView = new QITableView;
         {
             /* Configure table: */
-            m_pTableView->setModel(m_pModel);
             m_pTableView->setTabKeyNavigation(false);
             m_pTableView->verticalHeader()->hide();
@@ -553 +553 @@
             m_pTableView->setContextMenuPolicy(Qt::CustomContextMenu);
             m_pTableView->installEventFilter(this);
+        }
+        /* Create model: */
+        m_pModel = new UIPortForwardingModel(m_pTableView, rules);
+        {
+            /* Configure model: */
+            connect(m_pModel, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(sltTableDataChanged()));
+            connect(m_pModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)), this, SLOT(sltTableDataChanged()));
+            connect(m_pModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), this, SLOT(sltTableDataChanged()));
+            /* Configure table (after model is configured): */
+            m_pTableView->setModel(m_pModel);
             connect(m_pTableView, SIGNAL(sigCurrentChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(sltCurrentChanged()));
             connect(m_pTableView, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(sltShowTableContexMenu(const QPoint &)));