prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolve conflicts

Browse source
This commit is contained in:
Jack251970 2025-10-12 13:31:24 +08:00
parent b8acead444
commit 6f17aa21c2
4 changed files with 12 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Plugins/Flow.Launcher.Plugin.Url/Main.cs
View file

@ -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();
}
}
}

9
Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
View file

@ -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>

31
Plugins/Flow.Launcher.Plugin.Url/URLSettings.xaml
View file

@ -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>

15
Plugins/Flow.Launcher.Plugin.Url/URLSettings.xaml.cs
View file

@ -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();
}
}