Browse Source

Check server url before saving it

Don't clear the textbox, focus it instead. We want the user to see the wrong input instead of a blank textbox.
tags/3.4.1
noisyfox 8 years ago
parent
commit
8a68a3515b
3 changed files with 11 additions and 11 deletions
  1. +1
    -0
      shadowsocks-csharp/Data/cn.txt
  2. +1
    -0
      shadowsocks-csharp/Data/zh_tw.txt
  3. +9
    -11
      shadowsocks-csharp/View/ConfigForm.cs

+ 1
- 0
shadowsocks-csharp/Data/cn.txt View File

@@ -105,6 +105,7 @@ Reg All=注册全部热键
Shadowsocks Error: {0}=Shadowsocks 错误: {0}
Port already in use=端口已被占用
Invalid server address=非法服务器地址
Illegal port number format=非法端口格式
Illegal timeout format=非法超时格式
Please add at least one server=请添加至少一个服务器


+ 1
- 0
shadowsocks-csharp/Data/zh_tw.txt View File

@@ -105,6 +105,7 @@ Reg All=註冊全部捷徑鍵

Shadowsocks Error: {0}=Shadowsocks 錯誤: {0}
Port already in use=連接埠號碼已被占用
Invalid server address=非法伺服器位址
Illegal port number format=非法連接埠號碼格式
Illegal timeout format=非法超時格式
Please add at least one server=請新增至少一個伺服器


+ 9
- 11
shadowsocks-csharp/View/ConfigForm.cs View File

@@ -80,28 +80,26 @@ namespace Shadowsocks.View
return true;
}
Server server = new Server();
server.server = IPTextBox.Text.Trim();
try
if (Uri.CheckHostName(server.server = IPTextBox.Text.Trim()) == UriHostNameType.Unknown)
{
server.server_port = int.Parse(ServerPortTextBox.Text);
MessageBox.Show(I18N.GetString("Invalid server address"));
IPTextBox.Focus();
return false;
}
catch (FormatException)
if (!int.TryParse(ServerPortTextBox.Text, out server.server_port))
{
MessageBox.Show(I18N.GetString("Illegal port number format"));
ServerPortTextBox.Clear();
ServerPortTextBox.Focus();
return false;
}
server.password = PasswordTextBox.Text;
server.method = EncryptionSelect.Text;
server.remarks = RemarksTextBox.Text;
try
{
server.timeout = int.Parse(TimeoutTextBox.Text);
}
catch (FormatException)
if (!int.TryParse(TimeoutTextBox.Text, out server.timeout))
{
MessageBox.Show(I18N.GetString("Illegal timeout format"));
TimeoutTextBox.Clear();
TimeoutTextBox.Focus();
return false;
}
server.auth = OneTimeAuth.Checked;


Loading…
Cancel
Save