Code separation, added wicd-gtk script

wicd/gui.py

@@ -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")

wicd/guiutil.py

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

wicd/netentry.py

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

wicd/prefs.py

@@ -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/')
 

wicd/wicd-client.py

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

wicd/wicd-daemon.py

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