diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs index 6a76630c..39587452 100644 --- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs @@ -91,13 +91,12 @@ this.menuExit = new System.Windows.Forms.ToolStripMenuItem(); this.panel1 = new System.Windows.Forms.Panel(); this.tsMain = new System.Windows.Forms.ToolStrip(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.tsbQRCodeSwitch = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.tsbSub = new System.Windows.Forms.ToolStripDropDownButton(); this.tsbSubSetting = new System.Windows.Forms.ToolStripMenuItem(); this.tsbSubUpdate = new System.Windows.Forms.ToolStripMenuItem(); this.tsbSubUpdateViaProxy = new System.Windows.Forms.ToolStripMenuItem(); - this.tsbQRCodeSwitch = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.tsbSetting = new System.Windows.Forms.ToolStripDropDownButton(); this.tsbOptionSetting = new System.Windows.Forms.ToolStripMenuItem(); this.tsbRoutingSetting = new System.Windows.Forms.ToolStripMenuItem(); @@ -105,9 +104,8 @@ this.tsbGroupSetting = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); this.tsbBackupGuiNConfig = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.tsbReload = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.tsbReload = new System.Windows.Forms.ToolStripButton(); this.tsbCheckUpdate = new System.Windows.Forms.ToolStripDropDownButton(); this.tsbCheckUpdateN = new System.Windows.Forms.ToolStripMenuItem(); this.tsbCheckUpdateCore = new System.Windows.Forms.ToolStripMenuItem(); @@ -117,16 +115,15 @@ this.tsbCheckUpdateClashMetaCore = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); this.tsbCheckUpdateGeo = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); this.tsbHelp = new System.Windows.Forms.ToolStripDropDownButton(); this.tsbAbout = new System.Windows.Forms.ToolStripMenuItem(); this.tsbV2rayWebsite = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); this.tsbLanguageDef = new System.Windows.Forms.ToolStripMenuItem(); this.tsbLanguageZhHans = new System.Windows.Forms.ToolStripMenuItem(); - this.tsbPromotion = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.tsbClose = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.scServers)).BeginInit(); this.scServers.Panel1.SuspendLayout(); this.scServers.Panel2.SuspendLayout(); @@ -213,7 +210,6 @@ this.menuExport2ShareUrl, this.menuExport2SubContent}); this.cmsLv.Name = "cmsLv"; - this.cmsLv.OwnerItem = this.tsbServer; resources.ApplyResources(this.cmsLv, "cmsLv"); // // menuAddVmessServer @@ -583,28 +579,34 @@ this.tsMain.ImageScalingSize = new System.Drawing.Size(32, 32); this.tsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsbServer, - this.toolStripSeparator4, + this.toolStripSeparator5, this.tsbSub, this.tsbQRCodeSwitch, - this.toolStripSeparator8, + this.toolStripSeparator4, this.tsbSetting, - this.toolStripSeparator5, - this.tsbReload, this.toolStripSeparator7, + this.tsbReload, this.tsbCheckUpdate, - this.toolStripSeparator10, this.tsbHelp, - this.tsbPromotion, this.toolStripSeparator11, this.tsbClose}); resources.ApplyResources(this.tsMain, "tsMain"); this.tsMain.Name = "tsMain"; this.tsMain.TabStop = true; // - // toolStripSeparator4 + // tsbQRCodeSwitch // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4"); + this.tsbQRCodeSwitch.CheckOnClick = true; + this.tsbQRCodeSwitch.ForeColor = System.Drawing.Color.Black; + this.tsbQRCodeSwitch.Image = global::v2rayN.Properties.Resources.share; + resources.ApplyResources(this.tsbQRCodeSwitch, "tsbQRCodeSwitch"); + this.tsbQRCodeSwitch.Name = "tsbQRCodeSwitch"; + this.tsbQRCodeSwitch.CheckedChanged += new System.EventHandler(this.tsbQRCodeSwitch_CheckedChanged); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5"); // // tsbSub // @@ -634,20 +636,6 @@ resources.ApplyResources(this.tsbSubUpdateViaProxy, "tsbSubUpdateViaProxy"); this.tsbSubUpdateViaProxy.Click += new System.EventHandler(this.tsbSubUpdateViaProxy_Click); // - // tsbQRCodeSwitch - // - this.tsbQRCodeSwitch.CheckOnClick = true; - this.tsbQRCodeSwitch.ForeColor = System.Drawing.Color.Black; - this.tsbQRCodeSwitch.Image = global::v2rayN.Properties.Resources.share; - resources.ApplyResources(this.tsbQRCodeSwitch, "tsbQRCodeSwitch"); - this.tsbQRCodeSwitch.Name = "tsbQRCodeSwitch"; - this.tsbQRCodeSwitch.CheckedChanged += new System.EventHandler(this.tsbQRCodeSwitch_CheckedChanged); - // - // toolStripSeparator8 - // - this.toolStripSeparator8.Name = "toolStripSeparator8"; - resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8"); - // // tsbSetting // this.tsbSetting.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -696,10 +684,10 @@ resources.ApplyResources(this.tsbBackupGuiNConfig, "tsbBackupGuiNConfig"); this.tsbBackupGuiNConfig.Click += new System.EventHandler(this.tsbBackupGuiNConfig_Click); // - // toolStripSeparator5 + // toolStripSeparator7 // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5"); + this.toolStripSeparator7.Name = "toolStripSeparator7"; + resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7"); // // tsbReload // @@ -708,11 +696,6 @@ this.tsbReload.Name = "tsbReload"; this.tsbReload.Click += new System.EventHandler(this.tsbReload_Click); // - // toolStripSeparator7 - // - this.toolStripSeparator7.Name = "toolStripSeparator7"; - resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7"); - // // tsbCheckUpdate // this.tsbCheckUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -727,6 +710,7 @@ this.tsbCheckUpdate.Image = global::v2rayN.Properties.Resources.checkupdate; resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate"); this.tsbCheckUpdate.Name = "tsbCheckUpdate"; + this.tsbCheckUpdate.Click += new System.EventHandler(this.tsbCheckUpdate_Click); // // tsbCheckUpdateN // @@ -774,11 +758,6 @@ resources.ApplyResources(this.tsbCheckUpdateGeo, "tsbCheckUpdateGeo"); this.tsbCheckUpdateGeo.Click += new System.EventHandler(this.tsbCheckUpdateGeo_Click); // - // toolStripSeparator10 - // - this.toolStripSeparator10.Name = "toolStripSeparator10"; - resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10"); - // // tsbHelp // this.tsbHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -820,14 +799,6 @@ resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans"); this.tsbLanguageZhHans.Click += new System.EventHandler(this.tsbLanguageZhHans_Click); // - // tsbPromotion - // - this.tsbPromotion.ForeColor = System.Drawing.Color.Black; - this.tsbPromotion.Image = global::v2rayN.Properties.Resources.promotion; - resources.ApplyResources(this.tsbPromotion, "tsbPromotion"); - this.tsbPromotion.Name = "tsbPromotion"; - this.tsbPromotion.Click += new System.EventHandler(this.tsbPromotion_Click); - // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; @@ -840,6 +811,11 @@ this.tsbClose.Name = "tsbClose"; this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click); // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4"); + // // MainForm // resources.ApplyResources(this, "$this"); @@ -895,7 +871,6 @@ private System.Windows.Forms.ToolStrip tsMain; private System.Windows.Forms.ToolStripDropDownButton tsbServer; private System.Windows.Forms.ToolStripButton tsbClose; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; @@ -908,7 +883,6 @@ private System.Windows.Forms.ToolStripMenuItem menuAddShadowsocksServer; private System.Windows.Forms.SplitContainer scServers; private QRCodeControl qrCodeControl; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; private System.Windows.Forms.ToolStripDropDownButton tsbCheckUpdate; private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateN; private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateCore; @@ -922,7 +896,6 @@ private System.Windows.Forms.ToolStripMenuItem menuScanScreen; private System.Windows.Forms.ToolStripMenuItem menuScanScreen2; private System.Windows.Forms.ToolStripDropDownButton tsbSub; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; private System.Windows.Forms.ToolStripMenuItem tsbSubSetting; private System.Windows.Forms.ToolStripMenuItem tsbSubUpdate; private System.Windows.Forms.ToolStripMenuItem menuSelectAll; @@ -930,7 +903,6 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; private System.Windows.Forms.ToolStripMenuItem tsbLanguageDef; private System.Windows.Forms.ToolStripMenuItem tsbLanguageZhHans; - private System.Windows.Forms.ToolStripButton tsbPromotion; private System.Windows.Forms.ToolStripMenuItem menuAddSocksServer; private System.Windows.Forms.ToolStripMenuItem menuRemoveDuplicateServer; private System.Windows.Forms.ToolStripMenuItem menuTcpingServer; @@ -972,6 +944,7 @@ private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateClashMetaCore; private System.Windows.Forms.ToolStripSeparator toolStripSeparator16; private System.Windows.Forms.ToolStripMenuItem menuSortServerResult; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; } } diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index fd491217..76d5f191 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -1542,5 +1542,9 @@ namespace v2rayN.Forms } #endregion + private void tsbCheckUpdate_Click(object sender, EventArgs e) + { + + } } } diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx index 5714620a..12a5be95 100644 --- a/v2rayN/v2rayN/Forms/MainForm.resx +++ b/v2rayN/v2rayN/Forms/MainForm.resx @@ -123,223 +123,211 @@ - 3, 17 + 3, 16 226, 19 - 355, 22 + 321, 22 Add [VMess] server - 355, 22 + 321, 22 Add [VLESS] server - 355, 22 + 321, 22 Add [Shadowsocks] server - 355, 22 + 321, 22 Add [Socks] server - 355, 22 + 321, 22 Add [Trojan] server - 355, 22 + 321, 22 Add a custom configuration server - 355, 22 + 321, 22 Import bulk URL from clipboard (Ctrl+V) - 355, 22 + 321, 22 Scan QR code on the screen (Ctrl+S) - 352, 6 + 318, 6 - 355, 22 + 321, 22 Remove selected servers (Delete) - 355, 22 + 321, 22 Remove duplicate servers - 355, 22 + 321, 22 Clone selected server - 355, 22 + 321, 22 Set as active server (Enter) - 355, 22 + 321, 22 Set server filter (Ctrl+F) - 352, 6 + 318, 6 - 355, 22 + 321, 22 Move to Group - 192, 22 + 179, 22 Move to top (T) - 192, 22 + 179, 22 Up (U) - 192, 22 + 179, 22 Down (D) - 192, 22 + 179, 22 Move to bottom (B) - 355, 22 + 321, 22 Move to - 355, 22 + 321, 22 Select All (Ctrl+A) - 352, 6 + 318, 6 - 355, 22 + 321, 22 Test servers ping (Ctrl+P) - 355, 22 + 321, 22 Test servers with tcping (Ctrl+O) - 355, 22 + 321, 22 Test servers real delay (Ctrl+R) - 355, 22 + 321, 22 Test servers download speed (Ctrl+T) - 355, 22 + 321, 22 Sort by test result (Ctrl+E) - 355, 22 + 321, 22 Test current service status - 355, 22 + 321, 22 Clear all service statistics - 352, 6 + 318, 6 - 355, 22 + 321, 22 Export selected server for client configuration - 355, 22 + 321, 22 Export selected server for server configuration - 355, 22 + 321, 22 Export share URLs to clipboard (Ctrl+C) - 355, 22 + 321, 22 Export subscription (base64) share to clipboard - - Magenta - - - 64, 53 - - - Servers - - - ImageAboveText - - 356, 644 + 322, 622 cmsLv @@ -371,7 +359,7 @@ 0, 20 - 686, 260 + 686, 290 @@ -435,7 +423,7 @@ 4, 4, 4, 4 - 256, 280 + 256, 310 2 @@ -468,7 +456,7 @@ 100 - 946, 280 + 946, 310 686 @@ -488,11 +476,23 @@ 0 + + Magenta + + + 57, 51 + + + Servers + + + ImageAboveText + Fill - 0, 66 + 0, 64 Horizontal @@ -504,7 +504,7 @@ 0, 0 - 952, 300 + 952, 329 0 @@ -540,7 +540,7 @@ 0, 0 - 952, 223 + 952, 245 0 @@ -570,10 +570,10 @@ 1 - 952, 527 + 952, 578 - 300 + 329 5 @@ -600,79 +600,79 @@ NoControl - 243, 22 + 225, 22 Clear system proxy - 243, 22 + 225, 22 Set system proxy - 243, 22 + 225, 22 Do not change system proxy - 277, 22 + 257, 22 System proxy - 277, 22 + 257, 22 Routing - 277, 22 + 257, 22 Server - 274, 6 + 254, 6 - 277, 22 + 257, 22 Import bulk URL from clipboard - 277, 22 + 257, 22 Scan QR code on the screen - 277, 22 + 257, 22 Update subscription without proxy - 277, 22 + 257, 22 Update subscriptions via proxy - 274, 6 + 254, 6 - 277, 22 + 257, 22 Exit - 278, 192 + 258, 192 cmsMain @@ -690,7 +690,7 @@ Top - 0, 56 + 0, 54 952, 10 @@ -713,23 +713,23 @@ 315, 17 - - 6, 56 + + 6, 54 - 277, 22 + 257, 22 Settings - 277, 22 + 257, 22 Update subscription without proxy - 277, 22 + 257, 22 Update subscription with proxy @@ -738,7 +738,7 @@ Magenta - 99, 53 + 91, 51 Subscriptions @@ -750,7 +750,7 @@ Magenta - 45, 53 + 40, 51 Share @@ -761,38 +761,38 @@ ImageAboveText - - 6, 56 + + 6, 54 - 195, 22 + 183, 22 OptionSetting - 195, 22 + 183, 22 RoutingSetting - 195, 22 + 183, 22 GlobalHotkeySetting - 195, 22 + 183, 22 GroupSetting - 192, 6 + 180, 6 - 195, 22 + 183, 22 BackupGuiConfig @@ -801,7 +801,7 @@ Magenta - 67, 53 + 62, 51 Settings @@ -809,8 +809,8 @@ ImageAboveText - - 6, 56 + + 6, 54 BottomCenter @@ -819,7 +819,7 @@ Magenta - 97, 53 + 86, 51 Restart service @@ -827,47 +827,44 @@ ImageAboveText - - 6, 56 - - 219, 22 + 202, 22 v2rayN (this software) - 219, 22 + 202, 22 Update v2fly Core - 219, 22 + 202, 22 Update Xray Core - 216, 6 + 199, 6 - 219, 22 + 202, 22 Update clash Core - 219, 22 + 202, 22 Update Clash.Meta Core - 216, 6 + 199, 6 - 219, 22 + 202, 22 Update Geo files @@ -876,7 +873,7 @@ Magenta - 128, 53 + 116, 51 Check for updates @@ -884,32 +881,29 @@ ImageAboveText - - 6, 56 - - 187, 22 + 177, 22 v2rayN Project - 187, 22 + 177, 22 V2Ray Website - 184, 6 + 174, 6 - 187, 22 + 177, 22 Language-[English] - 187, 22 + 177, 22 语言-[中文简体] @@ -918,7 +912,7 @@ Magenta - 48, 53 + 45, 51 Help @@ -926,26 +920,14 @@ ImageAboveText - - Magenta - - - 89, 53 - - - Promotion - - - ImageAboveText - - 6, 56 + 6, 54 Magenta - 52, 53 + 46, 51 Close @@ -957,7 +939,7 @@ 0, 0 - 952, 56 + 952, 54 1 @@ -981,10 +963,10 @@ 64 - 6, 12 + 6, 13 - 952, 593 + 952, 642 4, 4, 4, 4 @@ -1292,10 +1274,16 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripSeparator4 + + tsbQRCodeSwitch - + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripSeparator5 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1322,18 +1310,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsbQRCodeSwitch - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - toolStripSeparator8 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tsbSetting @@ -1376,10 +1352,10 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripSeparator5 + + toolStripSeparator7 - + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1388,12 +1364,6 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripSeparator7 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tsbCheckUpdate @@ -1448,12 +1418,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripSeparator10 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tsbHelp @@ -1490,12 +1454,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsbPromotion - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - toolStripSeparator11 @@ -1508,6 +1466,12 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripSeparator4 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MainForm diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs index e93fd214..6ab1cc4e 100644 --- a/v2rayN/v2rayN/Global.cs +++ b/v2rayN/v2rayN/Global.cs @@ -13,7 +13,7 @@ namespace v2rayN public const string UpdateUrl = AboutUrl + @"/releases"; public const string v2flyCoreUrl = "https://github.com/v2fly/v2ray-core/releases"; public const string xrayCoreUrl = "https://github.com/XTLS/Xray-core/releases"; - public const string NUrl = @"https://github.com/2dust/v2rayN/releases"; + public const string NUrl = @"https://github.com/cg3s/v2rayN/releases"; public const string clashCoreUrl = "https://github.com/Dreamacro/clash/releases"; public const string clashMetaCoreUrl = "https://github.com/MetaCubeX/Clash.Meta/releases"; public const string hysteriaCoreUrl = "https://github.com/HyNetwork/hysteria/releases"; diff --git a/v2rayN/v2rayN/Properties/Resources.Designer.cs b/v2rayN/v2rayN/Properties/Resources.Designer.cs index aa68f66d..6df7f90d 100644 --- a/v2rayN/v2rayN/Properties/Resources.Designer.cs +++ b/v2rayN/v2rayN/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace v2rayN.Properties { /// - /// 一个强类型的资源类，用于查找本地化的字符串等。 + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ namespace v2rayN.Properties { } /// - /// 返回此类使用的缓存的 ResourceManager 实例。 + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ namespace v2rayN.Properties { } /// - /// 重写当前线程的 CurrentUICulture 属性，对 - /// 使用此强类型资源类的所有资源查找执行重写。 + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap about { get { @@ -71,7 +71,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap checkupdate { get { @@ -81,7 +81,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap help { get { @@ -91,7 +91,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap minimize { get { @@ -101,7 +101,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap notify { get { @@ -111,7 +111,7 @@ namespace v2rayN.Properties { } /// - /// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon NotifyIcon1 { get { @@ -121,7 +121,7 @@ namespace v2rayN.Properties { } /// - /// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon NotifyIcon2 { get { @@ -131,7 +131,7 @@ namespace v2rayN.Properties { } /// - /// 查找类似于 (图标) 的 System.Drawing.Icon 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon NotifyIcon3 { get { @@ -141,7 +141,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap option { get { @@ -151,7 +151,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap promotion { get { @@ -161,7 +161,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap restart { get { @@ -171,7 +171,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap server { get { @@ -181,7 +181,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap share { get { @@ -191,7 +191,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap sub { get { @@ -201,7 +201,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Byte[] 类型的本地化资源。 + /// Looks up a localized resource of type System.Byte[]. /// internal static byte[] sysproxy_exe { get { @@ -211,7 +211,7 @@ namespace v2rayN.Properties { } /// - /// 查找 System.Byte[] 类型的本地化资源。 + /// Looks up a localized resource of type System.Byte[]. /// internal static byte[] sysproxy64_exe { get { diff --git a/v2rayN/v2rayN/app.config b/v2rayN/v2rayN/app.config index df5f1904..5323f2e4 100644 --- a/v2rayN/v2rayN/app.config +++ b/v2rayN/v2rayN/app.config @@ -2,6 +2,5 @@ - - + diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj index 10d89345..e6389114 100644 --- a/v2rayN/v2rayN/v2rayN.csproj +++ b/v2rayN/v2rayN/v2rayN.csproj @@ -476,6 +476,7 @@ + @@ -503,6 +504,9 @@ 2.0.14 + + 2.3.1 + 13.0.1