openlp-core team mailing list archive

Thread
Date

[Merge] lp:~meths/openlp/trivialfixes into lp:openlp

To: mp+13897@xxxxxxxxxxxxxxxxxx
From: Jon Tibble <meths@xxxxxxxxxxxxxx>
Date: Sat, 24 Oct 2009 16:45:27 -0000
Reply-to: mp+13897@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

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

    Requested reviews:
    OpenLP Core (openlp-core)


Remove unused imports from i18n patch

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

=== modified file 'openlp-get-strings.py'
--- openlp-get-strings.py	2009-10-24 07:14:11 +0000
+++ openlp-get-strings.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,6 @@
 ###############################################################################
 
 import os
-import sys
 import re
 
 ts_file = u"""<?xml version="1.0" encoding="utf-8"?>

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2009-10-24 13:07:41 +0000
+++ openlp/core/lib/mediamanageritem.py	2009-10-24 16:45:25 +0000
@@ -28,7 +28,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib.toolbar import *
-from openlp.core.lib import translate, contextMenuAction, contextMenuSeparator
+from openlp.core.lib import contextMenuAction, contextMenuSeparator
 from serviceitem import ServiceItem
 
 class MediaManagerItem(QtGui.QWidget):
@@ -36,7 +36,7 @@
     MediaManagerItem is a helper widget for plugins.
 
     None of the following *need* to be used, feel free to override
-    them cmopletely in your plugin's implementation. Alternatively,
+    them completely in your plugin's implementation. Alternatively,
     call them from your plugin before or after you've done extra
     things that you need to.
 

=== modified file 'openlp/core/ui/about.py'
--- openlp/core/ui/about.py	2009-10-23 13:17:43 +0000
+++ openlp/core/ui/about.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class AboutForm(QtGui.QDialog):
     """

=== modified file 'openlp/core/ui/alertform.py'
--- openlp/core/ui/alertform.py	2009-10-23 13:17:43 +0000
+++ openlp/core/ui/alertform.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 import logging
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class AlertForm(QtGui.QDialog):
     global log

=== modified file 'openlp/core/ui/alertstab.py'
--- openlp/core/ui/alertstab.py	2009-10-23 13:17:43 +0000
+++ openlp/core/ui/alertstab.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate
+from openlp.core.lib import SettingsTab
 
 class AlertsTab(SettingsTab):
     """

=== modified file 'openlp/core/ui/amendthemedialog.py'
--- openlp/core/ui/amendthemedialog.py	2009-10-23 18:48:49 +0000
+++ openlp/core/ui/amendthemedialog.py	2009-10-24 16:45:25 +0000
@@ -23,7 +23,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class Ui_AmendThemeDialog(object):
     def setupUi(self, AmendThemeDialog):

=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py	2009-10-24 10:04:35 +0000
+++ openlp/core/ui/amendthemeform.py	2009-10-24 16:45:25 +0000
@@ -28,7 +28,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import ThemeXML, file_to_xml, translate
+from openlp.core.lib import ThemeXML, file_to_xml
 from amendthemedialog import Ui_AmendThemeDialog
 
 log = logging.getLogger(u'AmendThemeForm')

=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py	2009-10-23 18:48:49 +0000
+++ openlp/core/ui/generaltab.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate, str_to_bool
+from openlp.core.lib import SettingsTab, str_to_bool
 
 class GeneralTab(SettingsTab):
     """

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2009-10-23 13:17:43 +0000
+++ openlp/core/ui/mainwindow.py	2009-10-24 16:45:25 +0000
@@ -30,9 +30,8 @@
 from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \
     ServiceManager, ThemeManager, MainDisplay, SlideController, \
     PluginForm, MediaDockManager
-from openlp.core.lib import translate, RenderManager, PluginConfig, \
-    OpenLPDockWidget, SettingsManager, PluginManager, Receiver, \
-    buildIcon, str_to_bool
+from openlp.core.lib import RenderManager, PluginConfig, buildIcon, \
+    OpenLPDockWidget, SettingsManager, PluginManager, Receiver, str_to_bool
 from openlp.core.utils import check_latest_version
 
 media_manager_style = """

=== modified file 'openlp/core/ui/plugindialog.py'
--- openlp/core/ui/plugindialog.py	2009-10-23 13:17:43 +0000
+++ openlp/core/ui/plugindialog.py	2009-10-24 16:45:25 +0000
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_PluginViewDialog(object):
     def setupUi(self, PluginViewDialog):

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2009-10-23 13:17:43 +0000
+++ openlp/core/ui/servicemanager.py	2009-10-24 16:45:25 +0000
@@ -30,7 +30,7 @@
 
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
-    translate, ServiceType, contextMenuAction, contextMenuSeparator, Receiver
+    ServiceType, contextMenuAction, contextMenuSeparator, Receiver
 
 class ServiceManagerList(QtGui.QTreeWidget):
 

=== modified file 'openlp/core/ui/settingsdialog.py'
--- openlp/core/ui/settingsdialog.py	2009-10-23 13:17:43 +0000
+++ openlp/core/ui/settingsdialog.py	2009-10-24 16:45:25 +0000
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_SettingsDialog(object):
     def setupUi(self, SettingsDialog):

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2009-10-24 16:00:43 +0000
+++ openlp/core/ui/slidecontroller.py	2009-10-24 16:45:25 +0000
@@ -26,7 +26,7 @@
 import time
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import OpenLPToolbar, translate, Receiver, ServiceType
+from openlp.core.lib import OpenLPToolbar, Receiver, ServiceType
 
 label_stylesheet = u"""
 QTableWidget::item:selected

=== modified file 'openlp/core/ui/splashscreen.py'
--- openlp/core/ui/splashscreen.py	2009-10-23 18:48:49 +0000
+++ openlp/core/ui/splashscreen.py	2009-10-24 16:45:25 +0000
@@ -23,7 +23,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class SplashScreen(object):
     def __init__(self, version):

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2009-10-24 09:55:25 +0000
+++ openlp/core/ui/thememanager.py	2009-10-24 16:45:25 +0000
@@ -32,7 +32,7 @@
 
 from openlp.core.ui import AmendThemeForm
 from openlp.core.theme import Theme
-from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, translate, \
+from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, \
     str_to_bool, file_to_xml, buildIcon, Receiver, contextMenuAction, \
     contextMenuSeparator
 from openlp.core.utils import ConfigHelper

=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py	2009-10-23 13:17:43 +0000
+++ openlp/core/ui/themestab.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate, Receiver
+from openlp.core.lib import SettingsTab, Receiver
 
 class ThemesTab(SettingsTab):
     """

=== modified file 'openlp/plugins/audit/auditplugin.py'
--- openlp/plugins/audit/auditplugin.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/audit/auditplugin.py	2009-10-24 16:45:25 +0000
@@ -27,7 +27,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Plugin, Receiver, translate, str_to_bool, buildIcon
+from openlp.core.lib import Plugin, Receiver, str_to_bool, buildIcon
 from openlp.plugins.audit.lib import AuditManager
 from openlp.plugins.audit.forms import AuditDetailForm, AuditDeleteForm
 from openlp.plugins.audit.lib.models import AuditItem

=== modified file 'openlp/plugins/audit/forms/auditdeleteform.py'
--- openlp/plugins/audit/forms/auditdeleteform.py	2009-10-23 13:17:43 +0000
+++ openlp/plugins/audit/forms/auditdeleteform.py	2009-10-24 16:45:25 +0000
@@ -27,8 +27,6 @@
 from PyQt4 import QtGui
 
 from auditdeletedialog import Ui_AuditDeleteDialog
-from openlp.core.lib import translate
-#from openlp.plugins.audit.lib import AuditManager
 
 class AuditDeleteForm(QtGui.QDialog, Ui_AuditDeleteDialog):
     """

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2009-10-24 16:45:25 +0000
@@ -26,7 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Plugin, translate, buildIcon
+from openlp.core.lib import Plugin, buildIcon
 from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem
 
 class BiblePlugin(Plugin):

=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py	2009-10-23 13:17:43 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py	2009-10-24 16:45:25 +0000
@@ -29,8 +29,7 @@
 from PyQt4 import QtCore, QtGui
 
 from bibleimportdialog import Ui_BibleImportDialog
-from openlp.core.lib import Receiver, translate
-
+from openlp.core.lib import Receiver
 
 class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
     global log

=== modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py'
--- openlp/plugins/bibles/lib/bibleOSISimpl.py	2009-10-23 13:17:43 +0000
+++ openlp/plugins/bibles/lib/bibleOSISimpl.py	2009-10-24 16:45:25 +0000
@@ -30,7 +30,7 @@
 
 from PyQt4 import QtCore
 
-from openlp.core.lib import translate, Receiver
+from openlp.core.lib import Receiver
 
 class BibleOSISImpl():
     """

=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py	2009-10-23 13:17:43 +0000
+++ openlp/plugins/bibles/lib/biblestab.py	2009-10-24 16:45:25 +0000
@@ -26,7 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, str_to_bool, Receiver
+from openlp.core.lib import str_to_bool, Receiver
 from openlp.core.lib import SettingsTab
 
 class BiblesTab(SettingsTab):

=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/bibles/lib/manager.py	2009-10-24 16:45:25 +0000
@@ -25,8 +25,6 @@
 import logging
 import os
 
-from openlp.core.lib import translate
-
 from bibleOSISimpl import BibleOSISImpl
 from bibleCSVimpl import BibleCSVImpl
 from bibleDBimpl import BibleDBImpl

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2009-10-23 13:17:43 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2009-10-24 16:45:25 +0000
@@ -27,8 +27,8 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, MediaManagerItem, Receiver, \
-    BaseListWithDnD, str_to_bool
+from openlp.core.lib import MediaManagerItem, Receiver, str_to_bool, \
+    BaseListWithDnD
 from openlp.plugins.bibles.forms import BibleImportForm
 from openlp.plugins.bibles.lib.manager import BibleMode
 

=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py	2009-10-23 13:17:43 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py	2009-10-24 16:45:25 +0000
@@ -22,7 +22,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class Ui_customEditDialog(object):
     def setupUi(self, customEditDialog):

=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py	2009-10-23 13:17:43 +0000
+++ openlp/plugins/custom/forms/editcustomform.py	2009-10-24 16:45:25 +0000
@@ -25,7 +25,7 @@
 from PyQt4 import QtCore, QtGui
 
 from editcustomdialog import Ui_customEditDialog
-from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
+from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver
 from openlp.plugins.custom.lib.models import CustomSlide
 
 class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):

=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py	2009-10-24 15:47:14 +0000
+++ openlp/plugins/images/lib/imagetab.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate, Receiver
+from openlp.core.lib import SettingsTab, Receiver
 
 class ImageTab(SettingsTab):
     """

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2009-10-24 16:45:25 +0000
@@ -26,7 +26,7 @@
 import os
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, BaseListWithDnD, buildIcon, translate
+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, buildIcon
 
 # We have to explicitly create separate classes for each plugin
 # in order for DnD to the Service manager to work correctly.

=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/media/lib/mediatab.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, str_to_bool, translate
+from openlp.core.lib import SettingsTab, str_to_bool
 
 class MediaTab(SettingsTab):
     """

=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2009-10-24 16:45:25 +0000
@@ -27,7 +27,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem, translate, BaseListWithDnD
+from openlp.core.lib import MediaManagerItem, BaseListWithDnD
 from openlp.plugins.presentations.lib import MessageListener
 
 # We have to explicitly create separate classes for each plugin

=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import SettingsTab, translate
+from openlp.core.lib import SettingsTab
 
 class PresentationTab(SettingsTab):
     """

=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/remotes/lib/remotetab.py	2009-10-24 16:45:25 +0000
@@ -20,7 +20,7 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import SettingsTab, translate
+from openlp.core.lib import SettingsTab
 
 class RemoteTab(SettingsTab):
     """

=== modified file 'openlp/plugins/songs/forms/authorsdialog.py'
--- openlp/plugins/songs/forms/authorsdialog.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/authorsdialog.py	2009-10-24 16:45:25 +0000
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_AuthorsDialog(object):
     def setupUi(self, AuthorsDialog):

=== modified file 'openlp/plugins/songs/forms/authorsform.py'
--- openlp/plugins/songs/forms/authorsform.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/authorsform.py	2009-10-24 16:45:25 +0000
@@ -23,7 +23,7 @@
 ###############################################################################
 
 from PyQt4 import QtGui, QtCore
-from openlp.core.lib import translate
+
 from openlp.plugins.songs.forms.authorsdialog import Ui_AuthorsDialog
 
 class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):

=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py	2009-10-23 13:17:43 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class Ui_EditSongDialog(object):
     def setupUi(self, EditSongDialog):

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2009-10-24 13:07:41 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2009-10-24 16:45:25 +0000
@@ -26,7 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
+from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver
 from openlp.plugins.songs.forms import EditVerseForm
 from openlp.plugins.songs.lib.models import Song
 from editsongdialog import Ui_EditSongDialog

=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/editversedialog.py	2009-10-24 16:45:25 +0000
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_EditVerseDialog(object):
     def setupUi(self, EditVerseDialog):

=== modified file 'openlp/plugins/songs/forms/openlpexportform.py'
--- openlp/plugins/songs/forms/openlpexportform.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/openlpexportform.py	2009-10-24 16:45:25 +0000
@@ -22,7 +22,8 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
+
 from openlp.plugins.songs.forms.openlpexportdialog import Ui_OpenLPExportDialog
 
 class OpenLPExportForm(QtGui.QDialog, Ui_OpenLPExportDialog):

=== modified file 'openlp/plugins/songs/forms/openlpimportform.py'
--- openlp/plugins/songs/forms/openlpimportform.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/openlpimportform.py	2009-10-24 16:45:25 +0000
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 from openlp.plugins.songs.forms.openlpimportdialog import Ui_OpenLPImportDialog
 
 class OpenLPImportForm(QtGui.QDialog, Ui_OpenLPImportDialog):
@@ -30,4 +30,3 @@
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
-

=== modified file 'openlp/plugins/songs/forms/opensongexportform.py'
--- openlp/plugins/songs/forms/opensongexportform.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/opensongexportform.py	2009-10-24 16:45:25 +0000
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 from openlp.plugins.songs.forms.opensongexportdialog import Ui_OpenSongExportDialog
 
 class OpenSongExportForm(QtGui.QDialog, Ui_OpenSongExportDialog):

=== modified file 'openlp/plugins/songs/forms/opensongimportform.py'
--- openlp/plugins/songs/forms/opensongimportform.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/opensongimportform.py	2009-10-24 16:45:25 +0000
@@ -22,7 +22,7 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtGui
 from openlp.plugins.songs.forms.opensongimportdialog import Ui_OpenSongImportDialog
 
 class OpenSongImportForm(QtGui.QDialog, Ui_OpenSongImportDialog):

=== modified file 'openlp/plugins/songs/forms/songbookdialog.py'
--- openlp/plugins/songs/forms/songbookdialog.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/songbookdialog.py	2009-10-24 16:45:25 +0000
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_SongBookDialog(object):
     def setupUi(self, SongBookDialog):

=== modified file 'openlp/plugins/songs/forms/songbookform.py'
--- openlp/plugins/songs/forms/songbookform.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/songbookform.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,6 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
 from openlp.plugins.songs.forms.songbookdialog import Ui_SongBookDialog
 
 class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):

=== modified file 'openlp/plugins/songs/forms/songmaintenancedialog.py'
--- openlp/plugins/songs/forms/songmaintenancedialog.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/songmaintenancedialog.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import translate, buildIcon
+from openlp.core.lib import buildIcon
 
 class Ui_SongMaintenanceDialog(object):
     def setupUi(self, SongMaintenanceDialog):

=== modified file 'openlp/plugins/songs/forms/songmaintenanceform.py'
--- openlp/plugins/songs/forms/songmaintenanceform.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/songmaintenanceform.py	2009-10-24 16:45:25 +0000
@@ -18,7 +18,7 @@
 """
 
 from PyQt4 import QtGui, QtCore
-from openlp.core.lib import translate
+
 from openlp.plugins.songs.lib.classes import Author, Book, Topic
 from songmaintenancedialog import Ui_SongMaintenanceDialog
 from authorsform import AuthorsForm

=== modified file 'openlp/plugins/songs/forms/topicsdialog.py'
--- openlp/plugins/songs/forms/topicsdialog.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/topicsdialog.py	2009-10-24 16:45:25 +0000
@@ -23,7 +23,6 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate
 
 class Ui_TopicsDialog(object):
     def setupUi(self, TopicsDialog):

=== modified file 'openlp/plugins/songs/forms/topicsform.py'
--- openlp/plugins/songs/forms/topicsform.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/topicsform.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,6 @@
 
 from PyQt4 import QtGui
 
-from openlp.core.lib import translate
 from openlp.plugins.songs.forms.topicsdialog import Ui_TopicsDialog
 
 class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2009-10-24 15:54:07 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2009-10-24 16:45:25 +0000
@@ -26,7 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem, translate, SongXMLParser, \
+from openlp.core.lib import MediaManagerItem, SongXMLParser, \
     BaseListWithDnD, Receiver,  str_to_bool
 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
 

=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/lib/songstab.py	2009-10-24 16:45:25 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, str_to_bool, translate
+from openlp.core.lib import SettingsTab, str_to_bool
 
 class SongsTab(SettingsTab):
     """

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/songsplugin.py	2009-10-24 16:45:25 +0000
@@ -26,7 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Plugin, translate, buildIcon
+from openlp.core.lib import Plugin, buildIcon
 from openlp.plugins.songs.lib import SongManager, SongMediaItem, SongsTab
 from openlp.plugins.songs.forms import OpenLPImportForm, OpenSongExportForm, \
     OpenSongImportForm, OpenLPExportForm

Follow ups

[Merge] lp:~meths/openlp/trivialfixes into lp:openlp updated
From: noreply, 2009-10-24
Re: [Merge] lp:~meths/openlp/trivialfixes into lp:openlp
From: Tim Bentley, 2009-10-24