raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Changed the "from openlp.core.resources import *" to a specific import, as per Michael Gorven's request.

Browse Source
This commit is contained in:
Raoul Snyman 2009-09-20 17:45:33 +02:00
parent de9e843c04
commit 61eee2fe3c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp.pyw
View File

@ -30,7 +30,7 @@ from optparse import OptionParser
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import Receiver, str_to_bool 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.ui import MainWindow, SplashScreen
from openlp.core.utils import ConfigHelper from openlp.core.utils import ConfigHelper
@ -105,6 +105,8 @@ def main():
log.setLevel(logging.DEBUG) log.setLevel(logging.DEBUG)
else: else:
log.setLevel(logging.INFO) log.setLevel(logging.INFO)
# Initialise the resources
qInitResources()
# Now create and actually run the application. # Now create and actually run the application.
app = OpenLP(sys.argv) app = OpenLP(sys.argv)
sys.exit(app.run()) sys.exit(app.run())
@ -113,6 +115,4 @@ if __name__ == u'__main__':
""" """
Instantiate and run the application. Instantiate and run the application.
""" """
#import cProfile
#cProfile.run("main()", "profile.out")
main() main()

1
openlp/core/ui/settingsform.py
View File

@ -27,7 +27,6 @@ import logging
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import SettingsTab from openlp.core.lib import SettingsTab
from openlp.core.resources import *
from openlp.core.ui import GeneralTab, ThemesTab, AlertsTab from openlp.core.ui import GeneralTab, ThemesTab, AlertsTab
from settingsdialog import Ui_SettingsDialog from settingsdialog import Ui_SettingsDialog