mirror of
https://github.com/2dust/v2rayN.git
synced 2025-10-14 04:19:12 +00:00
Compare commits
No commits in common. "6653ea12b725a8adb5c62845aab66ad137871431" and "83ad83b13577d0567c96789897eb2f62b2f04ca5" have entirely different histories.
6653ea12b7
...
83ad83b135
14 changed files with 49 additions and 1427 deletions
|
@ -6,7 +6,6 @@
|
|||
SendMsgView,
|
||||
SendSnackMsg,
|
||||
RefreshProfiles,
|
||||
StopSpeedtest,
|
||||
AppExit
|
||||
StopSpeedtest
|
||||
}
|
||||
}
|
|
@ -196,7 +196,7 @@
|
|||
public static readonly List<string> SingboxDomainStrategy4Out = new() { "ipv4_only", "prefer_ipv4", "prefer_ipv6", "ipv6_only", "" };
|
||||
public static readonly List<string> DomainDNSAddress = ["223.5.5.5", "223.6.6.6", "localhost"];
|
||||
public static readonly List<string> SingboxDomainDNSAddress = ["223.5.5.5", "223.6.6.6", "dhcp://auto"];
|
||||
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" };
|
||||
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> InboundTags = new() { "socks", "socks2" };
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -4,7 +4,7 @@
|
|||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<Version>7.3.1</Version>
|
||||
<Version>7.3.0</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -60,9 +60,6 @@
|
|||
<SubType>Designer</SubType>
|
||||
<Generator>PublicResXFileCodeGenerator</Generator>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Update="Resx\ResUI.hu.resx">
|
||||
<Generator>PublicResXFileCodeGenerator</Generator>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Update="Resx\ResUI.resx">
|
||||
<SubType>Designer</SubType>
|
||||
<LastGenOutput>ResUI.Designer.cs</LastGenOutput>
|
||||
|
|
|
@ -160,9 +160,9 @@ namespace ServiceLib.ViewModels
|
|||
var configDirZipTemp = Utils.GetTempPath($"v2rayN_{DateTime.Now:yyyyMMddHHmmss}");
|
||||
var configDirTemp = Path.Combine(configDirZipTemp, _guiConfigs);
|
||||
|
||||
FileManager.CopyDirectory(configDir, configDirTemp, false, "cache.db");
|
||||
var ret = FileManager.CreateFromDirectory(configDirZipTemp, fileName);
|
||||
Directory.Delete(configDirZipTemp, true);
|
||||
await Task.Run(() => FileManager.CopyDirectory(configDir, configDirTemp, false, "cache.db"));
|
||||
var ret = await Task.Run(() => FileManager.CreateFromDirectory(configDirZipTemp, fileName));
|
||||
await Task.Run(() => Directory.Delete(configDirZipTemp, true));
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -283,7 +283,6 @@ namespace ServiceLib.ViewModels
|
|||
try
|
||||
{
|
||||
Logging.SaveLog("MyAppExitAsync Begin");
|
||||
MessageBus.Current.SendMessage("", EMsgCommand.AppExit.ToString());
|
||||
|
||||
await ConfigHandler.SaveConfig(_config);
|
||||
await SysProxyHandler.UpdateSysProxy(_config, true);
|
||||
|
|
|
@ -156,7 +156,6 @@ namespace v2rayN.Desktop.Views
|
|||
RestoreUI();
|
||||
AddHelpMenuItem();
|
||||
//WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
|
||||
MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
|
||||
}
|
||||
|
||||
#region Event
|
||||
|
@ -442,7 +441,7 @@ namespace v2rayN.Desktop.Views
|
|||
}
|
||||
}
|
||||
|
||||
private void StorageUI(string? n = null)
|
||||
private void StorageUI()
|
||||
{
|
||||
_config.UiItem.MainWidth = Utils.ToInt(this.Width);
|
||||
_config.UiItem.MainHeight = Utils.ToInt(this.Height);
|
||||
|
@ -457,6 +456,7 @@ namespace v2rayN.Desktop.Views
|
|||
_config.UiItem.MainGirdHeight1 = Math.Ceiling(gridMain1.RowDefinitions[0].ActualHeight + 0.1);
|
||||
_config.UiItem.MainGirdHeight2 = Math.Ceiling(gridMain1.RowDefinitions[2].ActualHeight + 0.1);
|
||||
}
|
||||
ConfigHandler.SaveConfig(_config);
|
||||
}
|
||||
|
||||
private void AddHelpMenuItem()
|
||||
|
|
|
@ -56,23 +56,28 @@
|
|||
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
<SplitButton
|
||||
x:Name="btnAutofitColumnWidth"
|
||||
Width="30"
|
||||
Width="54"
|
||||
Height="30"
|
||||
Margin="4,0"
|
||||
Classes="Success"
|
||||
Theme="{DynamicResource BorderlessButton}"
|
||||
Margin="20,0"
|
||||
Padding="2"
|
||||
Classes="Tertiary"
|
||||
Theme="{DynamicResource BorderlessSplitButton}"
|
||||
ToolTip.Tip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
|
||||
<Button.Content>
|
||||
<SplitButton.Content>
|
||||
<PathIcon
|
||||
Width="24"
|
||||
Height="24"
|
||||
Data="{StaticResource building_fit}"
|
||||
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
|
||||
</Button.Content>
|
||||
</Button>
|
||||
</SplitButton.Content>
|
||||
<SplitButton.Flyout>
|
||||
<MenuFlyout>
|
||||
<MenuItem Name="menuStorageUI" Header="{x:Static resx:ResUI.menuStorageUI}" />
|
||||
</MenuFlyout>
|
||||
</SplitButton.Flyout>
|
||||
</SplitButton>
|
||||
|
||||
<TextBox
|
||||
x:Name="txtServerFilter"
|
||||
|
|
|
@ -27,6 +27,7 @@ namespace v2rayN.Desktop.Views
|
|||
menuSelectAll.Click += menuSelectAll_Click;
|
||||
btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
|
||||
txtServerFilter.KeyDown += TxtServerFilter_KeyDown;
|
||||
menuStorageUI.Click += MenuStorageUI_Click;
|
||||
lstProfiles.KeyDown += LstProfiles_KeyDown;
|
||||
lstProfiles.SelectionChanged += lstProfiles_SelectionChanged;
|
||||
lstProfiles.DoubleTapped += LstProfiles_DoubleTapped;
|
||||
|
@ -90,7 +91,6 @@ namespace v2rayN.Desktop.Views
|
|||
|
||||
RestoreUI();
|
||||
ViewModel?.RefreshServers();
|
||||
MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
|
||||
}
|
||||
|
||||
private async void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
|
||||
|
@ -324,6 +324,11 @@ namespace v2rayN.Desktop.Views
|
|||
}
|
||||
}
|
||||
|
||||
private void MenuStorageUI_Click(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
StorageUI();
|
||||
}
|
||||
|
||||
//#endregion Event
|
||||
|
||||
//#region UI
|
||||
|
@ -363,7 +368,7 @@ namespace v2rayN.Desktop.Views
|
|||
}
|
||||
}
|
||||
|
||||
private void StorageUI(string? n = null)
|
||||
private void StorageUI()
|
||||
{
|
||||
List<ColumnItem> lvColumnItem = new();
|
||||
for (int k = 0; k < lstProfiles.Columns.Count; k++)
|
||||
|
@ -381,6 +386,7 @@ namespace v2rayN.Desktop.Views
|
|||
});
|
||||
}
|
||||
_config.UiItem.MainColumnItem = lvColumnItem;
|
||||
ConfigHandler.SaveConfig(_config);
|
||||
}
|
||||
|
||||
//#endregion UI
|
||||
|
|
|
@ -51,7 +51,6 @@ namespace v2rayN.Views
|
|||
{
|
||||
AutofitColumnWidth();
|
||||
}
|
||||
|
||||
private void AutofitColumnWidth()
|
||||
{
|
||||
foreach (var it in lstConnections.Columns)
|
||||
|
|
|
@ -26,6 +26,7 @@ namespace v2rayN.Views
|
|||
_config = AppHandler.Instance.Config;
|
||||
ThreadPool.RegisterWaitForSingleObject(App.ProgramStarted, OnProgramStarted, null, -1, false);
|
||||
|
||||
Application.Current.Exit += Current_Exit;
|
||||
App.Current.SessionEnding += Current_SessionEnding;
|
||||
this.Closing += MainWindow_Closing;
|
||||
this.PreviewKeyDown += MainWindow_PreviewKeyDown;
|
||||
|
@ -141,7 +142,6 @@ namespace v2rayN.Views
|
|||
RestoreUI();
|
||||
AddHelpMenuItem();
|
||||
WindowsHandler.Instance.RegisterGlobalHotkey(_config, OnHotkeyHandler, null);
|
||||
MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
|
||||
}
|
||||
|
||||
#region Event
|
||||
|
@ -265,6 +265,11 @@ namespace v2rayN.Views
|
|||
ShowHideWindow(false);
|
||||
}
|
||||
|
||||
private void Current_Exit(object sender, ExitEventArgs e)
|
||||
{
|
||||
StorageUI();
|
||||
}
|
||||
|
||||
private async void Current_SessionEnding(object sender, SessionEndingCancelEventArgs e)
|
||||
{
|
||||
Logging.SaveLog("Current_SessionEnding");
|
||||
|
@ -397,7 +402,7 @@ namespace v2rayN.Views
|
|||
}
|
||||
}
|
||||
|
||||
private void StorageUI(string? n = null)
|
||||
private void StorageUI()
|
||||
{
|
||||
_config.UiItem.MainWidth = Utils.ToInt(this.Width);
|
||||
_config.UiItem.MainHeight = Utils.ToInt(this.Height);
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
using MaterialDesignThemes.Wpf;
|
||||
using ReactiveUI;
|
||||
using Splat;
|
||||
using System;
|
||||
using System.Reactive.Disposables;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
|
@ -25,6 +24,7 @@ namespace v2rayN.Views
|
|||
|
||||
_config = AppHandler.Instance.Config;
|
||||
|
||||
Application.Current.Exit += Current_Exit;
|
||||
btnAutofitColumnWidth.Click += BtnAutofitColumnWidth_Click;
|
||||
txtServerFilter.PreviewKeyDown += TxtServerFilter_PreviewKeyDown;
|
||||
lstProfiles.PreviewKeyDown += LstProfiles_PreviewKeyDown;
|
||||
|
@ -90,11 +90,15 @@ namespace v2rayN.Views
|
|||
|
||||
RestoreUI();
|
||||
ViewModel?.RefreshServers();
|
||||
MessageBus.Current.Listen<string>(EMsgCommand.AppExit.ToString()).Subscribe(StorageUI);
|
||||
}
|
||||
|
||||
#region Event
|
||||
|
||||
private void Current_Exit(object sender, ExitEventArgs e)
|
||||
{
|
||||
StorageUI();
|
||||
}
|
||||
|
||||
private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
|
||||
{
|
||||
switch (action)
|
||||
|
@ -352,7 +356,7 @@ namespace v2rayN.Views
|
|||
}
|
||||
}
|
||||
|
||||
private void StorageUI(string? n = null)
|
||||
private void StorageUI()
|
||||
{
|
||||
List<ColumnItem> lvColumnItem = new();
|
||||
for (int k = 0; k < lstProfiles.Columns.Count; k++)
|
||||
|
@ -366,6 +370,7 @@ namespace v2rayN.Views
|
|||
});
|
||||
}
|
||||
_config.UiItem.MainColumnItem = lvColumnItem;
|
||||
ConfigHandler.SaveConfig(_config);
|
||||
}
|
||||
|
||||
#endregion UI
|
||||
|
|
Loading…
Reference in a new issue