1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 04:20:22 +01:00

Generic updates and a bugfix.

curses/README,curses/TODO: Cleaned up and updated respectively
curses/curses_misc.py: added a get_caption() method to MaskingEdit
curses/netentry_curses.py: Actually made the error dialogs work instead of crashing the program.
curses/wicd-curses.py: Changed some capitalization in the help.
This commit is contained in:
Andrew Psaltis
2009-04-01 19:01:00 -04:00
parent 3bfb01d039
commit 69fe67d6af
5 changed files with 12 additions and 10 deletions

View File

@@ -208,10 +208,11 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
########################################
class WirelessSettingsDialog(AdvancedSettingsDialog):
def __init__(self,networkID):
def __init__(self,networkID,parent):
global wireless, daemon
AdvancedSettingsDialog.__init__(self)
self.networkid = networkID
self.parent = parent
global_settings_t = language['global_settings']
encryption_t = language['use_encryption']
autoconnect_t = language['automatic_connect']
@@ -307,9 +308,9 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
for entry_info in encrypt_info.itervalues():
if entry_info[0].get_edit_text() == "" \
and entry_info[1] == 'required':
error(self.ui, self.overlay,"%s (%s)" \
error(self.ui, self.parent,"%s (%s)" \
% (language['encrypt_info_missing'],
entry_info[0].get_captionabel() )
entry_info[0].get_caption()[0:-2] )
)
return False
@@ -319,7 +320,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
elif not self.encryption_chkbox.get_state() and \
wireless.GetWirelessProperty(self.networkid, "encryption"):
# Encrypt checkbox is off, but the network needs it.
error(self.ui, self.overlay, language['enable_encryption'])
error(self.ui, self.parent, language['enable_encryption'])
return False
else:
self.set_net_prop("enctype", "None")