From aa6a2d7ec9c06a2fe5042fdde75fbdd7590288c6 Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Fri, 15 May 2009 01:05:04 -0400 Subject: [PATCH 1/3] Added some deactivated options for enabling debug logs. --- curses/wicd-curses.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index 4485fed..34559e4 100755 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -69,6 +69,9 @@ from optparse import OptionParser #from grp import getgrgid #from os import getgroups,system +import logging +import logging.handler + CURSES_REVNO=wpath.curses_revision # Fix strings in wicd-curses @@ -989,7 +992,7 @@ class appGUI(): ######################################## def main(): - global ui + global ui, dlogger # We are _not_ python. misc.RenameProcess('wicd-curses') @@ -1003,6 +1006,11 @@ def main(): import urwid.curses_display ui = urwid.curses_display.Screen() + #if options.debug: + # dlogger = logging.getLogger("Debug") + # dlogger.setLevel(logging.DEBUG) + # dlogger.debug("wicd-curses debug logging started") + # Default Color scheme. # Other potential color schemes can be found at: # http://excess.org/urwid/wiki/RecommendedPalette @@ -1087,10 +1095,12 @@ setup_dbus() ######################################## if __name__ == '__main__': parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REVNO,daemon.Hello())) - parser.set_defaults(screen='raw') + parser.set_defaults(screen='raw',debug=False) parser.add_option("-r", "--raw-screen",action="store_const",const='raw' ,dest='screen',help="use urwid's raw screen controller (default)") parser.add_option("-c", "--curses-screen",action="store_const",const='curses',dest='screen',help="use urwid's curses screen controller") + parser.add_option("-d", "--debug",action="store_true", + ,dest='debug',help="enable logging of wicd-curses (currently does nothing)") (options,args) = parser.parse_args() main() # Make sure that the terminal does not try to overwrite the last line of From a886d437b6178a40e8ec1455e14f03ab796180c0 Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Tue, 19 May 2009 21:18:30 -0400 Subject: [PATCH 2/3] Flipped the order of the dhcp clients in the prefs dialog and fixed a syntax error in wicd-curses.py. --- curses/prefs_curses.py | 7 +++++-- curses/wicd-curses.py | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/curses/prefs_curses.py b/curses/prefs_curses.py index d51c61d..43da851 100644 --- a/curses/prefs_curses.py +++ b/curses/prefs_curses.py @@ -177,7 +177,10 @@ class PrefsDialog(urwid.WidgetWrap): self.dhcp_header = urwid.Text(dhcp_header_t) self.dhcp_l = [] - # Automatic + + # Order of these is flipped in the actual interface, + # (2,3,1 -> dhcpcd, pump, dhclient), because dhclient often doesn't like + # to work on several distros. self.dhcp0 = urwid.RadioButton(self.dhcp_l,automatic_t) self.dhcp1 = DynRadioButton(self.dhcp_l,dhcp1_t) self.dhcp2 = DynRadioButton(self.dhcp_l,dhcp2_t) @@ -199,7 +202,7 @@ class PrefsDialog(urwid.WidgetWrap): self.flush_l = [self.flush0,self.flush1,self.flush2] externalLB = urwid.ListBox([self.dhcp_header, - self.dhcp0,self.dhcp1,self.dhcp2,self.dhcp3, + self.dhcp0,self.dhcp2,self.dhcp3,self.dhcp1, _blank, self.wired_detect_header, self.wired0,self.wired1,self.wired2, diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index 34559e4..93a83b1 100755 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -69,8 +69,8 @@ from optparse import OptionParser #from grp import getgrgid #from os import getgroups,system -import logging -import logging.handler +#import logging +#import logging.handler CURSES_REVNO=wpath.curses_revision @@ -1099,7 +1099,7 @@ if __name__ == '__main__': parser.add_option("-r", "--raw-screen",action="store_const",const='raw' ,dest='screen',help="use urwid's raw screen controller (default)") parser.add_option("-c", "--curses-screen",action="store_const",const='curses',dest='screen',help="use urwid's curses screen controller") - parser.add_option("-d", "--debug",action="store_true", + parser.add_option("-d", "--debug",action="store_true" ,dest='debug',help="enable logging of wicd-curses (currently does nothing)") (options,args) = parser.parse_args() main() From c66383903d0883f86ddabcdda7ef9b7645a298eb Mon Sep 17 00:00:00 2001 From: Andrew Psaltis Date: Tue, 19 May 2009 21:20:29 -0400 Subject: [PATCH 3/3] Added wrap_exceptions to wicd-curses.py's run() function. --- curses/wicd-curses.py | 1 + 1 file changed, 1 insertion(+) diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index 93a83b1..4bc7b06 100755 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -1041,6 +1041,7 @@ def main(): urwid.set_encoding('utf8') ui.run_wrapper(run) +@wrap_exceptions def run(): global loop loop = gobject.MainLoop()