diff options
| author | Al <26797547+Al12rs@users.noreply.github.com> | 2020-01-16 21:30:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 21:30:26 +0100 |
| commit | a41c74bc5c6b3b090c3c6259da3b7ebee5a2ac5e (patch) | |
| tree | 839a80ca0d5dd40a06f0b618dc529f5f25929630 /src/modinfodialogconflicts.h | |
| parent | a12e56f977f9c1e0aad31cd69719f5d6a6c619ea (diff) | |
| parent | 58f35960281cf2522f3399b80ee1375afa6f1282 (diff) | |
Merge pull request #973 from Al12rs/hidden-files-flag
Added text filters for general conflicts lists
Diffstat (limited to 'src/modinfodialogconflicts.h')
| -rw-r--r-- | src/modinfodialogconflicts.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h index 1297e536..e0c2092d 100644 --- a/src/modinfodialogconflicts.h +++ b/src/modinfodialogconflicts.h @@ -45,6 +45,10 @@ private: ConflictListModel* m_overwrittenModel; ConflictListModel* m_noConflictModel; + FilterWidget m_filterOverwrite; + FilterWidget m_filterOverwritten; + FilterWidget m_filterNoConflicts; + ConflictItem createOverwriteItem( MOShared::FileEntry::Index index, bool archive, QString fileName, QString relativeName, |