mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-14 19:49:15 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #73 from kerams/master

Browse Source 
Opening Settings from tray and the ability to leave the windows command prompt open after running a command
This commit is contained in:
Yeechan Lu 2014-04-11 10:01:01 +08:00
commit ac5cd90cc6
5 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Wox.Infrastructure/Storage/UserSettings/UserSettingStorage.cs
View File

@ -68,6 +68,9 @@ namespace Wox.Infrastructure.Storage.UserSettings
[JsonProperty] [JsonProperty]
public OpacityMode OpacityMode { get; set; } public OpacityMode OpacityMode { get; set; }
[JsonProperty]
public bool LeaveCmdOpen { get; set; }
public List<WebSearch> LoadDefaultWebSearches() public List<WebSearch> LoadDefaultWebSearches()
{ {
List<WebSearch> webSearches = new List<WebSearch>(); List<WebSearch> webSearches = new List<WebSearch>();
@ -137,7 +140,8 @@ namespace Wox.Infrastructure.Storage.UserSettings
QueryBoxFont = FontFamily.GenericSansSerif.Name; QueryBoxFont = FontFamily.GenericSansSerif.Name;
ResultItemFont = FontFamily.GenericSansSerif.Name; ResultItemFont = FontFamily.GenericSansSerif.Name;
Opacity = 1; Opacity = 1;
OpacityMode = OpacityMode.Normal; OpacityMode = OpacityMode.Normal;
LeaveCmdOpen = false;
} }
} }

17
Wox.Infrastructure/WindowsShellRun.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.IO; using System.IO;
using Wox.Infrastructure.Storage.UserSettings;
namespace Wox.Infrastructure namespace Wox.Infrastructure
{ {
@ -102,7 +103,21 @@ namespace Wox.Infrastructure
startDir = dir; startDir = dir;
} }
global::System.Diagnostics.ProcessStartInfo startInfo = new global::System.Diagnostics.ProcessStartInfo(); if (UserSettingStorage.Instance.LeaveCmdOpen)
{
string cmdExe;
string dummy;
EvaluateSystemAndUserCommandLine("cmd.exe", startDir, out cmdExe, out dummy, dwSeclFlags);
// check whether user typed >cmd, because we don't want to create 2 nested shells
if (cmdExe != cmd)
{
args = string.Format("/k {0} {1}", cmd, args);
cmd = cmdExe;
}
}
global::System.Diagnostics.ProcessStartInfo startInfo = new global::System.Diagnostics.ProcessStartInfo();
startInfo.UseShellExecute = true; startInfo.UseShellExecute = true;
startInfo.Arguments = args; startInfo.Arguments = args;
startInfo.FileName = cmd; startInfo.FileName = cmd;

5
Wox/MainWindow.xaml.cs
View File

@ -23,6 +23,7 @@ using Wox.Infrastructure.Storage;
using Wox.Infrastructure.Storage.UserSettings; using Wox.Infrastructure.Storage.UserSettings;
using Wox.Plugin; using Wox.Plugin;
using Wox.PluginLoader; using Wox.PluginLoader;
using Wox.Properties;
using Application = System.Windows.Application; using Application = System.Windows.Application;
using Brushes = System.Windows.Media.Brushes; using Brushes = System.Windows.Media.Brushes;
using Color = System.Windows.Media.Color; using Color = System.Windows.Media.Color;
@ -179,9 +180,11 @@ namespace Wox
notifyIcon.Click += (o, e) => ShowWox(); notifyIcon.Click += (o, e) => ShowWox();
var open = new MenuItem("Open"); var open = new MenuItem("Open");
open.Click += (o, e) => ShowWox(); open.Click += (o, e) => ShowWox();
var setting = new MenuItem("Setting");
setting.Click += (o, e) => OpenSettingDialog();
var exit = new MenuItem("Exit"); var exit = new MenuItem("Exit");
exit.Click += (o, e) => CloseApp(); exit.Click += (o, e) => CloseApp();
MenuItem[] childen = { open, exit }; MenuItem[] childen = { open, setting, exit };
notifyIcon.ContextMenu = new ContextMenu(childen); notifyIcon.ContextMenu = new ContextMenu(childen);
} }

4
Wox/SettingWindow.xaml
View File

@ -29,6 +29,10 @@
<CheckBox x:Name="cbReplaceWinR" /> <CheckBox x:Name="cbReplaceWinR" />
<TextBlock Text="Replace Win+R" /> <TextBlock Text="Replace Win+R" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Margin="10">
<CheckBox x:Name="cbLeaveCmdOpen" />
<TextBlock Text="Do not close Command Prompt after command execution" />
</StackPanel>
</StackPanel> </StackPanel>
</TabItem> </TabItem>
<TabItem Header="Features"> <TabItem Header="Features">

12
Wox/SettingWindow.xaml.cs
View File

@ -76,6 +76,17 @@ namespace Wox
UserSettingStorage.Instance.Save(); UserSettingStorage.Instance.Save();
}; };
cbLeaveCmdOpen.Checked += (o, e) => {
UserSettingStorage.Instance.LeaveCmdOpen = true;
UserSettingStorage.Instance.Save();
};
cbLeaveCmdOpen.Unchecked += (o, e) =>
{
UserSettingStorage.Instance.LeaveCmdOpen = false;
UserSettingStorage.Instance.Save();
};
#region Load Theme Data #region Load Theme Data
if (!string.IsNullOrEmpty(UserSettingStorage.Instance.QueryBoxFont) && if (!string.IsNullOrEmpty(UserSettingStorage.Instance.QueryBoxFont) &&
@ -167,6 +178,7 @@ namespace Wox
cbEnablePythonPlugins.IsChecked = UserSettingStorage.Instance.EnablePythonPlugins; cbEnablePythonPlugins.IsChecked = UserSettingStorage.Instance.EnablePythonPlugins;
cbStartWithWindows.IsChecked = File.Exists(woxLinkPath); cbStartWithWindows.IsChecked = File.Exists(woxLinkPath);
cbEnableBookmarkPlugin.IsChecked = UserSettingStorage.Instance.EnableBookmarkPlugin; cbEnableBookmarkPlugin.IsChecked = UserSettingStorage.Instance.EnableBookmarkPlugin;
cbLeaveCmdOpen.IsChecked = UserSettingStorage.Instance.LeaveCmdOpen;
var features = new CompositeCollection var features = new CompositeCollection
{ {