diff --git a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj index 96380b9b22..3617934043 100644 --- a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj +++ b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj @@ -1,153 +1,153 @@ - - - - - Debug - AnyCPU - {230AE83F-E92E-4E69-8355-426B305DA9C0} - Library - Properties - Wox.Plugin.Everything - Wox.Plugin.Everything - v3.5 - 512 - ..\Wox\ - true - - - true - full - false - ..\..\Output\Debug\Plugins\Wox.Plugin.Everything\ - DEBUG;TRACE - prompt - 4 - AnyCPU - - - pdbonly - true - ..\..\Output\Release\Plugins\Wox.Plugin.Everything\ - TRACE - prompt - 4 - - - - - - - False - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - PreserveNewest - - - - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - - - - - MSBuild:Compile - Designer - PreserveNewest - - - - - MSBuild:Compile - Designer - PreserveNewest - - - - - MSBuild:Compile - Designer - PreserveNewest - - - - - - - - - - - 这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - + + + + + Debug + AnyCPU + {230AE83F-E92E-4E69-8355-426B305DA9C0} + Library + Properties + Wox.Plugin.Everything + Wox.Plugin.Everything + v3.5 + 512 + ..\Wox\ + true + + + true + full + false + ..\..\Output\Debug\Plugins\Wox.Plugin.Everything\ + DEBUG;TRACE + prompt + 4 + AnyCPU + + + pdbonly + true + ..\..\Output\Release\Plugins\Wox.Plugin.Everything\ + TRACE + prompt + 4 + + + + + + + False + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + PreserveNewest + + + + + {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} + Wox.Infrastructure + + + {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} + Wox.Plugin + + + + + MSBuild:Compile + Designer + PreserveNewest + + + + + MSBuild:Compile + Designer + PreserveNewest + + + + + MSBuild:Compile + Designer + PreserveNewest + + + + + + + + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + + --> \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Folder/Languages/zh-cn.xaml b/Plugins/Wox.Plugin.Folder/Languages/zh-cn.xaml index 01b435ec41..15df3d5c6e 100644 --- a/Plugins/Wox.Plugin.Folder/Languages/zh-cn.xaml +++ b/Plugins/Wox.Plugin.Folder/Languages/zh-cn.xaml @@ -1,15 +1,15 @@ - - - 删除 - 编辑 - 添加 - 文件夹路径 - 请选择一个文件夹 - 你确定要删除{0}吗? - - 文件夹 - 在Wox中直接打开收藏的文件夹 - + + + 删除 + 编辑 + 添加 + 文件夹路径 + 请选择一个文件夹 + 你确定要删除{0}吗? + + 文件夹 + 在Wox中直接打开收藏的文件夹 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Folder/Languages/zh-tw.xaml b/Plugins/Wox.Plugin.Folder/Languages/zh-tw.xaml index c2f6cd8edd..4f6c0b7faa 100644 --- a/Plugins/Wox.Plugin.Folder/Languages/zh-tw.xaml +++ b/Plugins/Wox.Plugin.Folder/Languages/zh-tw.xaml @@ -1,15 +1,15 @@ - - - 刪除 - 編輯 - 添加 - 文件夾路徑 - 請選擇一個文件夾 - 你確認要刪除{0}嗎? - - 文件夾 - 在Wox中直接打開收藏的文件夾 - + + + 刪除 + 編輯 + 添加 + 文件夾路徑 + 請選擇一個文件夾 + 你確認要刪除{0}嗎? + + 文件夾 + 在Wox中直接打開收藏的文件夾 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj index 162c2a12bf..60d98225c4 100644 --- a/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj +++ b/Plugins/Wox.Plugin.Folder/Wox.Plugin.Folder.csproj @@ -1,123 +1,123 @@ - - - - - Debug - AnyCPU - {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} - Library - Properties - Wox.Plugin.Folder - Wox.Plugin.Folder - v3.5 - 512 - ..\..\ - true - - - - true - full - false - ..\..\Output\Debug\Plugins\Wox.Plugin.Folder\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Output\Release\Plugins\Wox.Plugin.Folder\ - TRACE - prompt - 4 - false - - - - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - - - FolderPluginSettings.xaml - - - - - - - - PreserveNewest - - - - - MSBuild:Compile - Designer - - - PreserveNewest - - - MSBuild:Compile - Designer - PreserveNewest - - - MSBuild:Compile - Designer - PreserveNewest - - - MSBuild:Compile - Designer - PreserveNewest - - - - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - - - - - PreserveNewest - - - - - - - 这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - - + + + + + Debug + AnyCPU + {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} + Library + Properties + Wox.Plugin.Folder + Wox.Plugin.Folder + v3.5 + 512 + ..\..\ + true + + + + true + full + false + ..\..\Output\Debug\Plugins\Wox.Plugin.Folder\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\..\Output\Release\Plugins\Wox.Plugin.Folder\ + TRACE + prompt + 4 + false + + + + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + True + + + + + + + + + + + + + + + + + + FolderPluginSettings.xaml + + + + + + + + PreserveNewest + + + + + MSBuild:Compile + Designer + + + PreserveNewest + + + MSBuild:Compile + Designer + PreserveNewest + + + MSBuild:Compile + Designer + PreserveNewest + + + MSBuild:Compile + Designer + PreserveNewest + + + + + {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} + Wox.Infrastructure + + + {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} + Wox.Plugin + + + + + PreserveNewest + + + + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.PluginIndicator/Languages/zh-cn.xaml b/Plugins/Wox.Plugin.PluginIndicator/Languages/zh-cn.xaml index e91f7923ec..12a49d04e0 100644 --- a/Plugins/Wox.Plugin.PluginIndicator/Languages/zh-cn.xaml +++ b/Plugins/Wox.Plugin.PluginIndicator/Languages/zh-cn.xaml @@ -1,8 +1,8 @@ - - - 插件关键词提示 - 提供插件关键词搜索提示 - + + + 插件关键词提示 + 提供插件关键词搜索提示 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.PluginIndicator/Languages/zh-tw.xaml b/Plugins/Wox.Plugin.PluginIndicator/Languages/zh-tw.xaml index 7532048169..0958ba12e2 100644 --- a/Plugins/Wox.Plugin.PluginIndicator/Languages/zh-tw.xaml +++ b/Plugins/Wox.Plugin.PluginIndicator/Languages/zh-tw.xaml @@ -1,8 +1,8 @@ - - - 插件關鍵詞提示 - 提供插件關鍵詞搜索提示 - + + + 插件關鍵詞提示 + 提供插件關鍵詞搜索提示 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.PluginManagement/Languages/zh-cn.xaml b/Plugins/Wox.Plugin.PluginManagement/Languages/zh-cn.xaml index c8ed0d60a9..00ada8ff36 100644 --- a/Plugins/Wox.Plugin.PluginManagement/Languages/zh-cn.xaml +++ b/Plugins/Wox.Plugin.PluginManagement/Languages/zh-cn.xaml @@ -1,8 +1,8 @@ - - - Wox插件管理 - 安装/卸载/更新Wox插件 - + + + Wox插件管理 + 安装/卸载/更新Wox插件 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.PluginManagement/Languages/zh-tw.xaml b/Plugins/Wox.Plugin.PluginManagement/Languages/zh-tw.xaml index 9630894005..417195fbb7 100644 --- a/Plugins/Wox.Plugin.PluginManagement/Languages/zh-tw.xaml +++ b/Plugins/Wox.Plugin.PluginManagement/Languages/zh-tw.xaml @@ -1,8 +1,8 @@ - - - Wox插件管理 - 安裝/卸載/更新Wox插件 - + + + Wox插件管理 + 安裝/卸載/更新Wox插件 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj index 4952c96598..cc1174c98f 100644 --- a/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj +++ b/Plugins/Wox.Plugin.PluginManagement/Wox.Plugin.PluginManagement.csproj @@ -1,114 +1,114 @@ - - - - - Debug - AnyCPU - {049490F0-ECD2-4148-9B39-2135EC346EBE} - Library - Properties - Wox.Plugin.PluginManagement - Wox.Plugin.PluginManagement - v3.5 - 512 - ..\..\ - true - - - - true - full - false - ..\..\Output\Debug\Plugins\Wox.Plugin.PluginManagement\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Output\Release\Plugins\Wox.Plugin.PluginManagement\ - TRACE - prompt - 4 - false - - - - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - - - - - - PreserveNewest - - - - - PreserveNewest - - - - - MSBuild:Compile - Designer - PreserveNewest - - - - - MSBuild:Compile - Designer - PreserveNewest - - - - - MSBuild:Compile - Designer - PreserveNewest - - - - - - - - - - - 这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - + + + + + Debug + AnyCPU + {049490F0-ECD2-4148-9B39-2135EC346EBE} + Library + Properties + Wox.Plugin.PluginManagement + Wox.Plugin.PluginManagement + v3.5 + 512 + ..\..\ + true + + + + true + full + false + ..\..\Output\Debug\Plugins\Wox.Plugin.PluginManagement\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\..\Output\Release\Plugins\Wox.Plugin.PluginManagement\ + TRACE + prompt + 4 + false + + + + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + True + + + + + + + + + + + + + + + + + + + {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} + Wox.Plugin + + + + + + PreserveNewest + + + + + PreserveNewest + + + + + MSBuild:Compile + Designer + PreserveNewest + + + + + MSBuild:Compile + Designer + PreserveNewest + + + + + MSBuild:Compile + Designer + PreserveNewest + + + + + + + + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + + --> \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Sys/Languages/zh-cn.xaml b/Plugins/Wox.Plugin.Sys/Languages/zh-cn.xaml index ef7d495266..d9e10231f8 100644 --- a/Plugins/Wox.Plugin.Sys/Languages/zh-cn.xaml +++ b/Plugins/Wox.Plugin.Sys/Languages/zh-cn.xaml @@ -1,18 +1,18 @@ - - - 命令 - 描述 - - 关闭电脑 - 注销 - 锁定这台电脑 - 退出Wox - 重启Wox - 设置 - - 系统命令 - 系统系统相关的命令。例如,关机,锁定,设置等 - + + + 命令 + 描述 + + 关闭电脑 + 注销 + 锁定这台电脑 + 退出Wox + 重启Wox + 设置 + + 系统命令 + 系统系统相关的命令。例如,关机,锁定,设置等 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Sys/Languages/zh-tw.xaml b/Plugins/Wox.Plugin.Sys/Languages/zh-tw.xaml index 55abdbf433..75c93a0d1a 100644 --- a/Plugins/Wox.Plugin.Sys/Languages/zh-tw.xaml +++ b/Plugins/Wox.Plugin.Sys/Languages/zh-tw.xaml @@ -1,18 +1,18 @@ - - - 命令 - 描述 - - 關閉電腦 - 註銷 - 鎖定這臺電腦 - 退出Wox - 重啟Wox - 設置 - - 系統命令 - 系統系統相關的命令。例如,關機,鎖定,設置等 - + + + 命令 + 描述 + + 關閉電腦 + 註銷 + 鎖定這臺電腦 + 退出Wox + 重啟Wox + 設置 + + 系統命令 + 系統系統相關的命令。例如,關機,鎖定,設置等 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Sys/Sys.cs b/Plugins/Wox.Plugin.Sys/Sys.cs index 359faeef4b..f547e86e57 100644 --- a/Plugins/Wox.Plugin.Sys/Sys.cs +++ b/Plugins/Wox.Plugin.Sys/Sys.cs @@ -5,6 +5,9 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; using Wox.Infrastructure; +using System.Runtime.InteropServices; +using System.Windows.Forms; +using Control = System.Windows.Controls.Control; namespace Wox.Plugin.Sys { @@ -28,7 +31,7 @@ namespace Wox.Plugin.Sys #endregion - public System.Windows.Controls.Control CreateSettingPanel() + public Control CreateSettingPanel() { return new SysSettings(availableResults); } @@ -89,7 +92,15 @@ namespace Wox.Plugin.Sys return true; } }, - new Result + new Result + { + Title = "Sleep", + SubTitle = "Put computer to sleep", + Score = 100, + IcoPath = "Images\\sleep.png", + Action = (c) => Application.SetSuspendState(PowerState.Suspend, false, false) + }, + new Result { Title = "Exit", SubTitle = context.API.GetTranslation("wox_plugin_sys_exit"), diff --git a/Plugins/Wox.Plugin.Url/Languages/zh-cn.xaml b/Plugins/Wox.Plugin.Url/Languages/zh-cn.xaml index 4cab4182cd..d44f845570 100644 --- a/Plugins/Wox.Plugin.Url/Languages/zh-cn.xaml +++ b/Plugins/Wox.Plugin.Url/Languages/zh-cn.xaml @@ -1,11 +1,11 @@ - - - 打开链接:{0} - 无法打开链接:{0} - - URL - 从Wox打开链接 - + + + 打开链接:{0} + 无法打开链接:{0} + + URL + 从Wox打开链接 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Url/Languages/zh-tw.xaml b/Plugins/Wox.Plugin.Url/Languages/zh-tw.xaml index e4d45de1da..69a9b63a8f 100644 --- a/Plugins/Wox.Plugin.Url/Languages/zh-tw.xaml +++ b/Plugins/Wox.Plugin.Url/Languages/zh-tw.xaml @@ -1,11 +1,11 @@ - - - 打開鏈接:{0} - 無法打開鏈接:{0} - - URL - 從Wox打開鏈接 - + + + 打開鏈接:{0} + 無法打開鏈接:{0} + + URL + 從Wox打開鏈接 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.WebSearch/Languages/zh-cn.xaml b/Plugins/Wox.Plugin.WebSearch/Languages/zh-cn.xaml index 95ab6c4c6f..8800481360 100644 --- a/Plugins/Wox.Plugin.WebSearch/Languages/zh-cn.xaml +++ b/Plugins/Wox.Plugin.WebSearch/Languages/zh-cn.xaml @@ -1,32 +1,32 @@ - - - 删除 - 编辑 - 添加 - 触发关键字 - URL - 搜索 - 启用搜索建议 - 请选择一项 - 你确定要删除 {0} 吗? - - - - 标题 - 启用 - 图标 - 选择图标 - 取消 - 非法的网页搜索 - 请输入标题 - 请输入触发关键字 - 请输入URL - 触发关键字已经存在,请选择一个新的关键字 - 操作成功 - - 网页搜索 - 提供网页搜索能力 - + + + 删除 + 编辑 + 添加 + 触发关键字 + URL + 搜索 + 启用搜索建议 + 请选择一项 + 你确定要删除 {0} 吗? + + + + 标题 + 启用 + 图标 + 选择图标 + 取消 + 非法的网页搜索 + 请输入标题 + 请输入触发关键字 + 请输入URL + 触发关键字已经存在,请选择一个新的关键字 + 操作成功 + + 网页搜索 + 提供网页搜索能力 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.WebSearch/Languages/zh-tw.xaml b/Plugins/Wox.Plugin.WebSearch/Languages/zh-tw.xaml index 2d4efa88a1..9e665167c0 100644 --- a/Plugins/Wox.Plugin.WebSearch/Languages/zh-tw.xaml +++ b/Plugins/Wox.Plugin.WebSearch/Languages/zh-tw.xaml @@ -1,32 +1,32 @@ - - - 刪除 - 編輯 - 添加 - 觸發關鍵字 - URL - 搜索 - 啟用搜索建議 - 請選擇一項 - 你確定要刪除 {0} 嗎? - - - - 標題 - 啟用 - 圖標 - 選擇圖標 - 取消 - 非法的網頁搜索 - 請輸入標題 - 請輸入觸發關鍵字 - 請輸入URL - 觸發關鍵字已經存在,請選擇一個新的關鍵字 - 操作成功 - - 網頁搜索 - 提供網頁搜索能力 - + + + 刪除 + 編輯 + 添加 + 觸發關鍵字 + URL + 搜索 + 啟用搜索建議 + 請選擇一項 + 你確定要刪除 {0} 嗎? + + + + 標題 + 啟用 + 圖標 + 選擇圖標 + 取消 + 非法的網頁搜索 + 請輸入標題 + 請輸入觸發關鍵字 + 請輸入URL + 觸發關鍵字已經存在,請選擇一個新的關鍵字 + 操作成功 + + 網頁搜索 + 提供網頁搜索能力 + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj index 1a1f5b49bc..b4751d37bb 100644 --- a/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj +++ b/Plugins/Wox.Plugin.WebSearch/Wox.Plugin.WebSearch.csproj @@ -1,147 +1,147 @@ - - - - - Debug - AnyCPU - {403B57F2-1856-4FC7-8A24-36AB346B763E} - Library - Properties - Wox.Plugin.WebSearch - Wox.Plugin.WebSearch - v3.5 - 512 - ..\..\ - true - - - - true - full - false - ..\..\Output\Debug\Plugins\Wox.Plugin.WebSearch\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - ..\..\Output\Release\Plugins\Wox.Plugin.WebSearch\ - TRACE - prompt - 4 - false - - - - False - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll - - - - - - - - - - - - - - - - - - - - - - WebSearchesSetting.xaml - - - - WebSearchSetting.xaml - - - - - - PreserveNewest - - - MSBuild:Compile - Designer - PreserveNewest - - - MSBuild:Compile - Designer - PreserveNewest - - - MSBuild:Compile - Designer - PreserveNewest - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - - - - - {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} - Wox.Infrastructure - - - {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} - Wox.Plugin - - - - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - - - PreserveNewest - - - - - - - 这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - + + + + + Debug + AnyCPU + {403B57F2-1856-4FC7-8A24-36AB346B763E} + Library + Properties + Wox.Plugin.WebSearch + Wox.Plugin.WebSearch + v3.5 + 512 + ..\..\ + true + + + + true + full + false + ..\..\Output\Debug\Plugins\Wox.Plugin.WebSearch\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + ..\..\Output\Release\Plugins\Wox.Plugin.WebSearch\ + TRACE + prompt + 4 + false + + + + False + ..\..\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll + + + + + + + + + + + + + + + + + + + + + + WebSearchesSetting.xaml + + + + WebSearchSetting.xaml + + + + + + PreserveNewest + + + MSBuild:Compile + Designer + PreserveNewest + + + MSBuild:Compile + Designer + PreserveNewest + + + MSBuild:Compile + Designer + PreserveNewest + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + + + + {4fd29318-a8ab-4d8f-aa47-60bc241b8da3} + Wox.Infrastructure + + + {8451ecdd-2ea4-4966-bb0a-7bbc40138e80} + Wox.Plugin + + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + PreserveNewest + + + + + + + 这台计算机上缺少此项目引用的 NuGet 程序包。启用“NuGet 程序包还原”可下载这些程序包。有关详细信息,请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 + + + + --> \ No newline at end of file diff --git a/README.md b/README.md index b85ead8436..53e7eff0ee 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Wox [![Build status](https://ci.appveyor.com/api/projects/status/bfktntbivg32e103)](https://ci.appveyor.com/project/qianlifeng/wox) +Wox [![Build status](https://ci.appveyor.com/api/projects/status/bfktntbivg32e103)](https://ci.appveyor.com/project/qianlifeng/wox) [![Bountysource](https://www.bountysource.com/badge/team?team_id=39433&style=raised)](https://www.bountysource.com/teams/wox?utm_source=Wox&utm_medium=shield&utm_campaign=raised) [![Alipay](https://i.alipayobjects.com/i/localhost/png/201406/2m8C9z7xQ5_src.png)](http://meiweihezi.com/dashang/dashang.php?id=ZGsyNDI=) ========= [Wox](http://www.getwox.com) is a launcher for windows, which was inspired by [Alfred](http://www.alfredapp.com/) and [Launchy](http://www.launchy.net/). Wox provide an entry to search everything you want. diff --git a/Wox.Core/UserSettings/UserSettingStorage.cs b/Wox.Core/UserSettings/UserSettingStorage.cs index 79f17f86f3..c01538e623 100644 --- a/Wox.Core/UserSettings/UserSettingStorage.cs +++ b/Wox.Core/UserSettings/UserSettingStorage.cs @@ -101,6 +101,9 @@ namespace Wox.Core.UserSettings [JsonProperty] public string ProxyPassword { get; set; } + [JsonProperty] + public int MaxResultsToShow { get; set; } + protected override string ConfigFolder { get { return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Config"); } @@ -114,7 +117,7 @@ namespace Wox.Core.UserSettings public void IncreaseActivateTimes() { ActivateTimes++; - if (ActivateTimes % 15 == 0) + if (ActivateTimes%15 == 0) { Save(); } @@ -135,6 +138,7 @@ namespace Wox.Core.UserSettings HideWhenDeactive = false; CustomPluginHotkeys = new List(); RememberLastLaunchLocation = false; + MaxResultsToShow = 6; return this; } @@ -165,4 +169,4 @@ namespace Wox.Core.UserSettings LayeredWindow = 1, DWM = 2 } -} +} \ No newline at end of file diff --git a/Wox/Images/sleep.png b/Wox/Images/sleep.png new file mode 100644 index 0000000000..c7668e7f29 Binary files /dev/null and b/Wox/Images/sleep.png differ diff --git a/Wox/ResultPanel.xaml b/Wox/ResultPanel.xaml index 26b18f4f1a..83e3f4b0e3 100644 --- a/Wox/ResultPanel.xaml +++ b/Wox/ResultPanel.xaml @@ -1,4 +1,5 @@  - - + diff --git a/Wox/ResultPanel.xaml.cs b/Wox/ResultPanel.xaml.cs index 21251bb010..eec796d99d 100644 --- a/Wox/ResultPanel.xaml.cs +++ b/Wox/ResultPanel.xaml.cs @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; -using System.IO; -using System.Threading; using System.Windows; using System.Windows.Controls; using System.Windows.Input; using System.Windows.Media; -using Wox.Helper; +using Wox.Core.UserSettings; using Wox.Plugin; using Wox.Storage; using UserControl = System.Windows.Controls.UserControl; @@ -33,6 +31,8 @@ namespace Wox public bool Dirty { get; set; } + public int MaxResultsToShow { get { return UserSettingStorage.Instance.MaxResultsToShow * 50; } } + public void AddResults(List results) { if (Dirty) diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml index 66d0f1cdd6..07ab2b8a8e 100644 --- a/Wox/SettingWindow.xaml +++ b/Wox/SettingWindow.xaml @@ -6,6 +6,7 @@ xmlns:woxPlugin="clr-namespace:Wox.Plugin;assembly=Wox.Plugin" xmlns:converters="clr-namespace:Wox.Converters" xmlns:userSettings="clr-namespace:Wox.Core.UserSettings;assembly=Wox.Core" + xmlns:sys="clr-namespace:System;assembly=mscorlib" Icon="Images\app.png" Title="{DynamicResource woxsettings}" ResizeMode="NoResize" @@ -38,6 +39,10 @@ + + + + @@ -308,7 +313,7 @@ - + diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs index 479691bf05..5395de12ba 100644 --- a/Wox/SettingWindow.xaml.cs +++ b/Wox/SettingWindow.xaml.cs @@ -87,11 +87,21 @@ namespace Wox }; cbStartWithWindows.IsChecked = CheckApplicationIsStartupWithWindow(); + comboMaxResultsToShow.SelectionChanged += (o, e) => + { + UserSettingStorage.Instance.MaxResultsToShow = (int)comboMaxResultsToShow.SelectedItem; + UserSettingStorage.Instance.Save(); + MainWindow.pnlResult.lbResults.GetBindingExpression(MaxHeightProperty).UpdateTarget(); + }; + cbHideWhenDeactive.IsChecked = UserSettingStorage.Instance.HideWhenDeactive; cbDontPromptUpdateMsg.IsChecked = UserSettingStorage.Instance.DontPromptUpdateMsg; cbRememberLastLocation.IsChecked = UserSettingStorage.Instance.RememberLastLaunchLocation; LoadLanguages(); + comboMaxResultsToShow.ItemsSource = Enumerable.Range(2, 16); + var maxResults = UserSettingStorage.Instance.MaxResultsToShow; + comboMaxResultsToShow.SelectedItem = maxResults == 0 ? 6 : maxResults; #endregion diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj index e93a090615..238aa8ef11 100644 --- a/Wox/Wox.csproj +++ b/Wox/Wox.csproj @@ -351,6 +351,11 @@ + + + PreserveNewest + +