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

细节修缮

Browse Source
This commit is contained in:
ChsBuffer
2020-07-16 17:20:06 +08:00
parent aa581b2586
commit d27c7c016c
19 changed files with 239 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Netch/Forms/MainForm.Control.cs
View File

@@ -15,9 +15,13 @@ namespace Netch.Forms
partial class MainForm
{
public void ControlFun()
private bool _isFirstCloseWindow = true;
private void ControlFun()
{
SaveConfigs();
//防止模式选择框变成蓝色:D
ModeComboBox.Select(0, 0);
if (State == State.Waiting || State == State.Stopped)
{
// 服务器、模式 需选择
@@ -33,36 +37,23 @@ namespace Netch.Forms
return;
}
//MenuStrip.Enabled = ConfigurationGroupBox.Enabled = ControlButton.Enabled = SettingsButton.Enabled = false;
UpdateStatus(State.Starting);
Firewall.AddNetchFwRules();
Task.Run(() =>
{
Task.Run(Firewall.AddNetchFwRules);
var server = ServerComboBox.SelectedItem as Models.Server;
var mode = ModeComboBox.SelectedItem as Models.Mode;
MainController ??= new MainController();
var startResult = MainController.Start(server, mode);
if (startResult)
if (_mainController.Start(server, mode))
{
Task.Run(() =>
{
UpdateStatus(State.Started);
StatusText(i18N.Translate(StateExtension.GetStatusString(State)) + PortText(server.Type,mode.Type));
LastUploadBandwidth = 0;
//LastDownloadBandwidth = 0;
//UploadSpeedLabel.Text = "↑: 0 KB/s";
DownloadSpeedLabel.Text = "↑↓: 0 KB/s";
UsedBandwidthLabel.Text = $"{i18N.Translate("Used",": ")}0 KB";
UsedBandwidthLabel.Visible = UploadSpeedLabel.Visible = DownloadSpeedLabel.Visible = true;
UploadSpeedLabel.Visible = false;
Bandwidth.NetTraffic(server, mode, MainController);
UpdateStatus(State.Started,
i18N.Translate(StateExtension.GetStatusString(State.Started)) + PortText(server.Type, mode.Type));
Bandwidth.NetTraffic(server, mode, _mainController);
});
// 如果勾选启动后最小化
@@ -71,7 +62,7 @@ namespace Netch.Forms
WindowState = FormWindowState.Minimized;
NotifyIcon.Visible = true;
if (IsFirstOpened)
if (_isFirstCloseWindow)
{
// 显示提示语
NotifyIcon.ShowBalloonTip(5,
@@ -80,7 +71,7 @@ namespace Netch.Forms
"Netch is now minimized to the notification bar, double click this icon to restore."),
ToolTipIcon.Info);
IsFirstOpened = false;
_isFirstCloseWindow = false;
}
Hide();
@@ -111,8 +102,7 @@ namespace Netch.Forms
}
else
{
UpdateStatus(State.Stopped);
StatusText(i18N.Translate("Start failed"));
UpdateStatus(State.Stopped, i18N.Translate("Start failed"));
}
});
}
@@ -120,17 +110,17 @@ namespace Netch.Forms
{
// 停止
UpdateStatus(State.Stopping);
MainController.Stop();
UpdateStatus(State.Stopped);
Task.Run(() =>
{
_mainController.Stop();
UpdateStatus(State.Stopped);
TestServer();
});
}
}
private string PortText(string serverType,int modeType)
private string PortText(string serverType, int modeType)
{
var text = new StringBuilder(" (");
text.Append(Global.Settings.LocalAddress == "0.0.0.0"
@@ -148,7 +138,7 @@ namespace Netch.Forms
else
{
// 不可控HTTP
text.Clear();
return "";
}
}
else
@@ -163,14 +153,12 @@ namespace Netch.Forms
$" | HTTP {i18N.Translate("Local Port", ": ")}{Global.Settings.HTTPLocalPort}");
}
}
if (text.Length > 0)
{
text.Append(")");
}
text.Append(")");
return text.ToString();
}
public void OnBandwidthUpdated(long download)
{
try
@@ -198,7 +186,7 @@ namespace Netch.Forms
}
UsedBandwidthLabel.Text =
$"{i18N.Translate("Used",": ")}{Bandwidth.Compute(upload + download)}";
$"{i18N.Translate("Used", ": ")}{Bandwidth.Compute(upload + download)}";
UploadSpeedLabel.Text = $"↑: {Bandwidth.Compute(upload - LastUploadBandwidth)}/s";
DownloadSpeedLabel.Text = $"↓: {Bandwidth.Compute(download - LastDownloadBandwidth)}/s";