Revert changes and use api function instead

Jack251970 · Jack251970 · commit 6b032b33520a · 2025-02-18T11:32:47.000+08:00
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -7,23 +7,20 @@
 using System.Windows.Input;
 using System.Windows.Controls;
 using Flow.Launcher.Core;
-using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
 {
     public partial class CustomQueryHotkeySetting : Window
     {
         private SettingWindow _settingWidow;
         private readonly Settings _settings;
-        private readonly MainViewModel _mainViewModel;
         private bool update;
         private CustomPluginHotkey updateCustomHotkey;
 
-        public CustomQueryHotkeySetting(SettingWindow settingWidow, Settings settings, MainViewModel mainVM)
+        public CustomQueryHotkeySetting(SettingWindow settingWidow, Settings settings)
         {
             _settingWidow = settingWidow;
             _settings = settings;
-            _mainViewModel = mainVM;
             InitializeComponent();
         }
 
@@ -80,7 +77,7 @@ public void UpdateItem(CustomPluginHotkey item)
         private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)
         {
             App.API.ChangeQuery(tbAction.Text);
-            _mainViewModel.Show();
+            App.API.ShowMainWindow();
             Application.Current.MainWindow.Focus();
         }
 
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -4,24 +4,21 @@
 using System.Windows.Input;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.Core;
-using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
         private readonly SettingsPaneHotkeyViewModel _hotkeyVm;
-        private readonly MainViewModel _mainViewModel;
         public string Key { get; set; } = String.Empty;
         public string Value { get; set; } = String.Empty;
         private string originalKey { get; } = null;
         private string originalValue { get; } = null;
         private bool update { get; } = false;
 
-        public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm, MainViewModel mainVM)
+        public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm)
         {
             _hotkeyVm = vm;
-            _mainViewModel = mainVM;
             InitializeComponent();
         }
 
@@ -68,7 +65,7 @@ private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
         private void BtnTestShortcut_OnClick(object sender, RoutedEventArgs e)
         {
             App.API.ChangeQuery(tbExpand.Text);
-            _mainViewModel.Show();
+            App.API.ShowMainWindow();
             Application.Current.MainWindow.Focus();
         }
     }
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
@@ -105,7 +105,7 @@ public void OpenSettingDialog()
         {
             Application.Current.Dispatcher.Invoke(() =>
             {
-                SettingWindow sw = SingletonWindowOpener.Open<SettingWindow>(this, _settingsVM, _mainVM);
+                SettingWindow sw = SingletonWindowOpener.Open<SettingWindow>(this, _settingsVM);
             });
         }
 
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneHotkeyViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneHotkeyViewModel.cs
@@ -8,14 +8,12 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Core;
-using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.SettingPages.ViewModels;
 
 public partial class SettingsPaneHotkeyViewModel : BaseModel
 {
     public Settings Settings { get; }
-    private MainViewModel MainVM { get; }
 
     public CustomPluginHotkey SelectedCustomPluginHotkey { get; set; }
     public CustomShortcutModel SelectedCustomShortcut { get; set; }
@@ -27,10 +25,9 @@ public partial class SettingsPaneHotkeyViewModel : BaseModel
         $"{KeyConstant.Ctrl}+{KeyConstant.Alt}"
     };
 
-    public SettingsPaneHotkeyViewModel(Settings settings, MainViewModel mainVM)
+    public SettingsPaneHotkeyViewModel(Settings settings)
     {
         Settings = settings;
-        MainVM = mainVM;
     }
 
     [RelayCommand]
@@ -74,15 +71,15 @@ private void CustomHotkeyEdit()
             return;
         }
 
-        var window = new CustomQueryHotkeySetting(null, Settings, MainVM);
+        var window = new CustomQueryHotkeySetting(null, Settings);
         window.UpdateItem(item);
         window.ShowDialog();
     }
 
     [RelayCommand]
     private void CustomHotkeyAdd()
     {
-        new CustomQueryHotkeySetting(null, Settings, MainVM).ShowDialog();
+        new CustomQueryHotkeySetting(null, Settings).ShowDialog();
     }
 
     [RelayCommand]
@@ -129,7 +126,7 @@ private void CustomShortcutEdit()
     [RelayCommand]
     private void CustomShortcutAdd()
     {
-        var window = new CustomShortcutSetting(this, MainVM);
+        var window = new CustomShortcutSetting(this);
         if (window.ShowDialog() is true)
         {
             var shortcut = new CustomShortcutModel(window.Key, window.Value);
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -12,9 +12,9 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings, MainViewModel: { } mainVM })
+            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings })
                 throw new ArgumentException("Settings are required for SettingsPaneHotkey.");
-            _viewModel = new SettingsPaneHotkeyViewModel(settings, mainVM);
+            _viewModel = new SettingsPaneHotkeyViewModel(settings);
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
@@ -20,14 +20,12 @@ public partial class SettingWindow
     private readonly IPublicAPI _api;
     private readonly Settings _settings;
     private readonly SettingWindowViewModel _viewModel;
-    private readonly MainViewModel _mainVM;
 
-    public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel, MainViewModel mainVM)
+    public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel)
     {
         _settings = viewModel.Settings;
         DataContext = viewModel;
         _viewModel = viewModel;
-        _mainVM = mainVM;
         _api = api;
         InitializePosition();
         InitializeComponent();
@@ -162,7 +160,7 @@ private double WindowTop()
 
     private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
     {
-        var paneData = new PaneData(_settings, _viewModel.Updater, _viewModel.Portable, _mainVM);
+        var paneData = new PaneData(_settings, _viewModel.Updater, _viewModel.Portable);
         if (args.IsSettingsSelected)
         {
             ContentFrame.Navigate(typeof(SettingsPaneGeneral), paneData);
@@ -208,5 +206,5 @@ private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
         NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */
     }
 
-    public record PaneData(Settings Settings, Updater Updater, IPortable Portable, MainViewModel MainViewModel);
+    public record PaneData(Settings Settings, Updater Updater, IPortable Portable);
 }

Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,20 @@`
`7`	`7`	`using System.Windows.Input;`
`8`	`8`	`using System.Windows.Controls;`
`9`	`9`	`using Flow.Launcher.Core;`
`10`		`-using Flow.Launcher.ViewModel;`
`11`	`10`
`12`	`11`	`namespace Flow.Launcher`
`13`	`12`	`{`
`14`	`13`	`public partial class CustomQueryHotkeySetting : Window`
`15`	`14`	`{`
`16`	`15`	`private SettingWindow _settingWidow;`
`17`	`16`	`private readonly Settings _settings;`
`18`		`- private readonly MainViewModel _mainViewModel;`
`19`	`17`	`private bool update;`
`20`	`18`	`private CustomPluginHotkey updateCustomHotkey;`
`21`	`19`
`22`		`- public CustomQueryHotkeySetting(SettingWindow settingWidow, Settings settings, MainViewModel mainVM)`
	`20`	`+ public CustomQueryHotkeySetting(SettingWindow settingWidow, Settings settings)`
`23`	`21`	`{`
`24`	`22`	`_settingWidow = settingWidow;`
`25`	`23`	`_settings = settings;`
`26`		`- _mainViewModel = mainVM;`
`27`	`24`	`InitializeComponent();`
`28`	`25`	`}`
`29`	`26`
`@@ -80,7 +77,7 @@ public void UpdateItem(CustomPluginHotkey item)`
`80`	`77`	`private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)`
`81`	`78`	`{`
`82`	`79`	`App.API.ChangeQuery(tbAction.Text);`
`83`		`- _mainViewModel.Show();`
	`80`	`+ App.API.ShowMainWindow();`
`84`	`81`	`Application.Current.MainWindow.Focus();`
`85`	`82`	`}`
`86`	`83`
Original file line number	Diff line number	Diff line change
`@@ -4,24 +4,21 @@`
`4`	`4`	`using System.Windows.Input;`
`5`	`5`	`using Flow.Launcher.SettingPages.ViewModels;`
`6`	`6`	`using Flow.Launcher.Core;`
`7`		`-using Flow.Launcher.ViewModel;`
`8`	`7`
`9`	`8`	`namespace Flow.Launcher`
`10`	`9`	`{`
`11`	`10`	`public partial class CustomShortcutSetting : Window`
`12`	`11`	`{`
`13`	`12`	`private readonly SettingsPaneHotkeyViewModel _hotkeyVm;`
`14`		`- private readonly MainViewModel _mainViewModel;`
`15`	`13`	`public string Key { get; set; } = String.Empty;`
`16`	`14`	`public string Value { get; set; } = String.Empty;`
`17`	`15`	`private string originalKey { get; } = null;`
`18`	`16`	`private string originalValue { get; } = null;`
`19`	`17`	`private bool update { get; } = false;`
`20`	`18`
`21`		`- public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm, MainViewModel mainVM)`
	`19`	`+ public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm)`
`22`	`20`	`{`
`23`	`21`	`_hotkeyVm = vm;`
`24`		`- _mainViewModel = mainVM;`
`25`	`22`	`InitializeComponent();`
`26`	`23`	`}`
`27`	`24`
`@@ -68,7 +65,7 @@ private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)`
`68`	`65`	`private void BtnTestShortcut_OnClick(object sender, RoutedEventArgs e)`
`69`	`66`	`{`
`70`	`67`	`App.API.ChangeQuery(tbExpand.Text);`
`71`		`- _mainViewModel.Show();`
	`68`	`+ App.API.ShowMainWindow();`
`72`	`69`	`Application.Current.MainWindow.Focus();`
`73`	`70`	`}`
`74`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public void OpenSettingDialog()`
`105`	`105`	`{`
`106`	`106`	`Application.Current.Dispatcher.Invoke(() =>`
`107`	`107`	`{`
`108`		`- SettingWindow sw = SingletonWindowOpener.Open<SettingWindow>(this, _settingsVM, _mainVM);`
	`108`	`+ SettingWindow sw = SingletonWindowOpener.Open<SettingWindow>(this, _settingsVM);`
`109`	`109`	`});`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,12 @@`
`8`	`8`	`using Flow.Launcher.Infrastructure.UserSettings;`
`9`	`9`	`using Flow.Launcher.Plugin;`
`10`	`10`	`using Flow.Launcher.Core;`
`11`		`-using Flow.Launcher.ViewModel;`
`12`	`11`
`13`	`12`	`namespace Flow.Launcher.SettingPages.ViewModels;`
`14`	`13`
`15`	`14`	`public partial class SettingsPaneHotkeyViewModel : BaseModel`
`16`	`15`	`{`
`17`	`16`	`public Settings Settings { get; }`
`18`		`- private MainViewModel MainVM { get; }`
`19`	`17`
`20`	`18`	`public CustomPluginHotkey SelectedCustomPluginHotkey { get; set; }`
`21`	`19`	`public CustomShortcutModel SelectedCustomShortcut { get; set; }`
`@@ -27,10 +25,9 @@ public partial class SettingsPaneHotkeyViewModel : BaseModel`
`27`	`25`	`$"{KeyConstant.Ctrl}+{KeyConstant.Alt}"`
`28`	`26`	`};`
`29`	`27`
`30`		`- public SettingsPaneHotkeyViewModel(Settings settings, MainViewModel mainVM)`
	`28`	`+ public SettingsPaneHotkeyViewModel(Settings settings)`
`31`	`29`	`{`
`32`	`30`	`Settings = settings;`
`33`		`- MainVM = mainVM;`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`[RelayCommand]`
`@@ -74,15 +71,15 @@ private void CustomHotkeyEdit()`
`74`	`71`	`return;`
`75`	`72`	`}`
`76`	`73`
`77`		`- var window = new CustomQueryHotkeySetting(null, Settings, MainVM);`
	`74`	`+ var window = new CustomQueryHotkeySetting(null, Settings);`
`78`	`75`	`window.UpdateItem(item);`
`79`	`76`	`window.ShowDialog();`
`80`	`77`	`}`
`81`	`78`
`82`	`79`	`[RelayCommand]`
`83`	`80`	`private void CustomHotkeyAdd()`
`84`	`81`	`{`
`85`		`- new CustomQueryHotkeySetting(null, Settings, MainVM).ShowDialog();`
	`82`	`+ new CustomQueryHotkeySetting(null, Settings).ShowDialog();`
`86`	`83`	`}`
`87`	`84`
`88`	`85`	`[RelayCommand]`
`@@ -129,7 +126,7 @@ private void CustomShortcutEdit()`
`129`	`126`	`[RelayCommand]`
`130`	`127`	`private void CustomShortcutAdd()`
`131`	`128`	`{`
`132`		`- var window = new CustomShortcutSetting(this, MainVM);`
	`129`	`+ var window = new CustomShortcutSetting(this);`
`133`	`130`	`if (window.ShowDialog() is true)`
`134`	`131`	`{`
`135`	`132`	`var shortcut = new CustomShortcutModel(window.Key, window.Value);`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ protected override void OnNavigatedTo(NavigationEventArgs e)`
`12`	`12`	`{`
`13`	`13`	`if (!IsInitialized)`
`14`	`14`	`{`
`15`		`- if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings, MainViewModel: { } mainVM })`
	`15`	`+ if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings })`
`16`	`16`	`throw new ArgumentException("Settings are required for SettingsPaneHotkey.");`
`17`		`- _viewModel = new SettingsPaneHotkeyViewModel(settings, mainVM);`
	`17`	`+ _viewModel = new SettingsPaneHotkeyViewModel(settings);`
`18`	`18`	`DataContext = _viewModel;`
`19`	`19`	`InitializeComponent();`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,12 @@ public partial class SettingWindow`
`20`	`20`	`private readonly IPublicAPI _api;`
`21`	`21`	`private readonly Settings _settings;`
`22`	`22`	`private readonly SettingWindowViewModel _viewModel;`
`23`		`- private readonly MainViewModel _mainVM;`
`24`	`23`
`25`		`- public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel, MainViewModel mainVM)`
	`24`	`+ public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel)`
`26`	`25`	`{`
`27`	`26`	`_settings = viewModel.Settings;`
`28`	`27`	`DataContext = viewModel;`
`29`	`28`	`_viewModel = viewModel;`
`30`		`- _mainVM = mainVM;`
`31`	`29`	`_api = api;`
`32`	`30`	`InitializePosition();`
`33`	`31`	`InitializeComponent();`
`@@ -162,7 +160,7 @@ private double WindowTop()`
`162`	`160`
`163`	`161`	`private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)`
`164`	`162`	`{`
`165`		`- var paneData = new PaneData(_settings, _viewModel.Updater, _viewModel.Portable, _mainVM);`
	`163`	`+ var paneData = new PaneData(_settings, _viewModel.Updater, _viewModel.Portable);`
`166`	`164`	`if (args.IsSettingsSelected)`
`167`	`165`	`{`
`168`	`166`	`ContentFrame.Navigate(typeof(SettingsPaneGeneral), paneData);`
`@@ -208,5 +206,5 @@ private void ContentFrame_Loaded(object sender, RoutedEventArgs e)`
`208`	`206`	`NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */`
`209`	`207`	`}`
`210`	`208`
`211`		`- public record PaneData(Settings Settings, Updater Updater, IPortable Portable, MainViewModel MainViewModel);`
	`209`	`+ public record PaneData(Settings Settings, Updater Updater, IPortable Portable);`
`212`	`210`	`}`