From d79d255530547bfa48ae01ffc3e1a67f6d580f49 Mon Sep 17 00:00:00 2001 From: Jrohy <1101400284@qq.com> Date: Thu, 31 May 2018 00:54:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5dtls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v2rayN/v2rayN/Forms/AddServerForm.Designer.cs | 81 ++++++++++--------- v2rayN/v2rayN/Forms/AddServerForm.cs | 1 + v2rayN/v2rayN/Forms/MainForm.Designer.cs | 12 ++- v2rayN/v2rayN/Properties/AssemblyInfo.cs | 3 +- 4 files changed, 54 insertions(+), 43 deletions(-) diff --git a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs index cd79e52..fdfa4fd 100644 --- a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs @@ -33,6 +33,9 @@ private void InitializeComponent() this.btnGUID = new System.Windows.Forms.Button(); this.label13 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.label20 = new System.Windows.Forms.Label(); + this.txtPath = new System.Windows.Forms.TextBox(); + this.label19 = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label(); @@ -69,9 +72,6 @@ private void InitializeComponent() this.MenuItemImportServer = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.MenuItemImportClipboard = new System.Windows.Forms.ToolStripMenuItem(); - this.label19 = new System.Windows.Forms.Label(); - this.txtPath = new System.Windows.Forms.TextBox(); - this.label20 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.panel2.SuspendLayout(); @@ -111,9 +111,9 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.txtAddress); this.groupBox1.Controls.Add(this.label1); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(0, 34); + this.groupBox1.Location = new System.Drawing.Point(0, 35); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(729, 445); + this.groupBox1.Size = new System.Drawing.Size(729, 444); this.groupBox1.TabIndex = 3; this.groupBox1.TabStop = false; this.groupBox1.Text = "服务器"; @@ -154,13 +154,39 @@ private void InitializeComponent() this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.cmbHeaderType); this.groupBox2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.groupBox2.Location = new System.Drawing.Point(3, 241); + this.groupBox2.Location = new System.Drawing.Point(3, 240); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(723, 201); this.groupBox2.TabIndex = 21; this.groupBox2.TabStop = false; this.groupBox2.Text = "不清楚则保持默认值"; // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(469, 84); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(149, 12); + this.label20.TabIndex = 29; + this.label20.Text = "3)h2 host中间逗号(,)隔开"; + // + // txtPath + // + this.txtPath.Location = new System.Drawing.Point(124, 108); + this.txtPath.Multiline = true; + this.txtPath.Name = "txtPath"; + this.txtPath.Size = new System.Drawing.Size(396, 38); + this.txtPath.TabIndex = 28; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(9, 108); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(65, 12); + this.label19.TabIndex = 27; + this.label19.Text = "路径(path)"; + // // label18 // this.label18.AutoSize = true; @@ -262,7 +288,8 @@ private void InitializeComponent() "http", "srtp", "utp", - "wechat-video"}); + "wechat-video", + "dtls"}); this.cmbHeaderType.Location = new System.Drawing.Point(124, 30); this.cmbHeaderType.Name = "cmbHeaderType"; this.cmbHeaderType.Size = new System.Drawing.Size(143, 20); @@ -436,7 +463,7 @@ private void InitializeComponent() // panel1 // this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 24); + this.panel1.Location = new System.Drawing.Point(0, 25); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(729, 10); this.panel1.TabIndex = 6; @@ -447,7 +474,7 @@ private void InitializeComponent() this.MenuItem1}); this.menuServer.Location = new System.Drawing.Point(0, 0); this.menuServer.Name = "menuServer"; - this.menuServer.Size = new System.Drawing.Size(729, 24); + this.menuServer.Size = new System.Drawing.Size(729, 25); this.menuServer.TabIndex = 8; // // MenuItem1 @@ -458,61 +485,35 @@ private void InitializeComponent() this.toolStripSeparator1, this.MenuItemImportClipboard}); this.MenuItem1.Name = "MenuItem1"; - this.MenuItem1.Size = new System.Drawing.Size(89, 20); + this.MenuItem1.Size = new System.Drawing.Size(92, 21); this.MenuItem1.Text = "导入配置文件"; // // MenuItemImportClient // this.MenuItemImportClient.Name = "MenuItemImportClient"; - this.MenuItemImportClient.Size = new System.Drawing.Size(160, 22); + this.MenuItemImportClient.Size = new System.Drawing.Size(171, 22); this.MenuItemImportClient.Text = "导入客户端配置"; this.MenuItemImportClient.Click += new System.EventHandler(this.MenuItemImportClient_Click); // // MenuItemImportServer // this.MenuItemImportServer.Name = "MenuItemImportServer"; - this.MenuItemImportServer.Size = new System.Drawing.Size(160, 22); + this.MenuItemImportServer.Size = new System.Drawing.Size(171, 22); this.MenuItemImportServer.Text = "导入服务端配置"; this.MenuItemImportServer.Click += new System.EventHandler(this.MenuItemImportServer_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(157, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(168, 6); // // MenuItemImportClipboard // this.MenuItemImportClipboard.Name = "MenuItemImportClipboard"; - this.MenuItemImportClipboard.Size = new System.Drawing.Size(160, 22); + this.MenuItemImportClipboard.Size = new System.Drawing.Size(171, 22); this.MenuItemImportClipboard.Text = "从剪贴板导入URL"; this.MenuItemImportClipboard.Click += new System.EventHandler(this.MenuItemImportClipboard_Click); // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(9, 108); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(65, 12); - this.label19.TabIndex = 27; - this.label19.Text = "路径(path)"; - // - // txtPath - // - this.txtPath.Location = new System.Drawing.Point(124, 108); - this.txtPath.Multiline = true; - this.txtPath.Name = "txtPath"; - this.txtPath.Size = new System.Drawing.Size(396, 38); - this.txtPath.TabIndex = 28; - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(469, 84); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(149, 12); - this.label20.TabIndex = 29; - this.label20.Text = "3)h2 host中间逗号(,)隔开"; - // // AddServerForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/v2rayN/v2rayN/Forms/AddServerForm.cs b/v2rayN/v2rayN/Forms/AddServerForm.cs index c22029f..96c02c6 100644 --- a/v2rayN/v2rayN/Forms/AddServerForm.cs +++ b/v2rayN/v2rayN/Forms/AddServerForm.cs @@ -98,6 +98,7 @@ private void SetHeaderType() cmbHeaderType.Items.Add("srtp"); cmbHeaderType.Items.Add("utp"); cmbHeaderType.Items.Add("wechat-video"); + cmbHeaderType.Items.Add("dtls"); } else { diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs index bbbe257..4db9c5f 100644 --- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs @@ -54,6 +54,7 @@ private void InitializeComponent() this.menuAddVmessServer = new System.Windows.Forms.ToolStripMenuItem(); this.menuAddShadowsocksServer = new System.Windows.Forms.ToolStripMenuItem(); this.menuAddCustomServer = new System.Windows.Forms.ToolStripMenuItem(); + this.menuImportUrl = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.menuRemoveServer = new System.Windows.Forms.ToolStripMenuItem(); this.menuCopyServer = new System.Windows.Forms.ToolStripMenuItem(); @@ -249,6 +250,7 @@ private void InitializeComponent() this.menuAddVmessServer, this.menuAddShadowsocksServer, this.menuAddCustomServer, + this.menuImportUrl, this.toolStripSeparator1, this.menuRemoveServer, this.menuCopyServer, @@ -265,7 +267,7 @@ private void InitializeComponent() this.menuExport2ServerConfig, this.menuVmessExport2ClipBoard}); this.cmsLv.Name = "cmsLv"; - this.cmsLv.Size = new System.Drawing.Size(233, 358); + this.cmsLv.Size = new System.Drawing.Size(233, 380); // // menuAddVmessServer // @@ -288,6 +290,13 @@ private void InitializeComponent() this.menuAddCustomServer.Text = "添加自定义配置服务器"; this.menuAddCustomServer.Click += new System.EventHandler(this.menuAddCustomServer_Click); // + // menuImportUrl + // + this.menuImportUrl.Name = "menuImportUrl"; + this.menuImportUrl.Size = new System.Drawing.Size(232, 22); + this.menuImportUrl.Text = "从剪切板批量导入URL"; + this.menuImportUrl.Click += new System.EventHandler(this.menuClipboardImportVmess_Click); + // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; @@ -678,6 +687,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateN; private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateCore; private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdatePACList; + private System.Windows.Forms.ToolStripMenuItem menuImportUrl; } } diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs index 307b8a3..9ac5360 100644 --- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs +++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的常规信息通过以下 @@ -33,4 +32,4 @@ // 方法是按如下所示使用“*”: //[assembly: AssemblyVersion("1.0.*")] //[assembly: AssemblyVersion("1.0.0")] -[assembly: AssemblyFileVersion("2.1")] \ No newline at end of file +[assembly: AssemblyFileVersion("2.2")] \ No newline at end of file