diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index d141ba82c..517edd65f 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -93,10 +93,10 @@
Update
Installed
Plug-in already installed
- New
- This is a newly registered plug-in in 7 days
- Updated
- This plug-in has been updated within the last 5 days
+ New Version
+ This plug-in has been updated within the last 7 days
+ Update
+ New Update is Available
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 067c69c5a..e6ad509eb 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1534,19 +1534,19 @@
Text="{DynamicResource LabelNew}" />
+ ToolTip="{DynamicResource LabelUpdateToolTip}"
+ Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}">
+ Text="{DynamicResource LabelUpdate}" />
-
+
+ Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
diff --git a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs b/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
index c0a876378..09022862e 100644
--- a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs
@@ -1,4 +1,5 @@
using System;
+using System.Diagnostics;
using Flow.Launcher.Core.ExternalPlugins;
using Flow.Launcher.Core.Plugin;
using Flow.Launcher.Plugin;
@@ -25,9 +26,8 @@ namespace Flow.Launcher.ViewModel
public string UrlSourceCode => _plugin.UrlSourceCode;
public string IcoPath => _plugin.IcoPath;
- 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 UpdateBtn => LabelUpdated && LabelInstalled && _plugin.Version != PluginManager.GetPluginForId(_plugin.ID).Metadata.Version;
+ public bool LabelUpdate => LabelInstalled && _plugin.Version != PluginManager.GetPluginForId(_plugin.ID).Metadata.Version;
+ public bool LabelNew => DateTime.Now - _plugin.LatestReleaseDate < TimeSpan.FromDays(7) && !LabelUpdate; // Show Update Label show first.
}
}
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 99a05548f..11c2d5329 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -294,8 +294,8 @@ namespace Flow.Launcher.ViewModel
private IList LabelMaker(IList list)
{
return list.Select(p=>new PluginStoreItemViewModel(p))
- .OrderBy(p=>p.LabelNew)
- .ThenByDescending(p=>p.LabelUpdated)
+ .OrderByDescending(p=>p.LabelNew)
+ .ThenByDescending(p=>p.LabelUpdate)
.ThenBy(p=>p.LabelInstalled)
.ToList();
}