From 15966f27d11e61b3bf76718be113d8b9844c2408 Mon Sep 17 00:00:00 2001 From: Tiger Date: Thu, 20 Feb 2020 17:00:17 +0800 Subject: [PATCH] added shortcut key of "scan QR code", "move the current server up to top", and "move the current server down to bottom" --- .vs/v2rayN/v16/.suo | Bin 0 -> 14336 bytes v2rayN/v2rayN/Forms/MainForm.Designer.cs | 12 +- v2rayN/v2rayN/Forms/MainForm.cs | 9 + v2rayN/v2rayN/Forms/MainForm.resx | 257 ++++++++++------------ v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx | 6 +- 5 files changed, 133 insertions(+), 151 deletions(-) create mode 100644 .vs/v2rayN/v16/.suo diff --git a/.vs/v2rayN/v16/.suo b/.vs/v2rayN/v16/.suo new file mode 100644 index 0000000000000000000000000000000000000000..6c2ec2310754c9b53a3bf746b4853fd9e47143a4 GIT binary patch literal 14336 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 My|x>_BaOrS56bM0r~m)} literal 0 HcmV?d00001 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