gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-25 07:32:29 +01:00
Code Issues Projects Releases Wiki Activity

Merged mainline back in; no other changes.

Browse Source
This commit is contained in:
Robby Workman
2009-05-19 23:40:13 -05:00
parent 51f46c40a1 f6cb6600c6
commit 6c7eff5a3c
6 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
curses/prefs_curses.py
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,

15
curses/wicd-curses.py
View File

@@ -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
@@ -1033,6 +1041,7 @@ def main():
urwid.set_encoding('utf8')
ui.run_wrapper(run)
@wrap_exceptions
def run():
global loop
loop = gobject.MainLoop()
@@ -1087,10 +1096,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

6
data/wicd.glade
View File

@@ -1138,7 +1138,7 @@ is already active.</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
<property name="position">3</property>
</packing>
</child>
<child>
@@ -1153,7 +1153,7 @@ is already active.</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
<property name="position">1</property>
</packing>
</child>
<child>
@@ -1168,7 +1168,7 @@ is already active.</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
<property name="position">2</property>
</packing>
</child>
</widget>

1
other/wicd-tray.desktop
View File

@@ -1,6 +1,5 @@
[Desktop Entry]
Categories=Application;Network;
Encoding=UTF-8
Exec=wicd-client
GenericName=Network Manager
Icon=wicd-client

5
setup.py
View File

@@ -86,6 +86,8 @@ class configure(Command):
('initfilename=', None, "set the name of the init file (don't use)"),
('wicdgroup=', None, "set the name of the group used for wicd"),
('distro=', None, 'set the distribution for which wicd will be installed'),
('loggroup=', None, 'the group the log file belongs to'),
('logperms=', None, 'the log file permissions'),
# Configure switches
('no-install-init', None, "do not install the init file"),
@@ -220,6 +222,8 @@ class configure(Command):
self.pidfile = '/var/run/wicd/wicd.pid'
self.initfilename = os.path.basename(self.initfile)
self.wicdgroup = 'users'
self.loggroup = ''
self.logperms = '0600'
def distro_check(self):
print "Distro is: "+self.distro
@@ -236,6 +240,7 @@ class configure(Command):
self.mandir = '/usr/man/'
self.no_install_acpi = True
elif self.distro in ['debian']:
self.wicdgroup = "netdev"
self.init = '/etc/init.d/'
self.initfile = 'init/debian/wicd'
elif self.distro in ['arch']:

12
wicd/wnettools.py
View File

@@ -214,17 +214,17 @@ class BaseInterface(object):
"""
def get_client_name(cl):
""" Converts the integer value for a dhcp client to a string. """
if self.dhclient_cmd and cl in [misc.DHCLIENT, misc.AUTO]:
client = "dhclient"
cmd = self.dhclient_cmd
if self.dhclient_needs_verbose:
cmd += ' -v'
elif self.dhcpcd_cmd and cl in [misc.DHCPCD, misc.AUTO]:
if self.dhcpcd_cmd and cl in [misc.DHCPCD, misc.AUTO]:
client = "dhcpcd"
cmd = self.dhcpcd_cmd
elif self.pump_cmd and cl in [misc.PUMP, misc.AUTO]:
client = "pump"
cmd = self.pump_cmd
elif self.dhclient_cmd and cl in [misc.DHCLIENT, misc.AUTO]:
client = "dhclient"
cmd = self.dhclient_cmd
if self.dhclient_needs_verbose:
cmd += ' -v'
else:
client = None
cmd = ""