diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index d8dcb1d5b..578e5cd6a 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -95,7 +95,6 @@ Install Uninstall Update - Installed Plug-in already installed New Version This plug-in has been updated within the last 7 days diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index ba641eb6e..5081b4dad 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1558,19 +1558,15 @@ Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" /> - - + Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" /> _plugin.IcoPath; public bool LabelInstalled => PluginManager.GetPluginForId(_plugin.ID) != null; - 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. - + public bool LabelUpdate => LabelInstalled && _plugin.Version != PluginManager.GetPluginForId(_plugin.ID).Metadata.Version; public string Category { get diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index b1ed5a411..fa63b9ba4 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -296,9 +296,10 @@ namespace Flow.Launcher.ViewModel private IList LabelMaker(IList list) { return list.Select(p=>new PluginStoreItemViewModel(p)) - .OrderByDescending(p=>p.LabelNew) - .ThenByDescending(p=>p.LabelUpdate) - .ThenBy(p=>p.LabelInstalled) + .OrderByDescending(p => p.Category == "NewRelease") + .ThenByDescending(p=>p.Category == "RecentlyUpdated") + .ThenByDescending(p => p.Category == "None") + .ThenByDescending(p => p.Category == "Installed") .ToList(); }