dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-24 21:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

style<Preference>: new layout for Preference window

Browse source
This commit is contained in:
leo 2021-08-05 16:37:29 +08:00
parent eeeeafbf0a
commit 6f5cfe078e
4 changed files with 28 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Views/Preference.xaml.cs
View file

@ -13,7 +13,6 @@ namespace SourceGit.Views {
public string User { get; set; }
public string Email { get; set; }
public string CRLF { get; set; }
public string MergeCmd { get; set; }
public Preference() {
if (Models.Preference.Instance.IsReady) {
@ -27,9 +26,6 @@ namespace SourceGit.Views {
CRLF = "false";
}
var merger = Models.MergeTool.Supported.Find(x => x.Type == Models.Preference.Instance.MergeTool.Type);
if (merger != null) MergeCmd = merger.Cmd;
InitializeComponent();
}
@ -84,9 +80,6 @@ namespace SourceGit.Views {
var tool = Models.MergeTool.Supported.Find(x => x.Type == type);
if (tool == null) return;
MergeCmd = tool.Cmd;
txtMergeCmd?.GetBindingExpression(TextBlock.TextProperty).UpdateTarget();
if (IsLoaded) {
Models.Preference.Instance.MergeTool.Path = tool.Finder();
txtMergeExec?.GetBindingExpression(TextBox.TextProperty).UpdateTarget();