Changeset 105029 in vbox

Timestamp:

Jun 26, 2024 10:58:38 AM (5 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10681: UIPortForwardingTable: Moving the rest of table sub-class stuff from parent into appropriate place.

Location:

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

Files:

• UIPortForwardingTable.cpp (modified) (11 diffs)
• UIPortForwardingTable.h (modified) (2 diffs)

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

@@ -507 +507 @@
     virtual ~UIPortForwardingView();
 
+protected:
+
+    /** Handles any Qt @a pEvent. */
+    virtual bool event(QEvent *pEvent) RT_OVERRIDE;
+
+protected slots:
+
+    /** Handles rows being inserted.
+      * @param  parent  Brings the parent under which new rows being inserted.
+      * @param  iStart  Brings the starting position (inclusive).
+      * @param  iStart  Brings the end position (inclusive). */
+    virtual void rowsInserted(const QModelIndex &parent, int iStart, int iEnd) RT_OVERRIDE;
+
+    /** Handles rows being removed.
+      * @param  parent  Brings the parent for which rows being removed.
+      * @param  iStart  Brings the starting position (inclusive).
+      * @param  iStart  Brings the end position (inclusive). */
+    virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int iStart, int iEnd) RT_OVERRIDE;
+
 private:
 
@@ -513 +532 @@
     /** Cleanups everything. */
     void cleanup();
+
+    /** Adjusts table contents. */
+    void adjust();
 
     /** Holds whether this view contains IPv6 rules, not IPv4. */
@@ -810 +832 @@
 }
 
+bool UIPortForwardingView::event(QEvent *pEvent)
+{
+    /* Process different event-types: */
+    switch (pEvent->type())
+    {
+        /* Adjust table on show/resize events: */
+        case QEvent::Show:
+        case QEvent::Resize:
+        {
+            // WORKAROUND:
+            // Make sure layout requests really processed first of all;
+            // This is required for the 1st show event but let it be ..
+            QCoreApplication::sendPostedEvents(0, QEvent::LayoutRequest);
+            adjust();
+            break;
+        }
+        default:
+            break;
+    }
+
+    /* Call to base-class: */
+    return QITableView::event(pEvent);
+}
+
+void UIPortForwardingView::rowsInserted(const QModelIndex &parent, int iStart, int iEnd)
+{
+    /* Call to base-class: */
+    QITableView::rowsInserted(parent, iStart, iEnd);
+    /* Adjust table on rows being inserted: */
+    adjust();
+}
+
+void UIPortForwardingView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
+{
+    /* Call to base-class: */
+    QITableView::rowsAboutToBeRemoved(parent, start, end);
+    /* Adjust table on rows being removed: */
+    adjust();
+}
+
 void UIPortForwardingView::prepare()
 {
@@ -881 +943 @@
 
 
+void UIPortForwardingView::adjust()
+{
+    horizontalHeader()->setStretchLastSection(false);
+    /* If table is NOT empty: */
+    if (model()->rowCount())
+    {
+        /* Resize table to contents size-hint and emit a spare place for first column: */
+        resizeColumnsToContents();
+        uint uFullWidth = viewport()->width();
+        for (uint u = 1; u < UIPortForwardingDataType_Max; ++u)
+            uFullWidth -= horizontalHeader()->sectionSize(u);
+        horizontalHeader()->resizeSection(UIPortForwardingDataType_Name, uFullWidth);
+    }
+    /* If table is empty: */
+    else
+    {
+        /* Resize table columns to be equal in size: */
+        uint uFullWidth = viewport()->width();
+        for (uint u = 0; u < UIPortForwardingDataType_Max; ++u)
+            horizontalHeader()->resizeSection(u, uFullWidth / UIPortForwardingDataType_Max);
+    }
+    horizontalHeader()->setStretchLastSection(true);
+}
+
 /*********************************************************************************************************************************
 *   Class UIPortForwardingTable implementation.                                                                                  *
@@ -928 +1014 @@
     m_rules = newRules;
     m_pTableModel->setRules(m_rules);
-    sltAdjustTable();
 
     /* Restore last chosen item: */
@@ -1010 +1095 @@
 }
 
-bool UIPortForwardingTable::eventFilter(QObject *pObject, QEvent *pEvent)
-{
-    /* Process table: */
-    if (pObject == m_pTableView)
-    {
-        /* Process different event-types: */
-        switch (pEvent->type())
-        {
-            case QEvent::Show:
-            case QEvent::Resize:
-            {
-                /* Make sure layout requests really processed first of all: */
-                QCoreApplication::sendPostedEvents(0, QEvent::LayoutRequest);
-                /* Adjust table: */
-                sltAdjustTable();
-                break;
-            }
-            default:
-                break;
-        }
-    }
-    /* Call to base-class: */
-    return QWidget::eventFilter(pObject, pEvent);
-}
-
 void UIPortForwardingTable::sltRetranslateUI()
 {
@@ -1060 +1120 @@
     m_pTableView->setCurrentIndex(m_pTableModel->index(m_pTableModel->rowCount() - 1, 0));
     sltUpdateActions();
-    sltAdjustTable();
 }
 
@@ -1069 +1128 @@
     m_pTableView->setCurrentIndex(m_pTableModel->index(m_pTableModel->rowCount() - 1, 0));
     sltUpdateActions();
-    sltAdjustTable();
 }
 
@@ -1077 +1135 @@
     m_pTableView->setFocus();
     sltUpdateActions();
-    sltAdjustTable();
 }
 
@@ -1104 +1161 @@
         menu.addAction(m_pActionAdd);
     menu.exec(m_pTableView->viewport()->mapToGlobal(pos));
-}
-
-void UIPortForwardingTable::sltAdjustTable()
-{
-    /* If table is NOT empty: */
-    if (m_pTableModel->rowCount())
-    {
-        /* Resize table to contents size-hint and emit a spare place for first column: */
-        m_pTableView->resizeColumnsToContents();
-        uint uFullWidth = m_pTableView->viewport()->width();
-        for (uint u = 1; u < UIPortForwardingDataType_Max; ++u)
-            uFullWidth -= m_pTableView->horizontalHeader()->sectionSize(u);
-        m_pTableView->horizontalHeader()->resizeSection(UIPortForwardingDataType_Name, uFullWidth);
-    }
-    /* If table is empty: */
-    else
-    {
-        /* Resize table columns to be equal in size: */
-        uint uFullWidth = m_pTableView->viewport()->width();
-        for (uint u = 0; u < UIPortForwardingDataType_Max; ++u)
-            m_pTableView->horizontalHeader()->resizeSection(u, uFullWidth / UIPortForwardingDataType_Max);
-    }
 }
 
@@ -1249 +1284 @@
         m_pLayout->addWidget(m_pToolBar);
     }
+
+    /* Update actions finally: */
+    sltUpdateActions();
 }
 

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

@@ -243 +243 @@
     void makeSureEditorDataCommitted();
 
-protected:
-
-    /** Preprocesses any Qt @a pEvent for passed @a pObject. */
-    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
-
 private slots:
 
@@ -267 +262 @@
     /** Handles request to show context-menu in certain @a position. */
     void sltShowTableContexMenu(const QPoint &position);
-
-    /** Adjusts table column sizes. */
-    void sltAdjustTable();
 
 private: