1
0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-21 20:56:08 +03:00

UI tweaks

This commit is contained in:
MisCusi2023 2023-05-04 06:39:59 -07:00
parent d9d9393c5f
commit be74f42f19
8 changed files with 27 additions and 25 deletions

View File

@ -116,29 +116,28 @@
<TextBox Text="{Binding Path=Domain}" Width="200" /> <TextBox Text="{Binding Path=Domain}" Width="200" />
</StackPanel> </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--> <!--UUID-->
<StackPanel Margin="0,15,0,0" Orientation="Horizontal"> <StackPanel Margin="0,15,0,0" Orientation="Horizontal">
<Label Content="{DynamicResource XrayUUID}" Width="120" /> <Label Content="{DynamicResource XrayUUID}" Width="120" />
<TextBox Text="{Binding Path=UUID}" Width="200" /> <TextBox Text="{Binding Path=UUID}" Width="200" />
<Button Margin="5,0,0,0" <Button Margin="5,0,0,0"
Padding="12,3" Padding="12,3"
Command="{Binding Path=RandomUuid}" Command="{Binding Path=RandomUuid}"
Content="{DynamicResource Random}" /> Content="{DynamicResource Random}" />
</StackPanel> </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--> <!--#endregion-->
<!--more params--> <!--more params-->
<Expander ExpandDirection="Down" Margin="0,10,0,0"> <Expander ExpandDirection="Down" Margin="0,10,0,0">
<Expander.Header> <Expander.Header>
<TextBlock Text="更多参数" FontWeight="Bold" /> <TextBlock Text="{DynamicResource MoreParameters}" FontWeight="Bold" />
</Expander.Header> </Expander.Header>
<Expander.Content> <Expander.Content>
@ -153,6 +152,12 @@
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</StackPanel> </StackPanel>
<!--#endregion--> <!--#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 --> <!--#region VLESS WebSocket Settings -->
<!--WebSocket Path--> <!--WebSocket Path-->
@ -437,13 +442,6 @@
<Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" /> <Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
<TextBox Text="{Binding Path=TrojanPassword}" Width="200" /> <TextBox Text="{Binding Path=TrojanPassword}" Width="200" />
</StackPanel> </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--> <!--#endregion-->
<!--#region Multiple Users Settings --> <!--#region Multiple Users Settings -->

View File

@ -145,7 +145,7 @@
<!--more params--> <!--more params-->
<Expander ExpandDirection="Down" Margin="0,10,0,0"> <Expander ExpandDirection="Down" Margin="0,10,0,0">
<Expander.Header> <Expander.Header>
<TextBlock Text="更多参数" FontWeight="Bold" /> <TextBlock Text="{DynamicResource MoreParameters}" FontWeight="Bold" />
</Expander.Header> </Expander.Header>
<Expander.Content> <Expander.Content>

View File

@ -8,7 +8,7 @@
mc:Ignorable="d" mc:Ignorable="d"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Icon="/Resources/ProxySU.ico" Icon="/Resources/ProxySU.ico"
Title="ProxySU" Height="600" Width="1000"> Title="ProxySU v4.1.10" Height="600" Width="1000">
<Grid> <Grid>
</Grid> </Grid>

View File

@ -49,5 +49,5 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.1.6.0")] [assembly: AssemblyVersion("4.1.10.0")]
[assembly: AssemblyFileVersion("4.1.6.0")] [assembly: AssemblyFileVersion("4.1.10.0")]

View File

@ -119,6 +119,7 @@
<sys:String x:Key="V2rayPort">v2ray Port</sys:String> <sys:String x:Key="V2rayPort">v2ray Port</sys:String>
<sys:String x:Key="XrayPort">xray 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="XrayPortDefault">default port is 443</sys:String>
<sys:String x:Key="MoreParameters">More Parameters</sys:String>
<!--xray installer--> <!--xray installer-->
<sys:String x:Key="XrayInstallerInstall">Install</sys:String> <sys:String x:Key="XrayInstallerInstall">Install</sys:String>

View File

@ -91,8 +91,8 @@
<sys:String x:Key="XrayUUID">UUID</sys:String> <sys:String x:Key="XrayUUID">UUID</sys:String>
<sys:String x:Key="Flow">Flow</sys:String> <sys:String x:Key="Flow">Flow</sys:String>
<sys:String x:Key="UTLS">uTLS</sys:String> <sys:String x:Key="UTLS">uTLS</sys:String>
<sys:String x:Key="MultiUser">Multi User</sys:String> <sys:String x:Key="MultiUser">چند کاربره</sys:String>
<sys:String x:Key="MultiUserHelp">Multi Id split with ","</sys:String> <sys:String x:Key="MultiUserHelp">چند شناسه تقسیم با ","</sys:String>
<sys:String x:Key="VlessWsPath">VLESS WS Path</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="VlessKcpSeed">VLESS KCP Seed</sys:String>
<sys:String x:Key="VlessKcpType">VLESS KCP Type</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="SSPort">SS Port</sys:String>
<sys:String x:Key="TrojanPassword">Trojan Pwd</sys:String> <sys:String x:Key="TrojanPassword">Trojan Pwd</sys:String>
<sys:String x:Key="TrojanPort">پورت تروجان</sys:String> <sys:String x:Key="TrojanPort">پورت تروجان</sys:String>
<sys:String x:Key="V2rayPort">v2ray Port</sys:String> <sys:String x:Key="V2rayPort">v2ray بندر</sys:String>
<sys:String x:Key="XrayPort">xray Port</sys:String> <sys:String x:Key="XrayPort">xray بندر</sys:String>
<sys:String x:Key="XrayPortDefault">default port is 443</sys:String> <sys:String x:Key="XrayPortDefault">پورت پیش فرض 443 است</sys:String>
<sys:String x:Key="MoreParameters">پارامترهای بیشتر</sys:String>
<!--xray installer--> <!--xray installer-->
<sys:String x:Key="XrayInstallerInstall">نصب</sys:String> <sys:String x:Key="XrayInstallerInstall">نصب</sys:String>

View File

@ -120,6 +120,7 @@
<sys:String x:Key="V2rayPort">V2ray端口</sys:String> <sys:String x:Key="V2rayPort">V2ray端口</sys:String>
<sys:String x:Key="XrayPort">XRAY端口</sys:String> <sys:String x:Key="XrayPort">XRAY端口</sys:String>
<sys:String x:Key="XrayPortDefault">默認端口443不建議修改</sys:String> <sys:String x:Key="XrayPortDefault">默認端口443不建議修改</sys:String>
<sys:String x:Key="MoreParameters">更多參數</sys:String>
<!--xray installer--> <!--xray installer-->
<sys:String x:Key="XrayInstallerInstall">一鍵安裝</sys:String> <sys:String x:Key="XrayInstallerInstall">一鍵安裝</sys:String>

View File

@ -121,6 +121,7 @@
<sys:String x:Key="V2rayPort">V2ray端口</sys:String> <sys:String x:Key="V2rayPort">V2ray端口</sys:String>
<sys:String x:Key="XrayPort">XRAY端口</sys:String> <sys:String x:Key="XrayPort">XRAY端口</sys:String>
<sys:String x:Key="XrayPortDefault">默认端口443不建议修改</sys:String> <sys:String x:Key="XrayPortDefault">默认端口443不建议修改</sys:String>
<sys:String x:Key="MoreParameters">更多参数</sys:String>
<!--xray installer--> <!--xray installer-->
<sys:String x:Key="XrayInstallerInstall">一键安装</sys:String> <sys:String x:Key="XrayInstallerInstall">一键安装</sys:String>