diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 2dcf9788..9bd15e32 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -11,6 +11,7 @@
xmlns:reactiveui="http://reactiveui.net"
xmlns:resx="clr-namespace:v2rayN.Resx"
xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
+ xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
xmlns:vms="clr-namespace:v2rayN.ViewModels"
Title="v2rayN"
Width="900"
@@ -413,7 +414,7 @@
Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
-
+
@@ -513,13 +514,12 @@
Width="150"
Margin="8,0"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
- DisplayMemberPath="remarks"
FontSize="{DynamicResource StdFontSize}"
Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
-
@@ -619,9 +619,14 @@
x:Name="cmbMoveToGroup"
Width="200"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSubscription}"
- DisplayMemberPath="remarks"
FontSize="{DynamicResource StdFontSize}"
- Style="{StaticResource MaterialDesignFilledComboBox}" />
+ Style="{StaticResource MaterialDesignFilledComboBox}">
+
+
+
+
+
+
@@ -840,9 +845,14 @@
x:Name="cmbRoutings"
MaxWidth="300"
materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
- DisplayMemberPath="remarks"
FontSize="{DynamicResource StdFontSize}"
- Style="{StaticResource MaterialDesignFilledComboBox}" />
+ Style="{StaticResource MaterialDesignFilledComboBox}">
+
+
+
+
+
+
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml b/v2rayN/v2rayN/Views/MsgView.xaml
index 9e61d419..4cf63d0b 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/v2rayN/v2rayN/Views/MsgView.xaml
@@ -1,88 +1,76 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+ Click="menuMsgViewSelectAll_Click"
+ Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" />
+ Click="menuMsgViewCopy_Click"
+ Header="{x:Static resx:ResUI.menuMsgViewCopy}" />
+ Click="menuMsgViewCopyAll_Click"
+ Header="{x:Static resx:ResUI.menuMsgViewCopyAll}" />
+ Click="menuMsgViewClear_Click"
+ Header="{x:Static resx:ResUI.menuMsgViewClear}" />
-
-
+
+
\ No newline at end of file
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
index 7b2ba3a9..383036a4 100644
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -15,7 +15,8 @@
-
+
+