From 6f17aa21c20417bfd462c5bb08bc5d5b9fccb74b Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 12 Oct 2025 13:31:24 +0800
Subject: [PATCH] Resolve conflicts

---
 Plugins/Flow.Launcher.Plugin.Url/Main.cs      |  6 ++--
 .../SettingsControl.xaml                      |  9 ++++++
 .../Flow.Launcher.Plugin.Url/URLSettings.xaml | 31 -------------------
 .../URLSettings.xaml.cs                       | 15 ---------
 4 files changed, 12 insertions(+), 49 deletions(-)
 delete mode 100644 Plugins/Flow.Launcher.Plugin.Url/URLSettings.xaml
 delete mode 100644 Plugins/Flow.Launcher.Plugin.Url/URLSettings.xaml.cs

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 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
 
         <CheckBox
@@ -113,5 +114,13 @@
                     IsChecked="{Binding Settings.OpenInPrivateMode, Mode=TwoWay}" />
             </Grid>
         </Grid>
+
+        <CheckBox
+            Grid.Row="2"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Center"
+            Content="{DynamicResource flowlauncher_plugin_url_usehttps}"
+            IsChecked="{Binding Settings.AlwaysOpenWithHttps, Mode=TwoWay}" />
     </Grid>
 </UserControl>
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 @@
-<UserControl
-    x:Class="Flow.Launcher.Plugin.Url.URLSettings"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:url="clr-namespace:Flow.Launcher.Plugin.Url"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Url"
-    d:DataContext="{d:DesignInstance Type=viewModels:SettingsViewModel}"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-
-    <Grid Margin="{StaticResource SettingPanelMargin}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="auto" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-       
-        <CheckBox
-            Grid.Row="0"
-            Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Center"
-            Content="{DynamicResource flowlauncher_plugin_url_usehttps}"
-            IsChecked="{Binding Settings.AlwaysOpenWithHttps, Mode=TwoWay}" />
-    </Grid>
-</UserControl>
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();
-    }
-}