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 @@ User name for this repository Email : Email address + Proxy : + HTTP proxy used by this repository Create Branch Create Local Branch 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 @@ 应用于本仓库的用户名 邮箱 : 邮箱地址 + 代理 : + HTTP网络代理 新建分支 创建本地分支 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 @@ + @@ -40,5 +41,16 @@ Text="{Binding ElementName=me, Path=UserEmail, Mode=TwoWay}" Height="24" Placeholder="{StaticResource Text.Configure.Email.Placeholder}"/> + + + 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; }); }