openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #15115
[Merge] lp:~m2j/openlp/cleanups into lp:openlp
Meinert Jordan has proposed merging lp:~m2j/openlp/cleanups into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~m2j/openlp/cleanups/+merge/100891
fix: wrong method name
--
https://code.launchpad.net/~m2j/openlp/cleanups/+merge/100891
Your team OpenLP Core is requested to review the proposed merge of lp:~m2j/openlp/cleanups into lp:openlp.
=== modified file 'openlp/core/lib/eventreceiver.py'
--- openlp/core/lib/eventreceiver.py 2012-03-17 10:46:08 +0000
+++ openlp/core/lib/eventreceiver.py 2012-04-04 22:43:31 +0000
@@ -111,7 +111,7 @@
``slidecontroller_live_spin_delay``
Pushes out the loop delay.
-
+
``slidecontroller_update_slide_limits``
Updates the slide_limits variable from the saved settings.
=== modified file 'openlp/core/lib/htmlbuilder.py'
--- openlp/core/lib/htmlbuilder.py 2012-03-21 22:27:04 +0000
+++ openlp/core/lib/htmlbuilder.py 2012-04-04 22:43:31 +0000
@@ -45,7 +45,7 @@
padding: 0;
border: 0;
overflow: hidden;
- -webkit-user-select: none;
+ -webkit-user-select: none;
}
body {
%s;
=== modified file 'openlp/core/lib/mediaplayer.py'
--- openlp/core/lib/mediaplayer.py 2011-12-27 10:33:55 +0000
+++ openlp/core/lib/mediaplayer.py 2012-04-04 22:43:31 +0000
@@ -29,7 +29,7 @@
class MediaPlayer(object):
"""
- This is the base class media Player class to provide OpenLP with a pluggable media display
+ This is the base class media Player class to provide OpenLP with a pluggable media display
framework.
"""
@@ -65,7 +65,7 @@
def resize(self, display):
"""
- If the main display size or position is changed, the media widgets
+ If the main display size or position is changed, the media widgets
should also resized
"""
pass
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2012-04-03 17:59:34 +0000
+++ openlp/core/lib/ui.py 2012-04-04 22:43:31 +0000
@@ -261,7 +261,7 @@
def create_button(parent, name, **kwargs):
"""
Return an button with the object name set and the given parameters.
-
+
``parent``
A QtCore.QWidget for the buttons parent (required).
=== modified file 'openlp/core/ui/exceptiondialog.py'
--- openlp/core/ui/exceptiondialog.py 2012-04-02 00:19:16 +0000
+++ openlp/core/ui/exceptiondialog.py 2012-04-04 22:43:31 +0000
@@ -69,7 +69,7 @@
self.saveReportButton = create_button(exceptionDialog,
u'saveReportButton', icon=u':/general/general_save.png',
click=self.onSaveReportButtonClicked)
- self.attachFileButton = create_icon(exceptionDialog,
+ self.attachFileButton = create_button(exceptionDialog,
u'attachFileButton', icon=u':/general/general_open.png',
click=self.onAttachFileButtonClicked)
self.buttonBox = create_button_box(exceptionDialog, u'buttonBox',
=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py 2012-04-02 00:19:16 +0000
+++ openlp/core/ui/firsttimewizard.py 2012-04-04 22:43:31 +0000
@@ -263,5 +263,5 @@
'Select default theme:'))
self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
'Starting configuration process...'))
- FirstTimeWizard.setButtonText(QtGui.QWizard.CustomButton1,
+ FirstTimeWizard.setButtonText(QtGui.QWizard.CustomButton1,
translate('OpenLP.FirstTimeWizard', 'Finish'))
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2012-04-03 17:58:42 +0000
+++ openlp/core/ui/mainwindow.py 2012-04-04 22:43:31 +0000
@@ -1310,7 +1310,7 @@
"""
log.debug(u'Loading QSettings')
# Migrate Wrap Settings to Slide Limits Settings
- if QtCore.QSettings().contains(self.generalSettingsSection +
+ if QtCore.QSettings().contains(self.generalSettingsSection +
u'/enable slide loop'):
if QtCore.QSettings().value(self.generalSettingsSection +
u'/enable slide loop', QtCore.QVariant(True)).toBool():
@@ -1319,7 +1319,7 @@
else:
QtCore.QSettings().setValue(self.advancedlSettingsSection +
u'/slide limits', QtCore.QVariant(SlideLimits.End))
- QtCore.QSettings().remove(self.generalSettingsSection +
+ QtCore.QSettings().remove(self.generalSettingsSection +
u'/enable slide loop')
Receiver.send_message(u'slidecontroller_update_slide_limits')
settings = QtCore.QSettings()
=== modified file 'openlp/core/utils/actions.py'
--- openlp/core/utils/actions.py 2012-03-04 19:06:49 +0000
+++ openlp/core/utils/actions.py 2012-04-04 22:43:31 +0000
@@ -369,7 +369,7 @@
elif action in self.getAllChildObjects(existing_action.parent()):
return False
return True
-
+
def getAllChildObjects(self, qobject):
"""
Goes recursively through the children of ``qobject`` and returns a list
=== modified file 'openlp/plugins/bibles/forms/__init__.py'
--- openlp/plugins/bibles/forms/__init__.py 2011-12-27 10:33:55 +0000
+++ openlp/plugins/bibles/forms/__init__.py 2012-04-04 22:43:31 +0000
@@ -56,5 +56,5 @@
from bibleimportform import BibleImportForm
from bibleupgradeform import BibleUpgradeForm
-__all__ = [u'BookNameForm', u'LanguageForm', u'BibleImportForm',
+__all__ = [u'BookNameForm', u'LanguageForm', u'BibleImportForm',
u'BibleUpgradeForm']
=== modified file 'openlp/plugins/bibles/forms/booknamedialog.py'
--- openlp/plugins/bibles/forms/booknamedialog.py 2012-04-01 22:44:09 +0000
+++ openlp/plugins/bibles/forms/booknamedialog.py 2012-04-04 22:43:31 +0000
@@ -86,20 +86,20 @@
self.retranslateUi(bookNameDialog)
def retranslateUi(self, bookNameDialog):
- bookNameDialog.setWindowTitle(translate('BiblesPlugin.BookNameDialog',
+ bookNameDialog.setWindowTitle(translate('BiblesPlugin.BookNameDialog',
'Select Book Name'))
- self.infoLabel.setText(translate('BiblesPlugin.BookNameDialog',
+ self.infoLabel.setText(translate('BiblesPlugin.BookNameDialog',
'The following book name cannot be matched up internally. Please '
'select the corresponding English name from the list.'))
- self.currentLabel.setText(translate('BiblesPlugin.BookNameDialog',
+ self.currentLabel.setText(translate('BiblesPlugin.BookNameDialog',
'Current name:'))
self.correspondingLabel.setText(translate(
'BiblesPlugin.BookNameDialog', 'Corresponding name:'))
- self.optionsGroupBox.setTitle(translate('BiblesPlugin.BookNameDialog',
+ self.optionsGroupBox.setTitle(translate('BiblesPlugin.BookNameDialog',
'Show Books From'))
self.oldTestamentCheckBox.setText(translate(
'BiblesPlugin.BookNameDialog', 'Old Testament'))
self.newTestamentCheckBox.setText(translate(
'BiblesPlugin.BookNameDialog', 'New Testament'))
- self.apocryphaCheckBox.setText(translate('BiblesPlugin.BookNameDialog',
+ self.apocryphaCheckBox.setText(translate('BiblesPlugin.BookNameDialog',
'Apocrypha'))
=== modified file 'openlp/plugins/bibles/forms/booknameform.py'
--- openlp/plugins/bibles/forms/booknameform.py 2011-12-27 10:33:55 +0000
+++ openlp/plugins/bibles/forms/booknameform.py 2012-04-04 22:43:31 +0000
@@ -42,11 +42,11 @@
class BookNameForm(QDialog, Ui_BookNameDialog):
"""
- Class to manage a dialog which help the user to refer a book name a
+ Class to manage a dialog which help the user to refer a book name a
to a english book name
"""
log.info(u'BookNameForm loaded')
-
+
def __init__(self, parent = None):
"""
Constructor
@@ -111,7 +111,7 @@
self.currentBookLabel.setText(unicode(name))
self.correspondingComboBox.setFocus()
return QDialog.exec_(self)
-
+
def accept(self):
if self.correspondingComboBox.currentText() == u'':
critical_error_message_box(
=== modified file 'openlp/plugins/bibles/forms/languagedialog.py'
--- openlp/plugins/bibles/forms/languagedialog.py 2012-04-01 22:44:09 +0000
+++ openlp/plugins/bibles/forms/languagedialog.py 2012-04-04 22:43:31 +0000
@@ -71,8 +71,8 @@
languageDialog.setWindowTitle(
translate('BiblesPlugin.LanguageDialog', 'Select Language'))
self.bibleLabel.setText(translate('BiblesPlugin.LanguageDialog', ''))
- self.infoLabel.setText(translate('BiblesPlugin.LanguageDialog',
+ self.infoLabel.setText(translate('BiblesPlugin.LanguageDialog',
'OpenLP is unable to determine the language of this translation '
'of the Bible. Please select the language from the list below.'))
- self.languageLabel.setText(translate('BiblesPlugin.LanguageDialog',
+ self.languageLabel.setText(translate('BiblesPlugin.LanguageDialog',
'Language:'))
=== modified file 'openlp/plugins/bibles/lib/__init__.py'
--- openlp/plugins/bibles/lib/__init__.py 2012-04-01 21:19:56 +0000
+++ openlp/plugins/bibles/lib/__init__.py 2012-04-04 22:43:31 +0000
@@ -259,14 +259,14 @@
``reference``
A string. The Bible reference to parse.
-
+
``bible``
A object. The Bible database object.
-
+
``language_selection``
An int. The language selection the user has choosen in settings
section.
-
+
``book_ref_id``
A string. The book reference id.
@@ -382,7 +382,7 @@
lambda value: regex_book.match(value[u'name']), books)
if not book_list:
book_list = books
- for value in book_list:
+ for value in book_list:
if bible.get_book_by_book_ref_id(value[u'id']):
book_ref_id = value[u'id']
break
=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py 2012-03-04 20:10:17 +0000
+++ openlp/plugins/bibles/lib/manager.py 2012-04-04 22:43:31 +0000
@@ -293,7 +293,7 @@
- Genesis 1:1-10,15-20
- Genesis 1:1-2:10
- Genesis 1:1-10,2:1-10
-
+
``book_ref_id``
Unicode. The book referece id from the book in versetext.
For second bible this is necessary.
=== modified file 'openlp/plugins/bibles/lib/openlp1.py'
--- openlp/plugins/bibles/lib/openlp1.py 2011-12-27 10:33:55 +0000
+++ openlp/plugins/bibles/lib/openlp1.py 2012-04-04 22:43:31 +0000
@@ -87,14 +87,14 @@
testament_id = int(book[1])
name = unicode(book[2], u'cp1252')
abbreviation = unicode(book[3], u'cp1252')
- book_ref_id = self.get_book_ref_id_by_name(name, len(books),
+ book_ref_id = self.get_book_ref_id_by_name(name, len(books),
language_id)
if not book_ref_id:
log.exception(u'Importing books from "%s" '\
'failed' % self.filename)
return False
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
- db_book = self.create_book(name, book_ref_id,
+ db_book = self.create_book(name, book_ref_id,
book_details[u'testament_id'])
# Update the progess bar.
self.wizard.incrementProgressBar(WizardStrings.ImportingType % name)
=== modified file 'openlp/plugins/bibles/lib/opensong.py'
--- openlp/plugins/bibles/lib/opensong.py 2011-12-27 10:33:55 +0000
+++ openlp/plugins/bibles/lib/opensong.py 2012-04-04 22:43:31 +0000
@@ -77,7 +77,7 @@
'failed' % self.filename)
return False
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
- db_book = self.create_book(unicode(book.attrib[u'n']),
+ db_book = self.create_book(unicode(book.attrib[u'n']),
book_ref_id, book_details[u'testament_id'])
for chapter in book.c:
if self.stop_import_flag:
=== modified file 'openlp/plugins/songs/lib/__init__.py'
--- openlp/plugins/songs/lib/__init__.py 2012-04-02 11:38:22 +0000
+++ openlp/plugins/songs/lib/__init__.py 2012-04-04 22:43:31 +0000
@@ -257,7 +257,7 @@
Strips punctuation from the passed string to assist searching
"""
return WHITESPACE.sub(u' ', APOSTROPHE.sub(u'', string)).lower()
-
+
def clean_title(title):
"""
Cleans the song title by removing Unicode control chars groups C0 & C1,
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py 2011-12-31 14:18:05 +0000
+++ openlp/plugins/songs/lib/importer.py 2012-04-04 22:43:31 +0000
@@ -131,7 +131,7 @@
SongFormat.Generic,
SongFormat.CCLI,
SongFormat.EasySlides,
- SongFormat.EasyWorship,
+ SongFormat.EasyWorship,
SongFormat.FoilPresenter,
SongFormat.OpenSong,
SongFormat.SongBeamer,
=== modified file 'openlp/plugins/songs/lib/sofimport.py'
--- openlp/plugins/songs/lib/sofimport.py 2011-12-27 10:33:55 +0000
+++ openlp/plugins/songs/lib/sofimport.py 2012-04-04 22:43:31 +0000
@@ -345,7 +345,7 @@
u'I\'M', u'I\'LL', u'SAVIOUR', u'O', u'YOU\'RE', u'HE', u'HIS',
u'HIM', u'ZION', u'EMMANUEL', u'MAJESTY', u'JESUS\'', u'JIREH',
u'JUDAH', u'LION', u'LORD\'S', u'ABRAHAM', u'GOD\'S',
- u'FATHER\'S', u'ELIJAH' u'MARTHA', u'CHRISTMAS', u'ALPHA',
+ u'FATHER\'S', u'ELIJAH' u'MARTHA', u'CHRISTMAS', u'ALPHA',
u'OMEGA'):
textarr[i] = textarr[i].capitalize()
else:
=== modified file 'openlp/plugins/songs/lib/wowimport.py'
--- openlp/plugins/songs/lib/wowimport.py 2012-03-09 21:42:29 +0000
+++ openlp/plugins/songs/lib/wowimport.py 2012-04-04 22:43:31 +0000
@@ -53,7 +53,7 @@
* A block can be a verse, chorus or bridge.
File Header:
- Bytes are counted from one, i.e. the first byte is byte 1. The first 19
+ Bytes are counted from one, i.e. the first byte is byte 1. The first 19
bytes should be "WoW File \\nSong Words" The bytes after this and up to
the 56th byte, can change but no real meaning has been found. The
56th byte specifies how many blocks there are. The first block starts
Follow ups
