summaryrefslogtreecommitdiff
path: root/src/modinfodialogconflicts.cpp
diff options
context:
space:
mode:
authorAl <26797547+Al12rs@users.noreply.github.com>2020-01-16 21:30:26 +0100
committerGitHub <noreply@github.com>2020-01-16 21:30:26 +0100
commita41c74bc5c6b3b090c3c6259da3b7ebee5a2ac5e (patch)
tree839a80ca0d5dd40a06f0b618dc529f5f25929630 /src/modinfodialogconflicts.cpp
parenta12e56f977f9c1e0aad31cd69719f5d6a6c619ea (diff)
parent58f35960281cf2522f3399b80ee1375afa6f1282 (diff)
Merge pull request #973 from Al12rs/hidden-files-flag
Added text filters for general conflicts lists
Diffstat (limited to 'src/modinfodialogconflicts.cpp')
-rw-r--r--src/modinfodialogconflicts.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 0fb8c5a6..baa5a33c 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -859,6 +859,15 @@ GeneralConflictsTab::GeneralConflictsTab(
m_expanders.overwritten.set(ui->overwrittenExpander, ui->overwrittenTree, true);
m_expanders.nonconflict.set(ui->noConflictExpander, ui->noConflictTree);
+ m_filterOverwrite.setEdit(ui->overwriteLineEdit);
+ m_filterOverwrite.setList(ui->overwriteTree);
+
+ m_filterOverwritten.setEdit(ui->overwrittenLineEdit);
+ m_filterOverwritten.setList(ui->overwrittenTree);
+
+ m_filterNoConflicts.setEdit(ui->noConflictLineEdit);
+ m_filterNoConflicts.setList(ui->noConflictTree);
+
QObject::connect(
ui->overwriteTree, &QTreeView::doubleClicked,
[&](auto&&){ m_tab->activateItems(ui->overwriteTree); });