RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: fix choice field when device is connected

This commit is contained in:
Vinícius 2022-01-21 18:35:44 -03:00 committed by Peter F. Patel-Schneider
parent 8be2ca110a
commit 6f28a39a47
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/solaar/ui/diversion_rules.py
View File

@ -1972,7 +1972,7 @@ class SetUI(ActionUI):
def _all_choices(cls, setting): # choice and map-choice def _all_choices(cls, setting): # choice and map-choice
"""Return a NamedInts instance with the choices for a setting. """Return a NamedInts instance with the choices for a setting.
If the argument `setting` is a Setting instance, then the choices are taken only from it. If the argument `setting` is a Setting instance or subclass, then the choices are taken only from it.
If instead it is a name, then the function returns the union of the choices for each setting with that name. If instead it is a name, then the function returns the union of the choices for each setting with that name.
Only one label per number is kept. Only one label per number is kept.
@ -1980,6 +1980,8 @@ class SetUI(ActionUI):
(including the extra value if it exists) and the second element is the extra value to be pinned to (including the extra value if it exists) and the second element is the extra value to be pinned to
the start of the list (or `None` if there is no extra value). the start of the list (or `None` if there is no extra value).
""" """
if isinstance(setting, _Setting):
setting = type(setting)
if isinstance(setting, type) and issubclass(setting, _Setting): if isinstance(setting, type) and issubclass(setting, _Setting):
choices = UnsortedNamedInts() choices = UnsortedNamedInts()
universe = getattr(setting, 'choices_universe', None) universe = getattr(setting, 'choices_universe', None)
@ -2197,7 +2199,7 @@ class SetUI(ActionUI):
value = next(a, None) value = next(a, None)
if setting and (kind in (_SKIND.choice, _SKIND.map_choice)): if setting and (kind in (_SKIND.choice, _SKIND.map_choice)):
all_values = cls._all_choices(setting or setting_name)[0] all_values = cls._all_choices(setting or setting_name)[0]
if isinstance(all_values, NamedInts): if all_values and isinstance(all_values, NamedInts):
value = all_values[value] value = all_values[value]
disp.append(value) disp.append(value)
elif kind == _SKIND.multiple_range and isinstance(value, dict) and len(value) == 1: elif kind == _SKIND.multiple_range and isinstance(value, dict) and len(value) == 1: