Improved

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>

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>

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" />

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">

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>

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -320,17 +320,17 @@ namespace v2rayN.Desktop.Views
 
         public async Task ScanScreenTaskAsync()
         {
-            ShowHideWindow(false);
+            //ShowHideWindow(false);
  
-            //var dpiXY = QRCodeHelper.GetDpiXY(Application.Current.MainWindow);
+            NoticeHandler.Instance.SendMessageAndEnqueue("Not yet implemented.(还未实现)");
-            //string result = await Task.Run(() =>
+            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);
+            //ShowHideWindow(true);
-
-            //ViewModel?.ScanScreenResult(result);
         }
         private async Task ScanImageTaskAsync()
         {

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">

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);
+            var bytes = QRCodeHelper.GenQRCode(url);
-            if (qrCodeImage is null) return null;
+            return ByteToBitmap(bytes);
-            var ms = new MemoryStream(qrCodeImage);
+        }
+
+        private Bitmap? ByteToBitmap(byte[]? bytes)
+        {
+            if (bytes is null) return null;
+
+            using var ms = new MemoryStream(bytes);
             return new Bitmap(ms);
         }
     }

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">

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">

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>

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">
 

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"

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"

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

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"

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"

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"

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"

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"

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"

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"

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"