Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void Save()
public Control CreateSettingPanel()
{
if (Settings == null || Settings.Count == 0)
return new();
return null;

var settingWindow = new UserControl();
var mainPanel = new Grid { Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center };
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/ViewModel/PluginViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public bool IsExpanded
private Control _bottomPart2;
public Control BottomPart2 => IsExpanded ? _bottomPart2 ??= new InstalledPluginDisplayBottomData() : null;

public bool HasSettingControl => PluginPair.Plugin is ISettingProvider;
public bool HasSettingControl => PluginPair.Plugin is ISettingProvider settingProvider && settingProvider.CreateSettingPanel() != null;
public Control SettingControl
=> IsExpanded
? _settingControl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
<ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
</ItemGroup>

Expand Down
10 changes: 1 addition & 9 deletions Plugins/Flow.Launcher.Plugin.Url/Main.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Windows.Controls;

namespace Flow.Launcher.Plugin.Url
{
public class Main : ISettingProvider,IPlugin, IPluginI18n
public class Main : IPlugin, IPluginI18n
{
//based on https://gist.github.com/dperini/729294
private const string urlPattern = "^" +
Expand Down Expand Up @@ -43,7 +42,6 @@ public class Main : ISettingProvider,IPlugin, IPluginI18n
Regex reg = new Regex(urlPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
private PluginInitContext context;
private Settings _settings;


public List<Result> Query(Query query)
{
Expand Down Expand Up @@ -82,12 +80,6 @@ public List<Result> Query(Query query)
return new List<Result>(0);
}


public Control CreateSettingPanel()
{
return new SettingsControl(context.API,_settings);
}

public bool IsURL(string raw)
{
raw = raw.ToLower();
Expand Down
17 changes: 0 additions & 17 deletions Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml

This file was deleted.

18 changes: 0 additions & 18 deletions Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs

This file was deleted.

Loading