Commit graph

2775 commits

Author SHA1 Message Date
Göran W
0d919273b4
Merge c5dc25bed4 into 807cec8a30 2024-11-28 15:00:59 +00:00
goran-w
c5dc25bed4 Added ToggleTwoSideDiff(), so we can refresh change-block indicator 2024-11-28 15:23:55 +01:00
goran-w
d0fd3ca6a0 Added safeguards for edge cases 2024-11-28 15:23:55 +01:00
goran-w
b72f701324 The 2 implementations can now be switched
Added a bool property DiffView.UseChangeBlocks.
It's not bound from UI yet, but could be used for runtime switching between the two different implementations of prev/next change.
The buttons are now using the OnGoto[Prev|Next]Change Click-handler, regardless of implementation.
2024-11-28 15:23:55 +01:00
goran-w
52550fe53e Added indicator of current/total change-blocks in DiffView toolbar 2024-11-28 15:23:54 +01:00
goran-w
cabf1e84d3 Make sure SyncScrollOffset is updated after JumpToChangeBlock() 2024-11-28 15:23:54 +01:00
goran-w
2edf01db3b Improve navigation behavior
Prev/next at start/end of range now (re-)scrolls to first/last change-block
(I.e when unset, or already at first/last change-block, or at the only one.)
Current change-block is now unset in RefreshContent().
2024-11-28 15:23:54 +01:00
goran-w
392ab5061e Implemented change-block navigation
Modified behavior of the Prev/Next Change buttons in DiffView toolbar.
Well-defined change-blocks are pre-calculated and can be navigated between.
Current change-block is highlighted in the Diff panel(s).
2024-11-28 15:23:53 +01:00
goran-w
7d91c21b87 Corrected misspelled local variable nextHigh(t)light 2024-11-28 15:23:53 +01:00
leo
807cec8a30
fix: wrong column indentation on right side of Interactive Rebase window, for wide commit messages (#764)
Some checks failed
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
Localization Check / localization-check (push) Has been cancelled
2024-11-28 21:40:51 +08:00
leo
58eeeab67b
enhance: set core.autocrlf to false when run git diff to get detail changes of selected file (#761) 2024-11-28 19:36:23 +08:00
github-actions[bot]
8f4d3fd957 doc: Update translation status and missing keys 2024-11-28 05:57:58 +00:00
Efrem Ropelato
ccf03ce2de
fix ita locale: add ResourceInclude en_US.axaml (#762)
* Italian translation

* fix ita locale: add ResourceInclude en_US.axaml
2024-11-28 13:57:46 +08:00
leo
315a226365
code_review: PR #759
* code indent
* update README.md
2024-11-28 09:48:07 +08:00
github-actions[bot]
ba0bb35ca6 doc: Update translation status and missing keys 2024-11-28 01:45:10 +00:00
Efrem Ropelato
e66179aeb8
Italian translation (#759) 2024-11-28 09:44:59 +08:00
leo
e224f59ea7
enhance: clear unhandled key modifer before running command (#748)
Some checks are pending
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
Localization Check / localization-check (push) Waiting to run
2024-11-27 20:21:01 +08:00
leo
1872148d98
fix: the way to deal with local changes did not update after radio toggle changed (#748) 2024-11-27 18:31:50 +08:00
leo
1c0d8a2697
fix: git rev-list do not support --decorate-refs-exclude (#746)
Do not use histories filters to query commit children
2024-11-27 17:06:44 +08:00
leo
d38d1b11e8
fix: typo in Text.Preference.General.ShowChildren 2024-11-27 15:27:57 +08:00
leo
c5d82eb719
ux: new style for ToggleButton.toggle_untracked 2024-11-27 11:10:44 +08:00
leo
c70f94cba1
ux: change Height of repository search bar 2024-11-27 10:08:20 +08:00
leo
cb9110baef
ux: new style for repository sub-view switcher 2024-11-27 10:02:26 +08:00
leo
4fc32b2b59
fix: crash due to font family name is an empty space (#745) 2024-11-27 09:17:18 +08:00
leo
bb41fcea3e
fix: DisplayRange is not updated when text diff view is opened for the first time
Some checks are pending
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
2024-11-26 19:52:13 +08:00
leo
a1c48dd11b
project: upgrade AvaloniaUI to 11.2.2 2024-11-26 14:39:58 +08:00
leo
78fcc0117e
ux: style for tooltip
Some checks failed
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
Localization Check / localization-check (push) Has been cancelled
Signed-off-by: leo <longshuang@msn.cn>
2024-11-25 11:42:48 +08:00
leo
7d3b996de0
Merge branch 'master' into develop 2024-11-25 09:38:28 +08:00
leo
ee82067940
Merge branch 'release/8.40' 2024-11-25 09:37:44 +08:00
leo
12deb1d2c3
version: Release 8.40
Signed-off-by: leo <longshuang@msn.cn>
2024-11-25 09:37:02 +08:00
Chiahong
57d4842435
localization: update zh_TW.axaml (#739) 2024-11-25 09:28:55 +08:00
github-actions[bot]
d0f9e994bb doc: Update translation status and missing keys 2024-11-25 01:28:48 +00:00
AquariusStar
772f1a93b4
localiztion: update (#738) 2024-11-25 09:28:36 +08:00
github-actions[bot]
55e3bfa2d4 doc: Update translation status and missing keys 2024-11-25 01:28:22 +00:00
Nils van Rijsinge
831462b594
Add missing de_DE keys (#737)
* localization: add missing de_DE keys

- CommitDetail.Info.Children, General.ShowChildren were added in cc5bb5f
- Text.Fetch.Force was added in 153a1f3
- Repository.HistoriesOrder... were added in b25f9bd
- SHALinkCM.NavigateTo was added in 12f7531

* localization: fix invalid XAML
2024-11-25 09:28:09 +08:00
Nils van Rijsinge
bf4080b773
fix: crash on goto to SHA, NullReferenceException (#741) 2024-11-25 09:24:16 +08:00
leo
4160f8ab9c
fix: only set tooltip if commit exists
Some checks are pending
Continuous Integration / Build (push) Waiting to run
Continuous Integration / Prepare version string (push) Waiting to run
Continuous Integration / Package (push) Blocked by required conditions
Localization Check / localization-check (push) Waiting to run
Signed-off-by: leo <longshuang@msn.cn>
2024-11-24 21:43:31 +08:00
leo
b2e01f0d3e
feature: add tooltip for SHA in commit message presenter (#734)
Signed-off-by: leo <longshuang@msn.cn>
2024-11-24 21:22:04 +08:00
leo
637f138d63
code_style: remove Rider warning
Signed-off-by: leo <longshuang@msn.cn>
2024-11-24 20:28:32 +08:00
github-actions[bot]
f820c0ccac doc: Update translation status and missing keys 2024-11-24 03:06:15 +00:00
leo
457a1e79c7
code_review: PR #734
* remove unnecessary namespace using
* do NOT set tooltip currently, because CommitDetail.GetParent may cause UI lags and the tooltip DataTemplate is not provided.
* add translations for zh_CN and zh_TW

Signed-off-by: leo <longshuang@msn.cn>
2024-11-24 11:05:55 +08:00
github-actions[bot]
53220f9a36 doc: Update translation status and missing keys 2024-11-24 02:53:30 +00:00
Dmitrij D. Czarkoff
12f75315bd
feat: context menu for a commit in commit message (#734)
* feat: context menu for a commit in commit message

When a commit message happens to contain a commit link and the user elects to right-click it, instead of navigating them to the commit,  present a menu with options to navigate to it or to copy SHA.

* feat: show commit tooltip as well

`_lastHover` in the `if` is also swapped for `match`for consistency with the block body
2024-11-24 10:53:16 +08:00
leo
693940368b
code_style: remove unused variable
Signed-off-by: leo <longshuang@msn.cn>
2024-11-24 10:20:40 +08:00
Dmitrij D. Czarkoff
e3d6ee0f40
fix: better https regex (#735)
Fixes #733
2024-11-24 10:15:17 +08:00
Dmitrij D. Czarkoff
546f628470
fix: don't reverse commit order when cherry-picking (#736)
Fixes #726.  Looks like a980cc987d isn't sufficient.  It sorts the commits according to the ordering in history,  but then CherryPick ViewModel reverses the order.

This commit changes CherryPick ViewModel to use string.Join on the commit list without reordering,  so that the ordering is controlled entirely by the caller.
2024-11-24 09:32:47 +08:00
leo
cd96a28545
fix: typo in English (#731)
Some checks failed
Continuous Integration / Build (push) Has been cancelled
Continuous Integration / Prepare version string (push) Has been cancelled
Localization Check / localization-check (push) Has been cancelled
Continuous Integration / Package (push) Has been cancelled
Signed-off-by: leo <longshuang@msn.cn>
2024-11-22 18:47:06 +08:00
Martin Garstenauer
3ae3c587d8
fix: typo in English (#731) 2024-11-22 18:43:45 +08:00
leo
c78e2e59d9
enhance: git format-patch
* use `--output=<file>` instead of `-o <dir>` to avoid failure because the directory cannot be created
* make generated patches in order when format multiple commits

Signed-off-by: leo <longshuang@msn.cn>
2024-11-22 18:40:59 +08:00
leo
c50508d4ac
fix: try to fix the issue that the branch tree did not update after deleting multiple branches (#729)
Signed-off-by: leo <longshuang@msn.cn>
2024-11-22 10:42:53 +08:00