summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* renamed "revoke nexus authorization" to "disconnect from nexus" because ↵isanae2019-06-046-153/+337
| | | | | | | "revoking" is ambiguous reworked manual key dialog to look more like MO1 moved all the UI stuff from callbacks in Settings back to SettingsDialog in a central updateNexusButtons(), which also enables/disables buttons as needed
* added new dialog to enter api key manuallyisanae2019-06-036-2/+156
| | | | | added button in nexus settings to open the dialog added a force flag to apiCheck() to do a check with the new key even if the login was successful before
* Merge pull request #740 from isanae/new-conflict-listAl2019-06-019-355/+1173
|\ | | | | New conflict list, new "go to" conflict menu item
| * refresh files in the constructor because the ui is used to determine the tab ↵isanae2019-05-311-1/+8
| | | | | | | | states
| * conflict lists:isanae2019-05-314-50/+160
| | | | | | | | | | | | - the file index is now stored in the row data - the alternate origins are now added to the context menu in a "go to" submenu - context menu items are now visually disabled instead of omitted from the menu
| * advanced conflict list tooltipsisanae2019-05-311-0/+9
| |
| * conflict listsisanae2019-05-313-2/+39
| | | | | | | | | | | | - sorting on advanced list - save state of all four lists - call refreshLists() just before showing because the state has to be loaded first, which happens after the ctor
| * don't show open menu item if the files are from an archiveisanae2019-05-312-1/+14
| |
| * replaced all the manual UserRole stuff with a few constants and helper functionsisanae2019-05-314-63/+91
| | | | | | | | | | | | | | setConflictItem() is now used by all conflict lists to setup the data (filename, archive, etc.) and visuals (italic for archives) merged openDataFile() and previewDataFile() into their caller as they weren't used anywhere else previewDataFile() used to do a fromNativeSeparators() before previewing, moved that to previewFileWithAlternatives() instead brought overwrittenTree double click in line with overwriteTree, there's no difference between apply() and close() because there's only a close button
| * put back changes from another PR lost because of a bad rebaseisanae2019-05-311-7/+16
| |
| * restore conflicts selected tab and checkboxesisanae2019-05-313-8/+26
| |
| * FilterWidget takes a predicate to match stringsisanae2019-05-313-7/+42
| | | | | | | | copied the logic from modlistsortproxy so the basic boolean syntax in filters works
| * removed buddy from FilterWidget, the intention was to hook a ctrl+f shortcut ↵isanae2019-05-313-10/+49
| | | | | | | | | | | | | | to it, but that won't work as a general solution, it would need to be on tabs for the modinfo dialog added a simple matches() that just searches for the string FilterWidget can cleanly unhook itself
| * added new filterwidget, will eventually get the operators functionality from ↵isanae2019-05-316-6/+124
| | | | | | | | the mod/pluging lists
| * elide first two columns of the advanced listisanae2019-05-311-0/+25
| |
| * comments, switched some of the ifs for clarityisanae2019-05-311-5/+33
| |
| * added show all/nearest mods radio buttonsisanae2019-05-312-10/+55
| |
| * allow for refreshing individual conflict tabsisanae2019-05-313-30/+116
| | | | | | | | advanced conflict list now has items
| * added AlternativesVector typedef to FileEntryisanae2019-05-313-55/+92
| | | | | | | | split item creation from refreshConflictLists()
| * changed iterator loops to ranged forisanae2019-05-311-14/+28
| | | | | | | | | | added some autos here and there added some whitespace
| * split refreshLists() in twoisanae2019-05-312-10/+21
| |
| * added new tabs in the conflict tabisanae2019-05-311-217/+351
| |
| * moved all widgets in the conflict tab into a parent widget instead of ↵isanae2019-05-311-219/+234
|/ | | | directly being in the tab, allows for future additions to the tab
* Merge pull request #739 from isanae/hide-conflict-itemsAl2019-05-295-159/+184
|\ | | | | Share context menu between conflict lists
| * reverted change that showed the conflicted file first in the preview dialogisanae2019-05-281-3/+1
| | | | | | | | I'm not sure how I got to the conclusion that this was a better idea: preview was always an option for those files, and it has always shown the winning file, so I changed some long-standing behaviour for no reason. I reverted that change, although I'm leaving the functionality in previewFileWithAlternatives() to specify the selected origin because it works and could be useful in the future
| * also reversed 'hide' parameter to 'visible' for changeFiletreeVisibility()isanae2019-05-281-14/+15
| |
| * reversed 'hide' parameter to 'visible' for changeConflictItemsVisibility()isanae2019-05-281-11/+13
| | | | | | | | | | when I pass true to it, I expect it to be visible, not "yes, this should be hidden" I had actually started this earlier and ended up in a broken, in-between state, which should be fixed now
| * added selectedOrigin to previewFileWithAlternatives()isanae2019-05-284-7/+41
| | | | | | | | | | this is so that an origin other than the primary can be shown first and is used from previewDataFile() in ModInfoDialog since showing a preview for a conflicting file could initially show the file from the wrong mod removed unused, uninitialized and dangerous ModInfoDialog::m_OriginID
| * multiple selection for noconflict and overwritten listsisanae2019-05-273-129/+119
| | | | | | | | | | | | | | set uniformRowHeights for all three lists for faster rendering, all items are text only all three lists use the same code for the context menu: - createConflictMenuActions() returns a struct with the QActions that are valid for the selection - showConflictMenu() plugs in the handlers and shows the menu
* | Merge pull request #732 from isanae/cmake-changesAl2019-05-284-10/+465
|\ \ | | | | | | Adds filters, precompiled headers and quietness to the Visual Studio projects
| * \ Merge branch 'cmake-changes' of github_isa:isanae/modorganizer into ↵isanae2019-05-261-3/+0
| |\ \ | | | | | | | | | | | | cmake-changes
| | * | Update pch.hisanae2019-05-241-3/+0
| | | | | | | | | | | | removed headers that were redundant or actually from MO
| * | | set use_folders, puts all cmake generated projects into a folderisanae2019-05-261-0/+1
| |/ /
| * | added precompiled headersisanae2019-05-243-0/+282
| | |
| * | using builtin properties for autogen source groups, everything is now in the ↵isanae2019-05-241-25/+11
| | | | | | | | | | | | autogen filter
| * | turned autorcc on so no need for qt5_add_resources() anymoreisanae2019-05-242-3/+15
| | | | | | | | | | | | | | | qt5_wrap_ui() is redundant since autouic is already on generate INSTALL.vcxproj.user to have the proper debugging settings so ModOrganizer.exe is started from install/bin
| * | greatly decreased the verbosity of buildsisanae2019-05-242-3/+6
| | | | | | | | | | | | always include the INSTALL project in the solution build
| * | put source files in specific groups so they're organized in the visual ↵isanae2019-05-241-4/+178
| | | | | | | | | | | | studio project
* | | Merge pull request #734 from isanae/permissive-flagAl2019-05-288-13/+13
|\ \ \ | | | | | | | | Permissive flag
| * | | fixes for /permissive-:isanae2019-05-267-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | - no implicit conversions for enum classes - can't bind rvalue to non-const ref - string literals are const
| * | | added /permissive-isanae2019-05-261-1/+1
| |/ /
* | | Merge pull request #738 from isanae/crash-plugin-highlightAl2019-05-281-1/+1
|\ \ \ | |_|/ |/| | fixes a crash when highlighting plugins
| * | findFile() seems to return null in some cases and crash on the line belowisanae2019-05-271-1/+1
|/ / | | | | | | this is a quick fix for this particular crash, there's probably something deeper to fix
* | Merge pull request #735 from isanae/hover-activate-700Al2019-05-261-2/+9
|\ \ | | | | | | don't activate the window when hovering save files
| * | don't activate the window when hovering save filesisanae2019-05-261-2/+9
|/ / | | | | | | don't popup the widget if the window doesn't have focus
* | Merge pull request #733 from isanae/shell-functions-to-uibaseAl2019-05-263-176/+3
|\ \ | | | | | | moved shell functions to uibase
| * | moved shell functions to uibaseisanae2019-05-263-176/+3
|/ /
* | Merge pull request #731 from isanae/filetree-dds-preview-630Al2019-05-2612-390/+554
|\ \ | | | | | | Add preview to filetree, some refactoring
| * | moved getFileExecutionContext() and its enum into OrganizerCoreisanae2019-05-263-75/+76
| | |
| * | changed enum case to follow conventionisanae2019-05-263-10/+10
| | |