diff --git a/configscript.py b/configscript.py index 5b6c48a..49b2c2d 100755 --- a/configscript.py +++ b/configscript.py @@ -161,7 +161,8 @@ def main (argv): dialog = wTree.get_widget("configure_script_dialog") wTree.get_widget("pre_label").set_label(language['before_script'] + ":") wTree.get_widget("post_label").set_label(language['after_script'] + ":") - wTree.get_widget("disconnect_label").set_label(language['disconnect_script'] + ":") + wTree.get_widget("disconnect_label").set_label(language['disconnect_script'] + + ":") wTree.get_widget("window1").hide() pre_entry = wTree.get_widget("pre_entry") diff --git a/gui.py b/gui.py index 4e30abe..b8af7c4 100644 --- a/gui.py +++ b/gui.py @@ -182,7 +182,7 @@ language['running_dhcp'] = _('Obtaining IP address...') language['no_dhcp_offers'] = _('Connection Failed: No DHCP offers received. \ Couldn\'t get an IP Address.') language['dhcp_failed'] = _('Connection Failed: Unable to Get IP Address') -language['aborted'] = _('Connection cancelled') +language['aborted'] = _('Connection Cancelled') language['bad_pass'] = _('Connection Failed: Bad password') language['done'] = _('Done connecting...') @@ -1611,7 +1611,7 @@ class appGui: strength = wireless.GetCurrentDBMStrength(iwconfig) if strength is None: - return False + return False strength = str(strength) ip = str(wireless_ip) self.set_status(language['connected_to_wireless'].replace diff --git a/images/both-bad-signal-lock.png b/images/both-bad-signal-lock.png new file mode 100755 index 0000000..fcdb8a5 Binary files /dev/null and b/images/both-bad-signal-lock.png differ diff --git a/images/both-bad-signal.png b/images/both-bad-signal.png new file mode 100755 index 0000000..999608b Binary files /dev/null and b/images/both-bad-signal.png differ diff --git a/images/both-good-signal-lock.png b/images/both-good-signal-lock.png new file mode 100755 index 0000000..66a326b Binary files /dev/null and b/images/both-good-signal-lock.png differ diff --git a/images/both-good-signal.png b/images/both-good-signal.png new file mode 100755 index 0000000..5415126 Binary files /dev/null and b/images/both-good-signal.png differ diff --git a/images/both-high-signal-lock.png b/images/both-high-signal-lock.png new file mode 100755 index 0000000..d08aa99 Binary files /dev/null and b/images/both-high-signal-lock.png differ diff --git a/images/both-high-signal.png b/images/both-high-signal.png new file mode 100755 index 0000000..746f7d5 Binary files /dev/null and b/images/both-high-signal.png differ diff --git a/images/both-low-signal-lock.png b/images/both-low-signal-lock.png new file mode 100755 index 0000000..cc1bc35 Binary files /dev/null and b/images/both-low-signal-lock.png differ diff --git a/images/both-low-signal.png b/images/both-low-signal.png new file mode 100755 index 0000000..095b911 Binary files /dev/null and b/images/both-low-signal.png differ diff --git a/images/idle-bad-signal-lock.png b/images/idle-bad-signal-lock.png new file mode 100755 index 0000000..83999b1 Binary files /dev/null and b/images/idle-bad-signal-lock.png differ diff --git a/images/idle-bad-signal.png b/images/idle-bad-signal.png new file mode 100755 index 0000000..9896fb0 Binary files /dev/null and b/images/idle-bad-signal.png differ diff --git a/images/idle-good-signal-lock.png b/images/idle-good-signal-lock.png new file mode 100755 index 0000000..5273ab3 Binary files /dev/null and b/images/idle-good-signal-lock.png differ diff --git a/images/idle-good-signal.png b/images/idle-good-signal.png new file mode 100755 index 0000000..3e09cdb Binary files /dev/null and b/images/idle-good-signal.png differ diff --git a/images/idle-high-signal-lock.png b/images/idle-high-signal-lock.png new file mode 100755 index 0000000..91a9bc5 Binary files /dev/null and b/images/idle-high-signal-lock.png differ diff --git a/images/idle-high-signal.png b/images/idle-high-signal.png new file mode 100755 index 0000000..4fb76f1 Binary files /dev/null and b/images/idle-high-signal.png differ diff --git a/images/idle-low-signal-lock.png b/images/idle-low-signal-lock.png new file mode 100755 index 0000000..0a8b0fd Binary files /dev/null and b/images/idle-low-signal-lock.png differ diff --git a/images/idle-low-signal.png b/images/idle-low-signal.png new file mode 100755 index 0000000..53325d4 Binary files /dev/null and b/images/idle-low-signal.png differ diff --git a/images/receiving-bad-signal-lock.png b/images/receiving-bad-signal-lock.png new file mode 100755 index 0000000..1403214 Binary files /dev/null and b/images/receiving-bad-signal-lock.png differ diff --git a/images/receiving-bad-signal.png b/images/receiving-bad-signal.png new file mode 100755 index 0000000..1721559 Binary files /dev/null and b/images/receiving-bad-signal.png differ diff --git a/images/receiving-good-signal-lock.png b/images/receiving-good-signal-lock.png new file mode 100755 index 0000000..5d6b591 Binary files /dev/null and b/images/receiving-good-signal-lock.png differ diff --git a/images/receiving-good-signal.png b/images/receiving-good-signal.png new file mode 100755 index 0000000..241875f Binary files /dev/null and b/images/receiving-good-signal.png differ diff --git a/images/receiving-high-signal-lock.png b/images/receiving-high-signal-lock.png new file mode 100755 index 0000000..edf3787 Binary files /dev/null and b/images/receiving-high-signal-lock.png differ diff --git a/images/receiving-high-signal.png b/images/receiving-high-signal.png new file mode 100755 index 0000000..96eeedc Binary files /dev/null and b/images/receiving-high-signal.png differ diff --git a/images/receiving-low-signal-lock.png b/images/receiving-low-signal-lock.png new file mode 100755 index 0000000..3bc8f4b Binary files /dev/null and b/images/receiving-low-signal-lock.png differ diff --git a/images/receiving-low-signal.png b/images/receiving-low-signal.png new file mode 100755 index 0000000..88e1b54 Binary files /dev/null and b/images/receiving-low-signal.png differ diff --git a/images/transmitting-bad-signal-lock.png b/images/transmitting-bad-signal-lock.png new file mode 100755 index 0000000..203e7da Binary files /dev/null and b/images/transmitting-bad-signal-lock.png differ diff --git a/images/transmitting-bad-signal.png b/images/transmitting-bad-signal.png new file mode 100755 index 0000000..9d7ec0b Binary files /dev/null and b/images/transmitting-bad-signal.png differ diff --git a/images/transmitting-good-signal-lock.png b/images/transmitting-good-signal-lock.png new file mode 100755 index 0000000..7735f1b Binary files /dev/null and b/images/transmitting-good-signal-lock.png differ diff --git a/images/transmitting-good-signal.png b/images/transmitting-good-signal.png new file mode 100755 index 0000000..7538e36 Binary files /dev/null and b/images/transmitting-good-signal.png differ diff --git a/images/transmitting-high-signal-lock.png b/images/transmitting-high-signal-lock.png new file mode 100755 index 0000000..4c719fe Binary files /dev/null and b/images/transmitting-high-signal-lock.png differ diff --git a/images/transmitting-high-signal.png b/images/transmitting-high-signal.png new file mode 100755 index 0000000..b6749d6 Binary files /dev/null and b/images/transmitting-high-signal.png differ diff --git a/images/transmitting-low-signal-lock.png b/images/transmitting-low-signal-lock.png new file mode 100755 index 0000000..0accd7d Binary files /dev/null and b/images/transmitting-low-signal-lock.png differ diff --git a/images/transmitting-low-signal.png b/images/transmitting-low-signal.png new file mode 100755 index 0000000..a73b632 Binary files /dev/null and b/images/transmitting-low-signal.png differ diff --git a/monitor.py b/monitor.py index f899686..4026448 100755 --- a/monitor.py +++ b/monitor.py @@ -241,7 +241,7 @@ class ConnectionStatus(): # If we just lost a wireless connection, try to connect to that # network again. Otherwise just call Autoconnect. cur_net_id = wireless.GetCurrentNetworkID(self.iwconfig) - if from_wireless and cur_net_id > -1: # Needs to be a valid network + if from_wireless and cur_net_id > -1: print 'Trying to reconnect to last used wireless ' + \ 'network' wireless.ConnectWireless(cur_net_id) diff --git a/other/wicd.conf b/other/wicd.conf index cc905e3..b5807a6 100755 --- a/other/wicd.conf +++ b/other/wicd.conf @@ -1,17 +1,19 @@ - - + +"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/wnettools.py b/wnettools.py index 17d887c..74fbdfd 100644 --- a/wnettools.py +++ b/wnettools.py @@ -105,13 +105,37 @@ def StopDHCP(): def GetWirelessInterfaces(): """ Get available wireless interfaces. + Attempts to get an interface first by parsing /proc/net/wireless, + and should that fail, by parsing iwconfig. Returns: The first interface available. """ - output = misc.Run('iwconfig') - return misc.RunRegex(re.compile('(\w*)\s*\w*\s*[a-zA-Z0-9.-_]*\s*(?=ESSID)', + iface = _fast_get_wifi_interfaces() + if not iface: + output = misc.Run('iwconfig') + iface = misc.RunRegex(re.compile('(\w*)\s*\w*\s*[a-zA-Z0-9.-_]*\s*(?=ESSID)', re.I | re.M | re.S), output) + return iface + +def _fast_get_wifi_interfaces(): + """ Tries to get a wireless interface by parsing /proc/net/wireless. """ + device = re.compile('[a-z]{3,4}[0-9]') + ifnames = [] + + f = open('/proc/net/wireless', 'r') + data = f.readlines() + f.close() + for line in data: + try: + ifnames.append(device.search(line).group()) + except AttributeError: + pass + + if ifnames: + return ifnames[0] + else: + return None class Interface(object): """ Control a network interface. """ @@ -944,7 +968,6 @@ class WirelessInterface(Interface): cmd_list.append(key_name + '=' + network.get('key')) if info[5] == 'SHARED' and info[4] == 'WEP': cmd_list.append('DefaultKeyID=1') - #TODO: Confirm whether this second SSID set is required. cmd_list.append('SSID=' + info[2]) for cmd in cmd_list: