Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 11:16:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring CustomizedPluginConfig

Browse Source 
1. Reorder the sequence of initialization of UserSettings.
2. Use dictionary for CustomizedPluginConfigs, so code logic like
`.FirstOrDefault(o => o.ID == id);` are removed
3. part of #389
This commit is contained in:
bao-qian
2016-03-25 01:22:24 +00:00
parent 98f1d5cd9b
commit d6f9fddc94
10 changed files with 79 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Wox/PublicAPIInstance.cs
View File

@@ -30,9 +30,6 @@ namespace Wox
GlobalHotkey.Instance.hookedKeyboardCallback += KListener_hookedKeyboardCallback;
WebRequest.RegisterPrefix("data", new DataWebRequestFactory());
SetHotkey(UserSettingStorage.Instance.Hotkey, OnHotkey);
SetCustomPluginHotkey();
MainVM.ListeningKeyPressed += (o, e) => {
if(e.KeyEventArgs.Key == Key.Back)
@@ -98,7 +95,7 @@ namespace Wox
ShowWox();
}
public void ShowMsg(string title, string subTitle, string iconPath)
public void ShowMsg(string title, string subTitle = "", string iconPath = "")
{
Application.Current.Dispatcher.Invoke(() =>
{
@@ -202,7 +199,7 @@ namespace Wox
MainVM.OnTextBoxSelected();
}
public void SetHotkey(string hotkeyStr, EventHandler<HotkeyEventArgs> action)
internal void SetHotkey(string hotkeyStr, EventHandler<HotkeyEventArgs> action)
{
var hotkey = new HotkeyModel(hotkeyStr);
SetHotkey(hotkey, action);
@@ -244,7 +241,7 @@ namespace Wox
return false;
}
private void SetCustomPluginHotkey()
internal void SetCustomPluginHotkey()
{
if (UserSettingStorage.Instance.CustomPluginHotkeys == null) return;
foreach (CustomPluginHotkey hotkey in UserSettingStorage.Instance.CustomPluginHotkeys)
@@ -259,7 +256,7 @@ namespace Wox
}
}
private void OnHotkey(object sender, HotkeyEventArgs e)
protected internal void OnHotkey(object sender, HotkeyEventArgs e)
{
if (ShouldIgnoreHotkeys()) return;
ToggleWox();