Implement the support for shortcut key

This commit is contained in:
Colin Liu
2016-02-12 14:21:12 +08:00
parent e15baeb4a2
commit df85543337
9 changed files with 330 additions and 404 deletions

View File

@@ -1,40 +1,21 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Media.Animation;
using NHotkey;
using NHotkey.Wpf;
using Wox.Core.Plugin;
using Wox.Core.Resource;
using Wox.Core.Updater;
using Wox.Core.UserSettings;
using Wox.Helper;
using Wox.Infrastructure;
using Wox.Infrastructure.Hotkey;
using Wox.Plugin;
using Wox.Storage;
using Application = System.Windows.Application;
using ContextMenu = System.Windows.Forms.ContextMenu;
using DataFormats = System.Windows.DataFormats;
using DragEventArgs = System.Windows.DragEventArgs;
using IDataObject = System.Windows.IDataObject;
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using MenuItem = System.Windows.Forms.MenuItem;
using MessageBox = System.Windows.MessageBox;
using Stopwatch = Wox.Infrastructure.Stopwatch;
using ToolTip = System.Windows.Controls.ToolTip;
using Wox.ViewModel;
using Wox.Plugin;
namespace Wox
{
@@ -59,7 +40,6 @@ namespace Wox
//pnlResult.ItemDropEvent += pnlResult_ItemDropEvent;
Closing += MainWindow_Closing;
}
//void pnlResult_ItemDropEvent(Result result, IDataObject dropDataObject, DragEventArgs args)
@@ -173,20 +153,6 @@ namespace Wox
if (e.ChangedButton == MouseButton.Left) DragMove();
}
private void ShowWox(bool selectAll = true)
{
//UserSettingStorage.Instance.IncreaseActivateTimes();
//Left = GetWindowsLeft();
//Top = GetWindowsTop();
//Show();
//Activate();
//Focus();
//tbQuery.Focus();
//ResetQueryHistoryIndex();
//if (selectAll) tbQuery.SelectAll();
}
private void MainWindow_OnDeactivated(object sender, EventArgs e)
{
if (UserSettingStorage.Instance.HideWhenDeactive)
@@ -196,114 +162,49 @@ namespace Wox
}
}
//private void TbQuery_OnPreviewKeyDown(object sender, KeyEventArgs e)
//{
// //when alt is pressed, the real key should be e.SystemKey
// Key key = (e.Key == Key.System ? e.SystemKey : e.Key);
// switch (key)
// {
// case Key.Escape:
// if (IsInContextMenuMode)
// {
// BackToResultMode();
// }
// else
// {
// HideWox();
// }
// e.Handled = true;
// break;
private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
{
//The code here is to supress the conflict of Window.InputBinding and ListBox native Down/Up Key handle
var vm = this.DataContext as MainViewModel;
//when alt is pressed, the real key should be e.SystemKey
Key key = (e.Key == Key.System ? e.SystemKey : e.Key);
switch (key)
{
case Key.Down:
if (GlobalHotkey.Instance.CheckModifiers().CtrlPressed)
{
vm.DisplayNextQueryCommand.Execute(null);
}
else
{
vm.SelectNextItemCommand.Execute(null);
}
e.Handled = true;
break;
// case Key.Tab:
// if (GlobalHotkey.Instance.CheckModifiers().ShiftPressed)
// {
// SelectPrevItem();
// }
// else
// {
// SelectNextItem();
// }
// e.Handled = true;
// break;
// case Key.N:
// case Key.J:
// if (GlobalHotkey.Instance.CheckModifiers().CtrlPressed)
// {
// SelectNextItem();
// }
// break;
// case Key.P:
// case Key.K:
// if (GlobalHotkey.Instance.CheckModifiers().CtrlPressed)
// {
// SelectPrevItem();
// }
// break;
// case Key.O:
// if (GlobalHotkey.Instance.CheckModifiers().CtrlPressed)
// {
// if (IsInContextMenuMode)
// {
// BackToResultMode();
// }
// else
// {
// ShowContextMenu(GetActiveResult());
// }
// }
// break;
// case Key.Down:
// if (GlobalHotkey.Instance.CheckModifiers().CtrlPressed)
// {
// DisplayNextQuery();
// }
// else
// {
// SelectNextItem();
// }
// e.Handled = true;
// break;
// case Key.Up:
// if (GlobalHotkey.Instance.CheckModifiers().CtrlPressed)
// {
// DisplayPrevQuery();
// }
// else
// {
// SelectPrevItem();
// }
// e.Handled = true;
// break;
// case Key.D:
// if (GlobalHotkey.Instance.CheckModifiers().CtrlPressed)
// {
// pnlResult.SelectNextPage();
// }
// break;
// case Key.PageDown:
// pnlResult.SelectNextPage();
// e.Handled = true;
// break;
// case Key.U:
// if (GlobalHotkey.Instance.CheckModifiers().CtrlPressed)
// {
// pnlResult.SelectPrevPage();
// }
// break;
// case Key.PageUp:
// pnlResult.SelectPrevPage();
// e.Handled = true;
// break;
case Key.Up:
if (GlobalHotkey.Instance.CheckModifiers().CtrlPressed)
{
vm.DisplayPrevQueryCommand.Execute(null);
}
else
{
vm.SelectPrevItemCommand.Execute(null);
}
e.Handled = true;
break;
case Key.PageDown:
vm.SelectNextPageCommand.Execute(null);
e.Handled = true;
break;
case Key.PageUp:
vm.SelectPrevPageCommand.Execute(null);
e.Handled = true;
break;
}
}
//TODO: Colin - Figure out how to raise BackKeyDownEvent?
// case Key.Back:
// if (BackKeyDownEvent != null)
// {
@@ -315,144 +216,6 @@ namespace Wox
// }
// break;
// case Key.F1:
// Process.Start("http://doc.getwox.com");
// break;
// case Key.Enter:
// Result activeResult = GetActiveResult();
// if (GlobalHotkey.Instance.CheckModifiers().ShiftPressed)
// {
// ShowContextMenu(activeResult);
// }
// else
// {
// SelectResult(activeResult);
// }
// e.Handled = true;
// break;
// case Key.D1:
// SelectItem(1);
// break;
// case Key.D2:
// SelectItem(2);
// break;
// case Key.D3:
// SelectItem(3);
// break;
// case Key.D4:
// SelectItem(4);
// break;
// case Key.D5:
// SelectItem(5);
// break;
// case Key.D6:
// SelectItem(6);
// break;
// }
//}
//private void DisplayPrevQuery()
//{
// var prev = QueryHistoryStorage.Instance.Previous();
// DisplayQueryHistory(prev);
//}
//private void DisplayNextQuery()
//{
// var nextQuery = QueryHistoryStorage.Instance.Next();
// DisplayQueryHistory(nextQuery);
//}
//private void DisplayQueryHistory(HistoryItem history)
//{
// if (history != null)
// {
// var historyMetadata = QueryHistoryStorage.MetaData;
// ChangeQueryText(history.Query, true);
// var executeQueryHistoryTitle = GetTranslation("executeQuery");
// var lastExecuteTime = GetTranslation("lastExecuteTime");
// pnlResult.RemoveResultsExcept(historyMetadata);
// UpdateResultViewInternal(new List<Result>
// {
// new Result
// {
// Title = string.Format(executeQueryHistoryTitle,history.Query),
// SubTitle = string.Format(lastExecuteTime,history.ExecutedDateTime),
// IcoPath = "Images\\history.png",
// PluginDirectory = WoxDirectroy.Executable,
// Action = _ =>{
// ChangeQuery(history.Query,true);
// return false;
// }
// }
// }, historyMetadata);
// }
//}
//private void SelectItem(int index)
//{
// int zeroBasedIndex = index - 1;
// SpecialKeyState keyState = GlobalHotkey.Instance.CheckModifiers();
// if (keyState.AltPressed || keyState.CtrlPressed)
// {
// List<Result> visibleResults = pnlResult.GetVisibleResults();
// if (zeroBasedIndex < visibleResults.Count)
// {
// SelectResult(visibleResults[zeroBasedIndex]);
// }
// }
//}
//private bool IsInContextMenuMode
//{
// get { return pnlContextMenu.Visibility == Visibility.Visible; }
//}
//private Result GetActiveResult()
//{
// if (IsInContextMenuMode)
// {
// return pnlContextMenu.GetActiveResult();
// }
// else
// {
// return pnlResult.GetActiveResult();
// }
//}
//private void SelectPrevItem()
//{
// if (IsInContextMenuMode)
// {
// pnlContextMenu.SelectPrev();
// }
// else
// {
// pnlResult.SelectPrev();
// }
// toolTip.IsOpen = false;
//}
//private void SelectNextItem()
//{
// if (IsInContextMenuMode)
// {
// pnlContextMenu.SelectNext();
// }
// else
// {
// pnlResult.SelectNext();
// }
// toolTip.IsOpen = false;
//}
private void MainWindow_OnDrop(object sender, DragEventArgs e)
{
if (e.Data.GetDataPresent(DataFormats.FileDrop))
@@ -468,6 +231,7 @@ namespace Wox
MessageBox.Show(InternationalizationManager.Instance.GetTranslation("invalidWoxPluginFileFormat"));
}
}
e.Handled = false;
}
private void TbQuery_OnPreviewDragOver(object sender, DragEventArgs e)