From 6b2a78e1f2a6b2dcf983d1cd5fac40fa9bcfbd52 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 11 Oct 2022 21:37:43 +0900
Subject: [PATCH] - Add Uninstall / Update Btn - Adjust Strings

---
 Flow.Launcher/Languages/en.xaml               |  5 ++--
 Flow.Launcher/SettingWindow.xaml              | 30 ++++++++++++++-----
 Flow.Launcher/SettingWindow.xaml.cs           | 22 ++++++++++++++
 .../ViewModel/PluginStoreItemViewModel.cs     |  7 +++--
 4 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 149dcb817..2dd61329a 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -84,13 +84,14 @@
     <system:String x:Key="plugin_query_time">Query time:</system:String>
     <system:String x:Key="plugin_query_version">| Version</system:String>
     <system:String x:Key="plugin_query_web">Website</system:String>
-    <system:String x:Key="plugin_uninstall">Uninstall</system:String>
 
 
     <!--  Setting Plugin Store  -->
     <system:String x:Key="pluginStore">Plugin Store</system:String>
     <system:String x:Key="refresh">Refresh</system:String>
-    <system:String x:Key="install">Install</system:String>
+    <system:String x:Key="installbtn">Install</system:String>
+    <system:String x:Key="uninstallbtn">Uninstall</system:String>
+    <system:String x:Key="updatebtn">Update</system:String>
     <system:String x:Key="LabelInstalled">Installed</system:String>
     <system:String x:Key="LabelInstalledToolTip">Plug-in already installed</system:String>
     <system:String x:Key="LabelNew">New</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 74798235a..0a87ba677 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1320,7 +1320,7 @@
                                                                         FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
                                                                         MouseUp="OnExternalPluginUninstallClick"
-                                                                        Text="{DynamicResource plugin_uninstall}"
+                                                                        Text="{DynamicResource uninstallbtn}"
                                                                         TextDecorations="Underline" />
 
                                                                     <TextBlock
@@ -1692,22 +1692,36 @@
                                                                 </TextBlock>
                                                             </StackPanel>
                                                         </StackPanel>
-                                                        <Border
-                                                            Grid.Row="0"
-                                                            Grid.Column="1"
-                                                            Padding="0,0,0,0">
+                                                        <Grid Grid.Row="0" Grid.Column="1">
+                                                            <Button
+                                                                MinHeight="40"
+                                                                Margin="0,70,20,0"
+                                                                Padding="15,5,15,5"
+                                                                HorizontalAlignment="Right"
+                                                                VerticalAlignment="Center"
+                                                                Click="OnExternalPluginUninstallClick"
+                                                                Content="{DynamicResource uninstallbtn}"
+                                                                Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" />
                                                             <Button
-                                                                Name="ShortCutButtonPrev"
                                                                 MinHeight="40"
                                                                 Margin="0,70,20,0"
                                                                 Padding="15,5,15,5"
                                                                 HorizontalAlignment="Right"
                                                                 VerticalAlignment="Center"
                                                                 Click="OnExternalPluginInstallClick"
-                                                                Content="{DynamicResource install}"
+                                                                Content="{DynamicResource installbtn}"
                                                                 Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}" />
+                                                            <Button
+                                                                MinHeight="40"
+                                                                Margin="0,70,20,0"
+                                                                Padding="15,5,15,5"
+                                                                HorizontalAlignment="Right"
+                                                                VerticalAlignment="Center"
+                                                                Click="OnExternalPluginUpdateClick"
+                                                                Content="{DynamicResource updatebtn}"
+                                                                Visibility="{Binding UpdateBtn, Converter={StaticResource BoolToVisibilityConverter}}" />
                                                             <!--  Hide Install Button when installed Item  -->
-                                                        </Border>
+                                                        </Grid>
                                                     </Grid>
                                                 </StackPanel>
                                             </Grid>
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index db46b6f24..19aa45e47 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -491,5 +491,27 @@ namespace Flow.Launcher
             }
 
         }
+
+        private void OnExternalPluginUninstallClick(object sender, RoutedEventArgs e)
+        {
+            if (sender is Button { DataContext: PluginStoreItemViewModel plugin })
+            {
+                var pluginsManagerPlugin = PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7");
+                var actionKeyword = pluginsManagerPlugin.Metadata.ActionKeywords.Count == 0 ? "" : pluginsManagerPlugin.Metadata.ActionKeywords[0];
+                API.ChangeQuery($"{actionKeyword} uninstall {plugin.Name}");
+                API.ShowMainWindow();
+            }
+        }
+
+        private void OnExternalPluginUpdateClick(object sender, RoutedEventArgs e)
+        {
+            if (sender is Button { DataContext: PluginStoreItemViewModel plugin })
+            { 
+                var pluginsManagerPlugin = PluginManager.GetPluginForId("9f8f9b14-2518-4907-b211-35ab6290dee7");
+                var actionKeyword = pluginsManagerPlugin.Metadata.ActionKeywords.Count == 0 ? "" : pluginsManagerPlugin.Metadata.ActionKeywords[0];
+                API.ChangeQuery($"{actionKeyword} update {plugin.Name}");
+                API.ShowMainWindow();
+            }
+        }
     }
 }
diff --git a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs b/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
index e0235b5ac..c0a876378 100644
--- a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
@@ -24,9 +24,10 @@ namespace Flow.Launcher.ViewModel
         public string UrlDownload => _plugin.UrlDownload;
         public string UrlSourceCode => _plugin.UrlSourceCode;
         public string IcoPath => _plugin.IcoPath;
-        
-        public bool LabelNew => _plugin.LatestReleaseDate-DateTime.Now < TimeSpan.FromDays(7);
+
+        public bool LabelNew => _plugin.LatestReleaseDate - DateTime.Now < TimeSpan.FromDays(7);
         public bool LabelInstalled => PluginManager.GetPluginForId(_plugin.ID) != null;
-        public bool LabelUpdated => _plugin.DateAdded -DateTime.Now < TimeSpan.FromDays(5) && !LabelNew;
+        public bool LabelUpdated => _plugin.DateAdded - DateTime.Now < TimeSpan.FromDays(5) && !LabelNew;
+        public bool UpdateBtn => LabelUpdated && LabelInstalled && _plugin.Version != PluginManager.GetPluginForId(_plugin.ID).Metadata.Version;
     }
 }