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

- Finishes and tested rewrite of themewizard and bibleimportwizard 

- Added exceptions to OpenSong and CSV bible import wich occur for invalid files
This commit is contained in:
M2j 2010-12-27 16:31:53 +01:00
parent b0a53020f6
commit 6815ac3146
6 changed files with 515 additions and 618 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
openlp/core/ui/themeform.py
View File

@ -56,7 +56,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.registerFields() self.registerFields()
self.accepted = False self.accepted = False
self.updateThemeAllowed = True self.updateThemeAllowed = True
QtCore.QObject.connect(self.backgroundTypeComboBox, QtCore.QObject.connect(self.backgroundComboBox,
QtCore.SIGNAL(u'currentIndexChanged(int)'), QtCore.SIGNAL(u'currentIndexChanged(int)'),
self.onBackgroundComboBox) self.onBackgroundComboBox)
QtCore.QObject.connect(self.gradientComboBox, QtCore.QObject.connect(self.gradientComboBox,
@ -74,30 +74,30 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
QtCore.QObject.connect(self.imageBrowseButton, QtCore.QObject.connect(self.imageBrowseButton,
QtCore.SIGNAL(u'pressed()'), QtCore.SIGNAL(u'pressed()'),
self.onImageBrowseButtonClicked) self.onImageBrowseButtonClicked)
QtCore.QObject.connect(self.mainColorPushButton, QtCore.QObject.connect(self.mainColorButton,
QtCore.SIGNAL(u'pressed()'), QtCore.SIGNAL(u'pressed()'),
self.onMainColourPushButtonClicked) self.onMainColourButtonClicked)
QtCore.QObject.connect(self.outlineColorPushButton, QtCore.QObject.connect(self.outlineColorButton,
QtCore.SIGNAL(u'pressed()'), QtCore.SIGNAL(u'pressed()'),
self.onOutlineColourPushButtonClicked) self.onOutlineColourButtonClicked)
QtCore.QObject.connect(self.shadowColorPushButton, QtCore.QObject.connect(self.shadowColorButton,
QtCore.SIGNAL(u'pressed()'), QtCore.SIGNAL(u'pressed()'),
self.onShadowColourPushButtonClicked) self.onShadowColourButtonClicked)
QtCore.QObject.connect(self.outlineCheckBox, QtCore.QObject.connect(self.outlineCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'), QtCore.SIGNAL(u'stateChanged(int)'),
self.onOutlineCheckCheckBoxChanged) self.onOutlineCheckCheckBoxChanged)
QtCore.QObject.connect(self.shadowCheckBox, QtCore.QObject.connect(self.shadowCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'), QtCore.SIGNAL(u'stateChanged(int)'),
self.onShadowCheckCheckBoxChanged) self.onShadowCheckCheckBoxChanged)
QtCore.QObject.connect(self.footerColorPushButton, QtCore.QObject.connect(self.footerColorButton,
QtCore.SIGNAL(u'pressed()'), QtCore.SIGNAL(u'pressed()'),
self.onFooterColourPushButtonClicked) self.onFooterColourButtonClicked)
QtCore.QObject.connect(self.mainDefaultPositionCheckBox, QtCore.QObject.connect(self.mainPositionCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'), QtCore.SIGNAL(u'stateChanged(int)'),
self.onMainDefaultPositionCheckBox) self.onMainPositionCheckBox)
QtCore.QObject.connect(self.footerDefaultPositionCheckBox, QtCore.QObject.connect(self.footerPositionCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'), QtCore.SIGNAL(u'stateChanged(int)'),
self.onFooterDefaultPositionCheckBox) self.onFooterPositionCheckBox)
QtCore.QObject.connect(self, QtCore.QObject.connect(self,
QtCore.SIGNAL(u'currentIdChanged(int)'), QtCore.SIGNAL(u'currentIdChanged(int)'),
self.pageChanged) self.pageChanged)
@ -107,36 +107,25 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
QtCore.QObject.connect(self.mainSizeSpinBox, QtCore.QObject.connect(self.mainSizeSpinBox,
QtCore.SIGNAL(u'valueChanged(int)'), QtCore.SIGNAL(u'valueChanged(int)'),
self.calculateLines) self.calculateLines)
QtCore.QObject.connect(self.mainSizeSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.calculateLines)
QtCore.QObject.connect(self.lineSpacingSpinBox, QtCore.QObject.connect(self.lineSpacingSpinBox,
QtCore.SIGNAL(u'valueChanged(int)'), QtCore.SIGNAL(u'valueChanged(int)'),
self.calculateLines) self.calculateLines)
QtCore.QObject.connect(self.lineSpacingSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.calculateLines)
QtCore.QObject.connect(self.outlineSizeSpinBox, QtCore.QObject.connect(self.outlineSizeSpinBox,
QtCore.SIGNAL(u'valueChanged(int)'), QtCore.SIGNAL(u'valueChanged(int)'),
self.calculateLines) self.calculateLines)
QtCore.QObject.connect(self.outlineSizeSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.calculateLines)
QtCore.QObject.connect(self.shadowSizeSpinBox, QtCore.QObject.connect(self.shadowSizeSpinBox,
QtCore.SIGNAL(u'valueChanged(int)'), QtCore.SIGNAL(u'valueChanged(int)'),
self.calculateLines) self.calculateLines)
QtCore.QObject.connect(self.shadowSizeSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.calculateLines)
QtCore.QObject.connect(self.mainFontComboBox, QtCore.QObject.connect(self.mainFontComboBox,
QtCore.SIGNAL(u'activated(int)'), QtCore.SIGNAL(u'activated(int)'),
self.calculateLines) self.calculateLines)
QtCore.QObject.connect(self, QtCore.SIGNAL(u'accepted()'), self.accept)
def pageChanged(self, pageId): def pageChanged(self, pageId):
""" """
Detects Page changes and updates as approprate. Detects Page changes and updates as approprate.
""" """
if pageId == 6: if self.page(pageId) == self.previewPage:
self.updateTheme() self.updateTheme()
frame = self.thememanager.generateImage(self.theme) frame = self.thememanager.generateImage(self.theme)
self.previewBoxLabel.setPixmap(QtGui.QPixmap.fromImage(frame)) self.previewBoxLabel.setPixmap(QtGui.QPixmap.fromImage(frame))
@ -159,7 +148,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
Map field names to screen names, Map field names to screen names,
""" """
self.backgroundPage.registerField( self.backgroundPage.registerField(
u'background_type', self.backgroundTypeComboBox) u'background_type', self.backgroundComboBox)
self.backgroundPage.registerField( self.backgroundPage.registerField(
u'color', self.colorButton) u'color', self.colorButton)
self.backgroundPage.registerField( self.backgroundPage.registerField(
@ -167,11 +156,11 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.backgroundPage.registerField( self.backgroundPage.registerField(
u'grandient_end', self.gradientEndButton) u'grandient_end', self.gradientEndButton)
self.backgroundPage.registerField( self.backgroundPage.registerField(
u'background_image', self.imageLineEdit) u'background_image', self.imageFileEdit)
self.backgroundPage.registerField( self.backgroundPage.registerField(
u'gradient', self.gradientComboBox) u'gradient', self.gradientComboBox)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
u'mainColorPushButton', self.mainColorPushButton) u'mainColorButton', self.mainColorButton)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
u'mainSizeSpinBox', self.mainSizeSpinBox) u'mainSizeSpinBox', self.mainSizeSpinBox)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
@ -179,17 +168,17 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
u'outlineCheckBox', self.outlineCheckBox) u'outlineCheckBox', self.outlineCheckBox)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
u'outlineColorPushButton', self.outlineColorPushButton) u'outlineColorPushButton', self.outlineColorButton)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
u'outlineSizeSpinBox', self.outlineSizeSpinBox) u'outlineSizeSpinBox', self.outlineSizeSpinBox)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
u'shadowCheckBox', self.shadowCheckBox) u'shadowCheckBox', self.shadowCheckBox)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
u'boldCheckBox', self.boldCheckBox) u'mainBoldCheckBox', self.mainBoldCheckBox)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
u'italicsCheckBox', self.italicsCheckBox) u'mainItalicsCheckBox', self.mainItalicsCheckBox)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
u'shadowColorPushButton', self.shadowColorPushButton) u'shadowColorButton', self.shadowColorButton)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
u'shadowSizeSpinBox', self.shadowSizeSpinBox) u'shadowSizeSpinBox', self.shadowSizeSpinBox)
self.mainAreaPage.registerField( self.mainAreaPage.registerField(
@ -224,7 +213,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
Calculate the number of lines on a page by rendering text Calculate the number of lines on a page by rendering text
""" """
# Do not trigger on start up # Do not trigger on start up
if self.page != 0: if self.currentPage != self.welcomePage:
self.updateTheme() self.updateTheme()
frame = self.thememanager.generateImage(self.theme, True) frame = self.thememanager.generateImage(self.theme, True)
@ -243,7 +232,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.theme.font_main_outline = True self.theme.font_main_outline = True
else: else:
self.theme.font_main_outline = False self.theme.font_main_outline = False
self.outlineColorPushButton.setEnabled(self.theme.font_main_outline) self.outlineColorButton.setEnabled(self.theme.font_main_outline)
self.outlineSizeSpinBox.setEnabled(self.theme.font_main_outline) self.outlineSizeSpinBox.setEnabled(self.theme.font_main_outline)
self.calculateLines() self.calculateLines()
@ -255,35 +244,21 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.theme.font_main_shadow = True self.theme.font_main_shadow = True
else: else:
self.theme.font_main_shadow = False self.theme.font_main_shadow = False
self.shadowColorPushButton.setEnabled(self.theme.font_main_shadow) self.shadowColorButton.setEnabled(self.theme.font_main_shadow)
self.shadowSizeSpinBox.setEnabled(self.theme.font_main_shadow) self.shadowSizeSpinBox.setEnabled(self.theme.font_main_shadow)
self.calculateLines() self.calculateLines()
def onMainDefaultPositionCheckBox(self, value): def onMainPositionCheckBox(self, value):
""" """
Change state as Main Area Position check box changed Change state as Main Area Position check box changed
""" """
if value == QtCore.Qt.Checked: self.theme.font_main_override = (value == QtCore.Qt.Checked)
self.theme.font_main_override = False
else:
self.theme.font_main_override = True
self.mainXSpinBox.setEnabled(self.theme.font_main_override)
self.mainYSpinBox.setEnabled(self.theme.font_main_override)
self.mainHeightSpinBox.setEnabled(self.theme.font_main_override)
self.mainWidthSpinBox.setEnabled(self.theme.font_main_override)
def onFooterDefaultPositionCheckBox(self, value): def onFooterPositionCheckBox(self, value):
""" """
Change state as Footer Area Position check box changed Change state as Footer Area Position check box changed
""" """
if value == QtCore.Qt.Checked: self.theme.font_footer_override = (value == QtCore.Qt.Checked)
self.theme.font_footer_override = False
else:
self.theme.font_footer_override = True
self.footerXSpinBox.setEnabled(self.theme.font_footer_override)
self.footerYSpinBox.setEnabled(self.theme.font_footer_override)
self.footerHeightSpinBox.setEnabled(self.theme.font_footer_override)
self.footerWidthSpinBox.setEnabled(self.theme.font_footer_override)
def exec_(self, edit=False): def exec_(self, edit=False):
""" """
@ -302,16 +277,16 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
Set up the pages for Initial run through dialog Set up the pages for Initial run through dialog
""" """
log.debug(u'initializePage %s' % id) log.debug(u'initializePage %s' % id)
self.page = id wizardPage = self.page(id)
if id == 1: if wizardPage == self.backgroundPage:
self.setBackgroundTabValues() self.setBackgroundTabValues()
elif id == 2: elif wizardPage == self.mainAreaPage:
self.setMainAreaTabValues() self.setMainAreaTabValues()
elif id == 3: elif wizardPage == self.footerAreaPage:
self.setFooterAreaTabValues() self.setFooterAreaTabValues()
elif id == 4: elif wizardPage == self.alignmentPage:
self.setAlignmentTabValues() self.setAlignmentTabValues()
elif id == 5: elif wizardPage == self.areaPositionPage:
self.setPositionTabValues() self.setPositionTabValues()
def setBackgroundTabValues(self): def setBackgroundTabValues(self):
@ -331,7 +306,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.theme.background_end_color) self.theme.background_end_color)
self.setField(u'background_type', QtCore.QVariant(1)) self.setField(u'background_type', QtCore.QVariant(1))
else: else:
self.imageLineEdit.setText(self.theme.background_filename) self.imageFileEdit.setText(self.theme.background_filename)
self.setField(u'background_type', QtCore.QVariant(2)) self.setField(u'background_type', QtCore.QVariant(2))
if self.theme.background_direction == \ if self.theme.background_direction == \
BackgroundGradientType.to_string(BackgroundGradientType.Horizontal): BackgroundGradientType.to_string(BackgroundGradientType.Horizontal):
@ -354,41 +329,28 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
""" """
self.mainFontComboBox.setCurrentFont( self.mainFontComboBox.setCurrentFont(
QtGui.QFont(self.theme.font_main_name)) QtGui.QFont(self.theme.font_main_name))
self.mainColorPushButton.setStyleSheet(u'background-color: %s' % self.mainColorButton.setStyleSheet(u'background-color: %s' %
self.theme.font_main_color) self.theme.font_main_color)
self.setField(u'mainSizeSpinBox', \ self.setField(u'mainSizeSpinBox',
QtCore.QVariant(self.theme.font_main_size)) QtCore.QVariant(self.theme.font_main_size))
self.setField(u'lineSpacingSpinBox', \ self.setField(u'lineSpacingSpinBox',
QtCore.QVariant(self.theme.font_main_line_adjustment)) QtCore.QVariant(self.theme.font_main_line_adjustment))
self.setField(u'outlineCheckBox', \ self.setField(u'outlineCheckBox',
QtCore.QVariant(self.theme.font_main_outline)) QtCore.QVariant(self.theme.font_main_outline))
self.outlineColorPushButton.setStyleSheet(u'background-color: %s' % self.outlineColorButton.setStyleSheet(u'background-color: %s' %
self.theme.font_main_outline_color) self.theme.font_main_outline_color)
self.setField(u'outlineSizeSpinBox', \ self.setField(u'outlineSizeSpinBox',
QtCore.QVariant(self.theme.font_main_outline_size)) QtCore.QVariant(self.theme.font_main_outline_size))
self.setField(u'shadowCheckBox', \ self.setField(u'shadowCheckBox',
QtCore.QVariant(self.theme.font_main_shadow)) QtCore.QVariant(self.theme.font_main_shadow))
self.shadowColorPushButton.setStyleSheet(u'background-color: %s' % self.shadowColorButton.setStyleSheet(u'background-color: %s' %
self.theme.font_main_shadow_color) self.theme.font_main_shadow_color)
self.setField(u'shadowSizeSpinBox', \ self.setField(u'shadowSizeSpinBox',
QtCore.QVariant(self.theme.font_main_shadow_size)) QtCore.QVariant(self.theme.font_main_shadow_size))
self.setField(u'boldCheckBox', \ self.setField(u'mainBoldCheckBox',
QtCore.QVariant(self.theme.font_main_bold)) QtCore.QVariant(self.theme.font_main_bold))
self.setField(u'italicsCheckBox', \ self.setField(u'mainItalicsCheckBox',
QtCore.QVariant(self.theme.font_main_italics)) QtCore.QVariant(self.theme.font_main_italics))
# Set up field states
if self.theme.font_main_outline:
self.setField(u'outlineCheckBox', QtCore.QVariant(False))
else:
self.setField(u'outlineCheckBox', QtCore.QVariant(True))
self.outlineColorPushButton.setEnabled(self.theme.font_main_outline)
self.outlineSizeSpinBox.setEnabled(self.theme.font_main_outline)
if self.theme.font_main_shadow:
self.setField(u'shadowCheckBox', QtCore.QVariant(False))
else:
self.setField(u'shadowCheckBox', QtCore.QVariant(True))
self.shadowColorPushButton.setEnabled(self.theme.font_main_shadow)
self.shadowSizeSpinBox.setEnabled(self.theme.font_main_shadow)
def setFooterAreaTabValues(self): def setFooterAreaTabValues(self):
""" """
@ -396,9 +358,9 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
""" """
self.footerFontComboBox.setCurrentFont( self.footerFontComboBox.setCurrentFont(
QtGui.QFont(self.theme.font_main_name)) QtGui.QFont(self.theme.font_main_name))
self.footerColorPushButton.setStyleSheet(u'background-color: %s' % self.footerColorButton.setStyleSheet(u'background-color: %s' %
self.theme.font_footer_color) self.theme.font_footer_color)
self.setField(u'footerSizeSpinBox', \ self.setField(u'footerSizeSpinBox',
QtCore.QVariant(self.theme.font_footer_size)) QtCore.QVariant(self.theme.font_footer_size))
def setPositionTabValues(self): def setPositionTabValues(self):
@ -406,49 +368,40 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
Handle the display and State of the Position tab. Handle the display and State of the Position tab.
""" """
# Main Area # Main Area
if self.theme.font_main_override: self.mainPositionCheckBox.setChecked(not self.theme.font_main_override)
self.mainDefaultPositionCheckBox.setChecked(False) self.setField(u'mainPositionX', QtCore.QVariant(self.theme.font_main_x))
else: self.setField(u'mainPositionY', QtCore.QVariant(self.theme.font_main_y))
self.mainDefaultPositionCheckBox.setChecked(True) self.setField(u'mainPositionHeight',
self.setField(u'mainPositionX', \
QtCore.QVariant(self.theme.font_main_x))
self.setField(u'mainPositionY', \
QtCore.QVariant(self.theme.font_main_y))
self.setField(u'mainPositionHeight', \
QtCore.QVariant(self.theme.font_main_height)) QtCore.QVariant(self.theme.font_main_height))
self.setField(u'mainPositionWidth', \ self.setField(u'mainPositionWidth',
QtCore.QVariant(self.theme.font_main_width)) QtCore.QVariant(self.theme.font_main_width))
# Footer # Footer
if self.theme.font_footer_override: self.footerPositionCheckBox.setChecked(
self.footerDefaultPositionCheckBox.setChecked(False) not self.theme.font_footer_override)
else: self.setField(u'footerPositionX',
self.footerDefaultPositionCheckBox.setChecked(True)
self.setField(u'footerPositionX', \
QtCore.QVariant(self.theme.font_footer_x)) QtCore.QVariant(self.theme.font_footer_x))
self.setField(u'footerPositionY', \ self.setField(u'footerPositionY',
QtCore.QVariant(self.theme.font_footer_y)) QtCore.QVariant(self.theme.font_footer_y))
self.setField(u'footerPositionHeight', \ self.setField(u'footerPositionHeight',
QtCore.QVariant(self.theme.font_footer_height)) QtCore.QVariant(self.theme.font_footer_height))
self.setField(u'footerPositionWidth', \ self.setField(u'footerPositionWidth',
QtCore.QVariant(self.theme.font_footer_width)) QtCore.QVariant(self.theme.font_footer_width))
def setAlignmentTabValues(self): def setAlignmentTabValues(self):
""" """
Define the Tab Alignments Page Define the Tab Alignments Page
""" """
self.setField(u'horizontal', \ self.setField(u'horizontal',
QtCore.QVariant(self.theme.display_horizontal_align)) QtCore.QVariant(self.theme.display_horizontal_align))
self.setField(u'vertical', \ self.setField(u'vertical',
QtCore.QVariant(self.theme.display_vertical_align)) QtCore.QVariant(self.theme.display_vertical_align))
self.setField(u'slideTransition', \ self.setField(u'slideTransition',
QtCore.QVariant(self.theme.display_slide_transition)) QtCore.QVariant(self.theme.display_slide_transition))
def setPreviewTabValues(self): def setPreviewTabValues(self):
self.setField(u'name', QtCore.QVariant(self.theme.theme_name)) self.setField(u'name', QtCore.QVariant(self.theme.theme_name))
if len(self.theme.theme_name) > 0: self.themeNameEdit.setReadOnly(len(self.theme.theme_name) != 0)
self.themeNameEdit.setEnabled(False) self.themeNameEdit.setFrame(len(self.theme.theme_name) == 0)
else:
self.themeNameEdit.setEnabled(True)
def onBackgroundComboBox(self, index): def onBackgroundComboBox(self, index):
""" """
@ -456,17 +409,6 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
""" """
self.theme.background_type = BackgroundType.to_string(index) self.theme.background_type = BackgroundType.to_string(index)
self.setBackgroundTabValues() self.setBackgroundTabValues()
self.colorLabel.setVisible(index == 0)
self.colorButton.setVisible(index == 0)
self.gradientStartLabel.setVisible(index == 1)
self.gradientStartButton.setVisible(index == 1)
self.gradientEndLabel.setVisible(index == 1)
self.gradientEndButton.setVisible(index == 1)
self.gradientTypeLabel.setVisible(index == 1)
self.gradientComboBox.setVisible(index == 1)
self.imageLabel.setVisible(index == 2)
self.imageLineEdit.setVisible(index == 2)
self.imageBrowseButton.setVisible(index == 2)
def onGradientComboBox(self, index): def onGradientComboBox(self, index):
""" """
@ -514,22 +456,22 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.theme.background_filename = unicode(filename) self.theme.background_filename = unicode(filename)
self.setBackgroundTabValues() self.setBackgroundTabValues()
def onMainColourPushButtonClicked(self): def onMainColourButtonClicked(self):
self.theme.font_main_color = \ self.theme.font_main_color = \
self._colorButton(self.theme.font_main_color) self._colorButton(self.theme.font_main_color)
self.setMainAreaTabValues() self.setMainAreaTabValues()
def onOutlineColourPushButtonClicked(self): def onOutlineColourButtonClicked(self):
self.theme.font_main_outline_color = \ self.theme.font_main_outline_color = \
self._colorButton(self.theme.font_main_outline_color) self._colorButton(self.theme.font_main_outline_color)
self.setMainAreaTabValues() self.setMainAreaTabValues()
def onShadowColourPushButtonClicked(self): def onShadowColourButtonClicked(self):
self.theme.font_main_shadow_color = \ self.theme.font_main_shadow_color = \
self._colorButton(self.theme.font_main_shadow_color) self._colorButton(self.theme.font_main_shadow_color)
self.setMainAreaTabValues() self.setMainAreaTabValues()
def onFooterColourPushButtonClicked(self): def onFooterColourButtonClicked(self):
self.theme.font_footer_color = \ self.theme.font_footer_color = \
self._colorButton(self.theme.font_footer_color) self._colorButton(self.theme.font_footer_color)
self.setFooterAreaTabValues() self.setFooterAreaTabValues()
@ -554,9 +496,9 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
self.theme.font_main_shadow_size = \ self.theme.font_main_shadow_size = \
self.field(u'shadowSizeSpinBox').toInt()[0] self.field(u'shadowSizeSpinBox').toInt()[0]
self.theme.font_main_bold = \ self.theme.font_main_bold = \
self.field(u'boldCheckBox').toBool() self.field(u'mainBoldCheckBox').toBool()
self.theme.font_main_italics = \ self.theme.font_main_italics = \
self.field(u'italicsCheckBox').toBool() self.field(u'mainItalicsCheckBox').toBool()
# footer page # footer page
self.theme.font_footer_name = \ self.theme.font_footer_name = \
unicode(self.footerFontComboBox.currentFont().family()) unicode(self.footerFontComboBox.currentFont().family())

613
openlp/core/ui/themewizard.py
View File

@ -36,433 +36,389 @@ class Ui_ThemeWizard(object):
ThemeWizard.setOptions( ThemeWizard.setOptions(
QtGui.QWizard.IndependentPages | QtGui.QWizard.IndependentPages |
QtGui.QWizard.NoBackButtonOnStartPage) QtGui.QWizard.NoBackButtonOnStartPage)
# welcome page
self.welcomePage = QtGui.QWizardPage() self.welcomePage = QtGui.QWizardPage()
self.welcomePage.setPixmap(QtGui.QWizard.WatermarkPixmap, self.welcomePage.setPixmap(QtGui.QWizard.WatermarkPixmap,
QtGui.QPixmap(u':/wizards/wizard_createtheme.bmp')) QtGui.QPixmap(u':/wizards/wizard_createtheme.bmp'))
self.welcomePage.setObjectName(u'welcomePage') self.welcomePage.setObjectName(u'WelcomePage')
self.welcomeLayout = QtGui.QVBoxLayout(self.welcomePage) self.welcomeLayout = QtGui.QVBoxLayout(self.welcomePage)
self.welcomeLayout.setMargin(12) self.welcomeLayout.setObjectName(u'WelcomeLayout')
self.welcomeLayout.setSpacing(6)
self.welcomeLayout.setObjectName(u'welcomeLayout')
self.titleLabel = QtGui.QLabel(self.welcomePage) self.titleLabel = QtGui.QLabel(self.welcomePage)
self.titleLabel.setObjectName(u'titleLabel') self.titleLabel.setObjectName(u'TitleLabel')
self.welcomeLayout.addWidget(self.titleLabel) self.welcomeLayout.addWidget(self.titleLabel)
self.welcomeTopSpacer = QtGui.QSpacerItem(20, 40, self.welcomeLayout.addSpacing(40)
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
self.welcomeLayout.addItem(self.welcomeTopSpacer)
self.informationLabel = QtGui.QLabel(self.welcomePage) self.informationLabel = QtGui.QLabel(self.welcomePage)
self.informationLabel.setWordWrap(True) self.informationLabel.setWordWrap(True)
self.informationLabel.setObjectName(u'informationLabel') self.informationLabel.setObjectName(u'InformationLabel')
self.welcomeLayout.addWidget(self.informationLabel) self.welcomeLayout.addWidget(self.informationLabel)
self.welcomeBottomSpacer = QtGui.QSpacerItem(20, 40, self.welcomeLayout.addStretch()
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.welcomeLayout.addItem(self.welcomeBottomSpacer)
ThemeWizard.addPage(self.welcomePage) ThemeWizard.addPage(self.welcomePage)
# background page
self.backgroundPage = QtGui.QWizardPage() self.backgroundPage = QtGui.QWizardPage()
self.backgroundPage.setObjectName(u'backgroundPage') self.backgroundPage.setObjectName(u'BackgroundPage')
self.backgroundLayout = QtGui.QFormLayout(self.backgroundPage) self.backgroundLayout = QtGui.QVBoxLayout(self.backgroundPage)
self.backgroundLayout.setMargin(12) self.backgroundLayout.setObjectName(u'BackgroundLayout')
self.backgroundLayout.setVerticalSpacing(6) self.backgroundTypeLayout = QtGui.QFormLayout()
self.backgroundLayout.setObjectName(u'backgroundLayout') self.backgroundTypeLayout.setObjectName(u'BackgroundTypeLayout')
self.backgroundTypeLabel = QtGui.QLabel(self.backgroundPage) self.backgroundLabel = QtGui.QLabel(self.backgroundPage)
self.backgroundTypeLabel.setObjectName(u'backgroundTypeLabel') self.backgroundLabel.setObjectName(u'BackgroundLabel')
self.backgroundLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.backgroundComboBox = QtGui.QComboBox(self.backgroundPage)
self.backgroundTypeLabel) self.backgroundComboBox.addItems([u'', u'', u''])
self.backgroundTypeComboBox = QtGui.QComboBox(self.backgroundPage) self.backgroundComboBox.setObjectName(u'BackgroundComboBox')
self.backgroundTypeComboBox.addItem(u'') self.backgroundTypeLayout.addRow(self.backgroundLabel,
self.backgroundTypeComboBox.addItem(u'') self.backgroundComboBox)
self.backgroundTypeComboBox.addItem(u'') self.backgroundTypeSpacer = QtGui.QSpacerItem(10, 0,
self.backgroundTypeComboBox.setObjectName(u'backgroundTypeComboBox') QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
self.backgroundLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.backgroundTypeLayout.setItem(1,QtGui.QFormLayout.LabelRole,
self.backgroundTypeComboBox) self.backgroundTypeSpacer)
self.colorLabel = QtGui.QLabel(self.backgroundPage) self.backgroundLayout.addLayout(self.backgroundTypeLayout)
self.colorLabel.setObjectName(u'colorLabel') self.backgroundStack = QtGui.QStackedLayout()
self.backgroundLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.backgroundStack.setObjectName(u'BackgroundStack')
self.colorLabel) self.colorWidget = QtGui.QWidget(self.backgroundPage)
self.colorButton = QtGui.QPushButton(self.backgroundPage) self.colorWidget.setObjectName(u'ColorWidget')
self.colorButton.setObjectName(u'colorButton') self.colorLayout = QtGui.QFormLayout(self.colorWidget)
self.backgroundLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.colorLayout.setMargin(0)
self.colorButton) self.colorLayout.setObjectName(u'ColorLayout')
self.gradientStartLabel = QtGui.QLabel(self.backgroundPage) self.colorLabel = QtGui.QLabel(self.colorWidget)
self.gradientStartLabel.setVisible(False) self.colorLabel.setObjectName(u'ColorLabel')
self.gradientStartLabel.setObjectName(u'gradientStartLabel') self.colorButton = QtGui.QPushButton(self.colorWidget)
self.backgroundLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.colorButton.setObjectName(u'ColorButton')
self.gradientStartLabel) self.colorLayout.addRow(self.colorLabel, self.colorButton)
self.gradientStartButton = QtGui.QPushButton(self.backgroundPage) self.colorSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
self.gradientStartButton.setVisible(False) QtGui.QSizePolicy.Minimum)
self.gradientStartButton.setObjectName(u'gradientStartButton') self.colorLayout.setItem(1, QtGui.QFormLayout.LabelRole,
self.backgroundLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.colorSpacer)
self.backgroundStack.addWidget(self.colorWidget)
self.gradientWidget = QtGui.QWidget(self.backgroundPage)
self.gradientWidget.setObjectName(u'GradientWidget')
self.gradientLayout = QtGui.QFormLayout(self.gradientWidget)
self.gradientLayout.setMargin(0)
self.gradientLayout.setObjectName(u'GradientLayout')
self.gradientStartLabel = QtGui.QLabel(self.gradientWidget)
self.gradientStartLabel.setObjectName(u'GradientStartLabel')
self.gradientStartButton = QtGui.QPushButton(self.gradientWidget)
self.gradientStartButton.setObjectName(u'GradientStartButton')
self.gradientLayout.addRow(self.gradientStartLabel,
self.gradientStartButton) self.gradientStartButton)
self.gradientEndLabel = QtGui.QLabel(self.backgroundPage) self.gradientEndLabel = QtGui.QLabel(self.gradientWidget)
self.gradientEndLabel.setVisible(False) self.gradientEndLabel.setObjectName(u'GradientEndLabel')
self.gradientEndLabel.setObjectName(u'gradientEndLabel') self.gradientEndButton = QtGui.QPushButton(self.gradientWidget)
self.backgroundLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.gradientEndButton.setObjectName(u'GradientEndButton')
self.gradientEndLabel) self.gradientLayout.addRow(self.gradientEndLabel,
self.gradientEndButton = QtGui.QPushButton(self.backgroundPage)
self.gradientEndButton.setVisible(False)
self.gradientEndButton.setObjectName(u'gradientEndButton')
self.backgroundLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
self.gradientEndButton) self.gradientEndButton)
self.gradientTypeLabel = QtGui.QLabel(self.backgroundPage) self.gradientTypeLabel = QtGui.QLabel(self.gradientWidget)
self.gradientTypeLabel.setVisible(False) self.gradientTypeLabel.setObjectName(u'GradientTypeLabel')
self.gradientTypeLabel.setObjectName(u'gradientTypeLabel') self.gradientComboBox = QtGui.QComboBox(self.gradientWidget)
self.backgroundLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.gradientComboBox.setObjectName(u'GradientComboBox')
self.gradientTypeLabel) self.gradientComboBox.addItems([u'', u'', u'', u'', u''])
self.gradientComboBox = QtGui.QComboBox(self.backgroundPage) self.gradientLayout.addRow(self.gradientTypeLabel,
self.gradientComboBox.setVisible(False)
self.gradientComboBox.setObjectName(u'gradientComboBox')
self.gradientComboBox.addItem(u'')
self.gradientComboBox.addItem(u'')
self.gradientComboBox.addItem(u'')
self.gradientComboBox.addItem(u'')
self.gradientComboBox.addItem(u'')
self.backgroundLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
self.gradientComboBox) self.gradientComboBox)
self.imageLabel = QtGui.QLabel(self.backgroundPage) self.gradientSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
self.imageLabel.setVisible(False) QtGui.QSizePolicy.Minimum)
self.imageLabel.setObjectName(u'imageLabel') self.gradientLayout.setItem(3, QtGui.QFormLayout.LabelRole,
self.backgroundLayout.setWidget(5, QtGui.QFormLayout.LabelRole, self.gradientSpacer)
self.imageLabel) self.backgroundStack.addWidget(self.gradientWidget)
self.imageWidget = QtGui.QWidget(self.backgroundPage)
self.imageWidget.setObjectName(u'ImageWidget')
self.imageLayout = QtGui.QFormLayout(self.imageWidget)
self.imageLayout.setMargin(0)
self.imageLayout.setObjectName(u'ImageLayout')
self.imageLabel = QtGui.QLabel(self.imageWidget)
self.imageLabel.setObjectName(u'ImageLabel')
self.imageFileLayout = QtGui.QHBoxLayout() self.imageFileLayout = QtGui.QHBoxLayout()
self.imageFileLayout.setObjectName(u'imageFileLayout') self.imageFileLayout.setObjectName(u'ImageFileLayout')
self.imageLineEdit = QtGui.QLineEdit(self.backgroundPage) self.imageFileEdit = QtGui.QLineEdit(self.imageWidget)
self.imageLineEdit.setVisible(False) self.imageFileEdit.setObjectName(u'ImageFileEdit')
self.imageLineEdit.setObjectName(u'imageLineEdit') self.imageFileLayout.addWidget(self.imageFileEdit)
self.imageFileLayout.addWidget(self.imageLineEdit) self.imageBrowseButton = QtGui.QToolButton(self.imageWidget)
self.imageBrowseButton = QtGui.QToolButton(self.backgroundPage) self.imageBrowseButton.setObjectName(u'ImageBrowseButton')
self.imageBrowseButton.setVisible(False)
self.imageBrowseButton.setObjectName(u'imageBrowseButton')
self.imageBrowseButton.setIcon( self.imageBrowseButton.setIcon(
build_icon(u':/general/general_open.png')) build_icon(u':/general/general_open.png'))
self.imageFileLayout.addWidget(self.imageBrowseButton) self.imageFileLayout.addWidget(self.imageBrowseButton)
self.backgroundLayout.setLayout(5, QtGui.QFormLayout.FieldRole, self.imageLayout.addRow(self.imageLabel, self.imageFileLayout)
self.imageFileLayout) self.imageSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Minimum)
self.imageLayout.setItem(1, QtGui.QFormLayout.LabelRole,
self.imageSpacer)
self.backgroundStack.addWidget(self.imageWidget)
self.backgroundLayout.addLayout(self.backgroundStack)
ThemeWizard.addPage(self.backgroundPage) ThemeWizard.addPage(self.backgroundPage)
# main area page
self.mainAreaPage = QtGui.QWizardPage() self.mainAreaPage = QtGui.QWizardPage()
self.mainAreaPage.setObjectName(u'mainAreaPage') self.mainAreaPage.setObjectName(u'MainAreaPage')
self.mainAreaLayout = QtGui.QFormLayout(self.mainAreaPage) self.mainAreaLayout = QtGui.QFormLayout(self.mainAreaPage)
self.mainAreaLayout.setMargin(12) self.mainAreaLayout.setObjectName(u'MainAreaLayout')
self.mainAreaLayout.setVerticalSpacing(6)
self.mainAreaLayout.setObjectName(u'mainAreaLayout')
self.mainFontLabel = QtGui.QLabel(self.mainAreaPage) self.mainFontLabel = QtGui.QLabel(self.mainAreaPage)
self.mainFontLabel.setObjectName(u'mainFontLabel') self.mainFontLabel.setObjectName(u'MainFontLabel')
self.mainAreaLayout.setWidget(0,
QtGui.QFormLayout.LabelRole, self.mainFontLabel)
self.mainFontComboBox = QtGui.QFontComboBox(self.mainAreaPage) self.mainFontComboBox = QtGui.QFontComboBox(self.mainAreaPage)
self.mainFontComboBox.setObjectName(u'mainFontComboBox') self.mainFontComboBox.setObjectName(u'MainFontComboBox')
self.mainAreaLayout.setWidget(0, self.mainAreaLayout.addRow(self.mainFontLabel, self.mainFontComboBox)
QtGui.QFormLayout.FieldRole, self.mainFontComboBox)
self.mainColorLabel = QtGui.QLabel(self.mainAreaPage) self.mainColorLabel = QtGui.QLabel(self.mainAreaPage)
self.mainColorLabel.setObjectName(u'mainColorLabel') self.mainColorLabel.setObjectName(u'MainColorLabel')
self.mainAreaLayout.setWidget(1, self.mainPropertiesLayout = QtGui.QHBoxLayout()
QtGui.QFormLayout.LabelRole, self.mainColorLabel) self.mainPropertiesLayout.setObjectName(u'MainPropertiesLayout')
self.fontPropertiesLayout = QtGui.QHBoxLayout() self.mainColorButton = QtGui.QPushButton(self.mainAreaPage)
self.fontPropertiesLayout.setSpacing(12) self.mainColorButton.setObjectName(u'MainColorButton')
self.fontPropertiesLayout.setObjectName(u'fontPropertiesLayout') self.mainPropertiesLayout.addWidget(self.mainColorButton)
self.mainColorPushButton = QtGui.QPushButton(self.mainAreaPage) self.mainPropertiesLayout.addSpacing(20)
self.mainColorPushButton.setObjectName(u'mainColorPushButton') self.mainBoldCheckBox = QtGui.QCheckBox(self.mainAreaPage)
self.fontPropertiesLayout.addWidget(self.mainColorPushButton) self.mainBoldCheckBox.setObjectName(u'MainBoldCheckBox')
self.boldCheckBox = QtGui.QCheckBox(self.mainAreaPage) self.mainPropertiesLayout.addWidget(self.mainBoldCheckBox)
self.boldCheckBox.setObjectName(u'boldCheckBox') self.mainPropertiesLayout.addSpacing(20)
self.fontPropertiesLayout.addWidget(self.boldCheckBox) self.mainItalicsCheckBox = QtGui.QCheckBox(self.mainAreaPage)
self.italicsCheckBox = QtGui.QCheckBox(self.mainAreaPage) self.mainItalicsCheckBox.setObjectName(u'MainItalicsCheckBox')
self.italicsCheckBox.setObjectName(u'italicsCheckBox') self.mainPropertiesLayout.addWidget(self.mainItalicsCheckBox)
self.fontPropertiesLayout.addWidget(self.italicsCheckBox) self.mainAreaLayout.addRow(self.mainColorLabel,
self.mainAreaLayout.setLayout(1, self.mainPropertiesLayout)
QtGui.QFormLayout.FieldRole, self.fontPropertiesLayout)
self.mainSizeLabel = QtGui.QLabel(self.mainAreaPage) self.mainSizeLabel = QtGui.QLabel(self.mainAreaPage)
self.mainSizeLabel.setObjectName(u'mainSizeLabel') self.mainSizeLabel.setObjectName(u'MainSizeLabel')
self.mainAreaLayout.setWidget(2,
QtGui.QFormLayout.LabelRole, self.mainSizeLabel)
self.mainSizeLayout = QtGui.QHBoxLayout() self.mainSizeLayout = QtGui.QHBoxLayout()
self.mainSizeLayout.setObjectName(u'mainSizeLayout') self.mainSizeLayout.setObjectName(u'MainSizeLayout')
self.mainSizeSpinBox = QtGui.QSpinBox(self.mainAreaPage) self.mainSizeSpinBox = QtGui.QSpinBox(self.mainAreaPage)
self.mainSizeSpinBox.setMaximum(999) self.mainSizeSpinBox.setMaximum(999)
self.mainSizeSpinBox.setProperty(u'value', 16) self.mainSizeSpinBox.setValue(16)
self.mainSizeSpinBox.setObjectName(u'mainSizeSpinBox') self.mainSizeSpinBox.setObjectName(u'MainSizeSpinBox')
self.mainSizeLayout.addWidget(self.mainSizeSpinBox) self.mainSizeLayout.addWidget(self.mainSizeSpinBox)
self.mainLineCountLabel = QtGui.QLabel(self.mainAreaPage) self.mainLineCountLabel = QtGui.QLabel(self.mainAreaPage)
self.mainLineCountLabel.setObjectName(u'mainLineCountLabel') self.mainLineCountLabel.setObjectName(u'MainLineCountLabel')
self.mainSizeLayout.addWidget(self.mainLineCountLabel) self.mainSizeLayout.addWidget(self.mainLineCountLabel)
self.mainAreaLayout.setLayout(2, self.mainAreaLayout.addRow(self.mainSizeLabel, self.mainSizeLayout)
QtGui.QFormLayout.FieldRole, self.mainSizeLayout)
self.lineSpacingLabel = QtGui.QLabel(self.mainAreaPage) self.lineSpacingLabel = QtGui.QLabel(self.mainAreaPage)
self.lineSpacingLabel.setObjectName(u'lineSpacingLabel') self.lineSpacingLabel.setObjectName(u'LineSpacingLabel')
self.mainAreaLayout.setWidget(3,
QtGui.QFormLayout.LabelRole, self.lineSpacingLabel)
self.lineSpacingSpinBox = QtGui.QSpinBox(self.mainAreaPage) self.lineSpacingSpinBox = QtGui.QSpinBox(self.mainAreaPage)
self.lineSpacingSpinBox.setMinimum(-50) self.lineSpacingSpinBox.setMinimum(-50)
self.lineSpacingSpinBox.setMaximum(50) self.lineSpacingSpinBox.setMaximum(50)
self.lineSpacingSpinBox.setObjectName(u'lineSpacingSpinBox') self.lineSpacingSpinBox.setObjectName(u'LineSpacingSpinBox')
self.mainAreaLayout.setWidget(3, self.mainAreaLayout.addRow(self.lineSpacingLabel,
QtGui.QFormLayout.FieldRole, self.lineSpacingSpinBox) self.lineSpacingSpinBox)
self.outlineCheckBox = QtGui.QCheckBox(self.mainAreaPage) self.outlineCheckBox = QtGui.QCheckBox(self.mainAreaPage)
self.outlineCheckBox.setObjectName(u'outlineCheckBox') self.outlineCheckBox.setObjectName(u'OutlineCheckBox')
self.mainAreaLayout.setWidget(4,
QtGui.QFormLayout.LabelRole, self.outlineCheckBox)
self.outlineLayout = QtGui.QHBoxLayout() self.outlineLayout = QtGui.QHBoxLayout()
self.outlineLayout.setObjectName(u'outlineLayout') self.outlineLayout.setObjectName(u'OutlineLayout')
self.outlineColorPushButton = QtGui.QPushButton(self.mainAreaPage) self.outlineColorButton = QtGui.QPushButton(self.mainAreaPage)
self.outlineColorPushButton.setObjectName(u'outlineColorPushButton') self.outlineColorButton.setEnabled(False)
self.outlineLayout.addWidget(self.outlineColorPushButton) self.outlineColorButton.setObjectName(u'OutlineColorButton')
self.outlineLayout.addWidget(self.outlineColorButton)
self.outlineLayout.addSpacing(20)
self.outlineSizeLabel = QtGui.QLabel(self.mainAreaPage) self.outlineSizeLabel = QtGui.QLabel(self.mainAreaPage)
self.outlineSizeLabel.setObjectName(u'outlineSizeLabel') self.outlineSizeLabel.setObjectName(u'OutlineSizeLabel')
self.outlineLayout.addWidget(self.outlineSizeLabel) self.outlineLayout.addWidget(self.outlineSizeLabel)
self.outlineSizeSpinBox = QtGui.QSpinBox(self.mainAreaPage) self.outlineSizeSpinBox = QtGui.QSpinBox(self.mainAreaPage)
self.outlineSizeSpinBox.setObjectName(u'outlineSizeSpinBox') self.outlineSizeSpinBox.setEnabled(False)
self.outlineSizeSpinBox.setObjectName(u'OutlineSizeSpinBox')
self.outlineLayout.addWidget(self.outlineSizeSpinBox) self.outlineLayout.addWidget(self.outlineSizeSpinBox)
self.mainAreaLayout.setLayout(4, self.mainAreaLayout.addRow(self.outlineCheckBox, self.outlineLayout)
QtGui.QFormLayout.FieldRole, self.outlineLayout)
self.shadowCheckBox = QtGui.QCheckBox(self.mainAreaPage) self.shadowCheckBox = QtGui.QCheckBox(self.mainAreaPage)
self.shadowCheckBox.setObjectName(u'shadowCheckBox') self.shadowCheckBox.setObjectName(u'ShadowCheckBox')
self.mainAreaLayout.setWidget(5,
QtGui.QFormLayout.LabelRole, self.shadowCheckBox)
self.shadowLayout = QtGui.QHBoxLayout() self.shadowLayout = QtGui.QHBoxLayout()
self.shadowLayout.setObjectName(u'shadowLayout') self.shadowLayout.setObjectName(u'ShadowLayout')
self.shadowColorPushButton = QtGui.QPushButton(self.mainAreaPage) self.shadowColorButton = QtGui.QPushButton(self.mainAreaPage)
self.shadowColorPushButton.setObjectName(u'shadowColorPushButton') self.shadowColorButton.setEnabled(False)
self.shadowLayout.addWidget(self.shadowColorPushButton) self.shadowColorButton.setObjectName(u'shadowColorButton')
self.shadowLayout.addWidget(self.shadowColorButton)
self.shadowLayout.addSpacing(20)
self.shadowSizeLabel = QtGui.QLabel(self.mainAreaPage) self.shadowSizeLabel = QtGui.QLabel(self.mainAreaPage)
self.shadowSizeLabel.setObjectName(u'shadowSizeLabel') self.shadowSizeLabel.setObjectName(u'ShadowSizeLabel')
self.shadowLayout.addWidget(self.shadowSizeLabel) self.shadowLayout.addWidget(self.shadowSizeLabel)
self.shadowSizeSpinBox = QtGui.QSpinBox(self.mainAreaPage) self.shadowSizeSpinBox = QtGui.QSpinBox(self.mainAreaPage)
self.shadowSizeSpinBox.setObjectName(u'shadowSizeSpinBox') self.shadowSizeSpinBox.setEnabled(False)
self.shadowSizeSpinBox.setObjectName(u'ShadowSizeSpinBox')
self.shadowLayout.addWidget(self.shadowSizeSpinBox) self.shadowLayout.addWidget(self.shadowSizeSpinBox)
self.mainAreaLayout.setLayout(5, self.mainAreaLayout.addRow(self.shadowCheckBox, self.shadowLayout)
QtGui.QFormLayout.FieldRole, self.shadowLayout)
ThemeWizard.addPage(self.mainAreaPage) ThemeWizard.addPage(self.mainAreaPage)
# footer area page
self.footerAreaPage = QtGui.QWizardPage() self.footerAreaPage = QtGui.QWizardPage()
self.footerAreaPage.setObjectName(u'footerAreaPage') self.footerAreaPage.setObjectName(u'FooterAreaPage')
self.footerLayout = QtGui.QFormLayout(self.footerAreaPage) self.footerAreaLayout = QtGui.QFormLayout(self.footerAreaPage)
self.footerLayout.setMargin(12) self.footerAreaLayout.setObjectName(u'FooterAreaLayout')
self.footerLayout.setVerticalSpacing(6)
self.footerLayout.setObjectName(u'footerLayout')
self.footerFontLabel = QtGui.QLabel(self.footerAreaPage) self.footerFontLabel = QtGui.QLabel(self.footerAreaPage)
self.footerFontLabel.setObjectName(u'footerFontLabel') self.footerFontLabel.setObjectName(u'FooterFontLabel')
self.footerLayout.setWidget(0,
QtGui.QFormLayout.LabelRole, self.footerFontLabel)
self.footerFontComboBox = QtGui.QFontComboBox(self.footerAreaPage) self.footerFontComboBox = QtGui.QFontComboBox(self.footerAreaPage)
self.footerFontComboBox.setObjectName(u'footerFontComboBox') self.footerFontComboBox.setObjectName(u'footerFontComboBox')
self.footerLayout.setWidget(0, self.footerAreaLayout.addRow(self.footerFontLabel,
QtGui.QFormLayout.FieldRole, self.footerFontComboBox) self.footerFontComboBox)
self.footerColorLabel = QtGui.QLabel(self.footerAreaPage) self.footerColorLabel = QtGui.QLabel(self.footerAreaPage)
self.footerColorLabel.setObjectName(u'footerColorLabel') self.footerColorLabel.setObjectName(u'FooterColorLabel')
self.footerLayout.setWidget(1, self.footerColorButton = QtGui.QPushButton(self.footerAreaPage)
QtGui.QFormLayout.LabelRole, self.footerColorLabel) self.footerColorButton.setObjectName(u'footerColorButton')
self.footerColorPushButton = QtGui.QPushButton(self.footerAreaPage) self.footerAreaLayout.addRow(self.footerColorLabel,
self.footerColorPushButton.setObjectName(u'footerColorPushButton') self.footerColorButton)
self.footerLayout.setWidget(1,
QtGui.QFormLayout.FieldRole, self.footerColorPushButton)
self.footerSizeLabel = QtGui.QLabel(self.footerAreaPage) self.footerSizeLabel = QtGui.QLabel(self.footerAreaPage)
self.footerSizeLabel.setObjectName(u'footerSizeLabel') self.footerSizeLabel.setObjectName(u'FooterSizeLabel')
self.footerLayout.setWidget(2,
QtGui.QFormLayout.LabelRole, self.footerSizeLabel)
self.footerSizeSpinBox = QtGui.QSpinBox(self.footerAreaPage) self.footerSizeSpinBox = QtGui.QSpinBox(self.footerAreaPage)
self.footerSizeSpinBox.setMaximum(999) self.footerSizeSpinBox.setMaximum(999)
self.footerSizeSpinBox.setProperty(u'value', 10) self.footerSizeSpinBox.setValue(10)
self.footerSizeSpinBox.setObjectName(u'footerSizeSpinBox') self.footerSizeSpinBox.setObjectName(u'FooterSizeSpinBox')
self.footerLayout.setWidget(2, self.footerAreaLayout.addRow(self.footerSizeLabel, self.footerSizeSpinBox)
QtGui.QFormLayout.FieldRole, self.footerSizeSpinBox)
ThemeWizard.addPage(self.footerAreaPage) ThemeWizard.addPage(self.footerAreaPage)
# alignment page
self.alignmentPage = QtGui.QWizardPage() self.alignmentPage = QtGui.QWizardPage()
self.alignmentPage.setObjectName(u'alignmentPage') self.alignmentPage.setObjectName(u'AlignmentPage')
self.alignmentLayout = QtGui.QFormLayout(self.alignmentPage) self.alignmentLayout = QtGui.QFormLayout(self.alignmentPage)
self.alignmentLayout.setMargin(12) self.alignmentLayout.setObjectName(u'AlignmentLayout')
self.alignmentLayout.setVerticalSpacing(6)
self.alignmentLayout.setObjectName(u'alignmentLayout')
self.horizontalLabel = QtGui.QLabel(self.alignmentPage) self.horizontalLabel = QtGui.QLabel(self.alignmentPage)
self.horizontalLabel.setObjectName(u'horizontalLabel') self.horizontalLabel.setObjectName(u'HorizontalLabel')
self.alignmentLayout.setWidget(0,
QtGui.QFormLayout.LabelRole, self.horizontalLabel)
self.horizontalComboBox = QtGui.QComboBox(self.alignmentPage) self.horizontalComboBox = QtGui.QComboBox(self.alignmentPage)
self.horizontalComboBox.setObjectName(u'horizontalComboBox') self.horizontalComboBox.addItems([u'', u'', u''])
self.horizontalComboBox.addItem(u'') self.horizontalComboBox.setObjectName(u'HorizontalComboBox')
self.horizontalComboBox.addItem(u'') self.alignmentLayout.addRow(self.horizontalLabel,
self.horizontalComboBox.addItem(u'') self.horizontalComboBox)
self.alignmentLayout.setWidget(0,
QtGui.QFormLayout.FieldRole, self.horizontalComboBox)
self.verticalLabel = QtGui.QLabel(self.alignmentPage) self.verticalLabel = QtGui.QLabel(self.alignmentPage)
self.verticalLabel.setObjectName(u'verticalLabel') self.verticalLabel.setObjectName(u'VerticalLabel')
self.alignmentLayout.setWidget(1,
QtGui.QFormLayout.LabelRole, self.verticalLabel)
self.verticalComboBox = QtGui.QComboBox(self.alignmentPage) self.verticalComboBox = QtGui.QComboBox(self.alignmentPage)
self.verticalComboBox.setObjectName(u'verticalComboBox') self.verticalComboBox.addItems([u'', u'', u''])
self.verticalComboBox.addItem(u'') self.verticalComboBox.setObjectName(u'VerticalComboBox')
self.verticalComboBox.addItem(u'') self.alignmentLayout.addRow(self.verticalLabel, self.verticalComboBox)
self.verticalComboBox.addItem(u'')
self.alignmentLayout.setWidget(1,
QtGui.QFormLayout.FieldRole, self.verticalComboBox)
self.transitionsCheckBox = QtGui.QCheckBox(self.alignmentPage) self.transitionsCheckBox = QtGui.QCheckBox(self.alignmentPage)
self.transitionsCheckBox.setObjectName(u'transitionsCheckBox') self.transitionsCheckBox.setObjectName(u'TransitionsCheckBox')
self.alignmentLayout.setWidget(2, self.alignmentLayout.addRow(self.transitionsCheckBox)
QtGui.QFormLayout.FieldRole, self.transitionsCheckBox)
ThemeWizard.addPage(self.alignmentPage) ThemeWizard.addPage(self.alignmentPage)
# area position page
self.areaPositionPage = QtGui.QWizardPage() self.areaPositionPage = QtGui.QWizardPage()
self.areaPositionPage.setObjectName(u'areaPositionPage') self.areaPositionPage.setObjectName(u'AreaPositionPage')
self.areaPositionLayout = QtGui.QGridLayout(self.areaPositionPage) self.areaPositionLayout = QtGui.QHBoxLayout(self.areaPositionPage)
self.areaPositionLayout.setObjectName(u'areaPositionLayout') self.areaPositionLayout.setObjectName(u'AreaPositionLayout')
self.mainPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage) self.mainPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage)
self.mainPositionGroupBox.setObjectName(u'mainPositionGroupBox') self.mainPositionGroupBox.setObjectName(u'MainPositionGroupBox')
self.mainPositionLayout = QtGui.QFormLayout(self.mainPositionGroupBox) self.mainPositionLayout = QtGui.QFormLayout(self.mainPositionGroupBox)
self.mainPositionLayout.setSpacing(6) self.mainPositionLayout.setObjectName(u'MainPositionLayout')
self.mainPositionLayout.setObjectName(u'mainPositionLayout') self.mainPositionCheckBox = QtGui.QCheckBox(self.mainPositionGroupBox)
self.mainDefaultPositionCheckBox = QtGui.QCheckBox( self.mainPositionCheckBox.setObjectName(u'MainPositionCheckBox')
self.mainPositionGroupBox) self.mainPositionLayout.addRow(self.mainPositionCheckBox)
self.mainDefaultPositionCheckBox.setChecked(True)
self.mainDefaultPositionCheckBox.setObjectName(
u'mainDefaultPositionCheckBox')
self.mainPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
self.mainDefaultPositionCheckBox)
self.mainXLabel = QtGui.QLabel(self.mainPositionGroupBox) self.mainXLabel = QtGui.QLabel(self.mainPositionGroupBox)
self.mainXLabel.setObjectName(u'mainXLabel') self.mainXLabel.setObjectName(u'MainXLabel')
self.mainPositionLayout.setWidget(1,
QtGui.QFormLayout.LabelRole, self.mainXLabel)
self.mainXSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) self.mainXSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox)
self.mainXSpinBox.setEnabled(False)
self.mainXSpinBox.setMaximum(9999) self.mainXSpinBox.setMaximum(9999)
self.mainXSpinBox.setProperty(u'value', 0) self.mainXSpinBox.setObjectName(u'MainXSpinBox')
self.mainXSpinBox.setObjectName(u'mainXSpinBox') self.mainPositionLayout.addRow(self.mainXLabel, self.mainXSpinBox)
self.mainPositionLayout.setWidget(1,
QtGui.QFormLayout.FieldRole, self.mainXSpinBox)
self.mainYLabel = QtGui.QLabel(self.mainPositionGroupBox) self.mainYLabel = QtGui.QLabel(self.mainPositionGroupBox)
self.mainYLabel.setObjectName(u'mainYLabel') self.mainYLabel.setObjectName(u'MainYLabel')
self.mainPositionLayout.setWidget(2,
QtGui.QFormLayout.LabelRole, self.mainYLabel)
self.mainYSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) self.mainYSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox)
self.mainYSpinBox.setEnabled(False)
self.mainYSpinBox.setMaximum(9999) self.mainYSpinBox.setMaximum(9999)
self.mainYSpinBox.setObjectName(u'mainYSpinBox') self.mainYSpinBox.setObjectName(u'MainYSpinBox')
self.mainPositionLayout.setWidget(2, self.mainPositionLayout.addRow(self.mainYLabel, self.mainYSpinBox)
QtGui.QFormLayout.FieldRole, self.mainYSpinBox)
self.mainWidthLabel = QtGui.QLabel(self.mainPositionGroupBox) self.mainWidthLabel = QtGui.QLabel(self.mainPositionGroupBox)
self.mainWidthLabel.setObjectName(u'mainWidthLabel') self.mainWidthLabel.setObjectName(u'MainWidthLabel')
self.mainPositionLayout.setWidget(3,
QtGui.QFormLayout.LabelRole, self.mainWidthLabel)
self.mainWidthSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) self.mainWidthSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox)
self.mainWidthSpinBox.setEnabled(False)
self.mainWidthSpinBox.setMaximum(9999) self.mainWidthSpinBox.setMaximum(9999)
self.mainWidthSpinBox.setObjectName(u'mainWidthSpinBox') self.mainWidthSpinBox.setObjectName(u'MainWidthSpinBox')
self.mainPositionLayout.setWidget(3, self.mainPositionLayout.addRow(self.mainWidthLabel,
QtGui.QFormLayout.FieldRole, self.mainWidthSpinBox) self.mainWidthSpinBox)
self.mainHeightLabel = QtGui.QLabel(self.mainPositionGroupBox) self.mainHeightLabel = QtGui.QLabel(self.mainPositionGroupBox)
self.mainHeightLabel.setObjectName(u'mainHeightLabel') self.mainHeightLabel.setObjectName(u'MainHeightLabel')
self.mainPositionLayout.setWidget(4,
QtGui.QFormLayout.LabelRole, self.mainHeightLabel)
self.mainHeightSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) self.mainHeightSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox)
self.mainHeightSpinBox.setEnabled(False)
self.mainHeightSpinBox.setMaximum(9999) self.mainHeightSpinBox.setMaximum(9999)
self.mainHeightSpinBox.setObjectName(u'mainHeightSpinBox') self.mainHeightSpinBox.setObjectName(u'MainHeightSpinBox')
self.mainPositionLayout.setWidget(4, self.mainPositionLayout.addRow(self.mainHeightLabel,
QtGui.QFormLayout.FieldRole, self.mainHeightSpinBox) self.mainHeightSpinBox)
self.areaPositionLayout.addWidget( self.areaPositionLayout.addWidget(self.mainPositionGroupBox)
self.mainPositionGroupBox, 1, 0, 1, 1)
self.footerPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage) self.footerPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage)
self.footerPositionGroupBox.setObjectName(u'footerPositionGroupBox') self.footerPositionGroupBox.setObjectName(u'FooterPositionGroupBox')
self.footerPositionLayout = QtGui.QFormLayout( self.footerPositionLayout = QtGui.QFormLayout(self.footerPositionGroupBox)
self.footerPositionGroupBox) self.footerPositionLayout.setObjectName(u'FooterPositionLayout')
self.footerPositionLayout.setVerticalSpacing(6) self.footerPositionCheckBox = QtGui.QCheckBox(self.footerPositionGroupBox)
self.footerPositionLayout.setObjectName(u'footerPositionLayout') self.footerPositionCheckBox.setObjectName(u'FooterPositionCheckBox')
self.footerPositionLayout.addRow(self.footerPositionCheckBox)
self.footerXLabel = QtGui.QLabel(self.footerPositionGroupBox) self.footerXLabel = QtGui.QLabel(self.footerPositionGroupBox)
self.footerXLabel.setObjectName(u'footerXLabel') self.footerXLabel.setObjectName(u'FooterXLabel')
self.footerPositionLayout.setWidget(1,
QtGui.QFormLayout.LabelRole, self.footerXLabel)
self.footerXSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox) self.footerXSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox)
self.footerXSpinBox.setEnabled(False)
self.footerXSpinBox.setMaximum(9999) self.footerXSpinBox.setMaximum(9999)
self.footerXSpinBox.setProperty(u'value', 0) self.footerXSpinBox.setObjectName(u'FooterXSpinBox')
self.footerXSpinBox.setObjectName(u'footerXSpinBox') self.footerPositionLayout.addRow(self.footerXLabel, self.footerXSpinBox)
self.footerPositionLayout.setWidget(1,
QtGui.QFormLayout.FieldRole, self.footerXSpinBox)
self.footerYLabel = QtGui.QLabel(self.footerPositionGroupBox) self.footerYLabel = QtGui.QLabel(self.footerPositionGroupBox)
self.footerYLabel.setObjectName(u'footerYLabel') self.footerYLabel.setObjectName(u'FooterYLabel')
self.footerPositionLayout.setWidget(2,
QtGui.QFormLayout.LabelRole, self.footerYLabel)
self.footerYSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox) self.footerYSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox)
self.footerYSpinBox.setEnabled(False)
self.footerYSpinBox.setMaximum(9999) self.footerYSpinBox.setMaximum(9999)
self.footerYSpinBox.setProperty(u'value', 0) self.footerYSpinBox.setObjectName(u'FooterYSpinBox')
self.footerYSpinBox.setObjectName(u'footerYSpinBox') self.footerPositionLayout.addRow(self.footerYLabel, self.footerYSpinBox)
self.footerPositionLayout.setWidget(2,
QtGui.QFormLayout.FieldRole, self.footerYSpinBox)
self.footerWidthLabel = QtGui.QLabel(self.footerPositionGroupBox) self.footerWidthLabel = QtGui.QLabel(self.footerPositionGroupBox)
self.footerWidthLabel.setObjectName(u'footerWidthLabel') self.footerWidthLabel.setObjectName(u'FooterWidthLabel')
self.footerPositionLayout.setWidget(3,
QtGui.QFormLayout.LabelRole, self.footerWidthLabel)
self.footerWidthSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox) self.footerWidthSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox)
self.footerWidthSpinBox.setEnabled(False)
self.footerWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0))
self.footerWidthSpinBox.setMaximum(9999) self.footerWidthSpinBox.setMaximum(9999)
self.footerWidthSpinBox.setObjectName(u'footerWidthSpinBox') self.footerWidthSpinBox.setObjectName(u'FooterWidthSpinBox')
self.footerPositionLayout.setWidget(3, self.footerPositionLayout.addRow(self.footerWidthLabel,
QtGui.QFormLayout.FieldRole, self.footerWidthSpinBox) self.footerWidthSpinBox)
self.footerHeightLabel = QtGui.QLabel(self.footerPositionGroupBox) self.footerHeightLabel = QtGui.QLabel(self.footerPositionGroupBox)
self.footerHeightLabel.setObjectName(u'footerHeightLabel') self.footerHeightLabel.setObjectName(u'FooterHeightLabel')
self.footerPositionLayout.setWidget(4,
QtGui.QFormLayout.LabelRole, self.footerHeightLabel)
self.footerHeightSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox) self.footerHeightSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox)
self.footerHeightSpinBox.setEnabled(False)
self.footerHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0))
self.footerHeightSpinBox.setMaximum(9999) self.footerHeightSpinBox.setMaximum(9999)
self.footerHeightSpinBox.setObjectName(u'footerHeightSpinBox') self.footerHeightSpinBox.setObjectName(u'FooterHeightSpinBox')
self.footerPositionLayout.setWidget(4, self.footerPositionLayout.addRow(self.footerHeightLabel,
QtGui.QFormLayout.FieldRole, self.footerHeightSpinBox) self.footerHeightSpinBox)
self.footerDefaultPositionCheckBox = QtGui.QCheckBox( self.areaPositionLayout.addWidget(self.footerPositionGroupBox)
self.footerPositionGroupBox)
self.footerDefaultPositionCheckBox.setChecked(True)
self.footerDefaultPositionCheckBox.setObjectName(
u'footerDefaultPositionCheckBox')
self.footerPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
self.footerDefaultPositionCheckBox)
self.areaPositionLayout.addWidget(
self.footerPositionGroupBox, 1, 1, 1, 1)
ThemeWizard.addPage(self.areaPositionPage) ThemeWizard.addPage(self.areaPositionPage)
# preview page
self.previewPage = QtGui.QWizardPage() self.previewPage = QtGui.QWizardPage()
self.previewPage.setObjectName(u'previewPage') self.previewPage.setObjectName(u'PreviewPage')
self.previewLayout = QtGui.QVBoxLayout(self.previewPage) self.previewLayout = QtGui.QVBoxLayout(self.previewPage)
self.previewLayout.setSpacing(6) self.previewLayout.setObjectName(u'PreviewLayout')
self.previewLayout.setMargin(12) self.themeNameLayout = QtGui.QFormLayout()
self.previewLayout.setObjectName(u'previewLayout') self.themeNameLayout.setObjectName(u'ThemeNameLayout')
self.themeNameLayout = QtGui.QHBoxLayout()
self.themeNameLayout.setObjectName(u'themeNameLayout')
self.themeNameLabel = QtGui.QLabel(self.previewPage) self.themeNameLabel = QtGui.QLabel(self.previewPage)
self.themeNameLabel.setObjectName(u'themeNameLabel') self.themeNameLabel.setObjectName(u'ThemeNameLabel')
self.themeNameLayout.addWidget(self.themeNameLabel)
self.themeNameEdit = QtGui.QLineEdit(self.previewPage) self.themeNameEdit = QtGui.QLineEdit(self.previewPage)
self.themeNameEdit.setObjectName(u'themeNameEdit') self.themeNameEdit.setObjectName(u'ThemeNameEdit')
self.themeNameLayout.addWidget(self.themeNameEdit) self.themeNameLayout.addRow(self.themeNameLabel, self.themeNameEdit)
self.previewLayout.addLayout(self.themeNameLayout) self.previewLayout.addLayout(self.themeNameLayout)
self.previewPaneLayout = QtGui.QHBoxLayout() self.previewPaneLayout = QtGui.QHBoxLayout()
self.previewPaneLayout.setObjectName(u'previewPaneLayout') self.previewPaneLayout.setObjectName(u'PreviewPaneLayout')
self.previewLeftSpacer = QtGui.QSpacerItem(40, 20, self.previewPaneLayout.addStretch()
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.previewPaneLayout.addItem(self.previewLeftSpacer)
self.previewBoxLabel = QtGui.QLabel(self.previewPage) self.previewBoxLabel = QtGui.QLabel(self.previewPage)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(
self.previewBoxLabel.sizePolicy().hasHeightForWidth())
self.previewBoxLabel.setSizePolicy(sizePolicy) self.previewBoxLabel.setSizePolicy(sizePolicy)
self.previewBoxLabel.setMinimumSize(QtCore.QSize(100, 150)) self.previewBoxLabel.setMinimumSize(QtCore.QSize(100, 150))
self.previewBoxLabel.setFrameShape(QtGui.QFrame.WinPanel) self.previewBoxLabel.setFrameShape(QtGui.QFrame.WinPanel)
self.previewBoxLabel.setFrameShadow(QtGui.QFrame.Sunken) self.previewBoxLabel.setFrameShadow(QtGui.QFrame.Sunken)
self.previewBoxLabel.setLineWidth(1) self.previewBoxLabel.setLineWidth(1)
self.previewBoxLabel.setScaledContents(True) self.previewBoxLabel.setScaledContents(True)
self.previewBoxLabel.setObjectName(u'previewBoxLabel') self.previewBoxLabel.setObjectName(u'PreviewBoxLabel')
self.previewPaneLayout.addWidget(self.previewBoxLabel) self.previewPaneLayout.addWidget(self.previewBoxLabel)
self.previewRightSpacer = QtGui.QSpacerItem(40, 20, self.previewPaneLayout.addStretch()
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.previewPaneLayout.addItem(self.previewRightSpacer)
self.previewLayout.addLayout(self.previewPaneLayout) self.previewLayout.addLayout(self.previewPaneLayout)
ThemeWizard.addPage(self.previewPage) ThemeWizard.addPage(self.previewPage)
self.themeNameLabel.setBuddy(self.themeNameEdit)
self.retranslateUi(ThemeWizard) self.retranslateUi(ThemeWizard)
QtCore.QObject.connect(
ThemeWizard, QtCore.QObject.connect(self.backgroundComboBox,
QtCore.SIGNAL(u'accepted()'), QtCore.SIGNAL(u'currentIndexChanged(int)'), self.backgroundStack,
ThemeWizard.accept) QtCore.SLOT(u'setCurrentIndex(int)'))
QtCore.QObject.connect(self.outlineCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.outlineColorButton,
QtCore.SLOT(u'setEnabled(bool)'))
QtCore.QObject.connect(self.outlineCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.outlineSizeSpinBox,
QtCore.SLOT(u'setEnabled(bool)'))
QtCore.QObject.connect(self.shadowCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.shadowColorButton,
QtCore.SLOT(u'setEnabled(bool)'))
QtCore.QObject.connect(self.shadowCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.shadowSizeSpinBox,
QtCore.SLOT(u'setEnabled(bool)'))
QtCore.QObject.connect(self.mainPositionCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.mainXSpinBox,
QtCore.SLOT(u'setDisabled(bool)'))
QtCore.QObject.connect(self.mainPositionCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.mainYSpinBox,
QtCore.SLOT(u'setDisabled(bool)'))
QtCore.QObject.connect(self.mainPositionCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.mainWidthSpinBox,
QtCore.SLOT(u'setDisabled(bool)'))
QtCore.QObject.connect(self.mainPositionCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.mainHeightSpinBox,
QtCore.SLOT(u'setDisabled(bool)'))
QtCore.QObject.connect(self.footerPositionCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.footerXSpinBox,
QtCore.SLOT(u'setDisabled(bool)'))
QtCore.QObject.connect(self.footerPositionCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.footerYSpinBox,
QtCore.SLOT(u'setDisabled(bool)'))
QtCore.QObject.connect(self.footerPositionCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.footerWidthSpinBox,
QtCore.SLOT(u'setDisabled(bool)'))
QtCore.QObject.connect(self.footerPositionCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.footerHeightSpinBox,
QtCore.SLOT(u'setDisabled(bool)'))
QtCore.QMetaObject.connectSlotsByName(ThemeWizard) QtCore.QMetaObject.connectSlotsByName(ThemeWizard)
def retranslateUi(self, ThemeWizard): def retranslateUi(self, ThemeWizard):
@ -480,13 +436,13 @@ class Ui_ThemeWizard(object):
self.backgroundPage.setSubTitle( self.backgroundPage.setSubTitle(
translate('OpenLP.ThemeWizard', 'Set up your theme\'s background ' translate('OpenLP.ThemeWizard', 'Set up your theme\'s background '
'according to the parameters below.')) 'according to the parameters below.'))
self.backgroundTypeLabel.setText( self.backgroundLabel.setText(
translate('OpenLP.ThemeWizard', 'Background type:')) translate('OpenLP.ThemeWizard', 'Background type:'))
self.backgroundTypeComboBox.setItemText(0, self.backgroundComboBox.setItemText(0,
translate('OpenLP.ThemeWizard', 'Solid Color')) translate('OpenLP.ThemeWizard', 'Solid Color'))
self.backgroundTypeComboBox.setItemText(1, self.backgroundComboBox.setItemText(1,
translate('OpenLP.ThemeWizard', 'Gradient')) translate('OpenLP.ThemeWizard', 'Gradient'))
self.backgroundTypeComboBox.setItemText(2, self.backgroundComboBox.setItemText(2,
translate('OpenLP.ThemeWizard', 'Image')) translate('OpenLP.ThemeWizard', 'Image'))
self.colorLabel.setText(translate('OpenLP.ThemeWizard', 'Color:')) self.colorLabel.setText(translate('OpenLP.ThemeWizard', 'Color:'))
self.gradientStartLabel.setText( self.gradientStartLabel.setText(
@ -528,9 +484,9 @@ class Ui_ThemeWizard(object):
self.shadowCheckBox.setText(translate('OpenLP.ThemeWizard', '&Shadow:')) self.shadowCheckBox.setText(translate('OpenLP.ThemeWizard', '&Shadow:'))
self.shadowSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:')) self.shadowSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
self.shadowSizeSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt')) self.shadowSizeSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt'))
self.boldCheckBox.setText( self.mainBoldCheckBox.setText(
translate('OpenLP.ThemeWizard', 'Bold')) translate('OpenLP.ThemeWizard', 'Bold'))
self.italicsCheckBox.setText( self.mainItalicsCheckBox.setText(
translate('OpenLP.ThemeWizard', 'Italic')) translate('OpenLP.ThemeWizard', 'Italic'))
self.footerAreaPage.setTitle( self.footerAreaPage.setTitle(
translate('OpenLP.ThemeWizard', 'Footer Area Font Details')) translate('OpenLP.ThemeWizard', 'Footer Area Font Details'))
@ -571,7 +527,7 @@ class Ui_ThemeWizard(object):
' main and footer areas.')) ' main and footer areas.'))
self.mainPositionGroupBox.setTitle( self.mainPositionGroupBox.setTitle(
translate('OpenLP.ThemeWizard', '&Main Area')) translate('OpenLP.ThemeWizard', '&Main Area'))
self.mainDefaultPositionCheckBox.setText( self.mainPositionCheckBox.setText(
translate('OpenLP.ThemeWizard', '&Use default location')) translate('OpenLP.ThemeWizard', '&Use default location'))
self.mainXLabel.setText(translate('OpenLP.ThemeWizard', 'X position:')) self.mainXLabel.setText(translate('OpenLP.ThemeWizard', 'X position:'))
self.mainXSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px')) self.mainXSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'px'))
@ -598,7 +554,7 @@ class Ui_ThemeWizard(object):
translate('OpenLP.ThemeWizard', 'Height:')) translate('OpenLP.ThemeWizard', 'Height:'))
self.footerHeightSpinBox.setSuffix( self.footerHeightSpinBox.setSuffix(
translate('OpenLP.ThemeWizard', 'px')) translate('OpenLP.ThemeWizard', 'px'))
self.footerDefaultPositionCheckBox.setText( self.footerPositionCheckBox.setText(
translate('OpenLP.ThemeWizard', 'Use default location')) translate('OpenLP.ThemeWizard', 'Use default location'))
self.previewPage.setTitle( self.previewPage.setTitle(
translate('OpenLP.ThemeWizard', 'Save and Preview')) translate('OpenLP.ThemeWizard', 'Save and Preview'))
@ -608,3 +564,18 @@ class Ui_ThemeWizard(object):
'new theme')) 'new theme'))
self.themeNameLabel.setText( self.themeNameLabel.setText(
translate('OpenLP.ThemeWizard', 'Theme name:')) translate('OpenLP.ThemeWizard', 'Theme name:'))
# Align all QFormLayouts towards each other
width = max(self.backgroundLabel.minimumSizeHint().width(),
self.colorLabel.minimumSizeHint().width())
width = max(width, self.gradientStartLabel.minimumSizeHint().width())
width = max(width, self.gradientEndLabel.minimumSizeHint().width())
width = max(width, self.gradientTypeLabel.minimumSizeHint().width())
width = max(width, self.imageLabel.minimumSizeHint().width())
self.backgroundTypeSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed)
self.colorSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed)
self.gradientSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed)
self.imageSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed)

85
openlp/plugins/bibles/forms/bibleimportform.py
View File

@ -79,8 +79,12 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
QtGui.QWizard.__init__(self, parent) QtGui.QWizard.__init__(self, parent)
self.setupUi(self) self.setupUi(self)
self.registerFields() self.registerFields()
self.hasOpenlp1Import = \ if BibleFormat.get_availability(BibleFormat.OpenLP1):
BibleFormat.get_availability(BibleFormat.OpenLP1) self.openlp1DisabledLabel.hide()
else:
self.openlp1FileLabel.hide()
self.openlp1FileEdit.hide()
self.openlp1BrowseButton.hide()
self.finishButton = self.button(QtGui.QWizard.FinishButton) self.finishButton = self.button(QtGui.QWizard.FinishButton)
self.cancelButton = self.button(QtGui.QWizard.CancelButton) self.cancelButton = self.button(QtGui.QWizard.CancelButton)
self.manager = manager self.manager = manager
@ -88,27 +92,26 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
self.manager.set_process_dialog(self) self.manager.set_process_dialog(self)
self.web_bible_list = {} self.web_bible_list = {}
self.loadWebBibles() self.loadWebBibles()
QtCore.QObject.connect(self.formatComboBox, self.restart()
QtCore.SIGNAL(u'currentIndexChanged(int)'), self.selectStack.setCurrentIndex(0)
self.onFormatComboBoxChanged)
QtCore.QObject.connect(self.webSourceComboBox, QtCore.QObject.connect(self.webSourceComboBox,
QtCore.SIGNAL(u'currentIndexChanged(int)'), QtCore.SIGNAL(u'currentIndexChanged(int)'),
self.onWebSourceComboBoxChanged) self.onWebSourceComboBoxChanged)
QtCore.QObject.connect(self.osisFileButton, QtCore.QObject.connect(self.osisBrowseButton,
QtCore.SIGNAL(u'clicked()'), QtCore.SIGNAL(u'clicked()'),
self.onOsisFileButtonClicked) self.onOsisBrowseButtonClicked)
QtCore.QObject.connect(self.csvBooksButton, QtCore.QObject.connect(self.csvBooksButton,
QtCore.SIGNAL(u'clicked()'), QtCore.SIGNAL(u'clicked()'),
self.onBooksFileButtonClicked) self.onBooksBrowseButtonClicked)
QtCore.QObject.connect(self.csvVersesButton, QtCore.QObject.connect(self.csvVersesButton,
QtCore.SIGNAL(u'clicked()'), QtCore.SIGNAL(u'clicked()'),
self.onCsvVersesFileButtonClicked) self.onCsvVersesBrowseButtonClicked)
QtCore.QObject.connect(self.openSongFileButton, QtCore.QObject.connect(self.openSongBrowseButton,
QtCore.SIGNAL(u'clicked()'), QtCore.SIGNAL(u'clicked()'),
self.onOpenSongBrowseButtonClicked) self.onOpenSongBrowseButtonClicked)
QtCore.QObject.connect(self.openlp1FileButton, QtCore.QObject.connect(self.openlp1BrowseButton,
QtCore.SIGNAL(u'clicked()'), QtCore.SIGNAL(u'clicked()'),
self.onOpenlp1FileButtonClicked) self.onOpenlp1BrowseButtonClicked)
QtCore.QObject.connect(self, QtCore.QObject.connect(self,
QtCore.SIGNAL(u'currentIdChanged(int)'), QtCore.SIGNAL(u'currentIdChanged(int)'),
self.onCurrentIdChanged) self.onCurrentIdChanged)
@ -125,7 +128,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
Stop the import on cancel button, close button or ESC key. Stop the import on cancel button, close button or ESC key.
""" """
log.debug('Import canceled by user.') log.debug('Import canceled by user.')
if self.currentId() == 3: if self.currentPage() == self.importPage:
Receiver.send_message(u'bibles_stop_import') Receiver.send_message(u'bibles_stop_import')
self.done(QtGui.QDialog.Rejected) self.done(QtGui.QDialog.Rejected)
@ -133,11 +136,9 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
""" """
Validate the current page before moving on to the next page. Validate the current page before moving on to the next page.
""" """
if self.currentId() == 0: if self.currentPage() == self.welcomePage:
# Welcome page
return True return True
elif self.currentId() == 1: elif self.currentPage() == self.selectPage:
# Select page
if self.field(u'source_format').toInt()[0] == BibleFormat.OSIS: if self.field(u'source_format').toInt()[0] == BibleFormat.OSIS:
if not self.field(u'osis_location').toString(): if not self.field(u'osis_location').toString():
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
@ -146,7 +147,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
translate('BiblesPlugin.ImportWizardForm', translate('BiblesPlugin.ImportWizardForm',
'You need to specify a file to import your ' 'You need to specify a file to import your '
'Bible from.')) 'Bible from.'))
self.OSISLocationEdit.setFocus() self.osisFileEdit.setFocus()
return False return False
elif self.field(u'source_format').toInt()[0] == BibleFormat.CSV: elif self.field(u'source_format').toInt()[0] == BibleFormat.CSV:
if not self.field(u'csv_booksfile').toString(): if not self.field(u'csv_booksfile').toString():
@ -156,7 +157,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
translate('BiblesPlugin.ImportWizardForm', translate('BiblesPlugin.ImportWizardForm',
'You need to specify a file with books of ' 'You need to specify a file with books of '
'the Bible to use in the import.')) 'the Bible to use in the import.'))
self.booksLocationEdit.setFocus() self.csvBooksEdit.setFocus()
return False return False
elif not self.field(u'csv_versefile').toString(): elif not self.field(u'csv_versefile').toString():
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
@ -165,7 +166,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
translate('BiblesPlugin.ImportWizardForm', translate('BiblesPlugin.ImportWizardForm',
'You need to specify a file of Bible ' 'You need to specify a file of Bible '
'verses to import.')) 'verses to import.'))
self.csvVerseLocationEdit.setFocus() self.csvVersesEdit.setFocus()
return False return False
elif self.field(u'source_format').toInt()[0] == \ elif self.field(u'source_format').toInt()[0] == \
BibleFormat.OpenSong: BibleFormat.OpenSong:
@ -186,11 +187,10 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
translate('BiblesPlugin.ImportWizardForm', translate('BiblesPlugin.ImportWizardForm',
'You need to specify a file to import your ' 'You need to specify a file to import your '
'Bible from.')) 'Bible from.'))
self.openlp1LocationEdit.setFocus() self.openlp1FileEdit.setFocus()
return False return False
return True return True
elif self.currentId() == 2: elif self.currentPage() == self.licenseDetailsPage:
# License details
license_version = unicode(self.field(u'license_version').toString()) license_version = unicode(self.field(u'license_version').toString())
license_copyright = \ license_copyright = \
unicode(self.field(u'license_copyright').toString()) unicode(self.field(u'license_copyright').toString())
@ -220,31 +220,9 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
self.versionNameEdit.setFocus() self.versionNameEdit.setFocus()
return False return False
return True return True
if self.currentId() == 3: if self.currentPage() == self.importPage:
# Progress page
return True return True
def onFormatComboBoxChanged(self, index):
"""
Set Widgets for the selected import format visible.
``index``
The index of the combo box.
"""
self.osisFileLabel.setVisible(index == 0)
self.osisFileWidget.setVisible(index == 0)
self.csvBooksLabel.setVisible(index == 1)
self.csvBooksWidget.setVisible(index == 1)
self.csvVersesLabel.setVisible(index == 1)
self.csvVersesWidget.setVisible(index == 1)
self.openSongFileLabel.setVisible(index == 2)
self.openSongFileWidget.setVisible(index == 2)
self.webTabWidget.setVisible(index == 3)
self.openlp1FileLabel.setVisible(index == 4 and self.hasOpenlp1Import)
self.openlp1FileWidget.setVisible(index == 4 and self.hasOpenlp1Import)
self.openlp1DisabledLabel.setVisible(index == 4 and
not self.hasOpenlp1Import)
def onWebSourceComboBoxChanged(self, index): def onWebSourceComboBoxChanged(self, index):
""" """
Setup the list of Bibles when you select a different source on the web Setup the list of Bibles when you select a different source on the web
@ -256,10 +234,9 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
self.webTranslationComboBox.clear() self.webTranslationComboBox.clear()
bibles = self.web_bible_list[index].keys() bibles = self.web_bible_list[index].keys()
bibles.sort() bibles.sort()
for bible in bibles: self.webTranslationComboBox.addItems(bibles)
self.webTranslationComboBox.addItem(bible)
def onOsisFileButtonClicked(self): def onOsisBrowseButtonClicked(self):
""" """
Show the file open dialog for the OSIS file. Show the file open dialog for the OSIS file.
""" """
@ -267,7 +244,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
translate('BiblesPlugin.ImportWizardForm', 'Open OSIS File'), translate('BiblesPlugin.ImportWizardForm', 'Open OSIS File'),
self.osisFileEdit) self.osisFileEdit)
def onBooksFileButtonClicked(self): def onBooksBrowseButtonClicked(self):
""" """
Show the file open dialog for the books CSV file. Show the file open dialog for the books CSV file.
""" """
@ -276,7 +253,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
self.csvBooksEdit, u'%s (*.csv)' self.csvBooksEdit, u'%s (*.csv)'
% translate('BiblesPlugin.ImportWizardForm', 'CSV File')) % translate('BiblesPlugin.ImportWizardForm', 'CSV File'))
def onCsvVersesFileButtonClicked(self): def onCsvVersesBrowseButtonClicked(self):
""" """
Show the file open dialog for the verses CSV file. Show the file open dialog for the verses CSV file.
""" """
@ -292,7 +269,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
translate('BiblesPlugin.ImportWizardForm', 'Open OpenSong Bible'), translate('BiblesPlugin.ImportWizardForm', 'Open OpenSong Bible'),
self.openSongFileEdit) self.openSongFileEdit)
def onOpenlp1FileButtonClicked(self): def onOpenlp1BrowseButtonClicked(self):
""" """
Show the file open dialog for the openlp.org 1.x file. Show the file open dialog for the openlp.org 1.x file.
""" """
@ -303,7 +280,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
'openlp.org 1.x bible')) 'openlp.org 1.x bible'))
def onCurrentIdChanged(self, pageId): def onCurrentIdChanged(self, pageId):
if pageId == 3: if self.page(pageId) == self.importPage:
self.preImport() self.preImport()
self.performImport() self.performImport()
self.postImport() self.postImport()
@ -510,7 +487,7 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
# Import a bible from the web. # Import a bible from the web.
self.importProgressBar.setMaximum(1) self.importProgressBar.setMaximum(1)
download_location = self.field(u'web_location').toInt()[0] download_location = self.field(u'web_location').toInt()[0]
bible_version = unicode(self.bibleComboBox.currentText()) bible_version = unicode(self.webTranslationComboBox.currentText())
if download_location == WebDownload.Crosswalk: if download_location == WebDownload.Crosswalk:
bible = \ bible = \
self.web_bible_list[WebDownload.Crosswalk][bible_version] self.web_bible_list[WebDownload.Crosswalk][bible_version]

231
openlp/plugins/bibles/forms/bibleimportwizard.py
View File

@ -43,36 +43,26 @@ class Ui_BibleImportWizard(object):
QtGui.QPixmap(u':/wizards/wizard_importbible.bmp')) QtGui.QPixmap(u':/wizards/wizard_importbible.bmp'))
self.welcomePage.setObjectName(u'WelcomePage') self.welcomePage.setObjectName(u'WelcomePage')
self.welcomeLayout = QtGui.QVBoxLayout(self.welcomePage) self.welcomeLayout = QtGui.QVBoxLayout(self.welcomePage)
self.welcomeLayout.setMargin(12)
self.welcomeLayout.setSpacing(6)
self.welcomeLayout.setObjectName(u'WelcomeLayout') self.welcomeLayout.setObjectName(u'WelcomeLayout')
self.titleLabel = QtGui.QLabel(self.welcomePage) self.titleLabel = QtGui.QLabel(self.welcomePage)
self.titleLabel.setObjectName(u'TitleLabel') self.titleLabel.setObjectName(u'TitleLabel')
self.welcomeLayout.addWidget(self.titleLabel) self.welcomeLayout.addWidget(self.titleLabel)
self.welcomeTopSpacer = QtGui.QSpacerItem(20, 40, self.welcomeLayout.addSpacing(40)
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
self.welcomeLayout.addItem(self.welcomeTopSpacer)
self.informationLabel = QtGui.QLabel(self.welcomePage) self.informationLabel = QtGui.QLabel(self.welcomePage)
self.informationLabel.setWordWrap(True) self.informationLabel.setWordWrap(True)
self.informationLabel.setObjectName(u'InformationLabel') self.informationLabel.setObjectName(u'InformationLabel')
self.welcomeLayout.addWidget(self.informationLabel) self.welcomeLayout.addWidget(self.informationLabel)
self.welcomeBottomSpacer = QtGui.QSpacerItem(20, 40, self.welcomeLayout.addStretch()
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.welcomeLayout.addItem(self.welcomeBottomSpacer)
bibleImportWizard.addPage(self.welcomePage) bibleImportWizard.addPage(self.welcomePage)
# Select page # Select page
self.selectPage = QtGui.QWizardPage() self.selectPage = QtGui.QWizardPage()
self.selectPage.setObjectName(u'SelectPage') self.selectPage.setObjectName(u'SelectPage')
self.selectPageLayout = QtGui.QVBoxLayout(self.selectPage) self.selectPageLayout = QtGui.QVBoxLayout(self.selectPage)
self.selectPageLayout.setMargin(12) self.selectPageLayout.setObjectName(u'SelectFormLayout')
self.selectPageLayout.setObjectName(u'SelectPageLayout') self.formatLayout = QtGui.QFormLayout()
self.selectFormLayout = QtGui.QFormLayout() self.formatLayout.setObjectName(u'FormatLayout')
self.selectFormLayout.setVerticalSpacing(6)
self.selectFormLayout.setObjectName(u'SelectFormLayout')
self.formatLabel = QtGui.QLabel(self.selectPage) self.formatLabel = QtGui.QLabel(self.selectPage)
self.formatLabel.setObjectName(u'FormatLabel') self.formatLabel.setObjectName(u'FormatLabel')
self.selectFormLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
self.formatLabel)
self.formatComboBox = QtGui.QComboBox(self.selectPage) self.formatComboBox = QtGui.QComboBox(self.selectPage)
self.formatComboBox.addItem(u'') self.formatComboBox.addItem(u'')
self.formatComboBox.addItem(u'') self.formatComboBox.addItem(u'')
@ -80,122 +70,96 @@ class Ui_BibleImportWizard(object):
self.formatComboBox.addItem(u'') self.formatComboBox.addItem(u'')
self.formatComboBox.addItem(u'') self.formatComboBox.addItem(u'')
self.formatComboBox.setObjectName(u'FormatComboBox') self.formatComboBox.setObjectName(u'FormatComboBox')
self.selectFormLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.formatLayout.addRow(self.formatLabel, self.formatComboBox)
self.formatComboBox) self.formatSpacer = QtGui.QSpacerItem(10, 0,
self.osisFileLabel = QtGui.QLabel(self.selectPage) QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
self.formatLayout.setItem(1, QtGui.QFormLayout.LabelRole,
self.formatSpacer)
self.selectPageLayout.addLayout(self.formatLayout)
self.selectStack = QtGui.QStackedLayout()
self.osisWidget = QtGui.QWidget(self.selectPage)
self.osisWidget.setObjectName(u'OsisWidget')
self.osisLayout = QtGui.QFormLayout(self.osisWidget)
self.osisLayout.setMargin(0)
self.osisLayout.setObjectName(u'OsisLayout')
self.osisFileLabel = QtGui.QLabel(self.osisWidget)
self.osisFileLabel.setObjectName(u'OsisFileLabel') self.osisFileLabel.setObjectName(u'OsisFileLabel')
self.selectFormLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.osisFileLayout = QtGui.QHBoxLayout()
self.osisFileLabel)
self.osisFileWidget = QtGui.QWidget(self.selectPage)
self.osisFileWidget.setObjectName(u'OsisFileWidget')
self.osisFileLayout = QtGui.QHBoxLayout(self.osisFileWidget)
self.osisFileLayout.setMargin(0)
self.osisFileLayout.setObjectName(u'OsisFileLayout') self.osisFileLayout.setObjectName(u'OsisFileLayout')
self.osisFileEdit = QtGui.QLineEdit(self.osisFileWidget) self.osisFileEdit = QtGui.QLineEdit(self.osisWidget)
self.osisFileEdit.setObjectName(u'OsisFileEdit') self.osisFileEdit.setObjectName(u'OsisFileEdit')
self.osisFileLayout.addWidget(self.osisFileEdit) self.osisFileLayout.addWidget(self.osisFileEdit)
self.osisFileButton = QtGui.QToolButton(self.osisFileWidget) self.osisBrowseButton = QtGui.QToolButton(self.osisWidget)
self.osisFileButton.setIcon(build_icon(u':/general/general_open.png')) self.osisBrowseButton.setIcon(build_icon(u':/general/general_open.png'))
self.osisFileButton.setObjectName(u'OsisFileButton') self.osisBrowseButton.setObjectName(u'OsisBrowseButton')
self.osisFileLayout.addWidget(self.osisFileButton) self.osisFileLayout.addWidget(self.osisBrowseButton)
self.selectFormLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.osisLayout.addRow(self.osisFileLabel, self.osisFileLayout)
self.osisFileWidget) self.osisSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
self.csvBooksLabel = QtGui.QLabel(self.selectPage) QtGui.QSizePolicy.Minimum)
self.csvBooksLabel.setVisible(False) self.osisLayout.setItem(1, QtGui.QFormLayout.LabelRole, self.osisSpacer)
self.selectStack.addWidget(self.osisWidget)
self.csvWidget = QtGui.QWidget(self.selectPage)
self.csvWidget.setObjectName(u'CsvWidget')
self.csvLayout = QtGui.QFormLayout(self.csvWidget)
self.csvLayout.setMargin(0)
self.csvLayout.setObjectName(u'CsvLayout')
self.csvBooksLabel = QtGui.QLabel(self.csvWidget)
self.csvBooksLabel.setObjectName(u'CsvBooksLabel') self.csvBooksLabel.setObjectName(u'CsvBooksLabel')
self.selectFormLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.csvBooksLayout = QtGui.QHBoxLayout()
self.csvBooksLabel)
self.csvBooksWidget = QtGui.QWidget(self.selectPage)
self.csvBooksWidget.setVisible(False)
self.csvBooksWidget.setObjectName(u'CsvBooksWidget')
self.csvBooksLayout = QtGui.QHBoxLayout(self.csvBooksWidget)
self.csvBooksLayout.setMargin(0)
self.csvBooksLayout.setObjectName(u'CsvBooksLayout') self.csvBooksLayout.setObjectName(u'CsvBooksLayout')
self.csvBooksEdit = QtGui.QLineEdit(self.csvBooksWidget) self.csvBooksEdit = QtGui.QLineEdit(self.csvWidget)
self.csvBooksEdit.setObjectName(u'CsvBooksEdit') self.csvBooksEdit.setObjectName(u'CsvBooksEdit')
self.csvBooksLayout.addWidget(self.csvBooksEdit) self.csvBooksLayout.addWidget(self.csvBooksEdit)
self.csvBooksButton = QtGui.QToolButton(self.csvBooksWidget) self.csvBooksButton = QtGui.QToolButton(self.csvWidget)
self.csvBooksButton.setIcon(build_icon(u':/general/general_open.png')) self.csvBooksButton.setIcon(build_icon(u':/general/general_open.png'))
self.csvBooksButton.setObjectName(u'CsvBooksButton') self.csvBooksButton.setObjectName(u'CsvBooksButton')
self.csvBooksLayout.addWidget(self.csvBooksButton) self.csvBooksLayout.addWidget(self.csvBooksButton)
self.selectFormLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.csvLayout.addRow(self.csvBooksLabel, self.csvBooksLayout)
self.csvBooksWidget) self.csvVersesLabel = QtGui.QLabel(self.csvWidget)
self.csvVersesLabel = QtGui.QLabel(self.selectPage)
self.csvVersesLabel.setVisible(False)
self.csvVersesLabel.setObjectName(u'CsvVersesLabel') self.csvVersesLabel.setObjectName(u'CsvVersesLabel')
self.selectFormLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.csvVersesLayout = QtGui.QHBoxLayout()
self.csvVersesLabel)
self.csvVersesWidget = QtGui.QWidget(self.selectPage)
self.csvVersesWidget.setVisible(False)
self.csvVersesWidget.setObjectName(u'CsvVersesWidget')
self.csvVersesLayout = QtGui.QHBoxLayout(self.csvVersesWidget)
self.csvVersesLayout.setMargin(0)
self.csvVersesLayout.setObjectName(u'CsvVersesLayout') self.csvVersesLayout.setObjectName(u'CsvVersesLayout')
self.csvVersesEdit = QtGui.QLineEdit(self.csvVersesWidget) self.csvVersesEdit = QtGui.QLineEdit(self.csvWidget)
self.csvVersesEdit.setObjectName(u'CsvVersesEdit') self.csvVersesEdit.setObjectName(u'CsvVersesEdit')
self.csvVersesLayout.addWidget(self.csvVersesEdit) self.csvVersesLayout.addWidget(self.csvVersesEdit)
self.csvVersesButton = QtGui.QToolButton(self.csvVersesWidget) self.csvVersesButton = QtGui.QToolButton(self.csvWidget)
self.csvVersesButton.setIcon(build_icon(u':/general/general_open.png')) self.csvVersesButton.setIcon(build_icon(u':/general/general_open.png'))
self.csvVersesButton.setObjectName(u'CsvVersesButton') self.csvVersesButton.setObjectName(u'CsvVersesButton')
self.csvVersesLayout.addWidget(self.csvVersesButton) self.csvVersesLayout.addWidget(self.csvVersesButton)
self.selectFormLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.csvLayout.addRow(self.csvVersesLabel, self.csvVersesLayout)
self.csvVersesWidget) self.csvSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
self.openSongFileLabel = QtGui.QLabel(self.selectPage) QtGui.QSizePolicy.Minimum)
self.openSongFileLabel.setVisible(False) self.csvLayout.setItem(2, QtGui.QFormLayout.LabelRole, self.csvSpacer)
self.selectStack.addWidget(self.csvWidget)
self.openSongWidget = QtGui.QWidget(self.selectPage)
self.openSongWidget.setObjectName(u'OpenSongWidget')
self.openSongLayout = QtGui.QFormLayout(self.openSongWidget)
self.openSongLayout.setMargin(0)
self.openSongLayout.setObjectName(u'OpenSongLayout')
self.openSongFileLabel = QtGui.QLabel(self.openSongWidget)
self.openSongFileLabel.setObjectName(u'OpenSongFileLabel') self.openSongFileLabel.setObjectName(u'OpenSongFileLabel')
self.selectFormLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.openSongFileLayout = QtGui.QHBoxLayout()
self.openSongFileLabel)
self.openSongFileWidget = QtGui.QWidget(self.selectPage)
self.openSongFileWidget.setVisible(False)
self.openSongFileWidget.setObjectName(u'OpenSongFileWidget')
self.openSongFileLayout = QtGui.QHBoxLayout(self.openSongFileWidget)
self.openSongFileLayout.setMargin(0)
self.openSongFileLayout.setObjectName(u'OpenSongFileLayout') self.openSongFileLayout.setObjectName(u'OpenSongFileLayout')
self.openSongFileEdit = QtGui.QLineEdit(self.openSongFileWidget) self.openSongFileEdit = QtGui.QLineEdit(self.openSongWidget)
self.openSongFileEdit.setObjectName(u'OpenSongFileEdit') self.openSongFileEdit.setObjectName(u'OpenSongFileEdit')
self.openSongFileLayout.addWidget(self.openSongFileEdit) self.openSongFileLayout.addWidget(self.openSongFileEdit)
self.openSongFileButton = QtGui.QToolButton(self.openSongFileWidget) self.openSongBrowseButton = QtGui.QToolButton(self.openSongWidget)
self.openSongFileButton.setIcon( self.openSongBrowseButton.setIcon(
build_icon(u':/general/general_open.png')) build_icon(u':/general/general_open.png'))
self.openSongFileButton.setObjectName(u'OpenSongFileButton') self.openSongBrowseButton.setObjectName(u'OpenSongBrowseButton')
self.openSongFileLayout.addWidget(self.openSongFileButton) self.openSongFileLayout.addWidget(self.openSongBrowseButton)
self.selectFormLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.openSongLayout.addRow(self.openSongFileLabel,
self.openSongFileWidget) self.openSongFileLayout)
self.openlp1FileLabel = QtGui.QLabel(self.selectPage) self.openSongSpacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
self.openlp1FileLabel.setVisible(False) QtGui.QSizePolicy.Minimum)
self.openlp1FileLabel.setObjectName(u'Openlp1FileLabel') self.openSongLayout.setItem(1, QtGui.QFormLayout.LabelRole,
self.selectFormLayout.setWidget(5, QtGui.QFormLayout.LabelRole, self.openSongSpacer)
self.openlp1FileLabel) self.selectStack.addWidget(self.openSongWidget)
self.openlp1FileWidget = QtGui.QWidget(self.selectPage)
self.openlp1FileWidget.setVisible(False)
self.openlp1FileWidget.setObjectName(u'Openlp1FileWidget')
self.openlp1FileLayout = QtGui.QHBoxLayout(self.openlp1FileWidget)
self.openlp1FileLayout.setMargin(0)
self.openlp1FileLayout.setObjectName(u'Openlp1FileLayout')
self.openlp1FileEdit = QtGui.QLineEdit(self.openlp1FileWidget)
self.openlp1FileEdit.setObjectName(u'Openlp1FileEdit')
self.openlp1FileLayout.addWidget(self.openlp1FileEdit)
self.openlp1FileButton = QtGui.QToolButton(self.openlp1FileWidget)
self.openlp1FileButton.setIcon(
build_icon(u':/general/general_open.png'))
self.openlp1FileButton.setObjectName(u'Openlp1FileButton')
self.openlp1FileLayout.addWidget(self.openlp1FileButton)
self.selectFormLayout.setWidget(5, QtGui.QFormLayout.FieldRole,
self.openlp1FileWidget)
self.selectPageLayout.addItem(self.selectFormLayout)
self.openlp1DisabledLabel = QtGui.QLabel(self.selectPage)
self.openlp1DisabledLabel.setVisible(False)
self.openlp1DisabledLabel.setObjectName(u'Openlp1DisabledLabel')
self.selectPageLayout.addWidget(self.openlp1DisabledLabel)
self.webTabWidget = QtGui.QTabWidget(self.selectPage) self.webTabWidget = QtGui.QTabWidget(self.selectPage)
self.webTabWidget.setSizePolicy(QtGui.QSizePolicy.MinimumExpanding,
QtGui.QSizePolicy.MinimumExpanding)
self.webTabWidget.setVisible(False)
self.webTabWidget.setObjectName(u'WebTabWidget') self.webTabWidget.setObjectName(u'WebTabWidget')
self.webBibleTab = QtGui.QWidget() self.webBibleTab = QtGui.QWidget()
self.webBibleTab.setObjectName(u'WebBibleTab') self.webBibleTab.setObjectName(u'WebBibleTab')
self.webBibleLayout = QtGui.QFormLayout(self.webBibleTab) self.webBibleLayout = QtGui.QFormLayout(self.webBibleTab)
self.webBibleLayout.setVerticalSpacing(6)
self.webBibleLayout.setObjectName(u'WebBibleLayout') self.webBibleLayout.setObjectName(u'WebBibleLayout')
self.webSourceLabel = QtGui.QLabel(self.webBibleTab) self.webSourceLabel = QtGui.QLabel(self.webBibleTab)
self.webSourceLabel.setObjectName(u'WebSourceLabel') self.webSourceLabel.setObjectName(u'WebSourceLabel')
@ -213,17 +177,15 @@ class Ui_BibleImportWizard(object):
self.webBibleLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.webBibleLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
self.webTranslationLabel) self.webTranslationLabel)
self.webTranslationComboBox = QtGui.QComboBox(self.webBibleTab) self.webTranslationComboBox = QtGui.QComboBox(self.webBibleTab)
self.webTranslationComboBox.setSizeAdjustPolicy(
QtGui.QComboBox.AdjustToContents)
self.webTranslationComboBox.setObjectName(u'WebTranslationComboBox') self.webTranslationComboBox.setObjectName(u'WebTranslationComboBox')
self.webTranslationComboBox.addItem(u'')
self.webTranslationComboBox.addItem(u'')
self.webTranslationComboBox.addItem(u'')
self.webBibleLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.webBibleLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
self.webTranslationComboBox) self.webTranslationComboBox)
self.webTabWidget.addTab(self.webBibleTab, u'') self.webTabWidget.addTab(self.webBibleTab, u'')
self.webProxyTab = QtGui.QWidget() self.webProxyTab = QtGui.QWidget()
self.webProxyTab.setObjectName(u'WebProxyTab') self.webProxyTab.setObjectName(u'WebProxyTab')
self.webProxyLayout = QtGui.QFormLayout(self.webProxyTab) self.webProxyLayout = QtGui.QFormLayout(self.webProxyTab)
self.webProxyLayout.setVerticalSpacing(6)
self.webProxyLayout.setObjectName(u'WebProxyLayout') self.webProxyLayout.setObjectName(u'WebProxyLayout')
self.webServerLabel = QtGui.QLabel(self.webProxyTab) self.webServerLabel = QtGui.QLabel(self.webProxyTab)
self.webServerLabel.setObjectName(u'WebServerLabel') self.webServerLabel.setObjectName(u'WebServerLabel')
@ -250,14 +212,40 @@ class Ui_BibleImportWizard(object):
self.webProxyLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.webProxyLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
self.webPasswordEdit) self.webPasswordEdit)
self.webTabWidget.addTab(self.webProxyTab, u'') self.webTabWidget.addTab(self.webProxyTab, u'')
self.selectPageLayout.addWidget(self.webTabWidget) self.selectStack.addWidget(self.webTabWidget)
self.openlp1Widget = QtGui.QWidget(self.selectPage)
self.openlp1Widget.setObjectName(u'Openlp1Widget')
self.openlp1Layout = QtGui.QFormLayout(self.openlp1Widget)
self.openlp1Layout.setMargin(0)
self.openlp1Layout.setObjectName(u'Openlp1Layout')
self.openlp1FileLabel = QtGui.QLabel(self.openlp1Widget)
self.openlp1FileLabel.setObjectName(u'Openlp1FileLabel')
self.openlp1FileLayout = QtGui.QHBoxLayout()
self.openlp1FileLayout.setObjectName(u'Openlp1FileLayout')
self.openlp1FileEdit = QtGui.QLineEdit(self.openlp1Widget)
self.openlp1FileEdit.setObjectName(u'Openlp1FileEdit')
self.openlp1FileLayout.addWidget(self.openlp1FileEdit)
self.openlp1BrowseButton = QtGui.QToolButton(self.openlp1Widget)
self.openlp1BrowseButton.setIcon(
build_icon(u':/general/general_open.png'))
self.openlp1BrowseButton.setObjectName(u'Openlp1BrowseButton')
self.openlp1FileLayout.addWidget(self.openlp1BrowseButton)
self.openlp1Layout.addRow(self.openlp1FileLabel, self.openlp1FileLayout)
self.openlp1DisabledLabel = QtGui.QLabel(self.openlp1Widget)
self.openlp1DisabledLabel.setWordWrap(True)
self.openlp1DisabledLabel.setObjectName(u'Openlp1DisabledLabel')
self.openlp1Layout.addRow(self.openlp1DisabledLabel)
self.openlp1Spacer = QtGui.QSpacerItem(10, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Minimum)
self.openlp1Layout.setItem(1, QtGui.QFormLayout.LabelRole,
self.openlp1Spacer)
self.selectStack.addWidget(self.openlp1Widget)
self.selectPageLayout.addLayout(self.selectStack)
bibleImportWizard.addPage(self.selectPage) bibleImportWizard.addPage(self.selectPage)
# License page # License page
self.licenseDetailsPage = QtGui.QWizardPage() self.licenseDetailsPage = QtGui.QWizardPage()
self.licenseDetailsPage.setObjectName(u'LicenseDetailsPage') self.licenseDetailsPage.setObjectName(u'LicenseDetailsPage')
self.licenseDetailsLayout = QtGui.QFormLayout(self.licenseDetailsPage) self.licenseDetailsLayout = QtGui.QFormLayout(self.licenseDetailsPage)
self.licenseDetailsLayout.setMargin(12)
self.licenseDetailsLayout.setVerticalSpacing(6)
self.licenseDetailsLayout.setObjectName(u'LicenseDetailsLayout') self.licenseDetailsLayout.setObjectName(u'LicenseDetailsLayout')
self.versionNameLabel = QtGui.QLabel(self.licenseDetailsPage) self.versionNameLabel = QtGui.QLabel(self.licenseDetailsPage)
self.versionNameLabel.setObjectName(u'VersionNameLabel') self.versionNameLabel.setObjectName(u'VersionNameLabel')
@ -288,7 +276,6 @@ class Ui_BibleImportWizard(object):
self.importPage = QtGui.QWizardPage() self.importPage = QtGui.QWizardPage()
self.importPage.setObjectName(u'ImportPage') self.importPage.setObjectName(u'ImportPage')
self.importLayout = QtGui.QVBoxLayout(self.importPage) self.importLayout = QtGui.QVBoxLayout(self.importPage)
self.importLayout.setSpacing(6)
self.importLayout.setMargin(48) self.importLayout.setMargin(48)
self.importLayout.setObjectName(u'ImportLayout') self.importLayout.setObjectName(u'ImportLayout')
self.importProgressLabel = QtGui.QLabel(self.importPage) self.importProgressLabel = QtGui.QLabel(self.importPage)
@ -299,7 +286,10 @@ class Ui_BibleImportWizard(object):
self.importLayout.addWidget(self.importProgressBar) self.importLayout.addWidget(self.importProgressBar)
bibleImportWizard.addPage(self.importPage) bibleImportWizard.addPage(self.importPage)
self.retranslateUi(bibleImportWizard) self.retranslateUi(bibleImportWizard)
self.webTabWidget.setCurrentIndex(0) QtCore.QMetaObject.connectSlotsByName(bibleImportWizard)
QtCore.QObject.connect(self.formatComboBox,
QtCore.SIGNAL(u'currentIndexChanged(int)'), self.selectStack,
QtCore.SLOT(u'setCurrentIndex(int)'))
def retranslateUi(self, bibleImportWizard): def retranslateUi(self, bibleImportWizard):
bibleImportWizard.setWindowTitle( bibleImportWizard.setWindowTitle(
@ -387,3 +377,20 @@ class Ui_BibleImportWizard(object):
'importer has been disabled due to a missing Python module. If ' 'importer has been disabled due to a missing Python module. If '
'you want to use this importer, you will need to install the ' 'you want to use this importer, you will need to install the '
'"python-sqlite" module.')) '"python-sqlite" module.'))
# Align all QFormLayouts towards each other
width = max(self.formatLabel.minimumSizeHint().width(),
self.osisFileLabel.minimumSizeHint().width())
width = max(width, self.csvBooksLabel.minimumSizeHint().width())
width = max(width, self.csvVersesLabel.minimumSizeHint().width())
width = max(width, self.openSongFileLabel.minimumSizeHint().width())
width = max(width, self.openlp1FileLabel.minimumSizeHint().width())
self.formatSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed)
self.osisSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed)
self.csvSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed)
self.openSongSpacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed)
self.openlp1Spacer.changeSize(width, 0, QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed)

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

@ -72,7 +72,7 @@ class CSVBible(BibleDB):
self.create_book(unicode(line[1], details['encoding']), self.create_book(unicode(line[1], details['encoding']),
line[2], int(line[0])) line[2], int(line[0]))
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')
except IOError: except IOError, IndexError:
log.exception(u'Loading books from file failed') log.exception(u'Loading books from file failed')
success = False success = False
finally: finally:

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

@ -88,7 +88,7 @@ class OpenSongBible(BibleDB):
translate('BiblesPlugin.Opensong', 'Importing'), translate('BiblesPlugin.Opensong', 'Importing'),
db_book.name, chapter.attrib[u'n'])) db_book.name, chapter.attrib[u'n']))
self.session.commit() self.session.commit()
except IOError: except IOError, AttributeError:
log.exception(u'Loading bible from OpenSong file failed') log.exception(u'Loading bible from OpenSong file failed')
success = False success = False
finally: finally: