From add606291751a7cceffa647a69058c12eed926bf Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 15 Jul 2021 09:23:37 +0800
Subject: [PATCH] feature<Configure>: supports configuration for http.proxy

---
 src/Resources/Locales/en_US.xaml   |  2 ++
 src/Resources/Locales/zh_CN.xaml   |  2 ++
 src/Views/Popups/Configure.xaml    | 12 ++++++++++++
 src/Views/Popups/Configure.xaml.cs |  4 ++++
 4 files changed, 20 insertions(+)

diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml
index 74cdec93..a65fa255 100644
--- a/src/Resources/Locales/en_US.xaml
+++ b/src/Resources/Locales/en_US.xaml
@@ -92,6 +92,8 @@
     <sys:String x:Key="Text.Configure.User.Placeholder">User name for this repository</sys:String>
     <sys:String x:Key="Text.Configure.Email">Email :</sys:String>
     <sys:String x:Key="Text.Configure.Email.Placeholder">Email address</sys:String>
+    <sys:String x:Key="Text.Configure.Proxy">Proxy :</sys:String>
+    <sys:String x:Key="Text.Configure.Proxy.Placeholder">HTTP proxy used by this repository</sys:String>
 
     <sys:String x:Key="Text.CreateBranch">Create Branch</sys:String>
     <sys:String x:Key="Text.CreateBranch.Title">Create Local Branch</sys:String>
diff --git a/src/Resources/Locales/zh_CN.xaml b/src/Resources/Locales/zh_CN.xaml
index f8b1f1ff..239b8852 100644
--- a/src/Resources/Locales/zh_CN.xaml
+++ b/src/Resources/Locales/zh_CN.xaml
@@ -91,6 +91,8 @@
     <sys:String x:Key="Text.Configure.User.Placeholder">应用于本仓库的用户名</sys:String>
     <sys:String x:Key="Text.Configure.Email">邮箱 ：</sys:String>
     <sys:String x:Key="Text.Configure.Email.Placeholder">邮箱地址</sys:String>
+    <sys:String x:Key="Text.Configure.Proxy">代理 ：</sys:String>
+    <sys:String x:Key="Text.Configure.Proxy.Placeholder">HTTP网络代理</sys:String>
 
     <sys:String x:Key="Text.CreateBranch">新建分支</sys:String>
     <sys:String x:Key="Text.CreateBranch.Title">创建本地分支</sys:String>
diff --git a/src/Views/Popups/Configure.xaml b/src/Views/Popups/Configure.xaml
index 3fe07e3d..bb5c18fe 100644
--- a/src/Views/Popups/Configure.xaml
+++ b/src/Views/Popups/Configure.xaml
@@ -12,6 +12,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="32"/>
             <RowDefinition Height="32"/>
+            <RowDefinition Height="32"/>
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
@@ -40,5 +41,16 @@
             Text="{Binding ElementName=me, Path=UserEmail, Mode=TwoWay}"
             Height="24"
             Placeholder="{StaticResource Text.Configure.Email.Placeholder}"/>
+
+        <TextBlock
+            Grid.Row="2" Grid.Column="0"
+            Margin="0,0,8,0"
+            Text="{StaticResource Text.Configure.Proxy}"
+            HorizontalAlignment="Right"/>
+        <controls:TextEdit
+            Grid.Row="2" Grid.Column="1"
+            Text="{Binding ElementName=me, Path=Proxy, Mode=TwoWay}"
+            Height="24"
+            Placeholder="{StaticResource Text.Configure.Proxy.Placeholder}"/>
     </Grid>
 </controls:PopupWidget>
diff --git a/src/Views/Popups/Configure.xaml.cs b/src/Views/Popups/Configure.xaml.cs
index 7050b1f9..23f92115 100644
--- a/src/Views/Popups/Configure.xaml.cs
+++ b/src/Views/Popups/Configure.xaml.cs
@@ -9,6 +9,7 @@ namespace SourceGit.Views.Popups {
 
         public string UserName { get; set; }
         public string UserEmail { get; set; }
+        public string Proxy { get; set; }
 
         public Configure(string repo) {
             this.repo = repo;
@@ -16,6 +17,7 @@ namespace SourceGit.Views.Popups {
             var cmd = new Commands.Config(repo);
             UserName = cmd.Get("user.name");
             UserEmail = cmd.Get("user.email");
+            Proxy = cmd.Get("http.proxy");
 
             InitializeComponent();
         }
@@ -32,6 +34,8 @@ namespace SourceGit.Views.Popups {
                 if (oldUser != UserName) cmd.Set("user.name", UserName);
                 var oldEmail = cmd.Get("user.email");
                 if (oldEmail != UserEmail) cmd.Set("user.email", UserEmail);
+                var oldProxy = cmd.Get("http.proxy");
+                if (oldProxy != Proxy) cmd.Set("http.proxy", Proxy);
                 return true;
             });
         }