Merge branch 'master' into setup_tests_1097

pwr-Solaar · Feb 10, 2024 · 002ecdd · 002ecdd
2 parents 42f19d7 + 8b1463c
commit 002ecdd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/lib/logitech_receiver/settings_templates.py b/lib/logitech_receiver/settings_templates.py
@@ -596,11 +596,8 @@ class CrownSmooth(_Setting):
 
 class DivertGkeys(_Setting):
     name = 'divert-gkeys'
-    label = _('Divert G Keys')
-    description = (
-        _('Make G keys send GKEY HID++ notifications (which trigger Solaar rules but are otherwise ignored).') + '\n' +
-        _('May also make M keys and MR key send HID++ notifications')
-    )
+    label = _('Divert G and M Keys')
+    description = (_('Make G and M keys send HID++ notifications (which trigger Solaar rules but are otherwise ignored).'))
     feature = _F.GKEY
     validator_options = {'true_value': 0x01, 'false_value': 0x00, 'mask': 0xff}
 

diff --git a/lib/solaar/cli/show.py b/lib/solaar/cli/show.py
@@ -243,6 +243,8 @@ def _print_device(dev, num=None):
                         v = setting.val_to_string(setting.read(False))
                     except _hidpp20.FeatureCallError as e:
                         v = 'HID++ error ' + str(e)
+                    except AssertionError as e:
+                        v = 'AssertionError ' + str(e)
                     print('            %s        : %s' % (setting.label, v))
 
     if dev.online and dev.keys:

diff --git a/lib/solaar/ui/config_panel.py b/lib/solaar/ui/config_panel.py
@@ -711,15 +711,15 @@ def _create_sbox(s, device):
 def _update_setting_item(sbox, value, is_online=True, sensitive=True, nullOK=False):
     #    sbox._spinner.set_visible(False)   # don't repack item box
     sbox._spinner.stop()
+    sensitive = sbox._change_icon._allowed if sensitive is None else sensitive
     if value is None and not nullOK:
-        sbox._control.set_sensitive(False)
-        _change_icon(False, sbox._change_icon)
+        sbox._control.set_sensitive(sensitive is True)
+        _change_icon(sensitive, sbox._change_icon)
         sbox._failed.set_visible(is_online)
         return
     sbox._failed.set_visible(False)
     sbox._control.set_sensitive(False)
     sbox._control.set_value(value)
-    sensitive = sbox._change_icon._allowed if sensitive is None else sensitive
     sbox._control.set_sensitive(sensitive is True)
     _change_icon(sensitive, sbox._change_icon)