Browse Source

don't serialize FriendlyName

tags/2.3
clowwindy 10 years ago
parent
commit
bcdbcae305
3 changed files with 7 additions and 10 deletions
  1. +4
    -7
      shadowsocks-csharp/Model/Server.cs
  2. +1
    -1
      shadowsocks-csharp/View/ConfigForm.cs
  3. +2
    -2
      shadowsocks-csharp/View/MenuViewController.cs

+ 4
- 7
shadowsocks-csharp/Model/Server.cs View File

@@ -18,16 +18,13 @@ namespace Shadowsocks.Model
public string method;
public string remarks;
public string FriendlyName
public string FriendlyName()
{
get
if (string.IsNullOrEmpty(server))
{
if (string.IsNullOrEmpty(server))
{
return I18N.GetString("New server");
}
return string.IsNullOrEmpty(remarks) ? server + ":" + server_port : server + ":" + server_port + " (" + remarks + ")";
return I18N.GetString("New server");
}
return string.IsNullOrEmpty(remarks) ? server + ":" + server_port : server + ":" + server_port + " (" + remarks + ")";
}
}
}

+ 1
- 1
shadowsocks-csharp/View/ConfigForm.cs View File

@@ -125,7 +125,7 @@ namespace Shadowsocks.View
ServersListBox.Items.Clear();
foreach (Server server in _modifiedConfiguration.configs)
{
ServersListBox.Items.Add(server.FriendlyName);
ServersListBox.Items.Add(server.FriendlyName());
}
}


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

@@ -117,7 +117,7 @@ namespace Shadowsocks.View
}
_notifyIcon.Icon = Icon.FromHandle(icon.GetHicon());
_notifyIcon.Text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + (enabled ? I18N.GetString("Enabled") : I18N.GetString("Disabled")) + "\n" + controller.GetCurrentServer().FriendlyName;
_notifyIcon.Text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + (enabled ? I18N.GetString("Enabled") : I18N.GetString("Disabled")) + "\n" + controller.GetCurrentServer().FriendlyName();
}
private void LoadMenu()
@@ -328,7 +328,7 @@ namespace Shadowsocks.View
for (int i = 0; i < configuration.configs.Count; i++)
{
Server server = configuration.configs[i];
MenuItem item = new MenuItem(server.FriendlyName);
MenuItem item = new MenuItem(server.FriendlyName());
item.Tag = i;
item.Click += AServerItem_Click;
items.Add(item);


Loading…
Cancel
Save