From f7a4d894672424cbf6135b747ca7ddf8e7c8d76c Mon Sep 17 00:00:00 2001 From: Daniel Pavel Date: Thu, 8 Nov 2012 22:05:35 +0200 Subject: [PATCH] fixed display of receiver details --- app/ui/main_window.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/ui/main_window.py b/app/ui/main_window.py index 146abcae..afb7694e 100644 --- a/app/ui/main_window.py +++ b/app/ui/main_window.py @@ -18,13 +18,11 @@ _PLACEHOLDER = '~' # def _info_text(dev): - fw_text = '\n'.join(['%-12s\t%s%s%s' % - (f.kind, f.name, ' ' if f.name else '', f.version) for f in dev.firmware]) - return ('' - 'Serial \t\t%s\n' - 'HID protocol\t%1.1f\n' - '%s' - '' % (dev.serial, dev.protocol, fw_text)) + items = [('Serial', dev.serial)] + [(f.kind, ((f.name + ' ') if f.name else '') + f.version) for f in dev.firmware] + if hasattr(dev, 'number'): + items += [('HID version', dev.protocol)] + + return '%s' % '\n'.join('%-11s: %s' % (item[0], str(item[1])) for item in items) def _toggle_info(action, label_widget, box_widget, frame): if action.get_active():