From 50449df08dd453ed615283cc9af7d76f6677bc05 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 19 Oct 2024 14:30:14 +0800
Subject: [PATCH] Improved

---
 .../Views/AddServer2Window.axaml              |  6 ++--
 .../Views/AddServerWindow.axaml               |  6 ++--
 .../Views/CheckUpdateView.axaml               |  8 +++--
 .../Views/DNSSettingWindow.axaml              |  6 ++--
 .../Views/GlobalHotkeySettingWindow.axaml     | 30 ++++++++++---------
 .../v2rayN.Desktop/Views/MainWindow.axaml.cs  | 18 +++++------
 .../Views/OptionSettingWindow.axaml           |  6 ++--
 .../v2rayN.Desktop/Views/QrcodeView.axaml.cs  | 12 ++++++--
 .../Views/RoutingRuleDetailsWindow.axaml      |  6 ++--
 .../Views/RoutingRuleSettingWindow.axaml      |  6 ++--
 .../Views/RoutingSettingWindow.axaml          |  6 ++--
 .../v2rayN.Desktop/Views/SubEditWindow.axaml  |  6 ++--
 v2rayN/v2rayN/Views/AddServer2Window.xaml     |  1 +
 v2rayN/v2rayN/Views/AddServerWindow.xaml      |  1 +
 v2rayN/v2rayN/Views/BackupAndRestoreView.xaml |  1 -
 v2rayN/v2rayN/Views/CheckUpdateView.xaml      |  3 +-
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml     |  1 +
 .../Views/GlobalHotkeySettingWindow.xaml      |  1 +
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  |  1 +
 .../Views/RoutingRuleDetailsWindow.xaml       |  9 +++---
 .../Views/RoutingRuleSettingWindow.xaml       |  9 +++---
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml |  1 +
 v2rayN/v2rayN/Views/SubEditWindow.xaml        |  9 +++---
 23 files changed, 93 insertions(+), 60 deletions(-)

diff --git a/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml b/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
index 797d8117..a49fcf3d 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServer2Window.axaml
@@ -23,13 +23,15 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
             <Grid>
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
index f55c3957..5c6dff35 100644
--- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -23,13 +23,15 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
             <Grid>
diff --git a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
index 28c67bc3..cd6f3843 100644
--- a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml
@@ -6,14 +6,14 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    d:DesignHeight="450"
+    d:DesignHeight="600"
     d:DesignWidth="800"
     x:DataType="vms:CheckUpdateViewModel"
     mc:Ignorable="d">
 
     <DockPanel Classes="Margin8">
         <StackPanel
-            HorizontalAlignment="Right"
+            HorizontalAlignment="Center"
             Classes="Margin8"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
@@ -67,14 +67,16 @@
                                     Grid.Column="0"
                                     Margin="8"
                                     HorizontalAlignment="Left"
-                                    VerticalAlignment="Center"
+                                    VerticalAlignment="Top"
                                     IsChecked="{Binding IsSelected}" />
                                 <TextBlock
                                     Grid.Column="1"
+                                    HorizontalAlignment="Left"
                                     VerticalAlignment="Center"
                                     Text="{Binding CoreType}" />
                                 <TextBlock
                                     Grid.Column="2"
+                                    HorizontalAlignment="Left"
                                     VerticalAlignment="Center"
                                     Text="{Binding Remarks}"
                                     TextWrapping="WrapWithOverflow" />
diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
index fdfdcd2f..a0ade9db 100644
--- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml
@@ -23,13 +23,15 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsCancel="True" />
         </StackPanel>
 
         <TabControl HorizontalContentAlignment="Left">
diff --git a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
index 743c9c62..d0a202c9 100644
--- a/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/GlobalHotkeySettingWindow.axaml
@@ -15,8 +15,8 @@
     mc:Ignorable="d">
     <DockPanel Classes="Margin8">
         <StackPanel
-            Classes="Margin8"
             HorizontalAlignment="Center"
+            Classes="Margin8"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <Button
@@ -28,13 +28,15 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
             <Grid>
@@ -66,77 +68,77 @@
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
-                        Classes="Margin8"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbDisplayGUI}" />
 
                     <TextBox
                         x:Name="txtGlobalHotkey0"
                         Grid.Row="1"
                         Grid.Column="1"
-                        Classes="Margin8"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         IsReadOnly="True" />
 
                     <TextBlock
                         Grid.Row="2"
                         Grid.Column="0"
-                        Classes="Margin8"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
                     <TextBox
                         x:Name="txtGlobalHotkey1"
                         Grid.Row="2"
                         Grid.Column="1"
-                        Classes="Margin8"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         IsReadOnly="True" />
 
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="0"
-                        Classes="Margin8"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
                     <TextBox
                         x:Name="txtGlobalHotkey2"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Classes="Margin8"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         IsReadOnly="True" />
                     <TextBlock
                         Grid.Row="4"
                         Grid.Column="0"
-                        Classes="Margin8"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
                     <TextBox
                         x:Name="txtGlobalHotkey3"
                         Grid.Row="4"
                         Grid.Column="1"
-                        Classes="Margin8"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         IsReadOnly="True" />
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
-                        Classes="Margin8"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbSystemProxyPac}" />
                     <TextBox
                         x:Name="txtGlobalHotkey4"
                         Grid.Row="5"
                         Grid.Column="1"
-                        Classes="Margin8"
                         VerticalAlignment="Center"
+                        Classes="Margin8"
                         IsReadOnly="True" />
                 </Grid>
 
                 <TextBlock
                     Grid.Row="1"
-                    Classes="Margin8"
                     VerticalAlignment="Center"
+                    Classes="Margin8"
                     Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
             </Grid>
         </ScrollViewer>
diff --git a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
index 8c468f75..f4d6d8ea 100644
--- a/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
@@ -320,17 +320,17 @@ namespace v2rayN.Desktop.Views
 
         public async Task ScanScreenTaskAsync()
         {
-            ShowHideWindow(false);
-
-            //var dpiXY = QRCodeHelper.GetDpiXY(Application.Current.MainWindow);
-            //string result = await Task.Run(() =>
+            //ShowHideWindow(false);
+ 
+            NoticeHandler.Instance.SendMessageAndEnqueue("Not yet implemented.(还未实现)");
+            return;
+            //if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             //{
-            //    return QRCodeHelper.ScanScreen(dpiXY.Item1, dpiXY.Item2);
-            //});
+            //    //var bytes = QRCodeHelper.CaptureScreen(desktop);
+            //    //await ViewModel?.ScanScreenResult(bytes);
+            //}
 
-            ShowHideWindow(true);
-
-            //ViewModel?.ScanScreenResult(result);
+            //ShowHideWindow(true);
         }
         private async Task ScanImageTaskAsync()
         {
diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
index 7d7ccbc3..fb457f41 100644
--- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
@@ -23,13 +23,15 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsCancel="True" />
         </StackPanel>
 
         <TabControl HorizontalContentAlignment="Stretch">
diff --git a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
index 2f8bab2a..dc7273be 100644
--- a/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml.cs
@@ -17,9 +17,15 @@ namespace v2rayN.Desktop.Views
 
         private Bitmap? GetQRCode(string? url)
         {
-            var qrCodeImage = QRCodeHelper.GenQRCode(url);
-            if (qrCodeImage is null) return null;
-            var ms = new MemoryStream(qrCodeImage);
+            var bytes = QRCodeHelper.GenQRCode(url);
+            return ByteToBitmap(bytes);
+        }
+
+        private Bitmap? ByteToBitmap(byte[]? bytes)
+        {
+            if (bytes is null) return null;
+
+            using var ms = new MemoryStream(bytes);
             return new Bitmap(ms);
         }
     }
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
index b11ce805..b405c0c2 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml
@@ -158,13 +158,15 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsCancel="True" />
         </StackPanel>
 
         <Grid Classes="Margin8">
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
index c8867854..12616690 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml
@@ -35,13 +35,15 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsCancel="True" />
         </StackPanel>
 
         <Grid Classes="Margin8" DockPanel.Dock="Top">
diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
index 90dbf965..3ba7aa9b 100644
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
@@ -71,13 +71,15 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsCancel="True" />
         </StackPanel>
 
         <DockPanel>
diff --git a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
index 30a7a5dc..c5d22cfd 100644
--- a/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml
@@ -24,13 +24,15 @@
                 x:Name="btnSave"
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsDefault="True" />
             <Button
                 x:Name="btnCancel"
                 Width="100"
                 Margin="8,0"
                 Content="{x:Static resx:ResUI.TbCancel}"
-                Cursor="Hand" />
+                Cursor="Hand"
+                IsCancel="True" />
         </StackPanel>
         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
 
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index 904f2248..5c12a951 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -33,6 +33,7 @@
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
+                IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index ad9a229b..760650ea 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -33,6 +33,7 @@
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
+                IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
index 4107d199..e0cecd10 100644
--- a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
+++ b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
@@ -30,7 +30,6 @@
                 Content="{x:Static resx:ResUI.menuClose}"
                 DockPanel.Dock="Right"
                 IsCancel="True"
-                IsDefault="True"
                 Style="{StaticResource MaterialDesignFlatButton}" />
 
             <TextBlock
diff --git a/v2rayN/v2rayN/Views/CheckUpdateView.xaml b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
index acd8299b..9eba240b 100644
--- a/v2rayN/v2rayN/Views/CheckUpdateView.xaml
+++ b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
@@ -37,7 +37,6 @@
                 Width="100"
                 Margin="{StaticResource Margin8}"
                 Content="{x:Static resx:ResUI.menuCheckUpdate}"
-                IsCancel="True"
                 IsDefault="True"
                 Style="{StaticResource MaterialDesignFlatButton}" />
 
@@ -48,7 +47,6 @@
                 Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
                 Content="{x:Static resx:ResUI.menuClose}"
                 IsCancel="True"
-                IsDefault="True"
                 Style="{StaticResource MaterialDesignFlatButton}" />
         </StackPanel>
 
@@ -84,6 +82,7 @@
                                     Grid.Column="0"
                                     Margin="{StaticResource Margin8}"
                                     HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
                                     IsChecked="{Binding IsSelected}" />
                                 <TextBlock
                                     Grid.Column="1"
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index 76a212c9..3e93e373 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -33,6 +33,7 @@
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
+                IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
index 90c4957e..08669761 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -40,6 +40,7 @@
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
+                IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index c42fc4c4..3a66f2e6 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -33,6 +33,7 @@
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
+                IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index 58d1b2f9..74ea9453 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -1,14 +1,14 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"
     Width="900"
     Height="700"
@@ -184,6 +184,7 @@
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
+                IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index cd815208..9e851b1f 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -1,14 +1,14 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
     Width="960"
     Height="700"
@@ -81,6 +81,7 @@
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
+                IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index c49f4c49..ffe700ef 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -142,6 +142,7 @@
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
+                IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index b82e30ef..f2779995 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -1,14 +1,14 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     Title="{x:Static resx:ResUI.menuSubSetting}"
     Width="700"
     Height="600"
@@ -40,6 +40,7 @@
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 Cursor="Hand"
+                IsDefault="True"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"