Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use variable instead of global static method

Browse Source 
1. introduce variable
2. part of #389
3. refactoring program suffix in program plugin
4. 全局变量一时爽，代码重构火葬场
This commit is contained in:
bao-qian
2016-03-28 03:09:57 +01:00
parent c596039453
commit b22a4501cc
36 changed files with 402 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Wox/CustomQueryHotkeySetting.xaml.cs
View File

@@ -12,14 +12,16 @@ namespace Wox
{
public partial class CustomQueryHotkeySetting : Window
{
private SettingWindow settingWidow;
private SettingWindow _settingWidow;
private bool update;
private CustomPluginHotkey updateCustomHotkey;
private UserSettingStorage _settings;
public CustomQueryHotkeySetting(SettingWindow settingWidow)
public CustomQueryHotkeySetting(SettingWindow settingWidow, UserSettingStorage settings)
{
this.settingWidow = settingWidow;
_settingWidow = settingWidow;
InitializeComponent();
_settings = settings;
}
private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
@@ -37,9 +39,9 @@ namespace Wox
return;
}
if (UserSettingStorage.Instance.CustomPluginHotkeys == null)
if (_settings.CustomPluginHotkeys == null)
{
UserSettingStorage.Instance.CustomPluginHotkeys = new List<CustomPluginHotkey>();
_settings.CustomPluginHotkeys = new List<CustomPluginHotkey>();
}
var pluginHotkey = new CustomPluginHotkey
@@ -47,7 +49,7 @@ namespace Wox
Hotkey = ctlHotkey.CurrentHotkey.ToString(),
ActionKeyword = tbAction.Text
};
UserSettingStorage.Instance.CustomPluginHotkeys.Add(pluginHotkey);
_settings.CustomPluginHotkeys.Add(pluginHotkey);
SetHotkey(ctlHotkey.CurrentHotkey, delegate
{
@@ -76,14 +78,14 @@ namespace Wox
MessageBox.Show(InternationalizationManager.Instance.GetTranslation("succeed"));
}
UserSettingStorage.Instance.Save();
settingWidow.ReloadCustomPluginHotkeyView();
_settings.Save();
_settingWidow.ReloadCustomPluginHotkeyView();
Close();
}
public void UpdateItem(CustomPluginHotkey item)
{
updateCustomHotkey = UserSettingStorage.Instance.CustomPluginHotkeys.FirstOrDefault(o => o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey);
updateCustomHotkey = _settings.CustomPluginHotkeys.FirstOrDefault(o => o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey);
if (updateCustomHotkey == null)
{
MessageBox.Show(InternationalizationManager.Instance.GetTranslation("invalidPluginHotkey"));