From c38a0bde65e1fa9f1db3ef2fc5843ab9adf11ad5 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 18 Jun 2023 09:42:45 +0800
Subject: [PATCH] Optimize interface

---
 v2rayN/v2rayN/Base/StringEx.cs                | 10 ++++
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml     | 51 +++++++++----------
 v2rayN/v2rayN/Views/MainWindow.xaml           |  4 +-
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |  6 ++-
 .../Views/RoutingRuleSettingWindow.xaml       | 10 ++--
 5 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/v2rayN/v2rayN/Base/StringEx.cs b/v2rayN/v2rayN/Base/StringEx.cs
index 98fed4d8..cf0f9106 100644
--- a/v2rayN/v2rayN/Base/StringEx.cs
+++ b/v2rayN/v2rayN/Base/StringEx.cs
@@ -70,5 +70,15 @@ namespace v2rayN.Base
                 return value;
             }
         }
+
+        public static string UpperFirstChar(this string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return string.Empty;
+            }
+
+            return char.ToUpper(value[0]) + value.Substring(1);
+        }
     }
 }
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index 4fe14cbb..4c6a829d 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -4,6 +4,7 @@
     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:v2rayN.Resx"
@@ -84,13 +85,15 @@
                             Cursor="Hand"
                             Style="{StaticResource DefButton}" />
                     </StackPanel>
+
                     <TextBox
                         x:Name="txtnormalDNS"
                         Margin="{StaticResource SettingItemMargin}"
                         VerticalAlignment="Stretch"
+                        materialDesign:HintAssist.Hint="Http/Socks"
                         AcceptsReturn="True"
                         BorderThickness="1"
-                        Style="{StaticResource DefTextBox}"
+                        Style="{StaticResource MaterialDesignOutlinedTextBox}"
                         TextWrapping="Wrap"
                         VerticalScrollBarVisibility="Auto" />
                 </DockPanel>
@@ -122,35 +125,29 @@
                             <ColumnDefinition Width="1*" />
                         </Grid.ColumnDefinitions>
 
-                        <GroupBox
+                        <TextBox
+                            x:Name="txtnormalDNS2"
                             Grid.Column="0"
-                            Header=""
-                            Style="{StaticResource MyGroupBox}">
-                            <TextBox
-                                x:Name="txtnormalDNS2"
-                                Margin="{StaticResource SettingItemMargin}"
-                                VerticalAlignment="Stretch"
-                                AcceptsReturn="True"
-                                BorderThickness="1"
-                                Style="{StaticResource DefTextBox}"
-                                TextWrapping="Wrap"
-                                VerticalScrollBarVisibility="Auto" />
-                        </GroupBox>
+                            VerticalAlignment="Stretch"
+                            materialDesign:HintAssist.Hint="Http/Socks"
+                            AcceptsReturn="True"
+                            BorderThickness="1"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            TextWrapping="Wrap"
+                            VerticalScrollBarVisibility="Auto" />
+
                         <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
-                        <GroupBox
+
+                        <TextBox
+                            x:Name="txttunDNS2"
                             Grid.Column="2"
-                            Header="{x:Static resx:ResUI.TbSettingsTunMode}"
-                            Style="{StaticResource MyGroupBox}">
-                            <TextBox
-                                x:Name="txttunDNS2"
-                                Margin="{StaticResource SettingItemMargin}"
-                                VerticalAlignment="Stretch"
-                                AcceptsReturn="True"
-                                BorderThickness="1"
-                                Style="{StaticResource DefTextBox}"
-                                TextWrapping="Wrap"
-                                VerticalScrollBarVisibility="Auto" />
-                        </GroupBox>
+                            VerticalAlignment="Stretch"
+                            materialDesign:HintAssist.Hint="{x:Static resx:ResUI.TbSettingsTunMode}"
+                            AcceptsReturn="True"
+                            BorderThickness="1"
+                            Style="{StaticResource MaterialDesignOutlinedTextBox}"
+                            TextWrapping="Wrap"
+                            VerticalScrollBarVisibility="Auto" />
                     </Grid>
                 </DockPanel>
             </TabItem>
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 412d55fb..ba961f66 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -209,7 +209,7 @@
                                 <MenuItem
                                     x:Name="menuCheckUpdateN"
                                     Height="{StaticResource MenuItemHeight}"
-                                    Header="v2rayN" />
+                                    Header="V2rayN" />
                                 <MenuItem
                                     x:Name="menuCheckUpdateV2flyCore"
                                     Height="{StaticResource MenuItemHeight}"
@@ -235,7 +235,7 @@
                                 <MenuItem
                                     x:Name="menuCheckUpdateSingBoxCore"
                                     Height="{StaticResource MenuItemHeight}"
-                                    Header="sing-box Core" />
+                                    Header="Sing-box Core" />
                                 <Separator Margin="-40,5" />
                                 <MenuItem
                                     x:Name="menuCheckUpdateGeo"
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index e38ff4dd..d98ab2d5 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -519,10 +519,14 @@ namespace v2rayN.Views
             var coreInfos = LazyConfig.Instance.GetCoreInfos();
             foreach (var it in coreInfos)
             {
+                if (it.coreType == ECoreType.v2fly)
+                {
+                    continue;
+                }
                 var item = new MenuItem()
                 {
                     Tag = it.coreUrl.Replace(@"/releases", ""),
-                    Header = string.Format(Resx.ResUI.menuWebsiteItem, it.coreType.ToString().Replace("_", " "))
+                    Header = string.Format(Resx.ResUI.menuWebsiteItem, it.coreType.ToString().Replace("_", " ")).UpperFirstChar()
                 };
                 item.Click += MenuItem_Click;
                 menuHelp.Items.Add(item);
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index 4ea61401..b10ae720 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -10,7 +10,7 @@
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
-    Width="900"
+    Width="960"
     Height="700"
     x:TypeArguments="vms:RoutingRuleSettingViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
@@ -280,7 +280,7 @@
                             Binding="{Binding outboundTag}"
                             Header="outboundTag" />
                         <DataGridTextColumn
-                            Width="100"
+                            Width="80"
                             Binding="{Binding port}"
                             Header="port" />
                         <DataGridTextColumn
@@ -288,15 +288,15 @@
                             Binding="{Binding protocols}"
                             Header="protocol" />
                         <DataGridTextColumn
-                            Width="120"
+                            Width="110"
                             Binding="{Binding inboundTags}"
                             Header="inboundTag" />
                         <DataGridTextColumn
-                            Width="150"
+                            Width="220"
                             Binding="{Binding domains}"
                             Header="domain" />
                         <DataGridTextColumn
-                            Width="150"
+                            Width="220"
                             Binding="{Binding ips}"
                             Header="ip" />
                         <DataGridTextColumn