diff options
| author | isanae <14251494+isanae@users.noreply.github.com> | 2020-10-31 12:37:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-31 12:37:25 -0400 |
| commit | a57cb6bb718ba571a3f99ab08c1b15f06d49a9c3 (patch) | |
| tree | 6596a576cfdc14371056dd86a029bd924a7cb0bd /src/modinfodialogconflicts.cpp | |
| parent | 5ee734c1890fe35dbfff4770654051688fb3b725 (diff) | |
| parent | 71fc5d0af5593c04cd48587e72252cc0df24752d (diff) | |
Merge pull request #1275 from isanae/conflicts-sort
Conflict lists sorting not using natsort
Diffstat (limited to 'src/modinfodialogconflicts.cpp')
| -rw-r--r-- | src/modinfodialogconflicts.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp index 79ce6ade..feb20e65 100644 --- a/src/modinfodialogconflicts.cpp +++ b/src/modinfodialogconflicts.cpp @@ -559,12 +559,18 @@ GeneralConflictsTab::GeneralConflictsTab( m_filterOverwrite.setEdit(ui->overwriteLineEdit); m_filterOverwrite.setList(ui->overwriteTree); + m_filterOverwrite.setUseSourceSort(true); + m_filterOverwrite.setUpdateDelay(false); m_filterOverwritten.setEdit(ui->overwrittenLineEdit); m_filterOverwritten.setList(ui->overwrittenTree); + m_filterOverwritten.setUseSourceSort(true); + m_filterOverwritten.setUpdateDelay(false); m_filterNoConflicts.setEdit(ui->noConflictLineEdit); m_filterNoConflicts.setList(ui->noConflictTree); + m_filterNoConflicts.setUseSourceSort(true); + m_filterNoConflicts.setUpdateDelay(false); QObject::connect( ui->overwriteTree, &QTreeView::doubleClicked, @@ -789,9 +795,10 @@ AdvancedConflictsTab::AdvancedConflictsTab( m_tab(tab), ui(pui), m_core(oc), m_model(new AdvancedConflictListModel(ui->conflictsAdvancedList)) { - m_filter.setEdit(ui->conflictsAdvancedFilter); m_filter.setList(ui->conflictsAdvancedList); + m_filter.setUseSourceSort(true); + m_filter.setUpdateDelay(false); // left-elide the overwrites column so that the nearest are visible ui->conflictsAdvancedList->setItemDelegateForColumn( |