From 0b1ec520f4a7ba73b987073c93303f81d4178303 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 14 Apr 2022 17:01:51 +0800
Subject: [PATCH] fix
---
v2rayN/v2rayN/Forms/MainForm.cs | 7 --
.../v2rayN/Forms/MainMsgControl.Designer.cs | 1 +
v2rayN/v2rayN/Forms/MainMsgControl.cs | 8 ++
v2rayN/v2rayN/Forms/MainMsgControl.resx | 92 +++++++++----------
.../v2rayN/Forms/MainMsgControl.zh-Hans.resx | 62 +++++++++----
5 files changed, 100 insertions(+), 70 deletions(-)
diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index 065f9051..8ff27652 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -389,13 +389,6 @@ namespace v2rayN.Forms
{
}
- private void ssMain_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
- {
- if (!Utils.IsNullOrEmpty(e.ClickedItem.Text))
- {
- Utils.SetClipboardData(e.ClickedItem.Text);
- }
- }
private void lvServers_ColumnClick(object sender, ColumnClickEventArgs e)
{
diff --git a/v2rayN/v2rayN/Forms/MainMsgControl.Designer.cs b/v2rayN/v2rayN/Forms/MainMsgControl.Designer.cs
index 9af4bc0f..785a4329 100644
--- a/v2rayN/v2rayN/Forms/MainMsgControl.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainMsgControl.Designer.cs
@@ -130,6 +130,7 @@ namespace v2rayN.Forms
this.toolSslServerSpeed,
this.toolSslBlank4});
this.ssMain.Name = "ssMain";
+ this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked);
//
// toolSslInboundInfo
//
diff --git a/v2rayN/v2rayN/Forms/MainMsgControl.cs b/v2rayN/v2rayN/Forms/MainMsgControl.cs
index 85a4bdde..660aa2f4 100644
--- a/v2rayN/v2rayN/Forms/MainMsgControl.cs
+++ b/v2rayN/v2rayN/Forms/MainMsgControl.cs
@@ -189,6 +189,14 @@ namespace v2rayN.Forms
gbMsgTitle.Text = string.Format(ResUI.MsgInformationTitle, MsgFilter);
}
}
+
+ private void ssMain_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
+ {
+ if (!Utils.IsNullOrEmpty(e.ClickedItem.Text))
+ {
+ Utils.SetClipboardData(e.ClickedItem.Text);
+ }
+ }
#endregion
diff --git a/v2rayN/v2rayN/Forms/MainMsgControl.resx b/v2rayN/v2rayN/Forms/MainMsgControl.resx
index 8a16d9b2..a4461339 100644
--- a/v2rayN/v2rayN/Forms/MainMsgControl.resx
+++ b/v2rayN/v2rayN/Forms/MainMsgControl.resx
@@ -126,12 +126,12 @@
Select All (Ctrl+A)
+
+ ssMain
+
menuMsgBoxSelectAll
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
False
@@ -146,9 +146,6 @@
227, 22
-
- System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
menuMsgBoxCopyAll
@@ -173,8 +170,8 @@
System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 6, 12
+
+ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
0, 17
@@ -188,6 +185,9 @@
txtMsgBox
+
+ 0, 17
+
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -209,9 +209,6 @@
Add Routing Rule (Ctrl+V)
-
- System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
MiddleRight
@@ -224,15 +221,15 @@
InboundInfo
-
- 0
-
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
menuMsgBoxClear
+
+ 4
+
5
@@ -242,9 +239,6 @@
3, 17
-
- System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
toolSslBlank4
@@ -260,15 +254,15 @@
172, 17
-
- menuMsgBoxAddRoutingRule
-
True
Clear All
+
+ 6, 12
+
Vertical
@@ -282,6 +276,9 @@
cmsMsgBox
+
+ Fill
+
System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -303,8 +300,8 @@
System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Copy All
+
+ MainMsgControl
0, 0
@@ -318,26 +315,29 @@
No
-
- Copy (Ctrl+C)
+
+ Copy All
+
+
+ 250, 17
statusStrip1
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ menuMsgBoxAddRoutingRule
toolSslBlank2
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Set message filters
SPEED Disabled
-
- 4
+
+ 0
gbMsgTitle
@@ -348,32 +348,32 @@
1
-
- MainMsgControl
+
+ System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Fill
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
menuMsgBoxCopy
-
- 0, 17
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- ssMain
+
+ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Set message filters
+
+ Copy (Ctrl+C)
228, 136
-
- 250, 17
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 17, 17
+
+ 131, 18
zh-Hans
@@ -381,7 +381,7 @@
True
-
- 131, 18
+
+ 17, 17
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/MainMsgControl.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainMsgControl.zh-Hans.resx
index d9673dca..950b302b 100644
--- a/v2rayN/v2rayN/Forms/MainMsgControl.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/MainMsgControl.zh-Hans.resx
@@ -117,25 +117,53 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 信息
-
-
- 快速添加路由规则 (Ctrl+V)
-
-
- 清除所有
-
-
- 复制 (Ctrl+C)
-
-
- 复制所有
-
-
- 设置信息过滤器
+
+
+ 221, 22
全选 (Ctrl+A)
+
+ 221, 22
+
+
+ 复制 (Ctrl+C)
+
+
+ 221, 22
+
+
+ 复制所有
+
+
+ 221, 22
+
+
+ 清除所有
+
+
+ 221, 22
+
+
+ 快速添加路由规则 (Ctrl+V)
+
+
+ 221, 22
+
+
+ 设置信息过滤器
+
+
+ 222, 136
+
+
+ 157, 17
+
+
+ 157, 17
+
+
+ 信息
+
\ No newline at end of file