Fix notify icon + move hotkey into MainViewModel

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

View File

@@ -38,14 +38,12 @@ namespace Wox
ImageLoader.PreloadImages();
MainViewModel mainVM = new MainViewModel();
var pluginsSettings = mainVM._settings.PluginSettings;
API = new PublicAPIInstance(mainVM, mainVM._settings);
var vm = new MainViewModel();
var pluginsSettings = vm._settings.PluginSettings;
var window = new MainWindow(vm._settings, vm);
API = new PublicAPIInstance(vm._settings, vm);
PluginManager.InitializePlugins(API, pluginsSettings);
var _notifyIconManager = new NotifyIconManager(API);
var window = new MainWindow(mainVM._settings, mainVM);
RegisterExitEvents();
Current.MainWindow = window;