forked from openlp/openlp
random clean ups
This commit is contained in:
parent
2b00c28635
commit
0ba3ccf199
@ -136,16 +136,14 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
|
|||||||
"""
|
"""
|
||||||
self.backgroundPage.registerField(
|
self.backgroundPage.registerField(
|
||||||
u'background_type', self.backgroundComboBox)
|
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(
|
||||||
u'grandient_start', self.gradientStartButton)
|
u'grandient_start', self.gradientStartButton)
|
||||||
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.imageFileEdit)
|
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'mainColorButton', self.mainColorButton)
|
u'mainColorButton', self.mainColorButton)
|
||||||
self.mainAreaPage.registerField(
|
self.mainAreaPage.registerField(
|
||||||
@ -158,8 +156,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
|
|||||||
u'outlineColorButton', self.outlineColorButton)
|
u'outlineColorButton', 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'mainBoldCheckBox', self.mainBoldCheckBox)
|
u'mainBoldCheckBox', self.mainBoldCheckBox)
|
||||||
self.mainAreaPage.registerField(
|
self.mainAreaPage.registerField(
|
||||||
@ -170,10 +167,8 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
|
|||||||
u'shadowSizeSpinBox', self.shadowSizeSpinBox)
|
u'shadowSizeSpinBox', self.shadowSizeSpinBox)
|
||||||
self.mainAreaPage.registerField(
|
self.mainAreaPage.registerField(
|
||||||
u'footerSizeSpinBox', self.footerSizeSpinBox)
|
u'footerSizeSpinBox', self.footerSizeSpinBox)
|
||||||
self.areaPositionPage.registerField(
|
self.areaPositionPage.registerField(u'mainPositionX', self.mainXSpinBox)
|
||||||
u'mainPositionX', self.mainXSpinBox)
|
self.areaPositionPage.registerField(u'mainPositionY', self.mainYSpinBox)
|
||||||
self.areaPositionPage.registerField(
|
|
||||||
u'mainPositionY', self.mainYSpinBox)
|
|
||||||
self.areaPositionPage.registerField(
|
self.areaPositionPage.registerField(
|
||||||
u'mainPositionWidth', self.mainWidthSpinBox)
|
u'mainPositionWidth', self.mainWidthSpinBox)
|
||||||
self.areaPositionPage.registerField(
|
self.areaPositionPage.registerField(
|
||||||
@ -188,12 +183,10 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
|
|||||||
u'footerPositionHeight', self.footerHeightSpinBox)
|
u'footerPositionHeight', self.footerHeightSpinBox)
|
||||||
self.backgroundPage.registerField(
|
self.backgroundPage.registerField(
|
||||||
u'horizontal', self.horizontalComboBox)
|
u'horizontal', self.horizontalComboBox)
|
||||||
self.backgroundPage.registerField(
|
self.backgroundPage.registerField(u'vertical', self.verticalComboBox)
|
||||||
u'vertical', self.verticalComboBox)
|
|
||||||
self.backgroundPage.registerField(
|
self.backgroundPage.registerField(
|
||||||
u'slideTransition', self.transitionsCheckBox)
|
u'slideTransition', self.transitionsCheckBox)
|
||||||
self.backgroundPage.registerField(
|
self.backgroundPage.registerField(u'name', self.themeNameEdit)
|
||||||
u'name', self.themeNameEdit)
|
|
||||||
|
|
||||||
def calculateLines(self):
|
def calculateLines(self):
|
||||||
"""
|
"""
|
||||||
@ -269,10 +262,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
|
|||||||
Change state as Outline check box changed
|
Change state as Outline check box changed
|
||||||
"""
|
"""
|
||||||
if self.updateThemeAllowed:
|
if self.updateThemeAllowed:
|
||||||
if state == QtCore.Qt.Checked:
|
self.theme.font_main_outline = state == QtCore.Qt.Checked
|
||||||
self.theme.font_main_outline = True
|
|
||||||
else:
|
|
||||||
self.theme.font_main_outline = False
|
|
||||||
self.outlineColorButton.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()
|
||||||
@ -642,8 +632,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
|
|||||||
"""
|
"""
|
||||||
Handle Color buttons
|
Handle Color buttons
|
||||||
"""
|
"""
|
||||||
new_color = QtGui.QColorDialog.getColor(
|
new_color = QtGui.QColorDialog.getColor(QtGui.QColor(field), self)
|
||||||
QtGui.QColor(field), self)
|
|
||||||
if new_color.isValid():
|
if new_color.isValid():
|
||||||
field = new_color.name()
|
field = new_color.name()
|
||||||
return field
|
return field
|
||||||
|
Loading…
Reference in New Issue
Block a user