From 82b6ee5ad256dad6ef9cfb57a2ce3ede5445316c Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Thu, 31 Mar 2022 19:53:58 +0800 Subject: [PATCH] Refactor ResUI --- v2rayN/v2rayN/Forms/AddServer2Form.cs | 15 +++-- v2rayN/v2rayN/Forms/AddServerForm.cs | 13 ++-- .../v2rayN/Forms/GlobalHotkeySettingForm.cs | 3 +- v2rayN/v2rayN/Forms/GroupSettingForm.cs | 3 +- v2rayN/v2rayN/Forms/MainForm.cs | 67 ++++++++++--------- v2rayN/v2rayN/Forms/OptionSettingForm.cs | 21 +++--- .../Forms/RoutingRuleSettingDetailsForm.cs | 3 +- v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs | 21 +++--- v2rayN/v2rayN/Forms/RoutingSettingForm.cs | 19 +++--- v2rayN/v2rayN/Forms/ServerTransportControl.cs | 27 ++++---- v2rayN/v2rayN/Forms/SubSettingForm.cs | 3 +- v2rayN/v2rayN/Handler/DownloadHandle.cs | 5 +- v2rayN/v2rayN/Handler/MainFormHandler.cs | 17 ++--- v2rayN/v2rayN/Handler/ShareHandler.cs | 15 +++-- v2rayN/v2rayN/Handler/SpeedtestHandler.cs | 5 +- v2rayN/v2rayN/Handler/UpdateHandle.cs | 45 +++++++------ v2rayN/v2rayN/Handler/V2rayConfigHandler.cs | 67 ++++++++++--------- v2rayN/v2rayN/Handler/V2rayHandler.cs | 11 +-- v2rayN/v2rayN/Tool/UIRes.cs | 26 ------- v2rayN/v2rayN/v2rayN.csproj | 1 - 20 files changed, 189 insertions(+), 198 deletions(-) delete mode 100644 v2rayN/v2rayN/Tool/UIRes.cs diff --git a/v2rayN/v2rayN/Forms/AddServer2Form.cs b/v2rayN/v2rayN/Forms/AddServer2Form.cs index 2f8821b5..0d65b972 100644 --- a/v2rayN/v2rayN/Forms/AddServer2Form.cs +++ b/v2rayN/v2rayN/Forms/AddServer2Form.cs @@ -4,6 +4,7 @@ using System.IO; using System.Windows.Forms; using v2rayN.Handler; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -67,12 +68,12 @@ namespace v2rayN.Forms string remarks = txtRemarks.Text; if (Utils.IsNullOrEmpty(remarks)) { - UI.Show(UIRes.I18N("PleaseFillRemarks")); + UI.Show(ResUI.PleaseFillRemarks); return; } if (Utils.IsNullOrEmpty(txtAddress.Text)) { - UI.Show(UIRes.I18N("FillServerAddressCustom")); + UI.Show(ResUI.FillServerAddressCustom); return; } vmessItem.remarks = remarks; @@ -91,7 +92,7 @@ namespace v2rayN.Forms } else { - UI.ShowWarning(UIRes.I18N("OperationFailed")); + UI.ShowWarning(ResUI.OperationFailed); } } @@ -109,7 +110,7 @@ namespace v2rayN.Forms private void btnBrowse_Click(object sender, EventArgs e) { - UI.Show(UIRes.I18N("CustomServerTips")); + UI.Show(ResUI.CustomServerTips); OpenFileDialog fileDialog = new OpenFileDialog { @@ -132,11 +133,11 @@ namespace v2rayN.Forms if (ConfigHandler.AddCustomServer(ref config, vmessItem, false) == 0) { BindingServer(); - UI.Show(UIRes.I18N("SuccessfullyImportedCustomServer")); + UI.Show(ResUI.SuccessfullyImportedCustomServer); } else { - UI.ShowWarning(UIRes.I18N("FailedImportedCustomServer")); + UI.ShowWarning(ResUI.FailedImportedCustomServer); } } @@ -145,7 +146,7 @@ namespace v2rayN.Forms var address = txtAddress.Text; if (Utils.IsNullOrEmpty(address)) { - UI.Show(UIRes.I18N("FillServerAddressCustom")); + UI.Show(ResUI.FillServerAddressCustom); return; } diff --git a/v2rayN/v2rayN/Forms/AddServerForm.cs b/v2rayN/v2rayN/Forms/AddServerForm.cs index ef8a9d9c..8e731590 100644 --- a/v2rayN/v2rayN/Forms/AddServerForm.cs +++ b/v2rayN/v2rayN/Forms/AddServerForm.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Windows.Forms; using v2rayN.Handler; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -194,24 +195,24 @@ namespace v2rayN.Forms if (Utils.IsNullOrEmpty(address)) { - UI.Show(UIRes.I18N("FillServerAddress")); + UI.Show(ResUI.FillServerAddress); return; } if (Utils.IsNullOrEmpty(port) || !Utils.IsNumberic(port)) { - UI.Show(UIRes.I18N("FillCorrectServerPort")); + UI.Show(ResUI.FillCorrectServerPort); return; } if (eConfigType == EConfigType.Shadowsocks) { if (Utils.IsNullOrEmpty(id)) { - UI.Show(UIRes.I18N("FillPassword")); + UI.Show(ResUI.FillPassword); return; } if (Utils.IsNullOrEmpty(security)) { - UI.Show(UIRes.I18N("PleaseSelectEncryption")); + UI.Show(ResUI.PleaseSelectEncryption); return; } } @@ -219,7 +220,7 @@ namespace v2rayN.Forms { if (Utils.IsNullOrEmpty(id)) { - UI.Show(UIRes.I18N("FillUUID")); + UI.Show(ResUI.FillUUID); return; } } @@ -270,7 +271,7 @@ namespace v2rayN.Forms } else { - UI.ShowWarning(UIRes.I18N("OperationFailed")); + UI.ShowWarning(ResUI.OperationFailed); } } diff --git a/v2rayN/v2rayN/Forms/GlobalHotkeySettingForm.cs b/v2rayN/v2rayN/Forms/GlobalHotkeySettingForm.cs index 66799af0..ce9ca023 100644 --- a/v2rayN/v2rayN/Forms/GlobalHotkeySettingForm.cs +++ b/v2rayN/v2rayN/Forms/GlobalHotkeySettingForm.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -104,7 +105,7 @@ namespace v2rayN.Forms } else { - UI.ShowWarning(UIRes.I18N("OperationFailed")); + UI.ShowWarning(ResUI.OperationFailed); } } diff --git a/v2rayN/v2rayN/Forms/GroupSettingForm.cs b/v2rayN/v2rayN/Forms/GroupSettingForm.cs index 7856256c..6eabd74a 100644 --- a/v2rayN/v2rayN/Forms/GroupSettingForm.cs +++ b/v2rayN/v2rayN/Forms/GroupSettingForm.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Windows.Forms; using v2rayN.Handler; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -73,7 +74,7 @@ namespace v2rayN.Forms } else { - UI.ShowWarning(UIRes.I18N("OperationFailed")); + UI.ShowWarning(ResUI.OperationFailed); } } diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index 2d8b22d3..c5797a95 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -12,6 +12,7 @@ using v2rayN.Handler; using v2rayN.Mode; using v2rayN.Tool; using System.Linq; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -228,22 +229,22 @@ namespace v2rayN.Forms lvServers.RegisterDragEvent(UpdateDragEventHandler); lvServers.Columns.Add("", 30); - lvServers.Columns.Add(UIRes.I18N("LvServiceType"), 80); - lvServers.Columns.Add(UIRes.I18N("LvAlias"), 100); - lvServers.Columns.Add(UIRes.I18N("LvAddress"), 120); - lvServers.Columns.Add(UIRes.I18N("LvPort"), 100); - lvServers.Columns.Add(UIRes.I18N("LvEncryptionMethod"), 120); - lvServers.Columns.Add(UIRes.I18N("LvTransportProtocol"), 120); - lvServers.Columns.Add(UIRes.I18N("LvTLS"), 100); - lvServers.Columns.Add(UIRes.I18N("LvSubscription"), 100); - lvServers.Columns.Add(UIRes.I18N("LvTestResults"), 120, HorizontalAlignment.Right); + lvServers.Columns.Add(ResUI.LvServiceType, 80); + lvServers.Columns.Add(ResUI.LvAlias, 100); + lvServers.Columns.Add(ResUI.LvAddress, 120); + lvServers.Columns.Add(ResUI.LvPort, 100); + lvServers.Columns.Add(ResUI.LvEncryptionMethod, 120); + lvServers.Columns.Add(ResUI.LvTransportProtocol, 120); + lvServers.Columns.Add(ResUI.LvTLS, 100); + lvServers.Columns.Add(ResUI.LvSubscription, 100); + lvServers.Columns.Add(ResUI.LvTestResults, 120, HorizontalAlignment.Right); if (statistics != null && statistics.Enable) { - lvServers.Columns.Add(UIRes.I18N("LvTodayDownloadDataAmount"), 70); - lvServers.Columns.Add(UIRes.I18N("LvTodayUploadDataAmount"), 70); - lvServers.Columns.Add(UIRes.I18N("LvTotalDownloadDataAmount"), 70); - lvServers.Columns.Add(UIRes.I18N("LvTotalUploadDataAmount"), 70); + lvServers.Columns.Add(ResUI.LvTodayDownloadDataAmount, 70); + lvServers.Columns.Add(ResUI.LvTodayUploadDataAmount, 70); + lvServers.Columns.Add(ResUI.LvTotalDownloadDataAmount, 70); + lvServers.Columns.Add(ResUI.LvTotalUploadDataAmount, 70); } lvServers.EndUpdate(); } @@ -485,7 +486,7 @@ namespace v2rayN.Forms { tabGroup.TabPages.Clear(); - string title = $" {UIRes.I18N("AllGroupServers")} "; + string title = $" {ResUI.AllGroupServers} "; var tabPage = new TabPage(title); tabPage.Name = ""; tabGroup.TabPages.Add(tabPage); @@ -727,7 +728,7 @@ namespace v2rayN.Forms { return; } - if (UI.ShowYesNo(UIRes.I18N("RemoveServer")) == DialogResult.No) + if (UI.ShowYesNo(ResUI.RemoveServer) == DialogResult.No) { return; } @@ -744,7 +745,7 @@ namespace v2rayN.Forms int newCount = ConfigHandler.DedupServerList(ref config, ref lstVmess); RefreshServers(); _ = LoadV2ray(); - UI.Show(string.Format(UIRes.I18N("RemoveDuplicateServerResult"), oldCount, newCount)); + UI.Show(string.Format(ResUI.RemoveDuplicateServerResult, oldCount, newCount)); } private void menuCopyServer_Click(object sender, EventArgs e) @@ -784,11 +785,11 @@ namespace v2rayN.Forms { //if (!config.sysAgentEnabled) //{ - // UI.Show(UIRes.I18N("NeedHttpGlobalProxy")); + // UI.Show(ResUI.NeedHttpGlobalProxy")); // return; //} - //UI.Show(UIRes.I18N("SpeedServerTips")); + //UI.Show(ResUI.SpeedServerTips")); Speedtest(ESpeedActionType.Realping); } @@ -797,11 +798,11 @@ namespace v2rayN.Forms { //if (!config.sysAgentEnabled) //{ - // UI.Show(UIRes.I18N("NeedHttpGlobalProxy")); + // UI.Show(ResUI.NeedHttpGlobalProxy")); // return; //} - //UI.Show(UIRes.I18N("SpeedServerTips")); + //UI.Show(ResUI.SpeedServerTips")); Speedtest(ESpeedActionType.Speedtest); } @@ -816,7 +817,7 @@ namespace v2rayN.Forms { SpeedtestHandler statistics = new SpeedtestHandler(ref config); string result = statistics.RunAvailabilityCheck() + "ms"; - AppendText(false, string.Format(UIRes.I18N("TestMeOutput"), result)); + AppendText(false, string.Format(ResUI.TestMeOutput, result)); } private void menuClearStatistic_Click(object sender, EventArgs e) @@ -857,8 +858,8 @@ namespace v2rayN.Forms if (sb.Length > 0) { Utils.SetClipboardData(sb.ToString()); - AppendText(false, UIRes.I18N("BatchExportURLSuccessfully")); - //UI.Show(UIRes.I18N("BatchExportURLSuccessfully")); + AppendText(false, ResUI.BatchExportURLSuccessfully); + //UI.Show(ResUI.BatchExportURLSuccessfully")); } } @@ -880,7 +881,7 @@ namespace v2rayN.Forms if (sb.Length > 0) { Utils.SetClipboardData(Utils.Base64Encode(sb.ToString())); - UI.Show(UIRes.I18N("BatchExportSubscriptionSuccessfully")); + UI.Show(ResUI.BatchExportSubscriptionSuccessfully); } } @@ -950,7 +951,7 @@ namespace v2rayN.Forms { if (index < 0) { - UI.Show(UIRes.I18N("PleaseSelectServer")); + UI.Show(ResUI.PleaseSelectServer); return -1; } if (ConfigHandler.SetDefaultServer(ref config, lstVmess[index]) == 0) @@ -973,7 +974,7 @@ namespace v2rayN.Forms { if (lvServers.SelectedIndices.Count <= 0) { - UI.Show(UIRes.I18N("PleaseSelectServer")); + UI.Show(ResUI.PleaseSelectServer); return index; } @@ -1020,7 +1021,7 @@ namespace v2rayN.Forms if (ret > 0) { RefreshServers(); - UI.Show(string.Format(UIRes.I18N("SuccessfullyImportedServerViaClipboard"), ret)); + UI.Show(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret)); } } @@ -1042,7 +1043,7 @@ namespace v2rayN.Forms if (Utils.IsNullOrEmpty(result)) { - UI.ShowWarning(UIRes.I18N("NoValidQRcodeFound")); + UI.ShowWarning(ResUI.NoValidQRcodeFound); } else { @@ -1050,7 +1051,7 @@ namespace v2rayN.Forms if (ret > 0) { RefreshServers(); - UI.Show(UIRes.I18N("SuccessfullyImportedServerViaScan")); + UI.Show(ResUI.SuccessfullyImportedServerViaScan); } } } @@ -1316,7 +1317,7 @@ namespace v2rayN.Forms int index = GetLvSelectedIndex(); if (index < 0) { - UI.Show(UIRes.I18N("PleaseSelectServer")); + UI.Show(ResUI.PleaseSelectServer); return; } if (ConfigHandler.MoveServer(ref config, ref lstVmess, index, eMove) == 0) @@ -1412,12 +1413,12 @@ namespace v2rayN.Forms string fileName = Utils.GetPath(Utils.GetDownloadFileName(msg)); FileManager.ZipExtractToFile(fileName, config.ignoreGeoUpdateCore ? "geo" : ""); - AppendText(false, UIRes.I18N("MsgUpdateV2rayCoreSuccessfullyMore")); + AppendText(false, ResUI.MsgUpdateV2rayCoreSuccessfullyMore); Global.reloadV2ray = true; _ = LoadV2ray(); - AppendText(false, UIRes.I18N("MsgUpdateV2rayCoreSuccessfully")); + AppendText(false, ResUI.MsgUpdateV2rayCoreSuccessfully); } }; (new UpdateHandle()).CheckUpdateCore(type, config, _updateUI); @@ -1659,7 +1660,7 @@ namespace v2rayN.Forms if (fm.ShowDialog() == DialogResult.OK) { MsgFilter = fm.MsgFilter; - gbMsgTitle.Text = string.Format(UIRes.I18N("MsgInformationTitle"), MsgFilter); + gbMsgTitle.Text = string.Format(ResUI.MsgInformationTitle, MsgFilter); } } #endregion diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs index 6268daf7..fc53d7f9 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs @@ -5,6 +5,7 @@ using System.Windows.Forms; using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -101,9 +102,9 @@ namespace v2rayN.Forms ComboItem[] cbSource = new ComboItem[] { - new ComboItem{ID = (int)Global.StatisticsFreshRate.quick, Text = UIRes.I18N("QuickFresh")}, - new ComboItem{ID = (int)Global.StatisticsFreshRate.medium, Text = UIRes.I18N("MediumFresh")}, - new ComboItem{ID = (int)Global.StatisticsFreshRate.slow, Text = UIRes.I18N("SlowFresh")}, + new ComboItem{ID = (int)Global.StatisticsFreshRate.quick, Text = ResUI.QuickFresh}, + new ComboItem{ID = (int)Global.StatisticsFreshRate.medium, Text = ResUI.MediumFresh}, + new ComboItem{ID = (int)Global.StatisticsFreshRate.slow, Text = ResUI.SlowFresh}, }; cbFreshrate.DataSource = cbSource; @@ -187,7 +188,7 @@ namespace v2rayN.Forms } else { - UI.ShowWarning(UIRes.I18N("OperationFailed")); + UI.ShowWarning(ResUI.OperationFailed); } } @@ -211,12 +212,12 @@ namespace v2rayN.Forms bool sniffingEnabled = chksniffingEnabled.Checked; if (Utils.IsNullOrEmpty(localPort) || !Utils.IsNumberic(localPort)) { - UI.Show(UIRes.I18N("FillLocalListeningPort")); + UI.Show(ResUI.FillLocalListeningPort); return -1; } if (Utils.IsNullOrEmpty(protocol)) { - UI.Show(UIRes.I18N("PleaseSelectProtocol")); + UI.Show(ResUI.PleaseSelectProtocol); return -1; } @@ -229,7 +230,7 @@ namespace v2rayN.Forms { if (remoteDNS.Contains("{") || remoteDNS.Contains("}")) { - UI.Show(UIRes.I18N("FillCorrectDNSText")); + UI.Show(ResUI.FillCorrectDNSText); return -1; } } @@ -248,12 +249,12 @@ namespace v2rayN.Forms { if (Utils.IsNullOrEmpty(localPort2) || !Utils.IsNumberic(localPort2)) { - UI.Show(UIRes.I18N("FillLocalListeningPort")); + UI.Show(ResUI.FillLocalListeningPort); return -1; } if (Utils.IsNullOrEmpty(protocol2)) { - UI.Show(UIRes.I18N("PleaseSelectProtocol")); + UI.Show(ResUI.PleaseSelectProtocol); return -1; } if (config.inbound.Count < 2) @@ -312,7 +313,7 @@ namespace v2rayN.Forms || Utils.IsNullOrEmpty(readBufferSize) || !Utils.IsNumberic(readBufferSize) || Utils.IsNullOrEmpty(writeBufferSize) || !Utils.IsNumberic(writeBufferSize)) { - UI.Show(UIRes.I18N("FillKcpParameters")); + UI.Show(ResUI.FillKcpParameters); return -1; } config.kcpItem.mtu = Utils.ToInt(mtu); diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs index a08e872b..1d269af7 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -125,7 +126,7 @@ namespace v2rayN.Forms } if (!hasRule) { - UI.ShowWarning(string.Format(UIRes.I18N("RoutingRuleDetailRequiredTips"), "Port/Protocol/Domain/IP")); + UI.ShowWarning(string.Format(ResUI.RoutingRuleDetailRequiredTips, "Port/Protocol/Domain/IP")); return; } this.DialogResult = DialogResult.OK; diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs index 3ae9359f..4db5d2fe 100644 --- a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs +++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -114,7 +115,7 @@ namespace v2rayN.Forms } else { - UI.ShowWarning(UIRes.I18N("OperationFailed")); + UI.ShowWarning(ResUI.OperationFailed); } } @@ -154,7 +155,7 @@ namespace v2rayN.Forms { if (lvRoutings.SelectedIndices.Count <= 0) { - UI.Show(UIRes.I18N("PleaseSelectRules")); + UI.Show(ResUI.PleaseSelectRules); return index; } @@ -198,7 +199,7 @@ namespace v2rayN.Forms int index = GetLvSelectedIndex(); if (index < 0) { - UI.Show(UIRes.I18N("PleaseSelectRules")); + UI.Show(ResUI.PleaseSelectRules); return; } if (ConfigHandler.MoveRoutingRule(ref routingItem, index, eMove) == 0) @@ -232,7 +233,7 @@ namespace v2rayN.Forms { return; } - if (UI.ShowYesNo(UIRes.I18N("RemoveRules")) == DialogResult.No) + if (UI.ShowYesNo(ResUI.RemoveRules) == DialogResult.No) { return; } @@ -253,7 +254,7 @@ namespace v2rayN.Forms if (lst.Count > 0) { Utils.SetClipboardData(Utils.ToJson(lst)); - //UI.Show(UIRes.I18N("OperationSuccess")); + //UI.Show(ResUI.OperationSuccess")); } } @@ -323,7 +324,7 @@ namespace v2rayN.Forms if (AddBatchRoutingRules(ref routingItem, result) == 0) { RefreshRoutingsView(); - UI.Show(UIRes.I18N("OperationSuccess")); + UI.Show(ResUI.OperationSuccess); } } @@ -333,7 +334,7 @@ namespace v2rayN.Forms if (AddBatchRoutingRules(ref routingItem, clipboardData) == 0) { RefreshRoutingsView(); - UI.Show(UIRes.I18N("OperationSuccess")); + UI.Show(ResUI.OperationSuccess); } } private void menuImportRulesFromUrl_Click(object sender, EventArgs e) @@ -341,7 +342,7 @@ namespace v2rayN.Forms var url = txtUrl.Text.Trim(); if (Utils.IsNullOrEmpty(url)) { - UI.Show(UIRes.I18N("MsgNeedUrl")); + UI.Show(ResUI.MsgNeedUrl); return; } DownloadHandle downloadHandle = new DownloadHandle(); @@ -349,13 +350,13 @@ namespace v2rayN.Forms if (AddBatchRoutingRules(ref routingItem, clipboardData) == 0) { RefreshRoutingsView(); - UI.Show(UIRes.I18N("OperationSuccess")); + UI.Show(ResUI.OperationSuccess); } } private int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData) { bool blReplace = false; - if (UI.ShowYesNo(UIRes.I18N("AddBatchRoutingRulesYesNo")) == DialogResult.No) + if (UI.ShowYesNo(ResUI.AddBatchRoutingRulesYesNo) == DialogResult.No) { blReplace = true; } diff --git a/v2rayN/v2rayN/Forms/RoutingSettingForm.cs b/v2rayN/v2rayN/Forms/RoutingSettingForm.cs index b1c6755a..b8f21dd7 100644 --- a/v2rayN/v2rayN/Forms/RoutingSettingForm.cs +++ b/v2rayN/v2rayN/Forms/RoutingSettingForm.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using v2rayN.Base; using v2rayN.Handler; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -61,7 +62,7 @@ namespace v2rayN.Forms } else { - UI.ShowWarning(UIRes.I18N("OperationFailed")); + UI.ShowWarning(ResUI.OperationFailed); } } @@ -144,10 +145,10 @@ namespace v2rayN.Forms lvRoutings.HeaderStyle = ColumnHeaderStyle.Clickable; lvRoutings.Columns.Add("", 30); - lvRoutings.Columns.Add(UIRes.I18N("LvAlias"), 200); - lvRoutings.Columns.Add(UIRes.I18N("LvCount"), 60); - lvRoutings.Columns.Add(UIRes.I18N("LvUrl"), 240); - lvRoutings.Columns.Add(UIRes.I18N("LvCustomIcon"), 240); + lvRoutings.Columns.Add(ResUI.LvAlias, 200); + lvRoutings.Columns.Add(ResUI.LvCount, 60); + lvRoutings.Columns.Add(ResUI.LvUrl, 240); + lvRoutings.Columns.Add(ResUI.LvCustomIcon, 240); lvRoutings.EndUpdate(); } @@ -211,7 +212,7 @@ namespace v2rayN.Forms { if (lvRoutings.SelectedIndices.Count <= 0) { - UI.Show(UIRes.I18N("PleaseSelectRules")); + UI.Show(ResUI.PleaseSelectRules); return index; } @@ -259,7 +260,7 @@ namespace v2rayN.Forms { return; } - if (UI.ShowYesNo(UIRes.I18N("RemoveRules")) == DialogResult.No) + if (UI.ShowYesNo(ResUI.RemoveRules) == DialogResult.No) { return; } @@ -282,7 +283,7 @@ namespace v2rayN.Forms { if (index < 0) { - UI.Show(UIRes.I18N("PleaseSelectServer")); + UI.Show(ResUI.PleaseSelectServer); return -1; } if (ConfigHandler.SetDefaultRouting(ref config, index) == 0) @@ -301,7 +302,7 @@ namespace v2rayN.Forms txtBlockDomain.Text = "geosite:category-ads-all"; - UI.Show(UIRes.I18N("OperationSuccess")); + UI.Show(ResUI.OperationSuccess); } private void menuImportAdvancedRules_Click(object sender, EventArgs e) diff --git a/v2rayN/v2rayN/Forms/ServerTransportControl.cs b/v2rayN/v2rayN/Forms/ServerTransportControl.cs index dc4da30b..3b29ddd4 100644 --- a/v2rayN/v2rayN/Forms/ServerTransportControl.cs +++ b/v2rayN/v2rayN/Forms/ServerTransportControl.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Windows.Forms; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -156,34 +157,34 @@ namespace v2rayN.Forms if (network.Equals(Global.DefaultNetwork)) { - tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip1"); - tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip1"); + tipRequestHost.Text = ResUI.TransportRequestHostTip1; + tipHeaderType.Text = ResUI.TransportHeaderTypeTip1; } else if (network.Equals("kcp")) { - tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip2"); - tipPath.Text = UIRes.I18N("TransportPathTip5"); + tipHeaderType.Text = ResUI.TransportHeaderTypeTip2; + tipPath.Text = ResUI.TransportPathTip5; } else if (network.Equals("ws")) { - tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip2"); - tipPath.Text = UIRes.I18N("TransportPathTip1"); + tipRequestHost.Text = ResUI.TransportRequestHostTip2; + tipPath.Text = ResUI.TransportPathTip1; } else if (network.Equals("h2")) { - tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip3"); - tipPath.Text = UIRes.I18N("TransportPathTip2"); + tipRequestHost.Text = ResUI.TransportRequestHostTip3; + tipPath.Text = ResUI.TransportPathTip2; } else if (network.Equals("quic")) { - tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip4"); - tipPath.Text = UIRes.I18N("TransportPathTip3"); - tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip3"); + tipRequestHost.Text = ResUI.TransportRequestHostTip4; + tipPath.Text = ResUI.TransportPathTip3; + tipHeaderType.Text = ResUI.TransportHeaderTypeTip3; } else if (network.Equals("grpc")) { - tipPath.Text = UIRes.I18N("TransportPathTip4"); - tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip4"); + tipPath.Text = ResUI.TransportPathTip4; + tipHeaderType.Text = ResUI.TransportHeaderTypeTip4; labHeaderType.Visible = false; } } diff --git a/v2rayN/v2rayN/Forms/SubSettingForm.cs b/v2rayN/v2rayN/Forms/SubSettingForm.cs index e7ba4dd3..ac8266e2 100644 --- a/v2rayN/v2rayN/Forms/SubSettingForm.cs +++ b/v2rayN/v2rayN/Forms/SubSettingForm.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Windows.Forms; using v2rayN.Handler; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Forms { @@ -74,7 +75,7 @@ namespace v2rayN.Forms } else { - UI.ShowWarning(UIRes.I18N("OperationFailed")); + UI.ShowWarning(ResUI.OperationFailed); } } diff --git a/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayN/v2rayN/Handler/DownloadHandle.cs index 0bc47214..5b84224f 100644 --- a/v2rayN/v2rayN/Handler/DownloadHandle.cs +++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs @@ -3,6 +3,7 @@ using System.IO; using System.Net; using System.Text; using v2rayN.Base; +using v2rayN.Resx; namespace v2rayN.Handler { @@ -39,7 +40,7 @@ namespace v2rayN.Handler try { Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().enableSecurityProtocolTls13); - UpdateCompleted?.Invoke(this, new ResultEventArgs(false, UIRes.I18N("Downloading"))); + UpdateCompleted?.Invoke(this, new ResultEventArgs(false, ResUI.Downloading)); progressPercentage = -1; totalBytesToReceive = 0; @@ -215,7 +216,7 @@ namespace v2rayN.Handler try { Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().enableSecurityProtocolTls13); - UpdateCompleted?.Invoke(this, new ResultEventArgs(false, UIRes.I18N("Downloading"))); + UpdateCompleted?.Invoke(this, new ResultEventArgs(false, ResUI.Downloading)); progressPercentage = -1; totalBytesToReceive = 0; diff --git a/v2rayN/v2rayN/Handler/MainFormHandler.cs b/v2rayN/v2rayN/Handler/MainFormHandler.cs index c7dc4337..b30cf274 100644 --- a/v2rayN/v2rayN/Handler/MainFormHandler.cs +++ b/v2rayN/v2rayN/Handler/MainFormHandler.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using v2rayN.Mode; using System.Linq; +using v2rayN.Resx; namespace v2rayN.Handler { @@ -88,7 +89,7 @@ namespace v2rayN.Handler if (item.configType != EConfigType.Vmess && item.configType != EConfigType.VLESS) { - UI.Show(UIRes.I18N("NonVmessService")); + UI.Show(ResUI.NonVmessService); return; } @@ -115,7 +116,7 @@ namespace v2rayN.Handler } else { - UI.ShowWarning(string.Format(UIRes.I18N("SaveClientConfigurationIn"), fileName)); + UI.ShowWarning(string.Format(ResUI.SaveClientConfigurationIn, fileName)); } } @@ -128,7 +129,7 @@ namespace v2rayN.Handler if (item.configType != EConfigType.Vmess && item.configType != EConfigType.VLESS) { - UI.Show(UIRes.I18N("NonVmessService")); + UI.Show(ResUI.NonVmessService); return; } @@ -155,7 +156,7 @@ namespace v2rayN.Handler } else { - UI.ShowWarning(string.Format(UIRes.I18N("SaveServerConfigurationIn"), fileName)); + UI.ShowWarning(string.Format(ResUI.SaveServerConfigurationIn, fileName)); } } @@ -191,11 +192,11 @@ namespace v2rayN.Handler if (ret == 0) { - UI.Show(UIRes.I18N("OperationSuccess")); + UI.Show(ResUI.OperationSuccess); } else { - UI.ShowWarning(UIRes.I18N("OperationFailed")); + UI.ShowWarning(ResUI.OperationFailed); } } } @@ -268,12 +269,12 @@ namespace v2rayN.Handler try { HotkeyManager.Current.AddOrReplace(((int)item.eGlobalHotkey).ToString(), keys, handler); - var msg = string.Format(UIRes.I18N("RegisterGlobalHotkeySuccessfully"), $"{item.eGlobalHotkey.ToString()} = {keys}"); + var msg = string.Format(ResUI.RegisterGlobalHotkeySuccessfully, $"{item.eGlobalHotkey.ToString()} = {keys}"); update(false, msg); } catch (Exception ex) { - var msg = string.Format(UIRes.I18N("RegisterGlobalHotkeyFailed"), $"{item.eGlobalHotkey.ToString()} = {keys}", ex.Message); + var msg = string.Format(ResUI.RegisterGlobalHotkeyFailed, $"{item.eGlobalHotkey.ToString()} = {keys}", ex.Message); update(false, msg); Utils.SaveLog(msg); } diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs index fb755af5..56746da7 100644 --- a/v2rayN/v2rayN/Handler/ShareHandler.cs +++ b/v2rayN/v2rayN/Handler/ShareHandler.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using System.Web; using v2rayN.Base; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Handler { @@ -318,7 +319,7 @@ namespace v2rayN.Handler string result = clipboardData.TrimEx();// Utils.GetClipboardData(); if (Utils.IsNullOrEmpty(result)) { - msg = UIRes.I18N("FailedReadConfiguration"); + msg = ResUI.FailedReadConfiguration; return null; } @@ -338,7 +339,7 @@ namespace v2rayN.Handler } else if (result.StartsWith(Global.ssProtocol)) { - msg = UIRes.I18N("ConfigurationFormatIncorrect"); + msg = ResUI.ConfigurationFormatIncorrect; vmessItem = ResolveSSLegacy(result); if (vmessItem == null) @@ -358,7 +359,7 @@ namespace v2rayN.Handler } else if (result.StartsWith(Global.socksProtocol)) { - msg = UIRes.I18N("ConfigurationFormatIncorrect"); + msg = ResUI.ConfigurationFormatIncorrect; vmessItem = ResolveSocksNew(result); if (vmessItem == null) @@ -378,7 +379,7 @@ namespace v2rayN.Handler } else if (result.StartsWith(Global.trojanProtocol)) { - msg = UIRes.I18N("ConfigurationFormatIncorrect"); + msg = ResUI.ConfigurationFormatIncorrect; vmessItem = ResolveTrojan(result); } @@ -390,13 +391,13 @@ namespace v2rayN.Handler } else { - msg = UIRes.I18N("NonvmessOrssProtocol"); + msg = ResUI.NonvmessOrssProtocol; return null; } } catch { - msg = UIRes.I18N("Incorrectconfiguration"); + msg = ResUI.Incorrectconfiguration; return null; } @@ -416,7 +417,7 @@ namespace v2rayN.Handler VmessQRCode vmessQRCode = Utils.FromJson(result); if (vmessQRCode == null) { - msg = UIRes.I18N("FailedConversionConfiguration"); + msg = ResUI.FailedConversionConfiguration; return null; } diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs index df0eee21..1b299216 100644 --- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs +++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs @@ -6,6 +6,7 @@ using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Handler { @@ -117,7 +118,7 @@ namespace v2rayN.Handler pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds); if (pid < 0) { - _updateFunc(_selecteds[0].indexId, UIRes.I18N("OperationFailed")); + _updateFunc(_selecteds[0].indexId, ResUI.OperationFailed); return; } @@ -203,7 +204,7 @@ namespace v2rayN.Handler pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds); if (pid < 0) { - _updateFunc(_selecteds[0].indexId, UIRes.I18N("OperationFailed")); + _updateFunc(_selecteds[0].indexId, ResUI.OperationFailed); return; } diff --git a/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayN/v2rayN/Handler/UpdateHandle.cs index 1ab00e3b..894a6acf 100644 --- a/v2rayN/v2rayN/Handler/UpdateHandle.cs +++ b/v2rayN/v2rayN/Handler/UpdateHandle.cs @@ -8,6 +8,7 @@ using System.Text.RegularExpressions; using System.Windows.Forms; using v2rayN.Base; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Handler { @@ -53,7 +54,7 @@ namespace v2rayN.Handler { if (args.Success) { - _updateFunc(false, UIRes.I18N("MsgDownloadV2rayCoreSuccessfully")); + _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully); try { @@ -93,7 +94,7 @@ namespace v2rayN.Handler { if (args.Success) { - _updateFunc(false, string.Format(UIRes.I18N("MsgParsingSuccessfully"), "v2rayN")); + _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "v2rayN")); url = args.Msg; askToDownload(downloadHandle, url, true); @@ -103,7 +104,7 @@ namespace v2rayN.Handler _updateFunc(false, args.Msg); } }; - _updateFunc(false, string.Format(UIRes.I18N("MsgStartUpdating"), "v2rayN")); + _updateFunc(false, string.Format(ResUI.MsgStartUpdating, "v2rayN")); CheckUpdateAsync(ECoreType.v2rayN); } @@ -122,8 +123,8 @@ namespace v2rayN.Handler { if (args.Success) { - _updateFunc(false, UIRes.I18N("MsgDownloadV2rayCoreSuccessfully")); - _updateFunc(false, UIRes.I18N("MsgUnpacking")); + _updateFunc(false, ResUI.MsgDownloadV2rayCoreSuccessfully); + _updateFunc(false, ResUI.MsgUnpacking); try { @@ -149,7 +150,7 @@ namespace v2rayN.Handler { if (args.Success) { - _updateFunc(false, string.Format(UIRes.I18N("MsgParsingSuccessfully"), "Core")); + _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "Core")); url = args.Msg; askToDownload(downloadHandle, url, true); } @@ -158,7 +159,7 @@ namespace v2rayN.Handler _updateFunc(false, args.Msg); } }; - _updateFunc(false, string.Format(UIRes.I18N("MsgStartUpdating"), "Core")); + _updateFunc(false, string.Format(ResUI.MsgStartUpdating, "Core")); CheckUpdateAsync(type); } @@ -168,11 +169,11 @@ namespace v2rayN.Handler _config = config; _updateFunc = update; - _updateFunc(false, UIRes.I18N("MsgUpdateSubscriptionStart")); + _updateFunc(false, ResUI.MsgUpdateSubscriptionStart); if (config.subItem == null || config.subItem.Count <= 0) { - _updateFunc(false, UIRes.I18N("MsgNoValidSubscription")); + _updateFunc(false, ResUI.MsgNoValidSubscription); return; } @@ -189,7 +190,7 @@ namespace v2rayN.Handler } if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url)) { - _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgNoValidSubscription")}"); + _updateFunc(false, $"{hashCode}{ResUI.MsgNoValidSubscription}"); continue; } @@ -198,17 +199,17 @@ namespace v2rayN.Handler { if (args.Success) { - _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgGetSubscriptionSuccessfully")}"); + _updateFunc(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}"); //string result = Utils.Base64Decode(args.Msg); string result = args.Msg; if (Utils.IsNullOrEmpty(result)) { - _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgSubscriptionDecodingFailed")}"); + _updateFunc(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}"); return; } //ConfigHandler.RemoveServerViaSubid(ref config, id); - //_updateFunc(false, $"{hashCode}{UIRes.I18N("MsgClearSubscription")}"); + //_updateFunc(false, $"{hashCode}{ResUI.MsgClearSubscription")}"); // RefreshServers(); int ret = ConfigHandler.AddBatchServers(ref config, result, id, groupId); if (ret > 0) @@ -217,9 +218,9 @@ namespace v2rayN.Handler } else { - _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgFailedImportSubscription")}"); + _updateFunc(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}"); } - _updateFunc(true, $"{hashCode}{UIRes.I18N("MsgUpdateSubscriptionEnd")}"); + _updateFunc(true, $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"); } else { @@ -234,7 +235,7 @@ namespace v2rayN.Handler WebProxy webProxy = blProxy ? new WebProxy(Global.Loopback, _config.GetLocalPort(Global.InboundHttp)) : null; downloadHandle3.WebDownloadString(url, webProxy, userAgent); - _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgStartGettingSubscriptions")}"); + _updateFunc(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}"); } } @@ -255,7 +256,7 @@ namespace v2rayN.Handler { if (args.Success) { - _updateFunc(false, string.Format(UIRes.I18N("MsgDownloadGeoFileSuccessfully"), geoName)); + _updateFunc(false, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, geoName)); try { @@ -366,7 +367,7 @@ namespace v2rayN.Handler string filePath = Utils.GetPath(core); if (!File.Exists(filePath)) { - string msg = string.Format(UIRes.I18N("NotFoundCore"), @""); + string msg = string.Format(ResUI.NotFoundCore, @""); //ShowMsg(true, msg); return ""; } @@ -404,21 +405,21 @@ namespace v2rayN.Handler if (type == ECoreType.v2fly) { curVersion = "v" + getCoreVersion(type); - message = string.Format(UIRes.I18N("IsLatestCore"), curVersion); + message = string.Format(ResUI.IsLatestCore, curVersion); string osBit = Environment.Is64BitProcess ? "64" : "32"; url = string.Format(v2flyCoreUrl, version, osBit); } else if (type == ECoreType.Xray) { curVersion = "v" + getCoreVersion(type); - message = string.Format(UIRes.I18N("IsLatestCore"), curVersion); + message = string.Format(ResUI.IsLatestCore, curVersion); string osBit = Environment.Is64BitProcess ? "64" : "32"; url = string.Format(xrayCoreUrl, version, osBit); } else if (type == ECoreType.v2rayN) { curVersion = FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString(); - message = string.Format(UIRes.I18N("IsLatestN"), curVersion); + message = string.Format(ResUI.IsLatestN, curVersion); url = string.Format(nUrl, version); } else @@ -446,7 +447,7 @@ namespace v2rayN.Handler bool blDownload = false; if (blAsk) { - if (UI.ShowYesNo(string.Format(UIRes.I18N("DownloadYesNo"), url)) == DialogResult.Yes) + if (UI.ShowYesNo(string.Format(ResUI.DownloadYesNo, url)) == DialogResult.Yes) { blDownload = true; } diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs index 24887606..ca31c4ec 100644 --- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs @@ -6,6 +6,7 @@ using System.Net; using System.Net.NetworkInformation; using v2rayN.Base; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Handler { @@ -32,11 +33,11 @@ namespace v2rayN.Handler { if (node == null) { - msg = UIRes.I18N("CheckServerSettings"); + msg = ResUI.CheckServerSettings; return -1; } - msg = UIRes.I18N("InitialConfiguration"); + msg = ResUI.InitialConfiguration; if (node.configType == EConfigType.Custom) { return GenerateClientCustomConfig(node, fileName, out msg); @@ -46,7 +47,7 @@ namespace v2rayN.Handler string result = Utils.GetEmbedText(SampleClient); if (Utils.IsNullOrEmpty(result)) { - msg = UIRes.I18N("FailedGetDefaultConfiguration"); + msg = ResUI.FailedGetDefaultConfiguration; return -1; } @@ -54,7 +55,7 @@ namespace v2rayN.Handler V2rayConfig v2rayConfig = Utils.FromJson(result); if (v2rayConfig == null) { - msg = UIRes.I18N("FailedGenDefaultConfiguration"); + msg = ResUI.FailedGenDefaultConfiguration; return -1; } @@ -80,11 +81,11 @@ namespace v2rayN.Handler Utils.ToJsonFile(v2rayConfig, fileName, false); - msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), $"[{config.GetGroupRemarks(node.groupId)}] {node.GetSummary()}"); + msg = string.Format(ResUI.SuccessfulConfiguration, $"[{config.GetGroupRemarks(node.groupId)}] {node.GetSummary()}"); } catch { - msg = UIRes.I18N("FailedGenDefaultConfiguration"); + msg = ResUI.FailedGenDefaultConfiguration; return -1; } return 0; @@ -901,7 +902,7 @@ namespace v2rayN.Handler //检查GUI设置 if (node == null) { - msg = UIRes.I18N("CheckServerSettings"); + msg = ResUI.CheckServerSettings; return -1; } @@ -917,7 +918,7 @@ namespace v2rayN.Handler } if (!File.Exists(addressFileName)) { - msg = UIRes.I18N("FailedGenDefaultConfiguration"); + msg = ResUI.FailedGenDefaultConfiguration; return -1; } File.Copy(addressFileName, fileName); @@ -925,7 +926,7 @@ namespace v2rayN.Handler //check again if (!File.Exists(fileName)) { - msg = UIRes.I18N("FailedGenDefaultConfiguration"); + msg = ResUI.FailedGenDefaultConfiguration; return -1; } @@ -944,12 +945,12 @@ namespace v2rayN.Handler } File.WriteAllLines(fileName, fileContent); - msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), $"[{LazyConfig.Instance.GetConfig().GetGroupRemarks(node.groupId)}] {node.GetSummary()}"); + msg = string.Format(ResUI.SuccessfulConfiguration, $"[{LazyConfig.Instance.GetConfig().GetGroupRemarks(node.groupId)}] {node.GetSummary()}"); } catch (Exception ex) { Utils.SaveLog("GenerateClientCustomConfig", ex); - msg = UIRes.I18N("FailedGenDefaultConfiguration"); + msg = ResUI.FailedGenDefaultConfiguration; return -1; } return 0; @@ -973,17 +974,17 @@ namespace v2rayN.Handler //检查GUI设置 if (node == null) { - msg = UIRes.I18N("CheckServerSettings"); + msg = ResUI.CheckServerSettings; return -1; } - msg = UIRes.I18N("InitialConfiguration"); + msg = ResUI.InitialConfiguration; //取得默认配置 string result = Utils.GetEmbedText(SampleServer); if (Utils.IsNullOrEmpty(result)) { - msg = UIRes.I18N("FailedGetDefaultConfiguration"); + msg = ResUI.FailedGetDefaultConfiguration; return -1; } @@ -991,7 +992,7 @@ namespace v2rayN.Handler V2rayConfig v2rayConfig = Utils.FromJson(result); if (v2rayConfig == null) { - msg = UIRes.I18N("FailedGenDefaultConfiguration"); + msg = ResUI.FailedGenDefaultConfiguration; return -1; } @@ -1008,11 +1009,11 @@ namespace v2rayN.Handler Utils.ToJsonFile(v2rayConfig, fileName, false); - msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), node.GetSummary()); + msg = string.Format(ResUI.SuccessfulConfiguration, node.GetSummary()); } catch { - msg = UIRes.I18N("FailedGenDefaultConfiguration"); + msg = ResUI.FailedGenDefaultConfiguration; return -1; } return 0; @@ -1110,7 +1111,7 @@ namespace v2rayN.Handler string result = Utils.LoadResource(fileName); if (Utils.IsNullOrEmpty(result)) { - msg = UIRes.I18N("FailedReadConfiguration"); + msg = ResUI.FailedReadConfiguration; return null; } @@ -1118,14 +1119,14 @@ namespace v2rayN.Handler V2rayConfig v2rayConfig = Utils.FromJson(result); if (v2rayConfig == null) { - msg = UIRes.I18N("FailedConversionConfiguration"); + msg = ResUI.FailedConversionConfiguration; return null; } if (v2rayConfig.outbounds == null || v2rayConfig.outbounds.Count <= 0) { - msg = UIRes.I18N("IncorrectClientConfiguration"); + msg = ResUI.IncorrectClientConfiguration; return null; } @@ -1139,7 +1140,7 @@ namespace v2rayN.Handler || outbound.settings.vnext[0].users == null || outbound.settings.vnext[0].users.Count <= 0) { - msg = UIRes.I18N("IncorrectClientConfiguration"); + msg = ResUI.IncorrectClientConfiguration; return null; } @@ -1232,7 +1233,7 @@ namespace v2rayN.Handler } catch { - msg = UIRes.I18N("IncorrectClientConfiguration"); + msg = ResUI.IncorrectClientConfiguration; return null; } @@ -1256,7 +1257,7 @@ namespace v2rayN.Handler string result = Utils.LoadResource(fileName); if (Utils.IsNullOrEmpty(result)) { - msg = UIRes.I18N("FailedReadConfiguration"); + msg = ResUI.FailedReadConfiguration; return null; } @@ -1264,14 +1265,14 @@ namespace v2rayN.Handler V2rayConfig v2rayConfig = Utils.FromJson(result); if (v2rayConfig == null) { - msg = UIRes.I18N("FailedConversionConfiguration"); + msg = ResUI.FailedConversionConfiguration; return null; } if (v2rayConfig.inbounds == null || v2rayConfig.inbounds.Count <= 0) { - msg = UIRes.I18N("IncorrectServerConfiguration"); + msg = ResUI.IncorrectServerConfiguration; return null; } @@ -1283,7 +1284,7 @@ namespace v2rayN.Handler || inbound.settings.clients == null || inbound.settings.clients.Count <= 0) { - msg = UIRes.I18N("IncorrectServerConfiguration"); + msg = ResUI.IncorrectServerConfiguration; return null; } @@ -1377,7 +1378,7 @@ namespace v2rayN.Handler } catch { - msg = UIRes.I18N("IncorrectClientConfiguration"); + msg = ResUI.IncorrectClientConfiguration; return null; } return vmessItem; @@ -1418,25 +1419,25 @@ namespace v2rayN.Handler { if (config == null) { - msg = UIRes.I18N("CheckServerSettings"); + msg = ResUI.CheckServerSettings; return ""; } - msg = UIRes.I18N("InitialConfiguration"); + msg = ResUI.InitialConfiguration; Config configCopy = Utils.DeepCopy(config); string result = Utils.GetEmbedText(SampleClient); if (Utils.IsNullOrEmpty(result)) { - msg = UIRes.I18N("FailedGetDefaultConfiguration"); + msg = ResUI.FailedGetDefaultConfiguration; return ""; } V2rayConfig v2rayConfig = Utils.FromJson(result); if (v2rayConfig == null) { - msg = UIRes.I18N("FailedGenDefaultConfiguration"); + msg = ResUI.FailedGenDefaultConfiguration; return ""; } List lstIpEndPoints = null; @@ -1517,12 +1518,12 @@ namespace v2rayN.Handler v2rayConfig.routing.rules.Add(rule); } - //msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), node.getSummary()); + //msg = string.Format(ResUI.SuccessfulConfiguration"), node.getSummary()); return Utils.ToJson(v2rayConfig); } catch { - msg = UIRes.I18N("FailedGenDefaultConfiguration"); + msg = ResUI.FailedGenDefaultConfiguration; return ""; } } diff --git a/v2rayN/v2rayN/Handler/V2rayHandler.cs b/v2rayN/v2rayN/Handler/V2rayHandler.cs index e6796d34..ba7dfb09 100644 --- a/v2rayN/v2rayN/Handler/V2rayHandler.cs +++ b/v2rayN/v2rayN/Handler/V2rayHandler.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using System.IO; using System.Text; using v2rayN.Mode; +using v2rayN.Resx; namespace v2rayN.Handler { @@ -40,13 +41,13 @@ namespace v2rayN.Handler var item = ConfigHandler.GetDefaultServer(ref config); if (item == null) { - ShowMsg(false, UIRes.I18N("CheckServerSettings")); + ShowMsg(false, ResUI.CheckServerSettings); return; } if (SetCore(config, item) != 0) { - ShowMsg(false, UIRes.I18N("CheckServerSettings")); + ShowMsg(false, ResUI.CheckServerSettings); return; } string fileName = Utils.GetPath(v2rayConfigRes); @@ -180,7 +181,7 @@ namespace v2rayN.Handler } if (Utils.IsNullOrEmpty(fileName)) { - string msg = string.Format(UIRes.I18N("NotFoundCore"), coreInfo.coreUrl); + string msg = string.Format(ResUI.NotFoundCore, coreInfo.coreUrl); ShowMsg(false, msg); } return fileName; @@ -191,7 +192,7 @@ namespace v2rayN.Handler /// private void V2rayStart() { - ShowMsg(false, string.Format(UIRes.I18N("StartService"), DateTime.Now.ToString())); + ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString())); try { @@ -245,7 +246,7 @@ namespace v2rayN.Handler /// private int V2rayStartNew(string configStr) { - ShowMsg(false, string.Format(UIRes.I18N("StartService"), DateTime.Now.ToString())); + ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString())); try { diff --git a/v2rayN/v2rayN/Tool/UIRes.cs b/v2rayN/v2rayN/Tool/UIRes.cs deleted file mode 100644 index f0660435..00000000 --- a/v2rayN/v2rayN/Tool/UIRes.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections.Generic; -using System.Reflection; -using System.Resources; - -namespace v2rayN -{ - public class UIRes - { - static ResourceManager res = new ResourceManager("v2rayN.Resx.ResUI", Assembly.GetExecutingAssembly()); - - static string LoadString(ResourceManager resMgr, string key) - { - string value = resMgr.GetString(key); - if (value == null) - { - throw new KeyNotFoundException($"key: {key}"); - } - return value; - } - - public static string I18N(string key) - { - return LoadString(res, key); - } - } -} diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj index 5499ccd2..403a5db0 100644 --- a/v2rayN/v2rayN/v2rayN.csproj +++ b/v2rayN/v2rayN/v2rayN.csproj @@ -262,7 +262,6 @@ -