l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #480 from JohnDowson/Variantless-layout

Browse source 
Added an option to layout-xkb to only show layout name without a variant
This commit is contained in:
tobi-wan-kenobi 2019-12-11 21:20:56 +01:00 committed by GitHub
commit c2bbaa88b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bumblebee/modules/layout-xkb.py
View file

@ -9,6 +9,7 @@ and python module:
Parameters: Parameters:
* layout-xkb.showname: Boolean that indicate whether the full name should be displayed. Defaults to false (only the symbol will be displayed) * layout-xkb.showname: Boolean that indicate whether the full name should be displayed. Defaults to false (only the symbol will be displayed)
* layout-xkb.show_variant: Boolean that indecates whether the variant name should be displayed. Defaults to true.
""" """
import bumblebee.input import bumblebee.input
@ -33,6 +34,7 @@ class Module(bumblebee.engine.Module):
cmd=self._next_keymap) cmd=self._next_keymap)
engine.input.register_callback(self, button=bumblebee.input.RIGHT_MOUSE, engine.input.register_callback(self, button=bumblebee.input.RIGHT_MOUSE,
cmd=self._prev_keymap) cmd=self._prev_keymap)
self._show_variant = bumblebee.util.asbool(self.parameter("show_variant", "true"))
def _next_keymap(self, event): def _next_keymap(self, event):
self._set_keymap(1) self._set_keymap(1)
@ -54,7 +56,9 @@ class Module(bumblebee.engine.Module):
xkb = XKeyboard() xkb = XKeyboard()
log.debug("group num: {}".format(xkb.group_num)) log.debug("group num: {}".format(xkb.group_num))
name = xkb.group_name if bumblebee.util.asbool(self.parameter("showname")) else xkb.group_symbol name = xkb.group_name if bumblebee.util.asbool(self.parameter("showname")) else xkb.group_symbol
return "{} ({})".format(name, xkb.group_variant) if xkb.group_variant else name if self._show_variant:
return "{} ({})".format(name, xkb.group_variant) if xkb.group_variant else name
return name
except Exception: except Exception:
return "n/a" return "n/a"