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

If a network dialog is up when a scan is initiated externally, drop the dialog.

Browse Source
This commit is contained in:
Andrew Psaltis
2009-06-04 22:19:33 -04:00
parent a9ef525da5
commit 8f6d807d87
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
curses/netentry_curses.py
View File

@@ -171,7 +171,7 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
self._w.body.body.append(self.set_default) self._w.body.body.append(self.set_default)
self.prof_name = name self.prof_name = name
title = ">"+language['configuring_wired'].replace('$A',self.prof_name) title = language['configuring_wired'].replace('$A',self.prof_name)
self._w.header = urwid.Text( ('header',title),align='right' ) self._w.header = urwid.Text( ('header',title),align='right' )
self.set_values() self.set_values()
@@ -241,7 +241,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
self.encrypt_types = misc.LoadEncryptionMethods() self.encrypt_types = misc.LoadEncryptionMethods()
self.set_values() self.set_values()
title = ">"+language['configuring_wireless'].replace('$A',wireless.GetWirelessProperty(networkID,'essid')).replace('$B',wireless.GetWirelessProperty(networkID,'bssid')) title = language['configuring_wireless'].replace('$A',wireless.GetWirelessProperty(networkID,'essid')).replace('$B',wireless.GetWirelessProperty(networkID,'bssid'))
self._w.header = urwid.Text(('header',title),align='right' ) self._w.header = urwid.Text(('header',title),align='right' )
def encryption_toggle(self,chkbox,new_state,user_data=None): def encryption_toggle(self,chkbox,new_state,user_data=None):

12
curses/wicd-curses.py
View File

@@ -557,7 +557,8 @@ class appGUI():
self.prev_state = False self.prev_state = False
self.connecting = False self.connecting = False
self.screen_locked = False self.screen_locked = False
self.do_diag_lock = False self.do_diag_lock = False #Whether the screen is locked beneath a dialog
self.diag_type = 'none' # The type of dialog that is up
self.scanning = False self.scanning = False
self.pref = None self.pref = None
@@ -568,7 +569,6 @@ class appGUI():
self.scanning = True self.scanning = True
wireless.Scan(False) wireless.Scan(False)
def init_other_optcols(self): def init_other_optcols(self):
# The "tabbed" preferences dialog # The "tabbed" preferences dialog
self.prefCols = OptCols( [ ('meta enter','OK'), self.prefCols = OptCols( [ ('meta enter','OK'),
@@ -580,7 +580,7 @@ class appGUI():
# Does what it says it does # Does what it says it does
def lock_screen(self): def lock_screen(self):
if self.diag: if self.diag_type == 'pref':
self.do_diag_lock = True self.do_diag_lock = True
return True return True
self.frame.set_body(self.screen_locker) self.frame.set_body(self.screen_locker)
@@ -779,9 +779,12 @@ class appGUI():
#@wrap_exceptions #@wrap_exceptions
def dbus_scan_started(self): def dbus_scan_started(self):
self.scanning = True self.scanning = True
if self.diag_type == 'conf':
self.restore_primary()
self.lock_screen() self.lock_screen()
def restore_primary(self): def restore_primary(self):
self.diag_type = 'none'
if self.do_diag_lock or self.scanning: if self.do_diag_lock or self.scanning:
self.frame.set_body(self.screen_locker) self.frame.set_body(self.screen_locker)
self.do_diag_lock = False self.do_diag_lock = False
@@ -817,6 +820,7 @@ class appGUI():
self.diag = WirelessSettingsDialog(pos,self.frame) self.diag = WirelessSettingsDialog(pos,self.frame)
self.diag.ready_widgets(ui,self.frame) self.diag.ready_widgets(ui,self.frame)
self.frame.set_body(self.diag) self.frame.set_body(self.diag)
self.diag_type = 'conf'
# Guess what! I actually need to put this here, else I'll have # Guess what! I actually need to put this here, else I'll have
# tons of references to self.frame lying around. ^_^ # tons of references to self.frame lying around. ^_^
if "enter" in keys: if "enter" in keys:
@@ -843,13 +847,13 @@ class appGUI():
self.pref.ready_widgets(ui,self.frame) self.pref.ready_widgets(ui,self.frame)
self.frame.set_footer(urwid.Pile([self.prefCols,self.footer2])) self.frame.set_footer(urwid.Pile([self.prefCols,self.footer2]))
self.diag = self.pref self.diag = self.pref
self.diag_type = 'pref'
self.frame.set_body(self.diag) self.frame.set_body(self.diag)
# Halt here, keypress gets passed to the dialog otherwise # Halt here, keypress gets passed to the dialog otherwise
return True return True
if "A" in keys: if "A" in keys:
about_dialog(self.frame) about_dialog(self.frame)
if "C" in keys: if "C" in keys:
# Same as "enter" for now
focus = self.frame.body.get_focus() focus = self.frame.body.get_focus()
if focus == self.wiredCB: if focus == self.wiredCB:
self.special = focus self.special = focus