Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-10-13 11:59:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Optimization and improvement, tray, etc.

Browse source 
https://github.com/2dust/v2rayN/pull/8083
This commit is contained in:
2dust 2025-10-07 11:16:20 +08:00
parent fec7353703
commit fce4a7b74c
11 changed files with 50 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
v2rayN/ServiceLib/Resx/ResUI.Designer.cs generated
View file

@ -3651,6 +3651,15 @@ namespace ServiceLib.Resx {
}
}
/// <summary>
/// 查找类似 If the system does not have a tray function, please do not enable it 的本地化字符串。
/// </summary>
public static string TbSettingsHide2TrayWhenCloseTip {
get {
return ResourceManager.GetString("TbSettingsHide2TrayWhenCloseTip", resourceCulture);
}
}
/// <summary>
/// 查找类似 Hysteria Max bandwidth (Up/Down) 的本地化字符串。
/// </summary>

3
v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
View file

@ -1593,4 +1593,7 @@
<data name="NotSupportProtocol" xml:space="preserve">
<value>Not support protocol '{0}'.</value>
</data>
<data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
<value>If the system does not have a tray function, please do not enable it</value>
</data>
</root>

3
v2rayN/ServiceLib/Resx/ResUI.hu.resx
View file

@ -1593,4 +1593,7 @@
<data name="NotSupportProtocol" xml:space="preserve">
<value>Not support protocol '{0}'.</value>
</data>
<data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
<value>If the system does not have a tray function, please do not enable it</value>
</data>
</root>

3
v2rayN/ServiceLib/Resx/ResUI.resx
View file

@ -1593,4 +1593,7 @@
<data name="NotSupportProtocol" xml:space="preserve">
<value>Not support protocol '{0}'.</value>
</data>
<data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
<value>If the system does not have a tray function, please do not enable it</value>
</data>
</root>

3
v2rayN/ServiceLib/Resx/ResUI.ru.resx
View file

@ -1593,4 +1593,7 @@
<data name="NotSupportProtocol" xml:space="preserve">
<value>Not support protocol '{0}'.</value>
</data>
<data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
<value>If the system does not have a tray function, please do not enable it</value>
</data>
</root>

3
v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
View file

@ -1590,4 +1590,7 @@
<data name="NotSupportProtocol" xml:space="preserve">
<value>不支持协议 '{0}'。</value>
</data>
<data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
<value>如果系统没有托盘功能，请不要开启</value>
</data>
</root>

3
v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
View file

@ -1590,4 +1590,7 @@
<data name="NotSupportProtocol" xml:space="preserve">
<value>Not support protocol '{0}'.</value>
</data>
<data name="TbSettingsHide2TrayWhenCloseTip" xml:space="preserve">
<value>如果系統沒有托盤功能，請不要開啟</value>
</data>
</root>

12
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
View file

@ -274,7 +274,6 @@ public class MainWindowViewModel : MyReactiveObject
BlReloadEnabled = true;
await Reload();
// await AutoHideStartup();
}
#endregion Init
@ -576,17 +575,6 @@ public class MainWindowViewModel : MyReactiveObject
await CoreManager.Instance.LoadCore(node);
}
/*
private async Task AutoHideStartup()
{
if (_config.UiItem.AutoHideStartup)
{
AppEvents.ShowHideWindowRequested.Publish(false);
}
await Task.CompletedTask;
}
*/
#endregion core job
#region Presets

8
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View file

@ -412,7 +412,10 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
public void ShowHideWindow(bool? blShow)
{
var bl = blShow ?? (!_config.UiItem.ShowInTaskbar ^ (WindowState == WindowState.Minimized));
var bl = blShow ??
Utils.IsLinux()
? (!_config.UiItem.ShowInTaskbar ^ (WindowState == WindowState.Minimized))
: !_config.UiItem.ShowInTaskbar;
if (bl)
{
this.Show();
@ -446,8 +449,7 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
base.OnLoaded(sender, e);
if (_config.UiItem.AutoHideStartup)
{
this.ShowHideWindow(false);
_config.UiItem.ShowInTaskbar = true;
ShowHideWindow(false);
}
RestoreUI();
}

16
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
View file

@ -355,14 +355,15 @@
Grid.Column="1"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<!--
<TextBlock
<TextBlock
x:Name="tbAutoRunTip"
Grid.Row="1"
Grid.Column="2"
VerticalAlignment="Center"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbSettingsStartBootTip}"
TextWrapping="Wrap" />-->
TextWrapping="Wrap" />
<TextBlock
Grid.Row="2"
Grid.Column="0"
@ -467,6 +468,13 @@
Grid.Column="1"
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
<TextBlock
x:Name="labHide2TrayWhenCloseTip"
Grid.Row="9"
Grid.Column="2"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbSettingsHide2TrayWhenCloseTip}" />
<TextBlock
Grid.Row="11"

6
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
View file

@ -131,19 +131,25 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
labHide2TrayWhenClose.IsVisible = false;
togHide2TrayWhenClose.IsVisible = false;
labHide2TrayWhenCloseTip.IsVisible = false;
}
else if (Utils.IsLinux())
{
txbSettingsExceptionTip.IsVisible = false;
panSystemProxyAdvanced.IsVisible = false;
tbAutoRunTip.IsVisible = false;
}
else if (Utils.IsOSX())
{
txbSettingsExceptionTip.IsVisible = false;
panSystemProxyAdvanced.IsVisible = false;
tbAutoRunTip.IsVisible = false;
labHide2TrayWhenClose.IsVisible = false;
togHide2TrayWhenClose.IsVisible = false;
labHide2TrayWhenCloseTip.IsVisible = false;
}
}