Refactor according to MVVM implementation

This commit is contained in:
Colin Liu 2016-02-18 20:56:53 +08:00
parent 3ce0b8bc97
commit c3fd732243

View File

@ -1,8 +1,12 @@
using System.Collections.Generic; using NHotkey;
using NHotkey.Wpf;
using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Windows; using System.Windows;
using Wox.Core.Resource; using Wox.Core.Resource;
using Wox.Core.UserSettings; using Wox.Core.UserSettings;
using Wox.Infrastructure.Hotkey;
namespace Wox namespace Wox
{ {
@ -44,11 +48,12 @@ namespace Wox
ActionKeyword = tbAction.Text ActionKeyword = tbAction.Text
}; };
UserSettingStorage.Instance.CustomPluginHotkeys.Add(pluginHotkey); UserSettingStorage.Instance.CustomPluginHotkeys.Add(pluginHotkey);
//settingWidow.MainWindow.SetHotkey(ctlHotkey.CurrentHotkey, delegate
//{ SetHotkey(ctlHotkey.CurrentHotkey, delegate
// settingWidow.MainWindow.ChangeQuery(pluginHotkey.ActionKeyword); {
// settingWidow.MainWindow.ShowApp(); App.API.ChangeQuery(pluginHotkey.ActionKeyword);
//}); App.API.ShowApp();
});
MessageBox.Show(InternationalizationManager.Instance.GetTranslation("succeed")); MessageBox.Show(InternationalizationManager.Instance.GetTranslation("succeed"));
} }
else else
@ -62,12 +67,12 @@ namespace Wox
updateCustomHotkey.ActionKeyword = tbAction.Text; updateCustomHotkey.ActionKeyword = tbAction.Text;
updateCustomHotkey.Hotkey = ctlHotkey.CurrentHotkey.ToString(); updateCustomHotkey.Hotkey = ctlHotkey.CurrentHotkey.ToString();
//remove origin hotkey //remove origin hotkey
//settingWidow.MainWindow.RemoveHotkey(oldHotkey); RemoveHotkey(oldHotkey);
//settingWidow.MainWindow.SetHotkey(updateCustomHotkey.Hotkey, delegate SetHotkey(new HotkeyModel(updateCustomHotkey.Hotkey), delegate
//{ {
// settingWidow.MainWindow.ShowApp(); App.API.ShowApp();
// settingWidow.MainWindow.ChangeQuery(updateCustomHotkey.ActionKeyword); App.API.ChangeQuery(updateCustomHotkey.ActionKeyword);
//}); });
MessageBox.Show(InternationalizationManager.Instance.GetTranslation("succeed")); MessageBox.Show(InternationalizationManager.Instance.GetTranslation("succeed"));
} }
@ -94,8 +99,30 @@ namespace Wox
private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e) private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)
{ {
//settingWidow.MainWindow.ShowApp(); App.API.ShowApp();
//settingWidow.MainWindow.ChangeQuery(tbAction.Text); App.API.ChangeQuery(tbAction.Text);
}
private void RemoveHotkey(string hotkeyStr)
{
if (!string.IsNullOrEmpty(hotkeyStr))
{
HotkeyManager.Current.Remove(hotkeyStr);
}
}
private void SetHotkey(HotkeyModel hotkey, EventHandler<HotkeyEventArgs> action)
{
string hotkeyStr = hotkey.ToString();
try
{
HotkeyManager.Current.AddOrReplace(hotkeyStr, hotkey.CharKey, hotkey.ModifierKeys, action);
}
catch (Exception)
{
string errorMsg = string.Format(InternationalizationManager.Instance.GetTranslation("registerHotkeyFailed"), hotkeyStr);
MessageBox.Show(errorMsg);
}
} }
} }
} }