From 8dc997548e1b447487002d3b9ab1ab10a6431c1a Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Sat, 9 May 2009 20:53:49 -0400 Subject: [PATCH 1/4] Make bitrates regex work when it's the last entry in a cell. --- wicd/wnettools.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wicd/wnettools.py b/wicd/wnettools.py index d09e8f2..f5d720d 100644 --- a/wicd/wnettools.py +++ b/wicd/wnettools.py @@ -48,7 +48,7 @@ channel_pattern = re.compile('.*Channel:? ?(\d\d?)', _re_mode) strength_pattern = re.compile('.*Quality:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode) altstrength_pattern = re.compile('.*Signal level:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode) signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\d*)', _re_mode) -bitrates_pattern = re.compile('.*Bit Rates:(.*?)E', _re_mode) +bitrates_pattern = re.compile('(\d+\s+\S+/s)', _re_mode) mode_pattern = re.compile('.*Mode:(.*?)\n', _re_mode) freq_pattern = re.compile('.*Frequency:(.*?)\n', _re_mode) wep_pattern = re.compile('.*Encryption key:(.*?)\n', _re_mode) @@ -1114,9 +1114,9 @@ class BaseWirelessInterface(BaseInterface): ap['channel'] = self._FreqToChannel(freq) # Bit Rate - ap['bitrates'] = misc.RunRegex(bitrates_pattern, cell).split('\n') - ap['bitrates'] = '; '.join(m.strip() for m in ap['bitrates']).rstrip('; ') - + ap['bitrates'] = misc.RunRegex(bitrates_pattern, + cell.split("Bit Rates")[-1]) + # BSSID ap['bssid'] = misc.RunRegex(ap_mac_pattern, cell) From 46798c4115dcfea02114a53cb2461f7aaf155390 Mon Sep 17 00:00:00 2001 From: Adam Blackburn Date: Sun, 10 May 2009 22:03:52 +0800 Subject: [PATCH 2/4] Removed italicized text from the GTK GUI --- wicd/guiutil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicd/guiutil.py b/wicd/guiutil.py index 454f37d..cee52ed 100644 --- a/wicd/guiutil.py +++ b/wicd/guiutil.py @@ -146,5 +146,5 @@ class GreyLabel(gtk.Label): gtk.Label.__init__(self) def set_label(self, text): - self.set_markup("" + text + "") + self.set_markup("" + text + "") self.set_alignment(0, 0) From 6e8fde82746e5ef7d2abfd00626fd6dcf2836ef5 Mon Sep 17 00:00:00 2001 From: Adam Blackburn Date: Sun, 10 May 2009 22:51:49 +0800 Subject: [PATCH 3/4] Made the GUI look better with dark themes --- wicd/guiutil.py | 2 +- wicd/netentry.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wicd/guiutil.py b/wicd/guiutil.py index cee52ed..169dcc8 100644 --- a/wicd/guiutil.py +++ b/wicd/guiutil.py @@ -146,5 +146,5 @@ class GreyLabel(gtk.Label): gtk.Label.__init__(self) def set_label(self, text): - self.set_markup("" + text + "") + self.set_markup(text) self.set_alignment(0, 0) diff --git a/wicd/netentry.py b/wicd/netentry.py index 161a45b..9765d57 100644 --- a/wicd/netentry.py +++ b/wicd/netentry.py @@ -555,7 +555,7 @@ class WiredNetworkEntry(NetworkEntry): self.image.show() self.connect_button.show() - self.name_label.set_label(language['wired_network']) + self.name_label.set_label("" + language['wired_network'] + "") self.is_full_gui = True @@ -756,7 +756,7 @@ class WirelessNetworkEntry(NetworkEntry): 'encryption_method')) self.set_channel(wireless.GetWirelessProperty(networkID, 'channel')) self.name_label.set_use_markup(True) - self.name_label.set_label("%s %s %s %s" % (self._escape(self.essid), + self.name_label.set_label("%s %s %s %s" % (self._escape(self.essid), self.lbl_strength.get_label(), self.lbl_encryption.get_label(), self.lbl_channel.get_label(), From 6f9ab0067309917b82ec0b73012349e1b4fc05d0 Mon Sep 17 00:00:00 2001 From: Dan O'Reilly Date: Sun, 10 May 2009 13:53:54 -0400 Subject: [PATCH 4/4] Don't use dbusmanager.DBusException--it doesn't exist. --- wicd/wicd-client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicd/wicd-client.py b/wicd/wicd-client.py index 7c9d100..4934215 100755 --- a/wicd/wicd-client.py +++ b/wicd/wicd-client.py @@ -753,7 +753,7 @@ def on_exit(): if DBUS_AVAIL: try: daemon.SetGUIOpen(False) - except dbusmanager.DBusException: + except DBusException: pass def handle_no_dbus():