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

ui: fix tree row text when device contains options not in the full list

This commit is contained in:
Vinícius 2022-01-21 20:27:17 -03:00 committed by Peter F. Patel-Schneider
parent 6f28a39a47
commit 25523315ab
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2190,6 +2190,7 @@ class SetUI(ActionUI):
device_disp = _('Originating device') if not device_str else device.display_name if device else shlex_quote(device_str) device_disp = _('Originating device') if not device_str else device.display_name if device else shlex_quote(device_str)
setting_name = next(a, None) setting_name = next(a, None)
setting, val_class, kind, keys = cls._setting_attributes(setting_name, device) setting, val_class, kind, keys = cls._setting_attributes(setting_name, device)
device_setting = (device.settings if device else {}).get(setting_name, None)
disp = [setting.label or setting.name if setting else setting_name] disp = [setting.label or setting.name if setting else setting_name]
if kind in cls.MULTIPLE: if kind in cls.MULTIPLE:
key = next(a, None) key = next(a, None)
@ -2199,7 +2200,17 @@ 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 all_values and isinstance(all_values, NamedInts): supported_values = None
if device_setting:
val = device_setting._validator
choices = getattr(val, 'choices', None) or None
if kind == _SKIND.choice:
supported_values = choices
elif kind == _SKIND.map_choice and isinstance(choices, dict):
supported_values = choices.get(key, None) or None
if supported_values and isinstance(supported_values, NamedInts):
value = supported_values[value]
if not supported_values and 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: