Changeset 105056 in vbox

Timestamp:

Jun 27, 2024 11:06:49 AM (9 months ago)

Author:

vboxsync

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

163675

Message:

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

Location:

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

Files:

• UIShortcutConfigurationEditor.cpp (modified) (8 diffs)
• UIShortcutConfigurationEditor.h (modified) (1 diff)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -315 +315 @@
 
     /** Constructs table passing @a pParent to the base-class.
-      * @param  pModel         Brings the model this table is bound to.
       * @param  strObjectName  Brings the object name this table has, required for fast referencing. */
-    UIShortcutConfigurationView(QWidget *pParent, UIShortcutConfigurationModel *pModel, const QString &strObjectName);
+    UIShortcutConfigurationView(QWidget *pParent, const QString &strObjectName);
     /** Destructs table. */
     virtual ~UIShortcutConfigurationView() RT_OVERRIDE;
+
+    /** Sets the @a pModel for the view to present. */
+    virtual void setModel(QAbstractItemModel *pModel) RT_OVERRIDE;
 
 private slots:
@@ -332 +334 @@
     /** Cleanups all. */
     void cleanup();
+
+    /** Holds whether the view is polished. */
+    bool  m_fPolished;
 
     /** Holds the item editor factory instance. */
@@ -703 +708 @@
 
 UIShortcutConfigurationView::UIShortcutConfigurationView(QWidget *pParent,
-                                                         UIShortcutConfigurationModel *pModel,
                                                          const QString &strObjectName)
     : QITableView(pParent)
+    , m_fPolished(false)
     , m_pItemEditorFactory(0)
 {
     /* Set object name: */
     setObjectName(strObjectName);
-    /* Set model: */
-    setModel(pModel);
 
     /* Prepare all: */
@@ -721 +724 @@
     /* Cleanup all: */
     cleanup();
+}
+
+void UIShortcutConfigurationView::setModel(QAbstractItemModel *pModel)
+{
+    /* Call to base-class: */
+    QITableView::setModel(pModel);
+
+    /* Some stuff to be polished after a model is assigned: */
+    if (model() && !m_fPolished)
+    {
+        m_fPolished = true;
+
+        // WORKAROUND:
+        // Due to internal Qt bug QHeaderView::::setSectionResizeMode is only possible
+        // to be used after model is already assigned. Getting Qt crash otherwise.
+        horizontalHeader()->setSectionResizeMode(TableColumnIndex_Description, QHeaderView::Interactive);
+        horizontalHeader()->setSectionResizeMode(TableColumnIndex_Sequence, QHeaderView::Stretch);
+
+        /* Connect model: */
+        UIShortcutConfigurationModel *pHotKeyTableModel = qobject_cast<UIShortcutConfigurationModel*>(model());
+        if (pHotKeyTableModel)
+            connect(pHotKeyTableModel, &UIShortcutConfigurationModel::sigShortcutsLoaded,
+                    this, &UIShortcutConfigurationView::sltHandleShortcutsLoaded);
+    }
 }
 
@@ -746 +773 @@
     verticalHeader()->setDefaultSectionSize((int)(verticalHeader()->minimumSectionSize() * 1.33));
     horizontalHeader()->setStretchLastSection(false);
-    horizontalHeader()->setSectionResizeMode(TableColumnIndex_Description, QHeaderView::Interactive);
-    horizontalHeader()->setSectionResizeMode(TableColumnIndex_Sequence, QHeaderView::Stretch);
-
-    /* Connect model: */
-    UIShortcutConfigurationModel *pHotKeyTableModel = qobject_cast<UIShortcutConfigurationModel*>(model());
-    if (pHotKeyTableModel)
-        connect(pHotKeyTableModel, &UIShortcutConfigurationModel::sigShortcutsLoaded,
-                this, &UIShortcutConfigurationView::sltHandleShortcutsLoaded);
+    // WORKAROUND:
+    // Rest of horizontalHeader stuff is in setModel() above..
 
     /* Check if we do have proper item delegate: */
@@ -915 +936 @@
 
             /* Prepare Manager UI table: */
-            m_pTableManager = new UIShortcutConfigurationView(pTabManager, m_pModelManager, "m_pTableManager");
+            m_pTableManager = new UIShortcutConfigurationView(pTabManager, "m_pTableManager");
             if (m_pTableManager)
+            {
+                m_pTableManager->setModel(m_pModelManager);
                 pLayoutManager->addWidget(m_pTableManager);
+            }
         }
 
@@ -949 +973 @@
 
             /* Create Runtime UI table: */
-            m_pTableRuntime = new UIShortcutConfigurationView(pTabMachine, m_pModelRuntime, "m_pTableRuntime");
+            m_pTableRuntime = new UIShortcutConfigurationView(pTabMachine, "m_pTableRuntime");
             if (m_pTableRuntime)
+            {
+                m_pTableRuntime->setModel(m_pModelRuntime);
                 pLayoutMachine->addWidget(m_pTableRuntime);
+            }
         }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as