!25 配置窗口增加实用功能

Merge pull request !25 from carterl/preference

src/Commands/Version.cs

@@ -0,0 +1,18 @@
+using System;
+
+namespace SourceGit.Commands {
+    /// <summary>
+    ///     检测git是否可用，并获取git版本信息
+    /// </summary>
+    public class Version : Command {
+        const string GitVersionPrefix = "git version ";
+        public string Query() {
+            Args = $"--version";
+            var result = ReadToEnd();
+            if (!result.IsSuccess || string.IsNullOrEmpty(result.Output)) return null;
+            var version = result.Output.Trim();
+            if (!version.StartsWith(GitVersionPrefix, StringComparison.Ordinal)) return null;
+            return version.Substring(GitVersionPrefix.Length);
+        }
+    }
+}

src/Models/Preference.cs

@@ -77,6 +77,11 @@ namespace SourceGit.Models {
             ///     是否启用崩溃上报
             /// </summary>
             public bool EnableCrashReport { get; set; } = false;
+
+            /// <summary>
+            ///     是否尝试使用 Windows Terminal 打开终端
+            /// </summary>
+            public bool UseWindowsTerminal { get; set; } = false;
         }
 
         /// <summary>
@@ -189,13 +194,11 @@ namespace SourceGit.Models {
         }
 
         /// <summary>
-        ///     检测配置是否
+        ///     检测配置是否正常
         /// </summary>
         [JsonIgnore]
         public bool IsReady {
-            get {
+            get => File.Exists(Git.Path) && new Commands.Version().Query() != null;
-                return !string.IsNullOrEmpty(Git.Path) && File.Exists(Git.Path);
-            }
         }
 
         #region DATA

src/Resources/Locales/en_US.xaml

@@ -360,9 +360,11 @@
     <sys:String x:Key="Text.Preference.AutoFetch">Fetch remotes automatically (need restart)</sys:String>
     <sys:String x:Key="Text.Preference.RestoreTabs">Restore windows</sys:String>
     <sys:String x:Key="Text.Preference.EnableCrashReport">Enable crash report (maybe include related path)</sys:String>
+    <sys:String x:Key="Text.Preference.UseWindowsTerminal">Use Windows Terminal to open Git terminal</sys:String>
     <sys:String x:Key="Text.Preference.Git">GIT SETTING</sys:String>
     <sys:String x:Key="Text.Preference.Git.Path">Install Path</sys:String>
     <sys:String x:Key="Text.Preference.Git.Path.Placeholder">Input path for git.exe</sys:String>
+    <sys:String x:Key="Text.Preference.Git.Version">Git version</sys:String>
     <sys:String x:Key="Text.Preference.Git.Dir">Default Clone Dir</sys:String>
     <sys:String x:Key="Text.Preference.Git.Dir.Placeholder">Default path to clone repo into</sys:String>
     <sys:String x:Key="Text.Preference.Git.User">User Name</sys:String>

src/Resources/Locales/zh_CN.xaml

@@ -359,9 +359,11 @@
     <sys:String x:Key="Text.Preference.AutoFetch">启用定时自动拉取远程更新（重启生效）</sys:String>
     <sys:String x:Key="Text.Preference.RestoreTabs">启动时恢复上次打开的仓库</sys:String>
     <sys:String x:Key="Text.Preference.EnableCrashReport">开启崩溃上报（可能涉及上报相关路径）</sys:String>
+    <sys:String x:Key="Text.Preference.UseWindowsTerminal">使用 Windows Terminal 打开 Git 终端</sys:String>
     <sys:String x:Key="Text.Preference.Git">GIT配置</sys:String>
     <sys:String x:Key="Text.Preference.Git.Path">安装路径</sys:String>
     <sys:String x:Key="Text.Preference.Git.Path.Placeholder">填写git.exe所在位置</sys:String>
+    <sys:String x:Key="Text.Preference.Git.Version">Git 版本</sys:String>
     <sys:String x:Key="Text.Preference.Git.Dir">默认克隆路径</sys:String>
     <sys:String x:Key="Text.Preference.Git.Dir.Placeholder">默认的仓库本地存放位置</sys:String>
     <sys:String x:Key="Text.Preference.Git.User">用户名</sys:String>

src/Views/Preference.xaml

@@ -65,6 +65,7 @@
                 <RowDefinition Height="28"/>
                 <RowDefinition Height="28"/>
                 <RowDefinition Height="28"/>
+                <RowDefinition Height="28"/>
                 <RowDefinition Height="8"/>
                 <RowDefinition Height="36"/>
                 <RowDefinition Height="28"/>
@@ -72,6 +73,7 @@
                 <RowDefinition Height="28"/>
                 <RowDefinition Height="28"/>
                 <RowDefinition Height="28"/>
+                <RowDefinition Height="28"/>
                 <RowDefinition Height="8"/>
                 <RowDefinition Height="36"/>
                 <RowDefinition Height="28"/>
@@ -188,20 +190,27 @@
                 Content="{DynamicResource Text.Preference.EnableCrashReport}"
                 IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.EnableCrashReport, Mode=TwoWay}"/>
 
+            <!-- Use Windows Terminal -->
+            <CheckBox
+                Grid.Row="9" Grid.Column="1"
+                Content="{DynamicResource Text.Preference.UseWindowsTerminal}"
+                IsEnabled="{Binding ElementName=me, Path=EnableWindowsTerminal}"
+                IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.UseWindowsTerminal, Mode=TwoWay}"/>
+
             <!-- Git Group -->
             <TextBlock
-                Grid.Row="10" Grid.Column="0" Grid.ColumnSpan="2"
+                Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2"
                 Text="{DynamicResource Text.Preference.Git}"
                 FontSize="16" FontWeight="DemiBold"
                 Foreground="{DynamicResource Brush.FG2}"/>
 
             <!-- Git Executable Path -->
             <TextBlock
-                Grid.Row="11" Grid.Column="0" 
+                Grid.Row="12" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Git.Path}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
-            <Grid Grid.Row="11" Grid.Column="1">
+            <Grid Grid.Row="12" Grid.Column="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
@@ -222,13 +231,24 @@
                     Icon="{StaticResource Icon.Folder.Open}"/>
             </Grid>
 
+            <!-- Git Version -->
+            <TextBlock
+                Grid.Row="13" Grid.Column="0"
+                Text="{DynamicResource Text.Preference.Git.Version}"
+                HorizontalAlignment="Right"
+                Margin="0,0,8,0"/>
+            <TextBlock
+                Grid.Row="13" Grid.Column="1"
+                x:Name="textGitVersion"
+                Text="{Binding ElementName=me, Path=Version}"/>
+
             <!-- Default Clone Dir -->
             <TextBlock
-                Grid.Row="12" Grid.Column="0" 
+                Grid.Row="14" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Git.Dir}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
-            <Grid Grid.Row="12" Grid.Column="1">
+            <Grid Grid.Row="14" Grid.Column="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>
@@ -251,36 +271,39 @@
 
             <!-- User -->
             <TextBlock
-                Grid.Row="13" Grid.Column="0" 
+                Grid.Row="15" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Git.User}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
             <controls:TextEdit
-                Grid.Row="13" Grid.Column="1"
+                Grid.Row="15" Grid.Column="1"
+                x:Name="editGitUser"
                 Height="24"
                 Text="{Binding ElementName=me, Path=User, Mode=TwoWay}"
                 Placeholder="{DynamicResource Text.Preference.Git.User.Placeholder}"/>
 
             <!-- Email -->
             <TextBlock
-                Grid.Row="14" Grid.Column="0" 
+                Grid.Row="16" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Git.Email}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
             <controls:TextEdit
-                Grid.Row="14" Grid.Column="1"
+                Grid.Row="16" Grid.Column="1"
+                x:Name="editGitEmail"
                 Height="24"
                 Text="{Binding ElementName=me, Path=Email, Mode=TwoWay}"
                 Placeholder="{DynamicResource Text.Preference.Git.Email.Placeholder}"/>
 
             <!-- CRLF -->
             <TextBlock
-                Grid.Row="15" Grid.Column="0" 
+                Grid.Row="17" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Git.CRLF}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
             <ComboBox
-                Grid.Row="15" Grid.Column="1" 
+                Grid.Row="17" Grid.Column="1"
+                x:Name="editGitCrlf"
                 Height="24"
                 ItemsSource="{Binding Source={x:Static models:CRLFOption.Supported}}"
                 SelectedValuePath="Value"
@@ -297,19 +320,19 @@
 
             <!-- Merge Tool Group -->
             <TextBlock
-                Grid.Row="17" Grid.Column="0" Grid.ColumnSpan="2"
+                Grid.Row="19" Grid.Column="0" Grid.ColumnSpan="2"
                 Text="{DynamicResource Text.Preference.Merger}"
                 FontSize="17" FontWeight="DemiBold"
                 Foreground="{DynamicResource Brush.FG2}"/>
 
             <!-- Merge Tool Type -->
             <TextBlock
-                Grid.Row="18" Grid.Column="0" 
+                Grid.Row="20" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Merger.Type}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
             <ComboBox
-                Grid.Row="18" Grid.Column="1" 
+                Grid.Row="20" Grid.Column="1"
                 Height="24"
                 ItemsSource="{Binding Source={x:Static models:MergeTool.Supported}}"
                 DisplayMemberPath="Name"
@@ -319,11 +342,11 @@
 
             <!-- Merge Tool Executable Path -->
             <TextBlock
-                Grid.Row="19" Grid.Column="0" 
+                Grid.Row="21" Grid.Column="0"
                 Text="{DynamicResource Text.Preference.Merger.Path}"
                 HorizontalAlignment="Right"
                 Margin="0,0,8,0"/>
-            <Grid Grid.Row="19" Grid.Column="1">
+            <Grid Grid.Row="21" Grid.Column="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="Auto"/>

src/Views/Preference.xaml.cs

@@ -1,5 +1,7 @@
 using Microsoft.Win32;
 using System;
+using System.Runtime.InteropServices;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -13,20 +15,46 @@ namespace SourceGit.Views {
         public string User { get; set; }
         public string Email { get; set; }
         public string CRLF { get; set; }
+        public string Version { get; set; }
+
+        // https://docs.microsoft.com/en-us/windows/desktop/api/shlwapi/nf-shlwapi-pathfindonpathw
+        // https://www.pinvoke.net/default.aspx/shlwapi.PathFindOnPath
+        [DllImport("shlwapi.dll", CharSet = CharSet.Unicode, SetLastError = false)]
+        private static extern bool PathFindOnPath([In, Out] StringBuilder pszFile, [In] string[] ppszOtherDirs);
+
+        public bool EnableWindowsTerminal { get; set; } = PathFindOnPath(new StringBuilder("wt.exe"), null);
 
         public Preference() {
-            if (Models.Preference.Instance.IsReady) {
+            UpdateGitInfo(false);
+
+            if (!EnableWindowsTerminal) {
+                Models.Preference.Instance.General.UseWindowsTerminal = false;
+            }
+
+            InitializeComponent();
+        }
+
+        private bool UpdateGitInfo(bool updateUi) {
+            var isReady = Models.Preference.Instance.IsReady;
+            if (isReady) {
                 User = new Commands.Config().Get("user.name");
                 Email = new Commands.Config().Get("user.email");
                 CRLF = new Commands.Config().Get("core.autocrlf");
+                Version = new Commands.Version().Query();
                 if (string.IsNullOrEmpty(CRLF)) CRLF = "false";
             } else {
                 User = "";
                 Email = "";
                 CRLF = "false";
+                Version = "Unknown";
             }
-
+            if (updateUi) {
-            InitializeComponent();
+                editGitUser?.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
+                editGitEmail?.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
+                editGitCrlf?.GetBindingExpression(ComboBox.SelectedValueProperty).UpdateTarget();
+                textGitVersion?.GetBindingExpression(TextBlock.TextProperty).UpdateTarget();
+            }
+            return isReady;
         }
 
         #region EVENTS
@@ -36,16 +64,23 @@ namespace SourceGit.Views {
         }
 
         private void SelectGitPath(object sender, RoutedEventArgs e) {
-            var dialog = new OpenFileDialog();
+            var sb = new StringBuilder("git.exe");
-            dialog.Filter = "Git Executable|git.exe";
+            string dir = PathFindOnPath(sb, null)
-            dialog.FileName = "git.exe";
+                ? sb.ToString()
-            dialog.Title = App.Text("Preference.Dialog.GitExe");
+                : Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
-            dialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
+
-            dialog.CheckFileExists = true;
+            var dialog = new OpenFileDialog {
+                Filter = "Git Executable|git.exe",
+                FileName = "git.exe",
+                Title = App.Text("Preference.Dialog.GitExe"),
+                InitialDirectory = dir,
+                CheckFileExists = true,
+            };
 
             if (dialog.ShowDialog() == true) {
                 Models.Preference.Instance.Git.Path = dialog.FileName;
                 editGitPath?.GetBindingExpression(TextBox.TextProperty).UpdateTarget();
+                UpdateGitInfo(true);
             }
         }
 

src/Views/Widgets/Dashboard.xaml.cs

@@ -315,11 +315,20 @@ namespace SourceGit.Views.Widgets {
                 Models.Exception.Raise(App.Text("MissingBash"));
                 return;
             }
-
+            if (Models.Preference.Instance.General.UseWindowsTerminal) {
-            var start = new ProcessStartInfo();
+                Process.Start(new ProcessStartInfo {
-            start.WorkingDirectory = repo.Path;
+                    WorkingDirectory = repo.Path,
-            start.FileName = bash;
+                    FileName = "wt",
-            Process.Start(start);
+                    Arguments = bash,
+                    UseShellExecute = false,
+                });
+            } else {
+                Process.Start(new ProcessStartInfo {
+                    WorkingDirectory = repo.Path,
+                    FileName = bash,
+                    UseShellExecute = true,
+                });
+            }
             e.Handled = true;
         }