Browse Source

remove unecessary code

tags/2.3
clowwindy 10 years ago
parent
commit
d3365a8fa4
2 changed files with 4 additions and 7 deletions
  1. +0
    -5
      shadowsocks-csharp/Controller/ShadowsocksController.cs
  2. +4
    -2
      shadowsocks-csharp/View/MenuViewController.cs

+ 0
- 5
shadowsocks-csharp/Controller/ShadowsocksController.cs View File

@@ -68,11 +68,6 @@ namespace Shadowsocks.Controller
return _config.GetCurrentServer();
}
public bool GetCurrentMode()
{
return _config.global;
}
// always return copy
public Configuration GetConfiguration()
{


+ 4
- 2
shadowsocks-csharp/View/MenuViewController.cs View File

@@ -98,7 +98,9 @@ namespace Shadowsocks.View
{
icon = Resources.ss24;
}
bool enabled = controller.GetConfiguration().enabled;
Configuration config = controller.GetConfiguration();
bool enabled = config.enabled;
bool global = config.global;
if (!enabled)
{
Bitmap iconCopy = new Bitmap(icon);
@@ -114,7 +116,7 @@ namespace Shadowsocks.View
}
_notifyIcon.Icon = Icon.FromHandle(icon.GetHicon());
string text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + (enabled ? I18N.GetString("Enabled") : I18N.GetString("Disabled")) + " " + (controller.GetCurrentMode() ? I18N.GetString("Global") : I18N.GetString("PAC")) + "\n" + controller.GetCurrentServer().FriendlyName();
string text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + (enabled ? I18N.GetString("Enabled") : I18N.GetString("Disabled")) + "\n" + global ? I18N.GetString("Global") : I18N.GetString("PAC")) + "\n" + config.GetCurrentServer().FriendlyName();
_notifyIcon.Text = text.Substring(0, Math.Min(63, text.Length));
}


Loading…
Cancel
Save