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

#129 Make web search suggestion optional and add baidu suggeestion source.

Browse Source
This commit is contained in:
qianlifeng
2014-07-21 22:27:57 +08:00
parent 4e87211d39
commit 83e199a0de
10 changed files with 203 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Wox/MainWindow.xaml.cs
View File

@@ -55,7 +55,6 @@ namespace Wox
private string lastQuery;
private ToolTip toolTip = new ToolTip();
private bool isCMDMode = false;
private bool ignoreTextChange = false;
#endregion
@@ -98,7 +97,7 @@ namespace Wox
{
Dispatcher.Invoke(new Action(() =>
{
var m = new Msg {Owner = GetWindow(this)};
var m = new Msg { Owner = GetWindow(this) };
m.Show(title, subTitle, iconPath);
}));
}
@@ -324,8 +323,37 @@ namespace Wox
}
}, TimeSpan.FromSeconds(0), lastQuery);
}
}, TimeSpan.FromMilliseconds((isCMDMode = tbQuery.Text.StartsWith(">")) ? 0 : 150));
}, TimeSpan.FromMilliseconds(ShouldNotDelayQuery ? 0 : 150));
}
private bool ShouldNotDelayQuery
{
get
{
return (bool)Dispatcher.Invoke(new Func<bool>(() =>
{
return IsCMDMode || IsWebSearchMode;
}));
}
}
private bool IsCMDMode
{
get
{
return tbQuery.Text.StartsWith(">");
}
}
private bool IsWebSearchMode
{
get
{
Query q = new Query(tbQuery.Text);
return !UserSettingStorage.Instance.EnableWebSearchSuggestion &&
UserSettingStorage.Instance.WebSearches.Exists(o => o.ActionWord == q.ActionName && o.Enabled);
}
}
private void Border_OnMouseDown(object sender, MouseButtonEventArgs e)
{
@@ -446,11 +474,11 @@ namespace Wox
private void updateCmdMode()
{
var selected = resultCtrl.AcceptSelect();
if (selected != null)
var currentSelectedItem = resultCtrl.GetActiveResult();
if (currentSelectedItem != null)
{
ignoreTextChange = true;
tbQuery.Text = ">" + selected.Title;
tbQuery.Text = ">" + currentSelectedItem.Title;
tbQuery.CaretIndex = tbQuery.Text.Length;
}
}
@@ -468,41 +496,41 @@ namespace Wox
case Key.Down:
resultCtrl.SelectNext();
if (isCMDMode) updateCmdMode();
if (IsCMDMode) updateCmdMode();
toolTip.IsOpen = false;
e.Handled = true;
break;
case Key.Up:
resultCtrl.SelectPrev();
if (isCMDMode) updateCmdMode();
if (IsCMDMode) updateCmdMode();
toolTip.IsOpen = false;
e.Handled = true;
break;
case Key.PageDown:
resultCtrl.SelectNextPage();
if (isCMDMode) updateCmdMode();
if (IsCMDMode) updateCmdMode();
toolTip.IsOpen = false;
e.Handled = true;
break;
case Key.PageUp:
resultCtrl.SelectPrevPage();
if (isCMDMode) updateCmdMode();
if (IsCMDMode) updateCmdMode();
toolTip.IsOpen = false;
e.Handled = true;
break;
case Key.Enter:
AcceptSelect(resultCtrl.AcceptSelect());
AcceptSelect(resultCtrl.GetActiveResult());
e.Handled = true;
break;
case Key.Back:
if (BackKeyDownEvent != null)
{
BackKeyDownEvent(tbQuery,new WoxKeyDownEventArgs()
BackKeyDownEvent(tbQuery, new WoxKeyDownEventArgs()
{
Query = tbQuery.Text,
keyEventArgs = e
@@ -511,7 +539,7 @@ namespace Wox
break;
case Key.Tab:
AcceptSelect(resultCtrl.AcceptSelect());
AcceptSelect(resultCtrl.GetActiveResult());
e.Handled = true;
break;
}
@@ -559,7 +587,7 @@ namespace Wox
List<Result> l = waitShowResultList.Where(o => o.OriginQuery != null && o.OriginQuery.RawQuery == lastQuery).ToList();
waitShowResultList.Clear();
resultCtrl.AddResults(l);
})), TimeSpan.FromMilliseconds(isCMDMode ? 0 : 50));
})), TimeSpan.FromMilliseconds(ShouldNotDelayQuery ? 0 : 50));
}
}

2
Wox/ResultPanel.xaml.cs
View File

@@ -126,7 +126,7 @@ namespace Wox
}
}
public Result AcceptSelect()
public Result GetActiveResult()
{
int index = lbResults.SelectedIndex;
if (index < 0) return null;