summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | more commentsisanae2019-06-031-0/+4
| | | | | | | | |
| * | | | | | | | renamed some of the menus to remove underscoresisanae2019-06-033-20/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added Run menu with shortcuts, only visible when there are shortcuts to show fixed menubar visibility not being remembered
| * | | | | | | | added menubar toggle in the context menuisanae2019-06-033-12/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed two unused actions: actionToolbar_Size and actionToolbar_style added ways to make the menu reappear if you hide everything: - show the toolbar popup when right-clicking around the border of the main window - intercept the Alt key and make the main menu visible
* | | | | | | | | reset m_closing to false when the user cancels closingisanae2019-06-031-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #747 from isanae/splash-monitorAl2019-06-032-0/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Display the splash screen on the same monitor as the main window
| * | | | | | | | remember the monitor numberisanae2019-06-032-0/+13
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | use it to display the splash screen on the same monitor as the main window instead of where the mouse cursor is
* | | | | | | | missed some mnemonics in the main menuisanae2019-06-021-3/+3
| | | | | | | |
* | | | | | | | reduced the padding of toolbar icons in the vs15 themesisanae2019-06-026-12/+6
| | | | | | | |
* | | | | | | | update styles to handle the new menu barisanae2019-06-0217-94/+2135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also formatted the Transparent styles, all the css was on one line added a separator before the settings menu item fixed medium icon item not being checkable
* | | | | | | | added medium toolbar icon sizeisanae2019-06-023-9/+20
| | | | | | | |
* | | | | | | | the toolbar menu is now in the ui file instead of being created by handisanae2019-06-023-32/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's also shared between the main menu and the context menu
* | | | | | | | toolbar size and button style are now configurable and rememberedisanae2019-06-022-0/+74
| | | | | | | |
* | | | | | | | moved links to a new dedicated toolbarisanae2019-06-023-46/+57
| | | | | | | |
* | | | | | | | moved notification menu item to tools, was the only thing in viewisanae2019-06-023-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed endorse action to also work with the menu fixed changing endorsement integration setting not changing visibility of actions
* | | | | | | | removed actionToToolButton(), which was replacing QAction's in the toolbar ↵isanae2019-06-023-96/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with QToolButton's, making it very difficult to have an equivalent in the main menu. QAction's can have a menu, so use that instead. the only place this doesn't work is with the nexus button, which can be replaced by a menu if there are IPluginModPage plugins adding items to it; registerModPage() works fine with the toolbar, but doesn't handle the main menu yet
* | | | | | | | - always show statusbar, used by the menu and toolbar to display status tipsisanae2019-06-025-48/+226
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - reduced margins around central widgets to align it with status bar text, removed bottom margins completely because the statusbar is enough - notifications: now always enabled, dialog shows a special item when empty, just change the tooltip and leave the text alone - added all toolbar actions to menu - non functional in menu for now: tools, help and endorse because they're menus - changed some of the action strings to be the same on both toolbar and menu, added missing status tips
* | | | | | | 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-283-10/+449
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | 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-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always include the INSTALL project in the solution build