From b0132137456c192cc8399ee89e956c1c8bb8e761 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Thu, 24 Oct 2024 10:55:15 +0800 Subject: [PATCH] Remove simple routing settings --- v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs | 2 +- v2rayN/v2rayN/Views/RoutingSettingWindow.xaml | 4 ++-- v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs b/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs index 2a4ea23e..d04bf34e 100644 --- a/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs @@ -111,7 +111,7 @@ namespace ServiceLib.ViewModels { SelectedSource = new(); - enableRoutingAdvanced = _config.RoutingBasicItem.EnableRoutingAdvanced; + enableRoutingAdvanced = true;//TODO _config.RoutingBasicItem.EnableRoutingAdvanced; domainStrategy = _config.RoutingBasicItem.DomainStrategy; domainMatcher = _config.RoutingBasicItem.DomainMatcher; domainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox; diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml index dd1b21b7..a140a4f8 100644 --- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml +++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml @@ -72,7 +72,7 @@ Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" /> - + 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.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.domainMatcher, v => v.cmbdomainMatcher.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); }); WindowsUtils.SetDarkBorder(this, AppHandler.Instance.Config.UiItem.FollowSystemTheme ? !WindowsUtils.IsLightTheme() : AppHandler.Instance.Config.UiItem.ColorModeDark); + } private async Task UpdateViewHandler(EViewAction action, object? obj)