feat(color): Single select option for model labels plus label AND/OR filtering logic.

[philmoz]

Fixes #4188

This is my take on a better way to handle labels. Feedback welcome.

TODO:

• Companion support (may need to wait for refactor(cpn): Support JSON radio hardware definitions #4406).

Adds new options to control how the label selection and filtering work. A new 'Manage Models' setup view has been added to the Radio Setup page with the options (Model quick select has also been moved to this new page).

There are three new options:

• 'Label select' - 'Multi select' or 'Single select' (Multi select is the default). If Single select is chosen then only a single label can be selected.
• 'Label matching' - 'Match all' or 'Match any' (Match all is the default). Match all is the current logic - only models having all selected labels are shown. Match any will show models with any of the selected labels.
• 'Favorites matching' - Only available when 'Match any' is selected for Label matching. Options are 'Must match' and 'Optional match' (Must match is the default). Only applies when 'Favorites' is in one of the selected labels. If 'Must match' is selected then only shows models that have Favorites AND the other selections. If 'Optional match' is selected then models that match Favorites OR any of the other labels are shown.

I've also tried to show the logic iin the labels list:

[jtaylor2]

Compiled and tested this PR in SIMU for tx16s. PR goes far beyond what I envisioned in #4188. Thank you.

[ParkerEde]

I have tested the PR. Very good idea. "Single select" in particular is very good. I only noticed that if a label is selected, the check mark is also displayed. If I now select a model, it is loaded. If I now go back to the model manager, the last label is also displayed correctly, but the check mark is no longer visible.

[philmoz]

I have tested the PR. Very good idea. "Single select" in particular is very good. I only noticed that if a label is selected, the check mark is also displayed. If I now select a model, it is loaded. If I now go back to the model manager, the last label is also displayed correctly, but the check mark is no longer visible.

Thanks for testing - the single select check mark should work now.

[ParkerEde]

yes, nice. Thx

[ParkerEde]

Now I found out during testing that the PageUp/down no longer work. Please also note that the Horus x10 with page longpress for down must work. It was the same before this PR. The checkmark must also be displayed.

[philmoz]

Now I found out during testing that the PageUp/down no longer work. Please also note that the Horus x10 with page longpress for down must work. It was the same before this PR. The checkmark must also be displayed.

The PGUP/PGDN keys should now work in single select mode.

[ParkerEde]

PgUp/Down is not quite perfect yet. The wrap around should jump directly to the first label and not to none. This drastically increases the loading time if you want to jump from the last to the first label. Before this PR, it was also the case that the wrap around jumped directly from the last to the first label. This affects both modes (single/multi select)

I have noticed that the list position jumps when going through the labels with the PgUp/Dn key, which looks very strange. It jumps to the correct next label, but within the list the entries jump up and down strangely. I have one label more than can be displayed at the same time (6 labels). By the way, in 2.9.2 6 labels could be displayed at the same time, now only 5, why did they change that?

[ulfhedlund]

Great effort!
SE translations:
#define TR_LABELS_SELECT "Etikettval"
#define TR_LABELS_MATCH "Etikettmatchning"
#define TR_FAV_MATCH "Matcha favoriter"
#define TR_LABELS_SELECT_MODE "Flerval","Enskilt val"
#define TR_LABELS_MATCH_MODE "Matcha alla","Matcha någon"
#define TR_FAV_MATCH_MODE "Måste matcha","Alternativt matcha"

[pfeerick]

By the way, in 2.9.2 6 labels could be displayed at the same time, now only 5, why did they change that?

Looks like the line height for each entry has increased slightly.

[philmoz]

PgUp/Down is not quite perfect yet. The wrap around should jump directly to the first label and not to none. This drastically increases the loading time if you want to jump from the last to the first label. Before this PR, it was also the case that the wrap around jumped directly from the last to the first label. This affects both modes (single/multi select)

I assumed that this was an oversight in the previous code - if it jumps directly to the first/last entry on wrap around then there is no way to clear the selection and show all models (on radios without a touch screen).

[ParkerEde]

I think that since there have been no complaints from Horus users about this, the behavior should not be changed. There is also no need to jump to no label in the wrap arround, because why should I be interested in a complete list if I have taken the trouble to organize my model within labels. Please, please do it the way it was in the previous versions. And if you want to have an unsorted complete list, you can go to the list of labels with the focus, press Enter and then select one or more labels or even no label, as it has always been in 2.9.2.

[ParkerEde]

DE translations:
#define TR_LABELS_SELECT " Labelauswahl"
#define TR_LABELS_MATCH "Labelvergleich"
#define TR_FAV_MATCH "Favoriten vergleichen"
#define TR_LABELS_SELECT_MODE "Mehrfachauswahl", "Einfachauswahl"
#define TR_LABELS_MATCH_MODE "Alle", "Beliebig"
#define TR_FAV_MATCH_MODE "Muss übereinstimmen", "Alternative Übereinstimmung"

[philmoz]

I have reverted the PGUP/DN wrap around logic.

[ParkerEde]

Thx. Now it's fine to me.

[ParkerEde]

Shouldn't we also make the labeling of this button translatable?

[philmoz]

Shouldn't we also make the labeling of this button translatable?

TR_MANAGE_MODELS

[ParkerEde]

DE:
#define TR_MANAGE_MODELS "Modellmanager"

[philmoz]

DE: #define TR_MANAGE_MODELS "Modellmanager"

This is also used for the title on the manage models page where all caps is the current standard.

[ParkerEde]

But on the buttons, all capital letters don't look very good. All other burtons have normal lettering.

[philmoz]

But on the buttons, all capital letters don't look very good. All other burtons have normal lettering.

I agree. I also think that the all caps on the menus looks bad and should be changed; but that's a topic for a separate PR.

[philmoz]

I have updated this to use the quick menu string (mixed case) for the button title instead of the all caps menu title string.

[pfeerick]

@philmoz Do you have any problems with #4524 and this PR getting merged, and a followup PR to catch Companion up?

[philmoz]

Do you have any problems with #4524 and this PR getting merged, and a followup PR to catch Companion up?

Ok with me; but this one needs translations.

[pfeerick]

I think that will probably be it's own PR as well, as there are several translations needed for each language now, across multiple PRs, so (overdue) time to pull them all together...

[pfeerick]

Looks great on TX16. I love how you added the AND/OR to the label list to help inform why it's matching the way it does... should help with people still confused how labels behave by default.