From 94fc7fba2b4e527c746dbdfdaa70cb5cc5c8a514 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 22 Oct 2009 15:04:11 +0100 Subject: [PATCH 01/10] Unused imports --- openlpcnv.pyw | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlpcnv.pyw b/openlpcnv.pyw index 76a7139dc..5dfe87061 100755 --- a/openlpcnv.pyw +++ b/openlpcnv.pyw @@ -28,8 +28,7 @@ import logging import time import subprocess import codecs -import sys -from datetime import date + if os.name == u'nt': import win32api import win32con From 4c35fc81a59c4adc6abdfec7770075e7218f5e2c Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 23 Oct 2009 18:09:09 +0100 Subject: [PATCH 02/10] Fix rendering bug --- openlp/core/lib/renderer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 4f6aa9235..79c58f6af 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -201,7 +201,7 @@ class Renderer(object): #if we have more text add up to 10 spaces on the front. if len(line) > 0 and self._theme.font_main_indentation > 0: line = u'%s%s' % \ - (u' '[:self._theme.font_main_indentation], line) + (u' '[:int(self._theme.font_main_indentation)], line) #Text fits in a line now for count, line in enumerate(split_lines): page.append(line) From 21882cd15dbecbb6ced565c969a5a858ab132bc2 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Sat, 24 Oct 2009 00:42:53 +0100 Subject: [PATCH 03/10] Stray config item under image instead of images --- openlp/plugins/images/lib/imagetab.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/images/lib/imagetab.py b/openlp/plugins/images/lib/imagetab.py index 5c00d826d..706a521c3 100644 --- a/openlp/plugins/images/lib/imagetab.py +++ b/openlp/plugins/images/lib/imagetab.py @@ -31,7 +31,7 @@ class ImageTab(SettingsTab): ImageTab is the Image settings tab in the settings dialog. """ def __init__(self): - SettingsTab.__init__(self, translate(u'ImageTab', u'Images'), u'Image') + SettingsTab.__init__(self, translate(u'ImageTab', u'Images'), u'Images') def setupUi(self): self.setObjectName(u'ImageTab') From cdf4e46b07f719af49190c5c3a6e3f297590a3da Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 24 Oct 2009 06:58:49 +0100 Subject: [PATCH 04/10] Fix abbriviations for searchs --- openlp/plugins/bibles/lib/bibleDBimpl.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openlp/plugins/bibles/lib/bibleDBimpl.py b/openlp/plugins/bibles/lib/bibleDBimpl.py index eac7ccd79..756828197 100644 --- a/openlp/plugins/bibles/lib/bibleDBimpl.py +++ b/openlp/plugins/bibles/lib/bibleDBimpl.py @@ -158,6 +158,11 @@ class BibleDBImpl(BibleCommon): def get_bible_text(self, bookname, chapter, sverse, everse): log.debug(u'get_bible_text %s, %s, %s, %s', bookname, chapter, sverse, everse) + #Look up book name or abbreviation + book = self.get_bible_book(bookname) + if book is not None: + bookname = book.name + log.debug(u'bookname corrected to %s' % bookname) verses = self.session.query(Verse).join(Book).filter( Book.name == bookname).filter(Verse.chapter == chapter).filter( Verse.verse>=sverse).filter(Verse.verse<=everse).order_by( From 2c1c202e5bfc94fa068510a10e494381f341bf38 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 24 Oct 2009 08:22:44 +0100 Subject: [PATCH 05/10] Fixed edit theme to preview render bug --- openlp/core/lib/rendermanager.py | 3 ++- openlp/core/ui/thememanager.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py index ce43ad9c9..50abcfd07 100644 --- a/openlp/core/lib/rendermanager.py +++ b/openlp/core/lib/rendermanager.py @@ -65,6 +65,7 @@ class RenderManager(object): self.service_theme = u'' self.global_style = u'' self.override_background = None + self.themedata = None self.save_bg_frame = None self.override_background_changed = False @@ -130,7 +131,7 @@ class RenderManager(object): self.theme = self.service_theme else: self.theme = self.global_theme - if self.theme != self.renderer.theme_name: + if self.theme != self.renderer.theme_name or self.themedata is None: log.debug(u'theme is now %s', self.theme) self.themedata = self.theme_manager.getThemeData(self.theme) self.calculate_default( diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 84f88c726..14da059e0 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -386,7 +386,7 @@ class ThemeManager(QtGui.QWidget): newtheme.add_font(unicode(theme.FontName), unicode(theme.FontColor.name()), - unicode(theme.FontProportion * 2), u'False') + unicode(theme.FontProportion * 3), u'False') newtheme.add_font(unicode(theme.FontName), unicode(theme.FontColor.name()), unicode(12), u'False', u'footer') From 4f211d24e0d1507d2413de7fb046accd5b14393b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 24 Oct 2009 11:04:35 +0100 Subject: [PATCH 06/10] Fix theme editor --- openlp/core/ui/amendthemeform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index 5b5e67225..c3ec0f850 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -678,6 +678,6 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): log.debug(u'Page Length area height %s , metrics %s , lines %s' % (int(self.FontMainHeightSpinBox.value()), metrics.height(), page_length )) self.FontMainLinesPageLabel.setText( - self.trUtf8(u'Slide Height is %s rows') % page_length) + self.trUtf8((u'Slide Height is %s rows') % page_length)) frame = self.thememanager.generateImage(theme) self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame)) From 23fd584f6351b42605723a323a7136fbd2047024 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 24 Oct 2009 14:07:41 +0100 Subject: [PATCH 07/10] Add Preview Song Editing --- openlp/core/lib/mediamanageritem.py | 1 - openlp/core/ui/slidecontroller.py | 23 ++++++++++++++++++---- openlp/plugins/songs/forms/editsongform.py | 1 + openlp/plugins/songs/lib/mediaitem.py | 16 ++++++++++++++- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 81d526d33..755f3581c 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -118,7 +118,6 @@ class MediaManagerItem(QtGui.QWidget): self.requiredIcons() self.setupUi() self.retranslateUi() - #self.initialise() def requiredIcons(self): """ diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 0c3d737ad..d3e55d36d 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -89,9 +89,12 @@ class SlideController(QtGui.QWidget): self.image_list = [ self.trUtf8(u'Start Loop'), self.trUtf8(u'Stop Loop'), - #self.trUtf8(u'Loop Separator'), + u'Loop Separator', self.trUtf8(u'Image SpinBox') ] + self.song_list = [ + self.trUtf8(u'Edit Song'), + ] self.timer_id = 0 self.commandItem = None self.Panel = QtGui.QWidget(parent.ControlSplitter) @@ -161,6 +164,10 @@ class SlideController(QtGui.QWidget): self.Toolbar.addToolbarButton( self.trUtf8(u'Go Live'), u':/system/system_live.png', self.trUtf8(u'Move to live'), self.onGoLive) + self.Toolbar.addToolbarSeparator(u'Close Separator') + self.Toolbar.addToolbarButton( + self.trUtf8(u'Edit Song'), u':songs/song_edit.png', + self.trUtf8(u'Edit and re-preview Song'), self.onEditSong) if isLive: self.Toolbar.addToolbarSeparator(u'Loop Separator') self.Toolbar.addToolbarButton( @@ -216,6 +223,8 @@ class SlideController(QtGui.QWidget): Receiver().send_message(u'request_spin_delay') if isLive: self.Toolbar.makeWidgetsInvisible(self.image_list) + else: + self.Toolbar.makeWidgetsInvisible(self.song_list) QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'slidecontroller_first'), self.onSlideSelectedFirst) QtCore.QObject.connect(Receiver.get_receiver(), @@ -255,7 +264,10 @@ class SlideController(QtGui.QWidget): """ Allows the Preview toolbar to be customised """ - pass + if item.name == u'Songs': + self.Toolbar.makeWidgetsVisible(self.song_list) + else: + self.Toolbar.makeWidgetsInvisible(self.song_list) def addServiceItem(self, item): """ @@ -389,13 +401,13 @@ class SlideController(QtGui.QWidget): log.info(u'Slide Rendering took %4s' % (time.time() - before)) if self.isLive: self.parent.mainDisplay.frameView(frame) - + def grabMainDisplay(self): winid = QtGui.QApplication.desktop().winId() rm = self.parent.RenderManager rect = rm.screen_list[rm.current_display][u'size'] winimg = QtGui.QPixmap.grabWindow(winid, rect.x(), rect.y(), rect.width(), rect.height()) - self.SlidePreview.setPixmap(winimg) + self.SlidePreview.setPixmap(winimg) def onSlideSelectedNext(self): """ @@ -461,6 +473,9 @@ class SlideController(QtGui.QWidget): if event.timerId() == self.timer_id: self.onSlideSelectedNext() + def onEditSong(self): + Receiver().send_message(u'edit_song') + def onGoLive(self): """ If preview copy slide item to live diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index c1f675f56..e46d2dfa2 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -410,6 +410,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.songmanager.save_song(self.song) if self.title_change: Receiver().send_message(u'load_song_list') + Receiver().send_message(u'preview_song') self.close() def processLyrics(self): diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 6718ef581..23f0ca752 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -55,6 +55,7 @@ class SongMediaItem(MediaManagerItem): self.edit_song_form = EditSongForm(self.parent.songmanager, self) self.song_maintenance_form = SongMaintenanceForm( self.parent.songmanager, self) + self.fromPreview = None def requiredIcons(self): MediaManagerItem.requiredIcons(self) @@ -121,6 +122,10 @@ class SongMediaItem(MediaManagerItem): QtCore.SIGNAL(u'load_song_list'), self.onSearchTextButtonClick) QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'config_updated'), self.configUpdated) + QtCore.QObject.connect(Receiver.get_receiver(), + QtCore.SIGNAL(u'edit_song'), self.onEventEditSong) + QtCore.QObject.connect(Receiver.get_receiver(), + QtCore.SIGNAL(u'proview_song'), self.onPreviewClick) def configUpdated(self): self.searchAsYouType = str_to_bool( @@ -173,6 +178,10 @@ class SongMediaItem(MediaManagerItem): song_name = QtGui.QListWidgetItem(song_detail) song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id)) self.ListView.addItem(song_name) + if song.id == self.fromPreview: + self.fromPreview = 0 + self.ListView.setCurrentItem(song_name) + self.onPreviewClick() def displayResultsAuthor(self, searchresults): log.debug(u'display results Author') @@ -218,13 +227,18 @@ class SongMediaItem(MediaManagerItem): def onSongMaintenanceClick(self): self.song_maintenance_form.exec_() - def onEditClick(self): + def onEditClick(self, preview=False): item = self.ListView.currentItem() if item is not None: item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] + if preview: + self.fromPreview = item_id self.edit_song_form.loadSong(item_id) self.edit_song_form.exec_() + def onEventEditSong (self): + self.onEditClick(True) + def onDeleteClick(self): item = self.ListView.currentItem() if item is not None: From 6d5505dbc6c88e13f327e54aa67976c0e7539c07 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 24 Oct 2009 16:54:07 +0100 Subject: [PATCH 08/10] Fix Song editing --- openlp/plugins/songs/lib/mediaitem.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 23f0ca752..7a72be2a1 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -173,8 +173,8 @@ class SongMediaItem(MediaManagerItem): if author_list != u'': author_list = author_list + u', ' author_list = author_list + author.display_name - song_detail = unicode(u'%s (%s)' % \ - (unicode(song.title), unicode(author_list))) + song_detail = unicode(self.trUtf8(u'%s (%s)' % \ + (unicode(song.title), unicode(author_list)))) song_name = QtGui.QListWidgetItem(song_detail) song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id)) self.ListView.addItem(song_name) @@ -188,8 +188,8 @@ class SongMediaItem(MediaManagerItem): self.ListView.clear() for author in searchresults: for song in author.songs: - song_detail = unicode(u'%s (%s)' % \ - (unicode(author.display_name), unicode(song.title))) + song_detail = unicode(self.trUtf8(u'%s (%s)' % \ + (unicode(author.display_name), unicode(song.title)))) song_name = QtGui.QListWidgetItem(song_detail) song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id)) self.ListView.addItem(song_name) @@ -231,6 +231,7 @@ class SongMediaItem(MediaManagerItem): item = self.ListView.currentItem() if item is not None: item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] + self.fromPreview = 0 if preview: self.fromPreview = item_id self.edit_song_form.loadSong(item_id) From abd66af1c4bc0c3e930267dbf8d073c95096d6bd Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 24 Oct 2009 17:00:43 +0100 Subject: [PATCH 09/10] Fix extra utf8 strings --- openlp/core/ui/slidecontroller.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index d3e55d36d..913d60bfe 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -87,13 +87,13 @@ class SlideController(QtGui.QWidget): self.isLive = isLive self.parent = parent self.image_list = [ - self.trUtf8(u'Start Loop'), - self.trUtf8(u'Stop Loop'), + u'Start Loop', + u'Stop Loop', u'Loop Separator', - self.trUtf8(u'Image SpinBox') + u'Image SpinBox' ] self.song_list = [ - self.trUtf8(u'Edit Song'), + u'Edit Song', ] self.timer_id = 0 self.commandItem = None @@ -143,17 +143,17 @@ class SlideController(QtGui.QWidget): self.Toolbar.setSizePolicy(sizeToolbarPolicy) if self.isLive: self.Toolbar.addToolbarButton( - self.trUtf8(u'First Slide'), u':/slides/slide_first.png', + u'First Slide', u':/slides/slide_first.png', self.trUtf8(u'Move to first'), self.onSlideSelectedFirst) self.Toolbar.addToolbarButton( - self.trUtf8(u'Previous Slide'), u':/slides/slide_previous.png', + u'Previous Slide', u':/slides/slide_previous.png', self.trUtf8(u'Move to previous'), self.onSlideSelectedPrevious) self.Toolbar.addToolbarButton( - self.trUtf8(u'Next Slide'), u':/slides/slide_next.png', + u'Next Slide', u':/slides/slide_next.png', self.trUtf8(u'Move to next'), self.onSlideSelectedNext) if self.isLive: self.Toolbar.addToolbarButton( - self.trUtf8(u'Last Slide'), u':/slides/slide_last.png', + u'Last Slide', u':/slides/slide_last.png', self.trUtf8(u'Move to last'), self.onSlideSelectedLast) if self.isLive: self.Toolbar.addToolbarSeparator(u'Close Separator') @@ -162,23 +162,23 @@ class SlideController(QtGui.QWidget): if not self.isLive: self.Toolbar.addToolbarSeparator(u'Close Separator') self.Toolbar.addToolbarButton( - self.trUtf8(u'Go Live'), u':/system/system_live.png', + u'Go Live', u':/system/system_live.png', self.trUtf8(u'Move to live'), self.onGoLive) self.Toolbar.addToolbarSeparator(u'Close Separator') self.Toolbar.addToolbarButton( - self.trUtf8(u'Edit Song'), u':songs/song_edit.png', + u'Edit Song', u':songs/song_edit.png', self.trUtf8(u'Edit and re-preview Song'), self.onEditSong) if isLive: self.Toolbar.addToolbarSeparator(u'Loop Separator') self.Toolbar.addToolbarButton( - self.trUtf8(u'Start Loop'), u':/media/media_time.png', + u'Start Loop', u':/media/media_time.png', self.trUtf8(u'Start continuous loop'), self.onStartLoop) self.Toolbar.addToolbarButton( - self.trUtf8(u'Stop Loop'), u':/media/media_stop.png', + u'Stop Loop', u':/media/media_stop.png', self.trUtf8(u'Stop continuous loop'), self.onStopLoop) self.DelaySpinBox = QtGui.QSpinBox() self.Toolbar.addToolbarWidget( - self.trUtf8(u'Image SpinBox'), self.DelaySpinBox) + u'Image SpinBox', self.DelaySpinBox) self.DelaySpinBox.setSuffix(self.trUtf8(u's')) self.ControllerLayout.addWidget(self.Toolbar) From aeb75d2056f1c4a5ffc96a03587a34fb9ad0cc2a Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Sat, 24 Oct 2009 17:40:36 +0100 Subject: [PATCH 10/10] Fix imports and typo --- openlp-get-strings.py | 1 - openlp/core/lib/mediamanageritem.py | 4 ++-- openlp/core/ui/about.py | 2 +- openlp/core/ui/alertform.py | 2 +- openlp/core/ui/alertstab.py | 2 +- openlp/core/ui/amendthemedialog.py | 2 +- openlp/core/ui/amendthemeform.py | 2 +- openlp/core/ui/generaltab.py | 2 +- openlp/core/ui/mainwindow.py | 5 ++--- openlp/core/ui/plugindialog.py | 1 - openlp/core/ui/servicemanager.py | 2 +- openlp/core/ui/settingsdialog.py | 1 - openlp/core/ui/slidecontroller.py | 2 +- openlp/core/ui/splashscreen.py | 2 +- openlp/core/ui/thememanager.py | 2 +- openlp/core/ui/themestab.py | 2 +- openlp/plugins/audit/auditplugin.py | 2 +- openlp/plugins/audit/forms/auditdeleteform.py | 2 -- openlp/plugins/bibles/bibleplugin.py | 2 +- openlp/plugins/bibles/forms/bibleimportform.py | 3 +-- openlp/plugins/bibles/lib/bibleOSISimpl.py | 2 +- openlp/plugins/bibles/lib/biblestab.py | 2 +- openlp/plugins/bibles/lib/manager.py | 2 -- openlp/plugins/bibles/lib/mediaitem.py | 4 ++-- openlp/plugins/custom/forms/editcustomdialog.py | 2 +- openlp/plugins/custom/forms/editcustomform.py | 2 +- openlp/plugins/images/lib/imagetab.py | 2 +- openlp/plugins/images/lib/mediaitem.py | 2 +- openlp/plugins/media/lib/mediatab.py | 2 +- openlp/plugins/presentations/lib/mediaitem.py | 2 +- openlp/plugins/presentations/lib/presentationtab.py | 2 +- openlp/plugins/remotes/lib/remotetab.py | 2 +- openlp/plugins/songs/forms/authorsdialog.py | 1 - openlp/plugins/songs/forms/authorsform.py | 2 +- openlp/plugins/songs/forms/editsongdialog.py | 2 +- openlp/plugins/songs/forms/editsongform.py | 2 +- openlp/plugins/songs/forms/editversedialog.py | 1 - openlp/plugins/songs/forms/openlpexportform.py | 3 ++- openlp/plugins/songs/forms/openlpimportform.py | 3 +-- openlp/plugins/songs/forms/opensongexportform.py | 2 +- openlp/plugins/songs/forms/opensongimportform.py | 2 +- openlp/plugins/songs/forms/songbookdialog.py | 1 - openlp/plugins/songs/forms/songbookform.py | 1 - openlp/plugins/songs/forms/songmaintenancedialog.py | 2 +- openlp/plugins/songs/forms/songmaintenanceform.py | 2 +- openlp/plugins/songs/forms/topicsdialog.py | 1 - openlp/plugins/songs/forms/topicsform.py | 1 - openlp/plugins/songs/lib/mediaitem.py | 2 +- openlp/plugins/songs/lib/songstab.py | 2 +- openlp/plugins/songs/songsplugin.py | 2 +- 50 files changed, 43 insertions(+), 58 deletions(-) diff --git a/openlp-get-strings.py b/openlp-get-strings.py index 0d4e3200a..2af5e476b 100644 --- a/openlp-get-strings.py +++ b/openlp-get-strings.py @@ -24,7 +24,6 @@ ############################################################################### import os -import sys import re ts_file = u""" diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 755f3581c..016bb5259 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -28,7 +28,7 @@ import os 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 @@ class MediaManagerItem(QtGui.QWidget): 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. diff --git a/openlp/core/ui/about.py b/openlp/core/ui/about.py index 1ab2dc430..c1c9006c2 100644 --- a/openlp/core/ui/about.py +++ b/openlp/core/ui/about.py @@ -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): """ diff --git a/openlp/core/ui/alertform.py b/openlp/core/ui/alertform.py index e6c2cacbc..9c069bd1c 100644 --- a/openlp/core/ui/alertform.py +++ b/openlp/core/ui/alertform.py @@ -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 diff --git a/openlp/core/ui/alertstab.py b/openlp/core/ui/alertstab.py index 206826a09..e7ce0a013 100644 --- a/openlp/core/ui/alertstab.py +++ b/openlp/core/ui/alertstab.py @@ -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): """ diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py index d5b0d0661..1a59e4fc3 100644 --- a/openlp/core/ui/amendthemedialog.py +++ b/openlp/core/ui/amendthemedialog.py @@ -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): diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index c3ec0f850..3a30a0d18 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -28,7 +28,7 @@ import os.path 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') diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 6cc5feed7..98479af3e 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -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): """ diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index c768210a0..2f58ee3c1 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -30,9 +30,8 @@ from PyQt4 import QtCore, QtGui 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 = """ diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py index 5d9ca5ef2..f733b8e2f 100644 --- a/openlp/core/ui/plugindialog.py +++ b/openlp/core/ui/plugindialog.py @@ -23,7 +23,6 @@ ############################################################################### from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate class Ui_PluginViewDialog(object): def setupUi(self, PluginViewDialog): diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 4355667af..3964b9c60 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -30,7 +30,7 @@ import zipfile 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): diff --git a/openlp/core/ui/settingsdialog.py b/openlp/core/ui/settingsdialog.py index a11c87fee..a936f9f2f 100644 --- a/openlp/core/ui/settingsdialog.py +++ b/openlp/core/ui/settingsdialog.py @@ -23,7 +23,6 @@ ############################################################################### from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate class Ui_SettingsDialog(object): def setupUi(self, SettingsDialog): diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 913d60bfe..02e0dc80d 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -26,7 +26,7 @@ import logging 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 diff --git a/openlp/core/ui/splashscreen.py b/openlp/core/ui/splashscreen.py index 2624f66c4..3990a8f5c 100644 --- a/openlp/core/ui/splashscreen.py +++ b/openlp/core/ui/splashscreen.py @@ -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): diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index c4d829a73..7b34874b3 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -32,7 +32,7 @@ from PyQt4 import QtCore, QtGui 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 diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py index 644238351..f50e6d227 100644 --- a/openlp/core/ui/themestab.py +++ b/openlp/core/ui/themestab.py @@ -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): """ diff --git a/openlp/plugins/audit/auditplugin.py b/openlp/plugins/audit/auditplugin.py index f4392649b..e2c3230ec 100644 --- a/openlp/plugins/audit/auditplugin.py +++ b/openlp/plugins/audit/auditplugin.py @@ -27,7 +27,7 @@ import logging 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 diff --git a/openlp/plugins/audit/forms/auditdeleteform.py b/openlp/plugins/audit/forms/auditdeleteform.py index bd1dbd4a6..d2e647a44 100644 --- a/openlp/plugins/audit/forms/auditdeleteform.py +++ b/openlp/plugins/audit/forms/auditdeleteform.py @@ -27,8 +27,6 @@ from datetime import date 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): """ diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 5ebebe027..eb1018bf2 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -26,7 +26,7 @@ import logging 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): diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index fa4cdcd42..9a871ec88 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -29,8 +29,7 @@ import os.path 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 diff --git a/openlp/plugins/bibles/lib/bibleOSISimpl.py b/openlp/plugins/bibles/lib/bibleOSISimpl.py index 09ada1fa4..cdcea869b 100644 --- a/openlp/plugins/bibles/lib/bibleOSISimpl.py +++ b/openlp/plugins/bibles/lib/bibleOSISimpl.py @@ -30,7 +30,7 @@ import codecs from PyQt4 import QtCore -from openlp.core.lib import translate, Receiver +from openlp.core.lib import Receiver class BibleOSISImpl(): """ diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py index 31d3135cb..bf08acbec 100644 --- a/openlp/plugins/bibles/lib/biblestab.py +++ b/openlp/plugins/bibles/lib/biblestab.py @@ -26,7 +26,7 @@ import logging 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): diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index 7a8b7eb38..a259af0c2 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -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 diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 3d024a90b..f78c20ca5 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -27,8 +27,8 @@ import time 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 diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py index 6d4464525..528f2d154 100644 --- a/openlp/plugins/custom/forms/editcustomdialog.py +++ b/openlp/plugins/custom/forms/editcustomdialog.py @@ -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): diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py index 90868d928..01afe1b48 100644 --- a/openlp/plugins/custom/forms/editcustomform.py +++ b/openlp/plugins/custom/forms/editcustomform.py @@ -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): diff --git a/openlp/plugins/images/lib/imagetab.py b/openlp/plugins/images/lib/imagetab.py index 937242b72..f5472b02c 100644 --- a/openlp/plugins/images/lib/imagetab.py +++ b/openlp/plugins/images/lib/imagetab.py @@ -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): """ diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 5720a5209..fb947cc0d 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -26,7 +26,7 @@ import logging 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. diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index 0c13c4593..69440faa8 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -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): """ diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index f5150827a..abbf83ac2 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -27,7 +27,7 @@ import os 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 diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 33eb78eb9..410e3cde9 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -24,7 +24,7 @@ from PyQt4 import QtGui -from openlp.core.lib import SettingsTab, translate +from openlp.core.lib import SettingsTab class PresentationTab(SettingsTab): """ diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py index aee3c57a2..a1f473c7c 100644 --- a/openlp/plugins/remotes/lib/remotetab.py +++ b/openlp/plugins/remotes/lib/remotetab.py @@ -20,7 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA from PyQt4 import QtGui -from openlp.core.lib import SettingsTab, translate +from openlp.core.lib import SettingsTab class RemoteTab(SettingsTab): """ diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py index d9bfde967..f42de7b1b 100644 --- a/openlp/plugins/songs/forms/authorsdialog.py +++ b/openlp/plugins/songs/forms/authorsdialog.py @@ -23,7 +23,6 @@ ############################################################################### from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate class Ui_AuthorsDialog(object): def setupUi(self, AuthorsDialog): diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py index 967a8de50..be5999f7b 100644 --- a/openlp/plugins/songs/forms/authorsform.py +++ b/openlp/plugins/songs/forms/authorsform.py @@ -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): diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 855566ed4..9d4ad6fcc 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -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): diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index e46d2dfa2..c501403c4 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -26,7 +26,7 @@ import logging 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 diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py index b0889515d..f69a2fe6f 100644 --- a/openlp/plugins/songs/forms/editversedialog.py +++ b/openlp/plugins/songs/forms/editversedialog.py @@ -23,7 +23,6 @@ ############################################################################### from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate class Ui_EditVerseDialog(object): def setupUi(self, EditVerseDialog): diff --git a/openlp/plugins/songs/forms/openlpexportform.py b/openlp/plugins/songs/forms/openlpexportform.py index 48a1303f4..a4bcffe2a 100644 --- a/openlp/plugins/songs/forms/openlpexportform.py +++ b/openlp/plugins/songs/forms/openlpexportform.py @@ -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): diff --git a/openlp/plugins/songs/forms/openlpimportform.py b/openlp/plugins/songs/forms/openlpimportform.py index 6254226eb..e8cc92818 100644 --- a/openlp/plugins/songs/forms/openlpimportform.py +++ b/openlp/plugins/songs/forms/openlpimportform.py @@ -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 @@ class OpenLPImportForm(QtGui.QDialog, Ui_OpenLPImportDialog): def __init__(self, parent=None): QtGui.QDialog.__init__(self, parent) self.setupUi(self) - diff --git a/openlp/plugins/songs/forms/opensongexportform.py b/openlp/plugins/songs/forms/opensongexportform.py index 4f6fddcf1..b5246cf74 100644 --- a/openlp/plugins/songs/forms/opensongexportform.py +++ b/openlp/plugins/songs/forms/opensongexportform.py @@ -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): diff --git a/openlp/plugins/songs/forms/opensongimportform.py b/openlp/plugins/songs/forms/opensongimportform.py index 80418f961..ed617626a 100644 --- a/openlp/plugins/songs/forms/opensongimportform.py +++ b/openlp/plugins/songs/forms/opensongimportform.py @@ -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): diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py index 10f560a58..786a019b9 100644 --- a/openlp/plugins/songs/forms/songbookdialog.py +++ b/openlp/plugins/songs/forms/songbookdialog.py @@ -23,7 +23,6 @@ ############################################################################### from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate class Ui_SongBookDialog(object): def setupUi(self, SongBookDialog): diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py index a662749df..4482e6d3a 100644 --- a/openlp/plugins/songs/forms/songbookform.py +++ b/openlp/plugins/songs/forms/songbookform.py @@ -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): diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py index 7de15fb4f..f3ba1fce0 100644 --- a/openlp/plugins/songs/forms/songmaintenancedialog.py +++ b/openlp/plugins/songs/forms/songmaintenancedialog.py @@ -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): diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py index c73452282..4c83b41e5 100644 --- a/openlp/plugins/songs/forms/songmaintenanceform.py +++ b/openlp/plugins/songs/forms/songmaintenanceform.py @@ -18,7 +18,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA """ 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 diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py index f66b1c222..9f4546b04 100644 --- a/openlp/plugins/songs/forms/topicsdialog.py +++ b/openlp/plugins/songs/forms/topicsdialog.py @@ -23,7 +23,6 @@ ############################################################################### from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate class Ui_TopicsDialog(object): def setupUi(self, TopicsDialog): diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py index f7b8fc56a..afa67c2db 100644 --- a/openlp/plugins/songs/forms/topicsform.py +++ b/openlp/plugins/songs/forms/topicsform.py @@ -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): diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 7a72be2a1..9f3bc5638 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -26,7 +26,7 @@ import logging 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 diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py index 864e97e59..d221e987d 100644 --- a/openlp/plugins/songs/lib/songstab.py +++ b/openlp/plugins/songs/lib/songstab.py @@ -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): """ diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 21eb832d1..6b19b0276 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -26,7 +26,7 @@ import logging 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