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

Fix notify icon + move hotkey into MainViewModel

Browse Source
This commit is contained in:
bao-qian
2016-05-09 23:35:20 +01:00
parent f376e1ab01
commit 3f709cc39e
6 changed files with 144 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Wox/MainWindow.xaml.cs
View File

@@ -10,11 +10,12 @@ using Wox.Core.Resource;
using Wox.Core.UserSettings;
using Wox.Helper;
using Wox.Infrastructure.Hotkey;
using Wox.Infrastructure.Logger;
using Wox.ViewModel;
using ContextMenu = System.Windows.Forms.ContextMenu;
using DataFormats = System.Windows.DataFormats;
using DragEventArgs = System.Windows.DragEventArgs;
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using MenuItem = System.Windows.Forms.MenuItem;
using MessageBox = System.Windows.MessageBox;
namespace Wox
@@ -26,6 +27,7 @@ namespace Wox
private readonly Storyboard _progressBarStoryboard = new Storyboard();
private Settings _settings;
private NotifyIcon _notifyIcon;
#endregion
@@ -41,21 +43,33 @@ namespace Wox
}
private void OnClosing(object sender, CancelEventArgs e)
{
_notifyIcon.Visible = false;
_settings.WindowLeft = Left;
_settings.WindowTop = Top;
var vm = (MainViewModel) DataContext;
var vm = (MainViewModel)DataContext;
vm.Save();
}
private void OnLoaded(object sender, RoutedEventArgs _)
{
InitProgressbarAnimation();
WindowIntelopHelper.DisableControlBox(this);
ThemeManager.Instance.ChangeTheme(_settings.Theme);
InitializeNotifyIcon();
var vm = (MainViewModel)DataContext;
RegisterEvents(vm);
// happlebao todo delete
vm.Left = GetWindowsLeft();
vm.Top = GetWindowsTop();
vm.MainWindowVisibility = Visibility.Visible;
}
private void RegisterEvents(MainViewModel vm)
{
vm.TextBoxSelected += (o, e) => QueryTextBox.SelectAll();
vm.CursorMovedToEnd += (o, e) =>
{
@@ -78,11 +92,22 @@ namespace Wox
_settings.WindowTop = Top;
}
};
}
// happlebao todo delete
vm.Left = GetWindowsLeft();
vm.Top = GetWindowsTop();
vm.MainWindowVisibility = Visibility.Visible;
private void InitializeNotifyIcon()
{
_notifyIcon = new NotifyIcon { Text = Infrastructure.Wox.Name, Icon = Properties.Resources.app, Visible = true };
_notifyIcon.Click += (o, e) => App.API.ShowApp();
var open = new MenuItem(InternationalizationManager.Instance.GetTranslation("iconTrayOpen"));
open.Click += (o, e) => App.API.ShowApp();
var setting = new MenuItem(InternationalizationManager.Instance.GetTranslation("iconTraySettings"));
setting.Click += (o, e) => App.API.OpenSettingDialog();
var about = new MenuItem(InternationalizationManager.Instance.GetTranslation("iconTrayAbout"));
about.Click += (o, e) => App.API.OpenSettingDialog("about");
var exit = new MenuItem(InternationalizationManager.Instance.GetTranslation("iconTrayExit"));
exit.Click += (o, e) => Close();
MenuItem[] childen = { open, setting, about, exit };
_notifyIcon.ContextMenu = new ContextMenu(childen);
}
private double GetWindowsLeft()
@@ -247,10 +272,6 @@ namespace Wox
e.Handled = true;
break;
case Key.Back:
vm.BackCommand.Execute(e);
break;
case Key.F1:
vm.StartHelpCommand.Execute(null);
break;