Compare commits

..

No commits in common. "b25d4d57bd10ac3448f095b6a40bd3d1feaf1742" and "dc4611a2589a2a9f79fbdee1ba3761d316b2eead" have entirely different histories.

4 changed files with 3 additions and 5 deletions

View file

@ -248,7 +248,7 @@ public class MainWindowViewModel : MyReactiveObject
{ {
_config.UiItem.ShowInTaskbar = true; _config.UiItem.ShowInTaskbar = true;
//await ConfigHandler.InitBuiltinRouting(_config); await ConfigHandler.InitBuiltinRouting(_config);
await ConfigHandler.InitBuiltinDNS(_config); await ConfigHandler.InitBuiltinDNS(_config);
await ConfigHandler.InitBuiltinFullConfigTemplate(_config); await ConfigHandler.InitBuiltinFullConfigTemplate(_config);
await ProfileExManager.Instance.Init(); await ProfileExManager.Instance.Init();

View file

@ -238,7 +238,6 @@ public class StatusBarViewModel : MyReactiveObject
private async Task Init() private async Task Init()
{ {
await ConfigHandler.InitBuiltinRouting(_config);
await RefreshRoutingsMenu(); await RefreshRoutingsMenu();
await InboundDisplayStatus(); await InboundDisplayStatus();
await ChangeSystemProxyAsync(_config.SystemProxyItem.SysProxyType, true); await ChangeSystemProxyAsync(_config.SystemProxyItem.SysProxyType, true);

View file

@ -15,7 +15,6 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
public MsgView() public MsgView()
{ {
InitializeComponent(); InitializeComponent();
txtMsg.TextArea.TextView.Options.EnableHyperlinks = false;
ViewModel = new MsgViewModel(UpdateViewHandler); ViewModel = new MsgViewModel(UpdateViewHandler);
this.WhenActivated(disposables => this.WhenActivated(disposables =>

View file

@ -3,13 +3,13 @@ using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.ReactiveUI;
using Avalonia.VisualTree; using Avalonia.VisualTree;
using ReactiveUI; using ReactiveUI;
using v2rayN.Desktop.Base;
namespace v2rayN.Desktop.Views; namespace v2rayN.Desktop.Views;
public partial class ProfilesSelectWindow : WindowBase<ProfilesSelectViewModel> public partial class ProfilesSelectWindow : ReactiveWindow<ProfilesSelectViewModel>
{ {
private static Config _config; private static Config _config;