diff --git a/TRANSLATION.md b/TRANSLATION.md index 4750d9739..e2d1478f0 100644 --- a/TRANSLATION.md +++ b/TRANSLATION.md @@ -6,14 +6,22 @@ This document shows the translation status of each locale file in the repository ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen) -### ![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen) +### ![de__DE](https://img.shields.io/badge/de__DE-99.90%25-yellow) -### ![es__ES](https://img.shields.io/badge/es__ES-99.27%25-yellow) +
+Missing keys in de_DE.axaml + +- Text.CommitMessageTextBox.Column + +
+ +### ![es__ES](https://img.shields.io/badge/es__ES-99.16%25-yellow)
Missing keys in es_ES.axaml - Text.ChangeCM.ResetFileTo +- Text.CommitMessageTextBox.Column - Text.GotoParentSelector - Text.Histories.Header.DateTime - Text.Histories.ShowColumns @@ -23,7 +31,7 @@ This document shows the translation status of each locale file in the repository
-### ![fr__FR](https://img.shields.io/badge/fr__FR-93.62%25-yellow) +### ![fr__FR](https://img.shields.io/badge/fr__FR-93.52%25-yellow)
Missing keys in fr_FR.axaml @@ -38,6 +46,7 @@ This document shows the translation status of each locale file in the repository - Text.ChangeCM.MergeExternal - Text.ChangeCM.ResetFileTo - Text.Checkout.WarnUpdatingSubmodules +- Text.CommitMessageTextBox.Column - Text.CommitMessageTextBox.Placeholder - Text.Compare.WithHead - Text.Configure.Git.AskBeforeAutoUpdatingSubmodules @@ -92,7 +101,7 @@ This document shows the translation status of each locale file in the repository
-### ![id__ID](https://img.shields.io/badge/id__ID-91.53%25-yellow) +### ![id__ID](https://img.shields.io/badge/id__ID-91.43%25-yellow)
Missing keys in id_ID.axaml @@ -112,6 +121,7 @@ This document shows the translation status of each locale file in the repository - Text.ChangeCM.ResetFileTo - Text.Checkout.WarnUpdatingSubmodules - Text.CommitCM.Drop +- Text.CommitMessageTextBox.Column - Text.CommitMessageTextBox.Placeholder - Text.Compare.WithHead - Text.Configure.CommitMessageTemplate.BuiltinVars @@ -181,12 +191,13 @@ This document shows the translation status of each locale file in the repository
-### ![it__IT](https://img.shields.io/badge/it__IT-99.27%25-yellow) +### ![it__IT](https://img.shields.io/badge/it__IT-99.16%25-yellow)
Missing keys in it_IT.axaml - Text.ChangeCM.ResetFileTo +- Text.CommitMessageTextBox.Column - Text.GotoParentSelector - Text.Histories.Header.DateTime - Text.Histories.ShowColumns @@ -196,7 +207,7 @@ This document shows the translation status of each locale file in the repository
-### ![ja__JP](https://img.shields.io/badge/ja__JP-71.76%25-red) +### ![ja__JP](https://img.shields.io/badge/ja__JP-71.68%25-red)
Missing keys in ja_JP.axaml @@ -268,6 +279,7 @@ This document shows the translation status of each locale file in the repository - Text.CommitDetail.Info.CopyNameAndEmail - Text.CommitDetail.Info.Key - Text.CommitDetail.Info.Signer +- Text.CommitMessageTextBox.Column - Text.CommitMessageTextBox.Placeholder - Text.CommitMessageTextBox.SubjectCount - Text.Compare.WithHead @@ -474,7 +486,7 @@ This document shows the translation status of each locale file in the repository
-### ![ko__KR](https://img.shields.io/badge/ko__KR-91.84%25-yellow) +### ![ko__KR](https://img.shields.io/badge/ko__KR-91.75%25-yellow)
Missing keys in ko_KR.axaml @@ -493,6 +505,7 @@ This document shows the translation status of each locale file in the repository - Text.ChangeCM.MergeExternal - Text.ChangeCM.ResetFileTo - Text.Checkout.WarnUpdatingSubmodules +- Text.CommitMessageTextBox.Column - Text.CommitMessageTextBox.Placeholder - Text.Compare.WithHead - Text.Configure.Git.AskBeforeAutoUpdatingSubmodules @@ -560,7 +573,7 @@ This document shows the translation status of each locale file in the repository
-### ![pt__BR](https://img.shields.io/badge/pt__BR-69.56%25-red) +### ![pt__BR](https://img.shields.io/badge/pt__BR-69.49%25-red)
Missing keys in pt_BR.axaml @@ -608,6 +621,7 @@ This document shows the translation status of each locale file in the repository - Text.CommitDetail.Info.CopyNameAndEmail - Text.CommitDetail.Info.Key - Text.CommitDetail.Info.Signer +- Text.CommitMessageTextBox.Column - Text.CommitMessageTextBox.Placeholder - Text.CommitMessageTextBox.SubjectCount - Text.Compare.WithHead @@ -859,17 +873,18 @@ This document shows the translation status of each locale file in the repository
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.79%25-yellow) +### ![ru__RU](https://img.shields.io/badge/ru__RU-99.69%25-yellow)
Missing keys in ru_RU.axaml +- Text.CommitMessageTextBox.Column - Text.SelfUpdate.CurrentVersion - Text.SelfUpdate.ReleaseDate
-### ![ta__IN](https://img.shields.io/badge/ta__IN-71.86%25-red) +### ![ta__IN](https://img.shields.io/badge/ta__IN-71.79%25-red)
Missing keys in ta_IN.axaml @@ -941,6 +956,7 @@ This document shows the translation status of each locale file in the repository - Text.CommitDetail.Info.CopyNameAndEmail - Text.CommitDetail.Info.Key - Text.CommitDetail.Info.Signer +- Text.CommitMessageTextBox.Column - Text.CommitMessageTextBox.Placeholder - Text.CommitMessageTextBox.SubjectCount - Text.Compare.WithHead @@ -1146,7 +1162,7 @@ This document shows the translation status of each locale file in the repository
-### ![uk__UA](https://img.shields.io/badge/uk__UA-72.70%25-red) +### ![uk__UA](https://img.shields.io/badge/uk__UA-72.62%25-red)
Missing keys in uk_UA.axaml @@ -1218,6 +1234,7 @@ This document shows the translation status of each locale file in the repository - Text.CommitDetail.Info.CopyNameAndEmail - Text.CommitDetail.Info.Key - Text.CommitDetail.Info.Signer +- Text.CommitMessageTextBox.Column - Text.CommitMessageTextBox.Placeholder - Text.CommitMessageTextBox.SubjectCount - Text.Compare.WithHead diff --git a/depends/AvaloniaEdit b/depends/AvaloniaEdit index 77f960a4e..80222a80b 160000 --- a/depends/AvaloniaEdit +++ b/depends/AvaloniaEdit @@ -1 +1 @@ -Subproject commit 77f960a4e61fe3d73fd40a8f6d3b4d4f9ea12027 +Subproject commit 80222a80b3f78d21da7db474d54a0d6a2e526c00 diff --git a/src/App.axaml.cs b/src/App.axaml.cs index 723a0251e..2d9637530 100644 --- a/src/App.axaml.cs +++ b/src/App.axaml.cs @@ -748,10 +748,17 @@ private void Check4Update(bool manually = false) private void ShowSelfUpdateResult(object data) { - Dispatcher.UIThread.Post(async () => + try { - await ShowDialog(new ViewModels.SelfUpdate { Data = data }); - }); + Dispatcher.UIThread.Invoke(async () => + { + await ShowDialog(new ViewModels.SelfUpdate { Data = data }); + }); + } + catch + { + // Ignore exceptions. + } } private string FixFontFamilyName(string input) diff --git a/src/Models/RepositoryUIStates.cs b/src/Models/RepositoryUIStates.cs index c9e1a04e0..6e591b396 100644 --- a/src/Models/RepositoryUIStates.cs +++ b/src/Models/RepositoryUIStates.cs @@ -117,6 +117,12 @@ public bool PushAllTags set; } = false; + public bool CreateAnnotatedTag + { + get; + set; + } = true; + public bool PushToRemoteWhenCreateTag { get; @@ -218,7 +224,7 @@ public static RepositoryUIStates Load(string gitDir) var fileInfo = new FileInfo(Path.Combine(gitDir, "sourcegit.uistates")); var fullpath = fileInfo.FullName; - RepositoryUIStates states = null; + RepositoryUIStates states; if (!File.Exists(fullpath)) { states = new RepositoryUIStates(); diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml index ff8d98383..bdd14810a 100644 --- a/src/Resources/Locales/en_US.axaml +++ b/src/Resources/Locales/en_US.axaml @@ -186,6 +186,7 @@ SHA Signer: Open in Browser + COL Enter commit message. Please use an empty-line to separate subject and description! SUBJECT Compare diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml index 3222d0b29..9260b56b3 100644 --- a/src/Resources/Locales/zh_CN.axaml +++ b/src/Resources/Locales/zh_CN.axaml @@ -190,6 +190,7 @@ 提交指纹 签名者 ： 浏览器中查看 + 列 请输入提交的信息。注意：主题与具体描述中间需要空白行分隔！ 主题 比较 diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml index d156206b6..95ea3fb55 100644 --- a/src/Resources/Locales/zh_TW.axaml +++ b/src/Resources/Locales/zh_TW.axaml @@ -190,6 +190,7 @@ 提交編號 簽署人: 在瀏覽器中檢視 + 列 請輸入提交訊息，標題與詳細描述之間請使用單行空白區隔。 標題 比較 diff --git a/src/ViewModels/CreateTag.cs b/src/ViewModels/CreateTag.cs index dbfdbd456..ff729aab9 100644 --- a/src/ViewModels/CreateTag.cs +++ b/src/ViewModels/CreateTag.cs @@ -29,8 +29,15 @@ public string Message public bool Annotated { - get => _annotated; - set => SetProperty(ref _annotated, value); + get => _repo.UIStates.CreateAnnotatedTag; + set + { + if (_repo.UIStates.CreateAnnotatedTag != value) + { + _repo.UIStates.CreateAnnotatedTag = value; + OnPropertyChanged(); + } + } } public bool SignTag @@ -83,9 +90,11 @@ public override async Task Sure() var log = _repo.CreateLog("Create Tag"); Use(log); - var cmd = new Commands.Tag(_repo.FullPath, _tagName).Use(log); - var succ = false; - if (_annotated) + var cmd = new Commands.Tag(_repo.FullPath, _tagName) + .Use(log); + + bool succ; + if (_repo.UIStates.CreateAnnotatedTag) succ = await cmd.AddAsync(_basedOn, Message, SignTag); else succ = await cmd.AddAsync(_basedOn); @@ -104,7 +113,6 @@ public override async Task Sure() private readonly Repository _repo = null; private string _tagName = string.Empty; - private bool _annotated = true; private readonly string _basedOn; } } diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs index fae7b2246..f315729c7 100644 --- a/src/ViewModels/Repository.cs +++ b/src/ViewModels/Repository.cs @@ -432,10 +432,12 @@ public Repository(bool isBare, string path, string gitDir) if (isWorktree) { var commonDir = File.ReadAllText(commonDirFile).Trim(); - if (!Path.IsPathRooted(commonDir)) + if (Path.IsPathRooted(commonDir)) + commonDir = new DirectoryInfo(commonDir).FullName; + else commonDir = new DirectoryInfo(Path.Combine(GitDir, commonDir)).FullName; - _gitCommonDir = commonDir; + _gitCommonDir = commonDir.Replace('\\', '/').TrimEnd('/'); } else { diff --git a/src/Views/Blame.axaml.cs b/src/Views/Blame.axaml.cs index 8f68826a2..c23dc311c 100644 --- a/src/Views/Blame.axaml.cs +++ b/src/Views/Blame.axaml.cs @@ -245,7 +245,7 @@ public VerticalSeparatorMargin(BlameTextEditor editor) public override void Render(DrawingContext context) { var pen = new Pen(_editor.BorderBrush); - context.DrawLine(pen, new Point(0, 0), new Point(0, Bounds.Height)); + context.DrawLine(pen, new Point(0.5, 0), new Point(0.5, Bounds.Height)); } protected override Size MeasureOverride(Size availableSize) diff --git a/src/Views/CommitMessageToolBox.axaml b/src/Views/CommitMessageToolBox.axaml index 3f247b646..2e0aa324d 100644 --- a/src/Views/CommitMessageToolBox.axaml +++ b/src/Views/CommitMessageToolBox.axaml @@ -35,7 +35,7 @@ Background="{DynamicResource Brush.Window}" BorderThickness="0" CornerRadius="0,0,4,4"> - +