-
-
Notifications
You must be signed in to change notification settings - Fork 453
Grouping in Plugin Store #1457
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Grouping in Plugin Store #1457
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
26b14c4
Add Install/New/Updated Label in plugin store
onesounds 5e7ee68
Merge branch 'PluginSearchTextBox' into InstalledLabel5
onesounds 15df419
- Change list order
onesounds bc47671
User ViewModel to separate logic
taooceros e3e0545
- Fix Mode to oneway
onesounds b7e51e5
Fix Install Button
onesounds 517d644
Merge branch 'dev' into InstalledLabel5
onesounds 6b2a78e
- Add Uninstall / Update Btn
onesounds f1c2dfe
Merge branch 'InstalledLabel5' of https://github.com/onesounds/Flow.L…
onesounds b970fdc
- rename LabelUpdate from LabelUpdated
onesounds 5eca096
Merge branch 'dev' into InstalledLabel5
onesounds 6bcb8e5
Fix Button Align
onesounds b9bc700
Merge branch 'InstalledLabel5' of https://github.com/onesounds/Flow.L…
onesounds e154b12
- Add GroupName
onesounds b9afa13
Adjust Label / Fix Order
onesounds ad3fd4a
Fix Search / Removed Purple Icon
onesounds 8dd24de
update category strings to constants
jjw24 3fcae23
move plugin install/uninstall/update calls from View to ViewModel
jjw24 cea9c5b
update language file keys
jjw24 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Globalization; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using System.Windows; | ||
| using System.Windows.Controls; | ||
| using System.Windows.Data; | ||
|
|
||
| namespace Flow.Launcher.Converters | ||
| { | ||
| public class BoolToVisibilityConverter : IValueConverter | ||
| { | ||
| public object Convert(object value, System.Type targetType, object parameter, CultureInfo culture) | ||
| { | ||
| if (parameter != null) | ||
| { | ||
| if (value is true) | ||
| { | ||
| return Visibility.Collapsed; | ||
| } | ||
|
|
||
| else | ||
| { | ||
| return Visibility.Visible; | ||
| } | ||
| } | ||
| else { | ||
| if (value is true) | ||
| { | ||
| return Visibility.Visible; | ||
| } | ||
|
|
||
| else { | ||
| return Visibility.Collapsed; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| using System; | ||
| using System.Globalization; | ||
| using System.Windows.Data; | ||
| using Flow.Launcher.Core.Resource; | ||
| using Flow.Launcher.ViewModel; | ||
|
|
||
| namespace Flow.Launcher.Converters | ||
| { | ||
| public class TextConverter : IValueConverter | ||
| { | ||
| public object Convert(object value, Type targetType, object parameter, CultureInfo culture) | ||
| { | ||
| var ID = value.ToString(); | ||
| switch(ID) | ||
| { | ||
| case PluginStoreItemViewModel.NewRelease: | ||
| return InternationalizationManager.Instance.GetTranslation("pluginStore_NewRelease"); | ||
| case PluginStoreItemViewModel.RecentlyUpdated: | ||
| return InternationalizationManager.Instance.GetTranslation("pluginStore_RecentlyUpdated"); | ||
| case PluginStoreItemViewModel.None: | ||
| return InternationalizationManager.Instance.GetTranslation("pluginStore_None"); | ||
| case PluginStoreItemViewModel.Installed: | ||
| return InternationalizationManager.Instance.GetTranslation("pluginStore_Installed"); | ||
| default: | ||
| return ID; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,13 +83,24 @@ | |
| <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="pluginStore_NewRelease">New Release</system:String> | ||
| <system:String x:Key="pluginStore_RecentlyUpdated">Recently Updated</system:String> | ||
| <system:String x:Key="pluginStore_None">Plugins</system:String> | ||
| <system:String x:Key="pluginStore_Installed">Installed</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="LabelInstalledToolTip">Plug-in already installed</system:String> | ||
| <system:String x:Key="LabelNew">New Version</system:String> | ||
| <system:String x:Key="LabelNewToolTip">This plug-in has been updated within the last 7 days</system:String> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe use "plugin" instead of "plug-in". We use "plugin" in all other texts. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK. |
||
| <system:String x:Key="LabelUpdateToolTip">New Update is Available</system:String> | ||
|
|
||
|
|
||
|
|
||
| <!-- Setting Theme --> | ||
| <system:String x:Key="theme">Theme</system:String> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remember these's a buildin boolconverter (used by @Sparrkle before). So let's use that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remember I saw it. but where is it?