diff --git a/Plugins/WinAlfred.Plugin.DouBan/.idea/.name b/Plugins/WinAlfred.Plugin.DouBan/.idea/.name deleted file mode 100644 index 5d573fdedf..0000000000 --- a/Plugins/WinAlfred.Plugin.DouBan/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -WinAlfred.Plugin.DouBan \ No newline at end of file diff --git a/Plugins/WinAlfred.Plugin.DouBan/.idea/WinAlfred.Plugin.DouBan.iml b/Plugins/WinAlfred.Plugin.DouBan/.idea/WinAlfred.Plugin.DouBan.iml deleted file mode 100644 index cb7a8494bf..0000000000 --- a/Plugins/WinAlfred.Plugin.DouBan/.idea/WinAlfred.Plugin.DouBan.iml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - diff --git a/Plugins/WinAlfred.Plugin.DouBan/.idea/dictionaries/Scott.xml b/Plugins/WinAlfred.Plugin.DouBan/.idea/dictionaries/Scott.xml deleted file mode 100644 index 72c46d1bc3..0000000000 --- a/Plugins/WinAlfred.Plugin.DouBan/.idea/dictionaries/Scott.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Plugins/WinAlfred.Plugin.DouBan/.idea/encodings.xml b/Plugins/WinAlfred.Plugin.DouBan/.idea/encodings.xml deleted file mode 100644 index e206d70d85..0000000000 --- a/Plugins/WinAlfred.Plugin.DouBan/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/Plugins/WinAlfred.Plugin.DouBan/.idea/misc.xml b/Plugins/WinAlfred.Plugin.DouBan/.idea/misc.xml deleted file mode 100644 index 89928bcf58..0000000000 --- a/Plugins/WinAlfred.Plugin.DouBan/.idea/misc.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/Plugins/WinAlfred.Plugin.DouBan/.idea/modules.xml b/Plugins/WinAlfred.Plugin.DouBan/.idea/modules.xml deleted file mode 100644 index b22aac4359..0000000000 --- a/Plugins/WinAlfred.Plugin.DouBan/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Plugins/WinAlfred.Plugin.DouBan/.idea/scopes/scope_settings.xml b/Plugins/WinAlfred.Plugin.DouBan/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b843..0000000000 --- a/Plugins/WinAlfred.Plugin.DouBan/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/Plugins/WinAlfred.Plugin.DouBan/.idea/vcs.xml b/Plugins/WinAlfred.Plugin.DouBan/.idea/vcs.xml deleted file mode 100644 index def6a6a184..0000000000 --- a/Plugins/WinAlfred.Plugin.DouBan/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Plugins/WinAlfred.Plugin.DouBan/.idea/workspace.xml b/Plugins/WinAlfred.Plugin.DouBan/.idea/workspace.xml deleted file mode 100644 index 63658b8a12..0000000000 --- a/Plugins/WinAlfred.Plugin.DouBan/.idea/workspace.xml +++ /dev/null @@ -1,345 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1389365252031 - 1389365252031 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Plugins/WinAlfred.Plugin.Doc/Doc.cs b/Plugins/Wox.Plugin.Doc/Doc.cs similarity index 85% rename from Plugins/WinAlfred.Plugin.Doc/Doc.cs rename to Plugins/Wox.Plugin.Doc/Doc.cs index c14239a387..655d6e8f05 100644 --- a/Plugins/WinAlfred.Plugin.Doc/Doc.cs +++ b/Plugins/Wox.Plugin.Doc/Doc.cs @@ -1,4 +1,4 @@ -namespace WinAlfred.Plugin.Doc +namespace Wox.Plugin.Doc { public class Doc { diff --git a/Plugins/WinAlfred.Plugin.Doc/DocViewFrm.Designer.cs b/Plugins/Wox.Plugin.Doc/DocViewFrm.Designer.cs similarity index 98% rename from Plugins/WinAlfred.Plugin.Doc/DocViewFrm.Designer.cs rename to Plugins/Wox.Plugin.Doc/DocViewFrm.Designer.cs index 8873faeeaf..db273fb300 100644 --- a/Plugins/WinAlfred.Plugin.Doc/DocViewFrm.Designer.cs +++ b/Plugins/Wox.Plugin.Doc/DocViewFrm.Designer.cs @@ -1,4 +1,4 @@ -namespace WinAlfred.Plugin.Doc +namespace Wox.Plugin.Doc { partial class DocViewFrm { diff --git a/Plugins/WinAlfred.Plugin.Doc/DocViewFrm.cs b/Plugins/Wox.Plugin.Doc/DocViewFrm.cs similarity index 96% rename from Plugins/WinAlfred.Plugin.Doc/DocViewFrm.cs rename to Plugins/Wox.Plugin.Doc/DocViewFrm.cs index 1d2c96d1e7..b59d1ae356 100644 --- a/Plugins/WinAlfred.Plugin.Doc/DocViewFrm.cs +++ b/Plugins/Wox.Plugin.Doc/DocViewFrm.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Text; using System.Windows.Forms; -namespace WinAlfred.Plugin.Doc +namespace Wox.Plugin.Doc { public partial class DocViewFrm : Form { diff --git a/Plugins/WinAlfred.Plugin.Doc/DocViewFrm.resx b/Plugins/Wox.Plugin.Doc/DocViewFrm.resx similarity index 100% rename from Plugins/WinAlfred.Plugin.Doc/DocViewFrm.resx rename to Plugins/Wox.Plugin.Doc/DocViewFrm.resx diff --git a/Plugins/WinAlfred.Plugin.Doc/Main.cs b/Plugins/Wox.Plugin.Doc/Main.cs similarity index 99% rename from Plugins/WinAlfred.Plugin.Doc/Main.cs rename to Plugins/Wox.Plugin.Doc/Main.cs index 9e7a4d0445..92419c8e6a 100644 --- a/Plugins/WinAlfred.Plugin.Doc/Main.cs +++ b/Plugins/Wox.Plugin.Doc/Main.cs @@ -10,7 +10,7 @@ using System.Text; using System.Web; using Microsoft.Win32; -namespace WinAlfred.Plugin.Doc +namespace Wox.Plugin.Doc { public class Main : IPlugin { diff --git a/Plugins/WinAlfred.Plugin.Doc/Properties/AssemblyInfo.cs b/Plugins/Wox.Plugin.Doc/Properties/AssemblyInfo.cs similarity index 92% rename from Plugins/WinAlfred.Plugin.Doc/Properties/AssemblyInfo.cs rename to Plugins/Wox.Plugin.Doc/Properties/AssemblyInfo.cs index 9a31651bd3..b7affd8425 100644 --- a/Plugins/WinAlfred.Plugin.Doc/Properties/AssemblyInfo.cs +++ b/Plugins/Wox.Plugin.Doc/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ 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.Doc")] +[assembly: AssemblyTitle("Wox.Plugin.Doc")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Oracle Corporation")] -[assembly: AssemblyProduct("WinAlfred.Plugin.Doc")] +[assembly: AssemblyProduct("Wox.Plugin.Doc")] [assembly: AssemblyCopyright("Copyright © Oracle Corporation 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Plugins/WinAlfred.Plugin.Doc/WinAlfred.Plugin.Doc.csproj b/Plugins/Wox.Plugin.Doc/Wox.Plugin.Doc.csproj similarity index 94% rename from Plugins/WinAlfred.Plugin.Doc/WinAlfred.Plugin.Doc.csproj rename to Plugins/Wox.Plugin.Doc/Wox.Plugin.Doc.csproj index f6ebbe54d3..f53a63ad8a 100644 --- a/Plugins/WinAlfred.Plugin.Doc/WinAlfred.Plugin.Doc.csproj +++ b/Plugins/Wox.Plugin.Doc/Wox.Plugin.Doc.csproj @@ -7,8 +7,8 @@ {6B6696B1-A547-4FD4-85EF-E1FD0F54AD2C} Library Properties - WinAlfred.Plugin.Doc - WinAlfred.Plugin.Doc + Wox.Plugin.Doc + Wox.Plugin.Doc v3.5 512 ..\..\ @@ -85,9 +85,9 @@ - + {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - WinAlfred.Plugin + Wox.Plugin @@ -101,7 +101,7 @@ - xcopy /Y /E $(TargetDir)*.* $(SolutionDir)WinAlfred\bin\Debug\Plugins\Doc\ + xcopy /Y /E $(TargetDir)*.* $(SolutionDir)Wox\bin\Debug\Plugins\Doc\ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WinAlfred.WorkflowInstaller/packages.config b/Wox.WorkflowInstaller/packages.config similarity index 100% rename from WinAlfred.WorkflowInstaller/packages.config rename to Wox.WorkflowInstaller/packages.config diff --git a/WinAlfred.sln b/Wox.sln similarity index 94% rename from WinAlfred.sln rename to Wox.sln index c0fdbb5ef3..6f2ce1e01a 100644 --- a/WinAlfred.sln +++ b/Wox.sln @@ -1,23 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred.Test", "WinAlfred.Test\WinAlfred.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Test", "Wox.Test\Wox.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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin", "Wox.Plugin\Wox.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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox", "Wox\Wox.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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.System", "Wox.Plugin.System\Wox.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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Fanyi", "Plugins\Wox.Plugin.Fanyi\Wox.Plugin.Fanyi.csproj", "{353769D3-D11C-4D86-BD06-AC8C1D68642B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred.WorkflowInstaller", "WinAlfred.WorkflowInstaller\WinAlfred.WorkflowInstaller.csproj", "{FAFCAD04-C37E-477B-88C9-0C945E4FB928}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.WorkflowInstaller", "Wox.WorkflowInstaller\Wox.WorkflowInstaller.csproj", "{FAFCAD04-C37E-477B-88C9-0C945E4FB928}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "Pythonnet.Runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinAlfred.Plugin.Doc", "Plugins\WinAlfred.Plugin.Doc\WinAlfred.Plugin.Doc.csproj", "{6B6696B1-A547-4FD4-85EF-E1FD0F54AD2C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Plugin.Doc", "Plugins\Wox.Plugin.Doc\Wox.Plugin.Doc.csproj", "{6B6696B1-A547-4FD4-85EF-E1FD0F54AD2C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/WinAlfred/App.config b/Wox/App.config similarity index 100% rename from WinAlfred/App.config rename to Wox/App.config diff --git a/WinAlfred/App.xaml b/Wox/App.xaml similarity index 92% rename from WinAlfred/App.xaml rename to Wox/App.xaml index e9810181ff..4f0225e563 100644 --- a/WinAlfred/App.xaml +++ b/Wox/App.xaml @@ -1,4 +1,4 @@ - diff --git a/WinAlfred/App.xaml.cs b/Wox/App.xaml.cs similarity index 94% rename from WinAlfred/App.xaml.cs rename to Wox/App.xaml.cs index b40bf39652..39de278bd8 100644 --- a/WinAlfred/App.xaml.cs +++ b/Wox/App.xaml.cs @@ -1,80 +1,80 @@ -using System; -using System.Collections.ObjectModel; -using System.Linq; -using System.Threading; -using System.Windows; -using Microsoft.VisualBasic.ApplicationServices; -using WinAlfred.Commands; -using StartupEventArgs = System.Windows.StartupEventArgs; - -namespace WinAlfred -{ - public static class EntryPoint - { - [STAThread] - public static void Main(string[] args) - { - SingleInstanceManager manager = new SingleInstanceManager(); - manager.Run(args); - } - } - - // Using VB bits to detect single instances and process accordingly: - // * OnStartup is fired when the first instance loads - // * OnStartupNextInstance is fired when the application is re-run again - // NOTE: it is redirected to this instance thanks to IsSingleInstance - public class SingleInstanceManager : WindowsFormsApplicationBase - { - App app; - - public SingleInstanceManager() - { - this.IsSingleInstance = true; - } - - protected override bool OnStartup(Microsoft.VisualBasic.ApplicationServices.StartupEventArgs e) - { - // First time app is launched - app = new App(); - app.InitializeComponent(); - app.Run(); - return true; - } - - protected override void OnStartupNextInstance(StartupNextInstanceEventArgs eventArgs) - { - // Subsequent launches - base.OnStartupNextInstance(eventArgs); - app.Activate(eventArgs.CommandLine.ToArray()); - } - } - - public partial class App : Application - { - - private static MainWindow window; - - public static MainWindow Window - { - get - { - return window; - } - } - - protected override void OnStartup(StartupEventArgs e) - { - base.OnStartup(e); - - window = new MainWindow(); - window.ShowApp(); - window.ParseArgs(e.Args); - } - - public void Activate(string[] args) - { - window.ShowApp(); - window.ParseArgs(args); - } - } -} +using System; +using System.Collections.ObjectModel; +using System.Linq; +using System.Threading; +using System.Windows; +using Microsoft.VisualBasic.ApplicationServices; +using Wox.Commands; +using StartupEventArgs = System.Windows.StartupEventArgs; + +namespace Wox +{ + public static class EntryPoint + { + [STAThread] + public static void Main(string[] args) + { + SingleInstanceManager manager = new SingleInstanceManager(); + manager.Run(args); + } + } + + // Using VB bits to detect single instances and process accordingly: + // * OnStartup is fired when the first instance loads + // * OnStartupNextInstance is fired when the application is re-run again + // NOTE: it is redirected to this instance thanks to IsSingleInstance + public class SingleInstanceManager : WindowsFormsApplicationBase + { + App app; + + public SingleInstanceManager() + { + this.IsSingleInstance = true; + } + + protected override bool OnStartup(Microsoft.VisualBasic.ApplicationServices.StartupEventArgs e) + { + // First time app is launched + app = new App(); + app.InitializeComponent(); + app.Run(); + return true; + } + + protected override void OnStartupNextInstance(StartupNextInstanceEventArgs eventArgs) + { + // Subsequent launches + base.OnStartupNextInstance(eventArgs); + app.Activate(eventArgs.CommandLine.ToArray()); + } + } + + public partial class App : Application + { + + private static MainWindow window; + + public static MainWindow Window + { + get + { + return window; + } + } + + protected override void OnStartup(StartupEventArgs e) + { + base.OnStartup(e); + + window = new MainWindow(); + window.ShowApp(); + window.ParseArgs(e.Args); + } + + public void Activate(string[] args) + { + window.ShowApp(); + window.ParseArgs(args); + } + } +} diff --git a/WinAlfred/Commands/BaseCommand.cs b/Wox/Commands/BaseCommand.cs similarity index 87% rename from WinAlfred/Commands/BaseCommand.cs rename to Wox/Commands/BaseCommand.cs index 1b25c7cc82..0e5e7fa553 100644 --- a/WinAlfred/Commands/BaseCommand.cs +++ b/Wox/Commands/BaseCommand.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using WinAlfred.Plugin; +using Wox.Plugin; -namespace WinAlfred.Commands +namespace Wox.Commands { public abstract class BaseCommand { diff --git a/WinAlfred/Commands/CommandFactory.cs b/Wox/Commands/CommandFactory.cs similarity index 90% rename from WinAlfred/Commands/CommandFactory.cs rename to Wox/Commands/CommandFactory.cs index 9ad2b98808..6d54d2a377 100644 --- a/WinAlfred/Commands/CommandFactory.cs +++ b/Wox/Commands/CommandFactory.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using WinAlfred.Helper; -using WinAlfred.Plugin; +using Wox.Helper; +using Wox.Plugin; -namespace WinAlfred.Commands +namespace Wox.Commands { internal static class CommandFactory { diff --git a/WinAlfred/Commands/PluginCommand.cs b/Wox/Commands/PluginCommand.cs similarity index 95% rename from WinAlfred/Commands/PluginCommand.cs rename to Wox/Commands/PluginCommand.cs index 482e4166cb..b11729ed66 100644 --- a/WinAlfred/Commands/PluginCommand.cs +++ b/Wox/Commands/PluginCommand.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using Python.Runtime; -using WinAlfred.Helper; -using WinAlfred.Plugin; -using WinAlfred.PluginLoader; +using Wox.Helper; +using Wox.Plugin; +using Wox.PluginLoader; -namespace WinAlfred.Commands +namespace Wox.Commands { public class PluginCommand : BaseCommand { diff --git a/WinAlfred/Commands/SystemCommand.cs b/Wox/Commands/SystemCommand.cs similarity index 93% rename from WinAlfred/Commands/SystemCommand.cs rename to Wox/Commands/SystemCommand.cs index b62989c74b..8cfe94d43f 100644 --- a/WinAlfred/Commands/SystemCommand.cs +++ b/Wox/Commands/SystemCommand.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading; -using WinAlfred.Plugin; -using WinAlfred.PluginLoader; +using Wox.Plugin; +using Wox.PluginLoader; -namespace WinAlfred.Commands +namespace Wox.Commands { public class SystemCommand : BaseCommand { diff --git a/WinAlfred/DispatcherExtensions.cs b/Wox/DispatcherExtensions.cs similarity index 99% rename from WinAlfred/DispatcherExtensions.cs rename to Wox/DispatcherExtensions.cs index 15a56bfa71..2ea304a2ed 100644 --- a/WinAlfred/DispatcherExtensions.cs +++ b/Wox/DispatcherExtensions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Windows.Threading; -namespace WinAlfred +namespace Wox { public static class DispatcherExtensions { diff --git a/WinAlfred/Helper/CommonStorage.cs b/Wox/Helper/CommonStorage.cs similarity index 97% rename from WinAlfred/Helper/CommonStorage.cs rename to Wox/Helper/CommonStorage.cs index 84cbf58e15..d920fe1124 100644 --- a/WinAlfred/Helper/CommonStorage.cs +++ b/Wox/Helper/CommonStorage.cs @@ -6,9 +6,9 @@ using System.Runtime.Serialization.Formatters.Binary; using System.Text; using System.Threading; using Newtonsoft.Json; -using WinAlfred.Models; +using Wox.Models; -namespace WinAlfred.Helper +namespace Wox.Helper { [Serializable] public class CommonStorage diff --git a/WinAlfred/Helper/DwmDropShadow.cs b/Wox/Helper/DwmDropShadow.cs similarity index 98% rename from WinAlfred/Helper/DwmDropShadow.cs rename to Wox/Helper/DwmDropShadow.cs index 030accebdf..9eb29681f1 100644 --- a/WinAlfred/Helper/DwmDropShadow.cs +++ b/Wox/Helper/DwmDropShadow.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; using System.Windows; using System.Windows.Interop; -namespace WinAlfred.Helper +namespace Wox.Helper { public static class DwmDropShadow { diff --git a/WinAlfred/Helper/IniParser.cs b/Wox/Helper/IniParser.cs similarity index 99% rename from WinAlfred/Helper/IniParser.cs rename to Wox/Helper/IniParser.cs index d72a38e191..05515093aa 100644 --- a/WinAlfred/Helper/IniParser.cs +++ b/Wox/Helper/IniParser.cs @@ -2,7 +2,7 @@ using System.Collections; using System.IO; -namespace WinAlfred.Helper +namespace Wox.Helper { public class IniParser { diff --git a/WinAlfred/Helper/KeyboardHook.cs b/Wox/Helper/KeyboardHook.cs similarity index 99% rename from WinAlfred/Helper/KeyboardHook.cs rename to Wox/Helper/KeyboardHook.cs index be717a541a..92acd37e4e 100644 --- a/WinAlfred/Helper/KeyboardHook.cs +++ b/Wox/Helper/KeyboardHook.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; -namespace WinAlfred.Helper +namespace Wox.Helper { public sealed class KeyboardHook : IDisposable { diff --git a/WinAlfred/Helper/KeyboardListener.cs b/Wox/Helper/KeyboardListener.cs similarity index 99% rename from WinAlfred/Helper/KeyboardListener.cs rename to Wox/Helper/KeyboardListener.cs index 264e6a8be3..5da9a1dda3 100644 --- a/WinAlfred/Helper/KeyboardListener.cs +++ b/Wox/Helper/KeyboardListener.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace WinAlfred.Helper +namespace Wox.Helper { public enum KeyEvent : int { diff --git a/WinAlfred/Helper/Log.cs b/Wox/Helper/Log.cs similarity index 91% rename from WinAlfred/Helper/Log.cs rename to Wox/Helper/Log.cs index 6b09fee8a4..656320f661 100644 --- a/WinAlfred/Helper/Log.cs +++ b/Wox/Helper/Log.cs @@ -1,7 +1,7 @@ using System.Reflection; using log4net; -namespace WinAlfred.Helper +namespace Wox.Helper { public class Log { diff --git a/WinAlfred/Helper/WinAlfredException.cs b/Wox/Helper/WoxException.cs similarity index 55% rename from WinAlfred/Helper/WinAlfredException.cs rename to Wox/Helper/WoxException.cs index 4fcd5c3574..dcfb5ff6d6 100644 --- a/WinAlfred/Helper/WinAlfredException.cs +++ b/Wox/Helper/WoxException.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace WinAlfred.Helper +namespace Wox.Helper { - public class WinAlfredException : Exception + public class WoxException : Exception { - public WinAlfredException(string msg) + public WoxException(string msg) : base(msg) { diff --git a/WinAlfred/Images/app.png b/Wox/Images/app.png similarity index 100% rename from WinAlfred/Images/app.png rename to Wox/Images/app.png diff --git a/WinAlfred/Images/bookmark.png b/Wox/Images/bookmark.png similarity index 100% rename from WinAlfred/Images/bookmark.png rename to Wox/Images/bookmark.png diff --git a/WinAlfred/Images/close.png b/Wox/Images/close.png similarity index 100% rename from WinAlfred/Images/close.png rename to Wox/Images/close.png diff --git a/WinAlfred/Images/cmd.png b/Wox/Images/cmd.png similarity index 100% rename from WinAlfred/Images/cmd.png rename to Wox/Images/cmd.png diff --git a/WinAlfred/Images/ctrl.png b/Wox/Images/ctrl.png similarity index 100% rename from WinAlfred/Images/ctrl.png rename to Wox/Images/ctrl.png diff --git a/WinAlfred/Images/enter.png b/Wox/Images/enter.png similarity index 100% rename from WinAlfred/Images/enter.png rename to Wox/Images/enter.png diff --git a/WinAlfred/Images/exit.png b/Wox/Images/exit.png similarity index 100% rename from WinAlfred/Images/exit.png rename to Wox/Images/exit.png diff --git a/WinAlfred/Images/folder.png b/Wox/Images/folder.png similarity index 100% rename from WinAlfred/Images/folder.png rename to Wox/Images/folder.png diff --git a/WinAlfred/Images/lock.png b/Wox/Images/lock.png similarity index 100% rename from WinAlfred/Images/lock.png rename to Wox/Images/lock.png diff --git a/WinAlfred/Images/logoff.png b/Wox/Images/logoff.png similarity index 100% rename from WinAlfred/Images/logoff.png rename to Wox/Images/logoff.png diff --git a/WinAlfred/Images/work.png b/Wox/Images/work.png similarity index 100% rename from WinAlfred/Images/work.png rename to Wox/Images/work.png diff --git a/WinAlfred/MainWindow.xaml b/Wox/MainWindow.xaml similarity index 85% rename from WinAlfred/MainWindow.xaml rename to Wox/MainWindow.xaml index 4c8f39538a..d1ff658f63 100644 --- a/WinAlfred/MainWindow.xaml +++ b/Wox/MainWindow.xaml @@ -1,7 +1,7 @@ - - + \ No newline at end of file diff --git a/WinAlfred/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs similarity index 89% rename from WinAlfred/MainWindow.xaml.cs rename to Wox/MainWindow.xaml.cs index 0851394f40..967e636bf8 100644 --- a/WinAlfred/MainWindow.xaml.cs +++ b/Wox/MainWindow.xaml.cs @@ -1,370 +1,370 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices; -using System.Threading; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Forms; -using System.Windows.Input; -using System.Windows.Media.Animation; -using WinAlfred.Commands; -using WinAlfred.Helper; -using WinAlfred.Plugin; -using WinAlfred.PluginLoader; -using Application = System.Windows.Application; -using KeyEventArgs = System.Windows.Input.KeyEventArgs; -using MessageBox = System.Windows.MessageBox; -using UserControl = System.Windows.Controls.UserControl; - -namespace WinAlfred -{ - public partial class MainWindow - { - private KeyboardHook hook = new KeyboardHook(); - private NotifyIcon notifyIcon; - Storyboard progressBarStoryboard = new Storyboard(); - private bool queryHasReturn = false; - - private KeyboardListener keyboardListener = new KeyboardListener(); - private bool WinRStroked = false; - - private WindowsInput.KeyboardSimulator keyboardSimulator = new WindowsInput.KeyboardSimulator(new WindowsInput.InputSimulator()); - - public MainWindow() - { - InitializeComponent(); - - hook.KeyPressed += OnHotKey; - hook.RegisterHotKey(XModifierKeys.Alt, Keys.Space); - resultCtrl.resultItemChangedEvent += resultCtrl_resultItemChangedEvent; - ThreadPool.SetMaxThreads(30, 10); - InitProgressbarAnimation(); - try - { - SetTheme(CommonStorage.Instance.UserSetting.Theme); - } - catch (IOException) - { - SetTheme(CommonStorage.Instance.UserSetting.Theme = "Default"); - } - } - - private void WakeupApp() - { - //After hide winalfred in the background for a long time. It will become very slow in the next show. - //This is caused by the Virtual Mermory Page Mechanisam. So, our solution is execute some codes in every min - //which may prevent sysetem uninstall memory from RAM to disk. - - System.Timers.Timer t = new System.Timers.Timer(1000 * 60 * 5) { AutoReset = true, Enabled = true }; - t.Elapsed += (o, e) => Dispatcher.Invoke(new Action(() => - { - if (Visibility != Visibility.Visible) - { - double oldLeft = Left; - Left = 20000; - ShowWinAlfred(); - CommandFactory.DispatchCommand(new Query("qq"), false); - HideWinAlfred(); - Left = oldLeft; - } - })); - } - - 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.X2)")); - Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)")); - progressBarStoryboard.Children.Add(da); - progressBarStoryboard.Children.Add(da1); - progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever; - progressBar.Visibility = Visibility.Hidden; - progressBar.BeginStoryboard(progressBarStoryboard); - } - - private void InitialTray() - { - notifyIcon = new NotifyIcon { Text = "WinAlfred", Icon = Properties.Resources.app, Visible = true }; - notifyIcon.Click += (o, e) => ShowWinAlfred(); - 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) => CloseApp(); - System.Windows.Forms.MenuItem[] childen = { open, exit }; - notifyIcon.ContextMenu = new System.Windows.Forms.ContextMenu(childen); - } - - private void resultCtrl_resultItemChangedEvent() - { - resultCtrl.Margin = resultCtrl.GetCurrentResultCount() > 0 ? new Thickness { Top = grid.Margin.Top } : new Thickness { Top = 0 }; - } - - private void OnHotKey(object sender, KeyPressedEventArgs e) - { - if (!IsVisible) - { - ShowWinAlfred(); - } - else - { - HideWinAlfred(); - } - } - - private void TextBoxBase_OnTextChanged(object sender, TextChangedEventArgs e) - { - resultCtrl.Dirty = true; - Dispatcher.DelayInvoke("UpdateSearch", - o => - { - 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); - CommandFactory.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; - } - - private void StopProgress() - { - progressBar.Visibility = Visibility.Hidden; - } - - private void HideWinAlfred() - { - Hide(); - } - - private void ShowWinAlfred(bool selectAll = true) - { - Show(); - Activate(); - Focus(); - tbQuery.Focus(); - if (selectAll) tbQuery.SelectAll(); - } - - public void ParseArgs(string[] args) - { - if (args != null && args.Length > 0) - { - switch (args[0]) - { - case "reloadWorkflows": - Plugins.Init(); - break; - - case "query": - if (args.Length > 1) - { - string query = args[1]; - tbQuery.Text = query; - tbQuery.SelectAll(); - } - break; - } - } - } - - private void SetAutoStart(bool IsAtuoRun) - { - //string LnkPath = Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "//WinAlfred.lnk"; - //if (IsAtuoRun) - //{ - // WshShell shell = new WshShell(); - // IWshShortcut shortcut = (IWshShortcut)shell.CreateShortcut(LnkPath); - // shortcut.TargetPath = System.Reflection.Assembly.GetExecutingAssembly().Location; - // shortcut.WorkingDirectory = Environment.CurrentDirectory; - // shortcut.WindowStyle = 1; //normal window - // shortcut.Description = "WinAlfred"; - // shortcut.Save(); - //} - //else - //{ - // System.IO.File.Delete(LnkPath); - //} - } - - private void MainWindow_OnLoaded(object sender, RoutedEventArgs e) - { - Left = (SystemParameters.PrimaryScreenWidth - ActualWidth) / 2; - Top = (SystemParameters.PrimaryScreenHeight - ActualHeight) / 3; - - Plugins.Init(); - InitialTray(); - SetAutoStart(true); - WakeupApp(); - - //var engine = new Jurassic.ScriptEngine(); - //MessageBox.Show(engine.Evaluate("5 * 10 + 2").ToString()); - keyboardListener.hookedKeyboardCallback += KListener_hookedKeyboardCallback; - } - - private bool KListener_hookedKeyboardCallback(KeyEvent keyevent, int vkcode, SpecialKeyState state) - { - if (CommonStorage.Instance.UserSetting.ReplaceWinR) - { - //todo:need refatoring. move those codes to CMD file or expose events - if (keyevent == KeyEvent.WM_KEYDOWN && vkcode == (int)Keys.R && state.WinPressed) - { - WinRStroked = true; - Dispatcher.BeginInvoke(new Action(OnWinRPressed)); - return false; - } - if (keyevent == KeyEvent.WM_KEYUP && WinRStroked && vkcode == (int)Keys.LWin) - { - WinRStroked = false; - keyboardSimulator.ModifiedKeyStroke(WindowsInput.Native.VirtualKeyCode.LWIN, WindowsInput.Native.VirtualKeyCode.CONTROL); - return false; - } - } - return true; - } - - private void OnWinRPressed() - { - ShowWinAlfred(false); - if (tbQuery.Text != ">") - { - resultCtrl.Clear(); - ChangeQuery(">"); - } - tbQuery.CaretIndex = tbQuery.Text.Length; - } - - private void TbQuery_OnPreviewKeyDown(object sender, KeyEventArgs e) - { - switch (e.Key) - { - case Key.Escape: - HideWinAlfred(); - e.Handled = true; - break; - - case Key.Down: - resultCtrl.SelectNext(); - e.Handled = true; - break; - - case Key.Up: - resultCtrl.SelectPrev(); - e.Handled = true; - break; - - case Key.Enter: - AcceptSelect(); - e.Handled = true; - break; - } - } - - private void AcceptSelect() - { - Result result = resultCtrl.AcceptSelect(); - if (result != null) - { - CommonStorage.Instance.UserSelectedRecords.Add(result); - if (!result.DontHideWinAlfredAfterSelect) - { - HideWinAlfred(); - } - } - } - - public void OnUpdateResultView(List list) - { - queryHasReturn = true; - progressBar.Dispatcher.Invoke(new Action(StopProgress)); - if (list.Count > 0) - { - //todo:this should be opened to users, it's their choise to use it or not in thier workflows - list.ForEach(o => - { - if (o.AutoAjustScore) o.Score += CommonStorage.Instance.UserSelectedRecords.GetSelectedCount(o); - }); - resultCtrl.Dispatcher.Invoke(new Action(() => - { - List l = list.Where(o => o.OriginQuery != null && o.OriginQuery.RawQuery == tbQuery.Text).ToList(); - resultCtrl.AddResults(l); - })); - } - } - - public void SetTheme(string themeName) - { - ResourceDictionary dict = new ResourceDictionary - { - Source = new Uri("pack://application:,,,/Themes/" + themeName + ".xaml") - }; - - Application.Current.Resources.MergedDictionaries.Clear(); - Application.Current.Resources.MergedDictionaries.Add(dict); - } - - #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; - Environment.Exit(0); - } - - 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); - } - - public void OpenSettingDialog() - { - SettingWidow s = new SettingWidow(this); - s.Show(); - } - - #endregion - } +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using System.Threading; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Forms; +using System.Windows.Input; +using System.Windows.Media.Animation; +using Wox.Commands; +using Wox.Helper; +using Wox.Plugin; +using Wox.PluginLoader; +using Application = System.Windows.Application; +using KeyEventArgs = System.Windows.Input.KeyEventArgs; +using MessageBox = System.Windows.MessageBox; +using UserControl = System.Windows.Controls.UserControl; + +namespace Wox +{ + public partial class MainWindow + { + private KeyboardHook hook = new KeyboardHook(); + private NotifyIcon notifyIcon; + Storyboard progressBarStoryboard = new Storyboard(); + private bool queryHasReturn = false; + + private KeyboardListener keyboardListener = new KeyboardListener(); + private bool WinRStroked = false; + + private WindowsInput.KeyboardSimulator keyboardSimulator = new WindowsInput.KeyboardSimulator(new WindowsInput.InputSimulator()); + + public MainWindow() + { + InitializeComponent(); + + hook.KeyPressed += OnHotKey; + hook.RegisterHotKey(XModifierKeys.Alt, Keys.Space); + resultCtrl.resultItemChangedEvent += resultCtrl_resultItemChangedEvent; + ThreadPool.SetMaxThreads(30, 10); + InitProgressbarAnimation(); + try + { + SetTheme(CommonStorage.Instance.UserSetting.Theme); + } + catch (IOException) + { + SetTheme(CommonStorage.Instance.UserSetting.Theme = "Default"); + } + } + + private void WakeupApp() + { + //After hide wox in the background for a long time. It will become very slow in the next show. + //This is caused by the Virtual Mermory Page Mechanisam. So, our solution is execute some codes in every min + //which may prevent sysetem uninstall memory from RAM to disk. + + System.Timers.Timer t = new System.Timers.Timer(1000 * 60 * 5) { AutoReset = true, Enabled = true }; + t.Elapsed += (o, e) => Dispatcher.Invoke(new Action(() => + { + if (Visibility != Visibility.Visible) + { + double oldLeft = Left; + Left = 20000; + ShowWox(); + CommandFactory.DispatchCommand(new Query("qq"), false); + HideWox(); + Left = oldLeft; + } + })); + } + + 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.X2)")); + Storyboard.SetTargetProperty(da1, new PropertyPath("(Line.X1)")); + progressBarStoryboard.Children.Add(da); + progressBarStoryboard.Children.Add(da1); + progressBarStoryboard.RepeatBehavior = RepeatBehavior.Forever; + progressBar.Visibility = Visibility.Hidden; + progressBar.BeginStoryboard(progressBarStoryboard); + } + + private void InitialTray() + { + notifyIcon = new NotifyIcon { Text = "Wox", Icon = Properties.Resources.app, Visible = true }; + notifyIcon.Click += (o, e) => ShowWox(); + System.Windows.Forms.MenuItem open = new System.Windows.Forms.MenuItem("Open"); + open.Click += (o, e) => ShowWox(); + System.Windows.Forms.MenuItem exit = new System.Windows.Forms.MenuItem("Exit"); + exit.Click += (o, e) => CloseApp(); + System.Windows.Forms.MenuItem[] childen = { open, exit }; + notifyIcon.ContextMenu = new System.Windows.Forms.ContextMenu(childen); + } + + private void resultCtrl_resultItemChangedEvent() + { + resultCtrl.Margin = resultCtrl.GetCurrentResultCount() > 0 ? new Thickness { Top = grid.Margin.Top } : new Thickness { Top = 0 }; + } + + private void OnHotKey(object sender, KeyPressedEventArgs e) + { + if (!IsVisible) + { + ShowWox(); + } + else + { + HideWox(); + } + } + + private void TextBoxBase_OnTextChanged(object sender, TextChangedEventArgs e) + { + resultCtrl.Dirty = true; + Dispatcher.DelayInvoke("UpdateSearch", + o => + { + 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); + CommandFactory.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; + } + + private void StopProgress() + { + progressBar.Visibility = Visibility.Hidden; + } + + private void HideWox() + { + Hide(); + } + + private void ShowWox(bool selectAll = true) + { + Show(); + Activate(); + Focus(); + tbQuery.Focus(); + if (selectAll) tbQuery.SelectAll(); + } + + public void ParseArgs(string[] args) + { + if (args != null && args.Length > 0) + { + switch (args[0]) + { + case "reloadWorkflows": + Plugins.Init(); + break; + + case "query": + if (args.Length > 1) + { + string query = args[1]; + tbQuery.Text = query; + tbQuery.SelectAll(); + } + break; + } + } + } + + private void SetAutoStart(bool IsAtuoRun) + { + //string LnkPath = Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "//Wox.lnk"; + //if (IsAtuoRun) + //{ + // WshShell shell = new WshShell(); + // IWshShortcut shortcut = (IWshShortcut)shell.CreateShortcut(LnkPath); + // shortcut.TargetPath = System.Reflection.Assembly.GetExecutingAssembly().Location; + // shortcut.WorkingDirectory = Environment.CurrentDirectory; + // shortcut.WindowStyle = 1; //normal window + // shortcut.Description = "Wox"; + // shortcut.Save(); + //} + //else + //{ + // System.IO.File.Delete(LnkPath); + //} + } + + private void MainWindow_OnLoaded(object sender, RoutedEventArgs e) + { + Left = (SystemParameters.PrimaryScreenWidth - ActualWidth) / 2; + Top = (SystemParameters.PrimaryScreenHeight - ActualHeight) / 3; + + Plugins.Init(); + InitialTray(); + SetAutoStart(true); + WakeupApp(); + + //var engine = new Jurassic.ScriptEngine(); + //MessageBox.Show(engine.Evaluate("5 * 10 + 2").ToString()); + keyboardListener.hookedKeyboardCallback += KListener_hookedKeyboardCallback; + } + + private bool KListener_hookedKeyboardCallback(KeyEvent keyevent, int vkcode, SpecialKeyState state) + { + if (CommonStorage.Instance.UserSetting.ReplaceWinR) + { + //todo:need refatoring. move those codes to CMD file or expose events + if (keyevent == KeyEvent.WM_KEYDOWN && vkcode == (int)Keys.R && state.WinPressed) + { + WinRStroked = true; + Dispatcher.BeginInvoke(new Action(OnWinRPressed)); + return false; + } + if (keyevent == KeyEvent.WM_KEYUP && WinRStroked && vkcode == (int)Keys.LWin) + { + WinRStroked = false; + keyboardSimulator.ModifiedKeyStroke(WindowsInput.Native.VirtualKeyCode.LWIN, WindowsInput.Native.VirtualKeyCode.CONTROL); + return false; + } + } + return true; + } + + private void OnWinRPressed() + { + ShowWox(false); + if (tbQuery.Text != ">") + { + resultCtrl.Clear(); + ChangeQuery(">"); + } + tbQuery.CaretIndex = tbQuery.Text.Length; + } + + private void TbQuery_OnPreviewKeyDown(object sender, KeyEventArgs e) + { + switch (e.Key) + { + case Key.Escape: + HideWox(); + e.Handled = true; + break; + + case Key.Down: + resultCtrl.SelectNext(); + e.Handled = true; + break; + + case Key.Up: + resultCtrl.SelectPrev(); + e.Handled = true; + break; + + case Key.Enter: + AcceptSelect(); + e.Handled = true; + break; + } + } + + private void AcceptSelect() + { + Result result = resultCtrl.AcceptSelect(); + if (result != null) + { + CommonStorage.Instance.UserSelectedRecords.Add(result); + if (!result.DontHideWoxAfterSelect) + { + HideWox(); + } + } + } + + public void OnUpdateResultView(List list) + { + queryHasReturn = true; + progressBar.Dispatcher.Invoke(new Action(StopProgress)); + if (list.Count > 0) + { + //todo:this should be opened to users, it's their choise to use it or not in thier workflows + list.ForEach(o => + { + if (o.AutoAjustScore) o.Score += CommonStorage.Instance.UserSelectedRecords.GetSelectedCount(o); + }); + resultCtrl.Dispatcher.Invoke(new Action(() => + { + List l = list.Where(o => o.OriginQuery != null && o.OriginQuery.RawQuery == tbQuery.Text).ToList(); + resultCtrl.AddResults(l); + })); + } + } + + public void SetTheme(string themeName) + { + ResourceDictionary dict = new ResourceDictionary + { + Source = new Uri("pack://application:,,,/Themes/" + themeName + ".xaml") + }; + + Application.Current.Resources.MergedDictionaries.Clear(); + Application.Current.Resources.MergedDictionaries.Add(dict); + } + + #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; + Environment.Exit(0); + } + + public void HideApp() + { + HideWox(); + } + + public void ShowApp() + { + ShowWox(); + } + + public void ShowMsg(string title, string subTitle, string iconPath) + { + Msg m = new Msg { Owner = GetWindow(this) }; + m.Show(title, subTitle, iconPath); + } + + public void OpenSettingDialog() + { + SettingWidow s = new SettingWidow(this); + s.Show(); + } + + #endregion + } } \ No newline at end of file diff --git a/WinAlfred/Models/UserSelectedRecords.cs b/Wox/Models/UserSelectedRecords.cs similarity index 93% rename from WinAlfred/Models/UserSelectedRecords.cs rename to Wox/Models/UserSelectedRecords.cs index de4266b5f8..158e131dc8 100644 --- a/WinAlfred/Models/UserSelectedRecords.cs +++ b/Wox/Models/UserSelectedRecords.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; -using WinAlfred.Helper; -using WinAlfred.Plugin; +using Wox.Helper; +using Wox.Plugin; -namespace WinAlfred.Models +namespace Wox.Models { [Serializable] public class UserSelectedRecords diff --git a/WinAlfred/Models/UserSetting.cs b/Wox/Models/UserSetting.cs similarity index 91% rename from WinAlfred/Models/UserSetting.cs rename to Wox/Models/UserSetting.cs index 58de8e75cd..a3cf980aa7 100644 --- a/WinAlfred/Models/UserSetting.cs +++ b/Wox/Models/UserSetting.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace WinAlfred.Models +namespace Wox.Models { public class UserSetting { diff --git a/WinAlfred/Models/WebSearch.cs b/Wox/Models/WebSearch.cs similarity index 87% rename from WinAlfred/Models/WebSearch.cs rename to Wox/Models/WebSearch.cs index 01bead1041..b786abd966 100644 --- a/WinAlfred/Models/WebSearch.cs +++ b/Wox/Models/WebSearch.cs @@ -1,4 +1,4 @@ -namespace WinAlfred.Models +namespace Wox.Models { public class WebSearch { diff --git a/WinAlfred/Msg.xaml b/Wox/Msg.xaml similarity index 98% rename from WinAlfred/Msg.xaml rename to Wox/Msg.xaml index 06d7a65d60..f99c9d0bfc 100644 --- a/WinAlfred/Msg.xaml +++ b/Wox/Msg.xaml @@ -1,4 +1,4 @@ - /// Indicates that the value of the marked element could be null sometimes, diff --git a/WinAlfred/Properties/AssemblyInfo.cs b/Wox/Properties/AssemblyInfo.cs similarity index 93% rename from WinAlfred/Properties/AssemblyInfo.cs rename to Wox/Properties/AssemblyInfo.cs index 85b3df9561..77130d58f8 100644 --- a/WinAlfred/Properties/AssemblyInfo.cs +++ b/Wox/Properties/AssemblyInfo.cs @@ -1,56 +1,56 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// 有关程序集的常规信息通过以下 -// 特性集控制。更改这些特性值可修改 -// 与程序集关联的信息。 -[assembly: AssemblyTitle("WinAlfred")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("WinAlfred")] -[assembly: AssemblyCopyright("Copyright © qianlifeng 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// 将 ComVisible 设置为 false 使此程序集中的类型 -// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型， -// 则将该类型上的 ComVisible 特性设置为 true。 -[assembly: ComVisible(false)] - -//若要开始生成可本地化的应用程序，请在 -// 中的 .csproj 文件中 -//设置 CultureYouAreCodingWith。例如，如果您在源文件中 -//使用的是美国英语，请将 设置为 en-US。然后取消 -//对以下 NeutralResourceLanguage 特性的注释。更新 -//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。 - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //主题特定资源词典所处位置 - //(在页面或应用程序资源词典中 - // 未找到某个资源的情况下使用) - ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置 - //(在页面、应用程序或任何主题特定资源词典中 - // 未找到某个资源的情况下使用) -)] - - -// 程序集的版本信息由下面四个值组成: -// -// 主版本 -// 次版本 -// 生成号 -// 修订号 -// -// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， -// 方法是按如下所示使用“*”: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// 有关程序集的常规信息通过以下 +// 特性集控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("Wox")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Wox")] +[assembly: AssemblyCopyright("Copyright © qianlifeng 2014")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 使此程序集中的类型 +// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型， +// 则将该类型上的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +//若要开始生成可本地化的应用程序，请在 +// 中的 .csproj 文件中 +//设置 CultureYouAreCodingWith。例如，如果您在源文件中 +//使用的是美国英语，请将 设置为 en-US。然后取消 +//对以下 NeutralResourceLanguage 特性的注释。更新 +//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。 + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //主题特定资源词典所处位置 + //(在页面或应用程序资源词典中 + // 未找到某个资源的情况下使用) + ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置 + //(在页面、应用程序或任何主题特定资源词典中 + // 未找到某个资源的情况下使用) +)] + + +// 程序集的版本信息由下面四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值， +// 方法是按如下所示使用“*”: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: log4net.Config.XmlConfigurator(Watch = true)] \ No newline at end of file diff --git a/WinAlfred/Properties/Resources.Designer.cs b/Wox/Properties/Resources.Designer.cs similarity index 93% rename from WinAlfred/Properties/Resources.Designer.cs rename to Wox/Properties/Resources.Designer.cs index c04e7374ec..ec902f335a 100644 --- a/WinAlfred/Properties/Resources.Designer.cs +++ b/Wox/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 Wox.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("Wox.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/Resources.resx b/Wox/Properties/Resources.resx similarity index 100% rename from WinAlfred/Properties/Resources.resx rename to Wox/Properties/Resources.resx diff --git a/WinAlfred/Properties/Settings.Designer.cs b/Wox/Properties/Settings.Designer.cs similarity index 94% rename from WinAlfred/Properties/Settings.Designer.cs rename to Wox/Properties/Settings.Designer.cs index caf9c18c10..07c3c5c393 100644 --- a/WinAlfred/Properties/Settings.Designer.cs +++ b/Wox/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 Wox.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/Properties/Settings.settings b/Wox/Properties/Settings.settings similarity index 100% rename from WinAlfred/Properties/Settings.settings rename to Wox/Properties/Settings.settings diff --git a/WinAlfred/Resources/app.ico b/Wox/Resources/app.ico similarity index 100% rename from WinAlfred/Resources/app.ico rename to Wox/Resources/app.ico diff --git a/WinAlfred/Resources/ctrl.png b/Wox/Resources/ctrl.png similarity index 100% rename from WinAlfred/Resources/ctrl.png rename to Wox/Resources/ctrl.png diff --git a/WinAlfred/ResultItem.xaml b/Wox/ResultItem.xaml similarity index 97% rename from WinAlfred/ResultItem.xaml rename to Wox/ResultItem.xaml index 7e685c9bc8..d4004599e5 100644 --- a/WinAlfred/ResultItem.xaml +++ b/Wox/ResultItem.xaml @@ -1,4 +1,4 @@ - diff --git a/WinAlfred/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs similarity index 97% rename from WinAlfred/SettingWindow.xaml.cs rename to Wox/SettingWindow.xaml.cs index aad464ca76..15ffe0d142 100644 --- a/WinAlfred/SettingWindow.xaml.cs +++ b/Wox/SettingWindow.xaml.cs @@ -3,9 +3,9 @@ using System.IO; using System.Linq; using System.Windows; using System.Windows.Controls; -using WinAlfred.Helper; +using Wox.Helper; -namespace WinAlfred +namespace Wox { public partial class SettingWidow : Window { diff --git a/WinAlfred/Themes/Default.xaml b/Wox/Themes/Default.xaml similarity index 100% rename from WinAlfred/Themes/Default.xaml rename to Wox/Themes/Default.xaml diff --git a/WinAlfred/Themes/Light.xaml b/Wox/Themes/Light.xaml similarity index 100% rename from WinAlfred/Themes/Light.xaml rename to Wox/Themes/Light.xaml diff --git a/WinAlfred/WebSearchSetting.xaml b/Wox/WebSearchSetting.xaml similarity index 95% rename from WinAlfred/WebSearchSetting.xaml rename to Wox/WebSearchSetting.xaml index 161f446fe7..073a1f72a3 100644 --- a/WinAlfred/WebSearchSetting.xaml +++ b/Wox/WebSearchSetting.xaml @@ -1,4 +1,4 @@ -Title: - What to show in the WinAlfred. The search query is automatically appended for clarity. + What to show in the Wox. The search query is automatically appended for clarity. Keyword: diff --git a/WinAlfred/WebSearchSetting.xaml.cs b/Wox/WebSearchSetting.xaml.cs similarity index 96% rename from WinAlfred/WebSearchSetting.xaml.cs rename to Wox/WebSearchSetting.xaml.cs index 3d31e61b69..3e20b971e6 100644 --- a/WinAlfred/WebSearchSetting.xaml.cs +++ b/Wox/WebSearchSetting.xaml.cs @@ -11,7 +11,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; -namespace WinAlfred +namespace Wox { public partial class WebSearchSetting : Window { diff --git a/WinAlfred/WinAlfred.csproj b/Wox/Wox.csproj similarity index 94% rename from WinAlfred/WinAlfred.csproj rename to Wox/Wox.csproj index 87a16824e1..c0df5d68f1 100644 --- a/WinAlfred/WinAlfred.csproj +++ b/Wox/Wox.csproj @@ -1,291 +1,291 @@ - - - - - Debug - AnyCPU - {DB90F671-D861-46BB-93A3-F1304F5BA1C5} - WinExe - Properties - WinAlfred - WinAlfred - v3.5 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - ..\ - true - - 发布\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - app.ico - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - - - WinAlfred.EntryPoint - - - - - ..\packages\log4net.2.0.3\lib\net35-full\log4net.dll - - - - ..\packages\Newtonsoft.Json.5.0.8\lib\net35\Newtonsoft.Json.dll - - - - - - - - - - - - - - - - - - - - ..\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll - - - - - MSBuild:Compile - Designer - - - - - - - - - - - - - - - - Msg.xaml - - - - - - - - - - ResultPanel.xaml - - - ResultItem.xaml - - - - SettingWindow.xaml - - - WebSearchSetting.xaml - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - Designer - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - {097b4ac0-74e9-4c58-bcf8-c69746ec8271} - Python.Runtime - - - {69ce0206-cb41-453d-88af-df86092ef9b8} - WinAlfred.Plugin.System - - - {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} - WinAlfred.Plugin - - - - - - - - - - - - - - Always - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - - - - - - - - - - - - - - - - xcopy /Y $(ProjectDir)Images\*.* $(TargetDir)Images\ -xcopy /Y $(ProjectDir)app.ico $(TargetDir) -xcopy /Y $(ProjectDir)Themes\*.* $(TargetDir)Themes\ - - + + + + + Debug + AnyCPU + {DB90F671-D861-46BB-93A3-F1304F5BA1C5} + WinExe + Properties + Wox + Wox + v3.5 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + ..\ + true + + 发布\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + app.ico + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + + + Wox.EntryPoint + + + + + ..\packages\log4net.2.0.3\lib\net35-full\log4net.dll + + + + ..\packages\Newtonsoft.Json.5.0.8\lib\net35\Newtonsoft.Json.dll + + + + + + + + + + + + + + + + + + + + ..\packages\InputSimulator.1.0.4.0\lib\net20\WindowsInput.dll + + + + + MSBuild:Compile + Designer + + + + + + + + + + + + + + + + Msg.xaml + + + + + + + + + + ResultPanel.xaml + + + ResultItem.xaml + + + + SettingWindow.xaml + + + WebSearchSetting.xaml + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + Designer + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + {097b4ac0-74e9-4c58-bcf8-c69746ec8271} + Python.Runtime + + + {69ce0206-cb41-453d-88af-df86092ef9b8} + Wox.Plugin.System + + + {8451ECDD-2EA4-4966-BB0A-7BBC40138E80} + Wox.Plugin + + + + + + + + + + + + + + Always + + + + + + + + + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + + + + + + + + + + + + + + + + xcopy /Y $(ProjectDir)Images\*.* $(TargetDir)Images\ +xcopy /Y $(ProjectDir)app.ico $(TargetDir) +xcopy /Y $(ProjectDir)Themes\*.* $(TargetDir)Themes\ + + \ No newline at end of file diff --git a/WinAlfred/app.ico b/Wox/app.ico similarity index 100% rename from WinAlfred/app.ico rename to Wox/app.ico diff --git a/WinAlfred/app.png b/Wox/app.png similarity index 100% rename from WinAlfred/app.png rename to Wox/app.png diff --git a/WinAlfred/packages.config b/Wox/packages.config similarity index 98% rename from WinAlfred/packages.config rename to Wox/packages.config index f46c1ba8d1..ebcfb61815 100644 --- a/WinAlfred/packages.config +++ b/Wox/packages.config @@ -1,6 +1,6 @@ - - - - - + + + + + \ No newline at end of file