diff --git a/Plugins/Flow.Launcher.Plugin.Url/Main.cs b/Plugins/Flow.Launcher.Plugin.Url/Main.cs index 385e478b1..8e77dbd15 100644 --- a/Plugins/Flow.Launcher.Plugin.Url/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.Url/Main.cs @@ -97,9 +97,9 @@ namespace Flow.Launcher.Plugin.Url return []; } - private string GetHttpPreference() + private static string GetHttpPreference() { - return _settings.AlwaysOpenWithHttps ? "https" : "http"; + return Settings.AlwaysOpenWithHttps ? "https" : "http"; } public bool IsURL(string raw) @@ -138,7 +138,7 @@ namespace Flow.Launcher.Plugin.Url public Control CreateSettingPanel() { - return new URLSettings(_settings); + return new SettingsControl(); } } } diff --git a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml index b8d282551..a7977551f 100644 --- a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml +++ b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml @@ -19,6 +19,7 @@ + + + diff --git a/Plugins/Flow.Launcher.Plugin.Url/URLSettings.xaml b/Plugins/Flow.Launcher.Plugin.Url/URLSettings.xaml deleted file mode 100644 index 8394dba5e..000000000 --- a/Plugins/Flow.Launcher.Plugin.Url/URLSettings.xaml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/Plugins/Flow.Launcher.Plugin.Url/URLSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Url/URLSettings.xaml.cs deleted file mode 100644 index e0e22fb73..000000000 --- a/Plugins/Flow.Launcher.Plugin.Url/URLSettings.xaml.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Windows.Controls; - -namespace Flow.Launcher.Plugin.Url; - -public partial class URLSettings : UserControl -{ - private readonly SettingsViewModel _viewModel; - - public URLSettings(Settings settings) - { - _viewModel = new SettingsViewModel(settings); - DataContext = _viewModel; - InitializeComponent(); - } -}