Changeset 105007 in vbox

Timestamp:

Jun 24, 2024 5:48:11 PM (9 months ago)

Author:

vboxsync

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

163625

Message:

FE/Qt: bugref:10681: UIPortForwardingTable: Reworking prepare/cleanup cascade for QITableView sub-class here.

Location:

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

Files:

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

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

@@ -498 +498 @@
 public:
 
-    /** Constructs Port Forwarding table-view passing @a pParent to the base-class. */
-    UIPortForwardingView(QWidget *pParent = 0) : QITableView(pParent) {}
+    /** Constructs Port Forwarding table-view passing @a pParent to the base-class.
+      * @param  fIPv6  Brings whether this table contains IPv6 rules, not IPv4. */
+    UIPortForwardingView(bool fIPv6, QWidget *pParent = 0);
+    /** Destructs Port Forwarding table-view. */
+    virtual ~UIPortForwardingView();
+
+private:
+
+    /** Prepares everything. */
+    void prepare();
+    /** Cleanups everything. */
+    void cleanup();
+
+    /** Holds whether this view contains IPv6 rules, not IPv4. */
+    bool  m_fIPv6;
+
+    /** Holds the item editor factory instance. */
+    QItemEditorFactory *m_pItemEditorFactory;
 };
 
@@ -764 +780 @@
 
 /*********************************************************************************************************************************
+*   Class UIPortForwardingView implementation.                                                                                   *
+*********************************************************************************************************************************/
+
+UIPortForwardingView::UIPortForwardingView(bool fIPv6, QWidget *pParent /* = 0 */)
+    : QITableView(pParent)
+    , m_fIPv6(fIPv6)
+    , m_pItemEditorFactory(0)
+{
+    prepare();
+}
+
+UIPortForwardingView::~UIPortForwardingView()
+{
+    cleanup();
+}
+
+void UIPortForwardingView::prepare()
+{
+    // WORAKROUND: Do we still need this?
+    setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+
+    /* Disable TAB-key navigation: */
+    setTabKeyNavigation(false);
+    /* Adjust selection mode: */
+    setSelectionMode(QAbstractItemView::SingleSelection);
+    /* Configure context-menu policy: */
+    setContextMenuPolicy(Qt::CustomContextMenu);
+
+    /* Adjust header policy: */
+    verticalHeader()->hide();
+    verticalHeader()->setDefaultSectionSize((int)(verticalHeader()->minimumSectionSize() * 1.33));
+
+    /* We certainly have abstract item delegate: */
+    QAbstractItemDelegate *pAbstractItemDelegate = itemDelegate();
+    if (pAbstractItemDelegate)
+    {
+        /* But is this also styled item delegate? */
+        QStyledItemDelegate *pStyledItemDelegate = qobject_cast<QStyledItemDelegate*>(pAbstractItemDelegate);
+        if (pStyledItemDelegate)
+        {
+            /* Create new item editor factory: */
+            m_pItemEditorFactory = new QItemEditorFactory;
+            if (m_pItemEditorFactory)
+            {
+                /* Register NameEditor as the NameData editor: */
+                int iNameId = qRegisterMetaType<NameData>();
+                QStandardItemEditorCreator<NameEditor> *pNameEditorItemCreator = new QStandardItemEditorCreator<NameEditor>();
+                m_pItemEditorFactory->registerEditor(iNameId, pNameEditorItemCreator);
+
+                /* Register ProtocolEditor as the KNATProtocol editor: */
+                int iProtocolId = qRegisterMetaType<KNATProtocol>();
+                QStandardItemEditorCreator<ProtocolEditor> *pProtocolEditorItemCreator = new QStandardItemEditorCreator<ProtocolEditor>();
+                m_pItemEditorFactory->registerEditor(iProtocolId, pProtocolEditorItemCreator);
+
+                /* Register IPv4Editor/IPv6Editor as the IpData editor: */
+                int iIpId = qRegisterMetaType<IpData>();
+                if (!m_fIPv6)
+                {
+                    QStandardItemEditorCreator<IPv4Editor> *pIPv4EditorItemCreator = new QStandardItemEditorCreator<IPv4Editor>();
+                    m_pItemEditorFactory->registerEditor(iIpId, pIPv4EditorItemCreator);
+                }
+                else
+                {
+                    QStandardItemEditorCreator<IPv6Editor> *pIPv6EditorItemCreator = new QStandardItemEditorCreator<IPv6Editor>();
+                    m_pItemEditorFactory->registerEditor(iIpId, pIPv6EditorItemCreator);
+                }
+
+                /* Register PortEditor as the PortData editor: */
+                int iPortId = qRegisterMetaType<PortData>();
+                QStandardItemEditorCreator<PortEditor> *pPortEditorItemCreator = new QStandardItemEditorCreator<PortEditor>();
+                m_pItemEditorFactory->registerEditor(iPortId, pPortEditorItemCreator);
+
+                /* Set newly created item editor factory for table delegate: */
+                pStyledItemDelegate->setItemEditorFactory(m_pItemEditorFactory);
+            }
+        }
+    }
+}
+
+void UIPortForwardingView::cleanup()
+{
+    /* Cleanup editor factory delegate: */
+    delete m_pItemEditorFactory;
+    m_pItemEditorFactory = 0;
+}
+
+/*********************************************************************************************************************************
 *   Class UIPortForwardingTable implementation.                                                                                  *
 *********************************************************************************************************************************/
@@ -775 +878 @@
     , m_pTableView(0)
     , m_pToolBar(0)
-    , m_pItemEditorFactory(0)
     , m_pTableModel(0)
     , m_pActionAdd(0)
@@ -782 +884 @@
 {
     prepare();
-}
-
-UIPortForwardingTable::~UIPortForwardingTable()
-{
-    cleanup();
 }
 
@@ -1067 +1164 @@
 {
     /* Create table-view: */
-    m_pTableView = new UIPortForwardingView(this);
+    m_pTableView = new UIPortForwardingView(m_fIPv6, this);
     if (m_pTableView)
     {
         /* Configure table-view: */
-        m_pTableView->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-        m_pTableView->setTabKeyNavigation(false);
-        m_pTableView->verticalHeader()->hide();
-        m_pTableView->verticalHeader()->setDefaultSectionSize((int)(m_pTableView->verticalHeader()->minimumSectionSize() * 1.33));
-        m_pTableView->setSelectionMode(QAbstractItemView::SingleSelection);
-        m_pTableView->setContextMenuPolicy(Qt::CustomContextMenu);
         m_pTableView->installEventFilter(this);
 
@@ -1087 +1178 @@
         connect(m_pTableView, &UIPortForwardingView::customContextMenuRequested,
                 this, &UIPortForwardingTable::sltShowTableContexMenu);
-
-        /* Prepare delegates: */
-        prepareTableDelegates();
 
         /* Add into layout: */
@@ -1110 +1198 @@
         connect(m_pTableModel, &UIPortForwardingModel::rowsRemoved,
                 this, &UIPortForwardingTable::sltTableDataChanged);
-    }
-}
-
-void UIPortForwardingTable::prepareTableDelegates()
-{
-    /* We certainly have abstract item delegate: */
-    QAbstractItemDelegate *pAbstractItemDelegate = m_pTableView->itemDelegate();
-    if (pAbstractItemDelegate)
-    {
-        /* But is this also styled item delegate? */
-        QStyledItemDelegate *pStyledItemDelegate = qobject_cast<QStyledItemDelegate*>(pAbstractItemDelegate);
-        if (pStyledItemDelegate)
-        {
-            /* Create new item editor factory: */
-            m_pItemEditorFactory = new QItemEditorFactory;
-            if (m_pItemEditorFactory)
-            {
-                /* Register NameEditor as the NameData editor: */
-                int iNameId = qRegisterMetaType<NameData>();
-                QStandardItemEditorCreator<NameEditor> *pNameEditorItemCreator = new QStandardItemEditorCreator<NameEditor>();
-                m_pItemEditorFactory->registerEditor(iNameId, pNameEditorItemCreator);
-
-                /* Register ProtocolEditor as the KNATProtocol editor: */
-                int iProtocolId = qRegisterMetaType<KNATProtocol>();
-                QStandardItemEditorCreator<ProtocolEditor> *pProtocolEditorItemCreator = new QStandardItemEditorCreator<ProtocolEditor>();
-                m_pItemEditorFactory->registerEditor(iProtocolId, pProtocolEditorItemCreator);
-
-                /* Register IPv4Editor/IPv6Editor as the IpData editor: */
-                int iIpId = qRegisterMetaType<IpData>();
-                if (!m_fIPv6)
-                {
-                    QStandardItemEditorCreator<IPv4Editor> *pIPv4EditorItemCreator = new QStandardItemEditorCreator<IPv4Editor>();
-                    m_pItemEditorFactory->registerEditor(iIpId, pIPv4EditorItemCreator);
-                }
-                else
-                {
-                    QStandardItemEditorCreator<IPv6Editor> *pIPv6EditorItemCreator = new QStandardItemEditorCreator<IPv6Editor>();
-                    m_pItemEditorFactory->registerEditor(iIpId, pIPv6EditorItemCreator);
-                }
-
-                /* Register PortEditor as the PortData editor: */
-                int iPortId = qRegisterMetaType<PortData>();
-                QStandardItemEditorCreator<PortEditor> *pPortEditorItemCreator = new QStandardItemEditorCreator<PortEditor>();
-                m_pItemEditorFactory->registerEditor(iPortId, pPortEditorItemCreator);
-
-                /* Set newly created item editor factory for table delegate: */
-                pStyledItemDelegate->setItemEditorFactory(m_pItemEditorFactory);
-            }
-        }
     }
 }
@@ -1212 +1251 @@
 }
 
-void UIPortForwardingTable::cleanup()
-{
-    delete m_pItemEditorFactory;
-    m_pItemEditorFactory = 0;
-}
-
 
 #include "UIPortForwardingTable.moc"

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

@@ -45 +45 @@
 class QAction;
 class QHBoxLayout;
-class QItemEditorFactory;
 class QIDialogButtonBox;
 class QITableView;
@@ -220 +219 @@
       * @param  fAllowEmptyGuestIPs  Brings whether this table allows empty guest IPs. */
     UIPortForwardingTable(const UIPortForwardingDataList &rules, bool fIPv6, bool fAllowEmptyGuestIPs);
-    /** Destructs Port Forwarding table. */
-    virtual ~UIPortForwardingTable() RT_OVERRIDE;
 
     /** Returns table-view reference. */
@@ -282 +279 @@
     /** Prepares table-model. */
     void prepareTableModel();
-    /** Prepares table-delegates. */
-    void prepareTableDelegates();
     /** Prepares toolbar. */
     void prepareToolbar();
-    /** Cleanups all. */
-    void cleanup();
 
     /** Holds the list of port forwarding rules. */
@@ -308 +301 @@
     /** Holds the tool-bar instance. */
     QIToolBar   *m_pToolBar;
-    /** Holds the item editor factory instance. */
-    QItemEditorFactory *m_pItemEditorFactory;
 
     /** Holds the table-model instance. */