prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/dev'

Browse source
This commit is contained in:
Jeremy Wu 2020-04-30 18:56:55 +10:00
commit eeadcdfe57
5 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher.Core/Plugin/PluginInstaller.cs
View file

@ -86,7 +86,7 @@ namespace Flow.Launcher.Core.Plugin
"Restart Flow Launcher to take effect?", "Restart Flow Launcher to take effect?",
"Install plugin", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes) "Install plugin", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
{ {
PluginManager.API.RestarApp(); PluginManager.API.RestartApp();
} }
} }
} }

6
Flow.Launcher.Plugin/IPublicAPI.cs
View file

@ -43,6 +43,12 @@ namespace Flow.Launcher.Plugin
/// <summary> /// <summary>
/// Restart Flow Launcher /// Restart Flow Launcher
/// </summary> /// </summary>
void RestartApp();
/// <summary>
/// Restart Flow Launcher
/// </summary>
[Obsolete("Use RestartApp instead. This method will be removed in Flow Launcher 1.3")]
void RestarApp(); void RestarApp();
/// <summary> /// <summary>

7
Flow.Launcher/PublicAPIInstance.cs
View file

@ -54,7 +54,7 @@ namespace Flow.Launcher
Application.Current.MainWindow.Close(); Application.Current.MainWindow.Close();
} }
public void RestarApp() public void RestartApp()
{ {
_mainVM.MainWindowVisibility = Visibility.Hidden; _mainVM.MainWindowVisibility = Visibility.Hidden;
@ -66,6 +66,11 @@ namespace Flow.Launcher
UpdateManager.RestartApp(Constant.ApplicationFileName); UpdateManager.RestartApp(Constant.ApplicationFileName);
} }
public void RestarApp()
{
RestartApp();
}
public void CheckForNewUpdate() public void CheckForNewUpdate()
{ {
_settingsVM.UpdateApp(); _settingsVM.UpdateApp();

2
Plugins/Flow.Launcher.Plugin.PluginManagement/Main.cs
View file

@ -220,7 +220,7 @@ namespace Flow.Launcher.Plugin.PluginManagement
"Install plugin", MessageBoxButton.YesNo, MessageBoxImage.Question); "Install plugin", MessageBoxButton.YesNo, MessageBoxImage.Question);
if (result == MessageBoxResult.Yes) if (result == MessageBoxResult.Yes)
{ {
context.API.RestarApp(); context.API.RestartApp();
} }
} }
} }

2
Plugins/Flow.Launcher.Plugin.Sys/Main.cs
View file

@ -205,7 +205,7 @@ namespace Flow.Launcher.Plugin.Sys
IcoPath = "Images\\app.png", IcoPath = "Images\\app.png",
Action = c => Action = c =>
{ {
context.API.RestarApp(); context.API.RestartApp();
return false; return false;
} }
}, },