Changeset 105058 in vbox

Timestamp:

Jun 27, 2024 12:44:55 PM (9 months ago)

Author:

vboxsync

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

163677

Message:

FE/Qt: bugref:10681: UIShortcutConfigurationEditor: Rework sorting a bit to depend on Qt signals/slots; But it will be replaced with sort-filtering model anyway.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIShortcutConfigurationEditor.cpp (modified) (6 diffs)

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

@@ -235 +235 @@
 signals:
 
-    /** Notifies about shortcuts loaded. */
-    void sigShortcutsLoaded();
     /** Notifies about data changed. */
     void sigDataChanged();
@@ -323 +321 @@
     virtual void setModel(QAbstractItemModel *pModel) RT_OVERRIDE;
 
-private slots:
-
-    /** Handles shortcuts loaded signal. */
-    void sltHandleShortcutsLoaded();
+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;
 
 private:
@@ -374 +375 @@
         m_shortcuts << new UIShortcutTableViewRow(view(), item);
     }
+
     /* Apply filter: */
     applyFilter();
-    /* Notify table: */
-    emit sigShortcutsLoaded();
 }
 
@@ -637 +637 @@
 {
     /* Sort whole the list: */
-    std::stable_sort(m_shortcuts.begin(), m_shortcuts.end(), UIShortcutItemSortingFunctor(iColumn, order));
+    std::stable_sort(m_filteredShortcuts.begin(), m_filteredShortcuts.end(), UIShortcutItemSortingFunctor(iColumn, order));
     /* Make sure host-combo item is always the first one: */
     UIShortcutConfigurationItem fakeHostComboItem(UIHostCombo::hostComboCacheKey(), QString(), QString(), QString(), QString());
     UIShortcutTableViewRow fakeHostComboTableViewRow(0, fakeHostComboItem);
-    const int iIndexOfHostComboItem = UIShortcutSearchFunctor<UIShortcutTableViewRow>()(m_shortcuts, fakeHostComboTableViewRow);
+    const int iIndexOfHostComboItem = UIShortcutSearchFunctor<UIShortcutTableViewRow>()(m_filteredShortcuts, fakeHostComboTableViewRow);
     if (iIndexOfHostComboItem != -1)
     {
-        UIShortcutTableViewRow *pHostComboItem = m_shortcuts.takeAt(iIndexOfHostComboItem);
-        m_shortcuts.prepend(pHostComboItem);
-    }
-    /* Apply the filter: */
-    applyFilter();
+        UIShortcutTableViewRow *pHostComboItem = m_filteredShortcuts.takeAt(iIndexOfHostComboItem);
+        m_filteredShortcuts.prepend(pHostComboItem);
+    }
     /* Notify the model: */
     emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
@@ -741 +739 @@
         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);
-    }
-}
-
-void UIShortcutConfigurationView::sltHandleShortcutsLoaded()
-{
-    /* Resize columns to feat contents: */
+    }
+}
+
+void UIShortcutConfigurationView::rowsInserted(const QModelIndex &parent, int iStart, int iEnd)
+{
+    /* Call to base-class: */
+    QITableView::rowsInserted(parent, iStart, iEnd);
+
+    /* Resize columns to fit contents: */
     resizeColumnsToContents();
 
-    /* Configure sorting: */
+    /* Reapply sorting: */
     sortByColumn(TableColumnIndex_Description, Qt::AscendingOrder);
+}
+
+void UIShortcutConfigurationView::prepare()
+{
+    /* Configure self: */
     setSortingEnabled(true);
-}
-
-void UIShortcutConfigurationView::prepare()
-{
-    /* Configure self: */
     setTabKeyNavigation(false);
     setContextMenuPolicy(Qt::CustomContextMenu);
@@ -1004 +999 @@
 }
 
+
 # include "UIShortcutConfigurationEditor.moc"