gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 12:28:08 +01:00
Code Issues Projects Releases Wiki Activity

curses/wicd-curses.py: ListBox focus-maintaining code completely debugged

Browse Source
This commit is contained in:
Andrew Psaltis
2009-02-05 16:33:45 -05:00
parent 96f55c0d3b
commit f437f17b58
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
curses/netentry_curses.py
View File

@@ -343,7 +343,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
return noneToBlankString(wireless.GetWirelessProperty(networkid, label)) return noneToBlankString(wireless.GetWirelessProperty(networkid, label))
# Ripped from netentry.py # Ripped from netentry.py
def save_settings(self, networkid): def save_settings(self):
# Check encryption info # Check encryption info
if self.encryption_chkbox.get_state(): if self.encryption_chkbox.get_state():
#print "setting encryption info..." #print "setting encryption info..."
@@ -358,11 +358,11 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
self.set_net_prop(x, noneToString(encryption_info[x]. self.set_net_prop(x, noneToString(encryption_info[x].
get_edit_text())) get_edit_text()))
elif not self.encryption_chkbox.get_state() and \ elif not self.encryption_chkbox.get_state() and \
wireless.GetWirelessProperty(networkid, "encryption"): wireless.GetWirelessProperty(self.networkID, "encryption"):
error(self.ui, self.overlay, language['enable_encryption']) error(self.ui, self.overlay, language['enable_encryption'])
return False return False
else: else:
#print 'encryption is ' + str(wireless.GetWirelessProperty(networkid, #print 'encryption is ' + str(wireless.GetWirelessProperty(self.networkID,
# "encryption")) # "encryption"))
#print "no encryption specified..." #print "no encryption specified..."
self.set_net_prop("enctype", "None") self.set_net_prop("enctype", "None")
@@ -372,9 +372,9 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
self.set_net_prop('use_settings_globally', True) self.set_net_prop('use_settings_globally', True)
else: else:
self.set_net_prop('use_settings_globally', False) self.set_net_prop('use_settings_globally', False)
wireless.RemoveGlobalEssidEntry(networkid) wireless.RemoveGlobalEssidEntry(self.networkID)
wireless.SaveWirelessNetworkProfile(networkid) wireless.SaveWirelessNetworkProfile(self.networkID)
return True return True
# More or less ripped from netentry.py # More or less ripped from netentry.py

4
curses/wicd-curses.py
View File

@@ -726,10 +726,10 @@ class appGUI():
@wrap_exceptions() @wrap_exceptions()
def idle_incr(self): def idle_incr(self):
theText = " " theText = " "
#if self.special != None:
# theText += self.special
if self.connecting: if self.connecting:
theText += "-- "+language['connecting']+' -- '+language["esc_to_cancel"] theText += "-- "+language['connecting']+' -- '+language["esc_to_cancel"]
else:
theText += "-- Press H or ? for Help"
quit_note = ' -- '+language["press_to_quit"] quit_note = ' -- '+language["press_to_quit"]
self.footer1 = urwid.Text(str(self.incr) + theText+quit_note,wrap='clip') self.footer1 = urwid.Text(str(self.incr) + theText+quit_note,wrap='clip')
self.incr+=1 self.incr+=1

2
setup.py
View File

@@ -27,7 +27,7 @@ import subprocess
# VERSIONNUMBER # VERSIONNUMBER
VERSION_NUM = '1.6.0' VERSION_NUM = '1.6.0'
REVISION_NUM = 'unknown' REVISION_NUM = 'unknown'
CURSES_REVNO = 'r270' CURSES_REVNO = 'r271'
try: try:
if not os.path.exists('vcsinfo.py'): if not os.path.exists('vcsinfo.py'):