forked from openlp/openlp
fix: wrong method name
bzr-revno: 1935
This commit is contained in:
commit
16c98ab404
@ -111,7 +111,7 @@ class EventReceiver(QtCore.QObject):
|
|||||||
|
|
||||||
``slidecontroller_live_spin_delay``
|
``slidecontroller_live_spin_delay``
|
||||||
Pushes out the loop delay.
|
Pushes out the loop delay.
|
||||||
|
|
||||||
``slidecontroller_update_slide_limits``
|
``slidecontroller_update_slide_limits``
|
||||||
Updates the slide_limits variable from the saved settings.
|
Updates the slide_limits variable from the saved settings.
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ HTMLSRC = u"""
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
border: 0;
|
border: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
}
|
}
|
||||||
body {
|
body {
|
||||||
%s;
|
%s;
|
||||||
|
@ -29,7 +29,7 @@ from openlp.core.ui.media import MediaState
|
|||||||
|
|
||||||
class MediaPlayer(object):
|
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.
|
framework.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@ -65,7 +65,7 @@ class MediaPlayer(object):
|
|||||||
|
|
||||||
def resize(self, display):
|
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
|
should also resized
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
@ -261,7 +261,7 @@ def create_horizontal_adjusting_combo_box(parent, name):
|
|||||||
def create_button(parent, name, **kwargs):
|
def create_button(parent, name, **kwargs):
|
||||||
"""
|
"""
|
||||||
Return an button with the object name set and the given parameters.
|
Return an button with the object name set and the given parameters.
|
||||||
|
|
||||||
``parent``
|
``parent``
|
||||||
A QtCore.QWidget for the buttons parent (required).
|
A QtCore.QWidget for the buttons parent (required).
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ class Ui_ExceptionDialog(object):
|
|||||||
self.saveReportButton = create_button(exceptionDialog,
|
self.saveReportButton = create_button(exceptionDialog,
|
||||||
u'saveReportButton', icon=u':/general/general_save.png',
|
u'saveReportButton', icon=u':/general/general_save.png',
|
||||||
click=self.onSaveReportButtonClicked)
|
click=self.onSaveReportButtonClicked)
|
||||||
self.attachFileButton = create_icon(exceptionDialog,
|
self.attachFileButton = create_button(exceptionDialog,
|
||||||
u'attachFileButton', icon=u':/general/general_open.png',
|
u'attachFileButton', icon=u':/general/general_open.png',
|
||||||
click=self.onAttachFileButtonClicked)
|
click=self.onAttachFileButtonClicked)
|
||||||
self.buttonBox = create_button_box(exceptionDialog, u'buttonBox',
|
self.buttonBox = create_button_box(exceptionDialog, u'buttonBox',
|
||||||
|
@ -263,5 +263,5 @@ class Ui_FirstTimeWizard(object):
|
|||||||
'Select default theme:'))
|
'Select default theme:'))
|
||||||
self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
|
self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
|
||||||
'Starting configuration process...'))
|
'Starting configuration process...'))
|
||||||
FirstTimeWizard.setButtonText(QtGui.QWizard.CustomButton1,
|
FirstTimeWizard.setButtonText(QtGui.QWizard.CustomButton1,
|
||||||
translate('OpenLP.FirstTimeWizard', 'Finish'))
|
translate('OpenLP.FirstTimeWizard', 'Finish'))
|
||||||
|
@ -1310,7 +1310,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
"""
|
"""
|
||||||
log.debug(u'Loading QSettings')
|
log.debug(u'Loading QSettings')
|
||||||
# Migrate Wrap Settings to Slide Limits Settings
|
# Migrate Wrap Settings to Slide Limits Settings
|
||||||
if QtCore.QSettings().contains(self.generalSettingsSection +
|
if QtCore.QSettings().contains(self.generalSettingsSection +
|
||||||
u'/enable slide loop'):
|
u'/enable slide loop'):
|
||||||
if QtCore.QSettings().value(self.generalSettingsSection +
|
if QtCore.QSettings().value(self.generalSettingsSection +
|
||||||
u'/enable slide loop', QtCore.QVariant(True)).toBool():
|
u'/enable slide loop', QtCore.QVariant(True)).toBool():
|
||||||
@ -1319,7 +1319,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
else:
|
else:
|
||||||
QtCore.QSettings().setValue(self.advancedlSettingsSection +
|
QtCore.QSettings().setValue(self.advancedlSettingsSection +
|
||||||
u'/slide limits', QtCore.QVariant(SlideLimits.End))
|
u'/slide limits', QtCore.QVariant(SlideLimits.End))
|
||||||
QtCore.QSettings().remove(self.generalSettingsSection +
|
QtCore.QSettings().remove(self.generalSettingsSection +
|
||||||
u'/enable slide loop')
|
u'/enable slide loop')
|
||||||
Receiver.send_message(u'slidecontroller_update_slide_limits')
|
Receiver.send_message(u'slidecontroller_update_slide_limits')
|
||||||
settings = QtCore.QSettings()
|
settings = QtCore.QSettings()
|
||||||
|
@ -369,7 +369,7 @@ class ActionList(object):
|
|||||||
elif action in self.getAllChildObjects(existing_action.parent()):
|
elif action in self.getAllChildObjects(existing_action.parent()):
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def getAllChildObjects(self, qobject):
|
def getAllChildObjects(self, qobject):
|
||||||
"""
|
"""
|
||||||
Goes recursively through the children of ``qobject`` and returns a list
|
Goes recursively through the children of ``qobject`` and returns a list
|
||||||
|
@ -56,5 +56,5 @@ from languageform import LanguageForm
|
|||||||
from bibleimportform import BibleImportForm
|
from bibleimportform import BibleImportForm
|
||||||
from bibleupgradeform import BibleUpgradeForm
|
from bibleupgradeform import BibleUpgradeForm
|
||||||
|
|
||||||
__all__ = [u'BookNameForm', u'LanguageForm', u'BibleImportForm',
|
__all__ = [u'BookNameForm', u'LanguageForm', u'BibleImportForm',
|
||||||
u'BibleUpgradeForm']
|
u'BibleUpgradeForm']
|
||||||
|
@ -86,20 +86,20 @@ class Ui_BookNameDialog(object):
|
|||||||
self.retranslateUi(bookNameDialog)
|
self.retranslateUi(bookNameDialog)
|
||||||
|
|
||||||
def retranslateUi(self, bookNameDialog):
|
def retranslateUi(self, bookNameDialog):
|
||||||
bookNameDialog.setWindowTitle(translate('BiblesPlugin.BookNameDialog',
|
bookNameDialog.setWindowTitle(translate('BiblesPlugin.BookNameDialog',
|
||||||
'Select Book Name'))
|
'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 '
|
'The following book name cannot be matched up internally. Please '
|
||||||
'select the corresponding English name from the list.'))
|
'select the corresponding English name from the list.'))
|
||||||
self.currentLabel.setText(translate('BiblesPlugin.BookNameDialog',
|
self.currentLabel.setText(translate('BiblesPlugin.BookNameDialog',
|
||||||
'Current name:'))
|
'Current name:'))
|
||||||
self.correspondingLabel.setText(translate(
|
self.correspondingLabel.setText(translate(
|
||||||
'BiblesPlugin.BookNameDialog', 'Corresponding name:'))
|
'BiblesPlugin.BookNameDialog', 'Corresponding name:'))
|
||||||
self.optionsGroupBox.setTitle(translate('BiblesPlugin.BookNameDialog',
|
self.optionsGroupBox.setTitle(translate('BiblesPlugin.BookNameDialog',
|
||||||
'Show Books From'))
|
'Show Books From'))
|
||||||
self.oldTestamentCheckBox.setText(translate(
|
self.oldTestamentCheckBox.setText(translate(
|
||||||
'BiblesPlugin.BookNameDialog', 'Old Testament'))
|
'BiblesPlugin.BookNameDialog', 'Old Testament'))
|
||||||
self.newTestamentCheckBox.setText(translate(
|
self.newTestamentCheckBox.setText(translate(
|
||||||
'BiblesPlugin.BookNameDialog', 'New Testament'))
|
'BiblesPlugin.BookNameDialog', 'New Testament'))
|
||||||
self.apocryphaCheckBox.setText(translate('BiblesPlugin.BookNameDialog',
|
self.apocryphaCheckBox.setText(translate('BiblesPlugin.BookNameDialog',
|
||||||
'Apocrypha'))
|
'Apocrypha'))
|
||||||
|
@ -42,11 +42,11 @@ log = logging.getLogger(__name__)
|
|||||||
|
|
||||||
class BookNameForm(QDialog, Ui_BookNameDialog):
|
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
|
to a english book name
|
||||||
"""
|
"""
|
||||||
log.info(u'BookNameForm loaded')
|
log.info(u'BookNameForm loaded')
|
||||||
|
|
||||||
def __init__(self, parent = None):
|
def __init__(self, parent = None):
|
||||||
"""
|
"""
|
||||||
Constructor
|
Constructor
|
||||||
@ -111,7 +111,7 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
|
|||||||
self.currentBookLabel.setText(unicode(name))
|
self.currentBookLabel.setText(unicode(name))
|
||||||
self.correspondingComboBox.setFocus()
|
self.correspondingComboBox.setFocus()
|
||||||
return QDialog.exec_(self)
|
return QDialog.exec_(self)
|
||||||
|
|
||||||
def accept(self):
|
def accept(self):
|
||||||
if self.correspondingComboBox.currentText() == u'':
|
if self.correspondingComboBox.currentText() == u'':
|
||||||
critical_error_message_box(
|
critical_error_message_box(
|
||||||
|
@ -71,8 +71,8 @@ class Ui_LanguageDialog(object):
|
|||||||
languageDialog.setWindowTitle(
|
languageDialog.setWindowTitle(
|
||||||
translate('BiblesPlugin.LanguageDialog', 'Select Language'))
|
translate('BiblesPlugin.LanguageDialog', 'Select Language'))
|
||||||
self.bibleLabel.setText(translate('BiblesPlugin.LanguageDialog', ''))
|
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 '
|
'OpenLP is unable to determine the language of this translation '
|
||||||
'of the Bible. Please select the language from the list below.'))
|
'of the Bible. Please select the language from the list below.'))
|
||||||
self.languageLabel.setText(translate('BiblesPlugin.LanguageDialog',
|
self.languageLabel.setText(translate('BiblesPlugin.LanguageDialog',
|
||||||
'Language:'))
|
'Language:'))
|
||||||
|
@ -259,14 +259,14 @@ def parse_reference(reference, bible, language_selection, book_ref_id=False):
|
|||||||
|
|
||||||
``reference``
|
``reference``
|
||||||
A string. The Bible reference to parse.
|
A string. The Bible reference to parse.
|
||||||
|
|
||||||
``bible``
|
``bible``
|
||||||
A object. The Bible database object.
|
A object. The Bible database object.
|
||||||
|
|
||||||
``language_selection``
|
``language_selection``
|
||||||
An int. The language selection the user has choosen in settings
|
An int. The language selection the user has choosen in settings
|
||||||
section.
|
section.
|
||||||
|
|
||||||
``book_ref_id``
|
``book_ref_id``
|
||||||
A string. The book reference 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)
|
lambda value: regex_book.match(value[u'name']), books)
|
||||||
if not book_list:
|
if not book_list:
|
||||||
book_list = books
|
book_list = books
|
||||||
for value in book_list:
|
for value in book_list:
|
||||||
if bible.get_book_by_book_ref_id(value[u'id']):
|
if bible.get_book_by_book_ref_id(value[u'id']):
|
||||||
book_ref_id = value[u'id']
|
book_ref_id = value[u'id']
|
||||||
break
|
break
|
||||||
|
@ -293,7 +293,7 @@ class BibleManager(object):
|
|||||||
- Genesis 1:1-10,15-20
|
- Genesis 1:1-10,15-20
|
||||||
- Genesis 1:1-2:10
|
- Genesis 1:1-2:10
|
||||||
- Genesis 1:1-10,2:1-10
|
- Genesis 1:1-10,2:1-10
|
||||||
|
|
||||||
``book_ref_id``
|
``book_ref_id``
|
||||||
Unicode. The book referece id from the book in versetext.
|
Unicode. The book referece id from the book in versetext.
|
||||||
For second bible this is necessary.
|
For second bible this is necessary.
|
||||||
|
@ -87,14 +87,14 @@ class OpenLP1Bible(BibleDB):
|
|||||||
testament_id = int(book[1])
|
testament_id = int(book[1])
|
||||||
name = unicode(book[2], u'cp1252')
|
name = unicode(book[2], u'cp1252')
|
||||||
abbreviation = unicode(book[3], 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)
|
language_id)
|
||||||
if not book_ref_id:
|
if not book_ref_id:
|
||||||
log.exception(u'Importing books from "%s" '\
|
log.exception(u'Importing books from "%s" '\
|
||||||
'failed' % self.filename)
|
'failed' % self.filename)
|
||||||
return False
|
return False
|
||||||
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
|
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'])
|
book_details[u'testament_id'])
|
||||||
# Update the progess bar.
|
# Update the progess bar.
|
||||||
self.wizard.incrementProgressBar(WizardStrings.ImportingType % name)
|
self.wizard.incrementProgressBar(WizardStrings.ImportingType % name)
|
||||||
|
@ -77,7 +77,7 @@ class OpenSongBible(BibleDB):
|
|||||||
'failed' % self.filename)
|
'failed' % self.filename)
|
||||||
return False
|
return False
|
||||||
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
|
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'])
|
book_ref_id, book_details[u'testament_id'])
|
||||||
for chapter in book.c:
|
for chapter in book.c:
|
||||||
if self.stop_import_flag:
|
if self.stop_import_flag:
|
||||||
|
@ -257,7 +257,7 @@ def clean_string(string):
|
|||||||
Strips punctuation from the passed string to assist searching
|
Strips punctuation from the passed string to assist searching
|
||||||
"""
|
"""
|
||||||
return WHITESPACE.sub(u' ', APOSTROPHE.sub(u'', string)).lower()
|
return WHITESPACE.sub(u' ', APOSTROPHE.sub(u'', string)).lower()
|
||||||
|
|
||||||
def clean_title(title):
|
def clean_title(title):
|
||||||
"""
|
"""
|
||||||
Cleans the song title by removing Unicode control chars groups C0 & C1,
|
Cleans the song title by removing Unicode control chars groups C0 & C1,
|
||||||
|
@ -131,7 +131,7 @@ class SongFormat(object):
|
|||||||
SongFormat.Generic,
|
SongFormat.Generic,
|
||||||
SongFormat.CCLI,
|
SongFormat.CCLI,
|
||||||
SongFormat.EasySlides,
|
SongFormat.EasySlides,
|
||||||
SongFormat.EasyWorship,
|
SongFormat.EasyWorship,
|
||||||
SongFormat.FoilPresenter,
|
SongFormat.FoilPresenter,
|
||||||
SongFormat.OpenSong,
|
SongFormat.OpenSong,
|
||||||
SongFormat.SongBeamer,
|
SongFormat.SongBeamer,
|
||||||
|
@ -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'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'HIM', u'ZION', u'EMMANUEL', u'MAJESTY', u'JESUS\'', u'JIREH',
|
||||||
u'JUDAH', u'LION', u'LORD\'S', u'ABRAHAM', u'GOD\'S',
|
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'):
|
u'OMEGA'):
|
||||||
textarr[i] = textarr[i].capitalize()
|
textarr[i] = textarr[i].capitalize()
|
||||||
else:
|
else:
|
||||||
|
@ -53,7 +53,7 @@ class WowImport(SongImport):
|
|||||||
* A block can be a verse, chorus or bridge.
|
* A block can be a verse, chorus or bridge.
|
||||||
|
|
||||||
File Header:
|
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
|
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
|
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
|
56th byte specifies how many blocks there are. The first block starts
|
||||||
|
Loading…
Reference in New Issue
Block a user