Move modules to a separate dir.

21 files changed, 23 insertions, 23 deletions

diff --git a/nephilim.py b/nephilim.py
index f3a1c89..0acb936 100755
--- a/nephilim.py
+++ b/nephilim.py
@@ -3,10 +3,11 @@
 # mpclientpc.py
 
 import sys
-from PyQt4 import QtGui
-from winMain import winMain
+from PyQt4     import QtGui
 from traceback import print_exc
-from misc import APPNAME
+
+from nephilim.winMain import winMain
+from nephilim.misc    import APPNAME
 
 
 def main():
diff --git a/LyricWiki_client.py b/nephilim/LyricWiki_client.py
index 76c24bb..76c24bb 100644
--- a/LyricWiki_client.py
+++ b/nephilim/LyricWiki_client.py
diff --git a/LyricWiki_types.py b/nephilim/LyricWiki_types.py
index d27cb1c..d27cb1c 100644
--- a/LyricWiki_types.py
+++ b/nephilim/LyricWiki_types.py
diff --git a/clPlugin.py b/nephilim/clPlugin.py
index efbd502..efbd502 100644
--- a/clPlugin.py
+++ b/nephilim/clPlugin.py
diff --git a/clSong.py b/nephilim/clSong.py
index 9b38076..9b38076 100644
--- a/clSong.py
+++ b/nephilim/clSong.py
diff --git a/default_layout b/nephilim/default_layout
index 5755674..5755674 100644
--- a/default_layout
+++ b/nephilim/default_layout
diff --git a/misc.py b/nephilim/misc.py
index b07360d..b07360d 100644
--- a/misc.py
+++ b/nephilim/misc.py
diff --git a/mpclient.py b/nephilim/mpclient.py
index 26b4d13..26b4d13 100644
--- a/mpclient.py
+++ b/nephilim/mpclient.py
diff --git a/mpd.py b/nephilim/mpd.py
index 2d14bb6..2d14bb6 100644
--- a/mpd.py
+++ b/nephilim/mpd.py
diff --git a/plugins/AlbumCover.py b/nephilim/plugins/AlbumCover.py
index e49fe0e..426df96 100644
--- a/plugins/AlbumCover.py
+++ b/nephilim/plugins/AlbumCover.py
@@ -5,8 +5,8 @@ import os
 import shutil
 import logging
 
-from clPlugin import Plugin
-from misc import ORGNAME, APPNAME
+from ..clPlugin import Plugin
+from ..misc     import ORGNAME, APPNAME
 
 # FETCH MODES
 AC_NO_FETCH = 0
diff --git a/plugins/Filebrowser.py b/nephilim/plugins/Filebrowser.py
index 9b39a05..0a2908d 100644
--- a/plugins/Filebrowser.py
+++ b/nephilim/plugins/Filebrowser.py
@@ -2,8 +2,8 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 import os
 
-from clPlugin import Plugin
-from misc import ORGNAME, APPNAME
+from ..clPlugin import Plugin
+from ..misc     import ORGNAME, APPNAME
 
 class pluginFilebrowser(Plugin):
     view  = None
diff --git a/plugins/Library.py b/nephilim/plugins/Library.py
index 101fce4..60490d9 100644
--- a/plugins/Library.py
+++ b/nephilim/plugins/Library.py
@@ -1,8 +1,8 @@
 from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 
-from clPlugin import Plugin
-from misc import ORGNAME, APPNAME
+from ..clPlugin import Plugin
+from ..misc     import ORGNAME, APPNAME
 
 class pluginLibrary(Plugin):
     o=None
diff --git a/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py
index f0efb55..1983f2a 100644
--- a/plugins/Lyrics.py
+++ b/nephilim/plugins/Lyrics.py
@@ -4,8 +4,8 @@ from PyQt4.QtCore import QVariant
 from thread import start_new_thread
 import logging
 
-from clPlugin import Plugin
-import LyricWiki_client
+from ..clPlugin import Plugin
+from ..         import LyricWiki_client
 
 class wgLyrics(QtGui.QWidget):
     " contains the lyrics"
diff --git a/plugins/Notify.py b/nephilim/plugins/Notify.py
index 40767fa..b3c2285 100644
--- a/plugins/Notify.py
+++ b/nephilim/plugins/Notify.py
@@ -2,9 +2,9 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 from traceback import print_exc
 
-from misc import *
-from clPlugin import Plugin
-import plugins
+from ..misc     import sec2min, ORGNAME, APPNAME
+from ..clPlugin import Plugin
+from ..         import plugins
 
 NOTIFY_PRIORITY_SONG = 1
 NOTIFY_PRIORITY_VOLUME = 2
diff --git a/plugins/PlayControl.py b/nephilim/plugins/PlayControl.py
index 8a17280..c5690be 100644
--- a/plugins/PlayControl.py
+++ b/nephilim/plugins/PlayControl.py
@@ -2,8 +2,8 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 import logging
 
-from misc import ORGNAME, APPNAME, Button
-from clPlugin import Plugin
+from ..misc import ORGNAME, APPNAME, Button
+from ..clPlugin import Plugin
 
 class wgPlayControl(QtGui.QToolBar):
     """Displays controls for interacting with playing, like play, volume ..."""
diff --git a/plugins/Playlist.py b/nephilim/plugins/Playlist.py
index 8fc315b..2258701 100644
--- a/plugins/Playlist.py
+++ b/nephilim/plugins/Playlist.py
@@ -1,8 +1,7 @@
 from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 
-from clPlugin import Plugin
-import plugins
+from ..clPlugin import Plugin
 
 # Dependencies:
 #   playcontrol
diff --git a/plugins/Systray.py b/nephilim/plugins/Systray.py
index a85f0b8..49a1414 100644
--- a/plugins/Systray.py
+++ b/nephilim/plugins/Systray.py
@@ -1,8 +1,8 @@
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 
-from clPlugin import Plugin
-from misc import *
+from ..clPlugin import Plugin
+from ..misc import sec2min, ORGNAME, APPNAME, appIcon
 
 class pluginSystray(Plugin):
     DEFAULTS = {'format': '$track - $title by $artist on $album ($length)'}
diff --git a/plugins/__init__.py b/nephilim/plugins/__init__.py
index 2e31655..affbf45 100644
--- a/plugins/__init__.py
+++ b/nephilim/plugins/__init__.py
@@ -18,10 +18,10 @@ def loadPlugins():
     """(Re)load all modules in the plugins directory."""
     global _plugins
     _plugins={}
-    for file in os.listdir('plugins'):
+    for file in os.listdir('nephilim/plugins'):
         if file[-3:]=='.py' and file!='__init__.py':
             name=file[:-3]  # name without ext
-            mod='plugins.%s'%(name) # mod name
+            mod='nephilim.plugins.%s'%(name) # mod name
             className='plugin%s'%(name) # classname
             
             _plugins[className.lower()]=[mod, className, None, None]
diff --git a/winConnect.py b/nephilim/winConnect.py
index 45789ac..45789ac 100644
--- a/winConnect.py
+++ b/nephilim/winConnect.py
diff --git a/winMain.py b/nephilim/winMain.py
index accf864..accf864 100644
--- a/winMain.py
+++ b/nephilim/winMain.py
diff --git a/winSettings.py b/nephilim/winSettings.py
index 08873df..08873df 100644
--- a/winSettings.py
+++ b/nephilim/winSettings.py