From 794b88e5ab6413411e55c5e41c277a6ec97bae9e Mon Sep 17 00:00:00 2001 From: YFdyh000 Date: Mon, 16 Mar 2020 01:33:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A1=86=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 致命错误取Error，普通错误取警告。 --- v2rayN/v2rayN/Forms/AddServer2Form.cs | 2 +- v2rayN/v2rayN/Forms/AddServer3Form.cs | 4 ++-- v2rayN/v2rayN/Forms/AddServer4Form.cs | 4 ++-- v2rayN/v2rayN/Forms/AddServerForm.cs | 6 +++--- v2rayN/v2rayN/Forms/MainForm.cs | 4 ++-- v2rayN/v2rayN/Forms/OptionSettingForm.cs | 2 +- v2rayN/v2rayN/Forms/SubSettingForm.cs | 2 +- v2rayN/v2rayN/Handler/MainFormHandler.cs | 4 ++-- v2rayN/v2rayN/Program.cs | 4 ++-- v2rayN/v2rayN/Tool/UI.cs | 10 +++++++++- 10 files changed, 25 insertions(+), 17 deletions(-) diff --git a/v2rayN/v2rayN/Forms/AddServer2Form.cs b/v2rayN/v2rayN/Forms/AddServer2Form.cs index a88afb44..98ba9904 100644 --- a/v2rayN/v2rayN/Forms/AddServer2Form.cs +++ b/v2rayN/v2rayN/Forms/AddServer2Form.cs @@ -63,7 +63,7 @@ namespace v2rayN.Forms } else { - UI.Show(UIRes.I18N("OperationFailed")); + UI.ShowWarning(UIRes.I18N("OperationFailed")); } } diff --git a/v2rayN/v2rayN/Forms/AddServer3Form.cs b/v2rayN/v2rayN/Forms/AddServer3Form.cs index 78192e45..06d43374 100644 --- a/v2rayN/v2rayN/Forms/AddServer3Form.cs +++ b/v2rayN/v2rayN/Forms/AddServer3Form.cs @@ -96,7 +96,7 @@ namespace v2rayN.Forms } else { - UI.Show(UIRes.I18N("OperationFailed")); + UI.ShowWarning(UIRes.I18N("OperationFailed")); } } private void btnClose_Click(object sender, EventArgs e) @@ -124,7 +124,7 @@ namespace v2rayN.Forms VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg); if (vmessItem == null) { - UI.Show(msg); + UI.ShowWarning(msg); return; } diff --git a/v2rayN/v2rayN/Forms/AddServer4Form.cs b/v2rayN/v2rayN/Forms/AddServer4Form.cs index 6adad2c1..90fc63ac 100644 --- a/v2rayN/v2rayN/Forms/AddServer4Form.cs +++ b/v2rayN/v2rayN/Forms/AddServer4Form.cs @@ -85,7 +85,7 @@ namespace v2rayN.Forms } else { - UI.Show(UIRes.I18N("OperationFailed")); + UI.ShowWarning(UIRes.I18N("OperationFailed")); } } private void btnClose_Click(object sender, EventArgs e) @@ -113,7 +113,7 @@ namespace v2rayN.Forms VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg); if (vmessItem == null) { - UI.Show(msg); + UI.ShowWarning(msg); return; } diff --git a/v2rayN/v2rayN/Forms/AddServerForm.cs b/v2rayN/v2rayN/Forms/AddServerForm.cs index 6d09db03..e2747b6c 100644 --- a/v2rayN/v2rayN/Forms/AddServerForm.cs +++ b/v2rayN/v2rayN/Forms/AddServerForm.cs @@ -166,7 +166,7 @@ namespace v2rayN.Forms } else { - UI.Show(UIRes.I18N("OperationFailed")); + UI.ShowWarning(UIRes.I18N("OperationFailed")); } } @@ -233,7 +233,7 @@ namespace v2rayN.Forms } if (vmessItem == null) { - UI.Show(msg); + UI.ShowWarning(msg); return; } @@ -261,7 +261,7 @@ namespace v2rayN.Forms VmessItem vmessItem = V2rayConfigHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg); if (vmessItem == null) { - UI.Show(msg); + UI.ShowWarning(msg); return; } diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index 20c846d0..259b771f 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -804,7 +804,7 @@ namespace v2rayN.Forms } else { - UI.Show(UIRes.I18N("FailedImportedCustomServer")); + UI.ShowWarning(UIRes.I18N("FailedImportedCustomServer")); } } @@ -1391,7 +1391,7 @@ namespace v2rayN.Forms string result = Convert.ToString(e.UserState); if (Utils.IsNullOrEmpty(result)) { - UI.Show(UIRes.I18N("NoValidQRcodeFound")); + UI.ShowWarning(UIRes.I18N("NoValidQRcodeFound")); } else { diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs index bb7ea8e5..294ebe73 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs @@ -181,7 +181,7 @@ namespace v2rayN.Forms } else { - UI.Show(UIRes.I18N("OperationFailed")); + UI.ShowWarning(UIRes.I18N("OperationFailed")); } } diff --git a/v2rayN/v2rayN/Forms/SubSettingForm.cs b/v2rayN/v2rayN/Forms/SubSettingForm.cs index 0cc90ae2..c8e7725b 100644 --- a/v2rayN/v2rayN/Forms/SubSettingForm.cs +++ b/v2rayN/v2rayN/Forms/SubSettingForm.cs @@ -79,7 +79,7 @@ namespace v2rayN.Forms } else { - UI.Show(UIRes.I18N("OperationFailed")); + UI.ShowWarning(UIRes.I18N("OperationFailed")); } } diff --git a/v2rayN/v2rayN/Handler/MainFormHandler.cs b/v2rayN/v2rayN/Handler/MainFormHandler.cs index e39623d3..f9d66496 100644 --- a/v2rayN/v2rayN/Handler/MainFormHandler.cs +++ b/v2rayN/v2rayN/Handler/MainFormHandler.cs @@ -101,7 +101,7 @@ namespace v2rayN.Handler } else { - UI.Show(string.Format(UIRes.I18N("SaveClientConfigurationIn"), fileName)); + UI.ShowWarning(string.Format(UIRes.I18N("SaveClientConfigurationIn"), fileName)); } } @@ -141,7 +141,7 @@ namespace v2rayN.Handler } else { - UI.Show(string.Format(UIRes.I18N("SaveServerConfigurationIn"), fileName)); + UI.ShowWarning(string.Format(UIRes.I18N("SaveServerConfigurationIn"), fileName)); } } diff --git a/v2rayN/v2rayN/Program.cs b/v2rayN/v2rayN/Program.cs index bd6e36d3..13b666db 100644 --- a/v2rayN/v2rayN/Program.cs +++ b/v2rayN/v2rayN/Program.cs @@ -38,7 +38,7 @@ namespace v2rayN { if (!UnzipLibs()) { - UI.Show($"Error preparing the environment(准备运行环境出错)"); + UI.ShowError($"Error preparing the environment(准备运行环境出错)"); return; } @@ -54,7 +54,7 @@ namespace v2rayN } else { - UI.Show($"v2rayN is already running(v2rayN已经运行)"); + UI.ShowWarning($"v2rayN is already running(v2rayN已经运行)"); } } diff --git a/v2rayN/v2rayN/Tool/UI.cs b/v2rayN/v2rayN/Tool/UI.cs index b6160d34..f2cabf75 100644 --- a/v2rayN/v2rayN/Tool/UI.cs +++ b/v2rayN/v2rayN/Tool/UI.cs @@ -8,10 +8,18 @@ namespace v2rayN { MessageBox.Show(msg, "v2rayN", MessageBoxButtons.OK, MessageBoxIcon.Information); } + public static void ShowWarning(string msg) + { + MessageBox.Show(msg, "v2rayN", MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + public static void ShowError(string msg) + { + MessageBox.Show(msg, "v2rayN", MessageBoxButtons.OK, MessageBoxIcon.Error); + } public static DialogResult ShowYesNo(string msg) { - return MessageBox.Show(msg, "YesNo", MessageBoxButtons.YesNo); + return MessageBox.Show(msg, "v2rayN", MessageBoxButtons.YesNo, MessageBoxIcon.Question); } //public static string GetResourseString(string key)