Resolve conflicts

Author: Jack251970

Plugins/Flow.Launcher.Plugin.Url/Main.cs

@@ -97,9 +97,9 @@ public List<Result> Query(Query query)
             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 @@ public string GetTranslatedPluginDescription()
 
         public Control CreateSettingPanel()
         {
-            return new URLSettings(_settings);
+            return new SettingsControl();
         }
     }
 }

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>