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

ui: avoid conflicts when settings with the same name have different labels for the same number

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

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

@ -2097,7 +2097,7 @@ class SetUI(ActionUI):
if kind in (_SKIND.toggle, _SKIND.multiple_toggle): if kind in (_SKIND.toggle, _SKIND.multiple_toggle):
self.value_field.make_toggle() self.value_field.make_toggle()
elif kind in (_SKIND.choice, _SKIND.map_choice): elif kind in (_SKIND.choice, _SKIND.map_choice):
all_values, extra = self._all_choices(setting_name) all_values, extra = self._all_choices(device_setting or setting_name)
self.value_field.make_choice(all_values, extra) self.value_field.make_choice(all_values, extra)
supported_values = None supported_values = None
if device_setting: if device_setting:
@ -2196,7 +2196,7 @@ class SetUI(ActionUI):
disp.append(key_label or key) disp.append(key_label or key)
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_name)[0] all_values = cls._all_choices(setting or setting_name)[0]
if isinstance(all_values, NamedInts): if isinstance(all_values, NamedInts):
value = all_values[value] value = all_values[value]
disp.append(value) disp.append(value)