openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/i18n into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/i18n/+merge/57055

Trying to fix the problem where UiStrings is not translated.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/i18n/+merge/57055
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/i18n into lp:openlp.

=== modified file 'openlp.pyw'
--- openlp.pyw	2011-04-05 14:24:51 +0000
+++ openlp.pyw	2011-04-09 18:18:27 +0000
@@ -38,13 +38,8 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Receiver, check_directory_exists
-from openlp.core.lib.ui import UiStrings
 from openlp.core.resources import qInitResources
-from openlp.core.ui.mainwindow import MainWindow
 from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm
-from openlp.core.ui.firsttimeform import FirstTimeForm
-from openlp.core.ui.exceptionform import ExceptionForm
-from openlp.core.ui import SplashScreen, ScreenList
 from openlp.core.utils import AppLocation, LanguageManager, VersionThread, \
     get_application_version
 
@@ -89,6 +84,8 @@
         """
         Run the OpenLP application.
         """
+        from openlp.core.ui.mainwindow import MainWindow
+        from openlp.core.ui import SplashScreen, ScreenList
         # provide a listener for widgets to reqest a screen update.
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'openlp_process_events'), self.processEvents)
@@ -102,6 +99,7 @@
         has_run_wizard = QtCore.QSettings().value(
             u'general/has run wizard', QtCore.QVariant(False)).toBool()
         if not has_run_wizard:
+            from openlp.core.ui.firsttimeform import FirstTimeForm
             if FirstTimeForm(screens).exec_() == QtGui.QDialog.Accepted:
                 QtCore.QSettings().setValue(u'general/has run wizard',
                     QtCore.QVariant(True))
@@ -137,6 +135,7 @@
         Look to see if OpenLP is already running and ask if a 2nd copy
         is to be started.
         """
+        from openlp.core.lib.ui import UiStrings
         self.sharedMemory = QtCore.QSharedMemory('OpenLP')
         if self.sharedMemory.attach():
             status = QtGui.QMessageBox.critical(None,
@@ -155,6 +154,7 @@
             log.exception(''.join(format_exception(exctype, value, traceback)))
             return
         if not hasattr(self, u'exceptionForm'):
+            from openlp.core.ui.exceptionform import ExceptionForm    
             self.exceptionForm = ExceptionForm(self.mainWindow)
         self.exceptionForm.exceptionTextEdit.setPlainText(
             ''.join(format_exception(exctype, value, traceback)))