Commit graph

249 commits

Author SHA1 Message Date
leo
c9ce41aef3 feature: supports open in/diff with VSCodium (#102) 2024-05-03 21:54:10 +08:00
leo
776605cb68 code_review: PR #98
* remove the `Leave` option (it may lead to an undefined behaviour), so user can only choose `Stash & reapply` or `Discard`.
* re-design the UI
* remove unused resources
2024-04-29 17:22:22 +08:00
Alexander Bogomolets
927a1cab24 Add checkout local changes handling
This commit adds the local changes handling behavior for branch checkout.
One of three can be selected: stash and reapply after checkout, discard changes or leave them as is (previous behaviour)
2024-04-29 16:40:20 +08:00
leo
5e6059ba36 ux: hotkey tooltip in buttons 2024-04-29 15:22:06 +08:00
leo
84568e573a feature: test if conflicts have been resolved manually (#96) 2024-04-29 10:54:41 +08:00
leo
9b5e8429b9 feature: add hotkey 'F5' to reload/refresh whole repository 2024-04-28 10:19:12 +08:00
leo
9a68418f51 Merge pull request #92 from ennerperez/feature/issues-77
code_review:

* use JsonSerializerContext to avoid AOT warnnings
* since we call TryAdd by interating the installed tools, so detecting by environment variable becomes meaningless (it can not detect tools not installed by Toolbox). Just add it into founded directly
* remove unnecessary type defines
* determine the Icon used by tool while adding it to the founded list.

# Conflicts:
#	src/Native/Linux.cs
#	src/Native/MacOS.cs
#	src/Native/Windows.cs
2024-04-27 21:13:21 +08:00
Enner Pérez
59c941dd00 JetBrains Icons Resources 2024-04-27 02:10:51 -05:00
leo
80c864dad7 ux: chevron icon for MenuItem 2024-04-26 21:39:33 +08:00
leo
879f3cd76c code_style: replace tab with 2-spaces in xaml 2024-04-24 22:32:55 +08:00
leo
fd2160e56e feature: supports JetBrains Rider (#77) 2024-04-23 16:53:33 +08:00
leo
fbf1d5aa32 localization: update translations 2024-04-19 14:28:18 +08:00
leo
599ba01f20 ux: re-design Views.Repository
* It's better to move the `Navigate to HEAD` button to the top-right of this page.
* Icons and alignments
2024-04-18 10:50:14 +08:00
leo
69d9edf963 ux: add Icons.Submodule.Add 2024-04-15 20:34:58 +08:00
leo
cc6996444e ux: update icon for navigate to current HEAD button 2024-04-15 15:22:32 +08:00
leo
003ad66ccb ux: add menu icon for git-flow 2024-04-15 15:07:07 +08:00
leo
ab26bb83e9 refactor: re-design toolbar of Views.DiffView 2024-04-14 12:27:09 +08:00
Gadfly
a249eed1ac
feat: show git file mode change if exist 2024-04-12 21:38:36 +08:00
leo
f3f39ac593 feature: supports resolving multiple conflicts at once. 2024-04-11 20:50:19 +08:00
leo
1da754afe8 resource: update all icons to 64x64 (since we use this icons in 16x16 size) 2024-04-09 19:19:49 +08:00
leo
217800c83a feature: support Meld as an external merge tool on Linux platform 2024-04-09 15:36:11 +08:00
leo
17fc7ab994 ux: add icons for external merge tools 2024-04-09 15:00:52 +08:00
leo
4882fd9d69 refactor: external tools and shells
* rename Models.ExternalMergeTools to Models.ExternalMerger
* supports Git Bash/PowerShell/Command Prompt/Default Shell in Windows Terminal
2024-04-09 10:41:37 +08:00
leo
4ac705f8ca feature: add powershell support for Windows 2024-04-08 17:39:52 +08:00
leo
75f6087447 update: unify all external tool icons to 128 x 128 2024-04-08 10:01:17 +08:00
leo
24b6e39066 feature: add context menu for changes in Views.CommitDetail and Views.RevisionCompare to diff with external merge tool (#53) 2024-04-07 20:02:43 +08:00
leo
482fab97c0 ux: update Icons.Tree 2024-04-07 15:17:02 +08:00
leo
416b839df5 localization: use x:String instead of declare a new namespace for System.String 2024-04-07 10:06:17 +08:00
leo
040a6d4bba refactor: use axaml resource to manage locales instead of resx 2024-04-06 18:06:32 +08:00
leo
1196fabfc1 feature: external editor supports Sublime Text 2024-04-06 15:31:13 +08:00
leo
111bf2966a refactor: rewrite external editor supports
* supported editors can be different on different platforms.
* display founded editors only
2024-04-06 13:14:22 +08:00
leo
bcb83af576 ux: new style for statistics page 2024-04-03 17:34:06 +08:00
leo
d986aa7165 feature: add button to navigate to current HEAD (#50) 2024-04-02 20:54:57 +08:00
leo
96d4150d26 project: reorganize the structure of the project.
* remove dotnet-tool.json because the project does not rely on any dotnet tools.
* remove Directory.Build.props because the solution has only one project.
* move src/SourceGit to src. It's not needed to put all sources into a subfolder of src since there's only one project.
2024-04-02 20:00:33 +08:00
Enner Pérez
a1a14f8858 Project Location 2024-03-20 02:38:28 -05:00
leo
f175f5abc1 optimize: use combined diff view as default. 2024-03-20 13:08:01 +08:00
leo
abc97dce6c fix: missing localization for Text.Cut 2024-03-19 13:00:47 +08:00
leo
44c141be7c update: localizations
* fix Locales.Designer.cs NOT updated when compile after Locale.*.resx changed in Visual Studio 2022.
* use PublicResXFileCodeGenerator instead of ResXFileCodeGenerator to make sure access modifier is 'public' in Visual Studio 2022.
* use ResourceManager.GetResourceSet instead of collecting properties by reflection.
* remove translation warnings in Visual Studio's ResXManager extension.
2024-03-18 18:44:31 +08:00
Enner Pérez
aa4c7be813 Resx Folder Location 2024-03-17 22:34:24 -05:00
Enner Pérez
ad1fdbe6ee Resx Localization 2024-03-16 03:27:03 -05:00
Enner Pérez
cb90f8b98d en_US Typo Fixes 2024-03-13 03:10:02 -05:00
leo
ea49de2379 style: search bar style 2024-03-12 16:32:40 +08:00
leo
ea3e28b5e7 style: text editor's search panel border 2024-03-11 19:30:07 +08:00
leo
13c5c116fd doc: add text editor hotkeys information 2024-03-11 18:30:32 +08:00
leo
76505fb582 style: new text editor search panel style 2024-03-11 18:29:42 +08:00
leo
8c1fe66ee5 fix: using DropShadowEffect in Launcher's popup container on Linux will get a wrong render result. 2024-03-08 15:52:40 +08:00
leo
267c955c88 style: views supports Linux 2024-03-08 11:28:17 +08:00
leo
f834af10a2 refactor: change the way loading custom fonts 2024-03-05 16:02:47 +08:00
leo
acb74a4b95 feature: hotkeys enhancement. see issue #19 2024-03-05 10:46:08 +08:00
leo
7b70951c93 style<Launcher>: supports two size rules for tabs in titlebar - fixed width or size to content 2024-03-01 14:09:39 +08:00