summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* added "Open Origin in Explorer" to the data tabisanae2019-06-042-11/+37
* Merge pull request #749 from isanae/manual-nexus-api-keyLostDragonist2019-06-048-142/+482
|\
| * fixed title on the manual key dialogisanae2019-06-042-1/+3
| * renamed "revoke nexus authorization" to "disconnect from nexus" because "revo...isanae2019-06-046-153/+337
| * added new dialog to enter api key manuallyisanae2019-06-036-2/+156
* | Merge pull request #750 from isanae/more-menu-toolbarAl2019-06-043-34/+102
|\ \
| * | fixed exit menu item not workingisanae2019-06-032-4/+6
| * | more commentsisanae2019-06-031-0/+4
| * | renamed some of the menus to remove underscoresisanae2019-06-033-20/+38
| * | added menubar toggle in the context menuisanae2019-06-033-12/+56
* | | 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
|\ \
| * | remember the monitor numberisanae2019-06-032-0/+13
| |/
* | 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
* | 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
* | 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
* | removed actionToToolButton(), which was replacing QAction's in the toolbar wi...isanae2019-06-023-96/+59
* | - always show statusbar, used by the menu and toolbar to display status tipsisanae2019-06-025-48/+226
|/
* refresh files in the constructor because the ui is used to determine the tab ...isanae2019-05-311-1/+8
* conflict lists:isanae2019-05-314-50/+160
* advanced conflict list tooltipsisanae2019-05-311-0/+9
* conflict listsisanae2019-05-313-2/+39
* 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
* 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
* removed buddy from FilterWidget, the intention was to hook a ctrl+f shortcut ...isanae2019-05-313-10/+49
* added new filterwidget, will eventually get the operators functionality from ...isanae2019-05-316-6/+124
* 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
* added AlternativesVector typedef to FileEntryisanae2019-05-313-55/+92
* changed iterator loops to ranged forisanae2019-05-311-14/+28
* 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 directl...isanae2019-05-311-219/+234
* Merge pull request #739 from isanae/hide-conflict-itemsAl2019-05-295-159/+184
|\
| * reverted change that showed the conflicted file first in the preview dialogisanae2019-05-281-3/+1
| * 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
| * added selectedOrigin to previewFileWithAlternatives()isanae2019-05-284-7/+41
| * multiple selection for noconflict and overwritten listsisanae2019-05-273-129/+119
* | Merge pull request #732 from isanae/cmake-changesAl2019-05-283-10/+449
|\ \