mirror of
https://github.com/2dust/v2rayN.git
synced 2026-02-28 21:23:04 +00:00
Compare commits
10 commits
838bd2c794
...
25fddc3c71
| Author | SHA1 | Date | |
|---|---|---|---|
|
25fddc3c71 | ||
|
|
c78b733850 | ||
|
|
a57c83125e | ||
|
|
247b59985f | ||
|
|
7470b8b6d3 | ||
|
|
776d37b7aa | ||
|
|
8f532f8468 | ||
|
|
472963fe2d | ||
|
|
6a9b62ab9a | ||
|
|
9ac8aa2969 |
38 changed files with 584 additions and 752 deletions
50
.github/workflows/build.yml
vendored
50
.github/workflows/build.yml
vendored
|
|
@ -18,43 +18,35 @@ jobs:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
# - name: 删除工作流运行
|
|
||||||
# uses: Mattraks/delete-workflow-runs@v2
|
|
||||||
# with:
|
|
||||||
# token: ${{ github.token }}
|
|
||||||
# repository: ${{ github.repository }}
|
|
||||||
# retain_days: 0
|
|
||||||
# keep_minimum_runs: 1
|
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cd v2rayN &&
|
run: cd v2rayN &&
|
||||||
./build.ps1
|
./build.ps1
|
||||||
|
|
||||||
# - name: Package
|
- name: Upload build artifacts
|
||||||
# shell: pwsh
|
uses: actions/upload-artifact@v4
|
||||||
# run: |
|
with:
|
||||||
# 7z a -mx9 ..\v2rayN.7z $env:Wap_Project_Directory
|
name: v2rayN-windows-64
|
||||||
|
path: |
|
||||||
|
./v2rayN/v2rayN-windows-64.zip
|
||||||
|
|
||||||
- name: Upload build artifacts
|
- name: Upload build artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: v2rayN
|
name: v2rayN-windows-arm64
|
||||||
path: |
|
path: |
|
||||||
./v2rayN/v2rayN.zip
|
./v2rayN/v2rayN-windows-arm64.zip
|
||||||
|
|
||||||
# - name: Release
|
- name: Upload build artifacts
|
||||||
# uses: softprops/action-gh-release@v1
|
uses: actions/upload-artifact@v4
|
||||||
# env:
|
with:
|
||||||
# GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
|
name: v2rayN-linux-64
|
||||||
# with:
|
path: |
|
||||||
# prerelease: ${{ contains(github.ref, '-') }}
|
./v2rayN/v2rayN-linux-64.zip
|
||||||
# draft: false
|
|
||||||
# files: |
|
- name: Upload build artifacts
|
||||||
# .\v2rayN\v2rayN.zip
|
uses: actions/upload-artifact@v4
|
||||||
# body: |
|
with:
|
||||||
# [](https://t.me/netch_channel) [](https://t.me/netch_group)
|
name: v2rayN-linux-arm64
|
||||||
# ## Changelogs
|
path: |
|
||||||
# * This is an automated deployment of GitHub Actions, the change log should be updated manually soon
|
./v2rayN/v2rayN-linux-arm64.zip
|
||||||
|
|
||||||
# ## 更新日志
|
|
||||||
# * 这是 GitHub Actions 自动化部署，更新日志应该很快会手动更新
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
{
|
{
|
||||||
socks = 0,
|
socks = 0,
|
||||||
socks2,
|
socks2,
|
||||||
|
socks3,
|
||||||
pac,
|
pac,
|
||||||
api,
|
api,
|
||||||
api2,
|
api2,
|
||||||
|
|
|
||||||
|
|
@ -200,7 +200,7 @@
|
||||||
public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru", "hu" };
|
public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru", "hu" };
|
||||||
public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2", "h2,http/1.1", "h3,h2,http/1.1", "" };
|
public static readonly List<string> Alpns = new() { "h3", "h2", "http/1.1", "h3,h2", "h2,http/1.1", "h3,h2,http/1.1", "" };
|
||||||
public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
|
public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
|
||||||
public static readonly List<string> InboundTags = new() { "socks", "socks2" };
|
public static readonly List<string> InboundTags = new() { "socks", "socks2", "socks3" };
|
||||||
public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
|
public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
|
||||||
public static readonly List<string> RuleNetworks = new() { "", "tcp", "udp", "tcp,udp" };
|
public static readonly List<string> RuleNetworks = new() { "", "tcp", "udp", "tcp,udp" };
|
||||||
public static readonly List<string> destOverrideProtocols = ["http", "tls", "quic", "fakedns", "fakedns+others"];
|
public static readonly List<string> destOverrideProtocols = ["http", "tls", "quic", "fakedns", "fakedns+others"];
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,16 @@
|
||||||
List<string> lstType = ["", "http", "https", "socks", "ftp"];
|
List<string> lstType = ["", "http", "https", "socks", "ftp"];
|
||||||
List<CmdItem> lstCmd = [];
|
List<CmdItem> lstCmd = [];
|
||||||
|
|
||||||
|
//GNOME
|
||||||
|
foreach (var type in lstType)
|
||||||
|
{
|
||||||
|
lstCmd.AddRange(GetSetCmd4Gnome(type, host, port));
|
||||||
|
}
|
||||||
|
if (exceptions.IsNotEmpty())
|
||||||
|
{
|
||||||
|
lstCmd.AddRange(GetSetCmd4Gnome("exceptions", exceptions, 0));
|
||||||
|
}
|
||||||
|
|
||||||
if (isKde)
|
if (isKde)
|
||||||
{
|
{
|
||||||
foreach (var type in lstType)
|
foreach (var type in lstType)
|
||||||
|
|
@ -45,17 +55,13 @@
|
||||||
{
|
{
|
||||||
lstCmd.AddRange(GetSetCmd4Kde("exceptions", exceptions, 0, configDir));
|
lstCmd.AddRange(GetSetCmd4Kde("exceptions", exceptions, 0, configDir));
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
// Notify system to reload
|
||||||
{
|
lstCmd.Add(new CmdItem()
|
||||||
foreach (var type in lstType)
|
|
||||||
{
|
{
|
||||||
lstCmd.AddRange(GetSetCmd4Gnome(type, host, port));
|
Cmd = "dbus-send",
|
||||||
}
|
Arguments = ["--type=signal", "/KIO/Scheduler", "org.kde.KIO.Scheduler.reparseSlaveConfiguration", "string:''"]
|
||||||
if (exceptions.IsNotEmpty())
|
});
|
||||||
{
|
|
||||||
lstCmd.AddRange(GetSetCmd4Gnome("exceptions", exceptions, 0));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return lstCmd;
|
return lstCmd;
|
||||||
}
|
}
|
||||||
|
|
@ -65,6 +71,13 @@
|
||||||
var isKde = IsKde(out var configDir);
|
var isKde = IsKde(out var configDir);
|
||||||
List<CmdItem> lstCmd = [];
|
List<CmdItem> lstCmd = [];
|
||||||
|
|
||||||
|
//GNOME
|
||||||
|
lstCmd.Add(new CmdItem()
|
||||||
|
{
|
||||||
|
Cmd = "gsettings",
|
||||||
|
Arguments = ["set", "org.gnome.system.proxy", "mode", "none"]
|
||||||
|
});
|
||||||
|
|
||||||
if (isKde)
|
if (isKde)
|
||||||
{
|
{
|
||||||
lstCmd.Add(new CmdItem()
|
lstCmd.Add(new CmdItem()
|
||||||
|
|
@ -72,16 +85,14 @@
|
||||||
Cmd = GetKdeVersion(),
|
Cmd = GetKdeVersion(),
|
||||||
Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0"]
|
Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0"]
|
||||||
});
|
});
|
||||||
}
|
|
||||||
else
|
// Notify system to reload
|
||||||
{
|
|
||||||
lstCmd.Add(new CmdItem()
|
lstCmd.Add(new CmdItem()
|
||||||
{
|
{
|
||||||
Cmd = "gsettings",
|
Cmd = "dbus-send",
|
||||||
Arguments = ["set", "org.gnome.system.proxy", "mode", "none"]
|
Arguments = ["--type=signal", "/KIO/Scheduler", "org.kde.KIO.Scheduler.reparseSlaveConfiguration", "string:''"]
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return lstCmd;
|
return lstCmd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -161,7 +172,11 @@
|
||||||
{
|
{
|
||||||
configDir = "/home";
|
configDir = "/home";
|
||||||
var desktop = Environment.GetEnvironmentVariable("XDG_CURRENT_DESKTOP");
|
var desktop = Environment.GetEnvironmentVariable("XDG_CURRENT_DESKTOP");
|
||||||
var isKde = string.Equals(desktop, "KDE", StringComparison.OrdinalIgnoreCase);
|
var desktop2 = Environment.GetEnvironmentVariable("XDG_SESSION_DESKTOP");
|
||||||
|
var isKde = string.Equals(desktop, "KDE", StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| string.Equals(desktop, "plasma", StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| string.Equals(desktop2, "KDE", StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| string.Equals(desktop2, "plasma", StringComparison.OrdinalIgnoreCase);
|
||||||
if (isKde)
|
if (isKde)
|
||||||
{
|
{
|
||||||
var homeDir = Environment.GetEnvironmentVariable("HOME");
|
var homeDir = Environment.GetEnvironmentVariable("HOME");
|
||||||
|
|
@ -173,6 +188,7 @@
|
||||||
|
|
||||||
return isKde;
|
return isKde;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string GetKdeVersion()
|
private static string GetKdeVersion()
|
||||||
{
|
{
|
||||||
var ver = Environment.GetEnvironmentVariable("KDE_SESSION_VERSION") ?? "0";
|
var ver = Environment.GetEnvironmentVariable("KDE_SESSION_VERSION") ?? "0";
|
||||||
|
|
|
||||||
|
|
@ -24,21 +24,16 @@
|
||||||
public class InItem
|
public class InItem
|
||||||
{
|
{
|
||||||
public int LocalPort { get; set; }
|
public int LocalPort { get; set; }
|
||||||
|
|
||||||
public string Protocol { get; set; }
|
public string Protocol { get; set; }
|
||||||
|
|
||||||
public bool UdpEnabled { get; set; }
|
public bool UdpEnabled { get; set; }
|
||||||
|
|
||||||
public bool SniffingEnabled { get; set; } = true;
|
public bool SniffingEnabled { get; set; } = true;
|
||||||
public List<string>? DestOverride { get; set; } = ["http", "tls"];
|
public List<string>? DestOverride { get; set; } = ["http", "tls"];
|
||||||
public bool RouteOnly { get; set; }
|
public bool RouteOnly { get; set; }
|
||||||
public bool AllowLANConn { get; set; }
|
public bool AllowLANConn { get; set; }
|
||||||
|
|
||||||
public bool NewPort4LAN { get; set; }
|
public bool NewPort4LAN { get; set; }
|
||||||
|
|
||||||
public string User { get; set; }
|
public string User { get; set; }
|
||||||
|
|
||||||
public string Pass { get; set; }
|
public string Pass { get; set; }
|
||||||
|
public bool SecondLocalPortEnabled { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
|
|
|
||||||
29
v2rayN/ServiceLib/Resx/ResUI.Designer.cs
generated
29
v2rayN/ServiceLib/Resx/ResUI.Designer.cs
generated
|
|
@ -2599,6 +2599,15 @@ namespace ServiceLib.Resx {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 socks: local port, socks2: second local port, socks3: LAN port 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string TbRoutingInboundTagTips {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("TbRoutingInboundTagTips", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 Domain 的本地化字符串。
|
/// 查找类似 Domain 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -2914,6 +2923,15 @@ namespace ServiceLib.Resx {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 Sniffing type 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string TbSettingsDestOverride {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("TbSettingsDestOverride", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 Outbound DNS address 的本地化字符串。
|
/// 查找类似 Outbound DNS address 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -3301,6 +3319,15 @@ namespace ServiceLib.Resx {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找类似 Enable second mixed port 的本地化字符串。
|
||||||
|
/// </summary>
|
||||||
|
public static string TbSettingsSecondLocalPortEnabled {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("TbSettingsSecondLocalPortEnabled", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 Set Win10 UWP Loopback 的本地化字符串。
|
/// 查找类似 Set Win10 UWP Loopback 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -3329,7 +3356,7 @@ namespace ServiceLib.Resx {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找类似 Pac port = +2; Xray API port = +3; mihomo API port = +4; 的本地化字符串。
|
/// 查找类似 Pac port = +3; Xray API port = +4; mihomo API port = +5; 的本地化字符串。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string TbSettingsSocksPortTip {
|
public static string TbSettingsSocksPortTip {
|
||||||
get {
|
get {
|
||||||
|
|
|
||||||
|
|
@ -1244,7 +1244,7 @@
|
||||||
<value>فایل TTF/TTC فونت را در دایرکتوری guiFonts کپی کنید، تنظیمات را مجددا راه اندازی کنید</value>
|
<value>فایل TTF/TTC فونت را در دایرکتوری guiFonts کپی کنید، تنظیمات را مجددا راه اندازی کنید</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
||||||
<value>پورت Pac = +2; پورت Xray API = +3; پورت mihomo API = +4;</value>
|
<value>پورت Pac = +3; پورت Xray API = +4; پورت mihomo API = +5;</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsStartBootTip" xml:space="preserve">
|
<data name="TbSettingsStartBootTip" xml:space="preserve">
|
||||||
<value>این را با امتیازات ادمین تنظیم کنید، پس از راه اندازی، امتیازات مدیر را دریافت کنید</value>
|
<value>این را با امتیازات ادمین تنظیم کنید، پس از راه اندازی، امتیازات مدیر را دریافت کنید</value>
|
||||||
|
|
@ -1390,4 +1390,13 @@
|
||||||
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
||||||
<value>استثنا:از سرور پروکسی برای آدرس ها، با کاما (،) استفاده نکنید</value>
|
<value>استثنا:از سرور پروکسی برای آدرس ها، با کاما (،) استفاده نکنید</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="TbSettingsDestOverride" xml:space="preserve">
|
||||||
|
<value>نوع Sniffing</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbSettingsSecondLocalPortEnabled" xml:space="preserve">
|
||||||
|
<value>فعال کردن دومین پورت ترکیبی</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbRoutingInboundTagTips" xml:space="preserve">
|
||||||
|
<value>socks:پورت محلی، socks2: پورت دوم محلی، socks3: پورت LAN</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@
|
||||||
<value>text/microsoft-resx</value>
|
<value>text/microsoft-resx</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<resheader name="version">
|
<resheader name="version">
|
||||||
<value>2.0</value>
|
<value>2.0</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<resheader name="reader">
|
<resheader name="reader">
|
||||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
|
@ -992,7 +992,7 @@
|
||||||
<value>Kérlek, másold a betűtípus TTF/TTC fájlt a guiFonts könyvtárba, indítsd újra a beállításokat</value>
|
<value>Kérlek, másold a betűtípus TTF/TTC fájlt a guiFonts könyvtárba, indítsd újra a beállításokat</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
||||||
<value>Pac port = +2; Xray API port = +3; mihomo API port = +4;</value>
|
<value>Pac port = +3; Xray API port = +4; mihomo API port = +5;</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsStartBootTip" xml:space="preserve">
|
<data name="TbSettingsStartBootTip" xml:space="preserve">
|
||||||
<value>Állítsd be ezt admin jogokkal, indítás után szerezd meg az admin jogokat</value>
|
<value>Állítsd be ezt admin jogokkal, indítás után szerezd meg az admin jogokat</value>
|
||||||
|
|
@ -1390,4 +1390,13 @@
|
||||||
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
||||||
<value>Kivétel. Ne használj proxy szervert a címeknél, évezz pontosvesszőt (,)</value>
|
<value>Kivétel. Ne használj proxy szervert a címeknél, évezz pontosvesszőt (,)</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
<data name="TbSettingsDestOverride" xml:space="preserve">
|
||||||
|
<value>Sniffing type</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbSettingsSecondLocalPortEnabled" xml:space="preserve">
|
||||||
|
<value>Enable second mixed port</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbRoutingInboundTagTips" xml:space="preserve">
|
||||||
|
<value>socks: local port, socks2: second local port, socks3: LAN port</value>
|
||||||
|
</data>
|
||||||
|
</root>
|
||||||
|
|
@ -992,7 +992,7 @@
|
||||||
<value>Copy the font TTF/TTC file to the directory guiFonts, restart the settings</value>
|
<value>Copy the font TTF/TTC file to the directory guiFonts, restart the settings</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
||||||
<value>Pac port = +2; Xray API port = +3; mihomo API port = +4;</value>
|
<value>Pac port = +3; Xray API port = +4; mihomo API port = +5;</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsStartBootTip" xml:space="preserve">
|
<data name="TbSettingsStartBootTip" xml:space="preserve">
|
||||||
<value>Set this with admin privileges, get admin privileges after startup</value>
|
<value>Set this with admin privileges, get admin privileges after startup</value>
|
||||||
|
|
@ -1390,4 +1390,13 @@
|
||||||
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
||||||
<value>Exception. Do not use proxy server for addresses,with a comma (,)</value>
|
<value>Exception. Do not use proxy server for addresses,with a comma (,)</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="TbSettingsDestOverride" xml:space="preserve">
|
||||||
|
<value>Sniffing type</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbSettingsSecondLocalPortEnabled" xml:space="preserve">
|
||||||
|
<value>Enable second mixed port</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbRoutingInboundTagTips" xml:space="preserve">
|
||||||
|
<value>socks: local port, socks2: second local port, socks3: LAN port</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
|
|
@ -1310,7 +1310,7 @@
|
||||||
<value>Move up and down</value>
|
<value>Move up and down</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
||||||
<value>Pac port = +2; Xray API port = +3; mihomo API port = +4;</value>
|
<value>Pac port = +3; Xray API port = +4; mihomo API port = +5;</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
|
<data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
|
||||||
<value>Install the font to the system and restart the settings</value>
|
<value>Install the font to the system and restart the settings</value>
|
||||||
|
|
@ -1390,4 +1390,13 @@
|
||||||
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
||||||
<value>Exception. Do not use proxy server for addresses,with a comma (,)</value>
|
<value>Exception. Do not use proxy server for addresses,with a comma (,)</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="TbSettingsDestOverride" xml:space="preserve">
|
||||||
|
<value>Sniffing type</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbSettingsSecondLocalPortEnabled" xml:space="preserve">
|
||||||
|
<value>Enable second mixed port</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbRoutingInboundTagTips" xml:space="preserve">
|
||||||
|
<value>socks: local port, socks2: second local port, socks3: LAN port</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
|
|
@ -992,7 +992,7 @@
|
||||||
<value>拷贝字体TTF/TTC文件到目录guiFonts，重启设置</value>
|
<value>拷贝字体TTF/TTC文件到目录guiFonts，重启设置</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
||||||
<value>Pac端口= +2；Xray API端口= +3；mihomo API端口= +4；</value>
|
<value>Pac端口= +3；Xray API端口= +4；mihomo API端口= +5；</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsStartBootTip" xml:space="preserve">
|
<data name="TbSettingsStartBootTip" xml:space="preserve">
|
||||||
<value>以管理员权限设置此项，在启动后获得管理员权限</value>
|
<value>以管理员权限设置此项，在启动后获得管理员权限</value>
|
||||||
|
|
@ -1387,4 +1387,13 @@
|
||||||
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
||||||
<value>例外. 对于下列地址不使用代理配置文件:使用逗号(,)分隔</value>
|
<value>例外. 对于下列地址不使用代理配置文件:使用逗号(,)分隔</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="TbSettingsDestOverride" xml:space="preserve">
|
||||||
|
<value>流量探测类型</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbSettingsSecondLocalPortEnabled" xml:space="preserve">
|
||||||
|
<value>开启第二个本地监听端口</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbRoutingInboundTagTips" xml:space="preserve">
|
||||||
|
<value>socks：本地端口，socks2：第二个本地端口，socks3：局域网端口</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
|
|
@ -992,7 +992,7 @@
|
||||||
<value>複製字型TTF/TTC檔案到目錄guiFonts，重啟設定</value>
|
<value>複製字型TTF/TTC檔案到目錄guiFonts，重啟設定</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
<data name="TbSettingsSocksPortTip" xml:space="preserve">
|
||||||
<value>Pac連接埠= +2；Xray API連接埠= +3；mihomo API連接埠= +4；</value>
|
<value>Pac連接埠= +3；Xray API連接埠= +4；mihomo API連接埠= +5；</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="TbSettingsStartBootTip" xml:space="preserve">
|
<data name="TbSettingsStartBootTip" xml:space="preserve">
|
||||||
<value>以管理員權限設定此項，在啟動後獲得管理員權限</value>
|
<value>以管理員權限設定此項，在啟動後獲得管理員權限</value>
|
||||||
|
|
@ -1387,4 +1387,13 @@
|
||||||
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
<data name="TbSettingsExceptionTip2" xml:space="preserve">
|
||||||
<value>例外. 對於下列位址不使用代理設定檔:使用逗號(,)分隔</value>
|
<value>例外. 對於下列位址不使用代理設定檔:使用逗號(,)分隔</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="TbSettingsDestOverride" xml:space="preserve">
|
||||||
|
<value>流量探測類型</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbSettingsSecondLocalPortEnabled" xml:space="preserve">
|
||||||
|
<value>開啟第二個本機監聽埠</value>
|
||||||
|
</data>
|
||||||
|
<data name="TbRoutingInboundTagTips" xml:space="preserve">
|
||||||
|
<value>socks：本地端口，socks2：第二個本地端口，socks3：區域網路端口</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
|
|
@ -507,11 +507,17 @@ namespace ServiceLib.Services.CoreConfig
|
||||||
inbound.domain_strategy = routing.DomainStrategy4Singbox;
|
inbound.domain_strategy = routing.DomainStrategy4Singbox;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_config.Inbound.First().SecondLocalPortEnabled)
|
||||||
|
{
|
||||||
|
var inbound2 = GetInbound(inbound, EInboundProtocol.socks2, true);
|
||||||
|
singboxConfig.inbounds.Add(inbound2);
|
||||||
|
}
|
||||||
|
|
||||||
if (_config.Inbound.First().AllowLANConn)
|
if (_config.Inbound.First().AllowLANConn)
|
||||||
{
|
{
|
||||||
if (_config.Inbound.First().NewPort4LAN)
|
if (_config.Inbound.First().NewPort4LAN)
|
||||||
{
|
{
|
||||||
var inbound3 = GetInbound(inbound, EInboundProtocol.socks2, true);
|
var inbound3 = GetInbound(inbound, EInboundProtocol.socks3, true);
|
||||||
inbound3.listen = listen;
|
inbound3.listen = listen;
|
||||||
singboxConfig.inbounds.Add(inbound3);
|
singboxConfig.inbounds.Add(inbound3);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -394,11 +394,17 @@ namespace ServiceLib.Services.CoreConfig
|
||||||
var inbound = GetInbound(_config.Inbound.First(), EInboundProtocol.socks, true);
|
var inbound = GetInbound(_config.Inbound.First(), EInboundProtocol.socks, true);
|
||||||
v2rayConfig.inbounds.Add(inbound);
|
v2rayConfig.inbounds.Add(inbound);
|
||||||
|
|
||||||
|
if (_config.Inbound.First().SecondLocalPortEnabled)
|
||||||
|
{
|
||||||
|
var inbound2 = GetInbound(_config.Inbound.First(), EInboundProtocol.socks2, true);
|
||||||
|
v2rayConfig.inbounds.Add(inbound2);
|
||||||
|
}
|
||||||
|
|
||||||
if (_config.Inbound.First().AllowLANConn)
|
if (_config.Inbound.First().AllowLANConn)
|
||||||
{
|
{
|
||||||
if (_config.Inbound.First().NewPort4LAN)
|
if (_config.Inbound.First().NewPort4LAN)
|
||||||
{
|
{
|
||||||
var inbound3 = GetInbound(_config.Inbound.First(), EInboundProtocol.socks2, true);
|
var inbound3 = GetInbound(_config.Inbound.First(), EInboundProtocol.socks3, true);
|
||||||
inbound3.listen = listen;
|
inbound3.listen = listen;
|
||||||
v2rayConfig.inbounds.Add(inbound3);
|
v2rayConfig.inbounds.Add(inbound3);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ namespace ServiceLib.ViewModels
|
||||||
#region Core
|
#region Core
|
||||||
|
|
||||||
[Reactive] public int localPort { get; set; }
|
[Reactive] public int localPort { get; set; }
|
||||||
|
[Reactive] public bool SecondLocalPortEnabled { get; set; }
|
||||||
[Reactive] public bool udpEnabled { get; set; }
|
[Reactive] public bool udpEnabled { get; set; }
|
||||||
[Reactive] public bool sniffingEnabled { get; set; }
|
[Reactive] public bool sniffingEnabled { get; set; }
|
||||||
public IList<string> destOverride { get; set; }
|
public IList<string> destOverride { get; set; }
|
||||||
|
|
@ -125,6 +126,7 @@ namespace ServiceLib.ViewModels
|
||||||
|
|
||||||
var inbound = _config.Inbound.First();
|
var inbound = _config.Inbound.First();
|
||||||
localPort = inbound.LocalPort;
|
localPort = inbound.LocalPort;
|
||||||
|
SecondLocalPortEnabled = inbound.SecondLocalPortEnabled;
|
||||||
udpEnabled = inbound.UdpEnabled;
|
udpEnabled = inbound.UdpEnabled;
|
||||||
sniffingEnabled = inbound.SniffingEnabled;
|
sniffingEnabled = inbound.SniffingEnabled;
|
||||||
routeOnly = inbound.RouteOnly;
|
routeOnly = inbound.RouteOnly;
|
||||||
|
|
@ -288,6 +290,7 @@ namespace ServiceLib.ViewModels
|
||||||
|
|
||||||
//Core
|
//Core
|
||||||
_config.Inbound.First().LocalPort = localPort;
|
_config.Inbound.First().LocalPort = localPort;
|
||||||
|
_config.Inbound.First().SecondLocalPortEnabled = SecondLocalPortEnabled;
|
||||||
_config.Inbound.First().UdpEnabled = udpEnabled;
|
_config.Inbound.First().UdpEnabled = udpEnabled;
|
||||||
_config.Inbound.First().SniffingEnabled = sniffingEnabled;
|
_config.Inbound.First().SniffingEnabled = sniffingEnabled;
|
||||||
_config.Inbound.First().DestOverride = destOverride?.ToList();
|
_config.Inbound.First().DestOverride = destOverride?.ToList();
|
||||||
|
|
|
||||||
|
|
@ -451,21 +451,20 @@ namespace ServiceLib.ViewModels
|
||||||
public async Task InboundDisplayStatus()
|
public async Task InboundDisplayStatus()
|
||||||
{
|
{
|
||||||
StringBuilder sb = new();
|
StringBuilder sb = new();
|
||||||
sb.Append($"[{EInboundProtocol.mixed}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)}]");
|
sb.Append($"[{EInboundProtocol.mixed}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)}");
|
||||||
|
if (_config.Inbound.First().SecondLocalPortEnabled)
|
||||||
|
{
|
||||||
|
sb.Append($",{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks2)}");
|
||||||
|
}
|
||||||
|
sb.Append(']');
|
||||||
InboundDisplay = $"{ResUI.LabLocal}:{sb}";
|
InboundDisplay = $"{ResUI.LabLocal}:{sb}";
|
||||||
|
|
||||||
if (_config.Inbound.First().AllowLANConn)
|
if (_config.Inbound.First().AllowLANConn)
|
||||||
{
|
{
|
||||||
if (_config.Inbound.First().NewPort4LAN)
|
var lan = _config.Inbound.First().NewPort4LAN
|
||||||
{
|
? $"[{EInboundProtocol.mixed}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks3)}]"
|
||||||
StringBuilder sb2 = new();
|
: $"[{EInboundProtocol.mixed}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks)}]";
|
||||||
sb2.Append($"[{EInboundProtocol.mixed}:{AppHandler.Instance.GetLocalPort(EInboundProtocol.socks2)}]");
|
InboundLanDisplay = $"{ResUI.LabLAN}:{lan}";
|
||||||
InboundLanDisplay = $"{ResUI.LabLAN}:{sb2}";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
InboundLanDisplay = $"{ResUI.LabLAN}:{sb}";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,10 @@ param (
|
||||||
[Parameter()]
|
[Parameter()]
|
||||||
[ValidateNotNullOrEmpty()]
|
[ValidateNotNullOrEmpty()]
|
||||||
[string]
|
[string]
|
||||||
$OutputPath = './bin/v2rayN'
|
$OutputPathWin64 = './bin/v2rayN/win-x64',
|
||||||
|
$OutputPathWinArm64 = './bin/v2rayN/win-arm64',
|
||||||
|
$OutputPathLinux64 = './bin/v2rayN/linux-x64',
|
||||||
|
$OutputPathLinuxArm64 = './bin/v2rayN/linux-arm64'
|
||||||
)
|
)
|
||||||
|
|
||||||
Write-Host 'Building'
|
Write-Host 'Building'
|
||||||
|
|
@ -14,7 +17,7 @@ dotnet publish `
|
||||||
--self-contained false `
|
--self-contained false `
|
||||||
-p:PublishReadyToRun=false `
|
-p:PublishReadyToRun=false `
|
||||||
-p:PublishSingleFile=true `
|
-p:PublishSingleFile=true `
|
||||||
-o "$OutputPath/win-x64"
|
-o $OutputPathWin64
|
||||||
|
|
||||||
dotnet publish `
|
dotnet publish `
|
||||||
./v2rayN/v2rayN.csproj `
|
./v2rayN/v2rayN.csproj `
|
||||||
|
|
@ -23,7 +26,7 @@ dotnet publish `
|
||||||
--self-contained false `
|
--self-contained false `
|
||||||
-p:PublishReadyToRun=false `
|
-p:PublishReadyToRun=false `
|
||||||
-p:PublishSingleFile=true `
|
-p:PublishSingleFile=true `
|
||||||
-o "$OutputPath/win-arm64"
|
-o $OutputPathWinArm64
|
||||||
|
|
||||||
dotnet publish `
|
dotnet publish `
|
||||||
./v2rayN.Desktop/v2rayN.Desktop.csproj `
|
./v2rayN.Desktop/v2rayN.Desktop.csproj `
|
||||||
|
|
@ -32,7 +35,7 @@ dotnet publish `
|
||||||
--self-contained true `
|
--self-contained true `
|
||||||
-p:PublishReadyToRun=false `
|
-p:PublishReadyToRun=false `
|
||||||
-p:PublishSingleFile=true `
|
-p:PublishSingleFile=true `
|
||||||
-o "$OutputPath/linux-x64"
|
-o $OutputPathLinux64
|
||||||
|
|
||||||
dotnet publish `
|
dotnet publish `
|
||||||
./v2rayN.Desktop/v2rayN.Desktop.csproj `
|
./v2rayN.Desktop/v2rayN.Desktop.csproj `
|
||||||
|
|
@ -41,7 +44,7 @@ dotnet publish `
|
||||||
--self-contained true `
|
--self-contained true `
|
||||||
-p:PublishReadyToRun=false `
|
-p:PublishReadyToRun=false `
|
||||||
-p:PublishSingleFile=true `
|
-p:PublishSingleFile=true `
|
||||||
-o "$OutputPath/linux-arm64"
|
-o $OutputPathLinuxArm64
|
||||||
|
|
||||||
|
|
||||||
if ( -Not $? ) {
|
if ( -Not $? ) {
|
||||||
|
|
@ -49,14 +52,16 @@ if ( -Not $? ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( Test-Path -Path ./bin/v2rayN ) {
|
if ( Test-Path -Path ./bin/v2rayN ) {
|
||||||
rm -Force "$OutputPath/win-x64/*.pdb"
|
rm -Force "$OutputPathWin64/*.pdb"
|
||||||
rm -Force "$OutputPath/win-arm64/*.pdb"
|
rm -Force "$OutputPathWinArm64/*.pdb"
|
||||||
rm -Force "$OutputPath/linux-x64/*.pdb"
|
rm -Force "$OutputPathLinux64/*.pdb"
|
||||||
rm -Force "$OutputPath/linux-arm64/*.pdb"
|
rm -Force "$OutputPathLinuxArm64/*.pdb"
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host 'Build done'
|
Write-Host 'Build done'
|
||||||
|
|
||||||
ls $OutputPath
|
7z a v2rayN-windows-64.zip $OutputPathWin64
|
||||||
7z a v2rayN.zip $OutputPath
|
7z a v2rayN-windows-arm64.zip $OutputPathWinArm64
|
||||||
|
7z a v2rayN-linux-64.zip $OutputPathLinux64
|
||||||
|
7z a v2rayN-linux-arm64.zip $OutputPathLinuxArm64
|
||||||
exit 0
|
exit 0
|
||||||
|
|
@ -109,7 +109,8 @@ namespace v2rayN.Desktop.ViewModels
|
||||||
x.OfType<Menu>(),
|
x.OfType<Menu>(),
|
||||||
x.OfType<ContextMenu>(),
|
x.OfType<ContextMenu>(),
|
||||||
x.OfType<DataGridRow>(),
|
x.OfType<DataGridRow>(),
|
||||||
x.OfType<ListBoxItem>()
|
x.OfType<ListBoxItem>(),
|
||||||
|
x.OfType<HeaderedContentControl>()
|
||||||
));
|
));
|
||||||
style.Add(new Setter()
|
style.Add(new Setter()
|
||||||
{
|
{
|
||||||
|
|
@ -137,6 +138,7 @@ namespace v2rayN.Desktop.ViewModels
|
||||||
x.OfType<ContextMenu>(),
|
x.OfType<ContextMenu>(),
|
||||||
x.OfType<DataGridRow>(),
|
x.OfType<DataGridRow>(),
|
||||||
x.OfType<ListBoxItem>(),
|
x.OfType<ListBoxItem>(),
|
||||||
|
x.OfType<HeaderedContentControl>(),
|
||||||
x.OfType<WindowNotificationManager>()
|
x.OfType<WindowNotificationManager>()
|
||||||
));
|
));
|
||||||
style.Add(new Setter()
|
style.Add(new Setter()
|
||||||
|
|
|
||||||
|
|
@ -34,147 +34,126 @@
|
||||||
IsCancel="True" />
|
IsCancel="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||||
<Grid>
|
<Grid ColumnDefinitions="Auto,Auto,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid Grid.Row="0">
|
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.menuServers}" />
|
Text="{x:Static resx:ResUI.menuServers}" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbRemarks}" />
|
Text="{x:Static resx:ResUI.TbRemarks}" />
|
||||||
|
|
||||||
<TextBox
|
<TextBox
|
||||||
x:Name="txtRemarks"
|
x:Name="txtRemarks"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="400"
|
Width="400"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbAddress}" />
|
Text="{x:Static resx:ResUI.TbAddress}" />
|
||||||
<TextBox
|
<TextBox
|
||||||
x:Name="txtAddress"
|
x:Name="txtAddress"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="400"
|
Width="400"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
IsReadOnly="True" />
|
IsReadOnly="True" />
|
||||||
<StackPanel
|
<StackPanel
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnBrowse"
|
x:Name="btnBrowse"
|
||||||
Margin="2,0"
|
Margin="2,0"
|
||||||
Content="{x:Static resx:ResUI.TbBrowse}" />
|
Content="{x:Static resx:ResUI.TbBrowse}" />
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnEdit"
|
x:Name="btnEdit"
|
||||||
Margin="2,0"
|
Margin="2,0"
|
||||||
Content="{x:Static resx:ResUI.TbEdit}" />
|
Content="{x:Static resx:ResUI.TbEdit}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="3"
|
Grid.Row="3"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbCoreType}" />
|
Text="{x:Static resx:ResUI.TbCoreType}" />
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbCoreType"
|
x:Name="cmbCoreType"
|
||||||
Grid.Row="3"
|
Grid.Row="3"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
MaxDropDownHeight="1000" />
|
MaxDropDownHeight="1000" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="4"
|
Grid.Row="4"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbDisplayLog}" />
|
Text="{x:Static resx:ResUI.TbDisplayLog}" />
|
||||||
<StackPanel
|
<StackPanel
|
||||||
Grid.Row="4"
|
Grid.Row="4"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="togDisplayLog"
|
x:Name="togDisplayLog"
|
||||||
HorizontalAlignment="Left"
|
|
||||||
Classes="Margin8" />
|
|
||||||
<TextBlock
|
|
||||||
Margin="8,0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Text="{x:Static resx:ResUI.TipDisplayLog}" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<TextBlock
|
|
||||||
Grid.Row="5"
|
|
||||||
Grid.Column="0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Classes="Margin8"
|
|
||||||
Text="{x:Static resx:ResUI.TbPreSocksPort}" />
|
|
||||||
<TextBox
|
|
||||||
x:Name="txtPreSocksPort"
|
|
||||||
Grid.Row="5"
|
|
||||||
Grid.Column="1"
|
|
||||||
Width="200"
|
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
<StackPanel
|
<TextBlock
|
||||||
Grid.Row="6"
|
Margin="8,0"
|
||||||
Grid.Column="1"
|
VerticalAlignment="Center"
|
||||||
Grid.ColumnSpan="2"
|
Text="{x:Static resx:ResUI.TipDisplayLog}" />
|
||||||
Classes="Margin8">
|
</StackPanel>
|
||||||
<TextBlock
|
|
||||||
Width="500"
|
<TextBlock
|
||||||
VerticalAlignment="Center"
|
Grid.Row="5"
|
||||||
Text="{x:Static resx:ResUI.TipPreSocksPort}"
|
Grid.Column="0"
|
||||||
TextWrapping="Wrap" />
|
VerticalAlignment="Center"
|
||||||
<TextBlock
|
Classes="Margin8"
|
||||||
Width="500"
|
Text="{x:Static resx:ResUI.TbPreSocksPort}" />
|
||||||
Margin="8,0"
|
<TextBox
|
||||||
VerticalAlignment="Center"
|
x:Name="txtPreSocksPort"
|
||||||
Text="{x:Static resx:ResUI.CustomServerTips}"
|
Grid.Row="5"
|
||||||
TextWrapping="Wrap" />
|
Grid.Column="1"
|
||||||
</StackPanel>
|
Width="200"
|
||||||
</Grid>
|
HorizontalAlignment="Left"
|
||||||
|
Classes="Margin8" />
|
||||||
|
<StackPanel
|
||||||
|
Grid.Row="6"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
|
Classes="Margin8">
|
||||||
|
<TextBlock
|
||||||
|
Width="500"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Text="{x:Static resx:ResUI.TipPreSocksPort}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
<TextBlock
|
||||||
|
Width="500"
|
||||||
|
Margin="8,0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Text="{x:Static resx:ResUI.CustomServerTips}"
|
||||||
|
TextWrapping="Wrap" />
|
||||||
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
|
||||||
|
|
@ -34,31 +34,12 @@
|
||||||
IsCancel="True" />
|
IsCancel="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||||
<Grid>
|
<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
|
|
||||||
<Grid Grid.Row="0">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
Grid.Row="0"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="180,Auto,Auto"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
|
|
@ -122,18 +103,9 @@
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="gridVMess"
|
x:Name="gridVMess"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
IsVisible="False">
|
ColumnDefinitions="180,Auto,Auto"
|
||||||
<Grid.RowDefinitions>
|
IsVisible="False"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|
@ -184,17 +156,9 @@
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="gridSs"
|
x:Name="gridSs"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
IsVisible="False">
|
ColumnDefinitions="180,Auto"
|
||||||
<Grid.RowDefinitions>
|
IsVisible="False"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|
@ -225,17 +189,9 @@
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="gridSocks"
|
x:Name="gridSocks"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
IsVisible="False">
|
ColumnDefinitions="180,Auto"
|
||||||
<Grid.RowDefinitions>
|
IsVisible="False"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|
@ -266,18 +222,9 @@
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="gridVLESS"
|
x:Name="gridVLESS"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
IsVisible="False">
|
ColumnDefinitions="180,Auto,Auto"
|
||||||
<Grid.RowDefinitions>
|
IsVisible="False"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|
@ -328,17 +275,9 @@
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="gridTrojan"
|
x:Name="gridTrojan"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
IsVisible="False">
|
ColumnDefinitions="180,Auto"
|
||||||
<Grid.RowDefinitions>
|
IsVisible="False"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|
@ -369,17 +308,9 @@
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="gridHysteria2"
|
x:Name="gridHysteria2"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
IsVisible="False">
|
ColumnDefinitions="180,Auto"
|
||||||
<Grid.RowDefinitions>
|
IsVisible="False"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|
@ -410,17 +341,9 @@
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="gridTuic"
|
x:Name="gridTuic"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
IsVisible="False">
|
ColumnDefinitions="180,Auto"
|
||||||
<Grid.RowDefinitions>
|
IsVisible="False"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|
@ -464,19 +387,9 @@
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="gridWireguard"
|
x:Name="gridWireguard"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
IsVisible="False">
|
ColumnDefinitions="180,Auto"
|
||||||
<Grid.RowDefinitions>
|
IsVisible="False"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|
@ -551,22 +464,11 @@
|
||||||
Grid.Row="3"
|
Grid.Row="3"
|
||||||
Margin="0,10" />
|
Margin="0,10" />
|
||||||
|
|
||||||
<Grid x:Name="gridTransport" Grid.Row="4">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
x:Name="gridTransport"
|
||||||
<RowDefinition Height="Auto" />
|
Grid.Row="4"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="180,Auto,Auto"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
|
|
@ -695,18 +597,11 @@
|
||||||
|
|
||||||
<Separator Grid.Row="5" Margin="0,10" />
|
<Separator Grid.Row="5" Margin="0,10" />
|
||||||
|
|
||||||
<Grid x:Name="gridTls" Grid.Row="6">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
x:Name="gridTls"
|
||||||
<RowDefinition Height="Auto" />
|
Grid.Row="6"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="180,Auto"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
|
|
@ -724,18 +619,9 @@
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="gridTlsMore"
|
x:Name="gridTlsMore"
|
||||||
Grid.Row="7"
|
Grid.Row="7"
|
||||||
IsVisible="False">
|
ColumnDefinitions="180,Auto"
|
||||||
<Grid.RowDefinitions>
|
IsVisible="False"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|
@ -793,18 +679,9 @@
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="gridRealityMore"
|
x:Name="gridRealityMore"
|
||||||
Grid.Row="7"
|
Grid.Row="7"
|
||||||
IsVisible="False">
|
ColumnDefinitions="180,Auto"
|
||||||
<Grid.RowDefinitions>
|
IsVisible="False"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="180" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
|
|
|
||||||
|
|
@ -25,17 +25,10 @@
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Theme="{StaticResource CardBorder}">
|
Theme="{StaticResource CardBorder}">
|
||||||
|
|
||||||
<Grid Classes="Margin8">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
Classes="Margin8"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="300,200"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="300" />
|
|
||||||
<ColumnDefinition Width="200" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
|
|
@ -77,18 +70,10 @@
|
||||||
Margin="4"
|
Margin="4"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Theme="{StaticResource CardBorder}">
|
Theme="{StaticResource CardBorder}">
|
||||||
<Grid Classes="Margin8">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
Classes="Margin8"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="300,200"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="300" />
|
|
||||||
<ColumnDefinition Width="200" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
|
|
@ -111,18 +96,7 @@
|
||||||
<Button.Flyout>
|
<Button.Flyout>
|
||||||
<Flyout>
|
<Flyout>
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<Grid>
|
<Grid ColumnDefinitions="Auto,300" RowDefinitions="Auto,Auto,Auto,Auto,Auto">
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="300" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
|
|
|
||||||
|
|
@ -53,15 +53,7 @@
|
||||||
Margin="-8"
|
Margin="-8"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Theme="{StaticResource CardBorder}">
|
Theme="{StaticResource CardBorder}">
|
||||||
<Grid>
|
<Grid ColumnDefinitions="1*,1*,3*" RowDefinitions="Auto">
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="1*" />
|
|
||||||
<ColumnDefinition Width="1*" />
|
|
||||||
<ColumnDefinition Width="3*" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="togAutoRefresh"
|
x:Name="togAutoRefresh"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
|
|
|
||||||
|
|
@ -109,12 +109,7 @@
|
||||||
Padding="0"
|
Padding="0"
|
||||||
Theme="{StaticResource CardBorder}">
|
Theme="{StaticResource CardBorder}">
|
||||||
<DockPanel>
|
<DockPanel>
|
||||||
<Grid Grid.Column="0" Classes="Margin8">
|
<Grid Classes="Margin8" RowDefinitions="1*,8,1*">
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="1*" />
|
|
||||||
<RowDefinition Height="8" />
|
|
||||||
<RowDefinition Height="1*" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<DockPanel Grid.Row="0">
|
<DockPanel Grid.Row="0">
|
||||||
<TextBlock DockPanel.Dock="Right" Text="{Binding Type}" />
|
<TextBlock DockPanel.Dock="Right" Text="{Binding Type}" />
|
||||||
<TextBlock Text="{Binding Name}" />
|
<TextBlock Text="{Binding Name}" />
|
||||||
|
|
@ -154,12 +149,7 @@
|
||||||
CornerRadius="4"
|
CornerRadius="4"
|
||||||
DockPanel.Dock="Left"
|
DockPanel.Dock="Left"
|
||||||
IsVisible="{Binding IsActive}" />
|
IsVisible="{Binding IsActive}" />
|
||||||
<Grid Classes="Margin8">
|
<Grid Classes="Margin8" RowDefinitions="1*,8,1*">
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="1*" />
|
|
||||||
<RowDefinition Height="8" />
|
|
||||||
<RowDefinition Height="1*" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<TextBlock Grid.Row="0" Text="{Binding Name}" />
|
<TextBlock Grid.Row="0" Text="{Binding Name}" />
|
||||||
<DockPanel Grid.Row="2">
|
<DockPanel Grid.Row="2">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
|
|
|
||||||
|
|
@ -141,12 +141,7 @@
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
|
|
||||||
<Grid Classes="Margin8">
|
<Grid Classes="Margin8" ColumnDefinitions="*,10,*">
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
<ColumnDefinition Width="10" />
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBox
|
<TextBox
|
||||||
x:Name="txtnormalDNS2"
|
x:Name="txtnormalDNS2"
|
||||||
|
|
|
||||||
|
|
@ -39,25 +39,12 @@
|
||||||
IsCancel="True" />
|
IsCancel="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||||
<Grid>
|
<Grid RowDefinitions="Auto,Auto,Auto">
|
||||||
<Grid.RowDefinitions>
|
<Grid
|
||||||
<RowDefinition Height="Auto" />
|
x:Name="gridText"
|
||||||
<RowDefinition Height="Auto" />
|
Grid.Row="0"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="Auto,400"
|
||||||
</Grid.RowDefinitions>
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<Grid x:Name="gridText" Grid.Row="0">
|
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="400" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
|
|
|
||||||
|
|
@ -124,12 +124,10 @@
|
||||||
<view:StatusBarView DockPanel.Dock="Bottom" />
|
<view:StatusBarView DockPanel.Dock="Bottom" />
|
||||||
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid x:Name="gridMain" IsVisible="False">
|
<Grid
|
||||||
<Grid.ColumnDefinitions>
|
x:Name="gridMain"
|
||||||
<ColumnDefinition Width="1*" />
|
ColumnDefinitions="1*,10,1*"
|
||||||
<ColumnDefinition Width="10" />
|
IsVisible="False">
|
||||||
<ColumnDefinition Width="1*" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<ContentControl x:Name="tabProfiles" Grid.Column="0" />
|
<ContentControl x:Name="tabProfiles" Grid.Column="0" />
|
||||||
<GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
|
<GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
|
||||||
<TabControl
|
<TabControl
|
||||||
|
|
@ -141,12 +139,10 @@
|
||||||
<TabItem x:Name="tabClashConnections" Header="{x:Static resx:ResUI.TbConnections}" />
|
<TabItem x:Name="tabClashConnections" Header="{x:Static resx:ResUI.TbConnections}" />
|
||||||
</TabControl>
|
</TabControl>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid x:Name="gridMain1" IsVisible="False">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
x:Name="gridMain1"
|
||||||
<RowDefinition Height="1*" />
|
IsVisible="False"
|
||||||
<RowDefinition Height="10" />
|
RowDefinitions="1*,10,1*">
|
||||||
<RowDefinition Height="1*" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<ContentControl x:Name="tabProfiles1" Grid.Row="0" />
|
<ContentControl x:Name="tabProfiles1" Grid.Row="0" />
|
||||||
<GridSplitter Grid.Row="1" HorizontalAlignment="Stretch" />
|
<GridSplitter Grid.Row="1" HorizontalAlignment="Stretch" />
|
||||||
<TabControl
|
<TabControl
|
||||||
|
|
|
||||||
|
|
@ -37,33 +37,10 @@
|
||||||
<TabControl HorizontalContentAlignment="Stretch">
|
<TabControl HorizontalContentAlignment="Stretch">
|
||||||
<TabItem Header="{x:Static resx:ResUI.TbSettingsCore}">
|
<TabItem Header="{x:Static resx:ResUI.TbSettingsCore}">
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Visible">
|
<ScrollViewer VerticalScrollBarVisibility="Visible">
|
||||||
<Grid Classes="Margin8">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
Classes="Margin8"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="Auto,Auto,Auto"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
|
|
@ -86,225 +63,244 @@
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="2"
|
||||||
|
Grid.Column="0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Classes="Margin8"
|
||||||
|
Text="{x:Static resx:ResUI.TbSettingsSecondLocalPortEnabled}" />
|
||||||
|
<ToggleSwitch
|
||||||
|
x:Name="togSecondLocalPortEnabled"
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="1"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
Classes="Margin8" />
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="3"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsUdpEnabled}" />
|
Text="{x:Static resx:ResUI.TbSettingsUdpEnabled}" />
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="togudpEnabled"
|
x:Name="togudpEnabled"
|
||||||
Grid.Row="1"
|
Grid.Row="3"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="2"
|
Grid.Row="4"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsSniffingEnabled}" />
|
Text="{x:Static resx:ResUI.TbSettingsSniffingEnabled}" />
|
||||||
<StackPanel
|
<ToggleSwitch
|
||||||
Grid.Row="2"
|
x:Name="togsniffingEnabled"
|
||||||
|
Grid.Row="4"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Grid.ColumnSpan="2"
|
HorizontalAlignment="Left"
|
||||||
Orientation="Horizontal">
|
Classes="Margin8" />
|
||||||
<ToggleSwitch
|
|
||||||
x:Name="togsniffingEnabled"
|
|
||||||
HorizontalAlignment="Left"
|
|
||||||
Classes="Margin8" />
|
|
||||||
<ListBox
|
|
||||||
x:Name="clbdestOverride"
|
|
||||||
HorizontalAlignment="Left"
|
|
||||||
Classes="Margin8"
|
|
||||||
SelectionMode="Multiple"
|
|
||||||
Theme="{DynamicResource PureCardRadioGroupListBox}" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="3"
|
Grid.Row="5"
|
||||||
|
Grid.Column="0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Classes="Margin8"
|
||||||
|
Text="{x:Static resx:ResUI.TbSettingsDestOverride}" />
|
||||||
|
<ListBox
|
||||||
|
x:Name="clbdestOverride"
|
||||||
|
Grid.Row="5"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
Classes="Margin8"
|
||||||
|
SelectionMode="Multiple"
|
||||||
|
Theme="{DynamicResource PureCardRadioGroupListBox}" />
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="6"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsRouteOnly}" />
|
Text="{x:Static resx:ResUI.TbSettingsRouteOnly}" />
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="togrouteOnly"
|
x:Name="togrouteOnly"
|
||||||
Grid.Row="3"
|
Grid.Row="6"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="4"
|
Grid.Row="7"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
|
Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="togAllowLANConn"
|
x:Name="togAllowLANConn"
|
||||||
Grid.Row="4"
|
Grid.Row="7"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="5"
|
Grid.Row="8"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsNewPort4LAN}" />
|
Text="{x:Static resx:ResUI.TbSettingsNewPort4LAN}" />
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="togNewPort4LAN"
|
x:Name="togNewPort4LAN"
|
||||||
Grid.Row="5"
|
Grid.Row="8"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="6"
|
Grid.Row="9"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsUser}" />
|
Text="{x:Static resx:ResUI.TbSettingsUser}" />
|
||||||
<TextBox
|
<TextBox
|
||||||
x:Name="txtuser"
|
x:Name="txtuser"
|
||||||
Grid.Row="6"
|
Grid.Row="9"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="7"
|
Grid.Row="10"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsPass}" />
|
Text="{x:Static resx:ResUI.TbSettingsPass}" />
|
||||||
<TextBox
|
<TextBox
|
||||||
x:Name="txtpass"
|
x:Name="txtpass"
|
||||||
Grid.Row="7"
|
Grid.Row="10"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="8"
|
Grid.Row="11"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
|
Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="togmuxEnabled"
|
x:Name="togmuxEnabled"
|
||||||
Grid.Row="8"
|
Grid.Row="11"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="9"
|
Grid.Row="12"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsLogEnabledToFile}" />
|
Text="{x:Static resx:ResUI.TbSettingsLogEnabledToFile}" />
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="toglogEnabled"
|
x:Name="toglogEnabled"
|
||||||
Grid.Row="9"
|
Grid.Row="12"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="10"
|
Grid.Row="13"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsLogLevel}" />
|
Text="{x:Static resx:ResUI.TbSettingsLogLevel}" />
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbloglevel"
|
x:Name="cmbloglevel"
|
||||||
Grid.Row="10"
|
Grid.Row="13"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
ToolTip.Tip="Level" />
|
ToolTip.Tip="Level" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="11"
|
Grid.Row="14"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsDefAllowInsecure}" />
|
Text="{x:Static resx:ResUI.TbSettingsDefAllowInsecure}" />
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="togdefAllowInsecure"
|
x:Name="togdefAllowInsecure"
|
||||||
Grid.Row="11"
|
Grid.Row="14"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="12"
|
Grid.Row="15"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsDefFingerprint}" />
|
Text="{x:Static resx:ResUI.TbSettingsDefFingerprint}" />
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbdefFingerprint"
|
x:Name="cmbdefFingerprint"
|
||||||
Grid.Row="12"
|
Grid.Row="15"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="13"
|
Grid.Row="16"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsDefUserAgent}" />
|
Text="{x:Static resx:ResUI.TbSettingsDefUserAgent}" />
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbdefUserAgent"
|
x:Name="cmbdefUserAgent"
|
||||||
Grid.Row="13"
|
Grid.Row="16"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="13"
|
Grid.Row="16"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsDefUserAgentTips}" />
|
Text="{x:Static resx:ResUI.TbSettingsDefUserAgentTips}" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="14"
|
Grid.Row="17"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsMux4SboxProtocol}" />
|
Text="{x:Static resx:ResUI.TbSettingsMux4SboxProtocol}" />
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbmux4SboxProtocol"
|
x:Name="cmbmux4SboxProtocol"
|
||||||
Grid.Row="14"
|
Grid.Row="17"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="15"
|
Grid.Row="18"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsEnableCacheFile4Sbox}" />
|
Text="{x:Static resx:ResUI.TbSettingsEnableCacheFile4Sbox}" />
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="togenableCacheFile4Sbox"
|
x:Name="togenableCacheFile4Sbox"
|
||||||
Grid.Row="15"
|
Grid.Row="18"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="16"
|
Grid.Row="19"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsHysteriaBandwidth}" />
|
Text="{x:Static resx:ResUI.TbSettingsHysteriaBandwidth}" />
|
||||||
|
|
||||||
<StackPanel
|
<StackPanel
|
||||||
Grid.Row="16"
|
Grid.Row="19"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
|
|
||||||
|
|
@ -321,19 +317,19 @@
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="17"
|
Grid.Row="20"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsEnableFragment}" />
|
Text="{x:Static resx:ResUI.TbSettingsEnableFragment}" />
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
x:Name="togenableFragment"
|
x:Name="togenableFragment"
|
||||||
Grid.Row="17"
|
Grid.Row="20"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="17"
|
Grid.Row="20"
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsEnableFragmentTips}"
|
Text="{x:Static resx:ResUI.TbSettingsEnableFragmentTips}"
|
||||||
|
|
@ -344,39 +340,11 @@
|
||||||
|
|
||||||
<TabItem Header="{x:Static resx:ResUI.TbSettingsN}">
|
<TabItem Header="{x:Static resx:ResUI.TbSettingsN}">
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Visible">
|
<ScrollViewer VerticalScrollBarVisibility="Visible">
|
||||||
<Grid Grid.Row="2" Classes="Margin8">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
Grid.Row="2"
|
||||||
<RowDefinition Height="Auto" />
|
Classes="Margin8"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="Auto,Auto,*"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="tbAutoRun"
|
x:Name="tbAutoRun"
|
||||||
|
|
@ -503,7 +471,6 @@
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Classes="Margin8" />
|
Classes="Margin8" />
|
||||||
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="11"
|
Grid.Row="11"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
|
|
@ -748,22 +715,11 @@
|
||||||
|
|
||||||
<TabItem Header="{x:Static resx:ResUI.TbSettingsTunMode}">
|
<TabItem Header="{x:Static resx:ResUI.TbSettingsTunMode}">
|
||||||
<DockPanel Classes="Margin8">
|
<DockPanel Classes="Margin8">
|
||||||
<Grid Classes="Margin8" DockPanel.Dock="Top">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
Classes="Margin8"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="Auto,Auto,Auto"
|
||||||
<RowDefinition Height="Auto" />
|
DockPanel.Dock="Top"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
|
|
@ -857,20 +813,10 @@
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|
||||||
<TabItem Header="{x:Static resx:ResUI.TbSettingsCoreType}">
|
<TabItem Header="{x:Static resx:ResUI.TbSettingsCoreType}">
|
||||||
<Grid Classes="Margin8">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
Classes="Margin8"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="Auto,Auto"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
|
|
|
||||||
|
|
@ -102,6 +102,7 @@ namespace v2rayN.Desktop.Views
|
||||||
this.WhenActivated(disposables =>
|
this.WhenActivated(disposables =>
|
||||||
{
|
{
|
||||||
this.Bind(ViewModel, vm => vm.localPort, v => v.txtlocalPort.Text).DisposeWith(disposables);
|
this.Bind(ViewModel, vm => vm.localPort, v => v.txtlocalPort.Text).DisposeWith(disposables);
|
||||||
|
this.Bind(ViewModel, vm => vm.SecondLocalPortEnabled, v => v.togSecondLocalPortEnabled.IsChecked).DisposeWith(disposables);
|
||||||
this.Bind(ViewModel, vm => vm.udpEnabled, v => v.togudpEnabled.IsChecked).DisposeWith(disposables);
|
this.Bind(ViewModel, vm => vm.udpEnabled, v => v.togudpEnabled.IsChecked).DisposeWith(disposables);
|
||||||
this.Bind(ViewModel, vm => vm.sniffingEnabled, v => v.togsniffingEnabled.IsChecked).DisposeWith(disposables);
|
this.Bind(ViewModel, vm => vm.sniffingEnabled, v => v.togsniffingEnabled.IsChecked).DisposeWith(disposables);
|
||||||
this.Bind(ViewModel, vm => vm.routeOnly, v => v.togrouteOnly.IsChecked).DisposeWith(disposables);
|
this.Bind(ViewModel, vm => vm.routeOnly, v => v.togrouteOnly.IsChecked).DisposeWith(disposables);
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,7 @@
|
||||||
d:DesignHeight="480"
|
d:DesignHeight="480"
|
||||||
d:DesignWidth="400"
|
d:DesignWidth="400"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<Grid Margin="30">
|
<Grid Margin="30" RowDefinitions="Auto,Auto">
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
|
|
||||||
<Image
|
<Image
|
||||||
Name="imgQrcode"
|
Name="imgQrcode"
|
||||||
|
|
|
||||||
|
|
@ -14,20 +14,11 @@
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<DockPanel>
|
<DockPanel>
|
||||||
<Grid Classes="Margin8" DockPanel.Dock="Top">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
Classes="Margin8"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="Auto,Auto,Auto"
|
||||||
<RowDefinition Height="Auto" />
|
DockPanel.Dock="Top"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
|
|
@ -119,6 +110,13 @@
|
||||||
Classes="Margin8"
|
Classes="Margin8"
|
||||||
SelectionMode="Multiple"
|
SelectionMode="Multiple"
|
||||||
Theme="{DynamicResource PureCardRadioGroupListBox}" />
|
Theme="{DynamicResource PureCardRadioGroupListBox}" />
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="4"
|
||||||
|
Grid.Column="2"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
Classes="Margin8"
|
||||||
|
Text="{x:Static resx:ResUI.TbRoutingInboundTagTips}" />
|
||||||
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="5"
|
Grid.Row="5"
|
||||||
|
|
@ -169,14 +167,7 @@
|
||||||
IsCancel="True" />
|
IsCancel="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<Grid Classes="Margin8">
|
<Grid Classes="Margin8" ColumnDefinitions="1*,10,1*,10,1*">
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="1*" />
|
|
||||||
<ColumnDefinition Width="10" />
|
|
||||||
<ColumnDefinition Width="1*" />
|
|
||||||
<ColumnDefinition Width="10" />
|
|
||||||
<ColumnDefinition Width="1*" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<HeaderedContentControl
|
<HeaderedContentControl
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
BorderBrush="Gray"
|
BorderBrush="Gray"
|
||||||
|
|
|
||||||
|
|
@ -46,20 +46,11 @@
|
||||||
IsCancel="True" />
|
IsCancel="True" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<Grid Classes="Margin8" DockPanel.Dock="Top">
|
<Grid
|
||||||
<Grid.RowDefinitions>
|
Classes="Margin8"
|
||||||
<RowDefinition Height="Auto" />
|
ColumnDefinitions="Auto,Auto,Auto"
|
||||||
<RowDefinition Height="Auto" />
|
DockPanel.Dock="Top"
|
||||||
<RowDefinition Height="Auto" />
|
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
|
|
|
||||||
|
|
@ -34,29 +34,7 @@
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||||
|
|
||||||
<Grid>
|
<Grid ColumnDefinitions="Auto,400,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
<RowDefinition Height="Auto" />
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="400" />
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
|
|
|
||||||
|
|
@ -20,12 +20,12 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Avalonia" Version="11.2.2" />
|
<PackageReference Include="Avalonia" Version="11.2.3" />
|
||||||
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.2" />
|
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.3" />
|
||||||
<PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
|
<PackageReference Include="Avalonia.Desktop" Version="11.2.3" />
|
||||||
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.2" />
|
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.3" />
|
||||||
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.2" />
|
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.3" />
|
||||||
<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.2" />
|
<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
|
||||||
<PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
|
<PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
|
||||||
<PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
|
<PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
|
||||||
<PackageReference Include="Semi.Avalonia" Version="11.2.1.2" />
|
<PackageReference Include="Semi.Avalonia" Version="11.2.1.2" />
|
||||||
|
|
|
||||||
|
|
@ -278,6 +278,13 @@ namespace v2rayN.Views
|
||||||
{
|
{
|
||||||
switch (e.Key)
|
switch (e.Key)
|
||||||
{
|
{
|
||||||
|
case Key.V:
|
||||||
|
if (Keyboard.FocusedElement is TextBox) return;
|
||||||
|
var clipboardData = WindowsUtils.GetClipboardData();
|
||||||
|
var service = Locator.Current.GetService<MainWindowViewModel>();
|
||||||
|
if (service != null) _ = service.AddServerViaClipboardAsync(clipboardData);
|
||||||
|
break;
|
||||||
|
|
||||||
case Key.S:
|
case Key.S:
|
||||||
ScanScreenTaskAsync().ContinueWith(_ => { });
|
ScanScreenTaskAsync().ContinueWith(_ => { });
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -63,6 +63,9 @@
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
|
|
@ -94,7 +97,21 @@
|
||||||
TextWrapping="Wrap" />
|
TextWrapping="Wrap" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="1"
|
Grid.Row="2"
|
||||||
|
Grid.Column="0"
|
||||||
|
Margin="{StaticResource Margin8}"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Style="{StaticResource ToolbarTextBlock}"
|
||||||
|
Text="{x:Static resx:ResUI.TbSettingsSecondLocalPortEnabled}" />
|
||||||
|
<ToggleButton
|
||||||
|
x:Name="togSecondLocalPortEnabled"
|
||||||
|
Grid.Row="2"
|
||||||
|
Grid.Column="1"
|
||||||
|
Margin="{StaticResource Margin8}"
|
||||||
|
HorizontalAlignment="Left" />
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="3"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -102,37 +119,44 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsUdpEnabled}" />
|
Text="{x:Static resx:ResUI.TbSettingsUdpEnabled}" />
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="togudpEnabled"
|
x:Name="togudpEnabled"
|
||||||
Grid.Row="1"
|
Grid.Row="3"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
HorizontalAlignment="Left" />
|
HorizontalAlignment="Left" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="2"
|
Grid.Row="4"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Style="{StaticResource ToolbarTextBlock}"
|
Style="{StaticResource ToolbarTextBlock}"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsSniffingEnabled}" />
|
Text="{x:Static resx:ResUI.TbSettingsSniffingEnabled}" />
|
||||||
<StackPanel
|
<ToggleButton
|
||||||
Grid.Row="2"
|
x:Name="togsniffingEnabled"
|
||||||
|
Grid.Row="4"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Grid.ColumnSpan="2"
|
Margin="{StaticResource Margin8}"
|
||||||
Orientation="Horizontal">
|
HorizontalAlignment="Left" />
|
||||||
<ToggleButton
|
|
||||||
x:Name="togsniffingEnabled"
|
|
||||||
Margin="{StaticResource Margin8}"
|
|
||||||
HorizontalAlignment="Left" />
|
|
||||||
<ListBox
|
|
||||||
x:Name="clbdestOverride"
|
|
||||||
Margin="{StaticResource Margin4}"
|
|
||||||
HorizontalAlignment="Left"
|
|
||||||
FontSize="{DynamicResource StdFontSize}"
|
|
||||||
Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="3"
|
Grid.Row="5"
|
||||||
|
Grid.Column="0"
|
||||||
|
Margin="{StaticResource Margin8}"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Style="{StaticResource ToolbarTextBlock}"
|
||||||
|
Text="{x:Static resx:ResUI.TbSettingsDestOverride}" />
|
||||||
|
<ListBox
|
||||||
|
x:Name="clbdestOverride"
|
||||||
|
Grid.Row="5"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
|
Margin="{StaticResource Margin4}"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
FontSize="{DynamicResource StdFontSize}"
|
||||||
|
Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
|
||||||
|
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="6"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -140,13 +164,13 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsRouteOnly}" />
|
Text="{x:Static resx:ResUI.TbSettingsRouteOnly}" />
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="togrouteOnly"
|
x:Name="togrouteOnly"
|
||||||
Grid.Row="3"
|
Grid.Row="6"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
HorizontalAlignment="Left" />
|
HorizontalAlignment="Left" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="4"
|
Grid.Row="7"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -154,13 +178,13 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
|
Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="togAllowLANConn"
|
x:Name="togAllowLANConn"
|
||||||
Grid.Row="4"
|
Grid.Row="7"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
HorizontalAlignment="Left" />
|
HorizontalAlignment="Left" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="5"
|
Grid.Row="8"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -168,13 +192,13 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsNewPort4LAN}" />
|
Text="{x:Static resx:ResUI.TbSettingsNewPort4LAN}" />
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="togNewPort4LAN"
|
x:Name="togNewPort4LAN"
|
||||||
Grid.Row="5"
|
Grid.Row="8"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
HorizontalAlignment="Left" />
|
HorizontalAlignment="Left" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="6"
|
Grid.Row="9"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -182,14 +206,14 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsUser}" />
|
Text="{x:Static resx:ResUI.TbSettingsUser}" />
|
||||||
<TextBox
|
<TextBox
|
||||||
x:Name="txtuser"
|
x:Name="txtuser"
|
||||||
Grid.Row="6"
|
Grid.Row="9"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
Style="{StaticResource DefTextBox}" />
|
Style="{StaticResource DefTextBox}" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="7"
|
Grid.Row="10"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -197,14 +221,14 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsPass}" />
|
Text="{x:Static resx:ResUI.TbSettingsPass}" />
|
||||||
<TextBox
|
<TextBox
|
||||||
x:Name="txtpass"
|
x:Name="txtpass"
|
||||||
Grid.Row="7"
|
Grid.Row="10"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
Style="{StaticResource DefTextBox}" />
|
Style="{StaticResource DefTextBox}" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="8"
|
Grid.Row="11"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -212,13 +236,13 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
|
Text="{x:Static resx:ResUI.TbSettingsMuxEnabled}" />
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="togmuxEnabled"
|
x:Name="togmuxEnabled"
|
||||||
Grid.Row="8"
|
Grid.Row="11"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
HorizontalAlignment="Left" />
|
HorizontalAlignment="Left" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="9"
|
Grid.Row="12"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -226,13 +250,13 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsLogEnabledToFile}" />
|
Text="{x:Static resx:ResUI.TbSettingsLogEnabledToFile}" />
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="toglogEnabled"
|
x:Name="toglogEnabled"
|
||||||
Grid.Row="9"
|
Grid.Row="12"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
HorizontalAlignment="Left" />
|
HorizontalAlignment="Left" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="10"
|
Grid.Row="13"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -240,7 +264,7 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsLogLevel}" />
|
Text="{x:Static resx:ResUI.TbSettingsLogLevel}" />
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbloglevel"
|
x:Name="cmbloglevel"
|
||||||
Grid.Row="10"
|
Grid.Row="13"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
|
|
@ -248,7 +272,7 @@
|
||||||
Style="{StaticResource DefComboBox}" />
|
Style="{StaticResource DefComboBox}" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="11"
|
Grid.Row="14"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -256,13 +280,13 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsDefAllowInsecure}" />
|
Text="{x:Static resx:ResUI.TbSettingsDefAllowInsecure}" />
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="togdefAllowInsecure"
|
x:Name="togdefAllowInsecure"
|
||||||
Grid.Row="11"
|
Grid.Row="14"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
HorizontalAlignment="Left" />
|
HorizontalAlignment="Left" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="12"
|
Grid.Row="15"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -270,7 +294,7 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsDefFingerprint}" />
|
Text="{x:Static resx:ResUI.TbSettingsDefFingerprint}" />
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbdefFingerprint"
|
x:Name="cmbdefFingerprint"
|
||||||
Grid.Row="12"
|
Grid.Row="15"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
|
|
@ -278,7 +302,7 @@
|
||||||
Style="{StaticResource DefComboBox}" />
|
Style="{StaticResource DefComboBox}" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="13"
|
Grid.Row="16"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -286,21 +310,21 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsDefUserAgent}" />
|
Text="{x:Static resx:ResUI.TbSettingsDefUserAgent}" />
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbdefUserAgent"
|
x:Name="cmbdefUserAgent"
|
||||||
Grid.Row="13"
|
Grid.Row="16"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
IsEditable="True"
|
IsEditable="True"
|
||||||
Style="{StaticResource DefComboBox}" />
|
Style="{StaticResource DefComboBox}" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="13"
|
Grid.Row="16"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
Style="{StaticResource ToolbarTextBlock}"
|
Style="{StaticResource ToolbarTextBlock}"
|
||||||
Text="{x:Static resx:ResUI.TbSettingsDefUserAgentTips}" />
|
Text="{x:Static resx:ResUI.TbSettingsDefUserAgentTips}" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="14"
|
Grid.Row="17"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -308,14 +332,14 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsMux4SboxProtocol}" />
|
Text="{x:Static resx:ResUI.TbSettingsMux4SboxProtocol}" />
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="cmbmux4SboxProtocol"
|
x:Name="cmbmux4SboxProtocol"
|
||||||
Grid.Row="14"
|
Grid.Row="17"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Width="200"
|
Width="200"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
Style="{StaticResource DefComboBox}" />
|
Style="{StaticResource DefComboBox}" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="15"
|
Grid.Row="18"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -323,13 +347,13 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsEnableCacheFile4Sbox}" />
|
Text="{x:Static resx:ResUI.TbSettingsEnableCacheFile4Sbox}" />
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="togenableCacheFile4Sbox"
|
x:Name="togenableCacheFile4Sbox"
|
||||||
Grid.Row="15"
|
Grid.Row="18"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
HorizontalAlignment="Left" />
|
HorizontalAlignment="Left" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="16"
|
Grid.Row="19"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -337,7 +361,7 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsHysteriaBandwidth}" />
|
Text="{x:Static resx:ResUI.TbSettingsHysteriaBandwidth}" />
|
||||||
|
|
||||||
<StackPanel
|
<StackPanel
|
||||||
Grid.Row="16"
|
Grid.Row="19"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Orientation="Horizontal">
|
Orientation="Horizontal">
|
||||||
|
|
||||||
|
|
@ -356,7 +380,7 @@
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="17"
|
Grid.Row="20"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|
@ -364,12 +388,12 @@
|
||||||
Text="{x:Static resx:ResUI.TbSettingsEnableFragment}" />
|
Text="{x:Static resx:ResUI.TbSettingsEnableFragment}" />
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
x:Name="togenableFragment"
|
x:Name="togenableFragment"
|
||||||
Grid.Row="17"
|
Grid.Row="20"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
HorizontalAlignment="Left" />
|
HorizontalAlignment="Left" />
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="17"
|
Grid.Row="20"
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
Margin="{StaticResource Margin8}"
|
Margin="{StaticResource Margin8}"
|
||||||
Style="{StaticResource ToolbarTextBlock}"
|
Style="{StaticResource ToolbarTextBlock}"
|
||||||
|
|
|
||||||
|
|
@ -104,6 +104,7 @@ namespace v2rayN.Views
|
||||||
this.WhenActivated(disposables =>
|
this.WhenActivated(disposables =>
|
||||||
{
|
{
|
||||||
this.Bind(ViewModel, vm => vm.localPort, v => v.txtlocalPort.Text).DisposeWith(disposables);
|
this.Bind(ViewModel, vm => vm.localPort, v => v.txtlocalPort.Text).DisposeWith(disposables);
|
||||||
|
this.Bind(ViewModel, vm => vm.SecondLocalPortEnabled, v => v.togSecondLocalPortEnabled.IsChecked).DisposeWith(disposables);
|
||||||
this.Bind(ViewModel, vm => vm.udpEnabled, v => v.togudpEnabled.IsChecked).DisposeWith(disposables);
|
this.Bind(ViewModel, vm => vm.udpEnabled, v => v.togudpEnabled.IsChecked).DisposeWith(disposables);
|
||||||
this.Bind(ViewModel, vm => vm.sniffingEnabled, v => v.togsniffingEnabled.IsChecked).DisposeWith(disposables);
|
this.Bind(ViewModel, vm => vm.sniffingEnabled, v => v.togsniffingEnabled.IsChecked).DisposeWith(disposables);
|
||||||
this.Bind(ViewModel, vm => vm.routeOnly, v => v.togrouteOnly.IsChecked).DisposeWith(disposables);
|
this.Bind(ViewModel, vm => vm.routeOnly, v => v.togrouteOnly.IsChecked).DisposeWith(disposables);
|
||||||
|
|
|
||||||
|
|
@ -223,12 +223,6 @@ namespace v2rayN.Views
|
||||||
{
|
{
|
||||||
switch (e.Key)
|
switch (e.Key)
|
||||||
{
|
{
|
||||||
case Key.V:
|
|
||||||
var clipboardData = WindowsUtils.GetClipboardData();
|
|
||||||
var service = Locator.Current.GetService<MainWindowViewModel>();
|
|
||||||
if (service != null) _ = service.AddServerViaClipboardAsync(clipboardData);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case Key.A:
|
case Key.A:
|
||||||
menuSelectAll_Click(null, null);
|
menuSelectAll_Click(null, null);
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
<reactiveui:ReactiveWindow
|
<reactiveui:ReactiveWindow
|
||||||
x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
|
x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
|
||||||
xmlns:reactiveui="http://reactiveui.net"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:reactiveui="http://reactiveui.net"
|
||||||
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
|
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
|
||||||
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
|
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
|
||||||
Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"
|
Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"
|
||||||
|
|
@ -134,6 +134,13 @@
|
||||||
Margin="{StaticResource Margin4}"
|
Margin="{StaticResource Margin4}"
|
||||||
FontSize="{DynamicResource StdFontSize}"
|
FontSize="{DynamicResource StdFontSize}"
|
||||||
Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
|
Style="{StaticResource MaterialDesignFilterChipPrimaryListBox}" />
|
||||||
|
<TextBlock
|
||||||
|
Grid.Row="4"
|
||||||
|
Grid.Column="2"
|
||||||
|
Margin="{StaticResource Margin4}"
|
||||||
|
HorizontalAlignment="Left"
|
||||||
|
Style="{StaticResource ToolbarTextBlock}"
|
||||||
|
Text="{x:Static resx:ResUI.TbRoutingInboundTagTips}" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Row="5"
|
Grid.Row="5"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue