Update AssemblyInfo.cs

Update MainForm.cs
Create .gitignore
2020-03-10 09:30:04 +08:00 · 2020-03-10 09:30:01 +08:00 · 2020-03-10 08:21:27 +08:00 · 2020-03-09 19:25:36 +08:00 · 2020-03-09 19:22:28 +08:00 · 2020-03-09 17:19:34 +08:00
6 changed files with 23 additions and 27 deletions
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -163,7 +163,7 @@
            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.KeyUp += new System.Windows.Forms.KeyEventHandler(this.lvServers_KeyUp);
+            this.lvServers.KeyDown += new System.Windows.Forms.KeyEventHandler(this.lvServers_KeyDown);
            // 
            // cmsLv
            // 
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -464,7 +464,7 @@ namespace v2rayN.Forms
            }
        }

-        private void lvServers_KeyUp(object sender, KeyEventArgs e)
+        private void lvServers_KeyDown(object sender, KeyEventArgs e)
        {
            if (e.Control)
            {
@@ -479,12 +479,6 @@ namespace v2rayN.Forms
                    case Keys.V:
                        menuAddServers_Click(null, null);
                        break;
-                    case Keys.U:
-                        menuMoveTop_Click(null, null);
-                        break;
-                    case Keys.D:
-                        menuMoveBottom_Click(null, null);
-                        break;
                    case Keys.P:
                        menuPingServer_Click(null, null);
                        break;
@@ -494,6 +488,9 @@ namespace v2rayN.Forms
                    case Keys.R:
                        menuRealPingServer_Click(null, null);
                        break;
+                    case Keys.S:
+                        menuScanScreen_Click(null, null);
+                        break;
                    case Keys.T:
                        menuSpeedServer_Click(null, null);
                        break;
@@ -509,6 +506,12 @@ namespace v2rayN.Forms
                    case Keys.Delete:
                        menuRemoveServer_Click(null, null);
                        break;
+                    case Keys.T:
+                        menuMoveTop_Click(null, null);
+                        break;
+                    case Keys.B:
+                        menuMoveBottom_Click(null, null);
+                        break;
                    case Keys.U:
                        menuMoveUp_Click(null, null);
                        break;
@@ -665,7 +668,8 @@ namespace v2rayN.Forms
            if (sb.Length > 0)
            {
                Utils.SetClipboardData(sb.ToString());
-                UI.Show(UIRes.I18N("BatchExportURLSuccessfully"));
+                AppendText(false, UIRes.I18N("BatchExportURLSuccessfully"));
+                //UI.Show(UIRes.I18N("BatchExportURLSuccessfully"));
            }
        }

--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -162,7 +162,7 @@
    <value>355, 22</value>
  </data>
  <data name="menuScanScreen.Text" xml:space="preserve">
-    <value>Scan QR code on the screen</value>
+    <value>Scan QR code on the screen (Ctrl+S)</value>
  </data>
  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
    <value>352, 6</value>
@@ -198,13 +198,13 @@
    <value>355, 22</value>
  </data>
  <data name="menuMoveTop.Text" xml:space="preserve">
-    <value>Move to top (Ctrl+U)</value>
+    <value>Move to top (T)</value>
  </data>
  <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
    <value>355, 22</value>
  </data>
  <data name="menuMoveUp.Text" xml:space="preserve">
-    <value>Upward (U)</value>
+    <value>Up (U)</value>
  </data>
  <data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
    <value>355, 22</value>
@@ -216,7 +216,7 @@
    <value>355, 22</value>
  </data>
  <data name="menuMoveBottom.Text" xml:space="preserve">
-    <value>Move to bottom (Ctrl+D)</value>
+    <value>Move to bottom (B)</value>
  </data>
  <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
    <value>355, 22</value>
--- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
@@ -152,7 +152,7 @@
    <value>278, 22</value>
  </data>
  <data name="menuScanScreen.Text" xml:space="preserve">
-    <value>扫描屏幕上的二维码</value>
+    <value>扫描屏幕上的二维码 (Ctrl+S)</value>
  </data>
  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
    <value>275, 6</value>
@@ -188,7 +188,7 @@
    <value>278, 22</value>
  </data>
  <data name="menuMoveTop.Text" xml:space="preserve">
-    <value>上移至顶 (Ctrl+U)</value>
+    <value>上移至顶 (T)</value>
  </data>
  <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
    <value>278, 22</value>
@@ -206,7 +206,7 @@
    <value>278, 22</value>
  </data>
  <data name="menuMoveBottom.Text" xml:space="preserve">
-    <value>下移至底 (Ctrl+D)</value>
+    <value>下移至底 (B)</value>
  </data>
  <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
    <value>278, 22</value>
--- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
@@ -446,15 +446,7 @@ namespace v2rayN.Handler
            {
                //远程服务器底层传输配置
                streamSettings.network = config.network();
-                string host;
-                if (streamSettings.network != "quic")
-                {
-                    host = config.requestHost();
-                }
-                else
-                {
-                    host = config.address();
-                }
+                var host = config.requestHost();               
                //if tls
                if (config.streamSecurity() == Global.StreamSecurity)
                {
@@ -548,7 +540,7 @@ namespace v2rayN.Handler
                        quicsettings.key = config.path();
                        quicsettings.header = new Header();
                        quicsettings.header.type = config.headerType();
-
+                        streamSettings.tlsSettings.serverName = config.address();
                        streamSettings.quicSettings = quicsettings;
                        break;
                    default:
--- 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("3.6")]
+[assembly: AssemblyFileVersion("3.7")]
Author	SHA1	Message	Date
2dust	4e38ec8f57	Update AssemblyInfo.cs	2020-03-10 09:30:04 +08:00
2dust	eda7b1789a	Update MainForm.cs	2020-03-10 09:30:01 +08:00
2dust	db2510fac5	Create .gitignore	2020-03-10 08:21:27 +08:00
2dust	e354dad70b	Merge pull request #524 from lycor1s/master fix quic server name	2020-03-09 19:25:36 +08:00
2dust	02607e116e	Delete .gitignore	2020-03-09 19:22:28 +08:00
Kyrie@cedu.me	932fd330ce	fix quic server name	2020-03-09 17:19:34 +08:00
2dust	c9c0dc9b5b	Merge pull request #523 from yfdyh000/misc-pr2 快捷键优化	2020-03-09 16:08:29 +08:00
YFdyh000	2b3e29f3d1	added shortcut key of "scan QR code" by @dearsn	2020-03-09 16:04:22 +08:00
YFdyh000	b83b624dc3	移至顶部/底部的快捷键调整	2020-03-09 16:04:20 +08:00