forked from openlp/openlp
Fixes and cleanups
bzr-revno: 1329
This commit is contained in:
commit
3526e8c7a1
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import translate, build_icon
|
from openlp.core.lib import translate
|
||||||
from openlp.core.lib.ui import UiStrings, create_accept_reject_button_box
|
from openlp.core.lib.ui import UiStrings, create_accept_reject_button_box
|
||||||
|
|
||||||
class Ui_DisplayTagDialog(object):
|
class Ui_DisplayTagDialog(object):
|
||||||
@ -134,7 +134,8 @@ class Ui_DisplayTagDialog(object):
|
|||||||
self.tagLabel.setText(translate('OpenLP.DisplayTagDialog', 'Tag'))
|
self.tagLabel.setText(translate('OpenLP.DisplayTagDialog', 'Tag'))
|
||||||
self.startTagLabel.setText(
|
self.startTagLabel.setText(
|
||||||
translate('OpenLP.DisplayTagDialog', 'Start tag'))
|
translate('OpenLP.DisplayTagDialog', 'Start tag'))
|
||||||
self.endTagLabel.setText(translate('OpenLP.DisplayTagDialog', 'End tag'))
|
self.endTagLabel.setText(
|
||||||
|
translate('OpenLP.DisplayTagDialog', 'End tag'))
|
||||||
self.deletePushButton.setText(UiStrings.Delete)
|
self.deletePushButton.setText(UiStrings.Delete)
|
||||||
self.defaultPushButton.setText(
|
self.defaultPushButton.setText(
|
||||||
translate('OpenLP.DisplayTagDialog', 'Default'))
|
translate('OpenLP.DisplayTagDialog', 'Default'))
|
||||||
|
@ -34,7 +34,7 @@ import cPickle
|
|||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import translate, DisplayTags
|
from openlp.core.lib import translate, DisplayTags
|
||||||
from openlp.core.lib.ui import UiStrings, critical_error_message_box
|
from openlp.core.lib.ui import critical_error_message_box
|
||||||
from openlp.core.ui.displaytagdialog import Ui_DisplayTagDialog
|
from openlp.core.ui.displaytagdialog import Ui_DisplayTagDialog
|
||||||
|
|
||||||
class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
|
class DisplayTagForm(QtGui.QDialog, Ui_DisplayTagDialog):
|
||||||
|
@ -29,7 +29,7 @@ from PyQt4 import QtCore, QtGui
|
|||||||
from openlp.core.lib import build_icon, translate, SpellTextEdit
|
from openlp.core.lib import build_icon, translate, SpellTextEdit
|
||||||
from openlp.core.lib.ui import UiStrings
|
from openlp.core.lib.ui import UiStrings
|
||||||
|
|
||||||
class ZoomSize():
|
class ZoomSize(object):
|
||||||
"""
|
"""
|
||||||
Type enumeration for Combo Box sizes
|
Type enumeration for Combo Box sizes
|
||||||
"""
|
"""
|
||||||
@ -45,6 +45,7 @@ class ZoomSize():
|
|||||||
translate('OpenLP.PrintServiceDialog', 'Fit Width'),
|
translate('OpenLP.PrintServiceDialog', 'Fit Width'),
|
||||||
u'100%', u'75%', u'50%', u'25%']
|
u'100%', u'75%', u'50%', u'25%']
|
||||||
|
|
||||||
|
|
||||||
class Ui_PrintServiceDialog(object):
|
class Ui_PrintServiceDialog(object):
|
||||||
def setupUi(self, printServiceDialog):
|
def setupUi(self, printServiceDialog):
|
||||||
printServiceDialog.setObjectName(u'printServiceDialog')
|
printServiceDialog.setObjectName(u'printServiceDialog')
|
||||||
|
@ -174,7 +174,7 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
|
|||||||
self.previewWidget.zoomIn(0.25)
|
self.previewWidget.zoomIn(0.25)
|
||||||
settings = QtCore.QSettings()
|
settings = QtCore.QSettings()
|
||||||
settings.beginGroup(u'advanced')
|
settings.beginGroup(u'advanced')
|
||||||
settings.setValue(u'display size',QtCore.QVariant(display))
|
settings.setValue(u'display size', QtCore.QVariant(display))
|
||||||
settings.endGroup()
|
settings.endGroup()
|
||||||
|
|
||||||
def copyText(self):
|
def copyText(self):
|
||||||
|
@ -40,9 +40,9 @@ from osis import OSISBible
|
|||||||
# Imports that might fail.
|
# Imports that might fail.
|
||||||
try:
|
try:
|
||||||
from openlp1 import OpenLP1Bible
|
from openlp1 import OpenLP1Bible
|
||||||
has_openlp1 = True
|
HAS_OPENLP1 = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
has_openlp1 = False
|
HAS_OPENLP1 = False
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -367,6 +367,6 @@ class BibleManager(object):
|
|||||||
for bible in self.db_cache:
|
for bible in self.db_cache:
|
||||||
self.db_cache[bible].finalise()
|
self.db_cache[bible].finalise()
|
||||||
|
|
||||||
BibleFormat.set_availability(BibleFormat.OpenLP1, has_openlp1)
|
BibleFormat.set_availability(BibleFormat.OpenLP1, HAS_OPENLP1)
|
||||||
|
|
||||||
__all__ = [u'BibleFormat']
|
__all__ = [u'BibleFormat']
|
||||||
|
@ -93,7 +93,6 @@ import os
|
|||||||
|
|
||||||
from lxml import etree, objectify
|
from lxml import etree, objectify
|
||||||
|
|
||||||
from openlp.core.lib import translate
|
|
||||||
from openlp.core.ui.wizard import WizardStrings
|
from openlp.core.ui.wizard import WizardStrings
|
||||||
from openlp.plugins.songs.lib import VerseType
|
from openlp.plugins.songs.lib import VerseType
|
||||||
from openlp.plugins.songs.lib.songimport import SongImport
|
from openlp.plugins.songs.lib.songimport import SongImport
|
||||||
@ -107,12 +106,12 @@ class FoilPresenterImport(SongImport):
|
|||||||
"""
|
"""
|
||||||
This provides the Foilpresenter import.
|
This provides the Foilpresenter import.
|
||||||
"""
|
"""
|
||||||
def __init__(self, master_manager, **kwargs):
|
def __init__(self, manager, **kwargs):
|
||||||
"""
|
"""
|
||||||
Initialise the import.
|
Initialise the import.
|
||||||
"""
|
"""
|
||||||
log.debug(u'initialise FoilPresenterImport')
|
log.debug(u'initialise FoilPresenterImport')
|
||||||
SongImport.__init__(self, master_manager, **kwargs)
|
SongImport.__init__(self, manager, **kwargs)
|
||||||
self.FoilPresenter = FoilPresenter(self.manager)
|
self.FoilPresenter = FoilPresenter(self.manager)
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
@ -340,7 +339,7 @@ class FoilPresenter(object):
|
|||||||
elif (len(author) > 2):
|
elif (len(author) > 2):
|
||||||
authors.append(author)
|
authors.append(author)
|
||||||
if not authors:
|
if not authors:
|
||||||
authors.append(SongStrings.AuthorUnknownUnT)
|
authors.append(SongStrings.AuthorUnknown)
|
||||||
for display_name in authors:
|
for display_name in authors:
|
||||||
author = self.manager.get_object_filtered(Author,
|
author = self.manager.get_object_filtered(Author,
|
||||||
Author.display_name == display_name)
|
Author.display_name == display_name)
|
||||||
@ -411,7 +410,6 @@ class FoilPresenter(object):
|
|||||||
search_text = u''
|
search_text = u''
|
||||||
temp_verse_order = {}
|
temp_verse_order = {}
|
||||||
temp_verse_order_backup = []
|
temp_verse_order_backup = []
|
||||||
temp_verse_sort = []
|
|
||||||
temp_sortnr_backup = 1
|
temp_sortnr_backup = 1
|
||||||
temp_sortnr_liste = []
|
temp_sortnr_liste = []
|
||||||
versenumber = {u'V': 1, u'C': 1, u'B': 1, u'E': 1, u'O': 1, u'I': 1,
|
versenumber = {u'V': 1, u'C': 1, u'B': 1, u'E': 1, u'O': 1, u'I': 1,
|
||||||
@ -454,7 +452,7 @@ class FoilPresenter(object):
|
|||||||
else:
|
else:
|
||||||
verse_type = u'O'
|
verse_type = u'O'
|
||||||
verse_number = re.compile(u'[a-zA-Z.+-_ ]*').sub(u'', verse_name)
|
verse_number = re.compile(u'[a-zA-Z.+-_ ]*').sub(u'', verse_name)
|
||||||
verse_part = re.compile(u'[0-9]*').sub(u'', verse_name[1:])
|
#verse_part = re.compile(u'[0-9]*').sub(u'', verse_name[1:])
|
||||||
# Foilpresenter allows e. g. "C", but we need "C1".
|
# Foilpresenter allows e. g. "C", but we need "C1".
|
||||||
if not verse_number:
|
if not verse_number:
|
||||||
verse_number = unicode(versenumber[verse_type])
|
verse_number = unicode(versenumber[verse_type])
|
||||||
|
@ -50,12 +50,12 @@ class OooImport(SongImport):
|
|||||||
"""
|
"""
|
||||||
Import songs from Impress/Powerpoint docs using Impress
|
Import songs from Impress/Powerpoint docs using Impress
|
||||||
"""
|
"""
|
||||||
def __init__(self, master_manager, **kwargs):
|
def __init__(self, manager, **kwargs):
|
||||||
"""
|
"""
|
||||||
Initialise the class. Requires a songmanager class which is passed
|
Initialise the class. Requires a songmanager class which is passed
|
||||||
to SongImport for writing song to disk
|
to SongImport for writing song to disk
|
||||||
"""
|
"""
|
||||||
SongImport.__init__(self, master_manager, **kwargs)
|
SongImport.__init__(self, manager, **kwargs)
|
||||||
self.document = None
|
self.document = None
|
||||||
self.process_started = False
|
self.process_started = False
|
||||||
|
|
||||||
|
@ -43,12 +43,12 @@ class OpenLyricsImport(SongImport):
|
|||||||
"""
|
"""
|
||||||
This provides the Openlyrics import.
|
This provides the Openlyrics import.
|
||||||
"""
|
"""
|
||||||
def __init__(self, master_manager, **kwargs):
|
def __init__(self, manager, **kwargs):
|
||||||
"""
|
"""
|
||||||
Initialise the import.
|
Initialise the Open Lyrics importer.
|
||||||
"""
|
"""
|
||||||
log.debug(u'initialise OpenLyricsImport')
|
log.debug(u'initialise OpenLyricsImport')
|
||||||
SongImport.__init__(self, master_manager, **kwargs)
|
SongImport.__init__(self, manager, **kwargs)
|
||||||
self.openLyrics = OpenLyrics(self.manager)
|
self.openLyrics = OpenLyrics(self.manager)
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
|
@ -66,12 +66,12 @@ class SofImport(OooImport):
|
|||||||
It attempts to detect italiced verses, and treats these as choruses in
|
It attempts to detect italiced verses, and treats these as choruses in
|
||||||
the verse ordering. Again not perfect, but a start.
|
the verse ordering. Again not perfect, but a start.
|
||||||
"""
|
"""
|
||||||
def __init__(self, master_manager, **kwargs):
|
def __init__(self, manager, **kwargs):
|
||||||
"""
|
"""
|
||||||
Initialise the class. Requires a songmanager class which is passed
|
Initialise the class. Requires a songmanager class which is passed
|
||||||
to SongImport for writing song to disk
|
to SongImport for writing song to disk
|
||||||
"""
|
"""
|
||||||
OooImport.__init__(self, master_manager, **kwargs)
|
OooImport.__init__(self, manager, **kwargs)
|
||||||
|
|
||||||
def process_ooo_document(self):
|
def process_ooo_document(self):
|
||||||
"""
|
"""
|
||||||
|
@ -67,14 +67,11 @@ class SongBeamerImport(SongImport):
|
|||||||
Song Beamer file format is text based
|
Song Beamer file format is text based
|
||||||
in the beginning are one or more control tags written
|
in the beginning are one or more control tags written
|
||||||
"""
|
"""
|
||||||
def __init__(self, master_manager, **kwargs):
|
def __init__(self, manager, **kwargs):
|
||||||
"""
|
"""
|
||||||
Initialise the import.
|
Initialise the Song Beamer importer.
|
||||||
|
|
||||||
``master_manager``
|
|
||||||
The song manager for the running OpenLP installation.
|
|
||||||
"""
|
"""
|
||||||
SongImport.__init__(self, master_manager, **kwargs)
|
SongImport.__init__(self, manager, **kwargs)
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
"""
|
"""
|
||||||
|
@ -86,14 +86,11 @@ class SongShowPlusImport(SongImport):
|
|||||||
otherList = {}
|
otherList = {}
|
||||||
otherCount = 0
|
otherCount = 0
|
||||||
|
|
||||||
def __init__(self, master_manager, **kwargs):
|
def __init__(self, manager, **kwargs):
|
||||||
"""
|
"""
|
||||||
Initialise the import.
|
Initialise the SongShow Plus importer.
|
||||||
|
|
||||||
``master_manager``
|
|
||||||
The song manager for the running OpenLP installation.
|
|
||||||
"""
|
"""
|
||||||
SongImport.__init__(self, master_manager, **kwargs)
|
SongImport.__init__(self, manager, **kwargs)
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
"""
|
"""
|
||||||
|
@ -92,14 +92,11 @@ class WowImport(SongImport):
|
|||||||
* .wow-song
|
* .wow-song
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, master_manager, **kwargs):
|
def __init__(self, manager, **kwargs):
|
||||||
"""
|
"""
|
||||||
Initialise the import.
|
Initialise the Words of Worship importer.
|
||||||
|
|
||||||
``master_manager``
|
|
||||||
The song manager for the running OpenLP installation.
|
|
||||||
"""
|
"""
|
||||||
SongImport.__init__(self, master_manager, **kwargs)
|
SongImport.__init__(self, manager, **kwargs)
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
"""
|
"""
|
||||||
|
@ -68,7 +68,6 @@ from lxml import etree, objectify
|
|||||||
|
|
||||||
from openlp.plugins.songs.lib import add_author_unknown, VerseType
|
from openlp.plugins.songs.lib import add_author_unknown, VerseType
|
||||||
from openlp.plugins.songs.lib.db import Author, Book, Song, Topic
|
from openlp.plugins.songs.lib.db import Author, Book, Song, Topic
|
||||||
from openlp.plugins.songs.lib.ui import SongStrings
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user