add uTLS settings.

ProxySuper.Core/Models/Projects/XraySettings.cs

@@ -9,6 +9,10 @@ namespace ProxySuper.Core.Models.Projects
 {
     public class XraySettings : V2raySettings
     {
+        public static List<string> UTLSList = new List<string> { "", "chrome", "firefox", "safari", "randomized" };
+
+        public string UTLS { get; set; } = UTLSList[1];
+
         /// <summary>
         /// vless xtls shareLink
         /// </summary>

ProxySuper.Core/ViewModels/XrayEditorViewModel.cs

@@ -87,6 +87,19 @@ namespace ProxySuper.Core.ViewModels
             }
         }
 
+
+        public List<string> UTLSList { get => XraySettings.UTLSList; }
+
+        public string UTLS
+        {
+            get => Settings.UTLS;
+            set
+            {
+                Settings.UTLS = value;
+                RaisePropertyChanged(nameof(UTLS));
+            }
+        }
+
         public int VLESS_KCP_Port
         {
             get => Settings.VLESS_KCP_Port;

ProxySuper.WPF/Controls/XraySettingsControl.xaml

@@ -11,100 +11,101 @@
         <convert:VisibleConverter x:Key="VisibleConverter" />
     </UserControl.Resources>
 
+    <StackPanel Orientation="Vertical" Margin="10,0,20,20">
+        <!--节点类型-->
+        <GroupBox Padding="10" Header="{DynamicResource EditorProxyType}">
             <StackPanel Orientation="Horizontal">
-        <StackPanel Width="220">
+                <WrapPanel Orientation="Vertical">
                     <!--XTLS-->
-            <CheckBox Margin="0,10,0,0"
+                    <CheckBox Width="150"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VLESS_TCP_XTLS}">
-                <Label Content="{DynamicResource VlessXtlsDesc}"  FontSize="13" Foreground="LimeGreen" />
+                        <Label Content="{DynamicResource VlessXtlsDesc}"  FontSize="12" Foreground="LimeGreen" />
                     </CheckBox>
 
                     <!--TCP-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VLESS_TCP}">
-                <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="13" Foreground="LimeGreen" />
+                        <Label Content="{DynamicResource VlessTcpDesc}"  FontSize="12" Foreground="LimeGreen" />
                     </CheckBox>
 
                     <!--WebSocket-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VLESS_WS}">
-                <Label  Content="{DynamicResource VlessWsDesc}"  FontSize="13"  Foreground="LimeGreen" />
+                        <Label Content="{DynamicResource VlessWsDesc}"  FontSize="12"  Foreground="LimeGreen" />
                     </CheckBox>
 
                     <!--mKCP-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                       VerticalContentAlignment="Center"
                       Foreground="LimeGreen"
                       IsChecked="{Binding Path=Checked_VLESS_KCP}">
-                <Label Content="{DynamicResource VlessKcpDesc}"  FontSize="13" Foreground="LimeGreen" />
+                        <Label Content="{DynamicResource VlessKcpDesc}"  FontSize="12" Foreground="LimeGreen" />
                     </CheckBox>
 
                     <!--gRPC-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                       VerticalContentAlignment="Center"
                       Foreground="LimeGreen"
                       IsChecked="{Binding Path=Checked_VLESS_gRPC}">
-                <Label Content="{DynamicResource VlessRpcDesc}" FontSize="13" Foreground="LimeGreen" />
+                        <Label Content="{DynamicResource VlessRpcDesc}" FontSize="12" Foreground="LimeGreen" />
                     </CheckBox>
+                </WrapPanel>
 
-            <!--TCP-->
+                <WrapPanel Orientation="Vertical">
-            <!--<CheckBox Content="VMESS over TCP with TLS&#x0a;不推荐" 
-                    Margin="0,15,0,0"
-                    FontSize="13"
-                    Style="{StaticResource MahApps.Styles.CheckBox}"
-                    IsChecked="{Binding Path=Checked_VMESS_TCP}" />-->
-
                     <!--WebSocket-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VMESS_WS}">
-                <Label Content="{DynamicResource VmessWsDesc}"  FontSize="13" Foreground="Blue" />
+                        <Label Content="{DynamicResource VmessWsDesc}"  FontSize="12" Foreground="Blue" />
                     </CheckBox>
 
                     <!--mKCP-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_VMESS_KCP}">
-                <Label Foreground="Blue"  FontSize="13" Content="{DynamicResource VmessKcpDesc}" />
+                        <Label Foreground="Blue"  FontSize="12" Content="{DynamicResource VmessKcpDesc}" />
                     </CheckBox>
+                </WrapPanel>
 
+                <WrapPanel Orientation="Vertical">
                     <!--ss-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=CheckedShadowSocks}">
-                <Label Content="{DynamicResource SSDesc}" FontSize="13"  Foreground="Fuchsia" />
+                        <Label Content="{DynamicResource SSDesc}" FontSize="12"  Foreground="Fuchsia" />
                     </CheckBox>
 
                     <!--Trojan-->
-            <CheckBox Margin="0,15,0,0"
+                    <CheckBox Width="150"
                       Foreground="CadetBlue"
                       VerticalContentAlignment="Center"
                       IsChecked="{Binding Path=Checked_Trojan_TCP}">
-                <Label Content="{DynamicResource TrojanDesc}"  FontSize="13" Foreground="CadetBlue" />
+                        <Label Content="{DynamicResource TrojanDesc}"  FontSize="12" Foreground="CadetBlue" />
                     </CheckBox>
 
+                </WrapPanel>
             </StackPanel>
+        </GroupBox>
 
-        <!--************************** 参数 **************************-->
+        <!--参数设置-->
-
+        <GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
             <StackPanel>
-
                 <!--Domain-->
-            <StackPanel Margin="30,15,0,0"
+                <StackPanel Margin="0,15,0,0"
                     Orientation="Horizontal">
                     <Label Content="{DynamicResource XrayDomain}" Width="120" />
-                <TextBox Text="{Binding Path=Domain}" Width="200"  />
+                    <TextBox Text="{Binding Path=Domain}" Width="260"  />
                 </StackPanel>
 
                 <!--UUID-->
-            <StackPanel Margin="30,10,0,0" Orientation="Horizontal">
+                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
                     <Label Content="{DynamicResource XrayUUID}" Width="120" />
 
                     <TextBox Text="{Binding Path=UUID}"
-                            Width="200" />
+                            Width="260" />
 
                     <Button Margin="5,0,0,0"
                             Padding="12,3"
@@ -113,16 +114,29 @@
                 </StackPanel>
 
                 <!--xray prot-->
-            <StackPanel Margin="30,15,0,0" Orientation="Horizontal">
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
-                <Label Content="{DynamicResource XrayPort}" Foreground="Gray" Width="120"  />
+                    <Label Content="{DynamicResource XrayPort}" Width="120"  />
                     <TextBox Text="{Binding Path=Port}" Width="120"  />
                     <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
                 </StackPanel>
 
-            <Expander ExpandDirection="Down" Margin="30,10,0,0">
+                <!--xray utls-->
+                <StackPanel Margin="0,15,0,0"
+                            Orientation="Horizontal">
+                    <Label Content="uTLS" Width="120" VerticalAlignment="Bottom"/>
+                    <ComboBox Width="260" 
+                              VerticalAlignment="Bottom"
+                              ItemsSource="{Binding Path=UTLSList}"
+                              SelectedValue="{Binding UTLS,Mode=TwoWay}">
+                    </ComboBox>
+                </StackPanel>
+
+                <!--more params-->
+                <Expander ExpandDirection="Down" Margin="0,10,0,0">
                     <Expander.Header>
                         <TextBlock Text="更多参数" FontWeight="Bold" />
                     </Expander.Header>
+                    
                     <Expander.Content>
                         <StackPanel>
                             <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
@@ -136,7 +150,7 @@
                             <!--Mask Domain-->
                             <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
                                 <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
-                            <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
+                                <TextBox Text="{Binding Path=MaskDomain}" Width="260"  />
                             </StackPanel>
 
                             <!--WebSocket Path-->
@@ -147,7 +161,7 @@
                                             Converter={StaticResource VisibleConverter}
                                         }"> 
                                 <Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
-                            <TextBox Text="{Binding Path=VLESS_WS_Path}" Width="200" />
+                                <TextBox Text="{Binding Path=VLESS_WS_Path}" Width="260" />
                             </StackPanel>
 
                             <!--seed-->
@@ -158,7 +172,7 @@
                                             Converter={StaticResource VisibleConverter}
                                         }">
                                 <Label Content="{DynamicResource VlessKcpSeed}" Foreground="LimeGreen" Width="120" />
-                            <TextBox Text="{Binding Path=VLESS_KCP_Seed}" Width="200"  />
+                                <TextBox Text="{Binding Path=VLESS_KCP_Seed}" Width="260"  />
                             </StackPanel>
 
                             <!--kcp type-->
@@ -166,10 +180,10 @@
                                         Visibility="{
                                             Binding Path=Checked_VLESS_KCP,
                                             Converter={StaticResource VisibleConverter}
-                            }" Orientation="Horizontal">
+                                        }"
-
+                                        Orientation="Horizontal">
                                 <Label Content="{DynamicResource VlessKcpType}"  Foreground="LimeGreen" Width="120" />
-                            <ComboBox Width="200" 
+                                <ComboBox Width="260" 
                                 ItemsSource="{Binding Path=KcpTypes}"
                                 SelectedValue="{Binding VLESS_KCP_Type,Mode=TwoWay}">
                                 </ComboBox>
@@ -183,7 +197,7 @@
                                         }" 
                                         Orientation="Horizontal">
                                 <Label Content="{DynamicResource VlessKcpPort}" Width="120"  Foreground="LimeGreen" />
-                            <TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="200"  />
+                                <TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="260"  />
                             </StackPanel>
 
                             <!--gRPC Port-->
@@ -194,7 +208,7 @@
                                             Converter={StaticResource VisibleConverter}
                                         }"> 
                                 <Label Content="{DynamicResource VlessRPCPort}" Width="120"  Foreground="LimeGreen" />
-                            <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="200"  />
+                                <TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="260"  />
                             </StackPanel>
 
                             <StackPanel Margin="0,15,0,0" 
@@ -204,22 +218,9 @@
                                             Converter={StaticResource VisibleConverter}
                                         }"> 
                                 <Label Content="{DynamicResource VlessRPCName}" Width="120"  Foreground="LimeGreen" />
-                            <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="200"  />
+                                <TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="260"  />
                             </StackPanel>
 
-                        <!--Tcp Path
-            <StackPanel Margin="30,15,0,0" 
-                    Orientation="Horizontal"
-                    Visibility="{
-                        Binding Path=Checked_VMESS_TCP,
-                        Converter={StaticResource VisibleConverter}
-                    }">
-                <Label Content="VMESS WS路径" Foreground="Blue"  Width="120" />
-                <TextBox Text="{Binding Path=VMESS_TCP_Path}"
-                        VerticalAlignment="Bottom"
-                        Width="200" />
-            </StackPanel>-->
-
                             <!--WebSocket Path-->
                             <StackPanel Margin="0,15,0,0" 
                                         Orientation="Horizontal"
@@ -230,7 +231,7 @@
                                 <Label Content="{DynamicResource VmessWsPath}" Foreground="Blue"  Width="120" />
                                 <TextBox Text="{Binding Path=VMESS_WS_Path}"
                                         VerticalAlignment="Bottom"
-                        Width="200" />
+                                        Width="260" />
                             </StackPanel>
 
                             <!--seed-->
@@ -241,7 +242,7 @@
                                             Converter={StaticResource VisibleConverter}
                                         }">
                                 <Label Content="{DynamicResource VmessKcpSeed}"  Foreground="Blue" Width="120" />
-                            <TextBox Text="{Binding Path=VMESS_KCP_Seed}" Width="200" />
+                                <TextBox Text="{Binding Path=VMESS_KCP_Seed}" Width="260" />
                             </StackPanel>
 
                             <!--kcp type-->
@@ -252,7 +253,7 @@
                                             Converter={StaticResource VisibleConverter}
                                         }">
                                 <Label Content="{DynamicResource VmessKcpType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
-                            <ComboBox Width="200" 
+                                <ComboBox Width="260" 
                                             VerticalAlignment="Bottom"
                                             ItemsSource="{Binding Path=KcpTypes}"
                                             SelectedValue="{Binding VMESS_KCP_Type,Mode=TwoWay}">
@@ -267,7 +268,7 @@
                                             Converter={StaticResource VisibleConverter}
                                         }">
                                 <Label Content="{DynamicResource VmessKcpPort}"  Foreground="Blue" Width="120" />
-                            <TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="200" />
+                                <TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="260" />
                             </StackPanel>
 
                             <!--ss密码-->
@@ -278,8 +279,7 @@
                                             Converter={StaticResource VisibleConverter}
                                         }">
                                 <Label Content="{DynamicResource SSPassword}" Foreground="Fuchsia" Width="120" />
-                            <TextBox Text="{Binding Path=ShadowSocksPassword}"
+                                <TextBox Text="{Binding Path=ShadowSocksPassword}" Width="260"/>
-                        Width="200"/>
                             </StackPanel>
 
                             <!--ss加密方式-->
@@ -290,7 +290,7 @@
                                             Converter={StaticResource VisibleConverter}
                                         }">
                                 <Label Content="{DynamicResource SSMethods}" Foreground="Fuchsia" Width="120" />
-                            <ComboBox Width="200"
+                                <ComboBox Width="260"
                                 ItemsSource="{Binding ShadowSocksMethods}"
                                 SelectedValue="{Binding ShadowSocksMethod}">
                                 </ComboBox>
@@ -304,7 +304,7 @@
                                             Converter={StaticResource VisibleConverter}
                                         }">
                                 <Label Content="{DynamicResource SSPort}" Foreground="Fuchsia" Width="120" />
-                            <TextBox Text="{Binding Path=ShadowSocksPort}" Width="200"/>
+                                <TextBox Text="{Binding Path=ShadowSocksPort}" Width="260"/>
                             </StackPanel>
 
                             <!--Trojan密码-->
@@ -315,7 +315,7 @@
                                             Converter={StaticResource VisibleConverter}
                                         }">
                                 <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
-                            <TextBox Text="{Binding Path=TrojanPassword}" Width="200" />
+                                <TextBox Text="{Binding Path=TrojanPassword}" Width="260" />
                             </StackPanel>
 
                             <!--多用户-->
@@ -326,8 +326,9 @@
                                     <TextBox Text="{Binding Path=MultiUUID}"
                                              Height="60"
                                              TextWrapping="Wrap"
-                                    Width="200" />
+                                             Width="260" />
                                 </StackPanel>
+                                
                                 <StackPanel>
                                     <TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
                                 </StackPanel>
@@ -336,6 +337,6 @@
                     </Expander.Content>
                 </Expander>
             </StackPanel>
+        </GroupBox>
     </StackPanel>
-
 </UserControl>

ProxySuper.WPF/Resources/Languages/en.xaml

@@ -65,17 +65,20 @@
     <sys:String x:Key="ProxyTypeHttp">Http</sys:String>
     <sys:String x:Key="ProxyTypeSocks5">Socks5</sys:String>
     
+    <!--editor-->
+    <sys:String x:Key="EditorProxyType" xml:space="preserve">Proxy Type</sys:String>
+    <sys:String x:Key="EditorProxyParams" xml:space="preserve">Params</sys:String>
 
     <!--Xray-->
-    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS over TCP With XTLS&#x0a;</sys:String>
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
-    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS over TCP with TLS&#x0a;</sys:String>
+    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
-    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS over WS with TLS&#x0a;Support CDN</sys:String>
+    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
-    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC&#x0a;http2，multiplexing。</sys:String>
+    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
-    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP&#x0a;low delay，without Domain</sys:String>
+    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
-    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS over WS with TLS&#x0a;Support CDN</sys:String>
+    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
-    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP&#x0a;low delay，without Domian</sys:String>
+    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
-    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks&#x0a;Support UDP，without Domain</sys:String>
+    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
-    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan over TCP with TLS&#x0a;Trojan</sys:String>
+    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
 
     <sys:String x:Key="XrayDomain">Domain/IP</sys:String>
     <sys:String x:Key="XrayMarkDomain">Redir Url</sys:String>

ProxySuper.WPF/Resources/Languages/tw_cn.xaml

@@ -64,16 +64,20 @@
     <sys:String x:Key="ProxyTypeHttp">Http</sys:String>
     <sys:String x:Key="ProxyTypeSocks5">Socks5</sys:String>
 
+    <!--editor-->
+    <sys:String x:Key="EditorProxyType" xml:space="preserve">節點類型</sys:String>
+    <sys:String x:Key="EditorProxyParams" xml:space="preserve">節點參數</sys:String>
+
     <!--Xray-->
-    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS Over TCP With XTLS&#x0a;安全隱患，謹慎。</sys:String>
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS TCP XTLS</sys:String>
-    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS over TCP with TLS&#x0a;</sys:String>
+    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
-    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS over WS with TLS&#x0a;推薦，支持CDN。</sys:String>
+    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
-    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC&#x0a;基於http2，多路複用。</sys:String>
+    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
-    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP&#x0a;遊戲推薦，延遲低，免域名。</sys:String>
+    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
-    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS over WS with TLS&#x0a;推薦，支持CDN。</sys:String>
+    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
-    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP&#x0a;遊戲推薦，延遲低，免域名。</sys:String>
+    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
-    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks&#x0a;SS，支持udp，免域名。</sys:String>
+    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
-    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan over TCP with TLS&#x0a;Trojan。</sys:String>
+    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
 
 
     <sys:String x:Key="XrayDomain">域名/IP</sys:String>

ProxySuper.WPF/Resources/Languages/zh_cn.xaml

@@ -65,16 +65,20 @@
     <sys:String x:Key="ProxyTypeHttp">Http</sys:String>
     <sys:String x:Key="ProxyTypeSocks5">Socks5</sys:String>
 
+    <!--editor-->
+    <sys:String x:Key="EditorProxyType" xml:space="preserve">节点类型</sys:String>
+    <sys:String x:Key="EditorProxyParams" xml:space="preserve">节点参数</sys:String>
+
     <!--Xray-->
-    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS Over TCP With XTLS&#x0a;安全隐患，谨慎。</sys:String>
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS TCP XTLS</sys:String>
-    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS over TCP with TLS&#x0a;推荐，主流。</sys:String>
+    <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
-    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS over WS with TLS&#x0a;推荐，支持CDN。</sys:String>
+    <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
-    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC&#x0a;基于http2，多路复用。</sys:String>
+    <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
-    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP&#x0a;游戏推荐，延迟低，免域名。</sys:String>
+    <sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
-    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS over WS with TLS&#x0a;推荐，支持CDN。</sys:String>
+    <sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
-    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP&#x0a;游戏推荐，延迟低，免域名。</sys:String>
+    <sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
-    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks&#x0a;SS，支持udp，免域名。</sys:String>
+    <sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
-    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan over TCP with TLS&#x0a;Trojan。</sys:String>
+    <sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
 
 
     <sys:String x:Key="XrayDomain">域名/IP</sys:String>

ProxySuper.WPF/Views/Xray/XrayEditorView.xaml

@@ -11,7 +11,7 @@
         Icon="/Resources/ProxySU.ico"
         BorderThickness="0,1,0,0"
         BorderBrush="#EEE"
-        Title="Xray编辑配置" Height="610" Width="1015">
+        Title="Xray编辑配置" Height="640" Width="1015">
 
     <Grid>
         <Grid.ColumnDefinitions>
@@ -26,17 +26,16 @@
 
         <StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
 
-        <StackPanel Grid.Column="2">
+        <Grid Grid.Column="2">
-            <Grid>
             <Grid.RowDefinitions>
-                    <RowDefinition Height="500" />
+                <RowDefinition Height="*" />
-                    <RowDefinition Height="80" />
+                <RowDefinition Height="50" />
             </Grid.RowDefinitions>
 
             <ScrollViewer Name="scroll" 
                           Padding="10"  
-                              Height="500"
                           Grid.Row="0"
+                          Height="auto"
                           HorizontalScrollBarVisibility="Auto" 
                           VerticalScrollBarVisibility="Auto" >
                 <ctrl:XraySettingsControl />
@@ -45,7 +44,7 @@
             <Border Grid.Row="1"
                     BorderBrush="#eee"
                     BorderThickness="0,1,0,0">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Height="50">
                     <Button Content="{DynamicResource Save}" 
                             Command="{Binding SaveCommand}"
                             HorizontalAlignment="Right"
@@ -60,7 +59,7 @@
                             Margin="20,0,40,0" />
                 </StackPanel>
             </Border>
+
         </Grid>
-        </StackPanel>
     </Grid>
 </views:MvxWindow>