Merge 8d61d6caaf into 5d6c5da9d9

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -3057,15 +3057,6 @@ namespace ServiceLib.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 Bootstrap DNS (sing-box) 的本地化字符串。
-        /// </summary>
-        public static string TbSBBootstrapDNS {
-            get {
-                return ResourceManager.GetString("TbSBBootstrapDNS", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 sing-box Direct Resolution Strategy 的本地化字符串。
         /// </summary>
@@ -3085,7 +3076,16 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Fallback DNS Resolution, Require IP 的本地化字符串。
+        ///   查找类似 sing-box DoH Resolver Server 的本地化字符串。
+        /// </summary>
+        public static string TbSBDoHResolverServer {
+            get {
+                return ResourceManager.GetString("TbSBDoHResolverServer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Fallback DNS Resolution, Suggest IP 的本地化字符串。
         /// </summary>
         public static string TbSBFallbackDNSResolve {
             get {

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1425,11 +1425,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>Resolve Outbound Domains</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+    <value>sing-box DoH Resolver Server</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Fallback DNS Resolution, Require IP</value>
+    <value>Fallback DNS Resolution, Suggest IP</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>xray Freedom Resolution Strategy</value>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1425,11 +1425,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>Resolve Outbound Domains</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+    <value>sing-box DoH Resolver Server</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Fallback DNS Resolution, Require IP</value>
+    <value>Fallback DNS Resolution, Suggest IP</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>xray Freedom Resolution Strategy</value>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1425,11 +1425,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>Resolve Outbound Domains</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+    <value>sing-box DoH Resolver Server</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Fallback DNS Resolution, Require IP</value>
+    <value>Fallback DNS Resolution, Suggest IP</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>xray Freedom Resolution Strategy</value>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1425,11 +1425,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>Разрешать домены для исходящих соединений</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+    <value>Сервер DoH-резолвера (sing-box)</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Fallback DNS Resolution, Require IP</value>
+    <value>Резервное DNS-разрешение (рекомендуется указывать IP)</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>Стратегия резолвинга Freedom (Xray)</value>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -1422,11 +1422,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>解析出站域名</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+    <value>sing-box DoH 解析服务器</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>回退 DNS 解析，需指定为 IP</value>
+    <value>兜底解析其他 DNS 域名，建议设为 ip</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>xray freedom 解析策略</value>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1422,11 +1422,11 @@
   <data name="TbSBOutboundDomainResolve" xml:space="preserve">
     <value>Resolve Outbound Domains</value>
   </data>
-  <data name="TbSBBootstrapDNS" xml:space="preserve">
+  <data name="TbSBDoHResolverServer" xml:space="preserve">
-    <value>Bootstrap DNS (sing-box)</value>
+    <value>sing-box DoH Resolver Server</value>
   </data>
   <data name="TbSBFallbackDNSResolve" xml:space="preserve">
-    <value>Fallback DNS Resolution, Require IP</value>
+    <value>Fallback DNS Resolution, Suggest IP</value>
   </data>
   <data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
     <value>xray Freedom Resolution Strategy</value>

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -1,5 +1,4 @@
 using System.Reactive;
-using System.Reactive.Linq;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 
@@ -33,8 +32,6 @@ public class DNSSettingViewModel : MyReactiveObject
     [Reactive] public bool RayCustomDNSEnableCompatible { get; set; }
     [Reactive] public bool SBCustomDNSEnableCompatible { get; set; }
 
-    [ObservableAsProperty] public bool IsSimpleDNSEnabled { get; }
-
     public ReactiveCommand<Unit, Unit> SaveCmd { get; }
     public ReactiveCommand<Unit, Unit> ImportDefConfig4V2rayCompatibleCmd { get; }
     public ReactiveCommand<Unit, Unit> ImportDefConfig4SingboxCompatibleCmd { get; }
@@ -58,10 +55,6 @@ public class DNSSettingViewModel : MyReactiveObject
             await Task.CompletedTask;
         });
 
-        this.WhenAnyValue(x => x.RayCustomDNSEnableCompatible, x => x.SBCustomDNSEnableCompatible)
-            .Select(x => !(x.Item1 && x.Item2))
-            .ToPropertyEx(this, x => x.IsSimpleDNSEnabled);
-
         _ = Init();
     }
 

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -37,7 +37,6 @@
             <TabItem Header="{x:Static resx:ResUI.ThBasicDNSSettings}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
                     <Grid
-                        x:Name="gridBasicDNSSettings"
                         Margin="{StaticResource Margin8}"
                         ColumnDefinitions="Auto,Auto,*"
                         RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
@@ -104,7 +103,7 @@
                             Grid.Column="0"
                             Margin="{StaticResource Margin4}"
                             VerticalAlignment="Center"
-                            Text="{x:Static resx:ResUI.TbSBBootstrapDNS}" />
+                            Text="{x:Static resx:ResUI.TbSBDoHResolverServer}" />
                         <ctrls:AutoCompleteBox
                             x:Name="cmbSBFinalResolverDNS"
                             Grid.Row="4"
@@ -188,7 +187,6 @@
             <TabItem Header="{x:Static resx:ResUI.ThAdvancedDNSSettings}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
                     <Grid
-                        x:Name="gridAdvancedDNSSettings"
                         Margin="{StaticResource Margin8}"
                         ColumnDefinitions="Auto,Auto,*"
                         RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,*">

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml.cs

@@ -1,5 +1,4 @@
 using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using ReactiveUI;
@@ -68,14 +67,16 @@ public partial class DNSSettingWindow : WindowBase<DNSSettingViewModel>
             this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCompatibleCmd, v => v.btnImportDefConfig4V2rayCompatible).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCompatibleCmd, v => v.btnImportDefConfig4SingboxCompatible).DisposeWith(disposables);
 
-            this.WhenAnyValue(x => x.ViewModel.IsSimpleDNSEnabled)
+            this.WhenAnyValue(
-                .Select(b => !b)
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
-                .BindTo(this.FindControl<TextBlock>("txtBasicDNSSettingsInvalid"), t => t.IsVisible);
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
-            this.WhenAnyValue(x => x.ViewModel.IsSimpleDNSEnabled)
+                    (ray, sb) => ray && sb
-                .Select(b => !b)
+                ).BindTo(this.FindControl<TextBlock>("txtBasicDNSSettingsInvalid"), t => t.IsVisible);
-                .BindTo(this.FindControl<TextBlock>("txtAdvancedDNSSettingsInvalid"), t => t.IsVisible);
+            this.WhenAnyValue(
-            this.Bind(ViewModel, vm => vm.IsSimpleDNSEnabled, v => v.gridBasicDNSSettings.IsEnabled).DisposeWith(disposables);
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
-            this.Bind(ViewModel, vm => vm.IsSimpleDNSEnabled, v => v.gridAdvancedDNSSettings.IsEnabled).DisposeWith(disposables);
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb
+                ).BindTo(this.FindControl<TextBlock>("txtAdvancedDNSSettingsInvalid"), t => t.IsVisible);
         });
     }
 

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

@@ -75,7 +75,6 @@
                     Width="{StaticResource IconButtonWidth}"
                     Height="{StaticResource IconButtonHeight}"
                     Margin="{StaticResource MarginLr8}"
-                    HorizontalAlignment="Left"
                     Theme="{DynamicResource BorderlessButton}">
                     <Button.Content>
                         <PathIcon Data="{StaticResource building_more}" Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
@@ -209,8 +208,8 @@
                     Grid.Row="9"
                     Grid.Column="2"
                     Margin="{StaticResource Margin4}"
-                    Click="BtnSelectPrevProfile_Click"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
-                    Content="{x:Static resx:ResUI.TbSelectProfile}" />
+                    Click="BtnSelectPrevProfile_Click" />
 
                 <TextBlock
                     Grid.Row="10"
@@ -229,8 +228,8 @@
                     Grid.Row="10"
                     Grid.Column="2"
                     Margin="{StaticResource Margin4}"
-                    Click="BtnSelectNextProfile_Click"
+                    Content="{x:Static resx:ResUI.TbSelectProfile}"
-                    Content="{x:Static resx:ResUI.TbSelectProfile}" />
+                    Click="BtnSelectNextProfile_Click" />
 
                 <TextBlock
                     Grid.Row="11"

v2rayN/v2rayN/Views/DNSSettingWindow.xaml

@@ -41,7 +41,7 @@
         <TabControl HorizontalContentAlignment="Left">
             <TabItem Header="{x:Static resx:ResUI.ThBasicDNSSettings}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
-                    <Grid x:Name="gridBasicDNSSettings" Margin="{StaticResource Margin8}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
@@ -131,7 +131,7 @@
                             Margin="{StaticResource Margin8}"
                             VerticalAlignment="Center"
                             Style="{StaticResource ToolbarTextBlock}"
-                            Text="{x:Static resx:ResUI.TbSBBootstrapDNS}" />
+                            Text="{x:Static resx:ResUI.TbSBDoHResolverServer}" />
                         <ComboBox
                             x:Name="cmbSBFinalResolverDNS"
                             Grid.Row="4"
@@ -222,7 +222,7 @@
             </TabItem>
             <TabItem Header="{x:Static resx:ResUI.ThAdvancedDNSSettings}">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">
-                    <Grid x:Name="gridAdvancedDNSSettings" Margin="{StaticResource Margin8}">
+                    <Grid Margin="{StaticResource Margin8}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -1,5 +1,4 @@
 using System.Reactive.Disposables;
-using System.Reactive.Linq;
 using System.Windows;
 using ReactiveUI;
 
@@ -66,16 +65,18 @@ public partial class DNSSettingWindow
             this.BindCommand(ViewModel, vm => vm.ImportDefConfig4V2rayCompatibleCmd, v => v.btnImportDefConfig4V2rayCompatible).DisposeWith(disposables);
             this.BindCommand(ViewModel, vm => vm.ImportDefConfig4SingboxCompatibleCmd, v => v.btnImportDefConfig4SingboxCompatible).DisposeWith(disposables);
 
-            this.WhenAnyValue(x => x.ViewModel.IsSimpleDNSEnabled)
+            this.WhenAnyValue(
-                .Select(b => b ? Visibility.Collapsed : Visibility.Visible)
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb ? Visibility.Visible : Visibility.Collapsed)
                 .BindTo(this, x => x.txtBasicDNSSettingsInvalid.Visibility)
                 .DisposeWith(disposables);
-            this.WhenAnyValue(x => x.ViewModel.IsSimpleDNSEnabled)
+            this.WhenAnyValue(
-                .Select(b => b ? Visibility.Collapsed : Visibility.Visible)
+                    x => x.ViewModel.RayCustomDNSEnableCompatible,
+                    x => x.ViewModel.SBCustomDNSEnableCompatible,
+                    (ray, sb) => ray && sb ? Visibility.Visible : Visibility.Collapsed)
                 .BindTo(this, x => x.txtAdvancedDNSSettingsInvalid.Visibility)
                 .DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.IsSimpleDNSEnabled, v => v.gridBasicDNSSettings.IsEnabled).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.IsSimpleDNSEnabled, v => v.gridAdvancedDNSSettings.IsEnabled).DisposeWith(disposables);
         });
         WindowsUtils.SetDarkBorder(this, AppManager.Instance.Config.UiItem.CurrentTheme);
     }

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -117,7 +117,7 @@
                 <materialDesign:PopupBox
                     Grid.Row="2"
                     Grid.Column="2"
-                    HorizontalAlignment="Left"
+                    HorizontalAlignment="Right"
                     StaysOpen="True"
                     Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
                     <StackPanel>