From f576e9d83d2141f30813f0ba9cb84424b8fa522b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 12 Jul 2009 15:56:06 +0100 Subject: [PATCH] Look a songs Focus issues Fix Bibles footers --- openlp/plugins/bibles/lib/mediaitem.py | 10 +++++-- openlp/plugins/songs/forms/editversedialog.py | 26 +++++++++++++------ openlp/plugins/songs/forms/editverseform.py | 3 ++- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index f5e58f8f0..2217b4e3e 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -363,8 +363,11 @@ class BibleMediaItem(MediaManagerItem): old_chapter = chapter bible_text = bible_text + u' '+ loc + u' '+ text service_item.title = book + u' ' + loc - if len(raw_footer) <= 1: - raw_footer.append(book) + footer = book + u' (' + self.version + u' ' + self.copyright +u')' + try: + raw_footer.index(footer) + except: + raw_footer.append(footer) if len(self.parent.bibles_tab.bible_theme) == 0: service_item.theme = None else: @@ -503,6 +506,9 @@ class BibleMediaItem(MediaManagerItem): self.search_results = self.parent.biblemanager.get_verse_text(bible, book, int(start_chapter), int(end_chapter), int(start_verse), int(end_verse)) + self.copyright = unicode(self.parent.biblemanager.get_meta_data(bible, u'Copyright').value) + self.permissions = unicode(self.parent.biblemanager.get_meta_data(bible, u'Permissions').value) + self.version = unicode(self.parent.biblemanager.get_meta_data(bible, u'Version').value) else: reply = QtGui.QMessageBox.information(self, translate(u'BibleMediaItem', u'Information'), diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py index 8600f675f..21acd17c3 100644 --- a/openlp/plugins/songs/forms/editversedialog.py +++ b/openlp/plugins/songs/forms/editversedialog.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 +""" +OpenLP - Open Source Lyrics Projection +Copyright (c) 2008 Raoul Snyman +Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, -# Form implementation generated from reading ui file '/home/raoul/Projects/openlp-2/resources/forms/editversedialog.ui' -# -# Created: Sat Mar 7 11:11:49 2009 -# by: PyQt4 UI code generator 4.4.4 -# -# WARNING! All changes made in this file will be lost! +This program is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free Software +Foundation; version 2 of the License. +This program is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place, Suite 330, Boston, MA 02111-1307 USA +""" from PyQt4 import QtCore, QtGui from openlp.core.lib import translate @@ -28,11 +38,11 @@ class Ui_EditVerseDialog(object): self.ButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save) self.ButtonBox.setObjectName(u'ButtonBox') self.DialogLayout.addWidget(self.ButtonBox) - self.retranslateUi(EditVerseDialog) QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'accepted()'), EditVerseDialog.accept) QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'rejected()'), EditVerseDialog.reject) QtCore.QMetaObject.connectSlotsByName(EditVerseDialog) + self.VerseTextEdit.setFocus(QtCore.Qt.OtherFocusReason) def retranslateUi(self, EditVerseDialog): - EditVerseDialog.setWindowTitle(translate(u'EditVerseDialog', u'Dialog')) + EditVerseDialog.setWindowTitle(translate(u'EditVerseDialog', u'Song Verse Edit Dialog')) diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index 35f8c110e..1bb269e29 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -3,7 +3,7 @@ """ OpenLP - Open Source Lyrics Projection Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008 Martin Thompson, Tim Bentley, +Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -35,6 +35,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): def setVerse(self, verse): self.VerseTextEdit.setPlainText(verse) + self.VerseTextEdit.setFocus(QtCore.Qt.OtherFocusReason) def getVerse(self): return self.VerseTextEdit.toPlainText()