pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-11-11 06:54:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove NetBridge

Browse Source
This commit is contained in:
2dust
2026-06-26 17:30:28 +08:00
parent 7100b3f0a5
commit 48d58d482a
23 changed files with 1 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml
-1
View File
@@ -89,7 +89,6 @@
</MenuItem>
<MenuItem x:Name="menuBackupAndRestore" Header="{x:Static resx:ResUI.menuBackupAndRestore}" />
<MenuItem x:Name="menuOpenTheFileLocation" Header="{x:Static resx:ResUI.menuOpenTheFileLocation}" />
<MenuItem x:Name="menuNetBridge" Header="{x:Static resx:ResUI.menuNetBridge}" />
</MenuItem>
<MenuItem x:Name="menuHelp" Header="{x:Static resx:ResUI.menuHelp}">
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
-16
View File
@@ -12,7 +12,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
private readonly WindowNotificationManager? _manager;
private CheckUpdateView? _checkUpdateView;
private BackupAndRestoreView? _backupAndRestoreView;
private NetBridgeView? _netBridgeView;
private bool _blCloseByUser = false;
public MainWindow()
@@ -29,7 +28,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
btnNewUpdate.Click += MenuCheckUpdate_Click;
menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
menuClose.Click += MenuClose_Click;
menuNetBridge.Click += MenuNetBridge_Click;
ViewModel = new MainWindowViewModel(UpdateViewHandler);
@@ -167,7 +165,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
{
Title = $"{Utils.GetVersion()}";
menuAddServerViaScan.IsVisible = false;
menuNetBridge.IsVisible = false;
}
if (_config.UiItem.AutoHideStartup && Utils.IsWindows())
@@ -382,19 +379,6 @@ public partial class MainWindow : WindowBase<MainWindowViewModel>
DialogHost.Show(_backupAndRestoreView);
}
private void MenuNetBridge_Click(object? sender, RoutedEventArgs e)
{
if (Utils.IsAdministrator())
{
_netBridgeView ??= new NetBridgeView();
DialogHost.Show(_netBridgeView);
}
else
{
NoticeManager.Instance.SendMessageAndEnqueue(ResUI.RunAsAdmin);
}
}
private async void MenuClose_Click(object? sender, RoutedEventArgs e)
{
if (await UI.ShowYesNo(this, ResUI.menuExitTips) != ButtonResult.Yes)
v2rayN/v2rayN.Desktop/Views/NetBridgeView.axaml
-94
View File
@@ -1,94 +0,0 @@
<UserControl
x:Class="v2rayN.Desktop.Views.NetBridgeView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
d:DesignHeight="400"
d:DesignWidth="600"
x:DataType="vms:NetBridgeViewModel"
mc:Ignorable="d">
<Border
Margin="{StaticResource Margin8}"
VerticalAlignment="Center"
Theme="{DynamicResource CardBorder}">
<DockPanel Margin="{StaticResource Margin8}">
<StackPanel
Margin="{StaticResource Margin8}"
DockPanel.Dock="Top"
Orientation="Horizontal">
<ToggleSwitch
x:Name="togEnableNetBridge"
Margin="{StaticResource Margin8}"
HorizontalAlignment="Left" />
<TextBlock
Width="500"
Margin="{StaticResource Margin8}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbEnableNetBridge}"
TextWrapping="Wrap" />
</StackPanel>
<StackPanel
Margin="{StaticResource Margin8}"
DockPanel.Dock="Top"
Orientation="Horizontal">
<ToggleSwitch
x:Name="togEnabletDnsViaProxy"
Margin="{StaticResource Margin8}"
HorizontalAlignment="Left" />
<TextBlock
Width="500"
Margin="{StaticResource Margin8}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbEnabletDnsViaProxy}"
TextWrapping="Wrap" />
</StackPanel>
<DockPanel>
<StackPanel
Margin="{StaticResource Margin8}"
DockPanel.Dock="Top"
Orientation="Horizontal">
<TextBlock
Width="500"
Margin="{StaticResource Margin8}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.NetBridgeRuleTips}"
TextWrapping="Wrap" />
</StackPanel>
<StackPanel
Margin="{StaticResource Margin8}"
HorizontalAlignment="Right"
DockPanel.Dock="Bottom"
Orientation="Horizontal">
<Button
x:Name="btnSave"
Width="100"
Content="{x:Static resx:ResUI.TbSaveNetBridgeRule}"
IsDefault="True" />
</StackPanel>
<TextBox
x:Name="txtRuleProcess"
Margin="{StaticResource Margin8}"
VerticalAlignment="Stretch"
AcceptsReturn="True"
BorderThickness="1"
Classes="TextArea"
TextWrapping="Wrap" />
</DockPanel>
</DockPanel>
</Border>
</UserControl>
v2rayN/v2rayN.Desktop/Views/NetBridgeView.axaml.cs
-25
View File
@@ -1,25 +0,0 @@
namespace v2rayN.Desktop.Views;
public partial class NetBridgeView : ReactiveUserControl<NetBridgeViewModel>
{
public NetBridgeView()
{
InitializeComponent();
ViewModel = new NetBridgeViewModel(UpdateViewHandler);
this.WhenActivated(disposables =>
{
this.BindCommand(ViewModel, vm => vm.SaveRulesCmd, v => v.btnSave).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.EnableNetBridge, v => v.togEnableNetBridge.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.RuleProcess, v => v.txtRuleProcess.Text).DisposeWith(disposables);
});
}
private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
{
return await Task.FromResult(true);
}
}