diff --git a/.vs/v2rayN/v16/.suo b/.vs/v2rayN/v16/.suo
new file mode 100644
index 00000000..6c2ec231
Binary files /dev/null and b/.vs/v2rayN/v16/.suo differ
diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
index dd2ce2b2..85668c13 100644
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -107,6 +107,7 @@
this.tsbCheckUpdateN = new System.Windows.Forms.ToolStripMenuItem();
this.tsbCheckUpdateCore = new System.Windows.Forms.ToolStripMenuItem();
this.tsbCheckUpdatePACList = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
this.tsbCheckClearPACList = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.tsbHelp = new System.Windows.Forms.ToolStripDropDownButton();
@@ -117,7 +118,6 @@
this.tsbPromotion = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.tsbClose = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -684,6 +684,11 @@
resources.ApplyResources(this.tsbCheckUpdatePACList, "tsbCheckUpdatePACList");
this.tsbCheckUpdatePACList.Click += new System.EventHandler(this.tsbCheckUpdatePACList_Click);
//
+ // toolStripSeparator13
+ //
+ this.toolStripSeparator13.Name = "toolStripSeparator13";
+ resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
+ //
// tsbCheckClearPACList
//
this.tsbCheckClearPACList.Name = "tsbCheckClearPACList";
@@ -748,11 +753,6 @@
this.tsbClose.Name = "tsbClose";
this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click);
//
- // toolStripSeparator13
- //
- this.toolStripSeparator13.Name = "toolStripSeparator13";
- resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
- //
// MainForm
//
resources.ApplyResources(this, "$this");
diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index 8ab48a1d..b303751e 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -486,6 +486,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;
@@ -499,6 +502,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;
diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx
index cde6dfff..18cb1b54 100644
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -162,7 +162,7 @@
447, 22
- Scan QR code on the screen
+ Scan QR code on the screen (Ctrl+S)
444, 6
@@ -198,7 +198,7 @@
447, 22
- Up to top
+ Up to top (T)
447, 22
@@ -216,7 +216,7 @@
447, 22
- Moves down to the bottom
+ Moves down to the bottom (B)
447, 22
@@ -291,7 +291,7 @@
ImageAboveText
- 448, 534
+ 448, 556
cmsLv
@@ -422,27 +422,6 @@
NoControl
-
- 265, 142
-
-
- cmsMain
-
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- v2rayN
-
-
- True
-
-
- 264, 22
-
-
- Http proxy
-
547, 22
@@ -473,6 +452,12 @@
Only open PAC, do not automatically configure PAC
+
+ 264, 22
+
+
+ Http proxy
+
264, 22
@@ -506,6 +491,21 @@
Exit
+
+ 265, 142
+
+
+ cmsMain
+
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ v2rayN
+
+
+ True
+
498, 17
@@ -536,60 +536,6 @@
2
-
- 228, 18
-
-
- txtMsgBox
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 0
-
-
- ssMain
-
-
- System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 1
-
-
- Bottom
-
-
- 0, 417
-
-
- 952, 176
-
-
- 4
-
-
- Information
-
-
- groupBox2
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 3
-
Fill
@@ -626,30 +572,6 @@
228, 18
-
- 3, 151
-
-
- 946, 22
-
-
- 7
-
-
- statusStrip1
-
-
- ssMain
-
-
- System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox2
-
-
- 1
-
微软雅黑, 8pt
@@ -725,6 +647,57 @@
0, 17
+
+ 3, 151
+
+
+ 946, 22
+
+
+ 7
+
+
+ statusStrip1
+
+
+ ssMain
+
+
+ System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
+ 1
+
+
+ Bottom
+
+
+ 0, 417
+
+
+ 952, 176
+
+
+ 4
+
+
+ Information
+
+
+ groupBox2
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 3
+
Top
@@ -755,6 +728,18 @@
6, 56
+
+ 197, 22
+
+
+ Subscription settings
+
+
+ 197, 22
+
+
+ Update subscription
+
Magenta
@@ -856,6 +841,27 @@
6, 56
+
+ 187, 22
+
+
+ About
+
+
+ 184, 6
+
+
+ 187, 22
+
+
+ Language-[English]
+
+
+ 187, 22
+
+
+ 语言-[中文简体]
+
Magenta
@@ -923,39 +929,6 @@
5
-
- 197, 22
-
-
- Subscription settings
-
-
- 197, 22
-
-
- Update subscription
-
-
- 187, 22
-
-
- About
-
-
- 184, 6
-
-
- 187, 22
-
-
- Language-[English]
-
-
- 187, 22
-
-
- 语言-[中文简体]
-
True
@@ -1370,6 +1343,12 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ toolStripSeparator13
+
+
+ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
tsbCheckClearPACList
@@ -1430,12 +1409,6 @@
System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- toolStripSeparator13
-
-
- System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
MainForm
diff --git a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
index 1659d54e..ddf7cef0 100644
--- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
@@ -152,7 +152,7 @@
278, 22
- 扫描屏幕上的二维码
+ 扫描屏幕上的二维码 (Ctrl+S)
275, 6
@@ -188,7 +188,7 @@
278, 22
- 上移至顶
+ 上移至顶 (T)
278, 22
@@ -206,7 +206,7 @@
278, 22
- 下移至底
+ 下移至底 (B)
278, 22