diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs index 13ce7b39..a556f0a3 100644 --- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs @@ -580,10 +580,9 @@ // // tsMain // - this.tsMain.ImageScalingSize = new System.Drawing.Size(32, 32); + this.tsMain.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.tsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsbServer, - this.toolStripSeparator4, this.tsbSub, this.toolStripSeparator8, this.tsbOptionSetting, @@ -593,6 +592,7 @@ this.tsbCheckUpdate, this.toolStripSeparator10, this.tsbHelp, + this.toolStripSeparator4, this.tsbPromotion, this.toolStripSeparator11, this.tsbClose}); @@ -644,6 +644,7 @@ // // tsbReload // + this.tsbReload.Image = global::v2rayN.Properties.Resources.restart; resources.ApplyResources(this.tsbReload, "tsbReload"); this.tsbReload.Name = "tsbReload"; this.tsbReload.Click += new System.EventHandler(this.tsbReload_Click); @@ -742,6 +743,7 @@ // // tsbClose // + this.tsbClose.Image = global::v2rayN.Properties.Resources.minimize; resources.ApplyResources(this.tsbClose, "tsbClose"); this.tsbClose.Name = "tsbClose"; this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click); diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx index 0045a460..b28fe42c 100644 --- a/v2rayN/v2rayN/Forms/MainForm.resx +++ b/v2rayN/v2rayN/Forms/MainForm.resx @@ -123,157 +123,157 @@ - 3, 17 + 3, 19 327, 17 - 447, 22 + 413, 22 Add [VMess] server - 447, 22 + 413, 22 Add [Shadowsocks] server - 447, 22 + 413, 22 Add [Socks] server - 447, 22 + 413, 22 Add a custom configuration server - 447, 22 + 413, 22 Import bulk URL from clipboard - 447, 22 + 413, 22 Scan QR code on the screen - 444, 6 + 410, 6 - 447, 22 + 413, 22 Remove selected server (multiple choice) (Delete) - 447, 22 + 413, 22 Remove duplicate server - 447, 22 + 413, 22 Copy selected server - 447, 22 + 413, 22 Set as active server (Enter) - 444, 6 + 410, 6 - 447, 22 + 413, 22 Up to top - 447, 22 + 413, 22 Upward (U) - 447, 22 + 413, 22 Down (D) - 447, 22 + 413, 22 Moves down to the bottom - 447, 22 + 413, 22 Select All (Ctrl+A) - 444, 6 + 410, 6 - 447, 22 + 413, 22 Test server ping (multiple choice)(Ctrl+P) - 447, 22 + 413, 22 Test server tcping (multiple choice)(Ctrl+O) - 447, 22 + 413, 22 Test server real ping (multiple choice)(Ctrl+R) - 447, 22 + 413, 22 Test server speed (multiple choice)(Ctrl+T) - 444, 6 + 410, 6 - 447, 22 + 413, 22 Export selected server for client configuration - 447, 22 + 413, 22 Export selected server for server configuration - 447, 22 + 413, 22 Batch export share URL to clipboard (multiple choice) - 447, 22 + 413, 22 Batch export subscription content to clipboard (multiple choice) @@ -282,16 +282,13 @@ Magenta - 64, 53 + 73, 22 Servers - - ImageAboveText - - 448, 534 + 414, 534 cmsLv @@ -323,7 +320,7 @@ 0, 0 - 686, 331 + 686, 409 @@ -356,11 +353,14 @@ Fill + + Segoe UI, 9pt + 0, 0 - 256, 331 + 256, 409 0 @@ -393,7 +393,7 @@ 100 - 946, 331 + 946, 409 686 @@ -423,76 +423,76 @@ NoControl - 547, 22 + 501, 22 Not Enabled Http Proxy - 547, 22 + 501, 22 Open Http proxy and automatically configure proxy server (global mode) - 547, 22 + 501, 22 Open PAC and automatically configure PAC (PAC mode) - 547, 22 + 501, 22 Only open Http proxy, do not automatically configure proxy server (direct mode) - 547, 22 + 501, 22 Only open PAC, do not automatically configure PAC - 264, 22 + 242, 22 Http proxy - 264, 22 + 242, 22 Server - 264, 22 + 242, 22 Import bulk URL from clipboard - 264, 22 + 242, 22 Scan QR code on the screen - 264, 22 + 242, 22 Copy local PAC URL - 261, 6 + 239, 6 - 264, 22 + 242, 22 Exit - 265, 142 + 243, 142 cmsMain @@ -512,11 +512,14 @@ Fill + + Segoe UI, 9pt + - 0, 66 + 0, 35 - 952, 351 + 952, 431 2 @@ -540,7 +543,7 @@ Fill - 3, 17 + 3, 19 0 @@ -552,7 +555,7 @@ Vertical - 946, 134 + 946, 132 2 @@ -573,7 +576,7 @@ 228, 18 - 微软雅黑, 8pt + Segoe UI, 9pt 49, 17 @@ -585,16 +588,16 @@ 0, 17 - 微软雅黑, 8pt + Microsoft YaHei, 8pt - 198, 17 + 199, 17 - 微软雅黑, 8pt + Segoe UI, 9pt - 36, 17 + 35, 17 HTTP @@ -603,16 +606,16 @@ 0, 17 - 微软雅黑, 8pt + Microsoft YaHei, 8pt - 198, 17 + 199, 17 - 微软雅黑, 8pt + Segoe UI, 9pt - 30, 17 + 29, 17 PAC @@ -621,16 +624,16 @@ 0, 17 - 微软雅黑, 8pt + Microsoft YaHei, 8pt - 198, 17 + 199, 17 False - 微软雅黑, 8pt + Segoe UI, 9pt No @@ -674,8 +677,11 @@ Bottom + + Segoe UI, 9pt + - 0, 417 + 0, 466 952, 176 @@ -702,7 +708,7 @@ Top - 0, 56 + 0, 25 952, 10 @@ -725,17 +731,14 @@ 409, 17 - - 6, 56 - - 197, 22 + 184, 22 Subscription settings - 197, 22 + 184, 22 Update subscription @@ -744,42 +747,25 @@ Magenta - 93, 53 + 102, 22 Subscription - - ImageAboveText - - 6, 56 + 6, 25 Magenta - 52, 53 + 64, 22 Setting - - ImageAboveText - - 6, 56 - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVFhH7ZaBDQIhDEVvBEdwBDfQDXQER3AD3cARdAPd - QDfSDbQvuSb1AicFjJrwkxcN0FIolOuamv5VE2E+gLaPayWchEcE+hhTXVPhIoQmDcFYbKpoJtwEdX4X - jgIrXfTwnzb6dBw22BaJVdjJmWQs1/SdBRtE0U5cBXW2oSFRO0HtSEeW2FZ1wsq9sjuRdTDVAXnNuWLY - 6JnAl0sYa/Q5q1dhq35ci+Bkq2HJvbZpxGeybAAuw4Fq+cnW1wPITgHFYxvBUw+qHEIL1yq1vDKhVlH3 - NQwF4JkcFRWiUAB7IVW2FFPO3YqlgPd+LJf02e8Fdi3rMdIAcLDuf9UpeT0IS0G/hvhPm305vSl7EQFY - B6zCvozvYGzRM8zEoeg5TPZwDaGvpHQni1yzSxbXPW9q+hF13ROHuJnQcjbhtQAAAABJRU5ErkJggg== - + 6, 25 BottomCenter @@ -788,37 +774,34 @@ Magenta - 97, 53 + 102, 22 Restart service - - ImageAboveText - - 6, 56 + 6, 25 - 338, 22 + 310, 22 Check for updates to v2rayN - 338, 22 + 310, 22 Check for updates to v2rayCore - 338, 22 + 310, 22 Check for updated PAC (requires Http proxy) - 338, 22 + 310, 22 Simplify PAC (please set Core route) @@ -827,34 +810,31 @@ Magenta - 128, 53 + 132, 22 Check for updates - - ImageAboveText - - 6, 56 + 6, 25 - 187, 22 + 177, 22 About - 184, 6 + 174, 6 - 187, 22 + 177, 22 Language-[English] - 187, 22 + 177, 22 语言-[中文简体] @@ -863,53 +843,43 @@ Magenta - 48, 53 + 61, 22 Help - - ImageAboveText + + 6, 25 Magenta - 89, 53 + 84, 22 - Promotion - - - ImageAboveText + Promotion - 6, 56 - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/ - GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg== - + 6, 25 Magenta - 52, 53 + 56, 22 - Close - - - ImageAboveText + Close 0, 0 + + 1, 0, 1, 0 + - 952, 56 + 952, 25 6 @@ -933,10 +903,10 @@ 65 - 6, 12 + 6, 13 - 952, 593 + 952, 642 4, 4, 4, 4 diff --git a/v2rayN/v2rayN/Resources/checkupdate.png b/v2rayN/v2rayN/Resources/checkupdate.png index bc1fade1..4471129d 100644 Binary files a/v2rayN/v2rayN/Resources/checkupdate.png and b/v2rayN/v2rayN/Resources/checkupdate.png differ diff --git a/v2rayN/v2rayN/Resources/help.png b/v2rayN/v2rayN/Resources/help.png index 03691a42..adfcf2f4 100644 Binary files a/v2rayN/v2rayN/Resources/help.png and b/v2rayN/v2rayN/Resources/help.png differ diff --git a/v2rayN/v2rayN/Resources/minimize.png b/v2rayN/v2rayN/Resources/minimize.png index 82ee86e4..9a5f3369 100644 Binary files a/v2rayN/v2rayN/Resources/minimize.png and b/v2rayN/v2rayN/Resources/minimize.png differ diff --git a/v2rayN/v2rayN/Resources/option.png b/v2rayN/v2rayN/Resources/option.png index a0973e58..51b5e31b 100644 Binary files a/v2rayN/v2rayN/Resources/option.png and b/v2rayN/v2rayN/Resources/option.png differ diff --git a/v2rayN/v2rayN/Resources/promotion.png b/v2rayN/v2rayN/Resources/promotion.png index e7b6251f..ea59c12c 100644 Binary files a/v2rayN/v2rayN/Resources/promotion.png and b/v2rayN/v2rayN/Resources/promotion.png differ diff --git a/v2rayN/v2rayN/Resources/restart.png b/v2rayN/v2rayN/Resources/restart.png index 1c0e0ca6..318567f2 100644 Binary files a/v2rayN/v2rayN/Resources/restart.png and b/v2rayN/v2rayN/Resources/restart.png differ diff --git a/v2rayN/v2rayN/Resources/server.png b/v2rayN/v2rayN/Resources/server.png index ee3b6970..52d4e252 100644 Binary files a/v2rayN/v2rayN/Resources/server.png and b/v2rayN/v2rayN/Resources/server.png differ diff --git a/v2rayN/v2rayN/Resources/sub.png b/v2rayN/v2rayN/Resources/sub.png index c60b5b35..e9aabbd8 100644 Binary files a/v2rayN/v2rayN/Resources/sub.png and b/v2rayN/v2rayN/Resources/sub.png differ