Fixed up things that were broken due to the move.

bzr-revno: 140

.eric4project/openlp.org 2.0.e4q

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
 <!-- eric4 user project file for project openlp.org 2.0 -->
-<!-- Saved: 2008-11-28, 16:03:21 -->
+<!-- Saved: 2008-11-29, 07:33:22 -->
 <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
 <UserProject version="4.0">
 </UserProject>

.eric4project/openlp.org 2.0.e4t

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Tasks SYSTEM "Tasks-4.2.dtd">
 <!-- eric4 tasks file for project openlp.org 2.0 -->
-<!-- Saved: 2008-11-28, 16:03:25 -->
+<!-- Saved: 2008-11-29, 07:33:22 -->
 <Tasks version="4.2">
   <Task priority="1" completed="False" bugfix="False">
     <Summary>TODO: what is the tags for bridge, pre-chorus?</Summary>

openlp.org 2.0.e4p

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-4.4.dtd">
 <!-- eric4 project file for project openlp.org 2.0 -->
-<!-- Saved: 2008-11-28, 16:03:20 -->
+<!-- Saved: 2008-11-28, 23:40:29 -->
 <!-- Copyright (C) 2008 Raoul Snyman, raoulsnyman@openlp.org -->
 <Project version="4.4">
   <ProgLanguage mixed="0">Python</ProgLanguage>
@@ -24,9 +24,6 @@
     <Source>openlp/core/plugin.py</Source>
     <Source>openlp/core/xmlrootclass.py</Source>
     <Source>openlp/plugins/biblemanager/__init__.py</Source>
-    <Source>openlp/plugins/biblemanager/BibleDBImpl.py</Source>
-    <Source>openlp/plugins/biblemanager/BibleManager.py</Source>
-    <Source>openlp/plugins/biblemanager/BibleHTTPImpl.py</Source>
     <Source>openlp/plugins/biblemanager/test/__init__.py</Source>
     <Source>openlp/plugins/biblemanager/test/test_bibleManager.py</Source>
     <Source>openlp/plugins/__init__.py</Source>
@@ -34,14 +31,11 @@
     <Source>openlp/plugins/testplugin2/__init__.py</Source>
     <Source>openlp/plugins/testplugin2/testplugin2.py</Source>
     <Source>openlp/plugins/test/test_plugin_manager.py</Source>
-    <Source>openlp/plugins/biblemanager/BibleCommon.py</Source>
     <Source>openlp/libraries/pptviewlib/ppttest.py</Source>
-    <Source>openlp/plugins/biblemanager/BibleCSVImpl.py</Source>
     <Source>openlp/plugins/biblemanager/test/test_bibleManagerAPI.py</Source>
     <Source>openlp/plugins/biblemanager/test/test_bibleManagerCSV.py</Source>
     <Source>openlp/plugins/mediamanageritem.py</Source>
     <Source>openlp/plugins/test/test_mediamanageritem.py</Source>
-    <Source>openlp/plugins/biblemanager/BibleOSISImpl.py</Source>
     <Source>openlp/plugins/biblemanager/test/test_bibleManagerOSIS.py</Source>
     <Source>openlp/core/pluginmanager.py</Source>
     <Source>openlp/core/mediamanageritem.py</Source>
@@ -71,12 +65,35 @@
     <Source>openlp/plugins/songs/test/test_song_text.py</Source>
     <Source>openlp/core/theme/test/test_theme.py</Source>
     <Source>openlp/core/event.py</Source>
+    <Source>openlp/core/resources.py</Source>
+    <Source>openlp/plugins/biblemanager/bibleplugin.py</Source>
+    <Source>openlp/plugins/biblemanager/bibleOSISImpl.py</Source>
+    <Source>openlp/plugins/biblemanager/bibleHTTPImpl.py</Source>
+    <Source>openlp/plugins/biblemanager/bibleDBImpl.py</Source>
+    <Source>openlp/plugins/biblemanager/bibleCSVImpl.py</Source>
+    <Source>openlp/plugins/biblemanager/bibleCommon.py</Source>
+    <Source>openlp/plugins/biblemanager/bibleManager.py</Source>
+    <Source>resources/__init__.py</Source>
   </Sources>
   <Forms>
+    <Form>resources/forms/bibleimport.ui</Form>
+    <Form>resources/forms/openlpexportform.ui</Form>
+    <Form>resources/forms/editsongform.ui</Form>
+    <Form>resources/forms/opensongexportform.ui</Form>
+    <Form>resources/forms/about.ui</Form>
+    <Form>resources/forms/settings.ui</Form>
+    <Form>resources/forms/themewizard.ui</Form>
+    <Form>resources/forms/opensongimportform.ui</Form>
+    <Form>resources/forms/alertform.ui</Form>
+    <Form>resources/forms/mainwindow.ui</Form>
+    <Form>resources/forms/songexport.ui</Form>
+    <Form>resources/forms/openlpimportform.ui</Form>
+    <Form>resources/forms/splashscreen.ui</Form>
   </Forms>
   <Translations>
   </Translations>
   <Resources>
+    <Resource>resources/images/openlp-2.qrc</Resource>
   </Resources>
   <Interfaces>
   </Interfaces>

openlp.pyw

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 """
 OpenLP - Open Source Lyrics Projection
 Copyright (c) 2008 Raoul Snyman

openlp/core/__init__.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 """
 OpenLP - Open Source Lyrics Projection
 Copyright (c) 2008 Raoul Snyman
@@ -20,5 +22,8 @@ from openlp.core.render import Renderer
 from openlp.core.settingsmanager import SettingsManager
 from openlp.core.plugin import Plugin
 from openlp.core.pluginmanager import PluginManager
+from openlp.core.settingstab import SettingsTab
+from openlp.core.mediamanageritem import MediaManagerItem
 
-__all__ = ['Renderer', 'SettingsManager', 'Plugin', 'PluginManager']
+__all__ = ['Renderer', 'SettingsManager', 'Plugin', 'PluginManager',
+           'SettingsTab', 'MediaManagerItem']

openlp/core/mediamanageritem.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 """
 OpenLP - Open Source Lyrics Projection
 Copyright (c) 2008 Raoul Snyman
@@ -20,7 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 import types
 
 from PyQt4 import QtCore, QtGui
-from openlp.resources import *
+from openlp.core.resources import *
 
 class MediaManagerItem(QtGui.QWidget):
     """

openlp/core/plugin.py

@@ -61,7 +61,7 @@ class Plugin(object):
         be overridden, like so:
         class MyPlugin(Plugin):
             def __init__(self):
-                Plugin.__init('MyPlugin', '0.1')
+                Plugin.__init(self, 'MyPlugin', '0.1')
                 ...
         """
         if name is not None:

openlp/core/pluginmanager.py

@@ -27,7 +27,7 @@ from openlp.core import Plugin
 mypath=os.path.split(os.path.abspath(__file__))[0]
 sys.path.insert(0,(os.path.join(mypath, '..' ,'..')))
 
-class PluginManager:
+class PluginManager(object):
     """
     This is the Plugin manager, which loads all the plugins,
     and executes all the hooks, as and when necessary.
@@ -72,7 +72,7 @@ class PluginManager:
         self.plugins = Plugin.__subclasses__()
         self.plugin_by_name = {}
         for p in self.plugins:
-            self.plugin_by_name[p.name] = p;
+            self.plugin_by_name[p.Name] = p;
 
     def hook_media_manager(self, MediaToolBox):
         """
@@ -81,6 +81,6 @@ class PluginManager:
         """
         for plugin in self.plugins:
             if plugin.MediaManagerItem is not None:
-                log.debug('Inserting media manager item from %s' % plugin.name)
+                log.debug('Inserting media manager item from %s' % plugin.Name)
                 MediaToolBox.addItem(plugin.MediaManagerItem,  plugin.Icon,  plugin.Name)
 

openlp/core/settingsmanager.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 """
 OpenLP - Open Source Lyrics Projection
 Copyright (c) 2008 Raoul Snyman

openlp/core/settingstab.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
 """
 OpenLP - Open Source Lyrics Projection
 Copyright (c) 2008 Raoul Snyman
@@ -19,7 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 from PyQt4 import QtCore, QtGui
-from openlp.resources import *
+from openlp.core.resources import *
 
 class SettingsTab(QtGui.QWidget):
     pass

openlp/core/ui/mainwindow.py

@@ -40,7 +40,7 @@ class MainWindow(object):
         #self.opensongexportform = OpenSongExportForm()
         #self.opensongimportform = OpenSongImportForm()
         self.settings_form = SettingsDialog()
-        self.plugin_manager = PluginManager()
+        self.plugin_manager = PluginManager('/home/raoul/Projects/openlp-2/openlp/plugins')
 
     def setupUi(self):
         self.main_window.setObjectName("main_window")

openlp/plugins/biblemanager/bibleplugin.py

@@ -19,13 +19,13 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 from PyQt4 import QtCore, QtGui
-#from openlp.resources import *
+from openlp.core.resources import *
 from openlp.core import Plugin
 
 class BiblePlugin(Plugin):
     def __init__(self):
         # Call the parent constructor
-        Plugin.__init__('Bible', '1.9.0')
+        Plugin.__init__(self, 'Bible', '1.9.0')
         # Create the plugin icon
         self.Icon = QtGui.QIcon()
         self.Icon.addPixmap(QtGui.QPixmap(':/media/media_Bible.png'),
@@ -75,14 +75,13 @@ class BiblePlugin(Plugin):
 
 
 class runner(QtGui.QApplication):
-
     def run(self):
         values = ["Genesis","Matthew","Revelation"]
         self.bim = BibleImportDialog()
         self.bim.show()
         self.processEvents()
         sys.exit(app.exec_())
-        
+
 if __name__ == '__main__':
     app = runner(sys.argv)
     app.run()

openlp/plugins/songs/songsplugin.py

@@ -19,13 +19,13 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 from PyQt4 import QtCore, QtGui
-from openlp.resources import *
+from openlp.core.resources import *
 from openlp.core import Plugin, MediaManagerItem
 
 class SongsPlugin(Plugin):
     def __init__(self):
         # Call the parent constructor
-        Plugin.__init__('Song', '1.9.0')
+        Plugin.__init__(self, 'Song', '1.9.0')
         # Create the plugin icon
         self.Icon = QtGui.QIcon()
         self.Icon.addPixmap(QtGui.QPixmap(':/media/media_song.png'),