diff --git a/data/wicd.glade b/data/wicd.glade index bb6bdc2..e5a9d7f 100644 --- a/data/wicd.glade +++ b/data/wicd.glade @@ -1,12 +1,12 @@ - + 450 400 True - Wicd Manager + Wicd Network Manager GTK_WIN_POS_CENTER 550 GDK_GRAVITY_CENTER @@ -429,15 +429,44 @@ 4 4 - + True 24 - + + True + 0 + DNS domain: + + + + + 6 + 7 + + + + + + True + True + + + 1 + 2 + 6 + 7 + + + + + True + 12 + + True True - If enabled, the wired network interface will always be displayed in the main window. This can be useful if your wired network card does not detect when the interface is connected to a cable. - Always show wired interface + Automatically reconnect on network connection loss 0 True @@ -445,278 +474,44 @@ 2 - 3 - 4 + 16 + 17 - - True - True - - - 1 - 2 - 7 - 8 - - - - - - True - True - - - 1 - 2 - 8 - 9 - - - - - - True - True - - - 1 - 2 - 9 - 10 - - - - - + True 0 - <b>Global DNS Servers</b> + <b>Automatic Reconnection</b> True 2 - 4 - 5 + 15 + 16 - + True 12 - + True True - Use global DNS servers - 0 - True - - - - - 2 - 5 - 6 - - - - - - True - 24 - - - True - 0 - Search domain: - - - - - 7 - 8 - - - - - - True - 24 - - - True - 0 - DNS server 1: - - - - - 8 - 9 - - - - - - True - 24 - - - True - 0 - DNS server 2: - - - - - 9 - 10 - - - - - - True - True - - - 1 - 2 - 10 - 11 - - - - - - True - 24 - - - True - 0 - DNS server 3: - - - - - 10 - 11 - - - - - - True - 0 - <b>Network Interfaces</b> - True - - - 2 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - 12 - - - True - 0 - Wireless interface: - - - - - 1 - 2 - - - - - - True - 12 - - - True - 0 - Wired interface: - - - - - 2 - 3 - - - - - - True - 0 - <b>Wired automatic connection</b> - True - - - 2 - 11 - 12 - - - - - - True - 12 - - - True - True - Use default wired network profile + Use last wired network profile 0 True True - pref_use_last_radio 2 - 12 - 13 + 14 + 15 @@ -744,89 +539,294 @@ - + True 12 - + True True - Use last wired network profile + Use default wired network profile 0 True True + pref_use_last_radio 2 - 14 - 15 + 12 + 13 - + True 0 - <b>Automatic Reconnection</b> + <b>Wired automatic connection</b> True 2 - 15 - 16 + 11 + 12 - + True 12 - + True - True - Automatically reconnect on network connection loss - 0 - True + 0 + Wired interface: - 2 - 16 - 17 + 2 + 3 - + + True + 12 + + + True + 0 + Wireless interface: + + + + + 1 + 2 + + + + + True True 1 2 - 6 - 7 + 2 + 3 + - + + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + <b>Network Interfaces</b> + True + + + 2 + + + + + True 24 - + True 0 - DNS domain: + DNS server 3: - 6 - 7 + 10 + 11 + + + + + + True + True + + + 1 + 2 + 10 + 11 + + + + + + True + 24 + + + True + 0 + DNS server 2: + + + + + 9 + 10 + + + + + + True + 24 + + + True + 0 + DNS server 1: + + + + + 8 + 9 + + + + + + True + 24 + + + True + 0 + Search domain: + + + + + 7 + 8 + + + + + + True + 12 + + + True + True + Use global DNS servers + 0 + True + + + + + 2 + 5 + 6 + + + + + + True + 0 + <b>Global DNS Servers</b> + True + + + 2 + 4 + 5 + + + + + + True + True + + + 1 + 2 + 9 + 10 + + + + + + True + True + + + 1 + 2 + 8 + 9 + + + + + + True + True + + + 1 + 2 + 7 + 8 + + + + + + True + 24 + + + True + True + If enabled, the wired network interface will always be displayed in the main window. This can be useful if your wired network card does not detect when the interface is connected to a cable. + Always show wired interface + 0 + True + + + + + 2 + 3 + 4 @@ -871,13 +871,146 @@ True 6 - + True 0 - <b>DHCP Client</b> + <b>Route Table Flushing</b> True + 4 + 5 + + + + + + True + 0 + <b>Wired Link Detection</b> + True + + + 2 + 3 + + + + + + True + 12 + + + True + + + True + True + Automatic (recommended) + 0 + True + True + + + False + + + + + True + True + ip + 0 + True + True + flush_auto_radio + + + False + 1 + + + + + True + True + route + 0 + True + True + flush_auto_radio + + + False + 2 + + + + + + + 5 + 6 + + + + + + True + 12 + + + True + + + True + True + Automatic (recommended) + 0 + True + True + + + False + + + + + True + True + ethtool + 0 + True + True + link_auto_radio + + + False + 1 + + + + + True + True + mii-tool + 0 + True + True + link_auto_radio + + + False + 2 + + + + + + + 3 + 4 @@ -956,146 +1089,13 @@ - - True - 12 - - - True - - - True - True - Automatic (recommended) - 0 - True - True - - - False - - - - - True - True - ethtool - 0 - True - True - link_auto_radio - - - False - 1 - - - - - True - True - mii-tool - 0 - True - True - link_auto_radio - - - False - 2 - - - - - - - 3 - 4 - - - - - - True - 12 - - - True - - - True - True - Automatic (recommended) - 0 - True - True - - - False - - - - - True - True - ip - 0 - True - True - flush_auto_radio - - - False - 1 - - - - - True - True - route - 0 - True - True - flush_auto_radio - - - False - 2 - - - - - - - 5 - 6 - - - - - + True 0 - <b>Wired Link Detection</b> + <b>DHCP Client</b> True - 2 - 3 - - - - - - True - 0 - <b>Route Table Flushing</b> - True - - - 4 - 5 @@ -1134,135 +1134,67 @@ 10 2 - - True - - - 5 - 6 - GTK_FILL - - - - - + True 0 - You should almost always use wext as the -WPA supplicant driver. + Hover your mouse over the selected backend +to read its description. True 1 2 - 2 - 3 + 5 + 6 - + True - 0 - <b>Backend</b> - True - - - 2 - 3 - 4 - - - - - - True - True + + + True + + + False + + 1 2 - 4 - 5 + 1 + 2 - + + True + + + 2 + 3 + GTK_FILL + + + + + True 12 - + True 0 - Backend: + Driver: - 4 - 5 - - - - - - True - 0 - <b>Debugging</b> - True - - - 2 - 6 - 7 - - - - - - True - 0 - <b>WPA Supplicant</b> - True - - - 2 - - - - - - True - 0 - <b>Wireless Interface</b> - True - - - 2 - 8 - 9 - - - - - - True - 12 - - - True - True - Enable debug mode - 0 - True - - - - - 2 - 7 - 8 + 1 + 2 @@ -1288,67 +1220,135 @@ WPA supplicant driver. - + True 12 - + + True + True + Enable debug mode + 0 + True + + + + + 2 + 7 + 8 + + + + + + True + 0 + <b>Wireless Interface</b> + True + + + 2 + 8 + 9 + + + + + + True + 0 + <b>WPA Supplicant</b> + True + + + 2 + + + + + + True + 0 + <b>Debugging</b> + True + + + 2 + 6 + 7 + + + + + + True + 12 + + True 0 - Driver: + Backend: - 1 - 2 + 4 + 5 - + True - - - 2 - 3 - GTK_FILL - - - - - - True - - - True - - - False - - + True 1 2 - 1 - 2 + 4 + 5 - + True 0 - Hover your mouse over the selected backend -to read its description. + <b>Backend</b> + True + + + 2 + 3 + 4 + + + + + + True + 0 + You should almost always use wext as the +WPA supplicant driver. True 1 2 + 2 + 3 + + + + + + True + + 5 6 + GTK_FILL diff --git a/wicd/netentry.py b/wicd/netentry.py index 54c8f9f..ed4eaba 100644 --- a/wicd/netentry.py +++ b/wicd/netentry.py @@ -373,8 +373,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog): activeID = -1 # Set the menu to this item when we are done for x, enc_type in enumerate(self.encrypt_types): self.combo_encryption.append_text(enc_type[0]) - if enc_type[1] == wireless.GetWirelessProperty(networkID, - "enctype"): + if enc_type[1] == wireless.GetWirelessProperty(networkID, "enctype"): activeID = x self.combo_encryption.set_active(activeID) if activeID != -1: @@ -803,7 +802,9 @@ class WirelessNetworkEntry(NetworkEntry): #self.image.set_from_icon_name("network-wired", 6) self.essid = noneToBlankString(wireless.GetWirelessProperty(networkID, "essid")) - self.name_label.set_markup(self._escape(self.essid)) + self.lbl_strength = GreyLabel() + self.lbl_encryption = GreyLabel() + print "ESSID : " + self.essid self.chkbox_autoconnect = gtk.CheckButton(language['automatic_connect']) @@ -811,6 +812,16 @@ class WirelessNetworkEntry(NetworkEntry): 'quality'), wireless.GetWirelessProperty(networkID, 'strength')) + self.set_encryption(wireless.GetWirelessProperty(networkID, + 'encryption'), + wireless.GetWirelessProperty(networkID, + 'encryption_method')) + self.name_label.set_use_markup(True) + self.name_label.set_label("%s %s %s" % (self._escape(self.essid), + self.lbl_strength.get_label(), + self.lbl_encryption.get_label() + ) + ) # Add the wireless network specific parts to the NetworkEntry # VBox objects. self.vbox_top.pack_start(self.chkbox_autoconnect, False, False) @@ -905,7 +916,17 @@ class WirelessNetworkEntry(NetworkEntry): ending = "%" disp_strength = str(strength) self.image.set_from_file(wpath.images + signal_img) + self.lbl_strength.set_label(disp_strength + ending) self.image.show() + + def set_encryption(self, on, ttype): + """ Set the encryption value for the WirelessNetworkEntry. """ + if on and ttype: + self.lbl_encryption.set_label(str(ttype)) + if on and not ttype: + self.lbl_encryption.set_label(language['secured']) + if not on: + self.lbl_encryption.set_label(language['unsecured']) def format_entry(self, networkid, label): """ Helper method for fetching/formatting wireless properties. """ @@ -950,19 +971,19 @@ class WirelessInformationDialog(gtk.Dialog): vbox.pack_start(table) # Pack the network status HBox. - table.attach(LeftAlignedLabel('Signal strength'), 0, 1, 0, 1) + table.attach(LeftAlignedLabel('Signal strength:'), 0, 1, 0, 1) table.attach(self.lbl_strength, 1, 2, 0, 1) - table.attach(LeftAlignedLabel('Encryption type'), 0, 1, 1, 2) + table.attach(LeftAlignedLabel('Encryption type:'), 0, 1, 1, 2) table.attach(self.lbl_encryption, 1, 2, 1, 2) - table.attach(LeftAlignedLabel('Access point address'), 0, 1, 2, 3) + table.attach(LeftAlignedLabel('Access point address:'), 0, 1, 2, 3) table.attach(self.lbl_mac, 1, 2, 2, 3) - table.attach(LeftAlignedLabel('Mode'), 0, 1, 3, 4) + table.attach(LeftAlignedLabel('Mode:'), 0, 1, 3, 4) table.attach(self.lbl_mode, 1, 2, 3, 4) - table.attach(LeftAlignedLabel('Channel'), 0, 1, 4, 5) + table.attach(LeftAlignedLabel('Channel:'), 0, 1, 4, 5) table.attach(self.lbl_channel, 1, 2, 4, 5) vbox.show_all()