1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-28 01:12:34 +01:00

Merged with experimental-nacl, r336.

This commit is contained in:
Andrew Psaltis
2009-05-19 21:22:14 -04:00
6 changed files with 26 additions and 17 deletions

View File

@@ -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,

View File

@@ -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
@@ -1070,6 +1070,7 @@ def main():
urwid.set_encoding('utf8')
ui.run_wrapper(run)
@wrap_exceptions
def run():
global loop
loop = gobject.MainLoop()
@@ -1135,7 +1136,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()