v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.12.7</Version>
+        <Version>7.12.6</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1979,7 +1979,7 @@ public class ConfigHandler
             items = await AppHandler.Instance.RoutingItems();
         }
 
-        if (!blImportAdvancedRules && items.Count > 0)
+        if (!blImportAdvancedRules && items.Where(t => t.Remarks.StartsWith(ver)).ToList().Count > 0)
         {
             return 0;
         }

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -34,7 +34,7 @@
                 IsCancel="True" />
         </StackPanel>
 
-        <TabControl HorizontalContentAlignment="Stretch">
+        <TabControl HorizontalContentAlignment="Left">
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
                 <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
@@ -90,18 +90,16 @@
                         </StackPanel>
                     </WrapPanel>
 
-                    <HeaderedContentControl
+                    <Grid Margin="{StaticResource Margin4}">
-                        Margin="{StaticResource Margin4}"
-                        BorderBrush="Gray"
-                        BorderThickness="1"
-                        Header="HTTP/SOCKS">
                         <TextBox
-                            Name="txtnormalDNS"
+                            x:Name="txtnormalDNS"
+                            Margin="{StaticResource Margin4}"
                             VerticalAlignment="Stretch"
+                            BorderThickness="1"
                             Classes="TextArea"
-                            MinLines="10"
+                            TextWrapping="Wrap"
-                            TextWrapping="Wrap" />
+                            Watermark="HTTP/SOCKS" />
-                    </HeaderedContentControl>
+                    </Grid>
                 </DockPanel>
             </TabItem>
 
@@ -146,34 +144,31 @@
 
                     <Grid Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
 
-                        <HeaderedContentControl
-                            Grid.Column="0"
-                            BorderBrush="Gray"
-                            BorderThickness="1"
-                            Header="HTTP/SOCKS">
                         <TextBox
-                                Name="txtnormalDNS2"
+                            x:Name="txtnormalDNS2"
+                            Grid.Column="0"
+                            Width="400"
+                            HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
+                            BorderThickness="1"
                             Classes="TextArea"
-                                MinLines="10"
+                            Margin="{StaticResource Margin4}"
-                                TextWrapping="Wrap" />
+                            TextWrapping="Wrap"
-                        </HeaderedContentControl>
+                            Watermark="HTTP/SOCKS" />
 
                         <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
 
-                        <HeaderedContentControl
-                            Grid.Column="2"
-                            BorderBrush="Gray"
-                            BorderThickness="1"
-                            Header="{x:Static resx:ResUI.TbSettingsTunMode}">
                         <TextBox
-                                Name="txttunDNS2"
+                            x:Name="txttunDNS2"
+                            Grid.Column="2"
+                            Width="400"
+                            HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
+                            BorderThickness="1"
                             Classes="TextArea"
-                                MinLines="10"
+                            Margin="{StaticResource Margin4}"
-                                TextWrapping="Wrap" />
+                            TextWrapping="Wrap"
-                        </HeaderedContentControl>
+                            Watermark="{x:Static resx:ResUI.TbSettingsTunMode}" />
-
                     </Grid>
                 </DockPanel>
             </TabItem>

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -24,11 +24,28 @@
                 <MenuItem x:Name="menuRoutingAdvancedAdd2" Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
                 <MenuItem x:Name="menuRoutingAdvancedImportRules2" Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
             </Menu>
+
+            <TextBlock VerticalAlignment="Center">
+                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
+                </HyperlinkButton>
+            </TextBlock>
+            <ComboBox x:Name="cmbdomainStrategy" Width="110" />
+            <Separator />
+            <TextBlock VerticalAlignment="Center" Text="{x:Static resx:ResUI.TbdomainMatcher}" />
+            <ComboBox x:Name="cmbdomainMatcher" Width="60" />
+            <Separator />
+            <TextBlock VerticalAlignment="Center">
+                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
+                </HyperlinkButton>
+            </TextBlock>
+            <ComboBox x:Name="cmbdomainStrategy4Singbox" Width="100" />
         </StackPanel>
 
         <StackPanel
-            Margin="{StaticResource Margin4}"
             HorizontalAlignment="Right"
+            Margin="{StaticResource Margin4}"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <StackPanel
@@ -52,62 +69,7 @@
                 IsCancel="True" />
         </StackPanel>
 
-        <Grid
+        <DockPanel>
-            Margin="{StaticResource Margin4}"
-            ColumnDefinitions="Auto,Auto"
-            DockPanel.Dock="Top"
-            RowDefinitions="Auto,Auto,Auto">
-
-            <TextBlock
-                Grid.Row="0"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center">
-                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy_Click">
-                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
-                </HyperlinkButton>
-            </TextBlock>
-            <ComboBox
-                x:Name="cmbdomainStrategy"
-                Grid.Row="0"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center" />
-
-            <TextBlock
-                Grid.Row="1"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center"
-                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox
-                x:Name="cmbdomainMatcher"
-                Grid.Row="1"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}" />
-
-            <TextBlock
-                Grid.Row="2"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center">
-                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
-                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
-                </HyperlinkButton>
-            </TextBlock>
-            <ComboBox
-                x:Name="cmbdomainStrategy4Singbox"
-                Grid.Row="2"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center" />
-        </Grid>
-
             <TabControl x:Name="tabAdvanced">
                 <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRoutingTabRuleList}">
                     <DataGrid
@@ -160,4 +122,5 @@
                 </TabItem>
             </TabControl>
         </DockPanel>
+    </DockPanel>
 </Window>

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -1,4 +1,4 @@
-<reactiveui:ReactiveWindow
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -29,25 +29,68 @@
                 VerticalAlignment="Center"
                 ClipToBounds="True"
                 Style="{StaticResource MaterialDesignToolBar}">
-                <Button x:Name="menuRoutingAdvancedAdd2">
+                <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
+                    <MenuItem x:Name="menuRoutingAdvanced" Padding="8,0">
+                        <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
                                     Margin="{StaticResource MarginRight8}"
                                     VerticalAlignment="Center"
-                            Kind="Plus" />
+                                    Kind="Routes" />
-                        <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
+                                <TextBlock Text="{x:Static resx:ResUI.menuRoutingAdvanced}" />
                             </StackPanel>
-                </Button>
+                        </MenuItem.Header>
+                        <MenuItem
+                            x:Name="menuRoutingAdvancedAdd2"
+                            Height="{StaticResource MenuItemHeight}"
+                            Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
+                        <MenuItem
+                            x:Name="menuRoutingAdvancedImportRules2"
+                            Height="{StaticResource MenuItemHeight}"
+                            Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
+                    </MenuItem>
+                </Menu>
                 <Separator />
-                <Button x:Name="menuRoutingAdvancedImportRules2">
+                <TextBlock
-                    <StackPanel Orientation="Horizontal">
+                    Margin="{StaticResource MarginLeft8}"
-                        <materialDesign:PackIcon
-                            Margin="{StaticResource MarginRight8}"
                     VerticalAlignment="Center"
-                            Kind="Import" />
+                    Style="{StaticResource ToolbarTextBlock}">
-                        <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
+                    <Hyperlink Click="linkdomainStrategy_Click">
-                    </StackPanel>
+                        <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
-                </Button>
+                        <materialDesign:PackIcon Kind="Link" />
+                    </Hyperlink>
+                </TextBlock>
+                <ComboBox
+                    x:Name="cmbdomainStrategy"
+                    Width="110"
+                    Margin="{StaticResource MarginLeft8}"
+                    Style="{StaticResource DefComboBox}" />
+                <Separator />
+                <TextBlock
+                    Margin="{StaticResource MarginLeft8}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbdomainMatcher}" />
+                <ComboBox
+                    x:Name="cmbdomainMatcher"
+                    Width="60"
+                    Margin="{StaticResource MarginLeft8}"
+                    Style="{StaticResource DefComboBox}" />
+                <Separator />
+                <TextBlock
+                    Margin="{StaticResource MarginLeft8}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}">
+                    <Hyperlink Click="linkdomainStrategy4Singbox_Click">
+                        <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
+                        <materialDesign:PackIcon Kind="Link" />
+                    </Hyperlink>
+                </TextBlock>
+                <ComboBox
+                    x:Name="cmbdomainStrategy4Singbox"
+                    Width="100"
+                    Margin="{StaticResource MarginLeft8}"
+                    Style="{StaticResource DefComboBox}" />
             </ToolBar>
         </ToolBarTray>
 
@@ -79,71 +122,7 @@
                 Style="{StaticResource DefButton}" />
         </StackPanel>
 
-        <Grid Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
+        <DockPanel>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock
-                Grid.Row="0"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}">
-                <Hyperlink Click="linkdomainStrategy_Click">
-                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
-                    <materialDesign:PackIcon Kind="Link" />
-                </Hyperlink>
-            </TextBlock>
-            <ComboBox
-                x:Name="cmbdomainStrategy"
-                Grid.Row="0"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}"
-                Style="{StaticResource DefComboBox}" />
-
-            <TextBlock
-                Grid.Row="1"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}"
-                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox
-                x:Name="cmbdomainMatcher"
-                Grid.Row="1"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}"
-                Style="{StaticResource DefComboBox}" />
-
-            <TextBlock
-                Grid.Row="2"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}">
-                <Hyperlink Click="linkdomainStrategy4Singbox_Click">
-                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
-                    <materialDesign:PackIcon Kind="Link" />
-                </Hyperlink>
-            </TextBlock>
-            <ComboBox
-                x:Name="cmbdomainStrategy4Singbox"
-                Grid.Row="2"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}"
-                Style="{StaticResource DefComboBox}" />
-        </Grid>
-
             <TabControl x:Name="tabAdvanced">
                 <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRoutingTabRuleList}">
                     <DataGrid
@@ -220,4 +199,5 @@
                 </TabItem>
             </TabControl>
         </DockPanel>
+    </DockPanel>
 </reactiveui:ReactiveWindow>