raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

fix: wrong method name

Browse Source 
bzr-revno: 1935
This commit is contained in:
Meinert Jordan 2012-04-05 17:44:57 +02:00 committed by Andreas Preikschat
commit 16c98ab404
20 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/eventreceiver.py
View File

@ -111,7 +111,7 @@ class EventReceiver(QtCore.QObject):
``slidecontroller_live_spin_delay``
Pushes out the loop delay.
``slidecontroller_update_slide_limits``
Updates the slide_limits variable from the saved settings.

2
openlp/core/lib/htmlbuilder.py
View File

@ -45,7 +45,7 @@ HTMLSRC = u"""
padding: 0;
border: 0;
overflow: hidden;
-webkit-user-select: none;
-webkit-user-select: none;
}
body {
%s;

4
openlp/core/lib/mediaplayer.py
View File

@ -29,7 +29,7 @@ from openlp.core.ui.media import MediaState
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 @@ class MediaPlayer(object):
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

2
openlp/core/lib/ui.py
View File

@ -261,7 +261,7 @@ def create_horizontal_adjusting_combo_box(parent, name):
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).

2
openlp/core/ui/exceptiondialog.py
View File

@ -69,7 +69,7 @@ class Ui_ExceptionDialog(object):
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',

2
openlp/core/ui/firsttimewizard.py
View File

@ -263,5 +263,5 @@ class Ui_FirstTimeWizard(object):
'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'))

4
openlp/core/ui/mainwindow.py
View File

@ -1310,7 +1310,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
"""
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 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
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()

2
openlp/core/utils/actions.py
View File

@ -369,7 +369,7 @@ class ActionList(object):
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

2
openlp/plugins/bibles/forms/__init__.py
View File

@ -56,5 +56,5 @@ from languageform import LanguageForm
from bibleimportform import BibleImportForm
from bibleupgradeform import BibleUpgradeForm
__all__ = [u'BookNameForm', u'LanguageForm', u'BibleImportForm',
__all__ = [u'BookNameForm', u'LanguageForm', u'BibleImportForm',
u'BibleUpgradeForm']

10
openlp/plugins/bibles/forms/booknamedialog.py
View File

@ -86,20 +86,20 @@ class Ui_BookNameDialog(object):
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'))

6
openlp/plugins/bibles/forms/booknameform.py
View File

@ -42,11 +42,11 @@ log = logging.getLogger(__name__)
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 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
self.currentBookLabel.setText(unicode(name))
self.correspondingComboBox.setFocus()
return QDialog.exec_(self)
def accept(self):
if self.correspondingComboBox.currentText() == u'':
critical_error_message_box(

4
openlp/plugins/bibles/forms/languagedialog.py
View File

@ -71,8 +71,8 @@ class Ui_LanguageDialog(object):
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:'))

8
openlp/plugins/bibles/lib/__init__.py
View File

@ -259,14 +259,14 @@ def parse_reference(reference, bible, language_selection, book_ref_id=False):
``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 @@ def parse_reference(reference, bible, language_selection, book_ref_id=False):
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

2
openlp/plugins/bibles/lib/manager.py
View File

@ -293,7 +293,7 @@ class BibleManager(object):
- 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.

4
openlp/plugins/bibles/lib/openlp1.py
View File

@ -87,14 +87,14 @@ class OpenLP1Bible(BibleDB):
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)

2
openlp/plugins/bibles/lib/opensong.py
View File

@ -77,7 +77,7 @@ class OpenSongBible(BibleDB):
'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:

2
openlp/plugins/songs/lib/__init__.py
View File

@ -257,7 +257,7 @@ def clean_string(string):
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,

2
openlp/plugins/songs/lib/importer.py
View File

@ -131,7 +131,7 @@ class SongFormat(object):
SongFormat.Generic,
SongFormat.CCLI,
SongFormat.EasySlides,
SongFormat.EasyWorship,
SongFormat.EasyWorship,
SongFormat.FoilPresenter,
SongFormat.OpenSong,
SongFormat.SongBeamer,

2
openlp/plugins/songs/lib/sofimport.py
View File

@ -345,7 +345,7 @@ class SofImport(OooImport):
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:

2
openlp/plugins/songs/lib/wowimport.py
View File

@ -53,7 +53,7 @@ class WowImport(SongImport):
* 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