Changeset 105021 in vbox

Timestamp:

Jun 25, 2024 1:58:19 PM (5 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10681: UIPortForwardingTable: A bit of cleanup for model/view creation.

Location:

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

Files:

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

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

@@ -1031 +1031 @@
             {
                 /* Update actions: */
-                sltCurrentChanged();
+                sltUpdateActions();
                 break;
             }
@@ -1066 +1066 @@
     m_pTableView->setFocus();
     m_pTableView->setCurrentIndex(m_pTableModel->index(m_pTableModel->rowCount() - 1, 0));
-    sltCurrentChanged();
+    sltUpdateActions();
     sltAdjustTable();
 }
@@ -1075 +1075 @@
     m_pTableView->setFocus();
     m_pTableView->setCurrentIndex(m_pTableModel->index(m_pTableModel->rowCount() - 1, 0));
-    sltCurrentChanged();
+    sltUpdateActions();
     sltAdjustTable();
 }
@@ -1083 +1083 @@
     m_pTableModel->removeRule(m_pTableView->currentIndex());
     m_pTableView->setFocus();
-    sltCurrentChanged();
+    sltUpdateActions();
     sltAdjustTable();
 }
@@ -1093 +1093 @@
 }
 
-void UIPortForwardingTable::sltCurrentChanged()
+void UIPortForwardingTable::sltUpdateActions()
 {
     bool fTableFocused = m_pTableView->hasFocus();
@@ -1168 +1168 @@
 #endif
 
-        /* Prepare table-view: */
+        /* Prepare model: */
+        prepareTableModel();
+        /* Prepare view: */
         prepareTableView();
 
         /* Prepare toolbar: */
         prepareToolbar();
-    }
-}
-
-void UIPortForwardingTable::prepareTableView()
-{
-    /* Create table-view: */
-    m_pTableView = new UIPortForwardingView(m_fIPv6, this);
-    if (m_pTableView)
-    {
-        /* Configure table-view: */
-        m_pTableView->installEventFilter(this);
-
-        /* Prepare model: */
-        prepareTableModel();
-
-        /* Finish configure table-view (after model is configured): */
-        connect(m_pTableView, &UIPortForwardingView::sigCurrentChanged,
-                this, &UIPortForwardingTable::sltCurrentChanged);
-        connect(m_pTableView, &UIPortForwardingView::customContextMenuRequested,
-                this, &UIPortForwardingTable::sltShowTableContexMenu);
-
-        /* Add into layout: */
-        m_pLayout->addWidget(m_pTableView);
     }
 }
@@ -1206 +1185 @@
     {
         /* Configure table-model: */
-        m_pTableView->setModel(m_pTableModel);
         connect(m_pTableModel, &UIPortForwardingModel::dataChanged,
                 this, &UIPortForwardingTable::sltTableDataChanged);
@@ -1213 +1191 @@
         connect(m_pTableModel, &UIPortForwardingModel::rowsRemoved,
                 this, &UIPortForwardingTable::sltTableDataChanged);
+    }
+}
+
+void UIPortForwardingTable::prepareTableView()
+{
+    /* Create table-view: */
+    m_pTableView = new UIPortForwardingView(m_fIPv6, this);
+    if (m_pTableView)
+    {
+        /* Assign model: */
+        if (m_pTableModel)
+            m_pTableView->setModel(m_pTableModel);
+
+        /* Finish configure table-view (after model is assigned): */
+        connect(m_pTableView, &UIPortForwardingView::sigCurrentChanged,
+                this, &UIPortForwardingTable::sltUpdateActions);
+        connect(m_pTableView, &UIPortForwardingView::customContextMenuRequested,
+                this, &UIPortForwardingTable::sltShowTableContexMenu);
+
+        /* Add into layout: */
+        m_pLayout->addWidget(m_pTableView);
     }
 }

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

@@ -262 +262 @@
     void sltTableDataChanged();
 
-    /** Handles current item change. */
-    void sltCurrentChanged();
+    /** Updates actions. */
+    void sltUpdateActions();
+
     /** Handles request to show context-menu in certain @a position. */
     void sltShowTableContexMenu(const QPoint &position);
+
     /** Adjusts table column sizes. */
     void sltAdjustTable();
@@ -275 +277 @@
     /** Prepares layout. */
     void prepareLayout();
+    /** Prepares table-model. */
+    void prepareTableModel();
     /** Prepares table-view. */
     void prepareTableView();
-    /** Prepares table-model. */
-    void prepareTableModel();
     /** Prepares toolbar. */
     void prepareToolbar();