[master][PATCH] Make Keyboard spoke's status consistent with other statuses (#1011166)
Vratislav Podzimek
vpodzime at redhat.com
Tue Sep 24 19:17:29 UTC 2013
When multiple keyboard layouts are configured, we should list them in the status
as we do with the other spokes.
Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---
pyanaconda/ui/gui/spokes/keyboard.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py
index 7c575d8..ffab6da 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/pyanaconda/ui/gui/spokes/keyboard.py
@@ -298,7 +298,9 @@ class KeyboardSpoke(NormalSpoke):
@property
def status(self):
# We don't need to check that self._store is empty, because that isn't allowed.
- return self._xkl_wrapper.get_layout_variant_description(self._store[0][0])
+ descriptions = (self._xkl_wrapper.get_layout_variant_description(row[0])
+ for row in self._store)
+ return ", ".join(descriptions)
def initialize(self):
NormalSpoke.initialize(self)
--
1.7.11.7
More information about the anaconda-patches
mailing list