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

[modules/layout] quotes

Browse source
This commit is contained in:
tobi-wan-kenobi 2020-04-24 16:16:14 +02:00
parent 810c0b68e0
commit 20cab432b9
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/contrib/layout.py
View file

@ -35,35 +35,35 @@ class Module(bumblebee.engine.Module):
layout_list = [] layout_list = []
variant_list = [] variant_list = []
for l in layouts: for l in layouts:
tmp = l.split(":") tmp = l.split(':')
layout_list.append(tmp[0]) layout_list.append(tmp[0])
variant_list.append(tmp[1] if len(tmp) > 1 else "") variant_list.append(tmp[1] if len(tmp) > 1 else '')
try: try:
bumblebee.util.execute("setxkbmap -layout {} -variant {}".format(",".join(layout_list), ",".join(variant_list))) bumblebee.util.execute('setxkbmap -layout {} -variant {}'.format(','.join(layout_list), ','.join(variant_list)))
except RuntimeError: except RuntimeError:
pass pass
def get_layouts(self): def get_layouts(self):
try: try:
res = bumblebee.util.execute("setxkbmap -query") res = bumblebee.util.execute('setxkbmap -query')
except RuntimeError: except RuntimeError:
return ["n/a"] return ['n/a']
layouts = [] layouts = []
variants = [] variants = []
for line in res.split("\n"): for line in res.split('\n'):
if not line: continue if not line: continue
if "layout" in line: if 'layout' in line:
layouts = line.split(":")[1].strip().split(",") layouts = line.split(':')[1].strip().split(',')
if "variant" in line: if 'variant' in line:
variants = line.split(":")[1].strip().split(",") variants = line.split(':')[1].strip().split(',')
result = [] result = []
for idx, layout in enumerate(layouts): for idx, layout in enumerate(layouts):
if len(variants) > idx and variants[idx]: if len(variants) > idx and variants[idx]:
layout = "{}:{}".format(layout, variants[idx]) layout = '{}:{}'.format(layout, variants[idx])
result.append(layout) result.append(layout)
return result if len(result) > 0 else ["n/a"] return result if len(result) > 0 else ['n/a']
def current_layout(self, widget): def current_layout(self, widget):
layouts = self.get_layouts() layouts = self.get_layouts()