Revert last two commits pushed by @aaroncampf, which will cause build erros.

This commit is contained in:
qianlifeng 2014-05-25 18:11:27 +08:00
parent 6aed2ec311
commit e1c7705182
4 changed files with 35 additions and 47 deletions

View File

@ -1,39 +1,28 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Wox.Plugin.SystemPlugins { namespace Wox.Plugin.SystemPlugins
{
public abstract class BaseSystemPlugin : ISystemPlugin { public abstract class BaseSystemPlugin : ISystemPlugin
public string PluginDirectory { get; set; } {
public virtual string Name { get { return "System workflow"; } } public string PluginDirectory { get; set; }
public virtual string Description { get { return "System workflow"; } } public virtual string Name { get { return "System workflow"; } }
public virtual string IcoPath { get { return null; } } public virtual string Description { get { return "System workflow"; } }
public virtual bool Enabled { get; set; } public virtual string IcoPath { get { return null; } }
protected abstract List<Result> QueryInternal(Query query); protected abstract List<Result> QueryInternal(Query query);
protected abstract void InitInternal(PluginInitContext context);
protected abstract void InitInternal(PluginInitContext context);
public List<Result> Query(Query query)
{
if (string.IsNullOrEmpty(query.RawQuery)) return new List<Result>();
return QueryInternal(query);
}
public List<Result> Query(Query query) { public void Init(PluginInitContext context)
if (Enabled && string.IsNullOrEmpty(query.RawQuery)) { {
//if (string.IsNullOrEmpty(query.RawQuery)) return new List<Result>(); InitInternal(context);
return QueryInternal(query); }
} }
else {
new List<Result>();
}
}
public void Init(PluginInitContext context) {
InitInternal(context);
}
/// <summary>
/// Used to save settings
/// </summary>
public virtual string PluginId {
get { return null; }
}
}
} }

View File

@ -3,9 +3,11 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace Wox.Plugin.SystemPlugins { namespace Wox.Plugin.SystemPlugins
public interface ISystemPlugin : IPlugin { {
string Name { get; } public interface ISystemPlugin : IPlugin
string Description { get; } {
} string Name { get; }
string Description { get; }
}
} }

View File

@ -1,13 +1,10 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Wox.Plugin { namespace Wox.Plugin
public interface IPlugin { {
List<Result> Query(Query query); public interface IPlugin
void Init(PluginInitContext context); {
List<Result> Query(Query query);
/// <summary> void Init(PluginInitContext context);
/// Used when saving Plug-in settings }
/// </summary>
string PluginId { get; }
}
} }

View File

@ -74,7 +74,7 @@
<TextBlock VerticalAlignment="Center" ToolTip="{Binding Name}" x:Name="tbTitle" Text="{Binding Name}"></TextBlock> <TextBlock VerticalAlignment="Center" ToolTip="{Binding Name}" x:Name="tbTitle" Text="{Binding Name}"></TextBlock>
<TextBlock ToolTip="{Binding Description}" Visibility="{Binding Description, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" Grid.Row="1" x:Name="tbSubTitle" Text="{Binding Description}" Opacity="0.5"></TextBlock> <TextBlock ToolTip="{Binding Description}" Visibility="{Binding Description, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" Grid.Row="1" x:Name="tbSubTitle" Text="{Binding Description}" Opacity="0.5"></TextBlock>
</Grid> </Grid>
<CheckBox Content="Enabled" IsChecked="{Binding Enabled}" /> <CheckBox Content="Enabled" />
</Grid> </Grid>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="{x:Type woxPlugin:PluginPair}"> <DataTemplate DataType="{x:Type woxPlugin:PluginPair}">