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 and export cleanups
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/22337
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py	2010-03-28 15:56:49 +0000
+++ openlp/core/ui/__init__.py	2010-03-28 22:01:22 +0000
@@ -43,4 +43,4 @@
 
 __all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
     'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
-    'AmendThemeForm', 'MediaDockManager', 'ServiceItemNoteForm']
\ No newline at end of file
+    'AmendThemeForm', 'MediaDockManager', 'ServiceItemEditForm']

=== modified file 'openlp/plugins/bibles/forms/importwizardform.py'
--- openlp/plugins/bibles/forms/importwizardform.py	2010-03-27 19:59:35 +0000
+++ openlp/plugins/bibles/forms/importwizardform.py	2010-03-28 22:01:22 +0000
@@ -32,7 +32,7 @@
 
 from bibleimportwizard import Ui_BibleImportWizard
 from openlp.core.lib import Receiver
-from openlp.core.utils import AppLocation, variant_to_unicode, string_to_unicode
+from openlp.core.utils import AppLocation, variant_to_unicode
 from openlp.plugins.bibles.lib.manager import BibleFormat
 
 log = logging.getLogger(__name__)
@@ -425,4 +425,3 @@
         self.finishButton.setVisible(True)
         self.cancelButton.setVisible(False)
         Receiver.send_message(u'process_events')
-

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2010-03-28 16:11:33 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2010-03-28 22:01:22 +0000
@@ -28,7 +28,7 @@
 
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
-contextMenuAction, contextMenuSeparator
+    contextMenuAction
 
 log = logging.getLogger(__name__)