gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-03-10 03:25:46 +01:00
Code Issues Projects Releases Wiki Activity

Merged with r391 of mainline 1.6.

Browse Source
This commit is contained in:
Andrew Psaltis
2009-05-11 23:52:43 -04:00
parent 7bcd28d210 6f9ab00673
commit 5c0afc0f60
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wicd/guiutil.py
View File

@@ -146,5 +146,5 @@ class GreyLabel(gtk.Label):
gtk.Label.__init__(self) gtk.Label.__init__(self)
def set_label(self, text): def set_label(self, text):
self.set_markup("<span color=\"#666666\"><i>" + text + "</i></span>") self.set_markup(text)
self.set_alignment(0, 0) self.set_alignment(0, 0)

4
wicd/netentry.py
View File

@@ -555,7 +555,7 @@ class WiredNetworkEntry(NetworkEntry):
self.image.show() self.image.show()
self.connect_button.show() self.connect_button.show()
self.name_label.set_label(language['wired_network']) self.name_label.set_label("<b>" + language['wired_network'] + "</b>")
self.is_full_gui = True self.is_full_gui = True
@@ -756,7 +756,7 @@ class WirelessNetworkEntry(NetworkEntry):
'encryption_method')) 'encryption_method'))
self.set_channel(wireless.GetWirelessProperty(networkID, 'channel')) self.set_channel(wireless.GetWirelessProperty(networkID, 'channel'))
self.name_label.set_use_markup(True) 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("<b>%s</b> %s %s %s" % (self._escape(self.essid),
self.lbl_strength.get_label(), self.lbl_strength.get_label(),
self.lbl_encryption.get_label(), self.lbl_encryption.get_label(),
self.lbl_channel.get_label(), self.lbl_channel.get_label(),

2
wicd/wicd-client.py
View File

@@ -753,7 +753,7 @@ def on_exit():
if DBUS_AVAIL: if DBUS_AVAIL:
try: try:
daemon.SetGUIOpen(False) daemon.SetGUIOpen(False)
except dbusmanager.DBusException: except DBusException:
pass pass
def handle_no_dbus(): def handle_no_dbus():

8
wicd/wnettools.py
View File

@@ -48,7 +48,7 @@ channel_pattern = re.compile('.*Channel:? ?(\d\d?)', _re_mode)
strength_pattern = re.compile('.*Quality:?=? ?(\d+)\s*/?\s*(\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) altstrength_pattern = re.compile('.*Signal level:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode)
signaldbm_pattern = re.compile('.*Signal level:?=? ?(-\d\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) mode_pattern = re.compile('.*Mode:(.*?)\n', _re_mode)
freq_pattern = re.compile('.*Frequency:(.*?)\n', _re_mode) freq_pattern = re.compile('.*Frequency:(.*?)\n', _re_mode)
wep_pattern = re.compile('.*Encryption key:(.*?)\n', _re_mode) wep_pattern = re.compile('.*Encryption key:(.*?)\n', _re_mode)
@@ -1114,9 +1114,9 @@ class BaseWirelessInterface(BaseInterface):
ap['channel'] = self._FreqToChannel(freq) ap['channel'] = self._FreqToChannel(freq)
# Bit Rate # Bit Rate
ap['bitrates'] = misc.RunRegex(bitrates_pattern, cell).split('\n') ap['bitrates'] = misc.RunRegex(bitrates_pattern,
ap['bitrates'] = '; '.join(m.strip() for m in ap['bitrates']).rstrip('; ') cell.split("Bit Rates")[-1])
# BSSID # BSSID
ap['bssid'] = misc.RunRegex(ap_mac_pattern, cell) ap['bssid'] = misc.RunRegex(ap_mac_pattern, cell)