From fe15fde5945447adae62dab5b3bebe0045386f05 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Mon, 2 Dec 2019 13:47:13 +0800 Subject: [PATCH] up pp --- v2rayN/v2rayN/Forms/MainForm.Designer.cs | 1 + v2rayN/v2rayN/Forms/MainForm.cs | 27 ++++++++++++++++++++++-- v2rayN/v2rayN/Forms/MainForm.resx | 2 +- v2rayN/v2rayN/Handler/ConfigHandler.cs | 8 +++---- v2rayN/v2rayN/Properties/AssemblyInfo.cs | 2 +- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs index 773021fa..13ce7b39 100644 --- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs @@ -159,6 +159,7 @@ this.lvServers.UseCompatibleStateImageBehavior = false; this.lvServers.View = System.Windows.Forms.View.Details; this.lvServers.SelectedIndexChanged += new System.EventHandler(this.lvServers_SelectedIndexChanged); + this.lvServers.Click += new System.EventHandler(this.lvServers_Click); this.lvServers.DoubleClick += new System.EventHandler(this.lvServers_DoubleClick); this.lvServers.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvServers_KeyDown); // diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index 07571e52..bef32c86 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -268,6 +268,7 @@ namespace v2rayN.Forms { menuServers.DropDownItems.Clear(); + List lst = new List(); for (int k = 0; k < config.vmess.Count; k++) { VmessItem item = config.vmess[k]; @@ -280,8 +281,9 @@ namespace v2rayN.Forms ts.Checked = true; } ts.Click += new EventHandler(ts_Click); - menuServers.DropDownItems.Add(ts); + lst.Add(ts); } + menuServers.DropDownItems.AddRange(lst.ToArray()); } private void ts_Click(object sender, EventArgs e) @@ -314,7 +316,7 @@ namespace v2rayN.Forms { return; } - qrCodeControl.showQRCode(index, config); + //qrCodeControl.showQRCode(index, config); } private void DisplayToolStatus() @@ -389,6 +391,26 @@ namespace v2rayN.Forms #region 功能按钮 + private void lvServers_Click(object sender, EventArgs e) + { + int index = -1; + try + { + if (lvServers.SelectedIndices.Count > 0) + { + index = lvServers.SelectedIndices[0]; + } + } + catch + { + } + if (index < 0) + { + return; + } + qrCodeControl.showQRCode(index, config); + } + private void lvServers_DoubleClick(object sender, EventArgs e) { int index = GetLvSelectedIndex(); @@ -1371,5 +1393,6 @@ namespace v2rayN.Forms #endregion + } } diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx index 56fbafc2..0045a460 100644 --- a/v2rayN/v2rayN/Forms/MainForm.resx +++ b/v2rayN/v2rayN/Forms/MainForm.resx @@ -492,7 +492,7 @@ Exit - 265, 164 + 265, 142 cmsMain diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index 2399a666..0437efcf 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -122,10 +122,10 @@ namespace v2rayN.Handler { config.urlGFWList = Global.GFWLIST_URL; } - if (Utils.IsNullOrEmpty(config.remoteDNS)) - { - config.remoteDNS = "1.1.1.1"; - } + //if (Utils.IsNullOrEmpty(config.remoteDNS)) + //{ + // config.remoteDNS = "1.1.1.1"; + //} if (config.subItem == null) { diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs index 1baec072..545bcf93 100644 --- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs +++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ using System.Runtime.InteropServices; // 方法是按如下所示使用“*”: //[assembly: AssemblyVersion("1.0.*")] //[assembly: AssemblyVersion("1.0.0")] -[assembly: AssemblyFileVersion("2.52")] +[assembly: AssemblyFileVersion("2.53")]