Skip to content

Commit 24372eb

Browse files
committed
installation and uninstallation restart after done
1 parent 2e9d364 commit 24372eb

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@
66
<system:String x:Key="plugin_pluginsmanager_downloading_plugin">Downloading plugin</system:String>
77
<system:String x:Key="plugin_pluginsmanager_please_wait">Please wait...</system:String>
88
<system:String x:Key="plugin_pluginsmanager_download_success">Successfully downloaded</system:String>
9-
<system:String x:Key="plugin_pluginsmanager_uninstall_prompt">Do you want to uninstall the following plugin?{0}{1}{2} by {3}</system:String>
10-
<system:String x:Key="plugin_pluginsmanager_install_prompt">Do you want to install the following plugin?{0}{1}{2} by {3}</system:String>
9+
<system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} by {1} {2}{3}Would you like to uninstall this plugin? After the uninstallation Flow will automatically restart.</system:String>
10+
<system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3}Would you like to install this plugin? After the installation Flow will automatically restart.</system:String>
1111
<system:String x:Key="plugin_pluginsmanager_install_title">Plugin Install</system:String>
1212
<system:String x:Key="plugin_pluginsmanager_uninstall_title">Plugin Uninstall</system:String>
1313
<system:String x:Key="plugin_pluginsmanager_install_errormetadatafile">Install failed: unable to find the plugin.json metadata file from the new plugin</system:String>
14-
<system:String x:Key="plugin_pluginsmanager_install_successandrestart">You have installed plugin {0} successfully.{1}Would you like to restart Flow Launcher to take effect?</system:String>
15-
<system:String x:Key="plugin_pluginsmanager_uninstall_successandrestart">You have uninstalled plugin {0} successfully.{1}Would you like to restart Flow Launcher to take effect?</system:String>
1614
<!--Controls-->
1715

1816
<!--Plugin Infos-->

Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ internal void InstallOrUpdate(UserPlugin plugin)
3636
}
3737

3838
var message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_prompt"),
39-
Environment.NewLine, Environment.NewLine,
40-
plugin.Name, plugin.Author);
39+
plugin.Name, plugin.Author,
40+
Environment.NewLine, Environment.NewLine);
4141

4242
if (MessageBox.Show(message, Context.API.GetTranslation("plugin_pluginsmanager_install_title"), MessageBoxButton.YesNo) == MessageBoxResult.No)
4343
return;
@@ -156,12 +156,8 @@ private void Install(UserPlugin plugin, string downloadedFilePath)
156156
string newPluginPath = Path.Combine(DataLocation.PluginsDirectory, $"{plugin.Name}{plugin.ID}");
157157

158158
Directory.Move(pluginFolderPath, newPluginPath);
159-
160-
if (MessageBox.Show(string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_successandrestart"),
161-
plugin.Name, Environment.NewLine),
162-
Context.API.GetTranslation("plugin_pluginsmanager_install_title"),
163-
MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
164-
Context.API.RestartApp();
159+
160+
Context.API.RestartApp();
165161
}
166162

167163
internal List<Result> RequestUninstall(string search)
@@ -216,19 +212,15 @@ internal List<Result> RequestUninstall(string search)
216212
private void Uninstall(PluginMetadata plugin)
217213
{
218214
string message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_uninstall_prompt"),
219-
Environment.NewLine, Environment.NewLine,
220-
plugin.Name, plugin.Author);
215+
plugin.Name, plugin.Author,
216+
Environment.NewLine, Environment.NewLine);
221217

222218
if (MessageBox.Show(message, Context.API.GetTranslation("plugin_pluginsmanager_uninstall_title"),
223219
MessageBoxButton.YesNo) == MessageBoxResult.Yes)
224220
{
225221
using var _ = File.CreateText(Path.Combine(plugin.PluginDirectory, "NeedDelete.txt"));
226-
227-
if (MessageBox.Show(string.Format(Context.API.GetTranslation("plugin_pluginsmanager_uninstall_successandrestart"),
228-
plugin.Name, Environment.NewLine),
229-
Context.API.GetTranslation("plugin_pluginsmanager_uninstall_title"),
230-
MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
231-
Context.API.RestartApp();
222+
223+
Context.API.RestartApp();
232224
}
233225
}
234226
}

0 commit comments

Comments
 (0)