From cec487be858bd5be357113590fedc328dfcd77c9 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Fri, 4 Mar 2011 13:57:39 +0000 Subject: [PATCH 1/6] Unused imports --- openlp/plugins/bibles/lib/csvbible.py | 2 -- openlp/plugins/bibles/lib/openlp1.py | 2 -- openlp/plugins/bibles/lib/opensong.py | 2 -- openlp/plugins/bibles/lib/osis.py | 2 -- 4 files changed, 8 deletions(-) diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py index 18bf06cfb..b96382df2 100644 --- a/openlp/plugins/bibles/lib/csvbible.py +++ b/openlp/plugins/bibles/lib/csvbible.py @@ -69,8 +69,6 @@ import logging import chardet import csv -from PyQt4 import QtCore - from openlp.core.lib import Receiver, translate from openlp.plugins.bibles.lib.db import BibleDB, Testament diff --git a/openlp/plugins/bibles/lib/openlp1.py b/openlp/plugins/bibles/lib/openlp1.py index 03011fa5e..2d19db20c 100644 --- a/openlp/plugins/bibles/lib/openlp1.py +++ b/openlp/plugins/bibles/lib/openlp1.py @@ -27,8 +27,6 @@ import logging import sqlite -from PyQt4 import QtCore - from openlp.core.lib import Receiver from openlp.core.ui.wizard import WizardStrings from openlp.plugins.bibles.lib.db import BibleDB diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py index 356483986..a7f1eff33 100644 --- a/openlp/plugins/bibles/lib/opensong.py +++ b/openlp/plugins/bibles/lib/opensong.py @@ -25,9 +25,7 @@ ############################################################################### import logging - from lxml import objectify -from PyQt4 import QtCore from openlp.core.lib import Receiver, translate from openlp.plugins.bibles.lib.db import BibleDB diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py index 000471b96..78e2551d9 100644 --- a/openlp/plugins/bibles/lib/osis.py +++ b/openlp/plugins/bibles/lib/osis.py @@ -31,8 +31,6 @@ import chardet import codecs import re -from PyQt4 import QtCore - from openlp.core.lib import Receiver, translate from openlp.core.utils import AppLocation from openlp.plugins.bibles.lib.db import BibleDB From 2cd7c2c66e8f99cc86924d1a72e66731903a7afa Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Fri, 4 Mar 2011 14:44:21 +0000 Subject: [PATCH 2/6] Cleanups --- openlp/core/ui/screen.py | 2 +- openlp/plugins/songs/forms/songexportform.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/screen.py b/openlp/core/ui/screen.py index 9f8191961..6b4978727 100644 --- a/openlp/core/ui/screen.py +++ b/openlp/core/ui/screen.py @@ -123,7 +123,7 @@ class ScreenList(object): [u'Screen 1 (primary)', u'Screen 2'] """ - screen_list= [] + screen_list = [] for screen in self.screen_list: screen_name = u'%s %d' % (translate('OpenLP.ScreenList', 'Screen'), screen[u'number'] + 1) diff --git a/openlp/plugins/songs/forms/songexportform.py b/openlp/plugins/songs/forms/songexportform.py index dbcff42f3..d8bc8b3a6 100644 --- a/openlp/plugins/songs/forms/songexportform.py +++ b/openlp/plugins/songs/forms/songexportform.py @@ -355,7 +355,8 @@ class SongExportForm(OpenLPWizard): the path to *directoryLineEdit*. """ path = unicode(QtGui.QFileDialog.getExistingDirectory(self, - translate('SongsPlugin.ExportWizardForm', 'Select Destination Folder'), + translate('SongsPlugin.ExportWizardForm', + 'Select Destination Folder'), SettingsManager.get_last_dir(self.plugin.settingsSection, 1), options=QtGui.QFileDialog.ShowDirsOnly)) SettingsManager.set_last_dir(self.plugin.settingsSection, path, 1) From c34d82fd1069a543fc308e9ecfbdd03b4516385c Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 4 Mar 2011 23:02:43 +0200 Subject: [PATCH 3/6] Updated the credits. --- openlp/core/ui/aboutdialog.py | 84 ++++++++++++++++++++++++++++++----- 1 file changed, 73 insertions(+), 11 deletions(-) diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index c3ab5a00f..b1b319c6b 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/openlp/core/ui/aboutdialog.py @@ -108,19 +108,40 @@ class Ui_AboutDialog(object): self.aboutNotebook.indexOf(self.aboutTab), UiStrings.About) lead = u'Raoul "superfly" Snyman' developers = [u'Tim "TRB143" Bentley', u'Jonathan "gushie" Corwin', - u'Michael "cocooncrash" Gorven', u'Scott "sguerrieri" Guerrieri', - u'Raoul "superfly" Snyman', u'Martin "mijiti" Thompson', - u'Jon "Meths" Tibble<'] - contributors = [u'Meinert "m2j" Jordan', u'Andreas "googol" Preikschat', + u'Michael "cocooncrash" Gorven', + u'Andreas "googol" Preikschat', u'Raoul "superfly" Snyman', + u'Martin "mijiti" Thompson', u'Jon "Meths" Tibble'] + contributors = [u'Scott "sguerrieri" Guerrieri', + u'Meinert "m2j" Jordan', u'Armin "orangeshirt" K\xf6hler', u'Christian "crichter" Richter', u'Philip "Phill" Ridout', - u'Maikel Stuivenberg', u'Carsten "catini" Tingaard', - u'Frode "frodus" Woldsund'] - testers = [u'Philip "Phill" Ridout', u'Wesley "wrst" Stout (lead)'] - packagers = [u'Thomas "tabthorpe" Abthorpe (FreeBSD)', + u'Jeffrey "whydoubt" Smith', u'Maikel Stuivenberg', + u'Carsten "catini" Tingaard', u'Frode "frodus" Woldsund'] + testers = [u'Philip "Phill" Ridout', u'Wesley "wrst" Stout', + u'John "jseagull1" Cegalis (lead)'] + packagers = ['Thomas "tabthorpe" Abthorpe (FreeBSD)', u'Tim "TRB143" Bentley (Fedora)', u'Michael "cocooncrash" Gorven (Ubuntu)', u'Matthias "matthub" Hub (Mac OS X)', u'Raoul "superfly" Snyman (Windows, Ubuntu)'] + translators = { + u'af': [u'Johan "nuvolari" Mynhardt'], + u'de': [u'Patrick "madmuffin" Br\xfcckner', + u'Meinert "m2j" Jordan', + u'Andreas "googol" Preikschat', + u'Christian "crichter" Richter'], + u'en_GB': [u'Tim "TRB143" Bentley', u'Jonathan "gushie" Corwin'], + u'en_ZA': [u'Raoul "superfly" Snyman'], + u'et': [u'Mattias "mahfiaz" P\xf5ldaru'], + u'fr': [u'Stephan\xe9 "stbrunner" Brunner'], + u'hu': [u'Gyuris Gellért'], + u'ja': [u'Kunio "Kunio" Nakamaru'], + u'nb': [u'Atle "pendlaren" Weibell', u'Frode "frodus" Woldsund'], + u'nl': [u'Arjen "typovar" van Voorst'], + u'pt_BR': [u'Rafael "rafaellerm" Lerm'], + u'ru': [u'Sergey "ratz" Ratz'] + } + documentors = [u'Wesley "wrst" Stout', + u'John "jseagull1" Cegalis (lead)'] self.creditsTextEdit.setPlainText(unicode(translate('OpenLP.AboutForm', 'Project Lead\n' ' %s\n' @@ -137,6 +158,35 @@ class Ui_AboutDialog(object): 'Packagers\n' ' %s\n' '\n' + 'Translators\n' + ' Afrikaans (af)\n' + ' %s\n' + ' German (de)\n' + ' %s\n' + ' English, United Kingdom (en_GB)\n' + ' %s\n' + ' English, South Africa (en_ZA)\n' + ' %s\n' + ' Estonian (et)\n' + ' %s\n' + ' French (fr)\n' + ' %s\n' + ' Hungarian (hu)\n' + ' %s\n' + ' Japanese (ja)\n' + ' %s\n' + ' Norwegian Bokm\xe5l (nb)\n' + ' %s\n' + ' Dutch (nl)\n' + ' %s\n' + ' Portuguese, Brazil (pt_BR)\n' + ' %s\n' + ' Russian (ru)\n' + ' %s\n' + '\n' + 'Documentation\n' + ' %s\n' + '\n' 'Built With\n' ' Python: http://www.python.org/\n' ' Qt4: http://qt.nokia.com/\n' @@ -155,7 +205,19 @@ class Ui_AboutDialog(object): ' bring this software to you for free because\n' ' He has set us free.')) % (lead, u'\n '.join(developers), u'\n '.join(contributors), u'\n '.join(testers), - u'\n '.join(packagers))) + u'\n '.join(packagers), u'\n '.join(translators[u'af']), + u'\n '.join(translators[u'de']), + u'\n '.join(translators[u'en_GB']), + u'\n '.join(translators[u'en_ZA']), + u'\n '.join(translators[u'et']), + u'\n '.join(translators[u'fr']), + u'\n '.join(translators[u'hu']), + u'\n '.join(translators[u'ja']), + u'\n '.join(translators[u'nb']), + u'\n '.join(translators[u'nl']), + u'\n '.join(translators[u'pt_BR']), + u'\n '.join(translators[u'ru']), + u'\n '.join(documentors))) self.aboutNotebook.setTabText( self.aboutNotebook.indexOf(self.creditsTab), translate('OpenLP.AboutForm', 'Credits')) @@ -176,7 +238,7 @@ class Ui_AboutDialog(object): 'but WITHOUT ANY WARRANTY; without even the implied warranty of ' 'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See below ' 'for more details.') - gpltext = ('GNU GENERAL PUBLIC LICENSE\n' + gpltext = 'GNU GENERAL PUBLIC LICENSE\n' 'Version 2, June 1991\n' '\n' 'Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 ' @@ -546,7 +608,7 @@ class Ui_AboutDialog(object): 'subroutine library, you may consider it more useful to permit ' 'linking proprietary applications with the library. If this is ' 'what you want to do, use the GNU Lesser General Public License ' - 'instead of this License.') + 'instead of this License.' self.licenseTextEdit.setPlainText(u'%s\n\n%s\n\n%s\n\n\n%s' % (copyright, licence, disclaimer, gpltext)) self.aboutNotebook.setTabText( From fb1b2cc26898619cae0578831de06618cf361706 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 5 Mar 2011 10:44:13 +0200 Subject: [PATCH 4/6] Updated the credits. --- openlp/core/ui/aboutdialog.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index b1b319c6b..d973c5680 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/openlp/core/ui/aboutdialog.py @@ -205,18 +205,18 @@ class Ui_AboutDialog(object): ' bring this software to you for free because\n' ' He has set us free.')) % (lead, u'\n '.join(developers), u'\n '.join(contributors), u'\n '.join(testers), - u'\n '.join(packagers), u'\n '.join(translators[u'af']), - u'\n '.join(translators[u'de']), - u'\n '.join(translators[u'en_GB']), - u'\n '.join(translators[u'en_ZA']), - u'\n '.join(translators[u'et']), - u'\n '.join(translators[u'fr']), - u'\n '.join(translators[u'hu']), - u'\n '.join(translators[u'ja']), - u'\n '.join(translators[u'nb']), - u'\n '.join(translators[u'nl']), - u'\n '.join(translators[u'pt_BR']), - u'\n '.join(translators[u'ru']), + u'\n '.join(packagers), u'\n '.join(translators[u'af']), + u'\n '.join(translators[u'de']), + u'\n '.join(translators[u'en_GB']), + u'\n '.join(translators[u'en_ZA']), + u'\n '.join(translators[u'et']), + u'\n '.join(translators[u'fr']), + u'\n '.join(translators[u'hu']), + u'\n '.join(translators[u'ja']), + u'\n '.join(translators[u'nb']), + u'\n '.join(translators[u'nl']), + u'\n '.join(translators[u'pt_BR']), + u'\n '.join(translators[u'ru']), u'\n '.join(documentors))) self.aboutNotebook.setTabText( self.aboutNotebook.indexOf(self.creditsTab), @@ -238,7 +238,7 @@ class Ui_AboutDialog(object): 'but WITHOUT ANY WARRANTY; without even the implied warranty of ' 'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See below ' 'for more details.') - gpltext = 'GNU GENERAL PUBLIC LICENSE\n' + gpltext = ('GNU GENERAL PUBLIC LICENSE\n' 'Version 2, June 1991\n' '\n' 'Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 ' @@ -608,7 +608,7 @@ class Ui_AboutDialog(object): 'subroutine library, you may consider it more useful to permit ' 'linking proprietary applications with the library. If this is ' 'what you want to do, use the GNU Lesser General Public License ' - 'instead of this License.' + 'instead of this License.') self.licenseTextEdit.setPlainText(u'%s\n\n%s\n\n%s\n\n\n%s' % (copyright, licence, disclaimer, gpltext)) self.aboutNotebook.setTabText( From 892430f90c13a1a3739c05df67a7d44a6251749b Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 6 Mar 2011 07:51:24 +0000 Subject: [PATCH 5/6] cleanup --- openlp.pyw | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openlp.pyw b/openlp.pyw index 7cc4d6d15..920908b61 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -149,10 +149,6 @@ class OpenLP(QtGui.QApplication): log.info(u'Openlp version %s' % app_version[u'version']) return app_version -# def notify(self, obj, evt): -# #TODO needed for presentation exceptions -# return QtGui.QApplication.notify(self, obj, evt) - def run(self): """ Run the OpenLP application. From 094e7968d0f1a6c14a2f5621a9c645feca706850 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 6 Mar 2011 07:59:26 +0000 Subject: [PATCH 6/6] Fix not flagging of service item changes --- openlp/core/ui/servicemanager.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index f5a08d8b2..3cdf25c7a 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -943,6 +943,7 @@ class ServiceManager(QtGui.QWidget): for item in self.serviceItems: if item[u'service_item']._uuid == uuid: item[u'service_item'].edit_id = editId + self.setModified(True) def replaceServiceItem(self, newItem): """ @@ -1123,13 +1124,14 @@ class ServiceManager(QtGui.QWidget): self.serviceItems.remove(serviceItem) self.serviceItems.insert(endpos, serviceItem) self.repaintServiceList(endpos, child) + self.setModified(True) else: # we are not over anything so drop replace = False if item is None: self.dropPosition = len(self.serviceItems) else: - # we are over somthing so lets investigate + # we are over something so lets investigate pos = self._getParentItemData(item) - 1 serviceItem = self.serviceItems[pos] if (plugin == serviceItem[u'service_item'].name and