Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 11:16:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup proxy enable/disable, fix #518

Browse Source
This commit is contained in:
stafford
2016-03-11 12:31:21 +11:00
committed by bao-qian
parent e37332a5d2
commit 099b62b645
2 changed files with 13 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Wox/SettingWindow.xaml.cs
View File

@@ -51,6 +51,11 @@ namespace Wox
Loaded += Setting_Loaded;
}
private void ProxyToggled(object sender, RoutedEventArgs e)
{
_settings.ProxyEnabled = ToggleProxy.IsChecked ?? false;
}
private void Setting_Loaded(object sender, RoutedEventArgs ev)
{
#region General
@@ -119,9 +124,7 @@ namespace Wox
#region Proxy
cbEnableProxy.Checked += (o, e) => EnableProxy();
cbEnableProxy.Unchecked += (o, e) => DisableProxy();
cbEnableProxy.IsChecked = _settings.ProxyEnabled;
ToggleProxy.IsChecked = _settings.ProxyEnabled;
tbProxyServer.Text = _settings.ProxyServer;
if (_settings.ProxyPort != 0)
{
@@ -129,14 +132,6 @@ namespace Wox
}
tbProxyUserName.Text = _settings.ProxyUserName;
tbProxyPassword.Password = _settings.ProxyPassword;
if (_settings.ProxyEnabled)
{
EnableProxy();
}
else
{
DisableProxy();
}
#endregion
@@ -726,7 +721,7 @@ namespace Wox
#region Proxy
private void btnSaveProxy_Click(object sender, RoutedEventArgs e)
{
_settings.ProxyEnabled = cbEnableProxy.IsChecked ?? false;
_settings.ProxyEnabled = ToggleProxy.IsChecked ?? false;
int port = 80;
if (_settings.ProxyEnabled)
@@ -805,22 +800,6 @@ namespace Wox
}
}
private void EnableProxy()
{
tbProxyPassword.IsEnabled = true;
tbProxyServer.IsEnabled = true;
tbProxyUserName.IsEnabled = true;
tbProxyPort.IsEnabled = true;
}
private void DisableProxy()
{
tbProxyPassword.IsEnabled = false;
tbProxyServer.IsEnabled = false;
tbProxyUserName.IsEnabled = false;
tbProxyPort.IsEnabled = false;
}
#endregion
#region About