summaryrefslogtreecommitdiff
path: root/src/modinfodialogconflicts.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Starfield: Updated blueprint / blueprint prefix support (#2368)Jeremy Rimpo2026-04-161-1/+1
| | | | | | | | | | * Add blueprint handling with blueprintships * Blueprint changes - Add tooltips - Add warnings - Handle blueprint prefixes properly * Make sure we're assigning the property
* Ignore conflicts between hidden files (#2148)Jonathan Feenstra2025-05-231-48/+74
| | | | * Ignore conflicts between hidden files * Optimize checks for .mohidden extension
* Apply clang-format.Mikaël Capelle2023-07-091-234/+227
|
* First pass for Qt6 compatibilityJeremy Rimpo2022-04-191-1/+1
|
* Remove unused variables.Mikaël Capelle2021-01-211-3/+0
|
* removed setUpdateDelay(false) calls, it's the defaultisanae2020-12-261-5/+1
| | | | FilterWidget for downloads tab
* fixes after rebasingisanae2020-11-031-7/+7
|
* Convert FileAlternative and DataArchiveOrigin to classesAL2020-11-021-10/+10
|
* Change Alternatives vector to use a structAL2020-11-021-12/+12
|
* Print the name, not the origin objectAL2020-10-311-1/+1
|
* Merge pull request #1274 from ModOrganizer2/conflicts_conter_tooltipAl2020-10-311-11/+108
|\ | | | | Add advanced counters as tooltip to general conflicts tab.
| * handle case of find_if failingAL2020-10-311-0/+6
| |
| * prefer if over ternary opAL2020-10-311-4/+20
| |
| * Cleanup clear()AL2020-10-311-1/+2
| |
| * Add advanced counters as tooltip to general conflicts tab.AL2020-10-301-11/+85
| | | | | | | | Loose, archive, totals, percentages.
* | stack overflow when searching text files/ini lists because they reported ↵isanae2020-10-311-1/+8
| | | | | | | | | | | | | | children to infinity and beyond removed update delays for filters in mod info dialog fixed conflict lists not using source sorting so they wouldn't use the case insensitive natsort
* | Prefer early return in case of error.AL2020-10-311-49/+47
| |
* | Fix typos in commentsAL2020-10-311-3/+3
| |
* | use alternatives.back() instead of iterator shenanigans.AL2020-10-311-1/+1
| |
* | Make advanced conflicts tab use italic if current mod file is from archive, ↵AL2020-10-301-1/+3
| | | | | | | | instead of using the status of the winning version.
* | Fix advanced conflicts tab archive orders.AL2020-10-281-52/+81
|/ | | | Use the the existing sorting of the alternatives vector instead of relying on priority (archives don't follow priority).
* fixed warnings about Q_OBJECT and thousand separatorsisanae2020-04-181-331/+1
| | | | had to move some classes to header files
* split directoryentryisanae2020-02-181-9/+12
| | | | made classes noncopyable, fixed a few unintended copies
* Renamed underscores function name to pascal caseAl2020-01-211-7/+7
|
* Removed missed lineAl2020-01-211-2/+0
|
* Fixed missing context menu on general conflicts tab.Al2020-01-211-31/+72
| | | | | Was due to the new FilterWidget adding a QSortProxy and the selection had to be translated to the underlying model. Normalized use of FilderWidget on the Advanced Conflicts tab.
* Added text filters for general conflicts listsAl2020-01-151-0/+9
|
* removed dead setDefaultActivationActionForFile()isanae2019-12-091-4/+0
|
* conflicts tab: run exes unhooked by defaultisanae2019-12-081-32/+40
|
* implemented previews on double-click for the data and conflicts tabsisanae2019-12-041-14/+43
|
* double-click now opens files for the data tab, filetree and conflict listsisanae2019-12-021-2/+14
|
* added "open with vfs" to the data tabisanae2019-12-021-23/+25
| | | | uniform order for file context menus
* added "open with vfs" option to conflicts tabisanae2019-12-021-2/+37
|
* added a ForceWait flag to bypass disabled lockingisanae2019-11-061-1/+1
| | | | merged a bunch of unnecessary functions in ProcessRunner
* explicit refresh parameter for setWaitForCompletion(), some parts of the ui ↵isanae2019-11-061-1/+5
| | | | | | | | will crash if things refresh unexpectedly removed runFile() fixed crash when unlocking if some widgets were destroyed in the meantime lock widget will now pick the active window and disable all top levels
* split to processrunnerisanae2019-11-061-1/+1
| | | | | added IUserInterface::qtWidget() put back IUserInterface in OrganizerCore now that there's a way to get the widget
* renamed runExecutable() to runExecutablefile()isanae2019-11-061-1/+1
| | | | added runExecutable() for Executable class, also used by runShortcut()
* added error messages to FileRenamer and a few moreisanae2019-10-041-1/+1
| | | | fixes for shell functions changing names
* split settings into a bunch of classesisanae2019-09-021-8/+8
| | | | removed "get" from the getters that had it
* added settings for QTabWidget, checkable QAbstractButton and ExpanderWidgetisanae2019-08-241-80/+22
| | | | removed directInterface() from mod info conflicts
* Merge pull request #807 from isanae/logging-reworkJeremy Rimpo2019-08-021-11/+19
|\ | | | | Logging rework
| * changed qDebug() to log::debug()isanae2019-07-221-8/+16
| | | | | | | | removed some commented out logging
| * changed qCritical() to log::error()isanae2019-07-221-3/+3
| | | | | | | | removed now unused vlog()
* | More refactoringSilarn2019-07-031-1/+1
| |
* | Refactor obsolete methodsSilarn2019-07-031-5/+4
|/
* added a ModInfoDialogTabContext to avoid passing too many things to tab ↵isanae2019-07-021-7/+5
| | | | | | | | constructors mod is passed to ctors to make sure they can never be empty only call deleteRequest() to selected mod comments
* added explore menu item to conflict lists and filetreeisanae2019-07-021-5/+38
| | | | | changed filetree context menu to always show all items added mnemonics to conflicts context menu
* filterwidget now support automatically installing a proxy on listsisanae2019-07-021-2/+2
| | | | filters on txt and ini tabs
* added path and explore button to images tabisanae2019-07-021-14/+4
|
* various optimizations and cachingisanae2019-07-021-79/+107
| | | | | | fixed conflict list not sorting when changing parameters switched from QDirIterator to std::filesystem, much faster FilterWidget precompiles the list