diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
index 7c56e5d9..4d43e379 100644
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -48,11 +48,12 @@
this.menuSetDefaultServer = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.menuMoveToGroup = new System.Windows.Forms.ToolStripMenuItem();
+ this.menuSelectAll = new System.Windows.Forms.ToolStripMenuItem();
+ this.menuMoveEvent = new System.Windows.Forms.ToolStripMenuItem();
this.menuMoveTop = new System.Windows.Forms.ToolStripMenuItem();
this.menuMoveUp = new System.Windows.Forms.ToolStripMenuItem();
this.menuMoveDown = new System.Windows.Forms.ToolStripMenuItem();
this.menuMoveBottom = new System.Windows.Forms.ToolStripMenuItem();
- this.menuSelectAll = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.menuPingServer = new System.Windows.Forms.ToolStripMenuItem();
this.menuTcpingServer = new System.Windows.Forms.ToolStripMenuItem();
@@ -190,10 +191,7 @@
this.menuSetDefaultServer,
this.toolStripSeparator3,
this.menuMoveToGroup,
- this.menuMoveTop,
- this.menuMoveUp,
- this.menuMoveDown,
- this.menuMoveBottom,
+ this.menuMoveEvent,
this.menuSelectAll,
this.toolStripSeparator9,
this.menuPingServer,
@@ -208,7 +206,6 @@
this.menuExport2ShareUrl,
this.menuExport2SubContent});
this.cmsLv.Name = "cmsLv";
- this.cmsLv.OwnerItem = this.tsbServer;
resources.ApplyResources(this.cmsLv, "cmsLv");
//
// menuAddVmessServer
@@ -299,6 +296,22 @@
resources.ApplyResources(this.menuMoveToGroup, "menuMoveToGroup");
this.menuMoveToGroup.Click += new System.EventHandler(this.menuMoveToGroup_Click);
//
+ // menuSelectAll
+ //
+ this.menuSelectAll.Name = "menuSelectAll";
+ resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
+ this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
+ //
+ // menuMoveEvent
+ //
+ this.menuMoveEvent.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.menuMoveTop,
+ this.menuMoveUp,
+ this.menuMoveDown,
+ this.menuMoveBottom});
+ this.menuMoveEvent.Name = "menuMoveEvent";
+ resources.ApplyResources(this.menuMoveEvent, "menuMoveEvent");
+ //
// menuMoveTop
//
this.menuMoveTop.Name = "menuMoveTop";
@@ -323,12 +336,6 @@
resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
this.menuMoveBottom.Click += new System.EventHandler(this.menuMoveBottom_Click);
//
- // menuSelectAll
- //
- this.menuSelectAll.Name = "menuSelectAll";
- resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
- this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
- //
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
@@ -413,7 +420,6 @@
//
// tsbServer
//
- this.tsbServer.DropDown = this.cmsLv;
this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
resources.ApplyResources(this.tsbServer, "tsbServer");
this.tsbServer.Name = "tsbServer";
@@ -852,10 +858,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
- private System.Windows.Forms.ToolStripMenuItem menuMoveTop;
- private System.Windows.Forms.ToolStripMenuItem menuMoveUp;
- private System.Windows.Forms.ToolStripMenuItem menuMoveDown;
- private System.Windows.Forms.ToolStripMenuItem menuMoveBottom;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
private System.Windows.Forms.ToolStripMenuItem menuSysAgentMode;
private System.Windows.Forms.ToolStripMenuItem menuGlobal;
@@ -919,6 +921,11 @@
private System.Windows.Forms.ToolStripMenuItem tsbGroupSetting;
private System.Windows.Forms.ToolStripMenuItem menuMoveToGroup;
private MainMsgControl mainMsgControl;
+ private System.Windows.Forms.ToolStripMenuItem menuMoveEvent;
+ private System.Windows.Forms.ToolStripMenuItem menuMoveTop;
+ private System.Windows.Forms.ToolStripMenuItem menuMoveUp;
+ private System.Windows.Forms.ToolStripMenuItem menuMoveDown;
+ private System.Windows.Forms.ToolStripMenuItem menuMoveBottom;
}
}
diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx
index 29963557..d7ea6577 100644
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -213,29 +213,35 @@
Move to Group
- 355, 22
+ 192, 22
Move to top (T)
- 355, 22
+ 192, 22
Up (U)
- 355, 22
+ 192, 22
Down (D)
- 355, 22
+ 192, 22
Move to bottom (B)
+
+ 355, 22
+
+
+ Move to
+
355, 22
@@ -308,20 +314,8 @@
Export subscription (base64) share to clipboard
-
- Magenta
-
-
- 64, 53
-
-
- Servers
-
-
- ImageAboveText
-
- 356, 644
+ 356, 600
cmsLv
@@ -470,6 +464,18 @@
0
+
+ Magenta
+
+
+ 64, 53
+
+
+ Servers
+
+
+ ImageAboveText
+
Fill
@@ -1049,6 +1055,18 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ menuSelectAll
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ menuMoveEvent
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
menuMoveTop
@@ -1073,12 +1091,6 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- menuSelectAll
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
toolStripSeparator9
diff --git a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
index e4efd702..2bb49b14 100644
--- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
@@ -555,4 +555,7 @@
移至分组
+
+ 上下移至
+
\ No newline at end of file