github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove simple routing settings

pull/5940/head
2dust 2024-10-24 10:55:15 +08:00
parent 40ea454a7c
commit b013213745
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
View File

@ -111,7 +111,7 @@ namespace ServiceLib.ViewModels
{ {
SelectedSource = new(); SelectedSource = new();
enableRoutingAdvanced = _config.RoutingBasicItem.EnableRoutingAdvanced; enableRoutingAdvanced = true;//TODO _config.RoutingBasicItem.EnableRoutingAdvanced;
domainStrategy = _config.RoutingBasicItem.DomainStrategy; domainStrategy = _config.RoutingBasicItem.DomainStrategy;
domainMatcher = _config.RoutingBasicItem.DomainMatcher; domainMatcher = _config.RoutingBasicItem.DomainMatcher;
domainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox; domainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox;

4
v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
View File

@ -72,7 +72,7 @@
Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" /> Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
</MenuItem> </MenuItem>
</Menu> </Menu>
<Separator /> <!--<Separator />
<TextBlock <TextBlock
Margin="{StaticResource MarginLeft8}" Margin="{StaticResource MarginLeft8}"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -81,7 +81,7 @@
<ToggleButton <ToggleButton
x:Name="togenableRoutingAdvanced" x:Name="togenableRoutingAdvanced"
Margin="{StaticResource MarginLeft8}" Margin="{StaticResource MarginLeft8}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left" />-->
<Separator /> <Separator />
<TextBlock <TextBlock
Margin="{StaticResource MarginLeft8}" Margin="{StaticResource MarginLeft8}"

3
v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
View File

@ -39,7 +39,7 @@ namespace v2rayN.Views
this.OneWayBind(ViewModel, vm => vm.RoutingItems, v => v.lstRoutings.ItemsSource).DisposeWith(disposables); this.OneWayBind(ViewModel, vm => vm.RoutingItems, v => v.lstRoutings.ItemsSource).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource, v => v.lstRoutings.SelectedItem).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SelectedSource, v => v.lstRoutings.SelectedItem).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.enableRoutingAdvanced, v => v.togenableRoutingAdvanced.IsChecked).DisposeWith(disposables); //this.Bind(ViewModel, vm => vm.enableRoutingAdvanced, v => v.togenableRoutingAdvanced.IsChecked).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.domainStrategy, v => v.cmbdomainStrategy.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.domainStrategy, v => v.cmbdomainStrategy.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.domainMatcher, v => v.cmbdomainMatcher.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.domainMatcher, v => v.cmbdomainMatcher.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.domainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.domainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.Text).DisposeWith(disposables);
@ -67,6 +67,7 @@ namespace v2rayN.Views
this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables); this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
}); });
WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark); WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark);
} }
private async Task<bool> UpdateViewHandler(EViewAction action, object? obj) private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)