Skip to content
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

Fix filter menus #9513

Merged
merged 1 commit into from
Mar 14, 2022
Merged

Fix filter menus #9513

merged 1 commit into from
Mar 14, 2022

Conversation

erikjv
Copy link
Collaborator

@erikjv erikjv commented Mar 11, 2022

  • replaced "No filter" option text with "All", to avoid the "No filter
    is not enabled" situation
  • replace the "Filter" label on the button with "1 Filter"/"2 Filters"
    when a filter is active, so a user can immediately see that without
    having to open the filter pop-up

@erikjv erikjv requested a review from TheOneRing March 11, 2022 14:42
@erikjv erikjv force-pushed the work/fix-filter-popup branch 2 times, most recently from ef43f34 to 399acdf Compare March 11, 2022 14:45
@erikjv
Copy link
Collaborator Author

erikjv commented Mar 11, 2022

No filter:
Screenshot 2022-03-11 at 15 51 38

1 filter:
Screenshot 2022-03-11 at 15 48 44

@erikjv erikjv force-pushed the work/fix-filter-popup branch from 55b0dbe to 24e839c Compare March 11, 2022 15:12
- replaced "No filter" option text with "All", to avoid the "No filter is not enabled" situation
- replace the "Filter" label on the button with "1 Filter"/"2 Filters" when a filter is active, so a user can immediately see that without having to open the filter pop-up

https://github.com/owncloud/client/issues/9425
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe merge the entry with 9425?

Copy link
Contributor

@TheOneRing TheOneRing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed

@erikjv erikjv force-pushed the work/fix-filter-popup branch from 24e839c to d3fb638 Compare March 11, 2022 18:46
@erikjv erikjv closed this Mar 11, 2022
@erikjv erikjv force-pushed the work/fix-filter-popup branch from d3fb638 to b4a6fc4 Compare March 11, 2022 19:07
@erikjv erikjv reopened this Mar 11, 2022
@erikjv
Copy link
Collaborator Author

erikjv commented Mar 11, 2022

sigh. something weird happened with this MR. Should be fine now.

@erikjv erikjv requested a review from TheOneRing March 11, 2022 19:11
@erikjv erikjv added this to the 2.10.1 milestone Mar 11, 2022
@erikjv erikjv force-pushed the work/fix-filter-popup branch from 1155ee1 to 2bb811b Compare March 11, 2022 19:12
QString ProtocolWidget::filterButtonText(int filterCount)
{
if (filterCount == 0) {
return tr("Filter");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@erikjv erikjv force-pushed the work/fix-filter-popup branch from 2bb811b to cee58b0 Compare March 14, 2022 10:16
- replaced "No filter" option text with "All", to avoid the "No filter
  is not enabled" situation
- replace the "Filter" label on the button with "1 Filter"/"2 Filters"
  when a filter is active, so a user can immediately see that without
  having to open the filter pop-up
@erikjv erikjv force-pushed the work/fix-filter-popup branch from cee58b0 to 3e3b3a5 Compare March 14, 2022 10:18
@TheOneRing TheOneRing merged commit 96ede25 into 2.10 Mar 14, 2022
@delete-merged-branch delete-merged-branch bot deleted the work/fix-filter-popup branch March 14, 2022 10:21
@sonarqubecloud
Copy link

Please retry analysis of this Pull-Request directly on SonarCloud.

@gabi18 gabi18 mentioned this pull request Mar 15, 2022
55 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants