mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-21 20:56:08 +03:00
Code Issues Projects Releases Wiki Activity

add quic

Browse Source
This commit is contained in:
autumn 2022-11-23 22:06:09 +08:00
parent 4c0d3a0cf4
commit e86db631c5
43 changed files with 984 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ProxySuper.Core/Models/Projects/RayType.cs
View File

@ -10,6 +10,7 @@
VLESS_WS = 102,
VLESS_H2 = 103,
VLESS_KCP = 104,
VLESS_QUIC = 105,
VLESS_gRPC = 110,
// VMESS 201开头
@ -17,6 +18,7 @@
VMESS_WS = 202,
VMESS_H2 = 203,
VMESS_KCP = 204,
VMESS_QUIC = 205,
// Trojan 301开头
Trojan_TCP = 301,
@ -26,5 +28,5 @@
ShadowsocksAEAD = 401
}
}

19
ProxySuper.Core/Models/Projects/V2raySettings.cs
View File

@ -9,6 +9,15 @@ namespace ProxySuper.Core.Models.Projects
{
public partial class V2raySettings : IProjectSettings
{
public static List<string> DisguiseTypes = new List<string> {
"none",
"srtp",
"utp",
"wechat-video",
"dtls",
"wireguard",
};
public V2raySettings()
{
WithTLS = true;
@ -16,8 +25,11 @@ namespace ProxySuper.Core.Models.Projects
var guid = Guid.NewGuid().ToString();
Port = 443;
VLESS_KCP_Port = 2001;
VLESS_gRPC_Port = 2002;
VLESS_QUIC_Port = 2002;
VLESS_gRPC_Port = 2003;
VMESS_KCP_Port = 3001;
VMESS_QUIC_Port = 3002;
ShadowSocksPort = 4001;
UUID = guid;
@ -26,12 +38,17 @@ namespace ProxySuper.Core.Models.Projects
VLESS_WS_Path = "/" + Utils.RandomString(6);
VLESS_KCP_Type = "none";
VLESS_KCP_Seed = guid;
VLESS_QUIC_Type = "none";
VLESS_QUIC_Security = "none";
VLESS_QUIC_Type = "none";
VLESS_gRPC_ServiceName = "/" + Utils.RandomString(7);
VMESS_WS_Path = "/" + Utils.RandomString(8);
VMESS_TCP_Path = "/" + Utils.RandomString(9);
VMESS_KCP_Seed = guid;
VMESS_KCP_Type = "none";
VMESS_QUIC_Security = "none";
VMESS_QUIC_Type = "none";
TrojanPassword = guid;

3
ProxySuper.Core/Models/Projects/V2raySettings_SS.cs
View File

@ -19,6 +19,9 @@ namespace ProxySuper.Core.Models.Projects
/// </summary>
public int ShadowSocksPort { get; set; }
/// <summary>
/// share link
/// </summary>
public string ShadowSocksShareLink
{
get

34
ProxySuper.Core/Models/Projects/V2raySettings_VLESS.cs
View File

@ -1,4 +1,7 @@
using ProxySuper.Core.Services;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Documents;
namespace ProxySuper.Core.Models.Projects
{
@ -57,6 +60,37 @@ namespace ProxySuper.Core.Models.Projects
}
}
/// <summary>
/// vless quic security
/// </summary>
public string VLESS_QUIC_Security { get; set; }
/// <summary>
/// vless quic type
/// </summary>
public string VLESS_QUIC_Type { get; set; }
/// <summary>
/// vless quic port
/// </summary>
public int VLESS_QUIC_Port { get; set; }
/// <summary>
/// vless quic key
/// </summary>
public string VLESS_QUIC_Key { get; set; }
/// <summary>
/// vless quic ShareLink
/// </summary>
public string VLESS_QUIC_ShareLink
{
get
{
return ShareLink.Build(RayType.VLESS_QUIC, this);
}
}
/// <summary>
/// grpc port
/// </summary>

31
ProxySuper.Core/Models/Projects/V2raySettings_VMESS.cs
View File

@ -61,5 +61,36 @@ namespace ProxySuper.Core.Models.Projects
return ShareLink.Build(RayType.VMESS_KCP, this);
}
}
/// <summary>
/// vmess quic security
/// </summary>
public string VMESS_QUIC_Security { get; set; }
/// <summary>
/// vmess quic type
/// </summary>
public string VMESS_QUIC_Type { get; set; }
/// <summary>
/// vmess quic port
/// </summary>
public int VMESS_QUIC_Port { get; set; }
/// <summary>
/// vmess quic key
/// </summary>
public string VMESS_QUIC_Key { get; set; }
/// <summary>
/// vmess quic ShareLink
/// </summary>
public string VMESS_QUIC_ShareLink
{
get
{
return ShareLink.Build(RayType.VMESS_QUIC, this);
}
}
}
}

3
ProxySuper.Core/Models/Projects/XraySettings.cs
View File

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

5
ProxySuper.Core/Services/ShareLink.cs
View File

@ -222,9 +222,10 @@ namespace ProxySuper.Core.Services
}
// 4.4 TLS 相关段
if (xrayType == RayType.VLESS_TCP_XTLS)
if (settings is XraySettings)
{
parametersURL += "&flow=xtls-rprx-direct";
var xraySettings = settings as XraySettings;
parametersURL += $"&flow={xraySettings.Flow}";
}

6
ProxySuper.Core/Services/XrayConfigBuilder.cs
View File

@ -91,7 +91,7 @@ namespace ProxySuper.Core.Services
return caddyStr;
}
private static void SetClients(dynamic bound, List<string> uuidList, bool withXtls = false)
private static void SetClients(dynamic bound, List<string> uuidList, bool withXtls = false, string flow = "")
{
bound.settings.clients.Clear();
uuidList.ForEach(id =>
@ -103,7 +103,7 @@ namespace ProxySuper.Core.Services
}
else
{
obj = new { id = id, flow = "xtls-rprx-direct" };
obj = new { id = id, flow = flow };
}
bound.settings.clients.Add(JToken.FromObject(obj));
@ -126,7 +126,7 @@ namespace ProxySuper.Core.Services
dest = FullbackPort
}));
xrayConfig.inbounds.Add(baseBound);
SetClients(baseBound, uuidList, withXtls: true);
SetClients(baseBound, uuidList, withXtls: true, flow: parameters.Flow);
#region Fullbacks

189
ProxySuper.Core/ViewModels/V2rayEditorViewModel.cs
View File

@ -64,12 +64,34 @@ namespace ProxySuper.Core.ViewModels
}
}
public partial class V2rayEditorViewModel
{
public List<string> KcpTypes => V2raySettings.DisguiseTypes;
public List<string> QuicTypes => V2raySettings.DisguiseTypes;
/// <summary>
/// https://www.v2ray.com/chapter_02/transport/quic.html
/// </summary>
public List<string> QuicSecurities => new List<string> {
"none",
"aes-128-gcm",
"chacha20-poly1305"
};
/// <summary>
/// https://www.v2ray.com/chapter_02/protocols/shadowsocks.html
/// </summary>
public List<string> ShadowSocksMethods => new List<string> {
"aes-256-cfb",
"aes-128-cfb",
"chacha20",
"chacha20-ietf",
"aes-256-gcm",
"aes-128-gcm",
"chacha20-poly1305"
};
public IMvxCommand RandomUuid => new MvxCommand(() => GetUuid());
public bool WithTLS
@ -112,17 +134,6 @@ namespace ProxySuper.Core.ViewModels
}
}
public int ShadowSocksPort
{
get => Settings.ShadowSocksPort;
set
{
Settings.ShadowSocksPort = value;
RaisePropertyChanged("ShadowSocksPort");
}
}
public string UUID
{
get => Settings.UUID;
@ -166,12 +177,12 @@ namespace ProxySuper.Core.ViewModels
}
}
#region Torjan
public string TrojanPassword
{
get => Settings.TrojanPassword;
set => Settings.TrojanPassword = value;
}
public bool Checked_Trojan_TCP
{
get
@ -196,9 +207,18 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.Trojan_TCP, Settings);
}
#endregion
private List<string> _ssMethods = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305" };
public List<string> ShadowSocksMethods => _ssMethods;
#region ShadowSocks
public int ShadowSocksPort
{
get => Settings.ShadowSocksPort;
set
{
Settings.ShadowSocksPort = value;
RaisePropertyChanged("ShadowSocksPort");
}
}
public bool CheckedShadowSocks
{
@ -209,6 +229,7 @@ namespace ProxySuper.Core.ViewModels
RaisePropertyChanged("CheckedShadowSocks");
}
}
public string ShadowSocksPassword
{
get => Settings.ShadowSocksPassword;
@ -230,6 +251,7 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.ShadowsocksAEAD, Settings);
}
#endregion
private void CheckBoxChanged(bool value, RayType type)
@ -258,11 +280,11 @@ namespace ProxySuper.Core.ViewModels
}
/// <summary>
/// VMESS
/// VMESS SETTINGS
/// </summary>
public partial class V2rayEditorViewModel
{
// vmess tcp
#region VMESS TCP
public bool Checked_VMESS_TCP
{
get => Settings.Types.Contains(RayType.VMESS_TCP);
@ -281,8 +303,9 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VMESS_TCP, Settings);
}
#endregion
// vmess ws
#region VMESS WS
public bool Checked_VMESS_WS
{
get => Settings.Types.Contains(RayType.VMESS_WS);
@ -301,8 +324,9 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VMESS_WS, Settings);
}
#endregion
// vmess kcp
#region VMESS KCP
public string VMESS_KCP_Seed
{
get => Settings.VMESS_KCP_Seed;
@ -333,18 +357,69 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VMESS_KCP, Settings);
}
#endregion
#region VMESS QUIC
public bool Checked_VMESS_QUIC
{
get => Settings.Types.Contains(RayType.VMESS_QUIC);
set
{
CheckBoxChanged(value, RayType.VMESS_QUIC);
RaisePropertyChanged(nameof(Checked_VMESS_QUIC));
}
}
public string VMESS_QUIC_Key
{
get => Settings.VMESS_QUIC_Key;
set
{
Settings.VMESS_QUIC_Key = value;
RaisePropertyChanged(nameof(VMESS_QUIC_Key));
}
}
public string VMESS_QUIC_Security
{
get => Settings.VMESS_QUIC_Security;
set
{
Settings.VMESS_QUIC_Security = value;
RaisePropertyChanged(nameof(VMESS_QUIC_Security));
}
}
public string VMESS_QUIC_Type
{
get => Settings.VMESS_QUIC_Type;
set
{
Settings.VMESS_QUIC_Type = value;
RaisePropertyChanged(nameof(VMESS_QUIC_Type));
}
}
public int VMESS_QUIC_Port
{
get => Settings.VMESS_QUIC_Port;
set
{
Settings.VMESS_QUIC_Port = value;
RaisePropertyChanged(nameof(VMESS_QUIC_Port));
}
}
public string VMESS_QUIC_ShareLink
{
get => ShareLink.Build(RayType.VMESS_QUIC, Settings);
}
#endregion
private List<string> _kcpTypes = new List<string> { "none", "srtp", "utp", "wechat-video", "dtls", "wireguard", };
public List<string> KcpTypes => _kcpTypes;
}
/// <summary>
/// VLESS
/// VLESS SETTINGS
/// </summary>
public partial class V2rayEditorViewModel
{
// vless tcp
#region VLESS TCP
public bool Checked_VLESS_TCP
{
get => Settings.Types.Contains(RayType.VLESS_TCP);
@ -358,9 +433,9 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VLESS_TCP, Settings);
}
#endregion
// vless ws
#region VLESS WS
public string VLESS_WS_Path
{
get => Settings.VLESS_WS_Path;
@ -382,8 +457,9 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VLESS_WS, Settings);
}
#endregion
// vless kcp
#region VLESS KCP
public string VLESS_KCP_Seed
{
get => Settings.VLESS_KCP_Seed;
@ -414,8 +490,60 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VLESS_KCP, Settings);
}
#endregion
// vless grpc
#region VLESS QUIC
public bool Checked_VLESS_QUIC
{
get => Settings.Types.Contains(RayType.VLESS_QUIC);
set
{
CheckBoxChanged(value, RayType.VLESS_QUIC);
RaisePropertyChanged(nameof(Checked_VLESS_QUIC));
}
}
public string VLESS_QUIC_Key
{
get => Settings.VLESS_QUIC_Key; set
{
Settings.VLESS_QUIC_Key = value;
RaisePropertyChanged(nameof(VLESS_QUIC_Key));
}
}
public string VLESS_QUIC_Security
{
get => Settings.VLESS_QUIC_Security;
set
{
Settings.VLESS_QUIC_Security = value;
RaisePropertyChanged(nameof(VLESS_QUIC_Security));
}
}
public string VLESS_QUIC_Type
{
get => Settings.VLESS_QUIC_Type;
set
{
Settings.VLESS_QUIC_Type = value;
RaisePropertyChanged(nameof(VLESS_QUIC_Type));
}
}
public int VLESS_QUIC_Port
{
get => Settings.VLESS_QUIC_Port;
set
{
Settings.VLESS_QUIC_Port = value;
RaisePropertyChanged(nameof(VLESS_QUIC_Port));
}
}
public string VLESS_QUIC_ShareLink
{
get => ShareLink.Build(RayType.VLESS_QUIC, Settings);
}
#endregion
#region VLESS gRPC
public string VLESS_gRPC_ServiceName
{
get => Settings.VLESS_gRPC_ServiceName;
@ -439,5 +567,6 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VLESS_gRPC, Settings);
}
#endregion
}
}

10
ProxySuper.Core/ViewModels/XrayConfigViewModel.cs
View File

@ -13,6 +13,16 @@ namespace ProxySuper.Core.ViewModels
Settings = parameter;
}
public string Flow
{
get { return Settings.Flow; }
}
public string UTLS
{
get { return Settings.UTLS; }
}
public bool Checked_VLESS_TCP_XTLS
{
get

201
ProxySuper.Core/ViewModels/XrayEditorViewModel.cs
View File

@ -65,6 +65,30 @@ namespace ProxySuper.Core.ViewModels
public partial class XrayEditorViewModel
{
public List<string> UTLSList { get => XraySettings.UTLSList; }
public List<string> KcpTypes => V2raySettings.DisguiseTypes;
public List<string> QuicTypes => V2raySettings.DisguiseTypes;
public List<string> QuicSecurities => new List<string>
{
"none",
"aes-128-gcm",
"chacha20-poly1305"
};
public List<string> ShadowSocksMethods => new List<string>
{
"2022-blake3-aes-128-gcm",
"2022-blake3-aes-256-gcm",
"2022-blake3-chacha20-poly1305",
"aes-256-gcm",
"aes-128-gcm",
"chacha20-poly1305",
"none"
};
public IMvxCommand RandomUuid => new MvxCommand(() => GetUuid());
public bool WithTLS
@ -88,8 +112,6 @@ namespace ProxySuper.Core.ViewModels
}
public List<string> UTLSList { get => XraySettings.UTLSList; }
public string UTLS
{
get => Settings.UTLS;
@ -120,17 +142,6 @@ namespace ProxySuper.Core.ViewModels
}
}
public int ShadowSocksPort
{
get => Settings.ShadowSocksPort;
set
{
Settings.ShadowSocksPort = value;
RaisePropertyChanged("ShadowSocksPort");
}
}
public string UUID
{
get => Settings.UUID;
@ -174,6 +185,7 @@ namespace ProxySuper.Core.ViewModels
}
}
#region Trojan
public string TrojanPassword
{
get => Settings.TrojanPassword;
@ -204,9 +216,18 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.Trojan_TCP, Settings);
}
#endregion
private List<string> _ssMethods = new List<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305" };
public List<string> ShadowSocksMethods => _ssMethods;
#region ShadowSocks
public int ShadowSocksPort
{
get => Settings.ShadowSocksPort;
set
{
Settings.ShadowSocksPort = value;
RaisePropertyChanged("ShadowSocksPort");
}
}
public bool CheckedShadowSocks
{
@ -238,7 +259,7 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.ShadowsocksAEAD, Settings);
}
#endregion
private void CheckBoxChanged(bool value, RayType type)
{
@ -255,8 +276,6 @@ namespace ProxySuper.Core.ViewModels
}
}
private void GetUuid()
{
UUID = Guid.NewGuid().ToString();
@ -270,7 +289,7 @@ namespace ProxySuper.Core.ViewModels
/// </summary>
public partial class XrayEditorViewModel
{
// vmess tcp
#region VMESS TCP
public bool Checked_VMESS_TCP
{
get => Settings.Types.Contains(RayType.VMESS_TCP);
@ -289,8 +308,9 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VMESS_TCP, Settings);
}
#endregion
// vmess ws
#region VMESS WS
public bool Checked_VMESS_WS
{
get => Settings.Types.Contains(RayType.VMESS_WS);
@ -309,8 +329,9 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VMESS_WS, Settings);
}
#endregion
// vmess kcp
#region VMESS KCP
public string VMESS_KCP_Seed
{
get => Settings.VMESS_KCP_Seed;
@ -341,10 +362,60 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VMESS_KCP, Settings);
}
#endregion
#region VMESS QUIC
public bool Checked_VMESS_QUIC
{
get => Settings.Types.Contains(RayType.VMESS_QUIC);
set
{
CheckBoxChanged(value, RayType.VMESS_QUIC);
RaisePropertyChanged(nameof(Checked_VMESS_QUIC));
}
}
public string VMESS_QUIC_Key
{
get => Settings.VMESS_QUIC_Key;
set
{
Settings.VMESS_QUIC_Key = value;
RaisePropertyChanged(nameof(VMESS_QUIC_Key));
}
}
public string VMESS_QUIC_Security
{
get => Settings.VMESS_QUIC_Security;
set
{
Settings.VMESS_QUIC_Security = value;
RaisePropertyChanged(nameof(VMESS_QUIC_Security));
}
}
public string VMESS_QUIC_Type
{
get => Settings.VMESS_QUIC_Type;
set
{
Settings.VMESS_QUIC_Type = value;
RaisePropertyChanged(nameof(VMESS_QUIC_Type));
}
}
public int VMESS_QUIC_Port
{
get => Settings.VMESS_QUIC_Port;
set
{
Settings.VMESS_QUIC_Port = value;
RaisePropertyChanged(nameof(VMESS_QUIC_Port));
}
}
public string VMESS_QUIC_ShareLink
{
get => ShareLink.Build(RayType.VMESS_QUIC, Settings);
}
#endregion
private List<string> _kcpTypes = new List<string> { "none", "srtp", "utp", "wechat-video", "dtls", "wireguard", };
public List<string> KcpTypes => _kcpTypes;
}
/// <summary>
@ -352,8 +423,19 @@ namespace ProxySuper.Core.ViewModels
/// </summary>
public partial class XrayEditorViewModel
{
#region VLESS XTLS
// vless xtls
public List<string> FlowList { get => XraySettings.FlowList; }
public string Flow
{
get => Settings.Flow;
set
{
Settings.Flow = value;
RaisePropertyChanged(nameof(Flow));
}
}
public bool Checked_VLESS_TCP_XTLS
{
get => Settings.Types.Contains(RayType.VLESS_TCP_XTLS);
@ -367,8 +449,9 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VLESS_TCP_XTLS, Settings);
}
#endregion
// vless tcp
#region VLESS TCP
public bool Checked_VLESS_TCP
{
get => Settings.Types.Contains(RayType.VLESS_TCP);
@ -382,9 +465,9 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VLESS_TCP, Settings);
}
#endregion
// vless ws
#region VLESS WS
public string VLESS_WS_Path
{
get => Settings.VLESS_WS_Path;
@ -406,12 +489,68 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VLESS_WS, Settings);
}
#endregion
// vless kcp
#region VLESS QUIC
public string VLESS_QUIC_Key
{
get => Settings.VLESS_QUIC_Key; set
{
Settings.VLESS_QUIC_Key = value;
RaisePropertyChanged(nameof(VLESS_QUIC_Key));
}
}
public bool Checked_VLESS_QUIC
{
get => Settings.Types.Contains(RayType.VLESS_QUIC);
set
{
CheckBoxChanged(value, RayType.VLESS_QUIC);
RaisePropertyChanged(nameof(Checked_VLESS_QUIC));
}
}
public string VLESS_QUIC_Security
{
get => Settings.VLESS_QUIC_Security;
set
{
Settings.VLESS_QUIC_Security = value;
RaisePropertyChanged(nameof(VLESS_QUIC_Security));
}
}
public string VLESS_QUIC_Type
{
get => Settings.VLESS_QUIC_Type;
set
{
Settings.VLESS_QUIC_Type = value;
RaisePropertyChanged(nameof(VLESS_QUIC_Type));
}
}
public int VLESS_QUIC_Port
{
get => Settings.VLESS_QUIC_Port;
set
{
Settings.VLESS_QUIC_Port = value;
RaisePropertyChanged(nameof(VLESS_QUIC_Port));
}
}
public string VLESS_QUIC_ShareLink
{
get => ShareLink.Build(RayType.VLESS_QUIC, Settings);
}
#endregion
#region VLESS KCP
public string VLESS_KCP_Seed
{
get => Settings.VLESS_KCP_Seed;
set => Settings.VLESS_KCP_Seed = value;
set
{
Settings.VLESS_KCP_Seed = value;
RaisePropertyChanged(nameof(VLESS_KCP_Seed));
}
}
public string VLESS_KCP_Type
{
@ -438,8 +577,9 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VLESS_KCP, Settings);
}
#endregion
// vless grpc
#region VLESS gRPC
public string VLESS_gRPC_ServiceName
{
get => Settings.VLESS_gRPC_ServiceName;
@ -463,6 +603,7 @@ namespace ProxySuper.Core.ViewModels
{
get => ShareLink.Build(RayType.VLESS_gRPC, Settings);
}
#endregion
}
}

154
ProxySuper.WPF/Controls/V2raySettingsControl.xaml
View File

@ -15,6 +15,7 @@
<!--节点类型-->
<GroupBox Padding="10" Header="{DynamicResource EditorProxyType}">
<StackPanel Orientation="Horizontal">
<!--#region VLESS -->
<WrapPanel Orientation="Vertical">
<!--TCP-->
<CheckBox Width="150"
@ -38,6 +39,14 @@
<Label Content="{DynamicResource VlessKcpDesc}" FontSize="13" Foreground="LimeGreen" />
</CheckBox>
<!--quic-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
Foreground="LimeGreen"
IsChecked="{Binding Path=Checked_VLESS_QUIC}">
<Label Content="{DynamicResource VlessQuicDesc}" FontSize="12" Foreground="LimeGreen" />
</CheckBox>
<!--gRPC-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
@ -46,7 +55,9 @@
<Label Content="{DynamicResource VlessRpcDesc}" FontSize="13" Foreground="LimeGreen" />
</CheckBox>
</WrapPanel>
<!--#endregion-->
<!--#region VMESS -->
<WrapPanel Orientation="Vertical">
<!--WebSocket-->
<CheckBox Width="150"
@ -61,8 +72,18 @@
IsChecked="{Binding Path=Checked_VMESS_KCP}">
<Label Foreground="Blue" FontSize="13" Content="{DynamicResource VmessKcpDesc}" />
</CheckBox>
</WrapPanel>
<!--quic-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
Foreground="Blue"
IsChecked="{Binding Path=Checked_VMESS_QUIC}">
<Label Content="{DynamicResource VmessQuicDesc}" FontSize="12" Foreground="Blue" />
</CheckBox>
</WrapPanel>
<!--#endregion-->
<!--#region SS And Trojan -->
<WrapPanel Orientation="Vertical">
<!--ss-->
<CheckBox Width="150"
@ -79,6 +100,7 @@
<Label Content="{DynamicResource TrojanDesc}" FontSize="13" Foreground="CadetBlue" />
</CheckBox>
</WrapPanel>
<!--#endregion-->
</StackPanel>
</GroupBox>
@ -87,6 +109,7 @@
<!--参数设置-->
<GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
<StackPanel>
<!--#region Common Settings -->
<!--Domain-->
<StackPanel Orientation="Horizontal">
<Label Content="{DynamicResource XrayDomain}" Width="120" />
@ -110,6 +133,7 @@
Command="{Binding Path=RandomUuid}"
Content="{DynamicResource Random}" />
</StackPanel>
<!--#endregion-->
<!--more params-->
<Expander ExpandDirection="Down" Margin="0,10,0,0">
@ -119,6 +143,7 @@
<Expander.Content>
<StackPanel>
<!--#region Cert Settings -->
<!--证书-->
<StackPanel Margin="0,15,0,0" Orientation="Horizontal">
<Label Content="{DynamicResource XrayWithTLS}" Width="120" />
@ -127,7 +152,9 @@
VerticalContentAlignment="Center"
VerticalAlignment="Center" />
</StackPanel>
<!--#endregion-->
<!--#region VLESS WebSocket Settings -->
<!--WebSocket Path-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -138,7 +165,9 @@
<Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
<TextBox Text="{Binding Path=VLESS_WS_Path}" Width="200" />
</StackPanel>
<!--#endregion-->
<!--#region VLESS KCP Settings -->
<!--seed-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -174,7 +203,62 @@
<Label Content="{DynamicResource VlessKcpPort}" Width="120" Foreground="LimeGreen" />
<TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="200" />
</StackPanel>
<!--#endregion-->
<!--#region VLESS Quic Settings -->
<!--quic port-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VlessQuicPort}" Foreground="LimeGreen" Width="120" />
<TextBox Text="{Binding Path=VLESS_QUIC_Port}" Width="260" />
</StackPanel>
<!--quic key-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VlessQuicKey}" Foreground="LimeGreen" Width="120" />
<TextBox Text="{Binding Path=VLESS_QUIC_Key}" Width="260" />
</StackPanel>
<!--quic security-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VlessQuicSecurity}" Foreground="LimeGreen" Width="120" />
<ComboBox Width="260"
ItemsSource="{Binding QuicSecurities}"
SelectedValue="{Binding VLESS_QUIC_Security}">
</ComboBox>
</StackPanel>
<!--quic type-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VlessQuicType}" Foreground="LimeGreen" Width="120" VerticalAlignment="Bottom"/>
<ComboBox Width="260"
VerticalAlignment="Bottom"
ItemsSource="{Binding Path=QuicTypes}"
SelectedValue="{Binding VLESS_QUIC_Type,Mode=TwoWay}">
</ComboBox>
</StackPanel>
<!--#endregion-->
<!--#region VLESS gRPC Settings -->
<!--gRPC Port-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -195,7 +279,9 @@
<Label Content="{DynamicResource VlessRPCName}" Width="120" Foreground="LimeGreen" />
<TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="200" />
</StackPanel>
<!--#endregion-->
<!--#region VMESS WebSocket Settings -->
<!--WebSocket Path-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -208,7 +294,9 @@
VerticalAlignment="Bottom"
Width="200" />
</StackPanel>
<!--#endregion-->
<!--#region VMESS KCP Settings -->
<!--seed-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -245,7 +333,62 @@
<Label Content="{DynamicResource VmessKcpPort}" Foreground="Blue" Width="120" />
<TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="200" />
</StackPanel>
<!--#endregion-->
<!--#region VMESS Quic Settings -->
<!--quic port-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VMESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VmessQuicPort}" Foreground="Blue" Width="120" />
<TextBox Text="{Binding Path=VMESS_QUIC_Port}" Width="260" />
</StackPanel>
<!--quic key-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VMESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VmessQuicKey}" Foreground="Blue" Width="120" />
<TextBox Text="{Binding Path=VMESS_QUIC_Key}" Width="260" />
</StackPanel>
<!--quic security-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VMESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VmessQuicSecurity}" Foreground="Blue" Width="120" />
<ComboBox Width="260"
ItemsSource="{Binding QuicSecurities}"
SelectedValue="{Binding VMESS_QUIC_Security}">
</ComboBox>
</StackPanel>
<!--quic type-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VMESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VmessQuicType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
<ComboBox Width="260"
VerticalAlignment="Bottom"
ItemsSource="{Binding Path=QuicTypes}"
SelectedValue="{Binding VMESS_QUIC_Type,Mode=TwoWay}">
</ComboBox>
</StackPanel>
<!--#endregion-->
<!--#region ShadowSocks Settings -->
<!--ss密码-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -281,7 +424,9 @@
<Label Content="{DynamicResource SSPort}" Foreground="Fuchsia" Width="120" />
<TextBox Text="{Binding Path=ShadowSocksPort}" Width="200"/>
</StackPanel>
<!--#endregion-->
<!--#region Trojan Settings -->
<!--Trojan密码-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -293,13 +438,15 @@
<TextBox Text="{Binding Path=TrojanPassword}" Width="200" />
</StackPanel>
<!--xray prot-->
<!--v2ray prot-->
<StackPanel Margin="0,15,0,0" Orientation="Horizontal">
<Label Content="{DynamicResource XrayPort}" Foreground="Gray" Width="120" />
<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 -->
<!--多用户-->
<StackPanel Margin="0,15,0,0" Orientation="Vertical">
<StackPanel Orientation="Horizontal">
@ -314,6 +461,7 @@
<TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
</StackPanel>
</StackPanel>
<!--#endregion-->
</StackPanel>
</Expander.Content>
</Expander>

7
ProxySuper.WPF/Controls/VLESS_XTLS_Control.xaml
View File

@ -23,7 +23,12 @@
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
<Label Content="流控(flow)" Width="140" />
<TextBox Text="xtls-rprx-direct" IsReadOnly="True" Width="300" />
<TextBox Text="{Binding Settings.Flow}" IsReadOnly="True" Width="300" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
<Label Content="uTLS" Width="140" />
<TextBox Text="{Binding Settings.UTLS}" IsReadOnly="True" Width="300" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">

234
ProxySuper.WPF/Controls/XraySettingsControl.xaml
View File

@ -15,61 +15,82 @@
<!--节点类型-->
<GroupBox Padding="10" Header="{DynamicResource EditorProxyType}">
<StackPanel Orientation="Horizontal">
<!--#region VLESS -->
<WrapPanel Orientation="Vertical">
<!--XTLS-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VLESS_TCP_XTLS}">
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VLESS_TCP_XTLS}">
<Label Content="{DynamicResource VlessXtlsDesc}" FontSize="12" Foreground="LimeGreen" />
</CheckBox>
<!--TCP-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VLESS_TCP}">
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VLESS_TCP}">
<Label Content="{DynamicResource VlessTcpDesc}" FontSize="12" Foreground="LimeGreen" />
</CheckBox>
<!--WebSocket-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VLESS_WS}">
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VLESS_WS}">
<Label Content="{DynamicResource VlessWsDesc}" FontSize="12" Foreground="LimeGreen" />
</CheckBox>
<!--mKCP-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
Foreground="LimeGreen"
VerticalContentAlignment="Center"
Foreground="LimeGreen"
IsChecked="{Binding Path=Checked_VLESS_KCP}">
<Label Content="{DynamicResource VlessKcpDesc}" FontSize="12" Foreground="LimeGreen" />
</CheckBox>
<!--quic-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
Foreground="LimeGreen"
IsChecked="{Binding Path=Checked_VLESS_QUIC}">
<Label Content="{DynamicResource VlessQuicDesc}" FontSize="12" Foreground="LimeGreen" />
</CheckBox>
<!--gRPC-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
Foreground="LimeGreen"
IsChecked="{Binding Path=Checked_VLESS_gRPC}">
VerticalContentAlignment="Center"
Foreground="LimeGreen"
IsChecked="{Binding Path=Checked_VLESS_gRPC}">
<Label Content="{DynamicResource VlessRpcDesc}" FontSize="12" Foreground="LimeGreen" />
</CheckBox>
</WrapPanel>
<!--#endregion-->
<!--#region VMESS -->
<WrapPanel Orientation="Vertical">
<!--WebSocket-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VMESS_WS}">
<Label Content="{DynamicResource VmessWsDesc}" FontSize="12" Foreground="Blue" />
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VMESS_WS}">
<Label Content="{DynamicResource VmessWsDesc}" FontSize="12" Foreground="Blue" />
</CheckBox>
<!--mKCP-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VMESS_KCP}">
<Label Foreground="Blue" FontSize="12" Content="{DynamicResource VmessKcpDesc}" />
VerticalContentAlignment="Center"
IsChecked="{Binding Path=Checked_VMESS_KCP}">
<Label Foreground="Blue" FontSize="12" Content="{DynamicResource VmessKcpDesc}" />
</CheckBox>
<!--quic-->
<CheckBox Width="150"
VerticalContentAlignment="Center"
Foreground="Blue"
IsChecked="{Binding Path=Checked_VMESS_QUIC}">
<Label Content="{DynamicResource VmessQuicDesc}" FontSize="12" Foreground="Blue" />
</CheckBox>
</WrapPanel>
<!--#endregion-->
<!--#region SS And Trojan -->
<WrapPanel Orientation="Vertical">
<!--ss-->
<CheckBox Width="150"
@ -85,14 +106,15 @@
IsChecked="{Binding Path=Checked_Trojan_TCP}">
<Label Content="{DynamicResource TrojanDesc}" FontSize="12" Foreground="CadetBlue" />
</CheckBox>
</WrapPanel>
<!--#endregion-->
</StackPanel>
</GroupBox>
<!--参数设置-->
<GroupBox Padding="10" Margin="0,10,0,0" Header="{DynamicResource EditorProxyParams}">
<StackPanel>
<!--#region Base Settings -->
<!--Domain-->
<StackPanel Orientation="Horizontal">
<Label Content="{DynamicResource XrayDomain}" Width="120" />
@ -118,32 +140,47 @@
<TextBox Text="{Binding Path=Port}" Width="120" />
<Label Content="{DynamicResource XrayPortDefault}" Foreground="Red" />
</StackPanel>
<!--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>
<!--#endregion-->
<!--more params-->
<Expander ExpandDirection="Down" Margin="0,10,0,0">
<Expander.Header>
<TextBlock Text="更多参数" FontWeight="Bold" />
</Expander.Header>
<Expander.Content>
<StackPanel>
<!--#region Common Settings -->
<!--xray utls-->
<StackPanel Margin="0,15,0,0" Orientation="Horizontal">
<Label Content="{DynamicResource UTLS}" Width="120" VerticalAlignment="Bottom"/>
<ComboBox Width="260"
VerticalAlignment="Bottom"
ItemsSource="{Binding Path=UTLSList}"
SelectedValue="{Binding UTLS,Mode=TwoWay}" />
</StackPanel>
<!--Flow-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_TCP_XTLS,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{Binding Path=Flow}" Width="120" VerticalAlignment="Bottom"/>
<ComboBox Width="260"
VerticalAlignment="Bottom"
ItemsSource="{Binding Path=FlowList}"
SelectedValue="{Binding Flow,Mode=TwoWay}" />
</StackPanel>
<!--Cert-->
<StackPanel Margin="0,15,0,0" Orientation="Horizontal">
<Label Content="{DynamicResource XrayWithTLS}" Width="120" />
<CheckBox IsChecked="{Binding Path=WithTLS}"
Content="{DynamicResource XrayWithTLSDesc}"
VerticalContentAlignment="Center"
VerticalAlignment="Center" />
Content="{DynamicResource XrayWithTLSDesc}"
VerticalContentAlignment="Center"
VerticalAlignment="Center" />
</StackPanel>
<!--Mask Domain-->
@ -151,18 +188,22 @@
<Label Content="{DynamicResource XrayMarkDomain}" Width="120" />
<TextBox Text="{Binding Path=MaskDomain}" Width="260" />
</StackPanel>
<!--#endregion-->
<!--#region VLESS WS Settings -->
<!--WebSocket Path-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_WS,
Converter={StaticResource VisibleConverter}
}">
}">
<Label Content="{DynamicResource VlessWsPath}" Foreground="LimeGreen" Width="120" />
<TextBox Text="{Binding Path=VLESS_WS_Path}" Width="260" />
</StackPanel>
<!--#endregion-->
<!--#region VLESS KCP SETTINGS -->
<!--seed-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -198,14 +239,69 @@
<Label Content="{DynamicResource VlessKcpPort}" Width="120" Foreground="LimeGreen" />
<TextBox Text="{Binding Path=VLESS_KCP_Port}" Width="260" />
</StackPanel>
<!--#endregion-->
<!--#region VLESS Quic Settings -->
<!--quic port-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VlessQuicPort}" Foreground="LimeGreen" Width="120" />
<TextBox Text="{Binding Path=VLESS_QUIC_Port}" Width="260" />
</StackPanel>
<!--quic key-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VlessQuicKey}" Foreground="LimeGreen" Width="120" />
<TextBox Text="{Binding Path=VLESS_QUIC_Key}" Width="260" />
</StackPanel>
<!--quic security-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VlessQuicSecurity}" Foreground="LimeGreen" Width="120" />
<ComboBox Width="260"
ItemsSource="{Binding QuicSecurities}"
SelectedValue="{Binding VLESS_QUIC_Security}">
</ComboBox>
</StackPanel>
<!--quic type-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VlessQuicType}" Foreground="LimeGreen" Width="120" VerticalAlignment="Bottom"/>
<ComboBox Width="260"
VerticalAlignment="Bottom"
ItemsSource="{Binding Path=QuicTypes}"
SelectedValue="{Binding VLESS_QUIC_Type,Mode=TwoWay}">
</ComboBox>
</StackPanel>
<!--#endregion-->
<!--#region VLESS GRPC SETTINGS -->
<!--gRPC Port-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VLESS_gRPC,
Converter={StaticResource VisibleConverter}
}">
}">
<Label Content="{DynamicResource VlessRPCPort}" Width="120" Foreground="LimeGreen" />
<TextBox Text="{Binding Path=VLESS_gRPC_Port}" Width="260" />
</StackPanel>
@ -215,11 +311,13 @@
Visibility="{
Binding Path=Checked_VLESS_gRPC,
Converter={StaticResource VisibleConverter}
}">
}">
<Label Content="{DynamicResource VlessRPCName}" Width="120" Foreground="LimeGreen" />
<TextBox Text="{Binding Path=VLESS_gRPC_ServiceName}" Width="260" />
</StackPanel>
<!--#endregion-->
<!--#region VMESS WS SETTINGS -->
<!--WebSocket Path-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -232,7 +330,9 @@
VerticalAlignment="Bottom"
Width="260" />
</StackPanel>
<!--#endregion-->
<!--#region VMESS KCP SETTINGS -->
<!--seed-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -269,7 +369,62 @@
<Label Content="{DynamicResource VmessKcpPort}" Foreground="Blue" Width="120" />
<TextBox Text="{Binding Path=VMESS_KCP_Port}" Width="260" />
</StackPanel>
<!--#endregion-->
<!--#region VMESS Quic Settings -->
<!--quic port-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VMESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VmessQuicPort}" Foreground="Blue" Width="120" />
<TextBox Text="{Binding Path=VMESS_QUIC_Port}" Width="260" />
</StackPanel>
<!--quic key-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VMESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VmessQuicKey}" Foreground="Blue" Width="120" />
<TextBox Text="{Binding Path=VMESS_QUIC_Key}" Width="260" />
</StackPanel>
<!--quic security-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VMESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VmessQuicSecurity}" Foreground="Blue" Width="120" />
<ComboBox Width="260"
ItemsSource="{Binding QuicSecurities}"
SelectedValue="{Binding VMESS_QUIC_Security}">
</ComboBox>
</StackPanel>
<!--quic type-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
Visibility="{
Binding Path=Checked_VMESS_QUIC,
Converter={StaticResource VisibleConverter}
}">
<Label Content="{DynamicResource VmessQuicType}" Foreground="Blue" Width="120" VerticalAlignment="Bottom"/>
<ComboBox Width="260"
VerticalAlignment="Bottom"
ItemsSource="{Binding Path=QuicTypes}"
SelectedValue="{Binding VMESS_QUIC_Type,Mode=TwoWay}">
</ComboBox>
</StackPanel>
<!--#endregion-->
<!--#region ShadowSocks Settings -->
<!--ss密码-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -305,7 +460,9 @@
<Label Content="{DynamicResource SSPort}" Foreground="Fuchsia" Width="120" />
<TextBox Text="{Binding Path=ShadowSocksPort}" Width="260"/>
</StackPanel>
<!--#endregion-->
<!--#region Trojan Settings -->
<!--Trojan密码-->
<StackPanel Margin="0,15,0,0"
Orientation="Horizontal"
@ -316,7 +473,9 @@
<Label Content="{DynamicResource TrojanPassword}" Foreground="CadetBlue" Width="120" />
<TextBox Text="{Binding Path=TrojanPassword}" Width="260" />
</StackPanel>
<!--#endregion-->
<!--#region Multiple Users Settings -->
<!--多用户-->
<StackPanel Margin="0,10,0,0" Orientation="Vertical">
<StackPanel Orientation="Horizontal">
@ -327,11 +486,12 @@
TextWrapping="Wrap"
Width="260" />
</StackPanel>
<StackPanel>
<TextBlock Margin="120,3,0,0" Text="{DynamicResource MultiUserHelp}" />
</StackPanel>
</StackPanel>
<!--#endregion-->
</StackPanel>
</Expander.Content>
</Expander>

13
ProxySuper.WPF/Resources/Languages/en.xaml
View File

@ -75,8 +75,10 @@
<sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
<sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
<sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
<sys:String x:Key="VlessQuicDesc" xml:space="preserve">VLESS QUIC</sys:String>
<sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
<sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
<sys:String x:Key="VmessQuicDesc" xml:space="preserve">VMESS QUIC</sys:String>
<sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
<sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
@ -85,23 +87,34 @@
<sys:String x:Key="XrayWithTLS">With TLS</sys:String>
<sys:String x:Key="XrayWithTLSDesc">Unchecked means upload your own TLS.</sys:String>
<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="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>
<sys:String x:Key="VlessKcpPort">VLESS KCP Port</sys:String>
<sys:String x:Key="VlessQuicPort">VLESS QUIC Port</sys:String>
<sys:String x:Key="VlessQuicKey">VLESS QUIC Key</sys:String>
<sys:String x:Key="VlessQuicSecurity">VLESS QUIC Security</sys:String>
<sys:String x:Key="VlessQuicType">VLESS QUIC Type</sys:String>
<sys:String x:Key="VlessRPCName">gRPC Service Name</sys:String>
<sys:String x:Key="VlessRPCPort">gRPC Port</sys:String>
<sys:String x:Key="VmessWsPath">VMESS WS Path</sys:String>
<sys:String x:Key="VmessKcpSeed">VMESS KCP Seed</sys:String>
<sys:String x:Key="VmessKcpType">VMESS KCP Type</sys:String>
<sys:String x:Key="VmessKcpPort">VMESS KCP Port</sys:String>
<sys:String x:Key="VmessQuicKey">VMESS QUIC Key</sys:String>
<sys:String x:Key="VmessQuicPort">VMESS QUIC Port</sys:String>
<sys:String x:Key="VmessQuicSecurity">VMESS QUIC Security</sys:String>
<sys:String x:Key="VmessQuicType">VMESS QUIC Type</sys:String>
<sys:String x:Key="SSPassword">SS Pwd</sys:String>
<sys:String x:Key="SSMethods">SS Method</sys:String>
<sys:String x:Key="SSPort">SS Port</sys:String>
<sys:String x:Key="TrojanPassword">Trojan Pwd</sys:String>
<sys:String x:Key="TrojanPort">Trojan 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="XrayPortDefault">default port is 443</sys:String>

15
ProxySuper.WPF/Resources/Languages/tw_cn.xaml
View File

@ -74,8 +74,10 @@
<sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
<sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
<sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
<sys:String x:Key="VlessQuicDesc" xml:space="preserve">VLESS QUIC</sys:String>
<sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
<sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
<sys:String x:Key="VmessQuicDesc" xml:space="preserve">VMESS QUIC</sys:String>
<sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
<sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
@ -85,24 +87,35 @@
<sys:String x:Key="XrayWithTLS">自動申請證書</sys:String>
<sys:String x:Key="XrayWithTLSDesc">如上傳自有證書，則取消對勾。</sys:String>
<sys:String x:Key="XrayUUID">UUID</sys:String>
<sys:String x:Key="Flow">流控</sys:String>
<sys:String x:Key="UTLS">uTLS</sys:String>
<sys:String x:Key="MultiUser">多用戶</sys:String>
<sys:String x:Key="MultiUserHelp">多個UUID用“,”分隔</sys:String>
<sys:String x:Key="VlessWsPath">VLESS WS路徑</sys:String>
<sys:String x:Key="VlessKcpSeed">VLESS KCP Seed</sys:String>
<sys:String x:Key="VlessKcpType">VLESS KCP偽裝</sys:String>
<sys:String x:Key="VlessKcpPort">VLESS KCP端口</sys:String>
<sys:String x:Key="VlessQuicKey">VLESS QUIC Key</sys:String>
<sys:String x:Key="VlessQuicPort">VLESS QUIC端口</sys:String>
<sys:String x:Key="VlessQuicSecurity">VLESS QUIC加密</sys:String>
<sys:String x:Key="VlessQuicType">VLESS QUIC僞裝</sys:String>
<sys:String x:Key="VlessRPCName">gRPC路徑</sys:String>
<sys:String x:Key="VlessRPCPort">gRPC端口</sys:String>
<sys:String x:Key="VmessWsPath">VMESS WS路徑</sys:String>
<sys:String x:Key="VmessKcpSeed">VMESS KCP Seed</sys:String>
<sys:String x:Key="VmessKcpType">VMESS KCP偽裝</sys:String>
<sys:String x:Key="VmessKcpPort">VMESS KCP端口</sys:String>
<sys:String x:Key="VmessQuicKey">VMESS QUIC Key</sys:String>
<sys:String x:Key="VmessQuicPort">VMESS QUIC端口</sys:String>
<sys:String x:Key="VmessQuicSecurity">VMESS QUIC加密</sys:String>
<sys:String x:Key="VmessQuicType">VMESS QUIC僞裝</sys:String>
<sys:String x:Key="SSPassword">SS密碼</sys:String>
<sys:String x:Key="SSMethods">SS加密方式</sys:String>
<sys:String x:Key="SSPort">SS端口</sys:String>
<sys:String x:Key="TrojanPassword">Trojan密碼</sys:String>
<sys:String x:Key="TrojanPort">Trojan端口</sys:String>
<sys:String x:Key="XrayPort">xray端口</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>
<!--xray installer-->

15
ProxySuper.WPF/Resources/Languages/zh_cn.xaml
View File

@ -75,8 +75,10 @@
<sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
<sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
<sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
<sys:String x:Key="VlessQuicDesc" xml:space="preserve">VLESS QUIC</sys:String>
<sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
<sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
<sys:String x:Key="VmessQuicDesc" xml:space="preserve">VMESS QUIC</sys:String>
<sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
<sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
@ -86,24 +88,35 @@
<sys:String x:Key="XrayWithTLS">自动申请证书</sys:String>
<sys:String x:Key="XrayWithTLSDesc">如上传自有证书，则取消对勾。</sys:String>
<sys:String x:Key="XrayUUID">UUID</sys:String>
<sys:String x:Key="Flow">流控</sys:String>
<sys:String x:Key="UTLS">uTLS</sys:String>
<sys:String x:Key="MultiUser">多用户</sys:String>
<sys:String x:Key="MultiUserHelp">多个UUID用“,”分隔</sys:String>
<sys:String x:Key="VlessWsPath">VLESS WS路径</sys:String>
<sys:String x:Key="VlessKcpSeed">VLESS KCP Seed</sys:String>
<sys:String x:Key="VlessKcpType">VLESS KCP伪装</sys:String>
<sys:String x:Key="VlessKcpPort">VLESS KCP端口</sys:String>
<sys:String x:Key="VlessQuicKey">VLESS QUIC Key</sys:String>
<sys:String x:Key="VlessQuicPort">VLESS QUIC端口</sys:String>
<sys:String x:Key="VlessQuicSecurity">VLESS QUIC加密</sys:String>
<sys:String x:Key="VlessQuicType">VLESS QUIC伪装</sys:String>
<sys:String x:Key="VlessRPCName">gRPC路径</sys:String>
<sys:String x:Key="VlessRPCPort">gRPC端口</sys:String>
<sys:String x:Key="VmessWsPath">VMESS WS路径</sys:String>
<sys:String x:Key="VmessKcpSeed">VMESS KCP Seed</sys:String>
<sys:String x:Key="VmessKcpType">VMESS KCP伪装</sys:String>
<sys:String x:Key="VmessKcpPort">VMESS KCP端口</sys:String>
<sys:String x:Key="VmessQuicKey">VMESS QUIC Key</sys:String>
<sys:String x:Key="VmessQuicPort">VMESS QUIC端口</sys:String>
<sys:String x:Key="VmessQuicSecurity">VMESS QUIC加密</sys:String>
<sys:String x:Key="VmessQuicType">VMESS QUIC伪装</sys:String>
<sys:String x:Key="SSPassword">SS密码</sys:String>
<sys:String x:Key="SSMethods">SS加密方式</sys:String>
<sys:String x:Key="SSPort">SS端口</sys:String>
<sys:String x:Key="TrojanPassword">Trojan密码</sys:String>
<sys:String x:Key="TrojanPort">Trojan端口</sys:String>
<sys:String x:Key="XrayPort">xray端口</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>
<!--xray installer-->

7
ProxySuper.WPF/Views/Brook/BrookConfigView.xaml.cs
View File

@ -1,10 +1,9 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// BrookConfigView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class BrookConfigView : MvxWindow
{
public BrookConfigView()

87
ProxySuper.WPF/Views/Brook/BrookEditorView.xaml
View File

@ -24,61 +24,60 @@
</StackPanel>
<StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
<StackPanel Grid.Column="2">
<Grid Margin="10">
<Grid.RowDefinitions>
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
<ColumnDefinition Width="200" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="2" Margin="10,10,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="*" />
<RowDefinition Height="50" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
<ColumnDefinition Width="200" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label Content="类型" Grid.Row="0" Grid.Column="0" />
<ComboBox Width="200"
Height="24"
Grid.Row="0"
Grid.Column="1"
ItemsSource="{Binding Path=BrookTypes}"
SelectedValue="{Binding CheckedBrookType,Mode=TwoWay}">
</ComboBox>
<Label Content="类型" Grid.Row="0" Grid.Column="0" />
<ComboBox Width="200"
Height="24"
Grid.Row="0"
Grid.Column="1"
ItemsSource="{Binding Path=BrookTypes}"
SelectedValue="{Binding CheckedBrookType,Mode=TwoWay}">
</ComboBox>
<Label Content="端口" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding EnablePort}" />
<TextBox IsEnabled="{Binding EnablePort}" Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
<Label Content="端口" Grid.Row="1" Grid.Column="0" IsEnabled="{Binding EnablePort}" />
<TextBox IsEnabled="{Binding EnablePort}" Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
<Label Content="密码" Grid.Row="2" Grid.Column="0" />
<TextBox Text="{Binding Settings.Password}" Grid.Row="2" Grid.Column="1" />
<Label Content="密码" Grid.Row="2" Grid.Column="0" />
<TextBox Text="{Binding Settings.Password}" Grid.Row="2" Grid.Column="1" />
<Label Content="IP" Grid.Row="3" Grid.Column="0" IsEnabled="{Binding EnableIP}" />
<TextBox IsEnabled="{Binding EnableIP}" Text="{Binding Settings.IP}" Grid.Row="3" Grid.Column="1" />
<Label Content="IP" Grid.Row="3" Grid.Column="0" IsEnabled="{Binding EnableIP}" />
<TextBox IsEnabled="{Binding EnableIP}" Text="{Binding Settings.IP}" Grid.Row="3" Grid.Column="1" />
<Label Content="域名" Grid.Row="4" Grid.Column="0" IsEnabled="{Binding EnableDomain}" />
<TextBox IsEnabled="{Binding EnableDomain}" Text="{Binding Settings.Domain}" Grid.Row="4" Grid.Column="1" />
</Grid>
<Label Content="域名" Grid.Row="4" Grid.Column="0" IsEnabled="{Binding EnableDomain}" />
<TextBox IsEnabled="{Binding EnableDomain}" Text="{Binding Settings.Domain}" Grid.Row="4" Grid.Column="1" />
<Border BorderBrush="#eee" BorderThickness="0,1,0,0">
<Border Grid.Row="6" Grid.ColumnSpan="3" BorderBrush="#eee" BorderThickness="0,1,0,0">
<StackPanel Orientation="Horizontal"
HorizontalAlignment="Right"
Margin="0,20,0,0">
HorizontalAlignment="Right">
<Button Content="{DynamicResource Save}"
Command="{Binding SaveCommand}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Padding="10,5" />
Command="{Binding SaveCommand}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Padding="10,5" />
<Button Content="{DynamicResource SaveAndInstall}"
Command="{Binding SaveAndInstallCommand}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Padding="10,5"
Margin="20,0,40,0" />
Command="{Binding SaveAndInstallCommand}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Padding="10,5"
Margin="20,0,40,0" />
</StackPanel>
</Border>
</StackPanel>
</Grid>
</Grid>
</views:MvxWindow>

5
ProxySuper.WPF/Views/Brook/BrookEditorView.xaml.cs
View File

@ -3,10 +3,7 @@ using MvvmCross.Platforms.Wpf.Views;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// BrookEditorView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation(Identifier = nameof(XrayEditorView), Modal = false)]
[MvxWindowPresentation]
public partial class BrookEditorView : MvxWindow
{
public BrookEditorView()

7
ProxySuper.WPF/Views/Brook/BrookInstallView.xaml.cs
View File

@ -1,4 +1,5 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using System;
using System.Collections.Generic;
using System.Linq;
@ -15,9 +16,7 @@ using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.Brook
{
/// <summary>
/// BrookInstallView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class BrookInstallView : MvxWindow
{
public BrookInstallView()

7
ProxySuper.WPF/Views/EnableRootView.xaml.cs
View File

@ -1,10 +1,9 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// EnableRootView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class EnableRootView : MvxWindow
{
public EnableRootView()

7
ProxySuper.WPF/Views/MTProxyGo/MTProxyGoConfigView.xaml.cs
View File

@ -1,4 +1,5 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using System;
using System.Collections.Generic;
using System.Linq;
@ -15,9 +16,7 @@ using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.MTProtoGo
{
/// <summary>
/// MTProtoGoConfigView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class MTProtoGoConfigView : MvxWindow
{
public MTProtoGoConfigView()

61
ProxySuper.WPF/Views/MTProxyGo/MTProxyGoEditorView.xaml
View File

@ -24,49 +24,50 @@
</StackPanel>
<StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
<StackPanel Grid.Column="2">
<Grid Margin="10">
<Grid.RowDefinitions>
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
<ColumnDefinition Width="200" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="2" Margin="10,10,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="*" />
<RowDefinition Height="50" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
<ColumnDefinition Width="200" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label Content="{DynamicResource MTProtoDomain}" Grid.Row="0" Grid.Column="0" />
<TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
<Label Content="{DynamicResource MTProtoDomain}" Grid.Row="0" Grid.Column="0" />
<TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
<Label Content="{DynamicResource MTProtoPort}" Grid.Row="1" Grid.Column="0" />
<TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
<Label Content="{DynamicResource MTProtoPort}" Grid.Row="1" Grid.Column="0" />
<TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
<Label Content="{DynamicResource MTProtoCleartext}" Grid.Row="2" Grid.Column="0" />
<TextBox Text="{Binding Settings.Cleartext}" Grid.Row="2" Grid.Column="1" />
</Grid>
<Label Content="{DynamicResource MTProtoCleartext}" Grid.Row="2" Grid.Column="0" />
<TextBox Text="{Binding Settings.Cleartext}" Grid.Row="2" Grid.Column="1" />
<Border Grid.Row="1"
<Border Grid.Row="4"
Grid.ColumnSpan="3"
BorderBrush="#eee"
BorderThickness="0,1,0,0">
<StackPanel Orientation="Horizontal"
Margin="0,20,0,0"
HorizontalAlignment="Right">
<Button Content="{DynamicResource Save}"
Command="{Binding SaveCommand}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Padding="10,5" />
Command="{Binding SaveCommand}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Padding="10,5" />
<Button Content="{DynamicResource SaveAndInstall}"
Command="{Binding SaveAndInstallCommand}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Padding="10,5"
Margin="20,0,40,0" />
Command="{Binding SaveAndInstallCommand}"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Padding="10,5"
Margin="20,0,40,0" />
</StackPanel>
</Border>
</StackPanel>
</Grid>
</Grid>
</views:MvxWindow>

7
ProxySuper.WPF/Views/MTProxyGo/MTProxyGoEditorView.xaml.cs
View File

@ -1,4 +1,5 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using System;
using System.Collections.Generic;
using System.Linq;
@ -15,9 +16,7 @@ using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.MTProtoGo
{
/// <summary>
/// MTProtoGoEditorView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class MTProtoGoEditorView : MvxWindow
{
public MTProtoGoEditorView()

7
ProxySuper.WPF/Views/MTProxyGo/MTProxyGoInstallView.xaml.cs
View File

@ -1,4 +1,5 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using System;
using System.Collections.Generic;
using System.Linq;
@ -15,9 +16,7 @@ using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.MTProtoGo
{
/// <summary>
/// MTProtoInstallView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class MTProtoGoInstallView : MvxWindow
{
public MTProtoGoInstallView()

7
ProxySuper.WPF/Views/NaiveProxy/NaiveProxyConfigView.xaml.cs
View File

@ -1,10 +1,9 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// NaiveProxyConfigView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class NaiveProxyConfigView : MvxWindow
{
public NaiveProxyConfigView()

57
ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml
View File

@ -22,42 +22,43 @@
<StackPanel Grid.Column="0" Margin="10">
<ctrl:HostControl />
</StackPanel>
<StackPanel Grid.Column="1" Background="#EEE"></StackPanel>
<StackPanel Grid.Column="2">
<Grid Margin="10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
<ColumnDefinition Width="200" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
</Grid.RowDefinitions>
<Grid Grid.Column="2" Margin="10,10,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
<ColumnDefinition Width="200" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="36" />
<RowDefinition Height="*" />
<RowDefinition Height="50" />
</Grid.RowDefinitions>
<Label Content="{DynamicResource NaiveProxyDomain}" Grid.Row="0" Grid.Column="0" />
<TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
<Label Content="{DynamicResource NaiveProxyDomain}" Grid.Row="0" Grid.Column="0" />
<TextBox Text="{Binding Settings.Domain}" Grid.Row="0" Grid.Column="1" />
<Label Content="{DynamicResource NaiveProxyPort}" Grid.Row="1" Grid.Column="0" />
<TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
<Label Content="{DynamicResource NaiveProxyPort}" Grid.Row="1" Grid.Column="0" />
<TextBox Text="{Binding Settings.Port}" Grid.Row="1" Grid.Column="1" />
<Label Content="{DynamicResource NaiveProxyUserName}" Grid.Row="2" Grid.Column="0" />
<TextBox Text="{Binding Settings.UserName}" Grid.Row="2" Grid.Column="1" />
<Label Content="{DynamicResource NaiveProxyUserName}" Grid.Row="2" Grid.Column="0" />
<TextBox Text="{Binding Settings.UserName}" Grid.Row="2" Grid.Column="1" />
<Label Content="{DynamicResource NaiveProxyPassword}" Grid.Row="3" Grid.Column="0" />
<TextBox Text="{Binding Settings.Password}" Grid.Row="3" Grid.Column="1" />
<Label Content="{DynamicResource NaiveProxyPassword}" Grid.Row="3" Grid.Column="0" />
<TextBox Text="{Binding Settings.Password}" Grid.Row="3" Grid.Column="1" />
<Label Content="{DynamicResource NaiveProxyMaskDomain}" Grid.Row="4" Grid.Column="0" />
<TextBox Text="{Binding Settings.MaskDomain}" Grid.Row="4" Grid.Column="1" />
</Grid>
<Label Content="{DynamicResource NaiveProxyMaskDomain}" Grid.Row="4" Grid.Column="0" />
<TextBox Text="{Binding Settings.MaskDomain}" Grid.Row="4" Grid.Column="1" />
<Border BorderBrush="#eee" BorderThickness="0,1,0,0">
<Border Grid.Row="6" Grid.ColumnSpan="3" BorderBrush="#eee" BorderThickness="0,1,0,0">
<StackPanel Orientation="Horizontal"
HorizontalAlignment="Right"
Margin="0,20,0,0">
HorizontalAlignment="Right">
<Button Content="{DynamicResource Save}"
Command="{Binding SaveCommand}"
HorizontalAlignment="Right"
@ -72,6 +73,6 @@
Margin="20,0,40,0" />
</StackPanel>
</Border>
</StackPanel>
</Grid>
</Grid>
</views:MvxWindow>

7
ProxySuper.WPF/Views/NaiveProxy/NaiveProxyEditorView.xaml.cs
View File

@ -1,10 +1,9 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// NaiveProxyEditorView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class NaiveProxyEditorView : MvxWindow
{
public NaiveProxyEditorView()

7
ProxySuper.WPF/Views/NaiveProxy/NaiveProxyInstallView.xaml.cs
View File

@ -1,4 +1,5 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using System;
using System.Collections.Generic;
using System.Linq;
@ -15,9 +16,7 @@ using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.NaiveProxy
{
/// <summary>
/// NaiveProxyInstallViewModel.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class NaiveProxyInstallView : MvxWindow
{
public NaiveProxyInstallView()

7
ProxySuper.WPF/Views/ShareLinkView.xaml.cs
View File

@ -1,10 +1,9 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// ShareLinkView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class ShareLinkView : MvxWindow
{
public ShareLinkView()

7
ProxySuper.WPF/Views/TrojanGo/TrojanGoConfigView.xaml.cs
View File

@ -1,11 +1,10 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using ProxySuper.Core.ViewModels;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// TrojanGoConfigView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class TrojanGoConfigView : MvxWindow
{
public TrojanGoConfigView()

1
ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml
View File

@ -70,7 +70,6 @@
BorderBrush="#eee"
BorderThickness="0,1,0,0">
<StackPanel Orientation="Horizontal"
Height="50"
HorizontalAlignment="Right">
<Button Content="{DynamicResource Save}"
Command="{Binding SaveCommand}"

5
ProxySuper.WPF/Views/TrojanGo/TrojanGoEditorView.xaml.cs
View File

@ -3,10 +3,7 @@ using MvvmCross.Platforms.Wpf.Views;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// TrojanEditorView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation(Identifier = nameof(TrojanGoEditorView), Modal = false)]
[MvxWindowPresentation]
public partial class TrojanGoEditorView : MvxWindow
{
public TrojanGoEditorView()

7
ProxySuper.WPF/Views/TrojanGo/TrojanGoInstallView.xaml.cs
View File

@ -1,4 +1,5 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using System;
using System.Collections.Generic;
using System.Linq;
@ -15,9 +16,7 @@ using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.TrojanGo
{
/// <summary>
/// TrojanGoInstallView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class TrojanGoInstallView : MvxWindow
{
public TrojanGoInstallView()

5
ProxySuper.WPF/Views/V2ray/V2rayConfigView.xaml.cs
View File

@ -1,4 +1,5 @@
using Microsoft.Win32;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using ProxySuper.Core.Models.Projects;
using ProxySuper.Core.ViewModels;
@ -21,9 +22,7 @@ using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.V2ray
{
/// <summary>
/// V2rayConfigView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class V2rayConfigView : MvxWindow
{
public V2rayConfigView()

2
ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml
View File

@ -43,7 +43,7 @@
<Border Grid.Row="1"
BorderBrush="#eee"
BorderThickness="0,1,0,0">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Height="50">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<Button Content="{DynamicResource Save}"
Command="{Binding SaveCommand}"
HorizontalAlignment="Right"

3
ProxySuper.WPF/Views/V2ray/V2rayEditorView.xaml.cs
View File

@ -16,9 +16,6 @@ using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.V2ray
{
/// <summary>
/// V2rayEditorView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class V2rayEditorView : MvxWindow
{

7
ProxySuper.WPF/Views/V2ray/V2rayInstallView.xaml.cs
View File

@ -1,4 +1,5 @@
using MvvmCross.Platforms.Wpf.Views;
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using System;
using System.Collections.Generic;
using System.Linq;
@ -15,9 +16,7 @@ using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.V2ray
{
/// <summary>
/// V2rayInstallView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class V2rayInstallView : MvxWindow
{
public V2rayInstallView()

5
ProxySuper.WPF/Views/Xray/XrayConfigView.xaml.cs
View File

@ -13,10 +13,7 @@ using System.Windows.Media.Imaging;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// XrayInfoView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation()]
[MvxWindowPresentation]
public partial class XrayConfigView : MvxWindow
{
public XrayConfigView()

2
ProxySuper.WPF/Views/Xray/XrayEditorView.xaml
View File

@ -44,7 +44,7 @@
<Border Grid.Row="1"
BorderBrush="#eee"
BorderThickness="0,1,0,0">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Height="50">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<Button Content="{DynamicResource Save}"
Command="{Binding SaveCommand}"
HorizontalAlignment="Right"

5
ProxySuper.WPF/Views/Xray/XrayEditorView.xaml.cs
View File

@ -4,10 +4,7 @@ using System;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// XrayEditorView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation()]
[MvxWindowPresentation]
public partial class XrayEditorView : MvxWindow
{
public XrayEditorView()

5
ProxySuper.WPF/Views/Xray/XrayInstallView.xaml.cs
View File

@ -18,10 +18,7 @@ using System.Windows.Shapes;
namespace ProxySuper.WPF.Views
{
/// <summary>
/// XrayInstallView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation()]
[MvxWindowPresentation]
public partial class XrayInstallView : MvxWindow
{
public XrayInstallView()