GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-03-18 18:13:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #233 from chsbuffer/master

Browse Source 
Fix some problems of saving selected index
This commit is contained in:
Connection Refused
2020-01-12 00:20:06 +08:00
committed by GitHub
parent 9ef7b99aa2 ad193a03d7
commit 4e1ae34f30
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Netch/Forms/MainForm.cs
View File

@@ -204,6 +204,13 @@ namespace Netch.Forms
SelectLastMode();
}
private void SaveConfigs()
{
Global.Settings.ServerComboBoxSelectedIndex = ServerComboBox.SelectedIndex;
Global.Settings.ModeComboBoxSelectedIndex = ModeComboBox.SelectedIndex;
Utils.Configuration.Save();
}
private void ComboBox_DrawItem(object sender, DrawItemEventArgs e)
{
var cbx = sender as ComboBox;
@@ -294,6 +301,8 @@ namespace Netch.Forms
ConfigurationGroupBox.Text = Utils.i18N.Translate("Configuration");
ServerLabel.Text = Utils.i18N.Translate("Server");
ModeLabel.Text = Utils.i18N.Translate("Mode");
ProfileLabel.Text = Utils.i18N.Translate("Profile Name");
ProfileGroupBox.Text = Utils.i18N.Translate("Profiles");
SettingsButton.Text = Utils.i18N.Translate("Settings");
ControlButton.Text = Utils.i18N.Translate("Start");
UsedBandwidthLabel.Text = $@"{Utils.i18N.Translate("Used")}{Utils.i18N.Translate(": ")}0 KB";
@@ -630,6 +639,7 @@ namespace Netch.Forms
private void ReloadModesToolStripMenuItem_Click(object sender, EventArgs e)
{
Enabled = false;
SaveConfigs();
Task.Run(() =>
{
InitMode();
@@ -659,6 +669,7 @@ namespace Netch.Forms
private void EditPictureBox_Click(object sender, EventArgs e)
{
SaveConfigs();
// 当前ServerComboBox中至少有一项
if (ServerComboBox.SelectedIndex != -1)
{
@@ -757,7 +768,8 @@ namespace Netch.Forms
MainController = new MainController();
if (MainController.Start(server, mode))
{
if (mode.Type == 0)
//if (mode.Type == 0)
if (false)
{
UsedBandwidthLabel.Visible = UploadSpeedLabel.Visible = DownloadSpeedLabel.Visible = true;
MainController.pNFController.OnBandwidthUpdated += OnBandwidthUpdated;
@@ -836,7 +848,8 @@ namespace Netch.Forms
MainController.Stop();
if (mode.Type == 0)
//if (mode.Type == 0)
if (false)
{
LastUploadBandwidth = 0;
LastDownloadBandwidth = 0;
@@ -895,9 +908,7 @@ namespace Netch.Forms
}
}
Global.Settings.ServerComboBoxSelectedIndex = ServerComboBox.SelectedIndex;
Global.Settings.ModeComboBoxSelectedIndex = ModeComboBox.SelectedIndex;
Utils.Configuration.Save();
SaveConfigs();
State = Models.State.Terminating;
NotifyIcon.Visible = false;
@@ -983,13 +994,18 @@ namespace Netch.Forms
}
catch (Exception ee)
{
Utils.Logging.Info(ee.Message);
ProfileButtons[index].Text = "Error";
Task.Run(() =>
{
Utils.Logging.Info(ee.Message);
ProfileButtons[index].Text = Utils.i18N.Translate("Error");
Thread.Sleep(1200);
ProfileButtons[index].Text = Utils.i18N.Translate("None");
});
}
}
}
public void InitProfile()
@@ -1006,7 +1022,7 @@ namespace Netch.Forms
for (int i = 0; i < num_profile; ++i)
{
var b = new Button();
ProfileTable.Controls.Add(b,i,0);
ProfileTable.Controls.Add(b, i, 0);
b.Location = new Point(i * 100, 0);
b.Click += new EventHandler(ProfileButton_Click);
b.Dock = DockStyle.Fill;
@@ -1018,7 +1034,7 @@ namespace Netch.Forms
}
else
{
b.Text = "None";
b.Text = Utils.i18N.Translate("None");
}
}

12
Netch/Resources/zh-CN
View File

@@ -16,7 +16,7 @@
"Started": "已启动",
"Stopping": "正在停止中",
"Stopped": "已停止",
"Server": "服务器",
"Import Servers From Clipboard": "从剪贴板导入服务器",
"Add [Socks5] Server": "添加 [Socks5] 服务器",
@@ -50,14 +50,14 @@
"Saved": "保存成功",
"Plugin": "插件",
"Plugin Options": "插件参数",
"Subscribe": "订阅",
"Manage Subscribe Links": "管理订阅链接",
"Update Servers From Subscribe Links": "从订阅链接更新服务器",
"No subscription link": "没有任何一条订阅链接",
"Updating in the background": "正在后台更新中",
"Update completed": "更新完成",
"Options": "选项",
"Restart Service": "重启服务",
"Restarting service": "正在重启服务中",
@@ -122,7 +122,11 @@
"Global Bypass IPs": "全局直连 IP",
"Port value illegal. Try again.": "端口值非法。请重试。",
"Check update when opened": "打开软件时检查更新",
"Profile Name": "Profile Name",
"Profiles": "Profiles",
"None": "无",
"Show": "显示",
"Exit": "退出"
}