mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-13 02:39:22 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

#21 Add Disable option for each plugin.

Browse Source
This commit is contained in:
qianlifeng 2014-07-01 22:19:46 +08:00
parent 6352408d87
commit e275ce6063
20 changed files with 174 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Wox.Infrastructure/Storage/BaseStorage.cs
View File

@ -15,6 +15,14 @@ namespace Wox.Infrastructure.Storage
private static object locker = new object();
private static T storage;
public event Action<T> AfterLoadConfig;
protected virtual void OnAfterLoadConfig(T obj)
{
Action<T> handler = AfterLoadConfig;
if (handler != null) handler(obj);
}
protected abstract string ConfigName { get; }
public static T Instance
@ -53,6 +61,7 @@ namespace Wox.Infrastructure.Storage
try
{
storage = JsonConvert.DeserializeObject<T>(json);
OnAfterLoadConfig(storage);
}
catch (Exception)
{

18
Wox.Infrastructure/Storage/UserSettings/CustomizedPluginConfig.cs Normal file
View File

@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Wox.Infrastructure.Storage.UserSettings
{
public class CustomizedPluginConfig
{
public string ID { get; set; }
public string Name { get; set; }
public string Actionword { get; set; }
public bool Disabled { get; set; }
}
}

10
Wox.Infrastructure/Storage/UserSettings/UserSettingStorage.cs
View File

@ -56,6 +56,8 @@ namespace Wox.Infrastructure.Storage.UserSettings
[JsonProperty]
public List<FolderLink> FolderLinks { get; set; } //Aaron
public List<CustomizedPluginConfig> CustomizedPluginConfigs { get; set; }
[JsonProperty]
public List<CustomPluginHotkey> CustomPluginHotkeys { get; set; }
@ -147,6 +149,7 @@ namespace Wox.Infrastructure.Storage.UserSettings
ReplaceWinR = true;
WebSearches = LoadDefaultWebSearches();
ProgramSources = LoadDefaultProgramSources();
CustomizedPluginConfigs = new List<CustomizedPluginConfig>();
Hotkey = "Alt + Space";
QueryBoxFont = FontFamily.GenericSansSerif.Name;
ResultItemFont = FontFamily.GenericSansSerif.Name;
@ -156,6 +159,13 @@ namespace Wox.Infrastructure.Storage.UserSettings
HideWhenDeactive = false;
}
protected override void OnAfterLoadConfig(UserSettingStorage storage)
{
if (storage.CustomizedPluginConfigs == null)
{
storage.CustomizedPluginConfigs = new List<CustomizedPluginConfig>();
}
}
}
public enum OpacityMode

1
Wox.Infrastructure/Wox.Infrastructure.csproj
View File

@ -50,6 +50,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="PeHeaderReader.cs" />
<Compile Include="Storage\UserSettings\CustomizedPluginConfig.cs" />
<Compile Include="Storage\UserSettings\FolderLink.cs" />
<Compile Include="Unidecoder.Characters.cs" />
<Compile Include="ChineseToPinYin.cs" />

9
Wox.Plugin.SystemPlugins/BaseSystemPlugin.cs
View File

@ -1,4 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Wox.Infrastructure.Storage.UserSettings;
namespace Wox.Plugin.SystemPlugins
{
@ -6,6 +8,8 @@ namespace Wox.Plugin.SystemPlugins
public abstract class BaseSystemPlugin : ISystemPlugin
{
public string PluginDirectory { get; set; }
public abstract string ID { get; }
public virtual string Name { get { return "System workflow"; } }
public virtual string Description { get { return "System workflow"; } }
public virtual string IcoPath { get { return null; } }
@ -17,6 +21,11 @@ namespace Wox.Plugin.SystemPlugins
public List<Result> Query(Query query)
{
if (string.IsNullOrEmpty(query.RawQuery)) return new List<Result>();
var customizedPluginConfig = UserSettingStorage.Instance.CustomizedPluginConfigs.FirstOrDefault(o => o.ID == ID);
if (customizedPluginConfig != null && customizedPluginConfig.Disabled)
{
return new List<Result>();
}
return QueryInternal(query);
}

5
Wox.Plugin.SystemPlugins/CMD/CMD.cs
View File

@ -148,6 +148,11 @@ namespace Wox.Plugin.SystemPlugins.CMD
this.context = context;
}
public override string ID
{
get { return "D409510CD0D2481F853690A07E6DC426"; }
}
public override string Name
{
get { return "Shell"; }

5
Wox.Plugin.SystemPlugins/Calculator.cs
View File

@ -85,6 +85,11 @@ namespace Wox.Plugin.SystemPlugins
this.context = context;
}
public override string ID
{
get { return "CEA0FDFC6D3B4085823D60DC76F28855"; }
}
public override string Name
{
get { return "Calculator"; }

5
Wox.Plugin.SystemPlugins/ColorsPlugin.cs
View File

@ -101,6 +101,11 @@ namespace Wox.Plugin.SystemPlugins
return string.Format("{0}{1}.png", ColorsDirectory.FullName, name.Substring(1));
}
public override string ID
{
get { return "9B36CE6181FC47FBB597AA2C29CD9B0A"; }
}
public override string Name
{
get { return "Colors"; }

5
Wox.Plugin.SystemPlugins/Folder/FolderPlugin.cs
View File

@ -23,6 +23,11 @@ namespace Wox.Plugin.SystemPlugins.Folder {
}
}
public override string ID
{
get { return "B4D3B69656E14D44865C8D818EAE47C4"; }
}
public override string Name { get { return "Folder"; } }
public override string IcoPath { get { return @"Images\folder.png"; } }

1
Wox.Plugin.SystemPlugins/ISystemPlugin.cs
View File

@ -7,6 +7,7 @@ namespace Wox.Plugin.SystemPlugins
{
public interface ISystemPlugin : IPlugin
{
string ID { get; }
string Name { get; }
string Description { get; }
}

5
Wox.Plugin.SystemPlugins/Program/Programs.cs
View File

@ -140,6 +140,11 @@ namespace Wox.Plugin.SystemPlugins.Program
}
public override string ID
{
get { return "791FC278BA414111B8D1886DFE447410"; }
}
public override string Name
{
get { return "Programs"; }

5
Wox.Plugin.SystemPlugins/Sys.cs
View File

@ -118,6 +118,11 @@ namespace Wox.Plugin.SystemPlugins
}
public override string ID
{
get { return "CEA08895D2544B019B2E9C5009600DF4"; }
}
public override string Name
{
get { return "System Commands"; }

11
Wox.Plugin.SystemPlugins/ThirdpartyPluginIndicator.cs
View File

@ -22,6 +22,12 @@ namespace Wox.Plugin.SystemPlugins
if (metadata.ActionKeyword.StartsWith(query.RawQuery))
{
PluginMetadata metadataCopy = metadata;
var customizedPluginConfig = UserSettingStorage.Instance.CustomizedPluginConfigs.FirstOrDefault(o => o.ID == metadataCopy.ID);
if (customizedPluginConfig != null && customizedPluginConfig.Disabled)
{
continue;
}
Result result = new Result
{
Title = metadata.ActionKeyword,
@ -61,6 +67,11 @@ namespace Wox.Plugin.SystemPlugins
}
public override string ID
{
get { return "6A122269676E40EB86EB543B945932B9"; }
}
public override string Name
{
get { return "Third-party Plugin Indicator"; }

5
Wox.Plugin.SystemPlugins/UrlPlugin.cs
View File

@ -31,6 +31,11 @@ namespace Wox.Plugin.SystemPlugins
return new List<Result>(0);
}
public override string ID
{
get { return "0308FD86DE0A4DEE8D62B9B535370992"; }
}
public override string Name { get { return "URL handler"; } }
public override string Description { get { return "Provide Opening the typed URL from Wox."; } }
public override string IcoPath { get { return "Images/url2.png"; } }

5
Wox.Plugin.SystemPlugins/WebSearch/WebSearchPlugin.cs
View File

@ -81,6 +81,11 @@ namespace Wox.Plugin.SystemPlugins
UserSettingStorage.Instance.WebSearches = UserSettingStorage.Instance.LoadDefaultWebSearches();
}
public override string ID
{
get { return "565B73353DBF4806919830B9202EE3BF"; }
}
public override string Name
{
get { return "Web Searches"; }

11
Wox/Commands/PluginCommand.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Threading;
using Python.Runtime;
using Wox.Helper;
using Wox.Infrastructure.Storage.UserSettings;
using Wox.Plugin;
using Wox.PluginLoader;
@ -19,6 +20,13 @@ namespace Wox.Commands
PluginPair thirdPlugin = Plugins.AllPlugins.FirstOrDefault(o => o.Metadata.ActionKeyword == q.ActionName);
if (thirdPlugin != null && !string.IsNullOrEmpty(thirdPlugin.Metadata.ActionKeyword))
{
var customizedPluginConfig = UserSettingStorage.Instance.CustomizedPluginConfigs.FirstOrDefault(o => o.ID == thirdPlugin.Metadata.ID);
if (customizedPluginConfig != null && customizedPluginConfig.Disabled)
{
UpdateResultView(null);
return;
}
if (thirdPlugin.Metadata.Language == AllowedLanguage.Python)
{
SwitchPythonEnv(thirdPlugin);
@ -28,6 +36,8 @@ namespace Wox.Commands
try
{
thirdPlugin.InitContext.PushResults = (qu, r) =>
{
if (r != null)
{
r.ForEach(o =>
{
@ -35,6 +45,7 @@ namespace Wox.Commands
o.OriginQuery = qu;
});
UpdateResultView(r);
}
};
List<Result> results = thirdPlugin.Plugin.Query(q) ?? new List<Result>();
thirdPlugin.InitContext.PushResults(q, results);

3
Wox/Commands/SystemCommand.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using Wox.Infrastructure.Storage.UserSettings;
using Wox.Plugin;
using Wox.PluginLoader;
@ -15,11 +16,11 @@ namespace Wox.Commands
foreach (PluginPair pair in Plugins.AllPlugins.Where(o => o.Metadata.PluginType == PluginType.System))
{
PluginPair pair1 = pair;
ThreadPool.QueueUserWorkItem(state =>
{
pair1.InitContext.PushResults = (q, r) =>
{
if (r == null || r.Count == 0) return;
foreach (Result result in r)
{
result.PluginDirectory = pair1.Metadata.PluginDirecotry;

6
Wox/MainWindow.xaml.cs
View File

@ -246,9 +246,9 @@ namespace Wox {
// didn't.
if (resultCtrl.Dirty) resultCtrl.Clear();
}, TimeSpan.FromMilliseconds(100), null);
queryHasReturn = false;
var q = new Query(lastQuery);
CommandFactory.DispatchCommand(q);
queryHasReturn = false;
if (Plugins.HitThirdpartyKeyword(q)) {
Dispatcher.DelayInvoke("ShowProgressbar", originQuery => {
if (!queryHasReturn && originQuery == lastQuery) {
@ -455,10 +455,10 @@ namespace Wox {
}
public void OnUpdateResultView(List<Result> list) {
if (list == null) return;
queryHasReturn = true;
progressBar.Dispatcher.Invoke(new Action(StopProgress));
if (list == null || list.Count == 0) return;
if (list.Count > 0)
{
//todo:this should be opened to users, it's their choice to use it or not in their workflows

2
Wox/SettingWindow.xaml
View File

@ -129,7 +129,7 @@
<TextBlock Opacity="0.5" x:Name="pluginAuthor"></TextBlock>
<TextBlock Opacity="0.5" x:Name="pluginWebsite" HorizontalAlignment="Right"></TextBlock>
</DockPanel>
<CheckBox Grid.Row="4" x:Name="pluginEnabled">Enable</CheckBox>
<CheckBox Grid.Row="4" x:Name="cbDisablePlugin" Click="CbDisablePlugin_OnClick">Disable</CheckBox>
</Grid>
</Grid>
</ContentControl>

52
Wox/SettingWindow.xaml.cs
View File

@ -15,6 +15,7 @@ using Wox.Infrastructure.Storage.UserSettings;
using Wox.Plugin;
using Wox.Helper;
using Wox.Plugin.SystemPlugins;
using Wox.PluginLoader;
using Application = System.Windows.Forms.Application;
using File = System.IO.File;
using MessageBox = System.Windows.MessageBox;
@ -422,6 +423,8 @@ namespace Wox
{
ISettingProvider provider = null;
var pair = lbPlugins.SelectedItem as PluginPair;
string pluginId = string.Empty;
if (pair != null)
{
//third-party plugin
@ -434,6 +437,7 @@ namespace Wox
pluginAuthor.Text = "Author: " + pair.Metadata.Author;
pluginWebsite.Text = "Website: " + pair.Metadata.Website;
pluginSubTitle.Text = pair.Metadata.Description;
pluginId = pair.Metadata.ID;
SyntaxSugars.CallOrRescueDefault(
() =>
pluginIcon.Source = (ImageSource)new ImagePathConverter().Convert(
@ -452,6 +456,7 @@ namespace Wox
if (sys != null)
{
pluginTitle.Text = sys.Name;
pluginId = sys.ID;
pluginSubTitle.Text = sys.Description;
pluginAuthor.Visibility = Visibility.Collapsed;
pluginActionKeyword.Visibility = Visibility.Collapsed;
@ -466,7 +471,10 @@ namespace Wox
}
}
this.PluginContentPanel.Content = null;
var customizedPluginConfig = UserSettingStorage.Instance.CustomizedPluginConfigs.FirstOrDefault(o => o.ID == pluginId);
cbDisablePlugin.IsChecked = customizedPluginConfig != null && customizedPluginConfig.Disabled;
PluginContentPanel.Content = null;
if (provider != null)
{
Control control = null;
@ -482,5 +490,47 @@ namespace Wox
// featureControls
// throw new NotImplementedException();
}
private void CbDisablePlugin_OnClick(object sender, RoutedEventArgs e)
{
CheckBox cbDisabled = e.Source as CheckBox;
if (cbDisabled == null) return;
var pair = lbPlugins.SelectedItem as PluginPair;
var id = string.Empty;
var name = string.Empty;
if (pair != null)
{
//third-party plugin
id = pair.Metadata.ID;
name = pair.Metadata.Name;
}
else
{
//system plugin
var sys = lbPlugins.SelectedItem as BaseSystemPlugin;
if (sys != null)
{
id = sys.ID;
name = sys.Name;
}
}
var customizedPluginConfig = UserSettingStorage.Instance.CustomizedPluginConfigs.FirstOrDefault(o => o.ID == id);
if (customizedPluginConfig == null)
{
UserSettingStorage.Instance.CustomizedPluginConfigs.Add(new CustomizedPluginConfig()
{
Disabled = cbDisabled.IsChecked ?? true,
ID = id,
Name = name,
Actionword = string.Empty
});
}
else
{
customizedPluginConfig.Disabled = cbDisabled.IsChecked ?? true;
}
UserSettingStorage.Instance.Save();
}
}
}