voronin9032/v2rayN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add system proxy exception function for linux

Browse Source 
https://github.com/2dust/v2rayN/issues/6214
This commit is contained in:
2dust
2024-12-06 19:12:32 +08:00
parent 5f5d7172ee
commit dbd4f55981
10 changed files with 73 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml
View File

@@ -697,7 +697,10 @@
<TabItem Name="tabSystemproxy" Header="{x:Static resx:ResUI.TbSettingsSystemproxy}">
<DockPanel Classes="Margin8">
<StackPanel DockPanel.Dock="Bottom" Orientation="Vertical">
<StackPanel
Name="panSystemProxyAdvanced"
DockPanel.Dock="Bottom"
Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<TextBlock
VerticalAlignment="Center"
@@ -723,11 +726,17 @@
</StackPanel>
<TextBlock
Grid.Row="1"
Name="txbSettingsExceptionTip"
VerticalAlignment="Center"
Classes="Margin8"
DockPanel.Dock="Top"
Text="{x:Static resx:ResUI.TbSettingsExceptionTip}" />
<TextBlock
Name="txbSettingsExceptionTip2"
VerticalAlignment="Center"
Classes="Margin8"
DockPanel.Dock="Top"
Text="{x:Static resx:ResUI.TbSettingsExceptionTip2}" />
<TextBox
x:Name="txtsystemProxyExceptions"
VerticalAlignment="Stretch"

9
v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs
View File

@@ -166,9 +166,14 @@ namespace v2rayN.Desktop.Views
this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
});
if (!Utils.IsWindows())
if (Utils.IsWindows())
{
tabSystemproxy.IsVisible = false;
txbSettingsExceptionTip2.IsVisible = false;
}
else
{
txbSettingsExceptionTip.IsVisible = false;
panSystemProxyAdvanced.IsVisible = false;
}
if (Utils.IsOSX())