From 61eee2fe3c6011027a15a4a162763f395e68b20e Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Sun, 20 Sep 2009 17:45:33 +0200
Subject: [PATCH] Changed the "from openlp.core.resources import *" to a
 specific import, as per Michael Gorven's request.

---
 openlp.pyw                     | 6 +++---
 openlp/core/ui/settingsform.py | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/openlp.pyw b/openlp.pyw
index e81d54ea0..07ea1b159 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -30,7 +30,7 @@ from optparse import OptionParser
 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 @@ def main():
         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 @@ if __name__ == u'__main__':
     """
     Instantiate and run the application.
     """
-    #import cProfile
-    #cProfile.run("main()", "profile.out")
     main()
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index 0b6e4de7b..e359a197b 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -27,7 +27,6 @@ import logging
 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