From b5175ae8b039e282ea0a0c8842cf8191d57600ee Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Tue, 3 Feb 2015 12:45:41 +0800 Subject: [PATCH 1/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b85ead8436..28ac96a3e8 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) ========= [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. From d90baed5b5d026e7b9fe03f263f818b36f02a807 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Tue, 10 Feb 2015 09:42:52 +0800 Subject: [PATCH 2/7] Add bountysource --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28ac96a3e8..1a58ce652f 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=bounties_received)](https://www.bountysource.com/teams/wox/issues?utm_source=Wox&utm_medium=shield&utm_campaign=bounties_received) ========= [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. From 64e57c54193110d3cb03e695aacbf7abad8ab6d6 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Wed, 4 Mar 2015 09:25:19 +0800 Subject: [PATCH 3/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a58ce652f..993682da9f 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) [![Bountysource](https://www.bountysource.com/badge/team?team_id=39433&style=bounties_received)](https://www.bountysource.com/teams/wox/issues?utm_source=Wox&utm_medium=shield&utm_campaign=bounties_received) +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) ========= [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. From a54898b06277b651d2baabd7581534194c0df6ac Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Wed, 10 Jun 2015 13:05:12 +0800 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 993682da9f..ef32cebd40 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) [![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) +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. From 207546b53cbb0d2417d0204452d90ba5603a4806 Mon Sep 17 00:00:00 2001 From: qianlifeng Date: Wed, 10 Jun 2015 13:08:40 +0800 Subject: [PATCH 5/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef32cebd40..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) [![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 [![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. From c79bf1ca3a6053dae9044943d7628d1fc3024ffb Mon Sep 17 00:00:00 2001 From: kerams Date: Sun, 12 Jul 2015 21:13:30 +0200 Subject: [PATCH 6/7] Make the number of results show at a time customizable --- .../Storage/UserSettings/UserSettingStorage.cs | 4 ++++ Wox/ResultPanel.xaml | 4 ++-- Wox/ResultPanel.xaml.cs | 8 +++----- Wox/SettingWindow.xaml | 5 +++++ Wox/SettingWindow.xaml.cs | 11 +++++++++++ 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Wox.Infrastructure/Storage/UserSettings/UserSettingStorage.cs b/Wox.Infrastructure/Storage/UserSettings/UserSettingStorage.cs index 229e100a2a..1dc8a40f3c 100644 --- a/Wox.Infrastructure/Storage/UserSettings/UserSettingStorage.cs +++ b/Wox.Infrastructure/Storage/UserSettings/UserSettingStorage.cs @@ -103,6 +103,9 @@ namespace Wox.Infrastructure.Storage.UserSettings [JsonProperty] public string ProxyPassword { get; set; } + [JsonProperty] + public int MaxResultsToShow { get; set; } + public List LoadDefaultWebSearches() { List webSearches = new List(); @@ -161,6 +164,7 @@ namespace Wox.Infrastructure.Storage.UserSettings OpacityMode = OpacityMode.Normal; LeaveCmdOpen = false; HideWhenDeactive = false; + MaxResultsToShow = 6; return this; } diff --git a/Wox/ResultPanel.xaml b/Wox/ResultPanel.xaml index a156d6fc18..b5689b72a7 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 736d5d262c..22f33b515f 100644 --- a/Wox/ResultPanel.xaml.cs +++ b/Wox/ResultPanel.xaml.cs @@ -1,14 +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.Infrastructure.Storage.UserSettings; using Wox.Plugin; -using UserControl = System.Windows.Controls.UserControl; namespace Wox { @@ -31,6 +27,8 @@ namespace Wox public bool Dirty { get; set; } + public int MaxResultsToShow { get { return UserSettingStorage.Instance.MaxResultsToShow * 50; } } + public void AddResults(List results) { diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml index 1ab4866c0f..298e47a913 100644 --- a/Wox/SettingWindow.xaml +++ b/Wox/SettingWindow.xaml @@ -6,6 +6,7 @@ xmlns:woxPlugin="clr-namespace:Wox.Plugin;assembly=Wox.Plugin" xmlns:system="clr-namespace:Wox.Plugin.SystemPlugins;assembly=Wox.Plugin.SystemPlugins" xmlns:converters="clr-namespace:Wox.Converters" + xmlns:sys="clr-namespace:System;assembly=mscorlib" Icon="Images\app.png" Title="Wox Settings" ResizeMode="NoResize" @@ -31,6 +32,10 @@ Don't show upgrade msg if new version available + + + + diff --git a/Wox/SettingWindow.xaml.cs b/Wox/SettingWindow.xaml.cs index 4c752ad13c..eca8b7272b 100644 --- a/Wox/SettingWindow.xaml.cs +++ b/Wox/SettingWindow.xaml.cs @@ -66,10 +66,21 @@ namespace Wox UserSettingStorage.Instance.Save(); }; + comboMaxResultsToShow.SelectionChanged += (o, e) => + { + UserSettingStorage.Instance.MaxResultsToShow = (int)comboMaxResultsToShow.SelectedItem; + UserSettingStorage.Instance.Save(); + MainWindow.pnlResult.lbResults.GetBindingExpression(MaxHeightProperty).UpdateTarget(); + }; + cbStartWithWindows.IsChecked = File.Exists(woxLinkPath); cbHideWhenDeactive.IsChecked = UserSettingStorage.Instance.HideWhenDeactive; cbDontPromptUpdateMsg.IsChecked = UserSettingStorage.Instance.DontPromptUpdateMsg; + comboMaxResultsToShow.ItemsSource = Enumerable.Range(2, 16); + var maxResults = UserSettingStorage.Instance.MaxResultsToShow; + comboMaxResultsToShow.SelectedItem = maxResults == 0 ? 6 : maxResults; + #endregion #region Theme From 2089406eaf53b248a0a32a463a3c42d517350eda Mon Sep 17 00:00:00 2001 From: kerams Date: Tue, 14 Jul 2015 17:59:24 +0200 Subject: [PATCH 7/7] Add option to put computer to sleep --- Wox.Plugin.SystemPlugins/Sys/Sys.cs | 18 ++++++++++++------ Wox/Images/sleep.png | Bin 0 -> 1240 bytes Wox/Wox.csproj | 5 +++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 Wox/Images/sleep.png diff --git a/Wox.Plugin.SystemPlugins/Sys/Sys.cs b/Wox.Plugin.SystemPlugins/Sys/Sys.cs index 50a2a6e859..15826859a8 100644 --- a/Wox.Plugin.SystemPlugins/Sys/Sys.cs +++ b/Wox.Plugin.SystemPlugins/Sys/Sys.cs @@ -1,10 +1,8 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; using System.Windows.Forms; +using Control = System.Windows.Controls.Control; namespace Wox.Plugin.SystemPlugins.Sys { @@ -51,7 +49,7 @@ namespace Wox.Plugin.SystemPlugins.Sys #endregion - public System.Windows.Controls.Control CreateSettingPanel() + public Control CreateSettingPanel() { return new SysSettings(availableResults); } @@ -109,7 +107,15 @@ namespace Wox.Plugin.SystemPlugins.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 = "Close this app", diff --git a/Wox/Images/sleep.png b/Wox/Images/sleep.png new file mode 100644 index 0000000000000000000000000000000000000000..c7668e7f2911ad1e642b469eb03c8c5fde56e357 GIT binary patch literal 1240 zcmV;}1Sk86P)$CL61Eo8q|Z(OB3o-4;Dly z6x2fmQi05rC1herm?hL`p;Bs!CgbRQHO|L9XYaLoxX$<7`Eu-k*l-SO@BRPpwHAA= zV;F}WdwU*95;o^N4XTtFP!<6S#ux_Ej^8ql-7U=(M@MXCk6u{#`5 zG2CMAQ7B-nvZ5+l<8p~^NfO0HixluV!Y4{D)-7&0(RxJ)^JLG(%0R53U=2hT(kVm6 z8Rp_j0fu5*?~{Aq%6>Yp4xoXoMmeSngTp(tf%-bWP? zEjF7z>^##q;P0~YO#OjepgbG#@s=74FSNAU8^EUUVtD7VS!INrTlpMI-R|KiioxMW_jZNVg_SBWt|`d5o{1egXYt6fg_u? zwEo;TZLHsTu7>Nw0Syz^Xi!8H7lI%vdBXw`8Rf)PtEFM?XdBv1HBPh&MbS zq6*`Axjwf>DITa`QFK(s+i6|Kt6|}Efks(e3$T$vFLXaCF5W(Dp zfFudry}Y=f-MI+w10rJ~P*r5H1oRJj)<0N2;~bGZ&v*fg;(<63?pT)Mfx2wLIk_Z& z78DSWurL8WC_UE`T3c4mIPdtmK_c=lA1?p`F7W{?VcJ?WloQg<5>3i45g5z`#2CKW zv5IVwn^C~NqgQcOkTCADQb^Qby$=Kte9#G_f6%jOeJ#ca9bGxP`eM5KVmfoD=oI{ZoPo2@OpFIyvRTO_7dAaIYUil20w*7e_Zbsmw1me zQm`Sc${IdsJI~?c*Z62_0~KYd8HtDEz$-i3IeM~}>Ln>Onf{7a14&|W-Ukz`pffab zONuRjU+Sm+<%2wSUlq-dFXy3^71S;(!CIxGE61;Y_OkczWeyy>N=2DtX*R-3;RLLlkNM2bBsmPK^TdJ2v7^7&I+8<2t01$f}a&a!S zi(}PXt8ruvB}EZ1eenr0xAxisaW1sGq2aJAo6(o7vH#zXfq_JY;T*dRK<(3Cx7L(v zqv*`7^kTsp;YzP*>)5xxX*Bb0d-AK+$}(+qkwta!ongqg96ktL|C+YW{m+d3oQ|M! zUE69G>E@K99z)4u1x4~nKbUyhePDO@cTGQy*!}~5elSy^H(d1q0000 + + + PreserveNewest + +