diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml index aaddd39f..6e5d7c8b 100644 --- a/src/Resources/Locales/en_US.xaml +++ b/src/Resources/Locales/en_US.xaml @@ -361,26 +361,25 @@ Preference GENERAL SETTING - Language : - Avatar Server : + Language + Avatar Server Check for update Fetch remotes automatically (need restart) Restore windows GIT SETTING - Install Path : + Install Path Input path for git.exe - Default Clone Dir : + Default Clone Dir Default path to clone repo into - User Name : + User Name Global git user name - User Email : + User Email Global git user email - Enable Auto CRLF : + Enable Auto CRLF MERGE TOOL - Merger : - Install Path : + Merger + Install Path Input path for merge tool - Command : Select Git Executable File Select {0} Install Path diff --git a/src/Resources/Locales/zh_CN.xaml b/src/Resources/Locales/zh_CN.xaml index acf2030b..1220f92e 100644 --- a/src/Resources/Locales/zh_CN.xaml +++ b/src/Resources/Locales/zh_CN.xaml @@ -360,26 +360,25 @@ 偏好设置 通用配置 - 显示语言 : - 头像服务 : + 显示语言 + 头像服务 启用检测更新 启用定时自动拉取远程更新(重启生效) 启动时恢复上次打开的仓库 GIT配置 - 安装路径 : + 安装路径 填写git.exe所在位置 - 默认克隆路径 : + 默认克隆路径 默认的仓库本地存放位置 - 用户名 : + 用户名 默认GIT用户名 - 邮箱 : + 邮箱 默认GIT用户邮箱 - 自动换行转换 : + 自动换行转换 外部合并工具 - 工具 : - 安装路径 : + 工具 + 安装路径 填写工具可执行文件所在位置 - 命令行参数 : 选择git.exe所在位置 选择{0}所在位置 diff --git a/src/Views/Preference.xaml b/src/Views/Preference.xaml index 5fce30d3..423f9fc2 100644 --- a/src/Views/Preference.xaml +++ b/src/Views/Preference.xaml @@ -69,12 +69,11 @@ - - + @@ -90,7 +89,7 @@ Grid.Row="1" Grid.Column="0" Text="{DynamicResource Text.Preference.Locale}" HorizontalAlignment="Right" - Margin="0,0,6,0"/> + Margin="0,0,8,0"/> + Margin="0,0,8,0"/> + Margin="0,0,8,0"/> @@ -171,7 +170,7 @@ Grid.Row="9" Grid.Column="0" Text="{DynamicResource Text.Preference.Git.Dir}" HorizontalAlignment="Right" - Margin="0,0,6,0"/> + Margin="0,0,8,0"/> @@ -198,7 +197,7 @@ Grid.Row="10" Grid.Column="0" Text="{DynamicResource Text.Preference.Git.User}" HorizontalAlignment="Right" - Margin="0,0,6,0"/> + Margin="0,0,8,0"/> + Margin="0,0,8,0"/> + Margin="0,0,8,0"/> + Margin="0,0,8,0"/> + Margin="0,0,8,0"/> @@ -287,18 +286,6 @@ BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}" Icon="{StaticResource Icon.Folder.Open}"/> - - - - diff --git a/src/Views/Preference.xaml.cs b/src/Views/Preference.xaml.cs index 30ef3da3..6a91aacc 100644 --- a/src/Views/Preference.xaml.cs +++ b/src/Views/Preference.xaml.cs @@ -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();