From 9b2261918f1592f97c356d1e90bedc4ccba98d67 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 5 Aug 2022 20:53:40 +0800
Subject: [PATCH] Refactor UI
---
v2rayN/v2rayN/Forms/MainForm.Designer.cs | 31 +-
v2rayN/v2rayN/Forms/MainForm.resx | 360 +++++++++++------------
2 files changed, 195 insertions(+), 196 deletions(-)
diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
index 218a8fe3..4cad06ba 100644
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -96,6 +96,8 @@
this.tsbSubSetting = new System.Windows.Forms.ToolStripMenuItem();
this.tsbSubUpdate = new System.Windows.Forms.ToolStripMenuItem();
this.tsbSubUpdateViaProxy = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsbSubGroupUpdate = new System.Windows.Forms.ToolStripMenuItem();
+ this.tsbSubGroupUpdateViaProxy = new System.Windows.Forms.ToolStripMenuItem();
this.tsbQRCodeSwitch = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.tsbSetting = new System.Windows.Forms.ToolStripDropDownButton();
@@ -128,8 +130,6 @@
this.tsbPromotion = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.tsbClose = new System.Windows.Forms.ToolStripButton();
- this.tsbSubGroupUpdate = new System.Windows.Forms.ToolStripMenuItem();
- this.tsbSubGroupUpdateViaProxy = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.scServers)).BeginInit();
this.scServers.Panel1.SuspendLayout();
this.scServers.Panel2.SuspendLayout();
@@ -193,11 +193,11 @@
this.menuAddServers,
this.menuScanScreen,
this.toolStripSeparator1,
+ this.menuServerFilter,
this.menuRemoveServer,
this.menuRemoveDuplicateServer,
this.menuCopyServer,
this.menuSetDefaultServer,
- this.menuServerFilter,
this.toolStripSeparator3,
this.menuMoveToGroup,
this.menuMoveEvent,
@@ -216,7 +216,6 @@
this.menuExport2ShareUrl,
this.menuExport2SubContent});
this.cmsLv.Name = "cmsLv";
- this.cmsLv.OwnerItem = this.tsbServer;
resources.ApplyResources(this.cmsLv, "cmsLv");
//
// menuAddVmessServer
@@ -639,6 +638,18 @@
resources.ApplyResources(this.tsbSubUpdateViaProxy, "tsbSubUpdateViaProxy");
this.tsbSubUpdateViaProxy.Click += new System.EventHandler(this.tsbSubUpdateViaProxy_Click);
//
+ // tsbSubGroupUpdate
+ //
+ this.tsbSubGroupUpdate.Name = "tsbSubGroupUpdate";
+ resources.ApplyResources(this.tsbSubGroupUpdate, "tsbSubGroupUpdate");
+ this.tsbSubGroupUpdate.Click += new System.EventHandler(this.tsbSubGroupUpdate_Click);
+ //
+ // tsbSubGroupUpdateViaProxy
+ //
+ this.tsbSubGroupUpdateViaProxy.Name = "tsbSubGroupUpdateViaProxy";
+ resources.ApplyResources(this.tsbSubGroupUpdateViaProxy, "tsbSubGroupUpdateViaProxy");
+ this.tsbSubGroupUpdateViaProxy.Click += new System.EventHandler(this.tsbSubGroupUpdateViaProxy_Click);
+ //
// tsbQRCodeSwitch
//
this.tsbQRCodeSwitch.CheckOnClick = true;
@@ -852,18 +863,6 @@
this.tsbClose.Name = "tsbClose";
this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click);
//
- // tsbSubGroupUpdate
- //
- this.tsbSubGroupUpdate.Name = "tsbSubGroupUpdate";
- resources.ApplyResources(this.tsbSubGroupUpdate, "tsbSubGroupUpdate");
- this.tsbSubGroupUpdate.Click += new System.EventHandler(this.tsbSubGroupUpdate_Click);
- //
- // tsbSubGroupUpdateViaProxy
- //
- this.tsbSubGroupUpdateViaProxy.Name = "tsbSubGroupUpdateViaProxy";
- resources.ApplyResources(this.tsbSubGroupUpdateViaProxy, "tsbSubGroupUpdateViaProxy");
- this.tsbSubGroupUpdateViaProxy.Click += new System.EventHandler(this.tsbSubGroupUpdateViaProxy_Click);
- //
// MainForm
//
resources.ApplyResources(this, "$this");
diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx
index e13b36cd..241c477c 100644
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -179,6 +179,12 @@
352, 6
+
+ 355, 22
+
+
+ Set server filter (Ctrl+F)
+
355, 22
@@ -203,12 +209,6 @@
Set as active server (Enter)
-
- 355, 22
-
-
- Set server filter (Ctrl+F)
-
352, 6
@@ -218,6 +218,30 @@
Move to Group
+
+ 192, 22
+
+
+ Move to top (T)
+
+
+ 192, 22
+
+
+ Up (U)
+
+
+ 192, 22
+
+
+ Down (D)
+
+
+ 192, 22
+
+
+ Move to bottom (B)
+
355, 22
@@ -302,20 +326,8 @@
Export subscription (base64) share to clipboard
-
- Magenta
-
-
- 64, 53
-
-
- Servers
-
-
- ImageAboveText
-
- 356, 622
+ 356, 644
cmsLv
@@ -464,29 +476,17 @@
0
-
- 192, 22
+
+ Magenta
-
- Move to top (T)
+
+ 64, 53
-
- 192, 22
+
+ Servers
-
- Up (U)
-
-
- 192, 22
-
-
- Down (D)
-
-
- 192, 22
-
-
- Move to bottom (B)
+
+ ImageAboveText
Fill
@@ -599,27 +599,6 @@
NoControl
-
- 278, 192
-
-
- cmsMain
-
-
- System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- v2rayN
-
-
- True
-
-
- 277, 22
-
-
- System proxy
-
243, 22
@@ -638,6 +617,12 @@
Do not change system proxy
+
+ 277, 22
+
+
+ System proxy
+
277, 22
@@ -686,6 +671,21 @@
Exit
+
+ 278, 192
+
+
+ cmsMain
+
+
+ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ v2rayN
+
+
+ True
+
Top
@@ -776,6 +776,39 @@
6, 56
+
+ 195, 22
+
+
+ OptionSetting
+
+
+ 195, 22
+
+
+ RoutingSetting
+
+
+ 195, 22
+
+
+ GlobalHotkeySetting
+
+
+ 195, 22
+
+
+ GroupSetting
+
+
+ 192, 6
+
+
+ 195, 22
+
+
+ BackupGuiConfig
+
Magenta
@@ -809,6 +842,54 @@
6, 56
+
+ 219, 22
+
+
+ v2rayN (this software)
+
+
+ 219, 22
+
+
+ Update v2fly Core
+
+
+ 219, 22
+
+
+ Update SagerNet Core
+
+
+ 219, 22
+
+
+ Update Xray Core
+
+
+ 216, 6
+
+
+ 219, 22
+
+
+ Update clash Core
+
+
+ 219, 22
+
+
+ Update Clash.Meta Core
+
+
+ 216, 6
+
+
+ 219, 22
+
+
+ Update Geo files
+
Magenta
@@ -824,6 +905,33 @@
6, 56
+
+ 187, 22
+
+
+ v2rayN Project
+
+
+ 187, 22
+
+
+ V2Ray Website
+
+
+ 184, 6
+
+
+ 187, 22
+
+
+ Language-[English]
+
+
+ 187, 22
+
+
+ 语言-[中文简体]
+
Magenta
@@ -884,114 +992,6 @@
4
-
- 195, 22
-
-
- OptionSetting
-
-
- 195, 22
-
-
- RoutingSetting
-
-
- 195, 22
-
-
- GlobalHotkeySetting
-
-
- 195, 22
-
-
- GroupSetting
-
-
- 192, 6
-
-
- 195, 22
-
-
- BackupGuiConfig
-
-
- 219, 22
-
-
- v2rayN (this software)
-
-
- 219, 22
-
-
- Update v2fly Core
-
-
- 219, 22
-
-
- Update SagerNet Core
-
-
- 219, 22
-
-
- Update Xray Core
-
-
- 216, 6
-
-
- 219, 22
-
-
- Update clash Core
-
-
- 219, 22
-
-
- Update Clash.Meta Core
-
-
- 216, 6
-
-
- 219, 22
-
-
- Update Geo files
-
-
- 187, 22
-
-
- v2rayN Project
-
-
- 187, 22
-
-
- V2Ray Website
-
-
- 184, 6
-
-
- 187, 22
-
-
- Language-[English]
-
-
- 187, 22
-
-
- 语言-[中文简体]
-
True
@@ -1340,6 +1340,18 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ tsbSubGroupUpdate
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tsbSubGroupUpdateViaProxy
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
tsbQRCodeSwitch
@@ -1532,18 +1544,6 @@
System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tsbSubGroupUpdate
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tsbSubGroupUpdateViaProxy
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
MainForm