From 1eb3f449e2f239b7df6e58e7a1b66405e5d2ed59 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Fri, 3 Jan 2014 18:16:05 +0800 Subject: [PATCH 01/16] Add system commands --- WinAlfred.Plugin.System/CMD.cs | 20 +++++++ WinAlfred.Plugin.System/ISystemPlugin.cs | 11 ++++ .../Properties/AssemblyInfo.cs | 36 +++++++++++ .../WinAlfred.Plugin.System.csproj | 59 +++++++++++++++++++ WinAlfred.Plugin/PluginMetadata.cs | 1 + WinAlfred.Plugin/PluginType.cs | 13 ++++ WinAlfred.Plugin/WinAlfred.Plugin.csproj | 1 + WinAlfred.sln | 16 +++++ WinAlfred/Commands/CommandDispatcher.cs | 31 ++++++++++ WinAlfred/Commands/PluginCommand.cs | 45 ++++++++++++++ WinAlfred/Commands/SystemCommand.cs | 16 +++++ WinAlfred/MainWindow.xaml.cs | 41 ++----------- WinAlfred/PluginLoader/BasePluginLoader.cs | 39 +++++++++--- WinAlfred/PluginLoader/Plugins.cs | 25 ++++++++ WinAlfred/WinAlfred.csproj | 8 +++ 15 files changed, 317 insertions(+), 45 deletions(-) create mode 100644 WinAlfred.Plugin.System/CMD.cs create mode 100644 WinAlfred.Plugin.System/ISystemPlugin.cs create mode 100644 WinAlfred.Plugin.System/Properties/AssemblyInfo.cs create mode 100644 WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj create mode 100644 WinAlfred.Plugin/PluginType.cs create mode 100644 WinAlfred/Commands/CommandDispatcher.cs create mode 100644 WinAlfred/Commands/PluginCommand.cs create mode 100644 WinAlfred/Commands/SystemCommand.cs create mode 100644 WinAlfred/PluginLoader/Plugins.cs diff --git a/WinAlfred.Plugin.System/CMD.cs b/WinAlfred.Plugin.System/CMD.cs new file mode 100644 index 0000000000..1175f58d7b --- /dev/null +++ b/WinAlfred.Plugin.System/CMD.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace WinAlfred.Plugin.System +{ + public class CMD:IPlugin + { + public List Query(Query query) + { + throw new NotImplementedException(); + } + + public void Init() + { + throw new NotImplementedException(); + } + } +} diff --git a/WinAlfred.Plugin.System/ISystemPlugin.cs b/WinAlfred.Plugin.System/ISystemPlugin.cs new file mode 100644 index 0000000000..3eb6f9dbf6 --- /dev/null +++ b/WinAlfred.Plugin.System/ISystemPlugin.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace WinAlfred.Plugin.System +{ + public interface ISystemPlugin : IPlugin + { + } +} diff --git a/WinAlfred.Plugin.System/Properties/AssemblyInfo.cs b/WinAlfred.Plugin.System/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..4e78f925c4 --- /dev/null +++ b/WinAlfred.Plugin.System/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("WinAlfred.Plugin.System")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Oracle Corporation")] +[assembly: AssemblyProduct("WinAlfred.Plugin.System")] +[assembly: AssemblyCopyright("Copyright © Oracle Corporation 2014")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("bab8d3dc-d6be-42b3-8aa4-24801d667528")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj b/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj new file mode 100644 index 0000000000..ae8c238f6c --- /dev/null +++ b/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj @@ -0,0 +1,59 @@ + + + + + Debug + AnyCPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8} + Library + Properties + WinAlfred.Plugin.System + WinAlfred.Plugin.System + v3.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} + WinAlfred.Plugin + + + + + \ No newline at end of file diff --git a/WinAlfred.Plugin/PluginMetadata.cs b/WinAlfred.Plugin/PluginMetadata.cs index 23d54b8c24..167e299e51 100644 --- a/WinAlfred.Plugin/PluginMetadata.cs +++ b/WinAlfred.Plugin/PluginMetadata.cs @@ -16,5 +16,6 @@ namespace WinAlfred.Plugin public string ExecuteFileName { get; set; } public string PluginDirecotry { get; set; } public string ActionKeyword { get; set; } + public PluginType PluginType { get; set; } } } diff --git a/WinAlfred.Plugin/PluginType.cs b/WinAlfred.Plugin/PluginType.cs new file mode 100644 index 0000000000..1db293c16a --- /dev/null +++ b/WinAlfred.Plugin/PluginType.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace WinAlfred.Plugin +{ + public enum PluginType + { + System, + ThirdParty + } +} diff --git a/WinAlfred.Plugin/WinAlfred.Plugin.csproj b/WinAlfred.Plugin/WinAlfred.Plugin.csproj index e0b1b3869d..8d13730b5d 100644 --- a/WinAlfred.Plugin/WinAlfred.Plugin.csproj +++ b/WinAlfred.Plugin/WinAlfred.Plugin.csproj @@ -61,6 +61,7 @@ + diff --git a/WinAlfred.sln b/WinAlfred.sln index 1b27e33db8..a90d1236b2 100644 --- a/WinAlfred.sln +++ b/WinAlfred.sln @@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred", "WinAlfred\WinA EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PyWinAlfred", "PyWinAlfred\PyWinAlfred.vcxproj", "{D03FD663-38A8-4C1A-8431-EB44F93E7EBA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred.Plugin.System", "WinAlfred.Plugin.System\WinAlfred.Plugin.System.csproj", "{69CE0206-CB41-453D-88AF-DF86092EF9B8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -104,6 +106,20 @@ Global {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|x64.Build.0 = Release|x64 {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|x86.ActiveCfg = Release|Win32 {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|x86.Build.0 = Release|Win32 + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Win32.ActiveCfg = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|x64.ActiveCfg = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|x86.ActiveCfg = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Any CPU.Build.0 = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Win32.ActiveCfg = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|x64.ActiveCfg = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/WinAlfred/Commands/CommandDispatcher.cs b/WinAlfred/Commands/CommandDispatcher.cs new file mode 100644 index 0000000000..e6f0f691ce --- /dev/null +++ b/WinAlfred/Commands/CommandDispatcher.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using WinAlfred.Helper; +using WinAlfred.Plugin; + +namespace WinAlfred.Commands +{ + public class CommandDispatcher + { + private PluginCommand pluginCmd = new PluginCommand(); + private SystemCommand systemCmd = new SystemCommand(); + + //public delegate void resultUpdateDelegate(List results); + + //public event resultUpdateDelegate OnResultUpdateEvent; + + //protected virtual void OnOnResultUpdateEvent(List list) + //{ + // resultUpdateDelegate handler = OnResultUpdateEvent; + // if (handler != null) handler(list); + //} + + public void DispatchCommand(Query query) + { + systemCmd.Dispatch(query); + pluginCmd.Dispatch(query); + } + } +} diff --git a/WinAlfred/Commands/PluginCommand.cs b/WinAlfred/Commands/PluginCommand.cs new file mode 100644 index 0000000000..37e1de91d5 --- /dev/null +++ b/WinAlfred/Commands/PluginCommand.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using WinAlfred.Helper; +using WinAlfred.Plugin; +using WinAlfred.PluginLoader; + +namespace WinAlfred.Commands +{ + public class PluginCommand + { + public void Dispatch(Query q) + { + //ThreadPool.QueueUserWorkItem(state => + //{ + foreach (PluginPair pair in Plugins.AllPlugins) + { + if (pair.Metadata.ActionKeyword == q.ActionName) + { + try + { + pair.Plugin.Query(q).ForEach(o => o.PluginDirectory = pair.Metadata.PluginDirecotry); + } + catch (Exception queryException) + { + Log.Error(string.Format("Plugin {0} query failed: {1}", pair.Metadata.Name, + queryException.Message)); +#if (DEBUG) + { + throw; + } +#endif + } + } + } + resultCtrl.Dispatcher.Invoke(new Action(() => + { + resultCtrl.AddResults(results.OrderByDescending(o => o.Score).ToList()); + resultCtrl.SelectFirst(); + })); + //}); + } + } +} diff --git a/WinAlfred/Commands/SystemCommand.cs b/WinAlfred/Commands/SystemCommand.cs new file mode 100644 index 0000000000..4544150694 --- /dev/null +++ b/WinAlfred/Commands/SystemCommand.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using WinAlfred.Plugin; + +namespace WinAlfred.Commands +{ + public class SystemCommand + { + public void Dispatch(Query query) + { + + } + } +} diff --git a/WinAlfred/MainWindow.xaml.cs b/WinAlfred/MainWindow.xaml.cs index 0c3d2aa2c3..9b5dbf78ab 100644 --- a/WinAlfred/MainWindow.xaml.cs +++ b/WinAlfred/MainWindow.xaml.cs @@ -8,6 +8,7 @@ using System.Windows.Controls; using System.Windows.Forms; using System.Windows.Input; using System.Windows.Threading; +using WinAlfred.Commands; using WinAlfred.Helper; using WinAlfred.Plugin; using WinAlfred.PluginLoader; @@ -18,9 +19,9 @@ namespace WinAlfred public partial class MainWindow : Window { private KeyboardHook hook = new KeyboardHook(); - public List plugins = new List(); private List results = new List(); private NotifyIcon notifyIcon = null; + private CommandDispatcher cmdDispatcher = new CommandDispatcher(); public MainWindow() { @@ -67,38 +68,8 @@ namespace WinAlfred private void TextBoxBase_OnTextChanged(object sender, TextChangedEventArgs e) { - string query = tbQuery.Text; - //ThreadPool.QueueUserWorkItem(state => - //{ - results.Clear(); - foreach (PluginPair pair in plugins) - { - var q = new Query(query); - if (pair.Metadata.ActionKeyword == q.ActionName) - { - try - { - results.AddRange(pair.Plugin.Query(q)); - results.ForEach(o => o.PluginDirectory = pair.Metadata.PluginDirecotry); - } - catch (Exception queryException) - { - Log.Error(string.Format("Plugin {0} query failed: {1}", pair.Metadata.Name, - queryException.Message)); -#if (DEBUG) - { - throw; - } -#endif - } - } - } - resultCtrl.Dispatcher.Invoke(new Action(() => - { - resultCtrl.AddResults(results.OrderByDescending(o => o.Score).ToList()); - resultCtrl.SelectFirst(); - })); - //}); + var q = new Query(tbQuery.Text); + cmdDispatcher.DispatchCommand(q); } private void HideWinAlfred() @@ -116,9 +87,7 @@ namespace WinAlfred private void MainWindow_OnLoaded(object sender, RoutedEventArgs e) { - plugins.AddRange(new PythonPluginLoader().LoadPlugin()); - plugins.AddRange(new CSharpPluginLoader().LoadPlugin()); - + Plugins.Init(); ShowWinAlfred(); InitialTray(); } diff --git a/WinAlfred/PluginLoader/BasePluginLoader.cs b/WinAlfred/PluginLoader/BasePluginLoader.cs index d16042b494..7aeb83dd04 100644 --- a/WinAlfred/PluginLoader/BasePluginLoader.cs +++ b/WinAlfred/PluginLoader/BasePluginLoader.cs @@ -1,8 +1,11 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; +using System.Reflection; using WinAlfred.Helper; using WinAlfred.Plugin; +using WinAlfred.Plugin.System; namespace WinAlfred.PluginLoader { @@ -21,11 +24,34 @@ namespace WinAlfred.PluginLoader private static void ParsePlugins() { - ParseDirectories(); - ParsePackagedPlugin(); + ParseSystemPlugins(); + ParseThirdPartyPlugins(); } - private static void ParseDirectories() + private static void ParseSystemPlugins() + { + try + { + Assembly asm = Assembly.GetAssembly(typeof (CMD)); + List types = asm.GetTypes().Where(o => o.GetInterfaces().Contains(typeof(ISystemPlugin))).ToList(); + foreach (Type type in types) + { + ISystemPlugin sysPlugin = Activator.CreateInstance(types[0]) as ISystemPlugin; + PluginMetadata metadata = new PluginMetadata(); + } + } + catch (Exception e) + { + Log.Error(string.Format("Cound't load system plugin: {0}", e.Message)); +#if (DEBUG) + { + throw; + } +#endif + } + } + + private static void ParseThirdPartyPlugins() { string[] directories = Directory.GetDirectories(PluginPath); foreach (string directory in directories) @@ -35,11 +61,6 @@ namespace WinAlfred.PluginLoader } } - private static void ParsePackagedPlugin() - { - - } - private static PluginMetadata GetMetadataFromIni(string directory) { string iniPath = directory + "\\" + PluginConfigName; @@ -50,7 +71,6 @@ namespace WinAlfred.PluginLoader return null; } - try { PluginMetadata metadata = new PluginMetadata(); @@ -60,6 +80,7 @@ namespace WinAlfred.PluginLoader metadata.Description = ini.GetSetting("plugin", "Description"); metadata.Language = ini.GetSetting("plugin", "Language"); metadata.Version = ini.GetSetting("plugin", "Version"); + metadata.PluginType = PluginType.ThirdParty; metadata.ActionKeyword = ini.GetSetting("plugin", "ActionKeyword"); metadata.ExecuteFilePath = AppDomain.CurrentDomain.BaseDirectory + directory + "\\" + ini.GetSetting("plugin", "ExecuteFile"); metadata.PluginDirecotry = AppDomain.CurrentDomain.BaseDirectory + directory + "\\"; diff --git a/WinAlfred/PluginLoader/Plugins.cs b/WinAlfred/PluginLoader/Plugins.cs new file mode 100644 index 0000000000..b744b351a5 --- /dev/null +++ b/WinAlfred/PluginLoader/Plugins.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using WinAlfred.Plugin; + +namespace WinAlfred.PluginLoader +{ + public static class Plugins + { + private static List plugins = new List(); + + public static void Init() + { + plugins.Clear(); + plugins.AddRange(new PythonPluginLoader().LoadPlugin()); + plugins.AddRange(new CSharpPluginLoader().LoadPlugin()); + } + + public static List AllPlugins + { + get { return plugins; } + } + } +} diff --git a/WinAlfred/WinAlfred.csproj b/WinAlfred/WinAlfred.csproj index 02dcadb309..5806e4e447 100644 --- a/WinAlfred/WinAlfred.csproj +++ b/WinAlfred/WinAlfred.csproj @@ -64,12 +64,16 @@ MSBuild:Compile Designer + + + + @@ -128,6 +132,10 @@ + + {69ce0206-cb41-453d-88af-df86092ef9b8} + WinAlfred.Plugin.System + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} WinAlfred.Plugin From dc51bc39abf06af3d1828d44eb9c1a9b7110f1b7 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Fri, 3 Jan 2014 23:52:36 +0800 Subject: [PATCH 02/16] structure change --- .../Properties/AssemblyInfo.cs | 36 --------- .../WinAlfred.Plugin.System.csproj | 72 ------------------ Plugins/WinAlfred.Plugin.System/plugin.ini | 8 -- WinAlfred.Plugin.System/CMD.cs | 47 +++++++++++- WinAlfred.Plugin.System/ISystemPlugin.cs | 2 + .../Main.cs => WinAlfred.Plugin.System/Sys.cs | 35 ++++++--- .../WinAlfred.Plugin.System.csproj | 7 ++ WinAlfred.Plugin/IPlugin.cs | 2 +- WinAlfred.Plugin/PluginInitContext.cs | 13 ++++ WinAlfred.Plugin/Result.cs | 9 +++ WinAlfred.Plugin/WinAlfred.Plugin.csproj | 1 + WinAlfred.sln | 19 ----- WinAlfred/Commands/Command.cs | 27 +++++++ WinAlfred/Commands/CommandDispatcher.cs | 31 -------- WinAlfred/Commands/PluginCommand.cs | 50 +++++++----- WinAlfred/Commands/SystemCommand.cs | 29 ++++++- .../Images/lock.png | Bin WinAlfred/MainWindow.xaml.cs | 38 ++++++++- WinAlfred/PluginLoader/BasePluginLoader.cs | 31 +++----- WinAlfred/PluginLoader/CSharpPluginLoader.cs | 29 +++---- WinAlfred/PluginLoader/Plugins.cs | 16 +++- WinAlfred/PluginLoader/PythonPluginLoader.cs | 4 - WinAlfred/PluginLoader/PythonPluginWrapper.cs | 2 +- WinAlfred/ResultItem.xaml | 2 +- WinAlfred/ResultItem.xaml.cs | 3 +- WinAlfred/ResultPanel.xaml.cs | 25 +++++- WinAlfred/WinAlfred.csproj | 8 +- 27 files changed, 289 insertions(+), 257 deletions(-) delete mode 100644 Plugins/WinAlfred.Plugin.System/Properties/AssemblyInfo.cs delete mode 100644 Plugins/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj delete mode 100644 Plugins/WinAlfred.Plugin.System/plugin.ini rename Plugins/WinAlfred.Plugin.System/Main.cs => WinAlfred.Plugin.System/Sys.cs (70%) create mode 100644 WinAlfred.Plugin/PluginInitContext.cs create mode 100644 WinAlfred/Commands/Command.cs delete mode 100644 WinAlfred/Commands/CommandDispatcher.cs rename {Plugins/WinAlfred.Plugin.System => WinAlfred}/Images/lock.png (100%) diff --git a/Plugins/WinAlfred.Plugin.System/Properties/AssemblyInfo.cs b/Plugins/WinAlfred.Plugin.System/Properties/AssemblyInfo.cs deleted file mode 100644 index 9f1336c2fa..0000000000 --- a/Plugins/WinAlfred.Plugin.System/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 有关程序集的常规信息通过以下 -// 特性集控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("WinAlfred.Plugin.System")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("WinAlfred.Plugin.System")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 使此程序集中的类型 -// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型， -// 则将该类型上的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID -[assembly: Guid("5cdfe514-80c9-4d82-94e7-c6f79a26ccda")] - -// 程序集的版本信息由下面四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， -// 方法是按如下所示使用“*”: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Plugins/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj b/Plugins/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj deleted file mode 100644 index a8dacb8d11..0000000000 --- a/Plugins/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj +++ /dev/null @@ -1,72 +0,0 @@ - - - - - Debug - AnyCPU - {E515011D-A769-418B-8761-ABE6F29827A0} - Library - Properties - WinAlfred.Plugin.System - WinAlfred.Plugin.System - v3.5 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - WinAlfred.Plugin - - - - - Always - - - - - - - - xcopy /Y $(TargetDir)$(TargetFileName) $(SolutionDir)WinAlfred\bin\Debug\Plugins\System\ -xcopy /Y $(TargetDir)plugin.ini $(SolutionDir)WinAlfred\bin\Debug\Plugins\System\ -xcopy /Y $(ProjectDir)Images\*.* $(SolutionDir)WinAlfred\bin\Debug\Plugins\System\Images\ - - - \ No newline at end of file diff --git a/Plugins/WinAlfred.Plugin.System/plugin.ini b/Plugins/WinAlfred.Plugin.System/plugin.ini deleted file mode 100644 index 5b49554ca6..0000000000 --- a/Plugins/WinAlfred.Plugin.System/plugin.ini +++ /dev/null @@ -1,8 +0,0 @@ -[plugin] -ActionKeyword = sys -Name = System Commands -Author = qianlifeng -Version = 0.1 -Language = csharp -Description = test -ExecuteFile = WinAlfred.Plugin.System.dll diff --git a/WinAlfred.Plugin.System/CMD.cs b/WinAlfred.Plugin.System/CMD.cs index 1175f58d7b..ef7aedd011 100644 --- a/WinAlfred.Plugin.System/CMD.cs +++ b/WinAlfred.Plugin.System/CMD.cs @@ -1,20 +1,59 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Text; +using System.Windows.Forms; namespace WinAlfred.Plugin.System { - public class CMD:IPlugin + public class CMD : ISystemPlugin { public List Query(Query query) { - throw new NotImplementedException(); + List results = new List(); + if (query.RawQuery.StartsWith(">") && query.RawQuery.Length > 1) + { + string cmd = query.RawQuery.Substring(1); + Result result = new Result + { + Title = cmd, + SubTitle = "execute command through command shell" , + IcoPath = "Images/cmd.png", + Action = () => + { + Process process = new Process(); + ProcessStartInfo startInfo = new ProcessStartInfo(); + startInfo.WindowStyle = ProcessWindowStyle.Hidden; + startInfo.FileName = "cmd.exe"; + startInfo.Arguments = "/C " + cmd; + process.StartInfo = startInfo; + process.Start(); + } + }; + results.Add(result); + } + return results; } - public void Init() + public void Init(PluginInitContext context) { - throw new NotImplementedException(); + } + + public string Name + { + get + { + return "CMD"; + } + } + + public string Description + { + get + { + return "Execute shell commands."; + } } } } diff --git a/WinAlfred.Plugin.System/ISystemPlugin.cs b/WinAlfred.Plugin.System/ISystemPlugin.cs index 3eb6f9dbf6..dcb428d352 100644 --- a/WinAlfred.Plugin.System/ISystemPlugin.cs +++ b/WinAlfred.Plugin.System/ISystemPlugin.cs @@ -7,5 +7,7 @@ namespace WinAlfred.Plugin.System { public interface ISystemPlugin : IPlugin { + string Name { get; } + string Description { get; } } } diff --git a/Plugins/WinAlfred.Plugin.System/Main.cs b/WinAlfred.Plugin.System/Sys.cs similarity index 70% rename from Plugins/WinAlfred.Plugin.System/Main.cs rename to WinAlfred.Plugin.System/Sys.cs index 9cd5d7d9ea..5dceba034b 100644 --- a/Plugins/WinAlfred.Plugin.System/Main.cs +++ b/WinAlfred.Plugin.System/Sys.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Text; @@ -8,7 +7,7 @@ using System.Windows.Forms; namespace WinAlfred.Plugin.System { - public class Main : IPlugin + public class Sys : ISystemPlugin { List availableResults = new List(); @@ -20,18 +19,18 @@ namespace WinAlfred.Plugin.System public List Query(Query query) { List results = new List(); - if (query.ActionParameters.Count == 0) + + foreach (Result availableResult in availableResults) { - results = availableResults; - } - else - { - results.AddRange(availableResults.Where(result => result.Title.ToLower().Contains(query.ActionParameters[0].ToLower()))); + if (availableResult.Title.ToLower().StartsWith(query.RawQuery.ToLower())) + { + results.Add(availableResult); + } } return results; } - public void Init() + public void Init(PluginInitContext context) { availableResults.Add(new Result { @@ -54,7 +53,23 @@ namespace WinAlfred.Plugin.System Score = 20, IcoPath = "Images\\lock.png", Action = () => LockWorkStation() - }); + }); + } + + public string Name + { + get + { + return "sys"; + } + } + + public string Description + { + get + { + return "provide system commands"; + } } } } diff --git a/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj b/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj index ae8c238f6c..b822bafe1d 100644 --- a/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj +++ b/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj @@ -32,6 +32,7 @@ + @@ -41,6 +42,8 @@ + + @@ -49,6 +52,10 @@ + + + + + \ No newline at end of file diff --git a/Plugins/WinAlfred.Plugin.Fanyi/packages.config b/Plugins/WinAlfred.Plugin.Fanyi/packages.config new file mode 100644 index 0000000000..9fdfb3d132 --- /dev/null +++ b/Plugins/WinAlfred.Plugin.Fanyi/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Plugins/WinAlfred.Plugin.Fanyi/plugin.ini b/Plugins/WinAlfred.Plugin.Fanyi/plugin.ini new file mode 100644 index 0000000000..6d2c6eaa27 --- /dev/null +++ b/Plugins/WinAlfred.Plugin.Fanyi/plugin.ini @@ -0,0 +1,8 @@ +[plugin] +ActionKeyword = fy +Name = Translator +Author = qianlifeng +Version = 0.1 +Language = csharp +Description = Chinese and English Translator +ExecuteFile = WinAlfred.Plugin.Fanyi.dll diff --git a/WinAlfred.Plugin.System/Common/ChineseToPinYin.cs b/WinAlfred.Plugin.System/Common/ChineseToPinYin.cs new file mode 100644 index 0000000000..1f3d7f9480 --- /dev/null +++ b/WinAlfred.Plugin.System/Common/ChineseToPinYin.cs @@ -0,0 +1,127 @@ +using System.Collections.Generic; +using System.Text; + +//From:http://blog.csdn.net/chamychen/article/details/7976125 +namespace WinAlfred.Plugin.System.Common +{ + public static class ChineseToPinYin + { + private static readonly Dictionary CodeCollections = new Dictionary { + { -20319, "a" }, { -20317, "ai" }, { -20304, "an" }, { -20295, "ang" }, { -20292, "ao" }, { -20283, "ba" }, { -20265, "bai" }, +{ -20257, "ban" }, { -20242, "bang" }, { -20230, "bao" }, { -20051, "bei" }, { -20036, "ben" }, { -20032, "beng" }, { -20026, "bi" } +, { -20002, "bian" }, { -19990, "biao" }, { -19986, "bie" }, { -19982, "bin" }, { -19976, "bing" }, { -19805, "bo" }, +{ -19784, "bu" }, { -19775, "ca" }, { -19774, "cai" }, { -19763, "can" }, { -19756, "cang" }, { -19751, "cao" }, { -19746, "ce" }, + { -19741, "ceng" }, { -19739, "cha" }, { -19728, "chai" }, { -19725, "chan" }, { -19715, "chang" }, { -19540, "chao" }, +{ -19531, "che" }, { -19525, "chen" }, { -19515, "cheng" }, { -19500, "chi" }, { -19484, "chong" }, { -19479, "chou" }, +{ -19467, "chu" }, { -19289, "chuai" }, { -19288, "chuan" }, { -19281, "chuang" }, { -19275, "chui" }, { -19270, "chun" }, + { -19263, "chuo" }, { -19261, "ci" }, { -19249, "cong" }, { -19243, "cou" }, { -19242, "cu" }, { -19238, "cuan" }, +{ -19235, "cui" }, { -19227, "cun" }, { -19224, "cuo" }, { -19218, "da" }, { -19212, "dai" }, { -19038, "dan" }, { -19023, "dang" }, + { -19018, "dao" }, { -19006, "de" }, { -19003, "deng" }, { -18996, "di" }, { -18977, "dian" }, { -18961, "diao" }, { -18952, "die" } +, { -18783, "ding" }, { -18774, "diu" }, { -18773, "dong" }, { -18763, "dou" }, { -18756, "du" }, { -18741, "duan" }, +{ -18735, "dui" }, { -18731, "dun" }, { -18722, "duo" }, { -18710, "e" }, { -18697, "en" }, { -18696, "er" }, { -18526, "fa" }, + { -18518, "fan" }, { -18501, "fang" }, { -18490, "fei" }, { -18478, "fen" }, { -18463, "feng" }, { -18448, "fo" }, { -18447, "fou" } +, { -18446, "fu" }, { -18239, "ga" }, { -18237, "gai" }, { -18231, "gan" }, { -18220, "gang" }, { -18211, "gao" }, { -18201, "ge" }, + { -18184, "gei" }, { -18183, "gen" }, { -18181, "geng" }, { -18012, "gong" }, { -17997, "gou" }, { -17988, "gu" }, { -17970, "gua" } +, { -17964, "guai" }, { -17961, "guan" }, { -17950, "guang" }, { -17947, "gui" }, { -17931, "gun" }, { -17928, "guo" }, +{ -17922, "ha" }, { -17759, "hai" }, { -17752, "han" }, { -17733, "hang" }, { -17730, "hao" }, { -17721, "he" }, { -17703, "hei" }, + { -17701, "hen" }, { -17697, "heng" }, { -17692, "hong" }, { -17683, "hou" }, { -17676, "hu" }, { -17496, "hua" }, +{ -17487, "huai" }, { -17482, "huan" }, { -17468, "huang" }, { -17454, "hui" }, { -17433, "hun" }, { -17427, "huo" }, +{ -17417, "ji" }, { -17202, "jia" }, { -17185, "jian" }, { -16983, "jiang" }, { -16970, "jiao" }, { -16942, "jie" }, +{ -16915, "jin" }, { -16733, "jing" }, { -16708, "jiong" }, { -16706, "jiu" }, { -16689, "ju" }, { -16664, "juan" }, +{ -16657, "jue" }, { -16647, "jun" }, { -16474, "ka" }, { -16470, "kai" }, { -16465, "kan" }, { -16459, "kang" }, { -16452, "kao" }, + { -16448, "ke" }, { -16433, "ken" }, { -16429, "keng" }, { -16427, "kong" }, { -16423, "kou" }, { -16419, "ku" }, { -16412, "kua" } +, { -16407, "kuai" }, { -16403, "kuan" }, { -16401, "kuang" }, { -16393, "kui" }, { -16220, "kun" }, { -16216, "kuo" }, +{ -16212, "la" }, { -16205, "lai" }, { -16202, "lan" }, { -16187, "lang" }, { -16180, "lao" }, { -16171, "le" }, { -16169, "lei" }, +{ -16158, "leng" }, { -16155, "li" }, { -15959, "lia" }, { -15958, "lian" }, { -15944, "liang" }, { -15933, "liao" }, +{ -15920, "lie" }, { -15915, "lin" }, { -15903, "ling" }, { -15889, "liu" }, { -15878, "long" }, { -15707, "lou" }, { -15701, "lu" }, + { -15681, "lv" }, { -15667, "luan" }, { -15661, "lue" }, { -15659, "lun" }, { -15652, "luo" }, { -15640, "ma" }, { -15631, "mai" }, + { -15625, "man" }, { -15454, "mang" }, { -15448, "mao" }, { -15436, "me" }, { -15435, "mei" }, { -15419, "men" }, +{ -15416, "meng" }, { -15408, "mi" }, { -15394, "mian" }, { -15385, "miao" }, { -15377, "mie" }, { -15375, "min" }, +{ -15369, "ming" }, { -15363, "miu" }, { -15362, "mo" }, { -15183, "mou" }, { -15180, "mu" }, { -15165, "na" }, { -15158, "nai" }, +{ -15153, "nan" }, { -15150, "nang" }, { -15149, "nao" }, { -15144, "ne" }, { -15143, "nei" }, { -15141, "nen" }, { -15140, "neng" } +, { -15139, "ni" }, { -15128, "nian" }, { -15121, "niang" }, { -15119, "niao" }, { -15117, "nie" }, { -15110, "nin" }, +{ -15109, "ning" }, { -14941, "niu" }, { -14937, "nong" }, { -14933, "nu" }, { -14930, "nv" }, { -14929, "nuan" }, { -14928, "nue" } +, { -14926, "nuo" }, { -14922, "o" }, { -14921, "ou" }, { -14914, "pa" }, { -14908, "pai" }, { -14902, "pan" }, { -14894, "pang" }, + { -14889, "pao" }, { -14882, "pei" }, { -14873, "pen" }, { -14871, "peng" }, { -14857, "pi" }, { -14678, "pian" }, +{ -14674, "piao" }, { -14670, "pie" }, { -14668, "pin" }, { -14663, "ping" }, { -14654, "po" }, { -14645, "pu" }, { -14630, "qi" }, + { -14594, "qia" }, { -14429, "qian" }, { -14407, "qiang" }, { -14399, "qiao" }, { -14384, "qie" }, { -14379, "qin" }, + { -14368, "qing" }, { -14355, "qiong" }, { -14353, "qiu" }, { -14345, "qu" }, { -14170, "quan" }, { -14159, "que" }, +{ -14151, "qun" }, { -14149, "ran" }, { -14145, "rang" }, { -14140, "rao" }, { -14137, "re" }, { -14135, "ren" }, { -14125, "reng" } +, { -14123, "ri" }, { -14122, "rong" }, { -14112, "rou" }, { -14109, "ru" }, { -14099, "ruan" }, { -14097, "rui" }, { -14094, "run" } +, { -14092, "ruo" }, { -14090, "sa" }, { -14087, "sai" }, { -14083, "san" }, { -13917, "sang" }, { -13914, "sao" }, { -13910, "se" } +, { -13907, "sen" }, { -13906, "seng" }, { -13905, "sha" }, { -13896, "shai" }, { -13894, "shan" }, { -13878, "shang" }, +{ -13870, "shao" }, { -13859, "she" }, { -13847, "shen" }, { -13831, "sheng" }, { -13658, "shi" }, { -13611, "shou" }, + { -13601, "shu" }, { -13406, "shua" }, { -13404, "shuai" }, { -13400, "shuan" }, { -13398, "shuang" }, { -13395, "shui" }, + { -13391, "shun" }, { -13387, "shuo" }, { -13383, "si" }, { -13367, "song" }, { -13359, "sou" }, { -13356, "su" }, +{ -13343, "suan" }, { -13340, "sui" }, { -13329, "sun" }, { -13326, "suo" }, { -13318, "ta" }, { -13147, "tai" }, { -13138, "tan" }, + { -13120, "tang" }, { -13107, "tao" }, { -13096, "te" }, { -13095, "teng" }, { -13091, "ti" }, { -13076, "tian" }, +{ -13068, "tiao" }, { -13063, "tie" }, { -13060, "ting" }, { -12888, "tong" }, { -12875, "tou" }, { -12871, "tu" }, +{ -12860, "tuan" }, { -12858, "tui" }, { -12852, "tun" }, { -12849, "tuo" }, { -12838, "wa" }, { -12831, "wai" }, { -12829, "wan" } +, { -12812, "wang" }, { -12802, "wei" }, { -12607, "wen" }, { -12597, "weng" }, { -12594, "wo" }, { -12585, "wu" }, { -12556, "xi" } +, { -12359, "xia" }, { -12346, "xian" }, { -12320, "xiang" }, { -12300, "xiao" }, { -12120, "xie" }, { -12099, "xin" }, +{ -12089, "xing" }, { -12074, "xiong" }, { -12067, "xiu" }, { -12058, "xu" }, { -12039, "xuan" }, { -11867, "xue" }, +{ -11861, "xun" }, { -11847, "ya" }, { -11831, "yan" }, { -11798, "yang" }, { -11781, "yao" }, { -11604, "ye" }, { -11589, "yi" }, + { -11536, "yin" }, { -11358, "ying" }, { -11340, "yo" }, { -11339, "yong" }, { -11324, "you" }, { -11303, "yu" }, +{ -11097, "yuan" }, { -11077, "yue" }, { -11067, "yun" }, { -11055, "za" }, { -11052, "zai" }, { -11045, "zan" }, + { -11041, "zang" }, { -11038, "zao" }, { -11024, "ze" }, { -11020, "zei" }, { -11019, "zen" }, { -11018, "zeng" }, +{ -11014, "zha" }, { -10838, "zhai" }, { -10832, "zhan" }, { -10815, "zhang" }, { -10800, "zhao" }, { -10790, "zhe" }, +{ -10780, "zhen" }, { -10764, "zheng" }, { -10587, "zhi" }, { -10544, "zhong" }, { -10533, "zhou" }, { -10519, "zhu" }, +{ -10331, "zhua" }, { -10329, "zhuai" }, { -10328, "zhuan" }, { -10322, "zhuang" }, { -10315, "zhui" }, { -10309, "zhun" }, +{ -10307, "zhuo" }, { -10296, "zi" }, { -10281, "zong" }, { -10274, "zou" }, { -10270, "zu" }, { -10262, "zuan" }, { -10260, "zui" } +, { -10256, "zun" }, { -10254, "zuo" } }; + /// + /// 汉字转拼音 + /// + /// 需要转换的汉字 + /// 返回汉字对应的拼音 + public static string ToPinYin(string txt) + { + txt = txt.Trim(); + byte[] arr = new byte[2]; //每个汉字为2字节 + StringBuilder result = new StringBuilder();//使用StringBuilder优化字符串连接 + int charCode = 0; + int arr1 = 0; + int arr2 = 0; + char[] arrChar = txt.ToCharArray(); + for (int j = 0; j < arrChar.Length; j++) //遍历输入的字符 + { + arr = Encoding.Default.GetBytes(arrChar[j].ToString());//根据系统默认编码得到字节码 + if (arr.Length == 1)//如果只有1字节说明该字符不是汉字，结束本次循环 + { + result.Append(arrChar[j].ToString()); + continue; + + } + arr1 = (short)(arr[0]); //取字节1 + arr2 = (short)(arr[1]); //取字节2 + charCode = arr1 * 256 + arr2 - 65536;//计算汉字的编码 + + if (charCode > -10254 || charCode < -20319) //如果不在汉字编码范围内则不改变 + { + result.Append(arrChar[j]); + } + else + { + //根据汉字编码范围查找对应的拼音并保存到结果中 + //由于charCode的键不一定存在，所以要找比他更小的键上一个键 + if (!CodeCollections.ContainsKey(charCode)) + { + for (int i = charCode; i <= 0; --i) + { + if (CodeCollections.ContainsKey(i)) + { + result.Append(" " + CodeCollections[i] + " "); + break; + } + } + } + else + { + result.Append(" " + CodeCollections[charCode] + " "); + } + } + } + return result.ToString(); + } + } +} diff --git a/WinAlfred.Plugin.System/Programs.cs b/WinAlfred.Plugin.System/Programs.cs index 72f9991ccf..556932af07 100644 --- a/WinAlfred.Plugin.System/Programs.cs +++ b/WinAlfred.Plugin.System/Programs.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; using Microsoft.Win32; +using WinAlfred.Plugin.System.Common; namespace WinAlfred.Plugin.System { @@ -14,21 +15,30 @@ namespace WinAlfred.Plugin.System public string Title { get; set; } public string IcoPath { get; set; } public string ExecutePath { get; set; } + public int Score { get; set; } } public class Programs : ISystemPlugin { + //TODO:add score for MRU program + + private List indexDirectory = new List(); + private List indexPostfix = new List { "lnk", "exe" }; + List installedList = new List(); public List Query(Query query) { - if (string.IsNullOrEmpty(query.RawQuery) || query.RawQuery.Length <= 1) return new List(); + if (string.IsNullOrEmpty(query.RawQuery) || query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List(); - return installedList.Where(o => o.Title.ToLower().Contains(query.RawQuery.ToLower())).Select(c => new Result() + List returnList = installedList.Where(o => MatchProgram(o, query)).ToList(); + returnList.ForEach(ScoreFilter); + + return returnList.Select(c => new Result() { Title = c.Title, IcoPath = c.IcoPath, - Score = 10, + Score = c.Score, Action = () => { if (string.IsNullOrEmpty(c.ExecutePath)) @@ -43,18 +53,27 @@ namespace WinAlfred.Plugin.System }).ToList(); } + private bool MatchProgram(Program program, Query query) + { + if (program.Title.ToLower().Contains(query.RawQuery.ToLower())) return true; + if (ChineseToPinYin.ToPinYin(program.Title).Replace(" ", "").ToLower().Contains(query.RawQuery.ToLower())) return true; + + return false; + } + public void Init(PluginInitContext context) { + indexDirectory.Add(Environment.GetFolderPath(Environment.SpecialFolder.Programs)); + indexDirectory.Add(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + @"\Microsoft\Windows\Start Menu\Programs"); + GetAppFromStartMenu(); } private void GetAppFromStartMenu() { - List path = - Directory.GetDirectories(Environment.GetFolderPath(Environment.SpecialFolder.Programs)).ToList(); - foreach (string s in path) + foreach (string directory in indexDirectory) { - GetAppFromDirectory(s); + GetAppFromDirectory(directory); } } @@ -62,12 +81,13 @@ namespace WinAlfred.Plugin.System { foreach (string file in Directory.GetFiles(path)) { - if (file.EndsWith(".lnk") || file.EndsWith(".exe")) + if (indexPostfix.Any(o => file.EndsWith("." + o))) { Program p = new Program() { Title = getAppNameFromAppPath(file), IcoPath = file, + Score = 10, ExecutePath = file }; installedList.Add(p); @@ -80,6 +100,18 @@ namespace WinAlfred.Plugin.System } } + private void ScoreFilter(Program p) + { + if (p.Title.Contains("启动") || p.Title.ToLower().Contains("start")) + { + p.Score += 10; + } + if (p.Title.Contains("卸载") || p.Title.ToLower().Contains("uninstall")) + { + p.Score -= 5; + } + } + private string getAppNameFromAppPath(string app) { string temp = app.Substring(app.LastIndexOf('\\') + 1); diff --git a/WinAlfred.Plugin.System/Sys.cs b/WinAlfred.Plugin.System/Sys.cs index f167099643..9919ca6c39 100644 --- a/WinAlfred.Plugin.System/Sys.cs +++ b/WinAlfred.Plugin.System/Sys.cs @@ -62,6 +62,14 @@ namespace WinAlfred.Plugin.System IcoPath = "Images\\lock.png", Action = () => LockWorkStation() }); + availableResults.Add(new Result + { + Title = "Exit", + SubTitle = "Close this app", + Score = 110, + IcoPath = "Images\\exit.png", + Action = () => context.CloseApp() + }); } public string Name diff --git a/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj b/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj index 7da37c9292..f7d8449ea4 100644 --- a/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj +++ b/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj @@ -40,6 +40,7 @@ + diff --git a/WinAlfred.Plugin/PluginInitContext.cs b/WinAlfred.Plugin/PluginInitContext.cs index c010ae25f5..70025c2584 100644 --- a/WinAlfred.Plugin/PluginInitContext.cs +++ b/WinAlfred.Plugin/PluginInitContext.cs @@ -8,6 +8,11 @@ namespace WinAlfred.Plugin public class PluginInitContext { public List Plugins { get; set; } + public Action ChangeQuery { get; set; } + public Action CloseApp { get; set; } + public Action HideApp { get; set; } + public Action ShowApp { get; set; } + public Action ShowMsg { get; set; } } } diff --git a/WinAlfred.Plugin/Result.cs b/WinAlfred.Plugin/Result.cs index 3d328df540..05565fea73 100644 --- a/WinAlfred.Plugin/Result.cs +++ b/WinAlfred.Plugin/Result.cs @@ -12,6 +12,8 @@ namespace WinAlfred.Plugin public Action Action { get; set; } public int Score { get; set; } + public bool DontHideWinAlfredAfterAction { get; set; } + //todo: this should be controlled by system, not visible to users /// /// Only resulsts that originQuery match with curren query will be displayed in the panel diff --git a/WinAlfred.sln b/WinAlfred.sln index 22df5a02b1..eca79e1fa0 100644 --- a/WinAlfred.sln +++ b/WinAlfred.sln @@ -9,10 +9,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugin", "Plugin", "{3A73F5 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred", "WinAlfred\WinAlfred.csproj", "{DB90F671-D861-46BB-93A3-F1304F5BA1C5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PyWinAlfred", "PyWinAlfred\PyWinAlfred.vcxproj", "{D03FD663-38A8-4C1A-8431-EB44F93E7EBA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred.Plugin.System", "WinAlfred.Plugin.System\WinAlfred.Plugin.System.csproj", "{69CE0206-CB41-453D-88AF-DF86092EF9B8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred.Plugin.Fanyi", "Plugins\WinAlfred.Plugin.Fanyi\WinAlfred.Plugin.Fanyi.csproj", "{353769D3-D11C-4D86-BD06-AC8C1D68642B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -52,8 +52,8 @@ Global {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|x86.Build.0 = Debug|Any CPU {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Any CPU.ActiveCfg = Release|Any CPU {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Any CPU.Build.0 = Release|Any CPU - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Mixed Platforms.Build.0 = Release|x86 + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Mixed Platforms.Build.0 = Release|Any CPU {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Win32.ActiveCfg = Release|x86 {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Win32.Build.0 = Release|x86 {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x64.ActiveCfg = Release|Any CPU @@ -72,24 +72,6 @@ Global {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Win32.ActiveCfg = Release|Any CPU {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.ActiveCfg = Release|Any CPU {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.ActiveCfg = Release|Any CPU - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Debug|Mixed Platforms.Build.0 = Debug|x64 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Debug|Win32.ActiveCfg = Debug|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Debug|Win32.Build.0 = Debug|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Debug|x64.ActiveCfg = Debug|x64 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Debug|x64.Build.0 = Debug|x64 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Debug|x86.ActiveCfg = Debug|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Debug|x86.Build.0 = Debug|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|Any CPU.ActiveCfg = Release|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|Mixed Platforms.Build.0 = Release|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|Win32.ActiveCfg = Release|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|Win32.Build.0 = Release|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|x64.ActiveCfg = Release|x64 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|x64.Build.0 = Release|x64 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|x86.ActiveCfg = Release|Win32 - {D03FD663-38A8-4C1A-8431-EB44F93E7EBA}.Release|x86.Build.0 = Release|Win32 {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Any CPU.Build.0 = Debug|Any CPU {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -104,8 +86,25 @@ Global {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Win32.ActiveCfg = Release|Any CPU {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|x64.ActiveCfg = Release|Any CPU {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|x86.ActiveCfg = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|Win32.ActiveCfg = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|x64.ActiveCfg = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|x86.ActiveCfg = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|Any CPU.Build.0 = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|Win32.ActiveCfg = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|x64.ActiveCfg = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {353769D3-D11C-4D86-BD06-AC8C1D68642B} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} + EndGlobalSection EndGlobal diff --git a/WinAlfred/Commands/PluginCommand.cs b/WinAlfred/Commands/PluginCommand.cs index cb0a764de3..f30b667ac3 100644 --- a/WinAlfred/Commands/PluginCommand.cs +++ b/WinAlfred/Commands/PluginCommand.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; using WinAlfred.Helper; using WinAlfred.Plugin; diff --git a/WinAlfred/Helper/KeyboardHook.cs b/WinAlfred/Helper/KeyboardHook.cs index 97a7755341..be717a541a 100644 --- a/WinAlfred/Helper/KeyboardHook.cs +++ b/WinAlfred/Helper/KeyboardHook.cs @@ -85,6 +85,7 @@ namespace WinAlfred.Helper if (!RegisterHotKey(window.Handle, currentId, (uint)xModifier, (uint)key)) { Log.Error("Couldn’t register the hot key."); + MessageBox.Show("Couldn’t register the hot key."); #if (DEBUG) { throw new InvalidOperationException("Couldn’t register the hot key."); diff --git a/WinAlfred/MainWindow.xaml.cs b/WinAlfred/MainWindow.xaml.cs index fd2099fb02..fa91201f4c 100644 --- a/WinAlfred/MainWindow.xaml.cs +++ b/WinAlfred/MainWindow.xaml.cs @@ -6,6 +6,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Forms; using System.Windows.Input; +using Noesis.Javascript; using WinAlfred.Commands; using WinAlfred.Helper; using WinAlfred.Plugin; @@ -39,11 +40,7 @@ namespace WinAlfred System.Windows.Forms.MenuItem open = new System.Windows.Forms.MenuItem("Open"); open.Click += (o, e) => ShowWinAlfred(); System.Windows.Forms.MenuItem exit = new System.Windows.Forms.MenuItem("Exit"); - exit.Click += (o, e) => - { - notifyIcon.Visible = false; - Close(); - }; + exit.Click += (o, e) => CloseApp(); System.Windows.Forms.MenuItem[] childen = { open, exit }; notifyIcon.ContextMenu = new System.Windows.Forms.ContextMenu(childen); } @@ -68,6 +65,30 @@ namespace WinAlfred private void TextBoxBase_OnTextChanged(object sender, TextChangedEventArgs e) { + + // Initialize a context + using (JavascriptContext context = new JavascriptContext()) + { + + // Setting external parameters for the context + context.SetParameter("message", "Hello World !"); + context.SetParameter("number", 1); + + // Script + string script = @" + var i; + for (i = 0; i < 5; i++) + console.Print(message + ' (' + i + ')'); + number += i; + "; + + // Running the script + context.Run(script); + + // Getting a parameter + MessageBox.Show("number: " + context.GetParameter("number")); + } + //MessageBox.Show("s"); resultCtrl.Dirty = true; ////auto clear results after 50ms if there are any results returned by plugins @@ -91,7 +112,7 @@ namespace WinAlfred Hide(); } - public void ShowWinAlfred() + private void ShowWinAlfred() { Show(); //FocusManager.SetFocusedElement(this, tbQuery); @@ -104,6 +125,9 @@ namespace WinAlfred Plugins.Init(this); cmdDispatcher = new Command(this); InitialTray(); + + + } private void TbQuery_OnPreviewKeyDown(object sender, KeyEventArgs e) @@ -126,8 +150,7 @@ namespace WinAlfred break; case Key.Enter: - resultCtrl.AcceptSelect(); - HideWinAlfred(); + if (resultCtrl.AcceptSelect()) HideWinAlfred(); e.Handled = true; break; } @@ -141,5 +164,39 @@ namespace WinAlfred resultCtrl.AddResults(l); })); } + + #region Public API + + //Those method can be invoked by plugins + + public void ChangeQuery(string query) + { + tbQuery.Text = query; + tbQuery.CaretIndex = tbQuery.Text.Length; + } + + public void CloseApp() + { + notifyIcon.Visible = false; + Close(); + } + + public void HideApp() + { + HideWinAlfred(); + } + + public void ShowApp() + { + ShowWinAlfred(); + } + + public void ShowMsg(string title, string subTitle, string iconPath) + { + Msg m = new Msg { Owner = GetWindow(this) }; + m.Show(title, subTitle, iconPath); + } + + #endregion } } \ No newline at end of file diff --git a/WinAlfred/Msg.xaml b/WinAlfred/Msg.xaml new file mode 100644 index 0000000000..ef17b34532 --- /dev/null +++ b/WinAlfred/Msg.xaml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + Title + sdfdsf + + + + diff --git a/WinAlfred/Msg.xaml.cs b/WinAlfred/Msg.xaml.cs new file mode 100644 index 0000000000..353279de68 --- /dev/null +++ b/WinAlfred/Msg.xaml.cs @@ -0,0 +1,82 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Forms; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Animation; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; +using Timer = System.Threading.Timer; + +namespace WinAlfred +{ + public partial class Msg : Window + { + Storyboard fadeOutStoryboard = new Storyboard(); + private bool closing = false; + + public Msg() + { + InitializeComponent(); + + Left = Screen.PrimaryScreen.WorkingArea.Right - this.Width; + Top = Screen.PrimaryScreen.Bounds.Bottom; + showAnimation.From = Screen.PrimaryScreen.Bounds.Bottom; + showAnimation.To = Screen.PrimaryScreen.WorkingArea.Bottom - Height; + + // Create the fade out storyboard + fadeOutStoryboard.Completed += new EventHandler(fadeOutStoryboard_Completed); + DoubleAnimation fadeOutAnimation = new DoubleAnimation(Screen.PrimaryScreen.WorkingArea.Bottom - Height, Screen.PrimaryScreen.Bounds.Bottom, new Duration(TimeSpan.FromSeconds(0.3))) + { + AccelerationRatio = 0.2 + }; + Storyboard.SetTarget(fadeOutAnimation, this); + Storyboard.SetTargetProperty(fadeOutAnimation, new PropertyPath(TopProperty)); + fadeOutStoryboard.Children.Add(fadeOutAnimation); + + imgClose.Source = new BitmapImage(new Uri(AppDomain.CurrentDomain.BaseDirectory + "\\Images\\close.png")); + imgClose.MouseUp += imgClose_MouseUp; + } + + void imgClose_MouseUp(object sender, MouseButtonEventArgs e) + { + if (!closing) + { + closing = true; + fadeOutStoryboard.Begin(); + } + } + + private void fadeOutStoryboard_Completed(object sender, EventArgs e) + { + Close(); + } + + public void Show(string title, string subTitle, string icopath) + { + tbTitle.Text = title; + tbSubTitle.Text = subTitle; + if (!File.Exists(icopath)) + { + icopath = AppDomain.CurrentDomain.BaseDirectory + "Images\\ico.png"; + } + imgIco.Source = new BitmapImage(new Uri(icopath)); + Show(); + new Timer(o => + { + if (!closing) + { + closing = true; + Dispatcher.Invoke(new Action(fadeOutStoryboard.Begin)); + } + }, null, TimeSpan.FromSeconds(3), TimeSpan.FromMilliseconds(-1)); + } + } +} diff --git a/WinAlfred/PluginLoader/Plugins.cs b/WinAlfred/PluginLoader/Plugins.cs index 1b1b840bf5..42f527bf09 100644 --- a/WinAlfred/PluginLoader/Plugins.cs +++ b/WinAlfred/PluginLoader/Plugins.cs @@ -22,11 +22,11 @@ namespace WinAlfred.PluginLoader ThreadPool.QueueUserWorkItem(o => plugin1.Init(new PluginInitContext() { Plugins = plugins, - ChangeQuery = s => - { - window.tbQuery.Text = s; - window.ShowWinAlfred(); - } + ChangeQuery = s => window.ChangeQuery(s), + CloseApp = window.CloseApp, + HideApp = window.HideApp, + ShowApp = window.ShowApp, + ShowMsg = (title,subTitle,iconPath) => window.ShowMsg(title,subTitle,iconPath) })); } } diff --git a/WinAlfred/ResultPanel.xaml.cs b/WinAlfred/ResultPanel.xaml.cs index 420cb7774f..6cf568da4f 100644 --- a/WinAlfred/ResultPanel.xaml.cs +++ b/WinAlfred/ResultPanel.xaml.cs @@ -192,14 +192,21 @@ namespace WinAlfred Select(0); } - public void AcceptSelect() + public bool AcceptSelect() { int index = GetCurrentSelectedResultIndex(); var resultItemControl = pnlContainer.Children[index] as ResultItem; if (resultItemControl != null) { - if (resultItemControl.Result.Action != null) resultItemControl.Result.Action(); + if (resultItemControl.Result.Action != null) + { + resultItemControl.Result.Action(); + } + + return !resultItemControl.Result.DontHideWinAlfredAfterAction; } + + return true; } public ResultPanel() diff --git a/WinAlfred/WinAlfred.csproj b/WinAlfred/WinAlfred.csproj index 6fe06be122..0d76b8b281 100644 --- a/WinAlfred/WinAlfred.csproj +++ b/WinAlfred/WinAlfred.csproj @@ -39,22 +39,50 @@ app.ico + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + ..\packages\log4net.2.0.3\lib\net35-full\log4net.dll ..\packages\Newtonsoft.Json.5.0.8\lib\net35\Newtonsoft.Json.dll + + C:\Users\Scott\Desktop\x64\Noesis.Javascript.dll + + + + + + + @@ -71,6 +99,9 @@ + + Msg.xaml + @@ -95,6 +126,10 @@ MainWindow.xaml Code + + Designer + MSBuild:Compile + Designer MSBuild:Compile From 2db21361178fcc3ec3d3f491eb7618f430438f1e Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Sun, 5 Jan 2014 19:33:36 +0800 Subject: [PATCH 06/16] remove unused codes --- WinAlfred/MainWindow.xaml.cs | 28 ---------------------------- WinAlfred/WinAlfred.csproj | 3 --- 2 files changed, 31 deletions(-) diff --git a/WinAlfred/MainWindow.xaml.cs b/WinAlfred/MainWindow.xaml.cs index fa91201f4c..02dea99755 100644 --- a/WinAlfred/MainWindow.xaml.cs +++ b/WinAlfred/MainWindow.xaml.cs @@ -6,7 +6,6 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Forms; using System.Windows.Input; -using Noesis.Javascript; using WinAlfred.Commands; using WinAlfred.Helper; using WinAlfred.Plugin; @@ -65,30 +64,6 @@ namespace WinAlfred private void TextBoxBase_OnTextChanged(object sender, TextChangedEventArgs e) { - - // Initialize a context - using (JavascriptContext context = new JavascriptContext()) - { - - // Setting external parameters for the context - context.SetParameter("message", "Hello World !"); - context.SetParameter("number", 1); - - // Script - string script = @" - var i; - for (i = 0; i < 5; i++) - console.Print(message + ' (' + i + ')'); - number += i; - "; - - // Running the script - context.Run(script); - - // Getting a parameter - MessageBox.Show("number: " + context.GetParameter("number")); - } - //MessageBox.Show("s"); resultCtrl.Dirty = true; ////auto clear results after 50ms if there are any results returned by plugins @@ -125,9 +100,6 @@ namespace WinAlfred Plugins.Init(this); cmdDispatcher = new Command(this); InitialTray(); - - - } private void TbQuery_OnPreviewKeyDown(object sender, KeyEventArgs e) diff --git a/WinAlfred/WinAlfred.csproj b/WinAlfred/WinAlfred.csproj index 0d76b8b281..f77fec5eab 100644 --- a/WinAlfred/WinAlfred.csproj +++ b/WinAlfred/WinAlfred.csproj @@ -65,9 +65,6 @@ ..\packages\Newtonsoft.Json.5.0.8\lib\net35\Newtonsoft.Json.dll - - C:\Users\Scott\Desktop\x64\Noesis.Javascript.dll - From 3901422a54a6cca6b04c97a961f2e6c46a8f8eb5 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Mon, 6 Jan 2014 19:03:20 +0800 Subject: [PATCH 07/16] Add missed changes --- .../ThirdpartyPluginIndicator.cs | 61 ++++++++++++++++++ WinAlfred/Commands/BaseCommand.cs | 29 +++++++++ WinAlfred/Images/close.png | Bin 0 -> 139 bytes WinAlfred/Images/cmd.png | Bin 0 -> 1633 bytes WinAlfred/Images/exit.png | Bin 0 -> 2724 bytes WinAlfred/Images/logoff.png | Bin 0 -> 613 bytes WinAlfred/Images/work.png | Bin 0 -> 4841 bytes WinAlfred/MainWindow.xaml.cs | 3 + WinAlfred/WinAlfred.csproj | 3 + 9 files changed, 96 insertions(+) create mode 100644 WinAlfred.Plugin.System/ThirdpartyPluginIndicator.cs create mode 100644 WinAlfred/Commands/BaseCommand.cs create mode 100644 WinAlfred/Images/close.png create mode 100644 WinAlfred/Images/cmd.png create mode 100644 WinAlfred/Images/exit.png create mode 100644 WinAlfred/Images/logoff.png create mode 100644 WinAlfred/Images/work.png diff --git a/WinAlfred.Plugin.System/ThirdpartyPluginIndicator.cs b/WinAlfred.Plugin.System/ThirdpartyPluginIndicator.cs new file mode 100644 index 0000000000..ca10dfa486 --- /dev/null +++ b/WinAlfred.Plugin.System/ThirdpartyPluginIndicator.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace WinAlfred.Plugin.System +{ + public class ThirdpartyPluginIndicator : ISystemPlugin + { + private List allPlugins = new List(); + private Action changeQuery; + + public List Query(Query query) + { + List results = new List(); + if (string.IsNullOrEmpty(query.RawQuery)) return results; + + foreach (PluginMetadata metadata in allPlugins.Select(o=>o.Metadata)) + { + if (metadata.ActionKeyword.StartsWith(query.RawQuery)) + { + PluginMetadata metadataCopy = metadata; + Result result = new Result + { + Title = metadata.ActionKeyword, + SubTitle = string.Format("press space to active {0} workflow",metadata.Name), + Score = 50, + IcoPath = "Images/work.png", + Action = () => changeQuery(metadataCopy.ActionKeyword + " "), + DontHideWinAlfredAfterAction = true + }; + results.Add(result); + } + } + return results; + } + + public void Init(PluginInitContext context) + { + allPlugins = context.Plugins; + changeQuery = context.ChangeQuery; + } + + public string Name { + get + { + return "ThirdpartyPluginIndicator"; + } + } + + public string Description + { + get + { + return "ThirdpartyPluginIndicator"; + } + } + + + } +} diff --git a/WinAlfred/Commands/BaseCommand.cs b/WinAlfred/Commands/BaseCommand.cs new file mode 100644 index 0000000000..aa3dfbdb75 --- /dev/null +++ b/WinAlfred/Commands/BaseCommand.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using WinAlfred.Plugin; + +namespace WinAlfred.Commands +{ + public abstract class BaseCommand + { + private MainWindow window; + + public abstract void Dispatch(Query query); + + //TODO:Ugly, we should subscribe events here, instead of just use usercontrol as the parameter + protected BaseCommand(MainWindow window) + { + this.window = window; + } + + protected void UpdateResultView(List results) + { + if (results.Count > 0) + { + window.OnUpdateResultView(results); + } + } + } +} diff --git a/WinAlfred/Images/close.png b/WinAlfred/Images/close.png new file mode 100644 index 0000000000000000000000000000000000000000..5ddfe20b8f3f9541bad8e9a6be5e208eba50244b GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`L7py-Ar`&K2@|z=9CLhAz6IL1a->h*YA2k~jgAU^{-zNWm$}Th{q$$7=!YgH|p8br|O5BHzfdY0B~KGjEsy-PEAey zWLcJNjDa!c<7P^B)2h{K(f#}Pze=T2f3#XH!vR2RO)8a2CYem0t<`GI*47r3Qa#Au zC(DD3bB=sI565x*jZ$e;O8FeXJ^&>pgb;Loex5EYEI>*L08mPGz;ru5Y8_v9uM>#` zu3o*0OP4MY5JD-X=#&5e3;-!5eBVbHhA0#Y*xA`ZyWNKG`v`)d1FAc~Vds7zsZ1?!a|jT)%!D=gyr2A*9D)x8wLY zYR?!0&N-WynD}C2W8?Eiy-s@=&|MFXkB?(!W(Gq;L%4VE9@f^@005NIo*)O&eONiP z)&M}2Qe<;;bG^}M^p>C-bvm8K{QNv#zI=&xyA7>1a=9Eh=a5pO(P*I2Xdn#3zomg# z%t|Q}hM_K(%YXVopnF6Z2M>Y(ckkW>00<#KDaFN$7cn0%AWFc`uS#d2Y_O+NVC~&(HKJyaux@UhtOeT_%J{{t*De~ zHJh7J6q$VnJdY+4iL)I5doRZIJ!twJ7W6me4g62T{Hltl#)y)1K0B)q6nrp1@z~26bt=( zi9`bFbQ*jA0Vcl3hqGDA7%NIC31`gAUA|0aXJ?_i+N|R+24eOo-QSIG9wI*i%i_ke zZM0i0Bc<#-$ZNHlezv?!gCM9FV2A*eF-93v9>5Mhlg<+u)o*MiD@O zDD+XUR`BgNUmGFC*0pQbW@@$C^H!@B?Q*j(5<&F{jQmOQ&Q-UtR7-NiyqDV(kBmsl~ntRwv<#PG=m6a9B7~_mFn=v-P7&|eP z$&7tEI$CsHw-~eLdfwPbE;oEK`w3^1Qp>WaQcAC_t*r_n{9bi@fW@rYwoNU|Vw6&g zbDm_3rILxn$y_dXW;CBK7Cdi!WMstqb#d{RrKP1GtJP}sQ2-o=jdM;c%VL~!W{k14 z)=CKBM^U8zp}7A+`wL@BoR9x#)=mHb03~!qSaf7zbY(hYa%Ew3WdJfTF)%GKGA%JN zR536*Gch_fI4v+XIxsLq5ff(s001R)MObuXVRU6WZEs|0W_bWIFfceRFfuJNH&ih= fIyE#pG&C(RHaajcNaF4900000NkvXXu0mjfN!jGN literal 0 HcmV?d00001 diff --git a/WinAlfred/Images/exit.png b/WinAlfred/Images/exit.png new file mode 100644 index 0000000000000000000000000000000000000000..523c3d5197db3825be40fa89af1c943ec37dbcbd GIT binary patch literal 2724 zcmV;V3S0GwP)yt5dvX`KvN%sn06G!T3WQ#NEJ(}Qc_SWH5eO_#zb2aznPX; zA5CMynAS7|+c2rEVtJJs%ZLO;6ryc;4Ud6gP=?`gXXeg*?%faPanEz++V+c^Z1z2S zud~+wzxG=DaX^eQe345E;Pee`mJ+$MR4zZRl$s(Uh=A4xV~pKugTaLQG}=FI4BBXn zHfV#>8no7!vMr1Atd0GSc4Y8mjo5k|{n~xUP}T+mM}TKUWZQSOHYtEov9u@m*@eps zpPn0ATPkA#3J_oG_I;je03E7vebtVYfdObe57%dn*#X=pC$72dhJ0q|Eq(Y@T^N8Q z0IQ~79Haj)68`=&a1?SHW~xH5^x$AmUtKu1k}@N%-}w6dhD>NIPX52KD?kI(0QaV} z*3GI|iYS)^qms}U24zArab%K+R70W$ED#D0FvPt1pRk#T#B`9sos0ykjp#dX8%d%w= zZ;e~FEEar{{v_c3XA!~9fzV($-s67b09GNOrm2bM88adTCbhRG&RR9I5Dg_kDIuku zqeM6<{VygZt4l&cHK``U1ChfV`(|g7wQ=LFU0im{Er?RITzf5Fe(pJs+(+gMhP)v8fLNCU-_C&?^djxLvjV3gu} z>(=qfO*c`l0=)f>vylbB5I+lLVA9&PG*6!%lsAUYmM^E=*;!o(0Ye=foW1*Q%DG%% z+)AgpbNzY_jvqg|_nki~e5FhZrL$LG&1HAo5dnYtp@+!7@=D;$o>bg%4Gg{U2A|EJ zPcalu^%EyD`PpX~@)3?L;>>`5Ck`9(lc-;@A_Bhm;fKln_P3FXM^Xu2PO{s#b9&x9 zii3jzx!KE>@o8Jzh`PX8M#CW#CZT}~&COi7WJzHBWJd?XFTWfhtATQ<6jo&$E0rQQ zD+A>A?xpX=7Xz{)!X@|JHwt{;X>`bn-#=aNs|O#XX6)F&SpJ!3;;(^&gPiT`jOfa4 z-Wh1mtHfUQ8hYcp1pnSWXCG7`80VCI}l~@~yW9`c7=!N_pSDAaEb3 z;g?(<52fB{PV{hU~{Ch$(v)Tyxq3P3NQEej<$M+sxN2n+)gv2RcQlB%x{ zJfGgOg+|A?gj#@XM+e=4itbMU<^?2R12sH5zvK#cM1)I$9W#!y_;btZ~S9n@Lu1A3xtbqYGP<$ zfC2C}xQY=$iICDp6VBtDQ~QB&KuefFvFH&Xrj1(`!X&~nxzI`kaIUEddU|5CIY)Qp zU1*Y5qCp^C7yRl{oH~_35z@wxBKRF>q~iCu21-CtgaVM7GbbXS&gT;o8TUTme7PI3 z^zGThwE6SB=PMU2V#hCj&NyYC2nA4L?~WD*F(4QeZn6qmK#SO)9}x_8?ip?GDYF(X z4A|^HbcjM%S0W}soa1!NMiwEkabw_lQd=9vwl*wF*)?UMQWlc3Ff}Q3Iz_oQO|dpj zxi*bXr=TW?X$k?yA=l?%;C;4MqY_w;Z!w9I{V@nVV# z7J^8?n>IizNWu?XRS1g+srw(`3SW2vWKNwTxBESmQW0VvKB!!1OepZRbNQix_cg{kgNf1AH zr#;iLp5D!y0&;cD&D^uSlY=eODGG^UViU8xel5b8Z`{m1+x|{^+_-?wW3T;*%%+Ww z-AaveaK^$(tdt#FA_`GbA!8|yKem$m`SSt!@vW`g*ZB_J?Q=MlD>`8pUzHM07RwAS zeSo`P`*UP@&YnF>&rctZI8T&~CpZKC5OVTB#Q&m`ByLqgsqYNOo_r!Qonsmsxqr)6 zu2}mA_O^V9quCspvId8E-WZM#=Q(uMHQf024!-lk3naq4T7^1`)0t6H}PKZg_1+=-0QD#q;4$JfB6C`l?s5ExnKb^7cAiDjvbuZyO-k! z4^lYS&y?BMF=yU9rna|7$ODvyhdJ=Ty$rnlmJJ$>7(uxk3<_hkgU$YmBG?2|?q`)S zcoDJJSrsMI-||iSDX^#+8fvKC*S}+3kdCC49xfp`_wi z@th1^65FbLLM}525>c)K->l>h{F@`U&ZXyxl?)v^P&M$OBVC+W@etj2-9i4qelI-5 z1FkCeL=Z)kjC&TcRk~AxPr&s62}EpzmN5+c^>v0eZJ^<%Z&P>sLQ<{MsBM`>O=F|2 zy<8@H_#lOUeoSu9`&``k2D(^6`NITI#s*=OL5v@RV5AZ@E?A|6lsg@Sfcsens(*EI zNVuUjyyIHvi-_`;sPJYMX?-5`^@-2RE@{s*rh>?RG`>N%B=bBoqyvT^Ro;tLHCcYCjdjCeb=Z{JAj^M1SJly5xL=k5XSSxChH{_zQ&A8+@3 e@f^ literal 0 HcmV?d00001 diff --git a/WinAlfred/Images/logoff.png b/WinAlfred/Images/logoff.png new file mode 100644 index 0000000000000000000000000000000000000000..73c1379b2e233a3f3cdeb8d62dfcfa9db43e1be6 GIT binary patch literal 613 zcmV-r0-F7aP)i&;aWI*Ri`asL#i^wz4kCiM=^zwW7ad$Wv|y)# z9W;uI3T?zeLQ^C41*sU5l4@dVnukLvdTGhMA=WH8<2m0s|KE4c<(^OA=6sbVnyQ)N zEr1q43jjblhNw9LyFp8!%SNtPVs`1vj(9+{ za=riK_HRIQ!MW+b*A6R^%Dno%~cAa=toq~O#e1d zyBVXVwnWVie8?84RI40vn9!?L{3=%@@r7iTyRSY;e8V1*c9V|hpVt_gj`Fi4&8Z7u zePffwWR~Om+c>)5}!+?m`kK2zF@bVx0xJ6(@}E8a!qlN8-XBjXL0L>lVLZa zSua~~`{qi-3udL}Wq8304pat+7vlFRrw4{x100000NkvXXu0mjfH;)=D literal 0 HcmV?d00001 diff --git a/WinAlfred/Images/work.png b/WinAlfred/Images/work.png new file mode 100644 index 0000000000000000000000000000000000000000..aa447afd8df40dca7123ee13c89f8016cc83b14c GIT binary patch literal 4841 zcmVKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000OSNklpWoZkjP?SDE z`w$|i+9FkH5mZHe07Q8}v}ysNQYa8n6-o(h2;d|@2-J26iJjQa<^{*`Hul)F-+RwF zeXxT9PJ&fY@kxK(qkFHu^V9jC?GsvSzRs}DG!ERq`3HmXi8U|(`PBz}mSw#mV6@uG@6|!v>URl_qz#^pyT@014Oo z*IR$vxx4mSHyjd!+yT;AuaW-!ibyN3>+c(U`ugM8=Cn>Lq)f>#^UljO`q zxn#paf??|`g*Y34lv4lP_4@9Q=gf)N*WJ9~F`$@f?=?`dB!cA_oVR~L5Geeg00dw{ z{&?@{Kep`H%lezHx@39P{H@;fcLlf^d9Kbc!W6%tz<5QOG$~6rVTqkWh=&j~YNfc) zQvV_V87W`ex2w55GdjWd?)dJ#VblDE1R}*Yk$FLsKb1@f)hL8|5z}baarryznbBKH zw&`yc?y;`WBmOnoGVcq93ilQiMxHfIqgpHd}C0?<)JIDYAc6J6$)t$u2NL>DDCT>2AU=cT)65isWD8_)4O+XO)yk@2sh> zYZAg}ROf*B3_wi_AfxoN2lgN78|XO6#@nu0zo4LSix3*=>2k;RU+Fu&=)vdTzpMC# zuAlNjS0kdKkYg8zIC?71(YN=}dm@fuPY{~-I(Fy(Ct*yEJm-Ck_q^@SQ)!MR`>MIg#UjKVWvt?9OMX6q3 zqm4q`95`Aa920G6gfoYU__avyS%L+SoGhShQHgzv#po0~4)ySbTo_=|l^0^tVtQ)3gZh~OYK`MdPptV426Do6?~)0QY@VmYBw%W-OE04!KJ(+$&NL1eCO?0$2Q&i!4i zS=+$PtCx{?NAaW&2y&@WEYrY@RbhS(LZdP9%@7)ip*30rQ50B8Th0uCT+%()WLO!F z+GPdRF70h6sam#xx~0o#?j6Oga${g(F9M82ogI>R36+V=1(D z(NdzMLMzCnuhIS~u8d6@8R^63=u{;m(bT>69A0SJ*1aBD7^ex$70 zJYg?N(z5R$(duQ?U2_-NtU}8?O8HYGp#=H#C=;V6Y0i|=m4<-{=os{H{C)RIkww4J<13n?e<=zWrweidUdz2BkGh$|>*BOk_MJ z67z`1p|v}YNHh~ke?)it2me4A&0wfm0cg!q>ASx!h|ayae95JK!J_E>)vJwrKRLXg zj`j{})@-78pycGp$lOPiwqH_GB1kiyuOT{7h8)Qd9NSKPtN< zbiRb4zKsMY9gOk!S!}*TZ$}F~T_+weZKp#B!Pyt?3jr(vE;dYyd}cDx+xGsSCI>%h zm40?hFxg4GuZ2U0JGpG##_K=r8w~q?{0=WU&;0b@-N>O;m@>(tz&B|3_1bx_X(y3z?uHw0tKU)NH{8>;eKVQy z6&SG$mC>gNCfjIl?s-W`{VRbWpY_OPTyh!r!l&VMbOTQSk4`NJ1Em!fl9G}DW->wd zf#=wLbf~EA(%QAIzMj5-#*6f@JoXyF4mOQC)o5KJfUo&P+?B z@1c|;QfyLWCm8B?NsMVKE)TN!hbxK9-%sk~YpM3;!L6?A|HQP+{H#i|^MnW73+z&g zd(d2M+R~JMo`7YtU~v&jniPpB|B``Ylr`w`ov zum7DG39c`xh^(_ic0(?w<{O4>hQel|3*jJOm>G^T0HF7MY}p8t0MqZSetJgpw% P00000NkvXXu0mjfuuw*Q literal 0 HcmV?d00001 diff --git a/WinAlfred/MainWindow.xaml.cs b/WinAlfred/MainWindow.xaml.cs index 02dea99755..4a12ba4f75 100644 --- a/WinAlfred/MainWindow.xaml.cs +++ b/WinAlfred/MainWindow.xaml.cs @@ -100,6 +100,9 @@ namespace WinAlfred Plugins.Init(this); cmdDispatcher = new Command(this); InitialTray(); + + //var engine = new Jurassic.ScriptEngine(); + //MessageBox.Show(engine.Evaluate("5 * 10 + 2").ToString()); } private void TbQuery_OnPreviewKeyDown(object sender, KeyEventArgs e) diff --git a/WinAlfred/WinAlfred.csproj b/WinAlfred/WinAlfred.csproj index f77fec5eab..722066c294 100644 --- a/WinAlfred/WinAlfred.csproj +++ b/WinAlfred/WinAlfred.csproj @@ -59,6 +59,9 @@ + + C:\Users\Scott\Desktop\Jurassic.dll + ..\packages\log4net.2.0.3\lib\net35-full\log4net.dll From 97b5526cc1e5373e024391199b9e6385e63eed38 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Mon, 6 Jan 2014 21:25:24 +0800 Subject: [PATCH 08/16] fix program plugin doesn't work in XP issue. --- WinAlfred.2010.sln | 110 +++++++++++++ WinAlfred.Plugin.System/DirectoryIndicator.cs | 58 +++++++ WinAlfred.Plugin.System/Programs.cs | 12 +- .../WinAlfred.Plugin.System.csproj | 1 + WinAlfred/App.config | 2 +- WinAlfred/App.xaml | 1 - WinAlfred/Images/folder.png | Bin 0 -> 4260 bytes WinAlfred/MainWindow.xaml.cs | 6 + WinAlfred/Properties/Resources.Designer.cs | 146 +++++++++--------- WinAlfred/Properties/Settings.Designer.cs | 52 +++---- WinAlfred/ResultPanel.xaml.cs | 2 + WinAlfred/WinAlfred.csproj | 5 +- WinAlfred/packages.config | 4 +- 13 files changed, 291 insertions(+), 108 deletions(-) create mode 100644 WinAlfred.2010.sln create mode 100644 WinAlfred.Plugin.System/DirectoryIndicator.cs create mode 100644 WinAlfred/Images/folder.png diff --git a/WinAlfred.2010.sln b/WinAlfred.2010.sln new file mode 100644 index 0000000000..1fa6a84748 --- /dev/null +++ b/WinAlfred.2010.sln @@ -0,0 +1,110 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred.Test", "WinAlfred.Test\WinAlfred.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred.Plugin", "WinAlfred.Plugin\WinAlfred.Plugin.csproj", "{8451ECDD-2EA4-4966-BB0A-7BBC40138E80}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugin", "Plugin", "{3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred", "WinAlfred\WinAlfred.csproj", "{DB90F671-D861-46BB-93A3-F1304F5BA1C5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred.Plugin.System", "WinAlfred.Plugin.System\WinAlfred.Plugin.System.csproj", "{69CE0206-CB41-453D-88AF-DF86092EF9B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred.Plugin.Fanyi", "Plugins\WinAlfred.Plugin.Fanyi\WinAlfred.Plugin.Fanyi.csproj", "{353769D3-D11C-4D86-BD06-AC8C1D68642B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|Win32.ActiveCfg = Debug|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x64.ActiveCfg = Debug|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Debug|x86.ActiveCfg = Debug|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|Any CPU.Build.0 = Release|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|Win32.ActiveCfg = Release|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|x64.ActiveCfg = Release|Any CPU + {FF742965-9A80-41A5-B042-D6C7D3A21708}.Release|x86.ActiveCfg = Release|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|Win32.ActiveCfg = Debug|x86 + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|Win32.Build.0 = Debug|x86 + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|x64.ActiveCfg = Debug|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|x86.ActiveCfg = Debug|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Debug|x86.Build.0 = Debug|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Any CPU.Build.0 = Release|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Win32.ActiveCfg = Release|x86 + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|Win32.Build.0 = Release|x86 + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x64.ActiveCfg = Release|Any CPU + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}.Release|x86.ActiveCfg = Release|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|Win32.ActiveCfg = Debug|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x64.ActiveCfg = Debug|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Debug|x86.ActiveCfg = Debug|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Any CPU.Build.0 = Release|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|Win32.ActiveCfg = Release|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x64.ActiveCfg = Release|Any CPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5}.Release|x86.ActiveCfg = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|Win32.ActiveCfg = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|x64.ActiveCfg = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Debug|x86.ActiveCfg = Debug|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Any CPU.Build.0 = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|Win32.ActiveCfg = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|x64.ActiveCfg = Release|Any CPU + {69CE0206-CB41-453D-88AF-DF86092EF9B8}.Release|x86.ActiveCfg = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|Win32.ActiveCfg = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|x64.ActiveCfg = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Debug|x86.ActiveCfg = Debug|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|Any CPU.Build.0 = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|Win32.ActiveCfg = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|x64.ActiveCfg = Release|Any CPU + {353769D3-D11C-4D86-BD06-AC8C1D68642B}.Release|x86.ActiveCfg = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {353769D3-D11C-4D86-BD06-AC8C1D68642B} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87} + EndGlobalSection +EndGlobal diff --git a/WinAlfred.Plugin.System/DirectoryIndicator.cs b/WinAlfred.Plugin.System/DirectoryIndicator.cs new file mode 100644 index 0000000000..79e4ae3f03 --- /dev/null +++ b/WinAlfred.Plugin.System/DirectoryIndicator.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Text; + +namespace WinAlfred.Plugin.System +{ + public class DirectoryIndicator : ISystemPlugin + { + public List Query(Query query) + { + List results = new List(); + if (string.IsNullOrEmpty(query.RawQuery)) return results; + + if (CheckIfDirectory(query.RawQuery)) + { + Result result = new Result + { + Title = "Open this directory", + SubTitle = string.Format("path: {0}", query.RawQuery), + Score = 50, + IcoPath = "Images/folder.png", + Action = () => Process.Start(query.RawQuery) + }; + results.Add(result); + } + + return results; + } + + private bool CheckIfDirectory(string path) + { + return Directory.Exists(path); + } + + public void Init(PluginInitContext context) + { + } + + public string Name + { + get + { + return "DirectoryIndicator"; + } + } + + public string Description + { + get + { + return "DirectoryIndicator"; + } + } + } +} diff --git a/WinAlfred.Plugin.System/Programs.cs b/WinAlfred.Plugin.System/Programs.cs index 556932af07..7a2d31b865 100644 --- a/WinAlfred.Plugin.System/Programs.cs +++ b/WinAlfred.Plugin.System/Programs.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using System.Windows.Forms; using Microsoft.Win32; @@ -27,6 +28,12 @@ namespace WinAlfred.Plugin.System List installedList = new List(); + + [DllImport("shell32.dll")] + static extern bool SHGetSpecialFolderPath(IntPtr hwndOwner,[Out] StringBuilder lpszPath, int nFolder, bool fCreate); + const int CSIDL_COMMON_STARTMENU = 0x16; // \Windows\Start Menu\Programs + const int CSIDL_COMMON_PROGRAMS = 0x17; + public List Query(Query query) { if (string.IsNullOrEmpty(query.RawQuery) || query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List(); @@ -64,7 +71,10 @@ namespace WinAlfred.Plugin.System public void Init(PluginInitContext context) { indexDirectory.Add(Environment.GetFolderPath(Environment.SpecialFolder.Programs)); - indexDirectory.Add(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + @"\Microsoft\Windows\Start Menu\Programs"); + + StringBuilder commonStartMenuPath = new StringBuilder(560); + SHGetSpecialFolderPath(IntPtr.Zero, commonStartMenuPath, CSIDL_COMMON_PROGRAMS, false); + indexDirectory.Add(commonStartMenuPath.ToString()); GetAppFromStartMenu(); } diff --git a/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj b/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj index f7d8449ea4..779af70e42 100644 --- a/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj +++ b/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj @@ -41,6 +41,7 @@ + diff --git a/WinAlfred/App.config b/WinAlfred/App.config index 01c0f5391e..e1eb5518f6 100644 --- a/WinAlfred/App.config +++ b/WinAlfred/App.config @@ -17,4 +17,4 @@ - + diff --git a/WinAlfred/App.xaml b/WinAlfred/App.xaml index ba0967d5dc..9acfef20e1 100644 --- a/WinAlfred/App.xaml +++ b/WinAlfred/App.xaml @@ -14,7 +14,6 @@ - diff --git a/WinAlfred/Images/folder.png b/WinAlfred/Images/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..330cb2e4bf8ac344014dd3d22910de1ae884343a GIT binary patch literal 4260 zcmV;V5L@qwP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000HgNklA6O6~}+~zBl9XjP2TvgKIl&oss|r(f|_8DvFQ@WyPuzLKLw= zEMS9#gi^%E1`q`aA&^RuU_~inQ5EqaT3|toP*D^?N|P4sw27TIwN3Li9?#5s_ngDx z-5HNFXA5bPz6LA;mw`5r1Hx^LJ^-aOF;iuDb~MfE%^A7boGFVV zX*WsDsHWh?M~$he+>DUr8`p;j7c#g2yav1qtVe(^?HPcoVrrz$Q<)eg)P`wYTPIv^ zP_2}3&Y^k3xx7&}qg-}WhhVl=E+6-`F%;1C6=o)@&83yb$AG`>34j?GfPsmUmJ&v$ z$B})bTsZqGcTbMt6NlR7?*Whu32guz%1F63d~kklde01)#YN-FCdFqmJjDMRO=`fM z(~|^I)by5rJ1}t0k%hp`_4OS!;2DHK71RooXhE<%@Tb52iy5RJ(>F`U9LQ-Z>f@ZC*ID!15bcIr_eN_DznVx|Ip<3{fQyVee63YFOvwuE)tz zFp_vrk~o%LUnLKLkDmAd&RKL@TmwTz$n$*f0O*{)%Rp46YIg_c9BG=6X8{$(d%B|R zLNJ3qjqHX2DZ-FQYggqV&Tq=C(42vqD>jS(4G>Y6!02DFEc{;<8p1BJ>}Z%+esTo3_RcfP}Y+{b}NR(i2HZ>TD*EW14h zRJCwH?+7|jREBLPuP!St>ger#aN?6c7*Gp>7IEDXVdrgt1_}WVV899yX4&>(c=9tp z9?XCQK}1neoa+HFF!dT{is800Kp{@uhJgn^``Gp_$hBZVRJ-mrAgD4(Q>xYt$1Ve| z5MirTr#h1I-v5Cjw*M}O`&F6#c5!sIA3Ps&?nHdD|Y(an$|b0lfi8V0Fi!C)Hz&d zPNTZICD$Qhc;BBOi?0gFFg{6Lt8HoAyc8dIOb7OaB1J{)08rI#y!UQmrl@*0Tl-E< zP#oF`QwI!1EA@H^us#4u;s^%08a{S6sTkG=pxgWOKkMlYFg#EJh9lzwv?73h2E20& zrAfg+CkKdPRum^SjqOw{7j6&$!*?o_!viD0XmrC(Ad4*YhvDPDI{l5m|8x1N(UGB8 zlZp@%HL2Aq;m-YIj8w~%O9>uu7OQ7ZpXV_0U_5sLZnP}%j`0XW;+-LEUk%}@XP#Sl zw%N*?4}JXopKfeqIB(P&S^X!!e(`5>Gn1uv-!pOF14pax%0*^}E9FwH5I4?>_wncX+7~`@s#+gZU8I5E5MJw^zA>)j@E|mfA2e|K79OvgC{@u zp6O#>{?6~e`i~c{JPm9N+I%+v03P}J5C77>@7_B;CBh59xm%M-9B)MX;}^gA+wYaq zq?+Y&W2Z~&wg66j|JmNJ-#T{x>@T#qeA+HRx1#Mh{yzX~hW#;ZfI(gW0000eRN literal 0 HcmV?d00001 diff --git a/WinAlfred/MainWindow.xaml.cs b/WinAlfred/MainWindow.xaml.cs index 4a12ba4f75..d231c8c9ea 100644 --- a/WinAlfred/MainWindow.xaml.cs +++ b/WinAlfred/MainWindow.xaml.cs @@ -91,8 +91,14 @@ namespace WinAlfred { Show(); //FocusManager.SetFocusedElement(this, tbQuery); + tbQuery.Focusable = true; Keyboard.Focus(tbQuery); tbQuery.SelectAll(); + + if (!tbQuery.IsKeyboardFocused) + { + MessageBox.Show("didnt focus"); + } } private void MainWindow_OnLoaded(object sender, RoutedEventArgs e) diff --git a/WinAlfred/Properties/Resources.Designer.cs b/WinAlfred/Properties/Resources.Designer.cs index 5b4270b0d5..c04e7374ec 100644 --- a/WinAlfred/Properties/Resources.Designer.cs +++ b/WinAlfred/Properties/Resources.Designer.cs @@ -1,73 +1,73 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.18052 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace WinAlfred.Properties { - using System; - - - /// - /// 一个强类型的资源类，用于查找本地化的字符串等。 - /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// 返回此类使用的缓存的 ResourceManager 实例。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WinAlfred.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// 使用此强类型资源类，为所有资源查找 - /// 重写当前线程的 CurrentUICulture 属性。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// 查找类似于 (Icon) 的 System.Drawing.Icon 类型的本地化资源。 - /// - internal static System.Drawing.Icon app { - get { - object obj = ResourceManager.GetObject("app", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - } -} +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.18052 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace WinAlfred.Properties { + using System; + + + /// + /// 一个强类型的资源类，用于查找本地化的字符串等。 + /// + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 VS 项目。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// 返回此类使用的缓存的 ResourceManager 实例。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WinAlfred.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// 使用此强类型资源类，为所有资源查找 + /// 重写当前线程的 CurrentUICulture 属性。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// 查找类似于 (Icon) 的 System.Drawing.Icon 类型的本地化资源。 + /// + internal static System.Drawing.Icon app { + get { + object obj = ResourceManager.GetObject("app", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + } +} diff --git a/WinAlfred/Properties/Settings.Designer.cs b/WinAlfred/Properties/Settings.Designer.cs index d6abbf65e1..caf9c18c10 100644 --- a/WinAlfred/Properties/Settings.Designer.cs +++ b/WinAlfred/Properties/Settings.Designer.cs @@ -1,26 +1,26 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.18052 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace WinAlfred.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.18052 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace WinAlfred.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/WinAlfred/ResultPanel.xaml.cs b/WinAlfred/ResultPanel.xaml.cs index 6cf568da4f..35af12e2ac 100644 --- a/WinAlfred/ResultPanel.xaml.cs +++ b/WinAlfred/ResultPanel.xaml.cs @@ -195,6 +195,8 @@ namespace WinAlfred public bool AcceptSelect() { int index = GetCurrentSelectedResultIndex(); + if (index < 0) return false; + var resultItemControl = pnlContainer.Children[index] as ResultItem; if (resultItemControl != null) { diff --git a/WinAlfred/WinAlfred.csproj b/WinAlfred/WinAlfred.csproj index 722066c294..c695a139c8 100644 --- a/WinAlfred/WinAlfred.csproj +++ b/WinAlfred/WinAlfred.csproj @@ -9,7 +9,7 @@ Properties WinAlfred WinAlfred - v4.0 + v3.5 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -59,9 +59,6 @@ - - C:\Users\Scott\Desktop\Jurassic.dll - ..\packages\log4net.2.0.3\lib\net35-full\log4net.dll diff --git a/WinAlfred/packages.config b/WinAlfred/packages.config index e25e951af7..0db9c4556d 100644 --- a/WinAlfred/packages.config +++ b/WinAlfred/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file From 13f00edefd80139655235f5a1ffc0fecc02a3004 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Mon, 6 Jan 2014 22:21:08 +0800 Subject: [PATCH 09/16] fix shutdown didn't work issue --- WinAlfred.Plugin.System/Sys.cs | 3 ++- WinAlfred/App.xaml | 2 +- WinAlfred/App.xaml.cs | 39 ++++++++++++++++++++++++---------- WinAlfred/MainWindow.xaml.cs | 23 +++++++++++++++++++- WinAlfred/WinAlfred.csproj | 11 ++++++++++ 5 files changed, 64 insertions(+), 14 deletions(-) diff --git a/WinAlfred.Plugin.System/Sys.cs b/WinAlfred.Plugin.System/Sys.cs index 9919ca6c39..a2badb7ceb 100644 --- a/WinAlfred.Plugin.System/Sys.cs +++ b/WinAlfred.Plugin.System/Sys.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; using System.Text; @@ -44,7 +45,7 @@ namespace WinAlfred.Plugin.System SubTitle = "Shutdown Computer", Score = 100, IcoPath = "Images\\exit.png", - Action = () => ExitWindowsEx(EWX_SHUTDOWN,0) + Action = () => Process.Start("shutdown","/s /t 0") }); availableResults.Add(new Result { diff --git a/WinAlfred/App.xaml b/WinAlfred/App.xaml index 9acfef20e1..1a43596b7a 100644 --- a/WinAlfred/App.xaml +++ b/WinAlfred/App.xaml @@ -1,7 +1,7 @@  + > + diff --git a/WinAlfred/Commands/BaseCommand.cs b/WinAlfred/Commands/BaseCommand.cs index aa3dfbdb75..fd16c8ab55 100644 --- a/WinAlfred/Commands/BaseCommand.cs +++ b/WinAlfred/Commands/BaseCommand.cs @@ -20,10 +20,7 @@ namespace WinAlfred.Commands protected void UpdateResultView(List results) { - if (results.Count > 0) - { - window.OnUpdateResultView(results); - } + window.OnUpdateResultView(results); } } } diff --git a/WinAlfred/Commands/SystemCommand.cs b/WinAlfred/Commands/SystemCommand.cs index 52ff2d5d6e..7ecad98203 100644 --- a/WinAlfred/Commands/SystemCommand.cs +++ b/WinAlfred/Commands/SystemCommand.cs @@ -31,7 +31,7 @@ namespace WinAlfred.Commands result.PluginDirectory = pair1.Metadata.PluginDirecotry; result.OriginQuery = query; } - UpdateResultView(results); + if(results.Count > 0) UpdateResultView(results); }); } } diff --git a/WinAlfred/DispatcherExtensions.cs b/WinAlfred/DispatcherExtensions.cs index 72f5be8edf..15a56bfa71 100644 --- a/WinAlfred/DispatcherExtensions.cs +++ b/WinAlfred/DispatcherExtensions.cs @@ -13,7 +13,14 @@ namespace WinAlfred private static readonly object syncRoot = new object(); public static string DelayInvoke(this Dispatcher dispatcher, string namedInvocation, - Action action, TimeSpan delay, + Action action, TimeSpan delay, + DispatcherPriority priority = DispatcherPriority.Normal) + { + return DelayInvoke(dispatcher, namedInvocation, action, delay, string.Empty, priority); + } + + public static string DelayInvoke(this Dispatcher dispatcher, string namedInvocation, + Action action, TimeSpan delay, string arg, DispatcherPriority priority = DispatcherPriority.Normal) { lock (syncRoot) @@ -29,7 +36,7 @@ namespace WinAlfred var timer = new DispatcherTimer(delay, priority, (s, e) => { RemoveTimer(namedInvocation); - action(); + action(arg); }, dispatcher); timer.Start(); timers.Add(namedInvocation, timer); diff --git a/WinAlfred/Helper/SelectedRecords.cs b/WinAlfred/Helper/SelectedRecords.cs new file mode 100644 index 0000000000..8e773cfcbd --- /dev/null +++ b/WinAlfred/Helper/SelectedRecords.cs @@ -0,0 +1,38 @@ +using WinAlfred.Plugin; + +namespace WinAlfred.Helper +{ + public class SelectedRecords + { + private int hasAddedCount = 0; + + public void LoadSelectedRecords() + { + + } + + public void AddSelect(Result result) + { + hasAddedCount++; + if (hasAddedCount == 10) + { + SaveSelectedRecords(); + hasAddedCount = 0; + } + + + + + } + + public int GetSelectedCount(Result result) + { + return 0; + } + + public void SaveSelectedRecords() + { + + } + } +} diff --git a/WinAlfred/Images/enter.png b/WinAlfred/Images/enter.png new file mode 100644 index 0000000000000000000000000000000000000000..0999b37cd721455c0e0d80e2ba1e575e36c5c416 GIT binary patch literal 367 zcmV-#0g(QQP)kdg0003tNklP9G&dyU!;qxWJwVO zF?2II7kk*6)DVX*{q66=o8!1JbV7)gbtxk;hJF7+3iL}&`z|Tsaiz#FIi874k;Eu4 z3TQ5A4Gd^ukS3c}h0g&2wM-vra7>p2{u`ahfXeDade!wdH696N>mByRqH8?JWA%=6 z1UfGZ03a`rvAr>~UC|>$I5SR;Yq9`zn8OK{)RWoZ@9~MWSK|giw>iN9tFFOppowzD z1|f7+&M<7EO+F|Bev;BWyBq+qHbBnr_Xx`AkH+^A&M*ZKH((Nrv#BQeL|0i?OQ)#T ztE%8737EuP8wVryCm6T9vqmVJI97?IaQP2c3MFexTO?wBZ9{$1z5v=RREDvw-r@iN N002ovPDHLkV1h7Ho7VsU literal 0 HcmV?d00001 diff --git a/WinAlfred/Images/exit.png b/WinAlfred/Images/exit.png index 523c3d5197db3825be40fa89af1c943ec37dbcbd..af7c738244dfc50d7e896fdf41adad6283ba3d7f 100644 GIT binary patch delta 1697 zcmV;S244B36~hf7iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPqe+E@a zL_t(og}s(th+Wkc$A4?>eeZl;O;a-H1d}!)A(;_1RGOEmB_K_)$p|8f526x?w&_Dj zq|k>})OLcY(56(U4+Tr8NpWl^HiblLELBACA(DVPt=c-nOkyXQnatezy!V{F`*8L- z_uM-lZC|=Ci?i1LSnI$3Ykyqvf8GNy-g9fWFUBwQ=#~wUk z%!AA6OHi4F&#JJ;&dn`86a9T`doy5yXii_tmNZz9yuMnW16rX_fbLQFe}Q%Li(f4e zvI&xJzClmLtS)(o5m&+D-z_L024I^p< z>%Cu-ZfS6;fD{U}tXr35f6~^`k&XW^KvV_I16a+81FAqJXE!z%#xE6%TwTRiBLERa zW4HEZbHLT6CO$oOj8BdqXSlVMcohI6M~?9I>1p)L89r-kTayg{6~*FR9o>!DT`v?U z4h+zG@)UHkSieEvKi-*XRNo}63;el(yM**?%mw_)?56ev$KxP`ct5&3y@Z%zpsz(`|r00mMM%<(K*V(MO4+2!NZqyV>~Si&UtmzK#KWjg&mn*;0wFC!VMa?)v+) z>vSas9I$ZW1Xp@{e~Bs;0J`qIm$6;DmSvv+P&D>9zk;L6BahI0!wmoo4-Qi8@6X2K zC?Z;1tgR`R>+b#evuC;d(o5O+rl+1-#+n0A@fxWvecq6j18#Zv;mn?Y{`p#Pz(o<` z0|VLk?5R_=u^@|meYjAHo%{Dw5y|FPfKfoLan^g!Ja8HKe91>C#u z5|f;g)J^%o0mjaqBOV`z+`dR_9gU1IH$G0OvlCGzZf_?lmzf2o0!S6by08nE0tgF~ zfGwp`!bTKjM>GvC0M#lpCr@TU^TAVlX?mJcXD0v?>()^%m+Q))Dp=?1w^S4mN}#OR z*2X_OI@oaSe=5e;{s#!4_;6|jC$$n)frV0uuB}^>B;pu1H%DVrmD(|EY-4Y}nPjU< z>wWi8ZYnU{Qe>*NiK(_`rrMjCXm4e*y@l)T%}lp8Gt<(pQnF_PCXUXDOinE2C~%)aCBVdh&~vDRPZV%=d z(Bv^{q{SMgeC{j@6B7Vz*tU(%XMaLfr9N;5#%7?Z#<1yU$63F5GXQhft}*+&Qy62i zvSzW2pe}a{hzQ0g#wdPnmZ2vPXJfm+{TX*@B+KN7(Y)R~X*5lbP6oCQfIZ zvX@Csw!e>;R4lN?PC#(2C}y!SZgQ59qmE{Mo3 zYZYS>DveQ$HQ0dMSj$a6dWMY$4lb)>V~eX*hWmfX#83N(V@Djt#IYj^dX(Bx%+8&g z-qUpBi6jgpqL}biljxI2pXQT&ck{2oSF_hH-@J2NIrAEyesd4ypC3yY4C_;NQ{N(z zf7xO3y>tAaWbJ7J-ss``6GqU3x?@)JRXcN(bRAT5nCicOE8H5d~Z3RH`x38cOx^_(~r z=;&BiDHQDqYmEMa*nKIgMth=a6n1MkHYx3zY)Yeonxrh6)i;18WEm1D6fMQ3Bq=M#@z(0=O-;q$NaIcT|8D;VVTWwY!O_+O00000NkvXXu0mjf*b6^D delta 2698 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 Eg0x^5*8l(j diff --git a/WinAlfred/Images/lock.png b/WinAlfred/Images/lock.png index 5a1593aafe22172c236d3b72df8c532c64849620..3eaa9abaa05d87a830a838e2aa9e1d830ac43729 100644 GIT binary patch literal 1602 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 Hu0mjf9Dlqa diff --git a/WinAlfred/MainWindow.xaml b/WinAlfred/MainWindow.xaml index d07aa89fd4..02da826d89 100644 --- a/WinAlfred/MainWindow.xaml +++ b/WinAlfred/MainWindow.xaml @@ -19,7 +19,7 @@ - + diff --git a/WinAlfred/MainWindow.xaml.cs b/WinAlfred/MainWindow.xaml.cs index 00e00e86ca..35fd1f2992 100644 --- a/WinAlfred/MainWindow.xaml.cs +++ b/WinAlfred/MainWindow.xaml.cs @@ -26,6 +26,8 @@ namespace WinAlfred private NotifyIcon notifyIcon; private Command cmdDispatcher; Storyboard progressBarStoryboard = new Storyboard(); + private bool queryHasReturn = false; + SelectedRecords selectedRecords = new SelectedRecords(); public MainWindow() { @@ -40,10 +42,10 @@ namespace WinAlfred private void InitProgressbarAnimation() { - DoubleAnimation da = new DoubleAnimation(progressBar.X2, Width + 100, new Duration(new TimeSpan(0, 0, 0,0,1600))); - DoubleAnimation da1 = new DoubleAnimation(progressBar.X1, Width, new Duration(new TimeSpan(0, 0, 0, 0,1600))); - Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X1)")); - Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X2)")); + DoubleAnimation da = new DoubleAnimation(progressBar.X2, Width + 100, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); + DoubleAnimation da1 = new DoubleAnimation(progressBar.X1, Width, new Duration(new TimeSpan(0, 0, 0, 0, 1600))); + Storyboard.SetTargetProperty(da, new PropertyPath("(Line.X2)")); + Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)")); progressBarStoryboard.Children.Add(da); progressBarStoryboard.Children.Add(da1); progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever; @@ -81,20 +83,45 @@ namespace WinAlfred } } + protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e) + { + base.OnMouseLeftButtonDown(e); + + // Begin dragging the window + this.DragMove(); + } + private void TextBoxBase_OnTextChanged(object sender, TextChangedEventArgs e) { resultCtrl.Dirty = true; Dispatcher.DelayInvoke("UpdateSearch", - () => + o => { - resultCtrl.Clear(); + Dispatcher.DelayInvoke("ClearResults", i => + { + // first try to use clear method inside resultCtrl, which is more closer to the add new results + // and this will not bring splash issues.After waiting 30ms, if there still no results added, we + // must clear the result. otherwise, it will be confused why the query changed, but the results + // didn't. + if (resultCtrl.Dirty) resultCtrl.Clear(); + }, TimeSpan.FromMilliseconds(30), null); var q = new Query(tbQuery.Text); cmdDispatcher.DispatchCommand(q); + queryHasReturn = false; + if (Plugins.HitThirdpartyKeyword(q)) + { + Dispatcher.DelayInvoke("ShowProgressbar", originQuery => + { + if (!queryHasReturn && originQuery == tbQuery.Text) + { + StartProgress(); + } + }, TimeSpan.FromSeconds(1), tbQuery.Text); + } + }, TimeSpan.FromMilliseconds(300)); - } - private void StartProgress() { progressBar.Visibility = Visibility.Visible; @@ -124,7 +151,7 @@ namespace WinAlfred } } - public void SetAutoStart(bool IsAtuoRun) + private void SetAutoStart(bool IsAtuoRun) { string LnkPath = Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "//WinAlfred.lnk"; if (IsAtuoRun) @@ -148,10 +175,10 @@ namespace WinAlfred Plugins.Init(this); cmdDispatcher = new Command(this); InitialTray(); + selectedRecords.LoadSelectedRecords(); SetAutoStart(true); //var engine = new Jurassic.ScriptEngine(); //MessageBox.Show(engine.Evaluate("5 * 10 + 2").ToString()); - StartProgress(); } private void TbQuery_OnPreviewKeyDown(object sender, KeyEventArgs e) @@ -174,7 +201,15 @@ namespace WinAlfred break; case Key.Enter: - if (resultCtrl.AcceptSelect()) HideWinAlfred(); + Result result = resultCtrl.AcceptSelect(); + if (result != null) + { + selectedRecords.AddSelect(result); + if (!result.DontHideWinAlfredAfterAction) + { + HideWinAlfred(); + } + } e.Handled = true; break; } @@ -182,11 +217,20 @@ namespace WinAlfred public void OnUpdateResultView(List list) { - resultCtrl.Dispatcher.Invoke(new Action(() => + queryHasReturn = true; + progressBar.Dispatcher.Invoke(new Action(StopProgress)); + if (list.Count > 0) { - List l = list.Where(o => o.OriginQuery != null && o.OriginQuery.RawQuery == tbQuery.Text).OrderByDescending(o => o.Score).ToList(); - resultCtrl.AddResults(l); - })); + list.ForEach(o => + { + o.Score += selectedRecords.GetSelectedCount(o); + }); + resultCtrl.Dispatcher.Invoke(new Action(() => + { + List l = list.Where(o => o.OriginQuery != null && o.OriginQuery.RawQuery == tbQuery.Text).OrderByDescending(o => o.Score).ToList(); + resultCtrl.AddResults(l); + })); + } } #region Public API diff --git a/WinAlfred/PluginLoader/Plugins.cs b/WinAlfred/PluginLoader/Plugins.cs index 42f527bf09..06bbceb65b 100644 --- a/WinAlfred/PluginLoader/Plugins.cs +++ b/WinAlfred/PluginLoader/Plugins.cs @@ -24,9 +24,9 @@ namespace WinAlfred.PluginLoader Plugins = plugins, ChangeQuery = s => window.ChangeQuery(s), CloseApp = window.CloseApp, - HideApp = window.HideApp, + HideApp = window.HideApp, ShowApp = window.ShowApp, - ShowMsg = (title,subTitle,iconPath) => window.ShowMsg(title,subTitle,iconPath) + ShowMsg = (title, subTitle, iconPath) => window.ShowMsg(title, subTitle, iconPath) })); } } @@ -35,5 +35,12 @@ namespace WinAlfred.PluginLoader { get { return plugins; } } + + public static bool HitThirdpartyKeyword(Query query) + { + if (string.IsNullOrEmpty(query.ActionName)) return false; + + return plugins.Any(o => o.Metadata.PluginType == PluginType.ThirdParty && o.Metadata.ActionKeyword == query.ActionName); + } } } diff --git a/WinAlfred/ResultItem.xaml b/WinAlfred/ResultItem.xaml index 50235dc9a4..34d3ef4d25 100644 --- a/WinAlfred/ResultItem.xaml +++ b/WinAlfred/ResultItem.xaml @@ -22,8 +22,8 @@ sdfdsf - - + + diff --git a/WinAlfred/ResultItem.xaml.cs b/WinAlfred/ResultItem.xaml.cs index 63cdba5678..389ee3af3a 100644 --- a/WinAlfred/ResultItem.xaml.cs +++ b/WinAlfred/ResultItem.xaml.cs @@ -27,6 +27,15 @@ namespace WinAlfred selected = value; BrushConverter bc = new BrushConverter(); Background = selected ? (Brush)(bc.ConvertFrom("#d1d1d1")) : (Brush)(bc.ConvertFrom("#ebebeb")); + if (selected) + { + img.Visibility = Visibility.Visible; + img.Source = new BitmapImage(new Uri(Directory.GetCurrentDirectory()+"\\Images\\enter.png")); + } + else + { + img.Visibility = Visibility.Hidden; + } } } diff --git a/WinAlfred/ResultPanel.xaml.cs b/WinAlfred/ResultPanel.xaml.cs index 35af12e2ac..26aa8f9598 100644 --- a/WinAlfred/ResultPanel.xaml.cs +++ b/WinAlfred/ResultPanel.xaml.cs @@ -192,10 +192,10 @@ namespace WinAlfred Select(0); } - public bool AcceptSelect() + public Result AcceptSelect() { int index = GetCurrentSelectedResultIndex(); - if (index < 0) return false; + if (index < 0) return null; var resultItemControl = pnlContainer.Children[index] as ResultItem; if (resultItemControl != null) @@ -205,10 +205,10 @@ namespace WinAlfred resultItemControl.Result.Action(); } - return !resultItemControl.Result.DontHideWinAlfredAfterAction; + return resultItemControl.Result; } - return true; + return null; } public ResultPanel() diff --git a/WinAlfred/WinAlfred.csproj b/WinAlfred/WinAlfred.csproj index 197c21d9ef..66418b728f 100644 --- a/WinAlfred/WinAlfred.csproj +++ b/WinAlfred/WinAlfred.csproj @@ -112,6 +112,7 @@ ResultItem.xaml + MSBuild:Compile Designer From 881d265579745aa5f5a38a68f9f275d579ebae1b Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Wed, 8 Jan 2014 19:08:48 +0800 Subject: [PATCH 12/16] update msg window --- WinAlfred/Msg.xaml | 4 ++-- WinAlfred/Msg.xaml.cs | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/WinAlfred/Msg.xaml b/WinAlfred/Msg.xaml index ef17b34532..06d7a65d60 100644 --- a/WinAlfred/Msg.xaml +++ b/WinAlfred/Msg.xaml @@ -7,7 +7,7 @@ ResizeMode="NoResize" WindowStyle="None" ShowInTaskbar="False" - Title="Msg" Height="60" Width="382.978"> + Title="Msg" Height="60" Width="420"> @@ -22,7 +22,7 @@ - + diff --git a/WinAlfred/Msg.xaml.cs b/WinAlfred/Msg.xaml.cs index 353279de68..5959f72862 100644 --- a/WinAlfred/Msg.xaml.cs +++ b/WinAlfred/Msg.xaml.cs @@ -69,14 +69,16 @@ namespace WinAlfred } imgIco.Source = new BitmapImage(new Uri(icopath)); Show(); - new Timer(o => - { - if (!closing) - { - closing = true; - Dispatcher.Invoke(new Action(fadeOutStoryboard.Begin)); - } - }, null, TimeSpan.FromSeconds(3), TimeSpan.FromMilliseconds(-1)); + + Dispatcher.DelayInvoke("ShowMsg", + o => + { + if (!closing) + { + closing = true; + Dispatcher.Invoke(new Action(fadeOutStoryboard.Begin)); + } + }, TimeSpan.FromSeconds(3)); } } } From 3f377d4efc2050b1f3cdf27fcc9ff361b199ea49 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Wed, 8 Jan 2014 23:21:37 +0800 Subject: [PATCH 13/16] add browser bookmark (chrome) plugin --- WinAlfred.Plugin.System/BrowserBookmarks.cs | 141 ++++++++++++++++++ .../WinAlfred.Plugin.System.csproj | 10 ++ WinAlfred.Plugin.System/packages.config | 4 + WinAlfred.Plugin/Result.cs | 5 + WinAlfred/Helper/SelectedRecords.cs | 49 +++++- WinAlfred/Images/bookmark.png | Bin 0 -> 4497 bytes 6 files changed, 202 insertions(+), 7 deletions(-) create mode 100644 WinAlfred.Plugin.System/BrowserBookmarks.cs create mode 100644 WinAlfred.Plugin.System/packages.config create mode 100644 WinAlfred/Images/bookmark.png diff --git a/WinAlfred.Plugin.System/BrowserBookmarks.cs b/WinAlfred.Plugin.System/BrowserBookmarks.cs new file mode 100644 index 0000000000..d7c86eeba4 --- /dev/null +++ b/WinAlfred.Plugin.System/BrowserBookmarks.cs @@ -0,0 +1,141 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Text.RegularExpressions; +using System.Windows.Forms; +using Newtonsoft.Json; +using WinAlfred.Plugin.System.Common; + +namespace WinAlfred.Plugin.System +{ + public class BrowserBookmarks : ISystemPlugin + { + + private List bookmarks = new List(); + + [DllImport("shell32.dll")] + static extern bool SHGetSpecialFolderPath(IntPtr hwndOwner, [Out] StringBuilder lpszPath, int nFolder, bool fCreate); + const int CSIDL_LOCAL_APPDATA = 0x001c; + + public List Query(Query query) + { + if (string.IsNullOrEmpty(query.RawQuery) || query.RawQuery.EndsWith(" ") || query.RawQuery.Length <= 1) return new List(); + + List returnList = bookmarks.Where(o => MatchProgram(o, query)).ToList(); + + return returnList.Select(c => new Result() + { + Title = c.Name, + SubTitle = "Bookmark: " + c.Url, + IcoPath = Directory.GetCurrentDirectory() + @"\Images\bookmark.png", + Score = 5, + Action = () => + { + try + { + Process.Start(c.Url); + } + catch (Exception e) + { + MessageBox.Show("open url failed:" + c.Url); + } + } + }).ToList(); + } + + private bool MatchProgram(Bookmark bookmark, Query query) + { + if (bookmark.Name.ToLower().Contains(query.RawQuery.ToLower()) || bookmark.Url.ToLower().Contains(query.RawQuery.ToLower())) return true; + if (ChineseToPinYin.ToPinYin(bookmark.Name).Replace(" ", "").ToLower().Contains(query.RawQuery.ToLower())) return true; + + return false; + } + + public void Init(PluginInitContext context) + { + LoadChromeBookmarks(); + } + + private void LoadChromeBookmarks() + { + StringBuilder platformPath = new StringBuilder(560); + SHGetSpecialFolderPath(IntPtr.Zero, platformPath, CSIDL_LOCAL_APPDATA, false); + + string path = platformPath + @"\Google\Chrome\User Data\Default\Bookmarks"; + if (File.Exists(path)) + { + string all = File.ReadAllText(path); + Regex nameRegex = new Regex("\"name\": \"(?.*?)\""); + MatchCollection nameCollection = nameRegex.Matches(all); + Regex typeRegex = new Regex("\"type\": \"(?.*?)\""); + MatchCollection typeCollection = typeRegex.Matches(all); + Regex urlRegex = new Regex("\"url\": \"(?.*?)\""); + MatchCollection urlCollection = urlRegex.Matches(all); + + List names = (from Match match in nameCollection select match.Groups["name"].Value).ToList(); + List types = (from Match match in typeCollection select match.Groups["type"].Value).ToList(); + List urls = (from Match match in urlCollection select match.Groups["url"].Value).ToList(); + + int urlIndex = 0; + for (int i = 0; i < names.Count; i++) + { + string name = DecodeUnicode(names[i]); + string type = types[i]; + if (type == "url") + { + string url = urls[urlIndex]; + urlIndex++; + + bookmarks.Add(new Bookmark() + { + Name = name, + Url = url, + Source = "Chrome" + }); + } + } + } + else + { +#if (DEBUG) + { + MessageBox.Show("load chrome bookmark failed"); + } +#endif + } + } + + private String DecodeUnicode(String dataStr) + { + Regex reg = new Regex(@"(?i)\\[uU]([0-9a-f]{4})"); + return reg.Replace(dataStr, m => ((char)Convert.ToInt32(m.Groups[1].Value, 16)).ToString()); + } + + public string Name + { + get + { + return "BrowserBookmark"; + } + } + + public string Description + { + get + { + return "BrowserBookmark"; + } + } + } + + public class Bookmark + { + public string Name { get; set; } + public string Url { get; set; } + public string Source { get; set; } + } +} diff --git a/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj b/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj index 779af70e42..9119d543e2 100644 --- a/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj +++ b/WinAlfred.Plugin.System/WinAlfred.Plugin.System.csproj @@ -11,6 +11,8 @@ WinAlfred.Plugin.System v3.5 512 + ..\ + true true @@ -30,6 +32,9 @@ 4 + + ..\packages\Newtonsoft.Json.5.0.8\lib\net35\Newtonsoft.Json.dll + @@ -39,6 +44,7 @@ + @@ -54,11 +60,15 @@ WinAlfred.Plugin + + + +