[formatting] reformat using "black -t py34"
getting rid of thinking about consistent formatting...
This commit is contained in:
parent
fa98bcbdd1
commit
30c1f712a6
119 changed files with 3961 additions and 3495 deletions
|
@ -15,6 +15,7 @@ Parameters:
|
|||
from xkbgroup import *
|
||||
|
||||
import logging
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
import core.module
|
||||
|
@ -23,15 +24,14 @@ import core.input
|
|||
|
||||
import util.format
|
||||
|
||||
|
||||
class Module(core.module.Module):
|
||||
def __init__(self, config, theme):
|
||||
super().__init__(config, theme, core.widget.Widget(self.current_layout))
|
||||
|
||||
core.input.register(self, button=core.input.LEFT_MOUSE,
|
||||
cmd=self.__next_keymap)
|
||||
core.input.register(self, button=core.input.RIGHT_MOUSE,
|
||||
cmd=self.__prev_keymap)
|
||||
self.__show_variant = util.format.asbool(self.parameter('show_variant', True))
|
||||
core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.__next_keymap)
|
||||
core.input.register(self, button=core.input.RIGHT_MOUSE, cmd=self.__prev_keymap)
|
||||
self.__show_variant = util.format.asbool(self.parameter("show_variant", True))
|
||||
|
||||
def __next_keymap(self, event):
|
||||
self.__set_keymap(1)
|
||||
|
@ -41,7 +41,8 @@ class Module(core.module.Module):
|
|||
|
||||
def __set_keymap(self, rotation):
|
||||
xkb = XKeyboard()
|
||||
if xkb.groups_count < 2: return # nothing to do
|
||||
if xkb.groups_count < 2:
|
||||
return # nothing to do
|
||||
layouts = xkb.groups_symbols
|
||||
idx = layouts.index(xkb.group_symbol)
|
||||
xkb.group_symbol = str(layouts[(idx + rotation) % len(layouts)])
|
||||
|
@ -49,13 +50,22 @@ class Module(core.module.Module):
|
|||
def current_layout(self, widget):
|
||||
try:
|
||||
xkb = XKeyboard()
|
||||
log.debug('group num: {}'.format(xkb.group_num))
|
||||
name = xkb.group_name if util.format.asbool(self.parameter('showname'), False) else xkb.group_symbol
|
||||
log.debug("group num: {}".format(xkb.group_num))
|
||||
name = (
|
||||
xkb.group_name
|
||||
if util.format.asbool(self.parameter("showname"), False)
|
||||
else xkb.group_symbol
|
||||
)
|
||||
if self.__show_variant:
|
||||
return '{} ({})'.format(name, xkb.group_variant) if xkb.group_variant else name
|
||||
return (
|
||||
"{} ({})".format(name, xkb.group_variant)
|
||||
if xkb.group_variant
|
||||
else name
|
||||
)
|
||||
return name
|
||||
except Exception as e:
|
||||
print('got exception: {}'.format(e))
|
||||
return 'n/a'
|
||||
print("got exception: {}".format(e))
|
||||
return "n/a"
|
||||
|
||||
|
||||
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue