From f2adc64966e2d3d9fe2343044993f5e52e0d11b1 Mon Sep 17 00:00:00 2001 From: Jonathan Gruber Date: Mon, 20 Jun 2016 11:40:46 +0200 Subject: [PATCH 1/3] Added format string setting --- i3pystatus/xkblayout.py | 1 + 1 file changed, 1 insertion(+) diff --git a/i3pystatus/xkblayout.py b/i3pystatus/xkblayout.py index a64c8b3..33f936b 100644 --- a/i3pystatus/xkblayout.py +++ b/i3pystatus/xkblayout.py @@ -17,6 +17,7 @@ class Xkblayout(IntervalModule): interval = 1 format = u"\u2328 {name}" settings = ( + ("format", "Format string"), ("layouts", "List of layouts"), ) layouts = [] From 1baaeb3ccc6e09c08832ac92676c45cd992c4fb2 Mon Sep 17 00:00:00 2001 From: Jonathan Gruber Date: Mon, 20 Jun 2016 11:53:18 +0200 Subject: [PATCH 2/3] Added uppercase setting --- i3pystatus/xkblayout.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/i3pystatus/xkblayout.py b/i3pystatus/xkblayout.py index 33f936b..b429603 100644 --- a/i3pystatus/xkblayout.py +++ b/i3pystatus/xkblayout.py @@ -16,9 +16,11 @@ class Xkblayout(IntervalModule): interval = 1 format = u"\u2328 {name}" + uppercase = True settings = ( ("format", "Format string"), ("layouts", "List of layouts"), + ("uppercase", "Flag for uppercase output"), ) layouts = [] on_leftclick = "change_layout" @@ -26,8 +28,12 @@ class Xkblayout(IntervalModule): def run(self): kblayout = self.kblayout() + full_text = self.format.format(name=kblayout); + if self.uppercase: + full_text = full_text.upper() + self.output = { - "full_text": self.format.format(name=kblayout).upper(), + "full_text": full_text, "color": "#ffffff" } From 42d8760462ad28cbb2b3ac19ede01927a4291fdb Mon Sep 17 00:00:00 2001 From: Jonathan Gruber Date: Mon, 20 Jun 2016 12:04:54 +0200 Subject: [PATCH 3/3] Removed semicolon --- i3pystatus/xkblayout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i3pystatus/xkblayout.py b/i3pystatus/xkblayout.py index b429603..811688c 100644 --- a/i3pystatus/xkblayout.py +++ b/i3pystatus/xkblayout.py @@ -28,7 +28,7 @@ class Xkblayout(IntervalModule): def run(self): kblayout = self.kblayout() - full_text = self.format.format(name=kblayout); + full_text = self.format.format(name=kblayout) if self.uppercase: full_text = full_text.upper()