From be74f42f1923b5648c705d9d23047afac495f869 Mon Sep 17 00:00:00 2001
From: MisCusi2023 <mygithub323@gmail.com>
Date: Thu, 4 May 2023 06:39:59 -0700
Subject: [PATCH] UI tweaks

---
 .../Controls/V2raySettingsControl.xaml        | 30 +++++++++----------
 .../Controls/XraySettingsControl.xaml         |  2 +-
 ProxySuper.WPF/MainWindow.xaml                |  2 +-
 ProxySuper.WPF/Properties/AssemblyInfo.cs     |  4 +--
 ProxySuper.WPF/Resources/Languages/en.xaml    |  1 +
 ProxySuper.WPF/Resources/Languages/fa_IR.xaml | 11 +++----
 ProxySuper.WPF/Resources/Languages/tw_cn.xaml |  1 +
 ProxySuper.WPF/Resources/Languages/zh_cn.xaml |  1 +
 8 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/ProxySuper.WPF/Controls/V2raySettingsControl.xaml b/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
index 3043116..2ef43b9 100644
--- a/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
+++ b/ProxySuper.WPF/Controls/V2raySettingsControl.xaml
@@ -116,29 +116,28 @@
                     <TextBox Text="{Binding Path=Domain}" Width="200"  />
                 </StackPanel>
 
-                <!--Mask Domain-->
-                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
-                    <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
-                    <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
-                </StackPanel>
-
                 <!--UUID-->
                 <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
                     <Label Content="{DynamicResource XrayUUID}" Width="120" />
-
                     <TextBox Text="{Binding Path=UUID}" Width="200" />
-
                     <Button Margin="5,0,0,0"
                             Padding="12,3"
                             Command="{Binding Path=RandomUuid}"
                             Content="{DynamicResource Random}" />
                 </StackPanel>
+
+                <!--v2ray prot-->
+                <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                    <Label Content="{DynamicResource V2rayPort}"  Width="120"  />
+                    <TextBox Text="{Binding Path=Port}" Width="120"  />
+                    <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
+                </StackPanel>
                 <!--#endregion-->
 
                 <!--more params-->
                 <Expander ExpandDirection="Down" Margin="0,10,0,0">
                     <Expander.Header>
-                        <TextBlock Text="更多参数" FontWeight="Bold" />
+                        <TextBlock Text="{DynamicResource MoreParameters}" FontWeight="Bold" />
                     </Expander.Header>
 
                     <Expander.Content>
@@ -153,6 +152,12 @@
                               VerticalAlignment="Center" />
                             </StackPanel>
                             <!--#endregion-->
+                            
+                            <!--Mask Domain-->
+                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
+                                <Label Content="{DynamicResource XrayMarkDomain}" Width="120"  />
+                                <TextBox Text="{Binding Path=MaskDomain}" Width="200"  />
+                            </StackPanel>
 
                             <!--#region VLESS WebSocket Settings -->
                             <!--WebSocket Path-->
@@ -437,13 +442,6 @@
                                 <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
                                 <TextBox Text="{Binding Path=TrojanPassword}" Width="200" />
                             </StackPanel>
-
-                            <!--v2ray prot-->
-                            <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
-                                <Label Content="{DynamicResource V2rayPort}" Foreground="Gray" Width="120"  />
-                                <TextBox Text="{Binding Path=Port}" Width="120"  />
-                                <Label Content="{DynamicResource XrayPortDefault}"  Foreground="Red" />
-                            </StackPanel>
                             <!--#endregion-->
 
                             <!--#region Multiple Users Settings -->
diff --git a/ProxySuper.WPF/Controls/XraySettingsControl.xaml b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
index cabed7c..666f892 100644
--- a/ProxySuper.WPF/Controls/XraySettingsControl.xaml
+++ b/ProxySuper.WPF/Controls/XraySettingsControl.xaml
@@ -145,7 +145,7 @@
                 <!--more params-->
                 <Expander ExpandDirection="Down" Margin="0,10,0,0">
                     <Expander.Header>
-                        <TextBlock Text="更多参数" FontWeight="Bold" />
+                        <TextBlock Text="{DynamicResource MoreParameters}" FontWeight="Bold" />
                     </Expander.Header>
 
                     <Expander.Content>
diff --git a/ProxySuper.WPF/MainWindow.xaml b/ProxySuper.WPF/MainWindow.xaml
index 236ff23..a5fe412 100644
--- a/ProxySuper.WPF/MainWindow.xaml
+++ b/ProxySuper.WPF/MainWindow.xaml
@@ -8,7 +8,7 @@
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
         Icon="/Resources/ProxySU.ico"
-        Title="ProxySU" Height="600" Width="1000">
+        Title="ProxySU v4.1.10" Height="600" Width="1000">
     <Grid>
         
     </Grid>
diff --git a/ProxySuper.WPF/Properties/AssemblyInfo.cs b/ProxySuper.WPF/Properties/AssemblyInfo.cs
index 69453d3..3616ea4 100644
--- a/ProxySuper.WPF/Properties/AssemblyInfo.cs
+++ b/ProxySuper.WPF/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.1.6.0")]
-[assembly: AssemblyFileVersion("4.1.6.0")]
+[assembly: AssemblyVersion("4.1.10.0")]
+[assembly: AssemblyFileVersion("4.1.10.0")]
diff --git a/ProxySuper.WPF/Resources/Languages/en.xaml b/ProxySuper.WPF/Resources/Languages/en.xaml
index 8849bf7..eeac2db 100644
--- a/ProxySuper.WPF/Resources/Languages/en.xaml
+++ b/ProxySuper.WPF/Resources/Languages/en.xaml
@@ -119,6 +119,7 @@
     <sys:String x:Key="V2rayPort">v2ray Port</sys:String>
     <sys:String x:Key="XrayPort">xray Port</sys:String>
     <sys:String x:Key="XrayPortDefault">default port is 443</sys:String>
+    <sys:String x:Key="MoreParameters">More Parameters</sys:String>
 
     <!--xray installer-->
     <sys:String x:Key="XrayInstallerInstall">Install</sys:String>
diff --git a/ProxySuper.WPF/Resources/Languages/fa_IR.xaml b/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
index e5cfc4d..6fe5aea 100644
--- a/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
+++ b/ProxySuper.WPF/Resources/Languages/fa_IR.xaml
@@ -91,8 +91,8 @@
     <sys:String x:Key="XrayUUID">UUID</sys:String>
     <sys:String x:Key="Flow">Flow</sys:String>
     <sys:String x:Key="UTLS">uTLS</sys:String>
-    <sys:String x:Key="MultiUser">Multi User</sys:String>
-    <sys:String x:Key="MultiUserHelp">Multi Id split with ","</sys:String>
+    <sys:String x:Key="MultiUser">چند کاربره</sys:String>
+    <sys:String x:Key="MultiUserHelp">چند شناسه تقسیم با ","</sys:String>
     <sys:String x:Key="VlessWsPath">VLESS WS Path</sys:String>
     <sys:String x:Key="VlessKcpSeed">VLESS KCP Seed</sys:String>
     <sys:String x:Key="VlessKcpType">VLESS KCP Type</sys:String>
@@ -116,9 +116,10 @@
     <sys:String x:Key="SSPort">SS Port</sys:String>
     <sys:String x:Key="TrojanPassword">Trojan Pwd</sys:String>
     <sys:String x:Key="TrojanPort">پورت تروجان</sys:String>
-    <sys:String x:Key="V2rayPort">v2ray Port</sys:String>
-    <sys:String x:Key="XrayPort">xray Port</sys:String>
-    <sys:String x:Key="XrayPortDefault">default port is 443</sys:String>
+    <sys:String x:Key="V2rayPort">v2ray بندر</sys:String>
+    <sys:String x:Key="XrayPort">xray بندر</sys:String>
+    <sys:String x:Key="XrayPortDefault">پورت پیش فرض 443 است</sys:String>
+    <sys:String x:Key="MoreParameters">پارامترهای بیشتر</sys:String>
 
     <!--xray installer-->
     <sys:String x:Key="XrayInstallerInstall">نصب</sys:String>
diff --git a/ProxySuper.WPF/Resources/Languages/tw_cn.xaml b/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
index 87f47f2..b734e33 100644
--- a/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
+++ b/ProxySuper.WPF/Resources/Languages/tw_cn.xaml
@@ -120,6 +120,7 @@
     <sys:String x:Key="V2rayPort">V2ray端口</sys:String>
     <sys:String x:Key="XrayPort">XRAY端口</sys:String>
     <sys:String x:Key="XrayPortDefault">默認端口443，不建議修改</sys:String>
+    <sys:String x:Key="MoreParameters">更多參數</sys:String>
 
     <!--xray installer-->
     <sys:String x:Key="XrayInstallerInstall">一鍵安裝</sys:String>
diff --git a/ProxySuper.WPF/Resources/Languages/zh_cn.xaml b/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
index 35f1af7..56d1fac 100644
--- a/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
+++ b/ProxySuper.WPF/Resources/Languages/zh_cn.xaml
@@ -121,6 +121,7 @@
     <sys:String x:Key="V2rayPort">V2ray端口</sys:String>
     <sys:String x:Key="XrayPort">XRAY端口</sys:String>
     <sys:String x:Key="XrayPortDefault">默认端口443，不建议修改</sys:String>
+    <sys:String x:Key="MoreParameters">更多参数</sys:String>
 
     <!--xray installer-->
     <sys:String x:Key="XrayInstallerInstall">一键安装</sys:String>