diff --git a/Wox.Plugin/IPublicAPI.cs b/Wox.Plugin/IPublicAPI.cs index 1cb9df7035..0608703e76 100644 --- a/Wox.Plugin/IPublicAPI.cs +++ b/Wox.Plugin/IPublicAPI.cs @@ -64,7 +64,7 @@ namespace Wox.Plugin /// /// Open setting dialog /// - void OpenSettingDialog(int tab = 0); + void OpenSettingDialog(); /// /// Show loading animation diff --git a/Wox/MainWindow.xaml.cs b/Wox/MainWindow.xaml.cs index e65f050a5c..bd6e687744 100644 --- a/Wox/MainWindow.xaml.cs +++ b/Wox/MainWindow.xaml.cs @@ -102,11 +102,9 @@ namespace Wox 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((int) SettingWindowViewModel.Tab.About); var exit = new MenuItem(InternationalizationManager.Instance.GetTranslation("iconTrayExit")); exit.Click += (o, e) => Close(); - MenuItem[] childen = { open, setting, about, exit }; + MenuItem[] childen = { open, setting, exit }; _notifyIcon.ContextMenu = new ContextMenu(childen); } diff --git a/Wox/PublicAPIInstance.cs b/Wox/PublicAPIInstance.cs index 253e43f0c5..61fed11e0c 100644 --- a/Wox/PublicAPIInstance.cs +++ b/Wox/PublicAPIInstance.cs @@ -97,11 +97,10 @@ namespace Wox }); } - public void OpenSettingDialog(int tab = 0) + public void OpenSettingDialog() { Application.Current.Dispatcher.Invoke(() => { - _settingsViewModel.SelectedTab = (Tab)tab; SettingWindow sw = SingletonWindowOpener.Open(this, _settingsViewModel); }); } diff --git a/Wox/SettingWindow.xaml b/Wox/SettingWindow.xaml index 86a11d9716..05bb39f69d 100644 --- a/Wox/SettingWindow.xaml +++ b/Wox/SettingWindow.xaml @@ -12,7 +12,7 @@ WindowStartupLocation="CenterScreen" Height="600" Width="800" PreviewKeyDown="Window_PreviewKeyDown" d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"> - + diff --git a/Wox/ViewModel/SettingWindowViewModel.cs b/Wox/ViewModel/SettingWindowViewModel.cs index e928b2938a..b5eae219b5 100644 --- a/Wox/ViewModel/SettingWindowViewModel.cs +++ b/Wox/ViewModel/SettingWindowViewModel.cs @@ -26,7 +26,6 @@ namespace Wox.ViewModel private readonly JsonStrorage _storage; private readonly Dictionary _featureControls = new Dictionary(); - public Tab SelectedTab { get; set; } = Tab.General; #region general public List Languages => InternationalizationManager.Instance.LoadAvailableLanguages(); public IEnumerable MaxResultsRange => Enumerable.Range(2, 16); @@ -296,15 +295,5 @@ namespace Wox.ViewModel { _storage.Save(); } - - public enum Tab - { - General = 0, - Plugin = 1, - Theme = 2, - Hotkey = 3, - Proxy = 4, - About = 5 - } } }