Merge remote-tracking branch 'origin/dev'

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

View file

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

View file

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

View file

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

View file

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

View file

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