From b3292729b01fc7bbdee5dfbb8659c59c35a498bf Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Sat, 15 Oct 2022 07:50:48 +0800 Subject: [PATCH] fix ui --- .../Forms/ServerTransportControl.Designer.cs | 16 +- .../v2rayN/Forms/ServerTransportControl.resx | 1218 ++++++++--------- .../Forms/ServerTransportControl.zh-Hans.resx | 36 +- 3 files changed, 635 insertions(+), 635 deletions(-) diff --git a/v2rayN/v2rayN/Forms/ServerTransportControl.Designer.cs b/v2rayN/v2rayN/Forms/ServerTransportControl.Designer.cs index ae9ce189..e0c63606 100644 --- a/v2rayN/v2rayN/Forms/ServerTransportControl.Designer.cs +++ b/v2rayN/v2rayN/Forms/ServerTransportControl.Designer.cs @@ -59,6 +59,7 @@ // // gbTransport // + resources.ApplyResources(this.gbTransport, "gbTransport"); this.gbTransport.Controls.Add(this.panTlsMore); this.gbTransport.Controls.Add(this.tipNetwork); this.gbTransport.Controls.Add(this.txtPath); @@ -74,12 +75,12 @@ this.gbTransport.Controls.Add(this.labHeaderType); this.gbTransport.Controls.Add(this.labRequestHost); this.gbTransport.Controls.Add(this.cmbHeaderType); - resources.ApplyResources(this.gbTransport, "gbTransport"); this.gbTransport.Name = "gbTransport"; this.gbTransport.TabStop = false; // // panTlsMore // + resources.ApplyResources(this.panTlsMore, "panTlsMore"); this.panTlsMore.Controls.Add(this.labfingerprint); this.panTlsMore.Controls.Add(this.cmbFingerprint); this.panTlsMore.Controls.Add(this.clbAlpn); @@ -88,7 +89,6 @@ this.panTlsMore.Controls.Add(this.labSNI); this.panTlsMore.Controls.Add(this.labAllowInsecure); this.panTlsMore.Controls.Add(this.cmbAllowInsecure); - resources.ApplyResources(this.panTlsMore, "panTlsMore"); this.panTlsMore.Name = "panTlsMore"; // // labfingerprint @@ -98,15 +98,15 @@ // // cmbFingerprint // + resources.ApplyResources(this.cmbFingerprint, "cmbFingerprint"); this.cmbFingerprint.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbFingerprint.FormattingEnabled = true; - resources.ApplyResources(this.cmbFingerprint, "cmbFingerprint"); this.cmbFingerprint.Name = "cmbFingerprint"; // // clbAlpn // - this.clbAlpn.CheckOnClick = true; resources.ApplyResources(this.clbAlpn, "clbAlpn"); + this.clbAlpn.CheckOnClick = true; this.clbAlpn.FormattingEnabled = true; this.clbAlpn.Items.AddRange(new object[] { resources.GetString("clbAlpn.Items"), @@ -136,13 +136,13 @@ // // cmbAllowInsecure // + resources.ApplyResources(this.cmbAllowInsecure, "cmbAllowInsecure"); this.cmbAllowInsecure.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbAllowInsecure.FormattingEnabled = true; this.cmbAllowInsecure.Items.AddRange(new object[] { resources.GetString("cmbAllowInsecure.Items"), resources.GetString("cmbAllowInsecure.Items1"), resources.GetString("cmbAllowInsecure.Items2")}); - resources.ApplyResources(this.cmbAllowInsecure, "cmbAllowInsecure"); this.cmbAllowInsecure.Name = "cmbAllowInsecure"; // // tipNetwork @@ -157,9 +157,9 @@ // // cmbNetwork // + resources.ApplyResources(this.cmbNetwork, "cmbNetwork"); this.cmbNetwork.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbNetwork.FormattingEnabled = true; - resources.ApplyResources(this.cmbNetwork, "cmbNetwork"); this.cmbNetwork.Name = "cmbNetwork"; this.cmbNetwork.SelectedIndexChanged += new System.EventHandler(this.cmbNetwork_SelectedIndexChanged); // @@ -190,9 +190,9 @@ // // cmbStreamSecurity // + resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity"); this.cmbStreamSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbStreamSecurity.FormattingEnabled = true; - resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity"); this.cmbStreamSecurity.Name = "cmbStreamSecurity"; this.cmbStreamSecurity.SelectedIndexChanged += new System.EventHandler(this.cmbStreamSecurity_SelectedIndexChanged); // @@ -218,9 +218,9 @@ // // cmbHeaderType // + resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType"); this.cmbHeaderType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbHeaderType.FormattingEnabled = true; - resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType"); this.cmbHeaderType.Name = "cmbHeaderType"; // // ServerTransportControl diff --git a/v2rayN/v2rayN/Forms/ServerTransportControl.resx b/v2rayN/v2rayN/Forms/ServerTransportControl.resx index 9a6b44c6..8bbb1bf5 100644 --- a/v2rayN/v2rayN/Forms/ServerTransportControl.resx +++ b/v2rayN/v2rayN/Forms/ServerTransportControl.resx @@ -121,220 +121,67 @@ True - - - NoControl - - - 16, 95 + + 12, 200 - - 4, 0, 4, 0 + + Camouflage domain(host) - - 143, 15 + + 127, 15 - - 46 - - - fingerprint(uTLS) - - - labfingerprint - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panTlsMore - - + 0 - - 172, 90 - - - 4, 4, 4, 4 - - - 189, 23 - - - 45 - - - cmbFingerprint - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + panTlsMore - - 1 + + gbTransport - - 70 + + gbTransport - - h2 + + gbTransport - - http/1.1 - - - 407, 9 - - - 4, 4, 4, 4 - - - 239, 24 - - - 44 - - - clbAlpn - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panTlsMore - - - 2 - - - True - - + + NoControl - - 321, 14 - - - 4, 0, 4, 0 - - - 39, 15 - - - 43 - alpn - - label1 + + System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panTlsMore - - - 3 - - - 133, 49 - - - 4, 4, 4, 4 - - - 512, 25 - - - 1 - - - txtSNI - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Camouflage type panTlsMore - - 4 - - - True - - - NoControl - - - 16, 54 + + 46 4, 0, 4, 0 - - 31, 15 + + 12, 120 - - 32 + + tipPath - - SNI - - - labSNI - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panTlsMore - - - 5 - - - True + + 189, 23 NoControl - - 16, 14 - - - 4, 0, 4, 0 - - - 111, 15 - - - 31 - - - allowInsecure - - - labAllowInsecure - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panTlsMore - - - 6 - - - + + 17 true @@ -342,526 +189,679 @@ false - - 133, 9 - - - 4, 4, 4, 4 - - - 105, 23 - - - 0 - - - cmbAllowInsecure - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panTlsMore - - - 7 - - - 267, 186 - - - 4, 4, 4, 4 - - - 667, 131 - - - 33 - - - panTlsMore - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbTransport - - - 0 - - + True - - NoControl - - - 467, 40 - - - 4, 0, 4, 0 - - - 151, 15 - - - 15 - - - *Default value tcp - - - tipNetwork - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbTransport - - - 1 - - - 169, 155 - - - 4, 4, 4, 4 - - - True - - - 527, 24 - - - 4 - - - txtPath - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbTransport - - - 2 - - - 256, 35 - - - 4, 4, 4, 4 - - - 189, 23 - - - 1 - - - cmbNetwork - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbTransport - - - 3 - True - - NoControl - - - 12, 40 - - - 4, 0, 4, 0 - - - 223, 15 - - - 13 - - - Transport protocol(network) - - - labNetwork - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbTransport - - - 4 - - - True - - - NoControl - - - 12, 160 - - - 4, 0, 4, 0 - - - 39, 15 - - - 27 - - - Path - - - labPath - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbTransport - - - 5 - - - True - - - NoControl - - - 705, 160 - - - 4, 0, 4, 0 - 15, 15 - - 24 + + 267, 186 - - * + + cmbNetwork - - tipPath + + labRequestHost - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 964, 325 - - gbTransport - - - 6 + + panTlsMore True - - NoControl + + TLS - - 619, 120 - - - 4, 0, 4, 0 - - - 15, 15 - - - 23 - - - * - - - tipRequestHost - - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + cmbStreamSecurity + + + panTlsMore + + + 44 + + + gbTransport + + + 4, 4, 4, 4 + + + 13 + + + 16, 54 + + + label1 + + + 191, 15 + + + 2 + + + Fill + + + gbTransport + + + 4, 4, 4, 4 + + + 0 + + + 4, 0, 4, 0 + + + 964, 325 + + + txtRequestHost + + + 189, 23 + + + 133, 9 + + + gbTransport + + + 7 + + + 12, 160 + + + 8 + + + 133, 49 + + + cmbAllowInsecure + + + ServerTransportControl + + + 13 + + + 111, 15 + + + 0, 0 + + + allowInsecure + + + 1 + + + 15, 15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4, 0, 4, 0 + + + NoControl + + + 172, 90 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + gbTransport 7 - - True + + labAllowInsecure - - NoControl + + labSNI - - 12, 200 - - - 4, 0, 4, 0 - - - 31, 15 - - - 22 - - - TLS - - - labStreamSecurity - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbTransport - - - 8 - - - 169, 195 + + 667, 131 4, 4, 4, 4 - - 79, 23 + + 4, 0, 4, 0 - - 5 + + 31 - - cmbStreamSecurity - - + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - gbTransport + + 321, 14 - - 9 + + 15, 15 + + + 4, 0, 4, 0 True - - NoControl + + 0 - - 376, 80 + + 1 - - 4, 0, 4, 0 + + 39, 15 - - 15, 15 - - - 20 - - - * - - - tipHeaderType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbTransport - - - 10 + + 5 211, 115 - - 4, 4, 4, 4 - - - True - - - 399, 24 - - - 3 - - - txtRequestHost - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + gbTransport - - 11 + + h2 - - True - - + NoControl + + cmbFingerprint + + + 4, 0, 4, 0 + + + gbTransport + 12, 80 - - 4, 0, 4, 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 127, 15 + + labPath + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + tipNetwork + + + gbTransport + + + gbTransport + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 79, 23 19 - - Camouflage type + + 169, 195 - - labHeaderType + + $this - + + 4, 0, 4, 0 + + + 8, 15 + + + 22 + + + 169, 155 + + + 16, 95 + + + 151, 15 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 256, 35 + + + Transport protocol(network) + + + 39, 15 + + + 31, 15 + + + 10 + + + 27 + + + True + + + NoControl + + + 169, 75 + + + gbTransport + + + 70 + + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4, 0, 4, 0 + + + gbTransport + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 2 + + + panTlsMore + + + 24 + + + True + + + 4, 4, 4, 4 + + + clbAlpn + + + SNI + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 3 + + + True + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tipRequestHost + + + True + + + 6 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + labfingerprint + + + NoControl + + + labStreamSecurity + + + http/1.1 + + + txtSNI + + + txtPath + + + True + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + + + 4, 0, 4, 0 + + gbTransport 12 - - True + + 45 NoControl - - 12, 120 - - - 4, 0, 4, 0 - - - 191, 15 - - - 17 - - - Camouflage domain(host) - - - labRequestHost - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbTransport - - - 13 - - - 169, 75 - - - 4, 4, 4, 4 - - - 189, 23 - 2 - - cmbHeaderType + + panTlsMore - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 239, 24 - - gbTransport + + 407, 9 - - 14 + + Path - - Fill + + 189, 23 - - 0, 0 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 - - - 964, 325 - - - 22 + + * Transport - - gbTransport + + 1 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 0, 4, 0 - - $this + + tipHeaderType - - 0 + + * - + True - - - 8, 15 + + + 15 + + + 4, 4, 4, 4 + + + panTlsMore 4, 4, 4, 4 - - 964, 325 + + 31, 15 - - ServerTransportControl + + 1 - - System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 4, 4, 4 + + 4, 4, 4, 4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 223, 15 + + + 619, 120 + + + fingerprint(uTLS) + + + 6 + + + 143, 15 + + + 105, 23 + + + 4, 4, 4, 4 + + + 3 + + + True + + + 4, 4, 4, 4 + + + gbTransport + + + 9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4, 0, 4, 0 + + + 33 + + + 16, 14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 705, 160 + + + 12, 40 + + + 4, 4, 4, 4 + + + NoControl + + + 14 + + + True + + + 11 + + + * + + + 4, 0, 4, 0 + + + 5 + + + NoControl + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 512, 25 + + + 0 + + + 4 + + + gbTransport + + + 32 + + + + + + cmbHeaderType + + + 4 + + + 4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 23 + + + 376, 80 + + + 22 + + + panTlsMore + + + labNetwork + + + 20 + + + 3 + + + NoControl + + + 399, 24 + + + 4, 4, 4, 4 + + + 527, 24 + + + NoControl + + + 5 + + + panTlsMore + + + labHeaderType + + + 43 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 467, 40 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + *Default value tcp + + + 4, 0, 4, 0 + + + True + + + 4, 4, 4, 4 + + + True + \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/ServerTransportControl.zh-Hans.resx b/v2rayN/v2rayN/Forms/ServerTransportControl.zh-Hans.resx index 4ca97072..4ef44255 100644 --- a/v2rayN/v2rayN/Forms/ServerTransportControl.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/ServerTransportControl.zh-Hans.resx @@ -119,49 +119,49 @@ - 143, 12 + 182, 15 *默认tcp,选错会无法连接 - 127, 28 + 169, 36 - 208, 20 + 290, 23 - 107, 12 + 139, 15 传输协议(network) - 65, 12 + 85, 15 路径(path) - 107, 12 + 122, 15 传输层安全(tls) - 127, 92 + 169, 117 - 331, 20 + 442, 20 - 89, 12 + 115, 15 伪装类型(type) - 89, 12 + 115, 15 伪装域名(host) @@ -169,25 +169,25 @@ 底层传输方式(transport) - - 282, 11 - - 331, 7 + 427, 9 - 160, 20 + 208, 24 + + + 378, 14 - 391, 21 + 391, 25 - 167, 12 + 217, 15 跳过证书验证(allowInsecure) - 183, 7 + 247, 10 \ No newline at end of file