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

For settings updates

Browse Source
This commit is contained in:
Tim Bentley 2010-10-09 12:20:47 +01:00
parent f5ccb757ab
commit 216f044883
2 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openlp/core/ui/amendthemeform.py
View File

@ -90,6 +90,16 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
QtCore.QObject.connect(self.fontMainSizeSpinBox, QtCore.QObject.connect(self.fontMainSizeSpinBox,
QtCore.SIGNAL(u'editingFinished()'), QtCore.SIGNAL(u'editingFinished()'),
self.onFontMainSizeSpinBoxChanged) self.onFontMainSizeSpinBoxChanged)
QtCore.QObject.connect(self.fontMainLineAdjustmentSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontMainLineAdjustmentSpinBoxChanged)
QtCore.QObject.connect(self.shadowSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onShadowSpinBoxChanged)
QtCore.QObject.connect(self.outlineSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onOutlineSpinBoxChanged)
QtCore.QObject.connect(self.fontFooterSizeSpinBox, QtCore.QObject.connect(self.fontFooterSizeSpinBox,
QtCore.SIGNAL(u'editingFinished()'), QtCore.SIGNAL(u'editingFinished()'),
self.onFontFooterSizeSpinBoxChanged) self.onFontFooterSizeSpinBoxChanged)
@ -118,12 +128,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
QtCore.QObject.connect(self.fontFooterHeightSpinBox, QtCore.QObject.connect(self.fontFooterHeightSpinBox,
QtCore.SIGNAL(u'editingFinished()'), QtCore.SIGNAL(u'editingFinished()'),
self.onFontFooterHeightSpinBoxChanged) self.onFontFooterHeightSpinBoxChanged)
QtCore.QObject.connect(self.shadowSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onShadowSpinBoxChanged)
QtCore.QObject.connect(self.outlineSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onOutlineSpinBoxChanged)
# CheckBoxes # CheckBoxes
QtCore.QObject.connect(self.fontMainDefaultCheckBox, QtCore.QObject.connect(self.fontMainDefaultCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'), QtCore.SIGNAL(u'stateChanged(int)'),

54
openlp/core/ui/themewizardform.py
View File

@ -139,6 +139,18 @@ class ThemeWizardForm(QtGui.QWizard, Ui_ThemeWizard):
QtCore.QObject.connect(self.shadowColorPushButton, QtCore.QObject.connect(self.shadowColorPushButton,
QtCore.SIGNAL(u'pressed()'), QtCore.SIGNAL(u'pressed()'),
self.onShadowColourPushButtonClicked) self.onShadowColourPushButtonClicked)
QtCore.QObject.connect(self.mainSizeSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onMainSizeSpinBoxFinished)
QtCore.QObject.connect(self.lineSpacingSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onLineSpacingSpinBoxFinished)
QtCore.QObject.connect(self.outlineSizeSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onOutlineSizeSpinBoxFinished)
QtCore.QObject.connect(self.shadowSizeSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onShadowSizeSpinBoxFinished)
def exec_(self): def exec_(self):
""" """
@ -227,18 +239,23 @@ class ThemeWizardForm(QtGui.QWizard, Ui_ThemeWizard):
def setMainAreaTabValues(self): def setMainAreaTabValues(self):
#self.setField(u'mainFontComboBox', QtCore.QVariant(self.theme.font_main_name)) #self.setField(u'mainFontComboBox', QtCore.QVariant(self.theme.font_main_name))
self.mainColorPushButton.setStyleSheet(u'background-color: %s' % self.mainColorPushButton.setStyleSheet(u'background-color: %s' %
self.theme.font_main_color) self.theme.font_main_color)
self.setField(u'mainSizeSpinBox', QtCore.QVariant(self.theme.font_main_proportion)) self.setField(u'mainSizeSpinBox', \
self.setField(u'lineSpacingSpinBox', QtCore.QVariant(self.theme.font_main_line_adjustment)) QtCore.QVariant(self.theme.font_main_proportion))
self.setField(u'outlineCheckBox', QtCore.QVariant(self.theme.font_main_outline)) self.setField(u'lineSpacingSpinBox', \
QtCore.QVariant(self.theme.font_main_line_adjustment))
self.setField(u'outlineCheckBox', \
QtCore.QVariant(self.theme.font_main_outline))
self.outlineColorPushButton.setStyleSheet(u'background-color: %s' % self.outlineColorPushButton.setStyleSheet(u'background-color: %s' %
self.theme.font_main_outline_color) self.theme.font_main_outline_color)
self.setField(u'outlineSizeSpinBox', QtCore.QVariant(self.theme.font_main_outline_size)) self.setField(u'outlineSizeSpinBox', \
self.setField(u'shadowCheckBox', QtCore.QVariant(self.theme.font_main_shadow)) QtCore.QVariant(self.theme.font_main_outline_size))
self.setField(u'shadowCheckBox', \
QtCore.QVariant(self.theme.font_main_shadow))
self.shadowColorPushButton.setStyleSheet(u'background-color: %s' % self.shadowColorPushButton.setStyleSheet(u'background-color: %s' %
self.theme.font_main_shadow_color) self.theme.font_main_shadow_color)
self.setField(u'shadowSizeSpinBox', QtCore.QVariant(self.theme.font_main_shadow_size)) self.setField(u'shadowSizeSpinBox', \
pass QtCore.QVariant(self.theme.font_main_shadow_size))
def setFooterAreaTabValues(self): def setFooterAreaTabValues(self):
pass pass
@ -341,6 +358,23 @@ class ThemeWizardForm(QtGui.QWizard, Ui_ThemeWizard):
self._colorButton(self.theme.font_main_shadow_color) self._colorButton(self.theme.font_main_shadow_color)
self.setBackgroundTabValues() self.setBackgroundTabValues()
def onMainSizeSpinBoxFinished(self):
self.theme.font_main_proportion = \
self.field(u'mainSizeSpinBox').toInt()[0]
def onLineSpacingSpinBoxFinished(self):
self.theme.font_main_line_adjustment = \
self.field(u'lineSpacingSpinBox').toInt()[0]
def onOutlineSizeSpinBoxFinished(self):
self.theme.font_main_outline = \
self.field(u'outlineSizeSpinBox').toInt()[0]
def onShadowSizeSpinBoxFinished(self):
self.theme.font_main_shadow_size = \
self.field(u'shadowSizeSpinBox').toInt()[0]
def _colorButton(self, field): def _colorButton(self, field):
print field print field
new_color = QtGui.QColorDialog.getColor( new_color = QtGui.QColorDialog.getColor(