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

Code separation, added wicd-gtk script

Browse Source
This commit is contained in:
David Paleino
2010-01-02 12:07:46 +01:00
parent 87d1eee5d0
commit a92af3a198
13 changed files with 64 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
in/scripts=wicd-cli.in
View File

@@ -1,2 +1,2 @@
#!/bin/bash
exec %PYTHON% -O %LIB%wicd-cli.py $@
exec %PYTHON% -O %LIB%cli/wicd-cli.py $@

2
in/scripts=wicd-client.in
View File

@@ -41,5 +41,5 @@ EOF
fi
else
exec %PYTHON% -O %LIB%wicd-client.py $@
exec %BIN%wicd-gtk
fi

2
in/scripts=wicd-curses.in
View File

@@ -6,4 +6,4 @@ if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; t
ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
fi
exec %PYTHON% -O %LIB%wicd-curses.py $@
exec %PYTHON% -O %LIB%curses/wicd-curses.py $@

15
in/scripts=wicd-gtk.in Normal file
View File

@@ -0,0 +1,15 @@
#!/bin/sh
# check_firstrun()
if [ ! -d "$HOME/.wicd" ]; then
mkdir -p "$HOME/.wicd"
fi
# Make sure the user knows WHEREAREMYFILES ;-)
if [ -e "/var/lib/wicd/WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
ln -s "/var/lib/wicd/WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
fi
PYTHONPATH=%LIB%
export PYTHONPATH
exec %PYTHON% -O %LIB%gtk/wicd-client.py $@

5
in/scripts=wicd.in
View File

@@ -1,3 +1,6 @@
#!/bin/bash
exec %PYTHON% -O %LIB%wicd-daemon.py $@
PYTHONPATH=%LIB%
export PYTHONPATH
exec %PYTHON% -O %LIB%daemon/wicd-daemon.py $@

4
in/wicd=wpath.py.in
View File

@@ -44,6 +44,10 @@ pmutils = '%PMUTILS%'
dbus = '%DBUS%'
desktop = '%DESKTOP%'
backends= '%BACKENDS%'
daemon = '%DAEMON%'
curses = '%CURSES%'
gtk = '%GTK%'
cli = '%CLI%'
translations = '%TRANSLATIONS%'
icons = '%ICONS%'
autostart = '%AUTOSTART%'

32
setup.py
View File

@@ -61,6 +61,10 @@ class configure(Command):
('bin=', None, 'set the bin directory'),
('sbin=', None, 'set the sbin directory'),
('backends=', None, 'set the backend storage directory'),
('daemon=', None, 'set the daemon directory'),
('curses=', None, 'set the curses UI directory'),
('gtk=', None, 'set the GTK UI directory'),
('cli=', None, 'set the CLI directory'),
('networks=', None, 'set the encryption configuration directory'),
('log=', None, 'set the log directory'),
('resume=', None, 'set the directory the resume from suspend script is stored in'),
@@ -113,7 +117,11 @@ class configure(Command):
self.encryption = self.etc + 'encryption/templates/'
self.bin = '/usr/bin/'
self.sbin = '/usr/sbin/'
self.backends = self.lib + 'backends'
self.daemon = self.share + 'daemon'
self.backends = self.share + 'backends'
self.curses = self.share + 'curses'
self.gtk = self.share + 'gtk'
self.cli = self.share + 'cli'
self.varlib = '/var/lib/wicd/'
self.networks = self.varlib + 'configurations/'
self.log = '/var/log/wicd/'
@@ -464,7 +472,7 @@ configure yet or you are running it for the first time.'''
data = []
py_modules=['wicd.networking','wicd.misc','wicd.wnettools',
'wicd.wpath','wicd.prefs','wicd.netentry','wicd.dbusmanager',
'wicd.wpath','wicd.dbusmanager',
'wicd.logfile','wicd.backend','wicd.configmanager',
'wicd.translations']
@@ -478,7 +486,7 @@ try:
os.listdir('encryption/templates') if not b.startswith('.')]),
(wpath.networks, []),
(wpath.sbin, ['scripts/wicd']),
(wpath.lib, ['wicd/monitor.py', 'wicd/wicd-daemon.py', 'wicd/configscript.py',
(wpath.daemon, ['wicd/monitor.py', 'wicd/wicd-daemon.py',
'wicd/suspend.py', 'wicd/autoconnect.py']),
(wpath.backends, ['wicd/backends/be-external.py', 'wicd/backends/be-ioctl.py']),
(wpath.scripts, []),
@@ -488,11 +496,11 @@ try:
(wpath.postconnectscripts, []),
]
if not wpath.no_install_gtk:
py_modules.extend(['wicd.gui', 'wicd.guiutil'])
data.append((wpath.desktop, ['other/wicd.desktop']))
data.append((wpath.bin, ['scripts/wicd-client']))
data.append((wpath.share, ['data/wicd.glade']))
data.append((wpath.lib, ['wicd/wicd-client.py']))
data.append((wpath.gtk, ['wicd/wicd-client.py', 'wicd/netentry.py', 'wicd/prefs.py',
'wicd/gui.py', 'wicd/guiutil.py', 'data/wicd.glade',
'wicd/configscript.py']))
data.append((wpath.autostart, ['other/wicd-tray.desktop']))
if not wpath.no_install_man:
data.append((wpath.mandir + 'man1/', [ 'man/wicd-client.1' ]))
@@ -510,18 +518,18 @@ try:
data.append((wpath.icons + '16x16/apps/', ['icons/16px/wicd-client.png']))
data.append((wpath.images, [('images/' + b) for b in os.listdir('images') if not b.startswith('.')]))
if not wpath.no_install_ncurses:
data.append((wpath.lib, ['curses/curses_misc.py']))
data.append((wpath.lib, ['curses/prefs_curses.py']))
data.append((wpath.lib, ['curses/wicd-curses.py']))
data.append((wpath.lib, ['curses/netentry_curses.py']))
data.append((wpath.lib, ['curses/configscript_curses.py']))
data.append((wpath.curses, ['curses/curses_misc.py']))
data.append((wpath.curses, ['curses/prefs_curses.py']))
data.append((wpath.curses, ['curses/wicd-curses.py']))
data.append((wpath.curses, ['curses/netentry_curses.py']))
data.append((wpath.curses, ['curses/configscript_curses.py']))
data.append((wpath.bin, ['scripts/wicd-curses']))
if not wpath.no_install_man:
data.append(( wpath.mandir + 'man8/', ['man/wicd-curses.8']))
if not wpath.no_install_docs:
data.append(( wpath.docdir, ['curses/README.curses']))
if not wpath.no_install_cli:
data.append((wpath.lib, ['cli/wicd-cli.py']))
data.append((wpath.cli, ['cli/wicd-cli.py']))
data.append((wpath.bin, ['scripts/wicd-cli']))
if not wpath.no_install_man:
data.append(( wpath.mandir + 'man8/', ['man/wicd-cli.8']))

12
wicd/gui.py
View File

@@ -36,12 +36,12 @@ from dbus import DBusException
from wicd import misc
from wicd import wpath
from wicd import dbusmanager
from wicd import prefs
from wicd import netentry
from wicd.misc import noneToString
from wicd.netentry import WiredNetworkEntry, WirelessNetworkEntry
from wicd.prefs import PreferencesDialog
from wicd.guiutil import error, LabelEntry
import prefs
from prefs import PreferencesDialog
import netentry
from netentry import WiredNetworkEntry, WirelessNetworkEntry
from guiutil import error, LabelEntry
from wicd.translations import language
if __name__ == '__main__':
@@ -148,7 +148,7 @@ class appGui(object):
self.tray = tray
gladefile = os.path.join(wpath.share, "wicd.glade")
gladefile = os.path.join(wpath.gtk, "wicd.glade")
self.wTree = gtk.glade.XML(gladefile)
self.window = self.wTree.get_widget("window1")
self.window.set_icon_name("wicd-client")

2
wicd/guiutil.py
View File

@@ -19,7 +19,7 @@
import gtk
import os.path
import wpath
import wicd.wpath as wpath
HAS_NOTIFY = True
try:

14
wicd/netentry.py
View File

@@ -26,13 +26,13 @@ contained within them.
import gtk
import os
import misc
import wpath
import dbusmanager
from misc import noneToString, stringToNone, noneToBlankString, to_bool
import wicd.misc as misc
import wicd.wpath as wpath
import wicd.dbusmanager as dbusmanager
from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool
from guiutil import error, LabelEntry, GreyLabel, LeftAlignedLabel, string_input
from translations import language
from wicd.translations import language
# These get set when a NetworkEntry is instantiated.
daemon = None
@@ -303,7 +303,7 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
def edit_scripts(self, widget=None, event=None):
""" Launch the script editting dialog. """
profile = self.prof_name
cmdend = [os.path.join(wpath.lib, "configscript.py"), profile, "wired"]
cmdend = [os.path.join(wpath.gtk, "configscript.py"), profile, "wired"]
if os.getuid() != 0:
cmdbase = misc.get_sudo_cmd(language['scripts_need_pass'],
prog_num=daemon.GetSudoApp())
@@ -408,7 +408,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
def edit_scripts(self, widget=None, event=None):
""" Launch the script editting dialog. """
cmdend = [os.path.join(wpath.lib, "configscript.py"),
cmdend = [os.path.join(wpath.gtk, "configscript.py"),
str(self.networkID), "wireless"]
if os.getuid() != 0:
cmdbase = misc.get_sudo_cmd(language['scripts_need_pass'],

2
wicd/prefs.py
View File

@@ -39,7 +39,7 @@ daemon = None
wireless = None
wired = None
from translations import language
from wicd.translations import language
USER_SETTINGS_DIR = os.path.expanduser('~/.wicd/')

4
wicd/wicd-client.py
View File

@@ -60,9 +60,9 @@ except ImportError:
# Wicd specific imports
from wicd import wpath
from wicd import misc
from wicd import gui
from wicd import dbusmanager
from wicd.guiutil import error, can_use_notify
import gui
from guiutil import error, can_use_notify
from wicd.translations import language

2
wicd/wicd-daemon.py
View File

@@ -1790,7 +1790,7 @@ def main(argv):
daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect)
if not no_poll:
child_pid = Popen([misc.find_path("python"), "-O",
os.path.join(wpath.lib, "monitor.py")],
os.path.join(wpath.lib, "daemon", "monitor.py")],
shell=False, close_fds=True).pid
atexit.register(on_exit, child_pid)