mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2025-04-19 17:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Miscellaneous modifications, interface optimization

Browse source
This commit is contained in:
MisCusi2023 2025-04-17 20:06:29 -07:00
parent 201d3da3a5
commit cdb8a0b1be
18 changed files with 357 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
FodyWeavers.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<Costura />
</Weavers>

5
ProxySU.sln
View file

@ -9,6 +9,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProxySuper.WPF", "ProxySupe
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProxySuper.Core", "ProxySuper.Core\ProxySuper.Core.csproj", "{15779EE6-D8CA-44BF-BFE2-941E155EEF3F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{327FE75A-7D23-4F0E-80E2-7D10C7603969}"
ProjectSection(SolutionItems) = preProject
FodyWeavers.xml = FodyWeavers.xml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU

17
ProxySuper.Core/Converters/ProxyTypeConverter.cs
View file

@ -1,5 +1,7 @@
using System;
using System.Globalization;
using System.Linq;
using System.Windows;
using System.Windows.Data;
namespace ProxySuper.Core.Converters
@ -26,4 +28,19 @@ namespace ProxySuper.Core.Converters
return parameter;
}
}
public class BooleanOrConverter : IMultiValueConverter
{
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{
return values.OfType<bool>().Any(v => v);
}
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

45
ProxySuper.Core/Converters/VisibleConverter.cs
View file

@ -9,22 +9,47 @@ namespace ProxySuper.Core.Converters
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
return value.Equals(true) ? Visibility.Visible : Visibility.Collapsed;
bool isMatch = (value != null && value.Equals(parameter));
// 如果匹配则显示，否则隐藏（Collapsed）
return isMatch ? Visibility.Visible : Visibility.Hidden;//Collapsed;
//return value.Equals(true) ? Visibility.Visible : Visibility.Hidden;//Collapsed;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value == null)
{
return false;
}
throw new NotImplementedException();
//if (value == null)
//{
// return false;
//}
if (value.Equals(Visibility.Visible))
{
return true;
}
//if (value.Equals(Visibility.Visible))
//{
// return true;
//}
return false;
//return false;
}
}
public class BooleanOrToVisibilityConverter : IMultiValueConverter
{
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
{
// 如果任一条件为 true，则返回 Visible，否则返回 Hidden/Collapsed
foreach (var value in values)
{
if (value is bool boolVal && boolVal)
{
return Visibility.Visible;
}
}
return Visibility.Hidden;//Collapsed
}
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

43
ProxySuper.Core/Models/Hosts/Host.cs
View file

@ -20,12 +20,12 @@ namespace ProxySuper.Core.Models.Hosts
public string Address { get; set; }
public int Port { get; set; } = 22;
public string UserName { get; set; }
public string Password { get; set; }
public int Port { get; set; } = 22;
public string PrivateKeyPath { get; set; }
public string PrivateKeyPassPhrase { get; set; }
@ -34,24 +34,47 @@ namespace ProxySuper.Core.Models.Hosts
public LoginSecretType SecretType { get; set; }
public IMvxCommand UploadPrivateKeyCommand => new MvxCommand(UploadPrivateKey);
//public IMvxCommand UploadPrivateKeyCommand => new MvxCommand(UploadPrivateKey);
private readonly IMvxCommand _uploadPrivateKeyCommand;
public IMvxCommand UploadPrivateKeyCommand => _uploadPrivateKeyCommand ?? new MvxCommand(UploadPrivateKey);
private void UploadPrivateKey()
{
var fileDialog = new OpenFileDialog();
var fileDialog = new OpenFileDialog()
{
Filter = "Private Key (*.pem;*.key)|*.pem;*.key|All File (*.*)|*.*",
Title = "Select the private key file"
};
fileDialog.FileOk += OnFileOk;
fileDialog.ShowDialog();
}
private void OnFileOk(object sender, CancelEventArgs e)
private async void OnFileOk(object sender, CancelEventArgs e)
{
var file = sender as OpenFileDialog;
PrivateKeyPath = file.FileName;
Task.Delay(300).ContinueWith((t) =>
if (file != null)
{
MessageBox.Show("上传成功", "提示");
});
PrivateKeyPath = file.FileName;
//Task.Delay(300).ContinueWith((t) =>
//{
// MessageBox.Show("OK:" + PrivateKeyPath, "Tips");
//});
await Task.Delay(300);
MessageBox.Show("OK:" + PrivateKeyPath, "Tips");
}
else
{
//Task.Delay(300).ContinueWith((t) =>
//{
// MessageBox.Show("Error:Unable to get file!", "Tips");
//});
await Task.Delay(300);
MessageBox.Show("Error:Unable to get file!", "Tips");
}
}
}
}

3
ProxySuper.Core/Services/ServiceBase.cs
View file

@ -829,7 +829,8 @@ namespace ProxySuper.Core.Services
proxyType: _host.Proxy.Type,
proxyHost: _host.Proxy.Address,
proxyPort: _host.Proxy.Port,
proxyUsername: _host.Proxy.UserName, proxyPassword: _host.Proxy.Password,
proxyUsername: _host.Proxy.UserName,
proxyPassword: _host.Proxy.Password,
authenticationMethods: authMethods.ToArray());
}
catch (Exception ex)

231
ProxySuper.WPF/Controls/HostControl.xaml
View file

@ -13,6 +13,10 @@
<UserControl.Resources>
<convert:LoginSecretTypeConverter x:Key="SecretTypeConverter" />
<convert:ProxyTypeConverter x:Key="ProxyTypeConverter" />
<convert:BooleanOrConverter x:Key="BooleanOrConverter" />
<convert:BooleanOrToVisibilityConverter x:Key="BooleanOrToVisibilityConverter" />
<convert:VisibleConverter x:Key="VisibleConverter" />
</UserControl.Resources>
<Grid>
@ -95,7 +99,13 @@
}" />
</StackPanel>
<Label Content="{DynamicResource HostUploadSecretKey}" Grid.Row="6" Grid.Column="0" />
<Label Content="{DynamicResource HostUploadSecretKey}"
Grid.Row="6" Grid.Column="0"
Visibility="{
Binding Host.SecretType,
Converter={StaticResource VisibleConverter},
ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
}"/>
<Button Height="24"
Width="100"
HorizontalAlignment="Left"
@ -106,9 +116,20 @@
Converter={StaticResource SecretTypeConverter},
ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
}"
Visibility="{
Binding Host.SecretType,
Converter={StaticResource VisibleConverter},
ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
}"
Content="{DynamicResource HostUploadSecretKey}" />
<Label Content="{DynamicResource HostSertTypePrivateKeyPassPhrase}" Grid.Row="7" Grid.Column="0" />
<Label Content="{DynamicResource HostSertTypePrivateKeyPassPhrase}"
Grid.Row="7" Grid.Column="0"
Visibility="{
Binding Host.SecretType,
Converter={StaticResource VisibleConverter},
ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
}"/>
<TextBox Grid.Row="7" Grid.Column="1"
Width="170"
Text="{Binding Host.PrivateKeyPassPhrase}"
@ -117,7 +138,32 @@
Converter={StaticResource SecretTypeConverter},
ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
}"
VerticalContentAlignment="Center" />
Visibility="{
Binding Host.SecretType,
Converter={StaticResource VisibleConverter},
ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
}"
VerticalContentAlignment="Center" Height="26" >
<TextBox.Resources>
<VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
<VisualBrush.Visual>
<TextBlock FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
</VisualBrush.Visual>
</VisualBrush>
</TextBox.Resources>
<TextBox.Style>
<Style TargetType="TextBox">
<Style.Triggers>
<Trigger Property="Text" Value="{x:Null}">
<Setter Property="Background" Value="{StaticResource HelpBrush}"/>
</Trigger>
<Trigger Property="Text" Value="">
<Setter Property="Background" Value="{StaticResource HelpBrush}"/>
</Trigger>
</Style.Triggers>
</Style>
</TextBox.Style>
</TextBox>
</Grid>
</GroupBox>
@ -144,13 +190,6 @@
Converter={StaticResource ProxyTypeConverter},
ConverterParameter={x:Static ssh:ProxyTypes.None}
}"/>
<RadioButton Content="{DynamicResource ProxyTypeHttp}"
Margin="5,0"
IsChecked="{
Binding Host.Proxy.Type,
Converter={StaticResource ProxyTypeConverter},
ConverterParameter={x:Static ssh:ProxyTypes.Http}
}"/>
<RadioButton Content="{DynamicResource ProxyTypeSocks5}"
Margin="5,0"
IsChecked="{
@ -158,19 +197,175 @@
Converter={StaticResource ProxyTypeConverter},
ConverterParameter={x:Static ssh:ProxyTypes.Socks5}
}"/>
<RadioButton Content="{DynamicResource ProxyTypeHttp}"
Margin="5,0"
IsChecked="{
Binding Host.Proxy.Type,
Converter={StaticResource ProxyTypeConverter},
ConverterParameter={x:Static ssh:ProxyTypes.Http}
}"/>
</StackPanel>
<Label Content="{DynamicResource ProxyAddress}" Grid.Row="1" Grid.Column="0" />
<TextBox Text="{Binding Host.Proxy.Address}" Grid.Row="1" Grid.Column="1" />
<Label Content="{DynamicResource ProxyAddress}" Grid.Row="1" Grid.Column="0" >
<Label.Visibility>
<MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
</MultiBinding>
</Label.Visibility>
</Label>
<TextBox Text="{Binding Host.Proxy.Address}"
Grid.Row="1"
Grid.Column="1" >
<!-- IsEnabled="{
Binding Host.Proxy.Type,
Converter={StaticResource ProxyTypeConverter},
ConverterParameter={x:Static ssh:ProxyTypes.Socks5}
}" -->
<TextBox.IsEnabled>
<MultiBinding Converter="{StaticResource BooleanOrConverter}">
<Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
<Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
</MultiBinding>
</TextBox.IsEnabled>
<TextBox.Visibility>
<MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
</MultiBinding>
</TextBox.Visibility>
</TextBox>
<Label Content="{DynamicResource ProxyUserName}" Grid.Row="2" Grid.Column="0" />
<TextBox Text="{Binding Host.Proxy.UserName}" Grid.Row="2" Grid.Column="1" />
<Label Content="{DynamicResource HostPort}" Grid.Row="2" Grid.Column="0" >
<Label.Visibility>
<MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
</MultiBinding>
</Label.Visibility>
</Label>
<TextBox Text="{Binding Host.Proxy.Port}" Grid.Row="2" Grid.Column="1" >
<TextBox.IsEnabled>
<MultiBinding Converter="{StaticResource BooleanOrConverter}">
<Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
<Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
</MultiBinding>
</TextBox.IsEnabled>
<TextBox.Visibility>
<MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
</MultiBinding>
</TextBox.Visibility>
</TextBox>
<Label Content="{DynamicResource HostPort}" Grid.Row="3" Grid.Column="0" />
<TextBox Text="{Binding Host.Proxy.Port}" Grid.Row="3" Grid.Column="1" />
<Label Content="{DynamicResource ProxyUserName}" Grid.Row="3" Grid.Column="0" >
<Label.Visibility>
<MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
</MultiBinding>
</Label.Visibility>
</Label>
<TextBox Text="{Binding Host.Proxy.UserName}" Grid.Row="3" Grid.Column="1" Height="26" >
<TextBox.IsEnabled>
<MultiBinding Converter="{StaticResource BooleanOrConverter}">
<Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
</MultiBinding>
</TextBox.IsEnabled>
<TextBox.Visibility>
<MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
</MultiBinding>
</TextBox.Visibility>
<TextBox.Resources>
<VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
<VisualBrush.Visual>
<TextBlock FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
</VisualBrush.Visual>
</VisualBrush>
</TextBox.Resources>
<TextBox.Style>
<Style TargetType="TextBox">
<Style.Triggers>
<Trigger Property="Text" Value="{x:Null}">
<Setter Property="Background" Value="{StaticResource HelpBrush}"/>
</Trigger>
<Trigger Property="Text" Value="">
<Setter Property="Background" Value="{StaticResource HelpBrush}"/>
</Trigger>
</Style.Triggers>
</Style>
</TextBox.Style>
</TextBox>
<Label Content="{DynamicResource ProxyPassword}" Grid.Row="4" Grid.Column="0" />
<TextBox Text="{Binding Host.Proxy.Password}" Grid.Row="4" Grid.Column="1" />
<Label Content="{DynamicResource ProxyPassword}" Grid.Row="4" Grid.Column="0" >
<Label.Visibility>
<MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
</MultiBinding>
</Label.Visibility>
</Label>
<TextBox Text="{Binding Host.Proxy.Password}" Grid.Row="4" Grid.Column="1" Height="26" >
<TextBox.IsEnabled>
<MultiBinding Converter="{StaticResource BooleanOrConverter}">
<Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
</MultiBinding>
</TextBox.IsEnabled>
<TextBox.Visibility>
<MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
<Binding Path="Host.Proxy.Type"
Converter="{StaticResource ProxyTypeConverter}"
ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
</MultiBinding>
</TextBox.Visibility>
<TextBox.Resources>
<VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
<VisualBrush.Visual>
<TextBlock Height="auto" FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
</VisualBrush.Visual>
</VisualBrush>
</TextBox.Resources>
<TextBox.Style>
<Style TargetType="TextBox">
<Style.Triggers>
<Trigger Property="Text" Value="{x:Null}">
<Setter Property="Background" Value="{StaticResource HelpBrush}"/>
</Trigger>
<Trigger Property="Text" Value="">
<Setter Property="Background" Value="{StaticResource HelpBrush}"/>
</Trigger>
</Style.Triggers>
</Style>
</TextBox.Style>
</TextBox>
</Grid>
</GroupBox>

7
ProxySuper.WPF/Controls/XraySettingsControl.xaml
View file

@ -17,6 +17,13 @@
<StackPanel Orientation="Horizontal">
<!--#region VLESS -->
<WrapPanel Orientation="Vertical">
<!--XTLS+Reality-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VLESS_TCP_XTLS}">
<Label Content="{DynamicResource VlessXtlsRealityDesc}" FontSize="12" Foreground="LimeGreen" />
</CheckBox>
<!--XTLS-->
<CheckBox Width="150"
VerticalContentAlignment="Center"

2
ProxySuper.WPF/MainWindow.xaml
View file

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

4
ProxySuper.WPF/Properties/AssemblyInfo.cs
View file

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

11
ProxySuper.WPF/ProxySuper.WPF.csproj
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
　　<AllowedReferenceRelatedFileExtensions>
@ -18,7 +19,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
@ -32,6 +33,9 @@
<StartupObject>ProxySuper.WPF.App</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="Costura, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.6.0.0\lib\netstandard2.0\Costura.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
@ -712,5 +716,10 @@
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\System.Runtime.WindowsRuntime.4.7.0\build\net461\System.Runtime.WindowsRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Runtime.WindowsRuntime.4.7.0\build\net461\System.Runtime.WindowsRuntime.targets'))" />
<Error Condition="!Exists('..\packages\Fody.6.8.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.8.2\build\Fody.targets'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets'))" />
</Target>
<Import Project="..\packages\Fody.6.8.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.8.2\build\Fody.targets')" />
<Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" />
</Project>

5
ProxySuper.WPF/Resources/Languages/en.xaml
View file

@ -29,6 +29,7 @@
<sys:String x:Key="MainMenuHelperUseRoot">UseRoot</sys:String>
<sys:String x:Key="MainMenuHelperCertQuestion">CertQuestion</sys:String>
<sys:String x:Key="MainMenuHelperPrivateKey">PrivateKey</sys:String>
<sys:String x:Key="MainMenuHelperResourcesAndTutorials">Related Resources and Tutorials</sys:String>
<!--Main DataGrid-->
<sys:String x:Key="MainDataGridColumnTag">Tag</sys:String>
@ -51,11 +52,12 @@
<sys:String x:Key="HostPassword">Password</sys:String>
<sys:String x:Key="HostPort">Port</sys:String>
<sys:String x:Key="HostSecretType">SecretType</sys:String>
<sys:String x:Key="HostUploadSecretKey">UploadKey</sys:String>
<sys:String x:Key="HostUploadSecretKey">LoadingKey</sys:String>
<sys:String x:Key="HostSertTypePassword">Password</sys:String>
<sys:String x:Key="HostSertTypePrivateKey">PrivateKey</sys:String>
<sys:String x:Key="HostSertTypePrivateKeyPassPhrase">PKPassword</sys:String>
<sys:String x:Key="TextBoxContentTipsNoneBlank">None,Blank</sys:String>
<sys:String x:Key="ProxyGroupName">Proxy</sys:String>
<sys:String x:Key="ProxyAddress">Address</sys:String>
@ -72,6 +74,7 @@
<sys:String x:Key="EditorProxyParams" xml:space="preserve">Params</sys:String>
<!--Xray-->
<sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</sys:String>
<sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
<sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
<sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>

7
ProxySuper.WPF/Resources/Languages/fa_IR.xaml
View file

@ -29,6 +29,7 @@
<sys:String x:Key="MainMenuHelperUseRoot">اکانت روت را فعال کنید</sys:String>
<sys:String x:Key="MainMenuHelperCertQuestion">در مورد گواهینامه</sys:String>
<sys:String x:Key="MainMenuHelperPrivateKey">در مورد سوال</sys:String>
<sys:String x:Key="MainMenuHelperResourcesAndTutorials">منابع و آموزش های مرتبط</sys:String>
<!--Main DataGrid-->
<sys:String x:Key="MainDataGridColumnTag">برچسب</sys:String>
@ -51,11 +52,12 @@
<sys:String x:Key="HostPassword">رمز عبور</sys:String>
<sys:String x:Key="HostPort">پورت</sys:String>
<sys:String x:Key="HostSecretType">نوع تأیید ورود</sys:String>
<sys:String x:Key="HostUploadSecretKey">کلید آپلود</sys:String>
<sys:String x:Key="HostUploadSecretKey">بارگیری کلید خصوصی</sys:String>
<sys:String x:Key="HostSertTypePassword">رمز عبور</sys:String>
<sys:String x:Key="HostSertTypePrivateKey">کلید خصوصی</sys:String>
<sys:String x:Key="HostSertTypePrivateKeyPassPhrase">رمز عبور PK</sys:String>
<sys:String x:Key="TextBoxContentTipsNoneBlank">اگر هیچ کدام، آن را خالی بگذارید</sys:String>
<sys:String x:Key="ProxyGroupName">پروکسی</sys:String>
<sys:String x:Key="ProxyAddress">آدرس</sys:String>
@ -65,13 +67,14 @@
<sys:String x:Key="ProxyType">نوع</sys:String>
<sys:String x:Key="ProxyTypeNone">None</sys:String>
<sys:String x:Key="ProxyTypeHttp">Http</sys:String>
<sys:String x:Key="ProxyTypeSocks5">ساکس5</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">Params</sys:String>
<!--Xray-->
<sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS TCP XTLS REALITY</sys:String>
<sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
<sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
<sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>

9
ProxySuper.WPF/Resources/Languages/tw_cn.xaml
View file

@ -29,7 +29,7 @@
<sys:String x:Key="MainMenuHelperUseRoot">啓用Root賬戶</sys:String>
<sys:String x:Key="MainMenuHelperCertQuestion">證書問題</sys:String>
<sys:String x:Key="MainMenuHelperPrivateKey">私鑰問題</sys:String>
<sys:String x:Key="MainMenuHelperResourcesAndTutorials">相關資源與教程</sys:String>
<!--Main DataGrid-->
<sys:String x:Key="MainDataGridColumnTag">名稱</sys:String>
@ -52,11 +52,13 @@
<sys:String x:Key="HostPassword">密碼</sys:String>
<sys:String x:Key="HostPort">端口</sys:String>
<sys:String x:Key="HostSecretType">登録驗證</sys:String>
<sys:String x:Key="HostUploadSecretKey">上傳Key</sys:String>
<sys:String x:Key="HostUploadSecretKey">載入私鑰</sys:String>
<sys:String x:Key="HostSertTypePassword">密碼</sys:String>
<sys:String x:Key="HostSertTypePrivateKey">私鑰</sys:String>
<sys:String x:Key="HostSertTypePrivateKeyPassPhrase">私鑰密碼</sys:String>
<sys:String x:Key="TextBoxContentTipsNoneBlank">若無,則留空</sys:String>
<sys:String x:Key="ProxyGroupName">代理</sys:String>
<sys:String x:Key="ProxyAddress">IP/地址</sys:String>
<sys:String x:Key="ProxyPort">端口</sys:String>
@ -72,7 +74,8 @@
<sys:String x:Key="EditorProxyParams" xml:space="preserve">節點參數</sys:String>
<!--Xray-->
<sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS TCP XTLS</sys:String>
<sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</sys:String>
<sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
<sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
<sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
<sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>

9
ProxySuper.WPF/Resources/Languages/zh_cn.xaml
View file

@ -29,7 +29,7 @@
<sys:String x:Key="MainMenuHelperUseRoot">启用Root账户</sys:String>
<sys:String x:Key="MainMenuHelperCertQuestion">证书问题</sys:String>
<sys:String x:Key="MainMenuHelperPrivateKey">私钥问题</sys:String>
<sys:String x:Key="MainMenuHelperResourcesAndTutorials">相关资源与教程</sys:String>
<!--Main DataGrid-->
<sys:String x:Key="MainDataGridColumnTag">名称</sys:String>
@ -53,11 +53,13 @@
<sys:String x:Key="HostPassword">密码</sys:String>
<sys:String x:Key="HostPort">端口</sys:String>
<sys:String x:Key="HostSecretType">登陆验证</sys:String>
<sys:String x:Key="HostUploadSecretKey">上传Key</sys:String>
<sys:String x:Key="HostUploadSecretKey">载入私钥</sys:String>
<sys:String x:Key="HostSertTypePassword">密码</sys:String>
<sys:String x:Key="HostSertTypePrivateKey">私钥</sys:String>
<sys:String x:Key="HostSertTypePrivateKeyPassPhrase">私钥密码</sys:String>
<sys:String x:Key="TextBoxContentTipsNoneBlank">若无,则留空</sys:String>
<sys:String x:Key="ProxyGroupName">代理</sys:String>
<sys:String x:Key="ProxyAddress">IP/地址</sys:String>
<sys:String x:Key="ProxyPort">端口</sys:String>
@ -73,7 +75,8 @@
<sys:String x:Key="EditorProxyParams" xml:space="preserve">节点参数</sys:String>
<!--Xray-->
<sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS TCP XTLS</sys:String>
<sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</sys:String>
<sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
<sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
<sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
<sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>

1
ProxySuper.WPF/Views/HomeView.xaml
View file

@ -41,6 +41,7 @@
<MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperUseRoot}" Click="LaunchUseRootSite"></MenuItem>
<MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperCertQuestion}" Click="LaunchCertQuestion"></MenuItem>
<MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperPrivateKey}" Click="LaunchPrivateKeyQuestion"></MenuItem>
<MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperResourcesAndTutorials}" Click="LaunchResourcesAndTutorials"></MenuItem>
</MenuItem>
</Menu>

4
ProxySuper.WPF/Views/HomeView.xaml.cs
View file

@ -62,6 +62,10 @@ namespace ProxySuper.WPF.Views
System.Diagnostics.Process.Start("explorer.exe", "https://github.com/proxysu/ProxySU/wiki/PrivateKey%E8%BD%AC%E6%8D%A2");
}
private void LaunchResourcesAndTutorials(object sender, RoutedEventArgs e)
{
System.Diagnostics.Process.Start("explorer.exe", "https://github.com/proxysu/ProxySU/wiki/%E7%9B%B8%E5%85%B3%E8%B5%84%E6%BA%90%E4%B8%8E%E6%95%99%E7%A8%8B");
}
ResourceDictionary resource = new ResourceDictionary();
private void SetSimpleChinese(object sender, RoutedEventArgs e)

2
ProxySuper.WPF/packages.config
View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Costura.Fody" version="6.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Fody" version="6.8.2" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net472" />
<package id="MvvmCross" version="8.0.2" targetFramework="net472" />
<package id="MvvmCross.Platforms.Wpf" version="8.0.2" targetFramework="net472" />