Commit Graph

1716 Commits

Author SHA1 Message Date
Martin Marmsoler
6c895fdd53 update ninja 2024-04-20 14:59:13 +02:00
Murmele
ec9980f699
Merge pull request #721 from jensenr30/navigation-hotkeys
Add Hotkeys for Navigating CommitList
2024-03-28 11:19:21 +01:00
Murmele
063099a208
Merge pull request #720 from jensenr30/hunk-header
Hunk header does not interfere with line wrapping
2024-03-28 11:16:11 +01:00
Ryan Jensen
611052da32 Add hotkeys D and U move DiffView down/up by half page 2024-03-24 21:54:54 -05:00
Ryan Jensen
7e182735e2 Add selectCommitRelative() 2024-03-21 01:17:47 -05:00
Ryan Jensen
770ac3c7a5 Add hotkeys: nextCommit and prevCommit 2024-03-20 22:07:04 -05:00
Ryan Jensen
5e124bd363 Simplify HunkLabel 2024-03-20 01:24:45 -05:00
Ryan Jensen
cec48ca95d Move HunkLabel.cpp into HunkWidget.cpp 2024-03-20 01:24:45 -05:00
Ryan Jensen
d4dc0f57b2 HunkHeader resizes itself to not interfere with line wrapping 2024-03-20 01:24:45 -05:00
Murmele
dac06473c0
Enable line wrapping
Merge pull request #709 from jensenr30/line-wrapping
2024-03-16 08:05:07 +01:00
Ryan Jensen
794347c279 Replace line wrap .webm with .gif
GitHub doesn't support webm yet
2024-03-15 20:35:20 -05:00
Ryan Jensen
a5be371509
Update docs/changelog.md - remove '->'
Co-authored-by: Murmele <Murmele@users.noreply.github.com>
2024-03-16 01:25:33 +00:00
Ryan Jensen
8b0973c8ea Line wrapping is disabled by default 2024-03-07 20:51:53 -06:00
Ryan Jensen
a6238e9f85 Add video of line wrapping to website; Add note to changelog 2024-03-07 20:32:18 -06:00
Ryan Jensen
0c50146f47 Add a check box in Settings->DiffPanel to enable line wrapping 2024-03-07 01:32:14 -06:00
Ryan Jensen
800a4c79c5 Enable line wrapping 2024-03-07 00:48:23 -06:00
Murmele
5d8091811d
Merge pull request #701 from jensenr30/fix-commit-highlighting
Fix commit highlighting
2024-02-27 10:26:49 +01:00
Ryan Jensen
22d81be025 Render 'Uncommitted changes' in italics 2024-02-25 17:18:33 -06:00
Ryan Jensen
1508333316 Highlight selected commit's backgrounds with painter->fillRect
Qt was adding additional highlighting that was distracting.  This commit
fixes that issue by manually drawing the highlighted background color
instead of relying on Qt to do that.
See
https://github.com/Murmele/Gittyup/issues/699
2024-02-25 17:06:10 -06:00
Murmele
fca7ee6b50
Merge pull request #700 from jensenr30/move-name-in-commit-list
Compact commit list: move commit message closer to commit graph
2024-02-24 06:49:16 +01:00
Ryan Jensen
3be4b5f96a Move commit messages closer to commit graph (compact mode)
also fix incorrect file name in README.md
2024-02-23 19:31:59 -06:00
Murmele
d37a32fddb
Merge pull request #693 from wolfseifert/delete-timeline-causes-crash-on-windows-#680
Delete timeline causes crash on windows #680
2024-02-20 14:04:13 +01:00
wolfseifert
3cd3ddba59
Update RepoView.cpp
reformatted
2024-02-14 12:47:15 +01:00
wolfseifert
b1f5b82657
Update MainWindow.cpp
reformatted
2024-02-14 12:45:49 +01:00
Murmele
dad3383b39
Merge pull request #695 from Murmele/dotGitError
Execute cdUp always
2024-02-13 21:11:47 +01:00
Martin Marmsoler
00a9ad1a20 Execute cdUp always
Description: In Debug mode the asserts are activated, but in Release mode not. In this case in the release build the cdUp will just be ignored.
2024-02-13 20:38:53 +01:00
wolfseifert
cfc90cd683
Update RepoView.cpp
delete-timeline-causes-crash-on-windows-#680
2024-02-08 15:38:37 +01:00
wolfseifert
9001e004e4
Update MainWindow.cpp
delete-timeline-causes-crash-on-windows-#680
2024-02-08 15:37:12 +01:00
Murmele
fbb4867afa
Merge pull request #682 from pwqw/patch-1
faster submodule update
2024-01-15 11:36:09 +01:00
Pin
241dd98058
faster submodule update
Submodules like `git` contain too much change history, which is not necessary to compile the program.  
Speeding up the setup significantly as well as saving space on the device is important.
2024-01-06 12:14:24 -03:00
Murmele
66bc256eed
Rebase: Use original commit message as default message
Merge pull request #674 from Murmele/rebase
2023-12-10 19:39:05 +01:00
Martin Marmsoler
b4e9885b95 set original commit message as default 2023-12-10 13:12:01 +01:00
Martin Marmsoler
faac6c58be add comments 2023-12-10 13:10:39 +01:00
Murmele
71da9986ad
Merge pull request #666 from Murmele/updateAction
update action
2023-11-21 14:07:16 +01:00
Murmele
e5fe010732
Merge pull request #665 from Murmele/appimagerelease
Publish appimage also for development release
2023-11-20 16:59:30 +01:00
Murmele
69d3e21a4a
Merge pull request #614 from ysalmon/betterHistory
Referring repos with their git-dir instead of their work-tree.
2023-11-20 14:38:04 +01:00
Murmele
6984d51722
Merge pull request #664 from Murmele/multicolumn
Use columns for file name, directory, and state when files are shown as a list in TreeViews.
2023-11-20 14:37:42 +01:00
Murmele
bbb6b88aff
Merge pull request #667 from Murmele/work/templateManualApply
Template: Apply with filenames from diff
2023-11-13 17:44:49 +01:00
Martin Marmsoler
5286ed190f Add hint that first template will be applied automatically 2023-11-12 21:53:55 +01:00
Martin Marmsoler
a63edf27f1 when clicking on template, also add filenames, otherwise nothing is shown 2023-11-12 21:48:50 +01:00
Martin Marmsoler
88073efabe update action 2023-11-12 20:17:52 +01:00
Martin Marmsoler
23bfb4e00f Publish appimage also for development release 2023-11-12 19:23:07 +01:00
Martin Marmsoler
73e3cf329a Format 2023-11-12 18:22:36 +01:00
Martin Marmsoler
c836908b9e Fix bug 2023-11-12 18:19:12 +01:00
Martin Marmsoler
986cbf140e updateView() must be done before expandAll is done, otherwise the collapse counter is wrong and an assert will be triggered 2023-11-12 18:10:12 +01:00
Martin Marmsoler
d598ac21fa updateView when updating the rest 2023-11-12 17:44:04 +01:00
Martin Marmsoler
9636a11923 reset selection, because when a list item is selected and treeview is used, no restore is possible with the collapse counter we use 2023-11-12 17:43:45 +01:00
Martin Marmsoler
ad5cfe306c forgotten to return value 2023-11-12 17:42:49 +01:00
Martin Marmsoler
1f3e81ab0b Add setting for multicolumn 2023-11-12 17:42:25 +01:00
Martin Marmsoler
7bb4a7a5f0 Use QAbstractItemModel because then mConstructed is not required and we gain more control 2023-11-12 17:41:13 +01:00