openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Import fixes and typo
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/23863
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2010-04-18 19:11:28 +0000
+++ openlp/core/ui/mainwindow.py	2010-04-21 17:07:17 +0000
@@ -671,7 +671,7 @@
 
     def serviceChanged(self, reset=False, serviceName=None):
         """
-        Hook to change the main window title when the service chmainwindow.pyanges
+        Hook to change the main window title when the service changes
 
         ``reset``
             Shows if the service has been cleared or saved

=== modified file 'openlp/plugins/alerts/forms/alertstab.py'
--- openlp/plugins/alerts/forms/alertstab.py	2010-04-17 11:28:23 +0000
+++ openlp/plugins/alerts/forms/alertstab.py	2010-04-21 17:07:17 +0000
@@ -26,7 +26,6 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import SettingsTab, str_to_bool
-from openlp.plugins.alerts.lib.models import AlertItem
 
 class AlertsTab(SettingsTab):
     """

=== modified file 'openlp/plugins/songs/lib/sofimport.py'
--- openlp/plugins/songs/lib/sofimport.py	2010-04-12 21:54:19 +0000
+++ openlp/plugins/songs/lib/sofimport.py	2010-04-21 17:07:17 +0000
@@ -29,22 +29,19 @@
 # http://www.oooforum.org/forum/viewtopic.phtml?t=14409
 # http://wiki.services.openoffice.org/wiki/Python
 
+import os
 import re
-import os
-import time
-from PyQt4 import QtCore
+
 from songimport import SongImport
 from oooimport import OooImport
 
 if os.name == u'nt':
-    from win32com.client import Dispatch
     BOLD = 150.0
     ITALIC = 2
     PAGE_BEFORE = 4
     PAGE_AFTER = 5
     PAGE_BOTH = 6
 else:
-    import uno
     from com.sun.star.awt.FontWeight import BOLD
     from com.sun.star.awt.FontSlant import ITALIC
     from com.sun.star.style.BreakType import PAGE_BEFORE, PAGE_AFTER, PAGE_BOTH

=== modified file 'openlp/plugins/songs/lib/songimport.py'
--- openlp/plugins/songs/lib/songimport.py	2010-04-12 21:49:56 +0000
+++ openlp/plugins/songs/lib/songimport.py	2010-04-21 17:07:17 +0000
@@ -24,7 +24,9 @@
 ###############################################################################
 
 import string
-from PyQt4 import QtGui, QtCore
+
+from PyQt4 import QtGui
+
 from openlp.core.lib import SongXMLBuilder
 from openlp.plugins.songs.lib.models import Song, Author, Topic, Book