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

Timestamp:

Jun 26, 2024 3:29:27 PM (8 months ago)

Author:

vboxsync

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

163650

Message:

FE/Qt: bugref:10681: UIShortcutConfigurationEditor: A bit of rework related to model/view stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors

Files:

• UIShortcutConfigurationEditor.cpp (modified) (8 diffs)
• UIShortcutConfigurationEditor.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.cpp

@@ -244 +244 @@
     /** Constructs model passing @a pParent to the base-class.
       * @param  enmType  Brings the action-pool type this model is related to. */
-    UIShortcutConfigurationModel(QObject *pParent, UIType enmType);
-
-    /** Defines the parent @a pTable reference. */
-    void setTable(UIShortcutConfigurationView *pTable);
+    UIShortcutConfigurationModel(UIShortcutConfigurationEditor *pParent, UIType enmType);
 
     /** Loads a @a list of shortcuts to the model. */
@@ -283 +280 @@
 private:
 
+    /** Return the parent table-view reference. */
+    QITableView *view() const;
+
     /** Applies filter. */
     void applyFilter();
 
+    /** Holds the parent shortcut-configuration editor instance. */
+    UIShortcutConfigurationEditor *m_pShortcutConfigurationEditor;
+
     /** Holds the action-pool type this model is related to. */
     UIType  m_enmType;
-
-    /** Holds the parent table reference. */
-    UIShortcutConfigurationView *m_pTable;
 
     /** Holds current filter. */
@@ -340 +340 @@
 *********************************************************************************************************************************/
 
-UIShortcutConfigurationModel::UIShortcutConfigurationModel(QObject *pParent, UIType enmType)
+UIShortcutConfigurationModel::UIShortcutConfigurationModel(UIShortcutConfigurationEditor *pParent, UIType enmType)
     : QAbstractTableModel(pParent)
+    , m_pShortcutConfigurationEditor(pParent)
     , m_enmType(enmType)
-    , m_pTable(0)
-{
-}
-
-void UIShortcutConfigurationModel::setTable(UIShortcutConfigurationView *pTable)
-{
-    m_pTable = pTable;
+{
 }
 
@@ -362 +357 @@
             continue;
         /* Add suitable item to the model as a new shortcut: */
-        m_shortcuts << UIShortcutTableViewRow(m_pTable, item);
+        m_shortcuts << UIShortcutTableViewRow(view(), item);
     }
     /* Apply filter: */
@@ -646 +641 @@
 }
 
+QITableView *UIShortcutConfigurationModel::view() const
+{
+    switch (m_enmType)
+    {
+        case UIType_ManagerUI: return m_pShortcutConfigurationEditor->viewManager();
+        case UIType_RuntimeUI: return m_pShortcutConfigurationEditor->viewRuntime();
+    }
+}
+
 void UIShortcutConfigurationModel::applyFilter()
 {
@@ -793 +797 @@
 }
 
+QITableView *UIShortcutConfigurationEditor::viewManager()
+{
+    return m_pTableManager;
+}
+
+QITableView *UIShortcutConfigurationEditor::viewRuntime()
+{
+    return m_pTableRuntime;
+}
+
 void UIShortcutConfigurationEditor::load(const UIShortcutConfigurationList &value)
 {
@@ -895 +909 @@
             m_pTableManager = new UIShortcutConfigurationView(pTabManager, m_pModelManager, "m_pTableManager");
             if (m_pTableManager)
-            {
-                m_pModelManager->setTable(m_pTableManager);
                 pLayoutManager->addWidget(m_pTableManager);
-            }
         }
 
@@ -932 +943 @@
             m_pTableRuntime = new UIShortcutConfigurationView(pTabMachine, m_pModelRuntime, "m_pTableRuntime");
             if (m_pTableRuntime)
-            {
-                m_pModelRuntime->setTable(m_pTableRuntime);
                 pLayoutMachine->addWidget(m_pTableRuntime);
-            }
         }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.h

@@ -38 +38 @@
 class QLineEdit;
 class QTabWidget;
+class QITableView;
 class UIShortcutConfigurationModel;
-class UIShortcutConfigurationView;
 
 /** Shortcut search functor template. */
@@ -170 +170 @@
     UIShortcutConfigurationEditor(QWidget *pParent = 0);
 
+    /** Returns manager table-view reference. */
+    QITableView *viewManager();
+    /** Returns runtime table-view reference. */
+    QITableView *viewRuntime();
+
     /** Loads shortcut configuration list from passed @a value. */
     void load(const UIShortcutConfigurationList &value);
@@ -213 +218 @@
     QLineEdit                    *m_pEditorFilterManager;
     /** Holds the Manager UI shortcuts table instance. */
-    UIShortcutConfigurationView  *m_pTableManager;
+    QITableView                  *m_pTableManager;
     /** Holds the Runtime UI shortcuts filter instance. */
     QLineEdit                    *m_pEditorFilterRuntime;
     /** Holds the Runtime UI shortcuts table instance. */
-    UIShortcutConfigurationView  *m_pTableRuntime;
+    QITableView                  *m_pTableRuntime;
 };