From 8c20f23cd3569418b9644aca8fb3a19c2b30d84d Mon Sep 17 00:00:00 2001 From: yyq-404 Date: Mon, 28 Oct 2019 12:43:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0Vmess?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v2rayN/v2rayN/Forms/AddServerForm.Designer.cs | 36 +- v2rayN/v2rayN/Forms/AddServerForm.resx | 1214 ++++++++++------- v2rayN/v2rayN/Forms/MainForm.Designer.cs | 14 +- v2rayN/v2rayN/Forms/MainForm.cs | 2 +- v2rayN/v2rayN/Forms/MainForm.resx | 6 +- 5 files changed, 751 insertions(+), 521 deletions(-) diff --git a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs index 6f1d6c67..fb68b1b4 100644 --- a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs @@ -31,7 +31,9 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddServerForm)); this.btnClose = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label25 = new System.Windows.Forms.Label(); this.lbBase = new System.Windows.Forms.Label(); + this.btnOK = new System.Windows.Forms.Button(); this.btnGUID = new System.Windows.Forms.Button(); this.label13 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); @@ -72,16 +74,15 @@ this.txtAddress = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); - this.btnOK = new System.Windows.Forms.Button(); this.menuServer = new System.Windows.Forms.MenuStrip(); this.MenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.MenuItemImportClient = new System.Windows.Forms.ToolStripMenuItem(); this.MenuItemImportServer = new System.Windows.Forms.ToolStripMenuItem(); this.MenuItemImportClipboard = new System.Windows.Forms.ToolStripMenuItem(); - this.label25 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.panTlsMore.SuspendLayout(); + this.panel2.SuspendLayout(); this.menuServer.SuspendLayout(); this.SuspendLayout(); // @@ -97,12 +98,9 @@ // resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Controls.Add(this.label25); - this.groupBox1.Controls.Add(this.btnClose); this.groupBox1.Controls.Add(this.lbBase); - this.groupBox1.Controls.Add(this.btnOK); this.groupBox1.Controls.Add(this.btnGUID); this.groupBox1.Controls.Add(this.label13); - this.groupBox1.Controls.Add(this.groupBox2); this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label8); this.groupBox1.Controls.Add(this.cmbNetwork); @@ -121,11 +119,23 @@ this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // + // label25 + // + resources.ApplyResources(this.label25, "label25"); + this.label25.Name = "label25"; + // // lbBase // resources.ApplyResources(this.lbBase, "lbBase"); this.lbBase.Name = "lbBase"; // + // btnOK + // + resources.ApplyResources(this.btnOK, "btnOK"); + this.btnOK.Name = "btnOK"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // // btnGUID // resources.ApplyResources(this.btnGUID, "btnGUID"); @@ -386,16 +396,11 @@ // // panel2 // + this.panel2.Controls.Add(this.btnClose); + this.panel2.Controls.Add(this.btnOK); resources.ApplyResources(this.panel2, "panel2"); this.panel2.Name = "panel2"; // - // btnOK - // - resources.ApplyResources(this.btnOK, "btnOK"); - this.btnOK.Name = "btnOK"; - this.btnOK.UseVisualStyleBackColor = true; - this.btnOK.Click += new System.EventHandler(this.btnOK_Click); - // // menuServer // this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -431,11 +436,6 @@ resources.ApplyResources(this.MenuItemImportClipboard, "MenuItemImportClipboard"); this.MenuItemImportClipboard.Click += new System.EventHandler(this.MenuItemImportClipboard_Click); // - // label25 - // - resources.ApplyResources(this.label25, "label25"); - this.label25.Name = "label25"; - // // AddServerForm // resources.ApplyResources(this, "$this"); @@ -444,6 +444,7 @@ this.Controls.Add(this.groupBox1); this.Controls.Add(this.panel2); this.Controls.Add(this.menuServer); + this.Controls.Add(this.groupBox2); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Name = "AddServerForm"; this.Load += new System.EventHandler(this.AddServerForm_Load); @@ -453,6 +454,7 @@ this.groupBox2.PerformLayout(); this.panTlsMore.ResumeLayout(false); this.panTlsMore.PerformLayout(); + this.panel2.ResumeLayout(false); this.menuServer.ResumeLayout(false); this.menuServer.PerformLayout(); this.ResumeLayout(false); diff --git a/v2rayN/v2rayN/Forms/AddServerForm.resx b/v2rayN/v2rayN/Forms/AddServerForm.resx index 3fd6670e..65a89170 100644 --- a/v2rayN/v2rayN/Forms/AddServerForm.resx +++ b/v2rayN/v2rayN/Forms/AddServerForm.resx @@ -119,7 +119,7 @@ - 619, 413 + 628, 5 75, 23 @@ -138,15 +138,270 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - groupBox1 + panel2 - 1 + 0 Zoom + + label25 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + lbBase + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + btnGUID + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 3 + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 4 + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 5 + + + cmbNetwork + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 6 + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 7 + + + cmbSecurity + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 8 + + + txtRemarks + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 9 + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 10 + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 11 + + + txtAlterId + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 12 + + + txtId + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 13 + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 14 + + + txtPort + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 15 + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 16 + + + txtAddress + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 17 + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 18 + + + 微软雅黑, 9pt + + + 9, 28 + + + No + + + 730, 190 + + + 3 + + + groupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + Right @@ -154,7 +409,7 @@ NoControl - 469, 76 + 467, 76 72, 18 @@ -193,7 +448,7 @@ NoControl - 359, 0 + 360, 0 36, 17 @@ -217,10 +472,10 @@ groupBox1 - 2 + 1 - 524, 413 + 547, 5 75, 23 @@ -238,10 +493,10 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - groupBox1 + panel2 - 3 + 1 387, 70 @@ -265,7 +520,7 @@ groupBox1 - 4 + 2 True @@ -295,7 +550,7 @@ groupBox1 - 5 + 3 Top @@ -310,7 +565,7 @@ NoControl - 356, 0 + 360, 0 68, 17 @@ -370,7 +625,7 @@ NoControl - 443, 111 + 444, 110 94, 17 @@ -454,7 +709,7 @@ True - 442, 96 + 443, 95 211, 17 @@ -505,7 +760,7 @@ Right - 75, 130 + 74, 130 55, 18 @@ -616,7 +871,7 @@ True - 442, 66 + 443, 65 220, 17 @@ -643,7 +898,7 @@ Right - 18, 204 + 17, 207 112, 17 @@ -700,7 +955,7 @@ True - 316, 34 + 291, 29 306, 17 @@ -751,7 +1006,7 @@ Right - 20, 33 + 19, 33 110, 18 @@ -781,7 +1036,7 @@ Right - -29, 69 + -30, 69 159, 17 @@ -849,11 +1104,14 @@ 17 + + 微软雅黑, 9pt + - 2, 173 + 9, 224 - 723, 234 + 730, 240 21 @@ -865,472 +1123,10 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - groupBox1 - - - 6 - - - True - - - 542, 142 - - - 110, 17 - - - 15 - - - *Default value tcp - - - label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 7 - - - True - - - 133, 141 - - - 139, 17 - - - 14 - - - *Recommended (auto) - - - label8 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 8 - - - tcp - - - kcp - - - ws - - - h2 - - - quic - - - 544, 114 - - - 150, 25 - - - 12 - - - cmbNetwork - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 9 - - - Right - - - 379, 121 - - - 159, 18 - - - 13 - - - TransportProtocol: - - - BottomRight - - - label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 10 - - - aes-128-gcm - - - chacha20-poly1305 - - - auto - - - none - - - 136, 113 - - - No - - - 154, 25 - - - 6 - - - cmbSecurity - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 11 - - - 544, 26 - - - 150, 23 - - - 11 - - - txtRemarks - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 12 - - - Right - - - 481, 32 - - - No - - - 60, 18 - - - 10 - - - Alias: - - - BottomRight - - - label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 13 - - - Right - - - 12, 120 - - - No - - - 118, 18 - - - 8 - - - EncryptionMethod: - - - BottomRight - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 14 - - - 544, 71 - - - 150, 23 - - - 7 - - - txtAlterId - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 15 - - - 136, 70 - - - 250, 23 - - - 5 - - - txtId - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 16 - - - Right - - - 26, 76 - - - 0, 0, 0, 0 - - - No - - - 104, 18 - - - 4 - - - UUID: - - - BottomRight - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 17 - - - 334, 26 - - - 52, 23 - - - 3 - - - txtPort - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 18 - - - Right - - - 296, 31 - - - No - - - 36, 18 - - - 2 - - - Port: - - - BottomRight - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 19 - - - 136, 26 - - - No - - - 154, 23 - - - 1 - - - txtAddress - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 20 - - - Right - - - 26, 31 - - - 0, 0, 0, 0 - - - No - - - 104, 18 - - - 0 - - - IP地址: - - - BottomRight - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 21 - - - 微软雅黑, 9pt - - - 6, 28 - - - No - - - 729, 480 - - - 3 - - - groupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this - - 0 + + 3 True @@ -1416,6 +1212,441 @@ 2 + + True + + + 542, 142 + + + 110, 17 + + + 15 + + + *Default value tcp + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 4 + + + True + + + 133, 141 + + + 139, 17 + + + 14 + + + *Recommended (auto) + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 5 + + + tcp + + + kcp + + + ws + + + h2 + + + quic + + + 544, 114 + + + 150, 25 + + + 12 + + + cmbNetwork + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 6 + + + Right + + + 380, 121 + + + 159, 18 + + + 13 + + + TransportProtocol: + + + BottomRight + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 7 + + + aes-128-gcm + + + chacha20-poly1305 + + + auto + + + none + + + 136, 114 + + + No + + + 154, 25 + + + 6 + + + cmbSecurity + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 8 + + + 544, 26 + + + 150, 23 + + + 11 + + + txtRemarks + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 9 + + + Right + + + 479, 31 + + + No + + + 60, 18 + + + 10 + + + Alias: + + + BottomRight + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 10 + + + Right + + + 7, 121 + + + No + + + 118, 18 + + + 8 + + + EncryptionMethod: + + + BottomRight + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 11 + + + 544, 71 + + + 150, 23 + + + 7 + + + txtAlterId + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 12 + + + 136, 70 + + + 250, 23 + + + 5 + + + txtId + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 13 + + + Right + + + 21, 76 + + + 0, 0, 0, 0 + + + No + + + 104, 18 + + + 4 + + + UUID: + + + BottomRight + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 14 + + + 334, 26 + + + 52, 23 + + + 3 + + + txtPort + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 15 + + + Right + + + 297, 31 + + + No + + + 36, 18 + + + 2 + + + Port: + + + BottomRight + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 16 + + + 136, 26 + + + No + + + 154, 23 + + + 1 + + + txtAddress + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 17 + + + Right + + + 27, 31 + + + 0, 0, 0, 0 + + + No + + + 104, 18 + + + 0 + + + IP地址: + + + BottomRight + + + label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 18 + Bottom @@ -1423,10 +1654,10 @@ 微软雅黑, 9pt - 0, 339 + 0, 470 - 744, 128 + 744, 31 7 @@ -1498,13 +1729,13 @@ True - 83 + 25 6, 12 - 744, 467 + 744, 501 @@ -1679,9 +1910,6 @@ wf+0BQAAgAUAAIAFAACAAQAAgAHB/4ABAACAAQAAgAEAALwBAAC8AQAAvAHB/4ABbP///5H/ - - NoControl - CenterParent diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs index 031d9fe0..991d98bb 100644 --- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs @@ -31,6 +31,7 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.qrCodeControl = new v2rayN.Forms.QRCodeControl(); this.lvServers = new v2rayN.Base.ListViewFlickerFree(); this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components); this.menuAddVmessServer = new System.Windows.Forms.ToolStripMenuItem(); @@ -61,7 +62,6 @@ this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem(); this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem(); this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton(); - this.qrCodeControl = new v2rayN.Forms.QRCodeControl(); this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components); this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components); this.menuSysAgentEnabled = new System.Windows.Forms.ToolStripMenuItem(); @@ -143,13 +143,18 @@ resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2"); this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved); // + // qrCodeControl + // + resources.ApplyResources(this.qrCodeControl, "qrCodeControl"); + this.qrCodeControl.Name = "qrCodeControl"; + // // lvServers // this.lvServers.ContextMenuStrip = this.cmsLv; resources.ApplyResources(this.lvServers, "lvServers"); this.lvServers.FullRowSelect = true; this.lvServers.GridLines = true; - this.lvServers.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; + this.lvServers.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.lvServers.HideSelection = false; this.lvServers.Items.AddRange(new System.Windows.Forms.ListViewItem[] { ((System.Windows.Forms.ListViewItem)(resources.GetObject("lvServers.Items")))}); @@ -361,11 +366,6 @@ resources.ApplyResources(this.tsbServer, "tsbServer"); this.tsbServer.Name = "tsbServer"; // - // qrCodeControl - // - resources.ApplyResources(this.qrCodeControl, "qrCodeControl"); - this.qrCodeControl.Name = "qrCodeControl"; - // // notifyMain // this.notifyMain.ContextMenuStrip = this.cmsMain; diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index ae49c6ef..98293225 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -1093,7 +1093,7 @@ namespace v2rayN.Forms todayDown_ = Utils.HumanFy(statistics[index].todayDown); } - datas.Add(new string[] { totalUp_, totalDown_, todayUp_, todayDown_ }); + datas.Add(new string[] {todayUp_, todayDown_, totalUp_, totalDown_}); } lvServers.Invoke((MethodInvoker)delegate diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx index 70732d57..5e8668b1 100644 --- a/v2rayN/v2rayN/Forms/MainForm.resx +++ b/v2rayN/v2rayN/Forms/MainForm.resx @@ -351,7 +351,7 @@ 0, 0 - 885, 235 + 860, 235 1 @@ -360,7 +360,7 @@ lvServers - v2rayN.Forms.ListViewFlickerFree, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + v2rayN.Base.ListViewFlickerFree, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null splitContainer1.Panel1 @@ -405,7 +405,7 @@ 889, 235 - 885 + 860 2