Merge lp:~raoul-snyman/openlp/bugfixes into lp:openlp

[Raoul Snyman]

[Raoul Snyman (raoul-snyman)]

Just changed the resource import slightly. Now it only imports the init function and runs that at a specific time. For Michael Gorven.

[Jon Tibble (meths)]

review: Approve

[lp:~raoul-snyman/openlp/bugfixes]

560. By Raoul Snyman on 2009-09-20

Merged in lp:~raoul-snyman/openlp/bugfixes

=== modified file 'openlp.pyw'
--- openlp.pyw	2009-09-12 21:31:35 +0000
+++ openlp.pyw	2009-09-20 15:45:33 +0000
@@ -30,7 +30,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver, str_to_bool
-from openlp.core.resources import *
+from openlp.core.resources import qInitResources
 from openlp.core.ui import MainWindow, SplashScreen
 from openlp.core.utils import ConfigHelper
 
@@ -105,6 +105,8 @@
         log.setLevel(logging.DEBUG)
     else:
         log.setLevel(logging.INFO)
+    # Initialise the resources
+    qInitResources()
     # Now create and actually run the application.
     app = OpenLP(sys.argv)
     sys.exit(app.run())
@@ -113,6 +115,4 @@
     """
     Instantiate and run the application.
     """
-    #import cProfile
-    #cProfile.run("main()", "profile.out")
     main()

=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py	2009-09-08 19:58:05 +0000
+++ openlp/core/ui/settingsform.py	2009-09-20 15:45:33 +0000
@@ -27,7 +27,6 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import SettingsTab
-from openlp.core.resources import *
 from openlp.core.ui import GeneralTab, ThemesTab, AlertsTab
 from settingsdialog import Ui_SettingsDialog