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

Cleanup including diff check fixes

This commit is contained in:
Jon Tibble 2010-06-01 18:13:54 +01:00
parent 2d988d9c8a
commit 08f0c1ff49
13 changed files with 322 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/ui/aboutform.py
View File

@ -57,5 +57,6 @@ class AboutForm(QtGui.QDialog, Ui_AboutDialog):
Launch a web browser and go to the contribute page on the site. Launch a web browser and go to the contribute page on the site.
""" """
import webbrowser import webbrowser
url = u'http://www.openlp.org/en/documentation/introduction/contributing.html' url = u'http://www.openlp.org/en/documentation/introduction/' \
+ u'contributing.html'
webbrowser.open_new(url) webbrowser.open_new(url)

464
openlp/core/ui/amendthemedialog.py
View File

@ -24,8 +24,8 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import build_icon
from openlp.core.lib import translate from openlp.core.lib import build_icon, translate
class Ui_AmendThemeDialog(object): class Ui_AmendThemeDialog(object):
def setupUi(self, AmendThemeDialog): def setupUi(self, AmendThemeDialog):
@ -68,56 +68,56 @@ class Ui_AmendThemeDialog(object):
self.BackgroundLayout.setObjectName(u'BackgroundLayout') self.BackgroundLayout.setObjectName(u'BackgroundLayout')
self.BackgroundLabel = QtGui.QLabel(self.BackgroundTab) self.BackgroundLabel = QtGui.QLabel(self.BackgroundTab)
self.BackgroundLabel.setObjectName(u'BackgroundLabel') self.BackgroundLabel.setObjectName(u'BackgroundLabel')
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
0, QtGui.QFormLayout.LabelRole, self.BackgroundLabel) self.BackgroundLabel)
self.BackgroundComboBox = QtGui.QComboBox(self.BackgroundTab) self.BackgroundComboBox = QtGui.QComboBox(self.BackgroundTab)
self.BackgroundComboBox.setObjectName(u'BackgroundComboBox') self.BackgroundComboBox.setObjectName(u'BackgroundComboBox')
self.BackgroundComboBox.addItem(QtCore.QString()) self.BackgroundComboBox.addItem(QtCore.QString())
self.BackgroundComboBox.addItem(QtCore.QString()) self.BackgroundComboBox.addItem(QtCore.QString())
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
0, QtGui.QFormLayout.FieldRole, self.BackgroundComboBox) self.BackgroundComboBox)
self.BackgroundTypeLabel = QtGui.QLabel(self.BackgroundTab) self.BackgroundTypeLabel = QtGui.QLabel(self.BackgroundTab)
self.BackgroundTypeLabel.setObjectName(u'BackgroundTypeLabel') self.BackgroundTypeLabel.setObjectName(u'BackgroundTypeLabel')
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
1, QtGui.QFormLayout.LabelRole, self.BackgroundTypeLabel) self.BackgroundTypeLabel)
self.BackgroundTypeComboBox = QtGui.QComboBox(self.BackgroundTab) self.BackgroundTypeComboBox = QtGui.QComboBox(self.BackgroundTab)
self.BackgroundTypeComboBox.setObjectName(u'BackgroundTypeComboBox') self.BackgroundTypeComboBox.setObjectName(u'BackgroundTypeComboBox')
self.BackgroundTypeComboBox.addItem(QtCore.QString()) self.BackgroundTypeComboBox.addItem(QtCore.QString())
self.BackgroundTypeComboBox.addItem(QtCore.QString()) self.BackgroundTypeComboBox.addItem(QtCore.QString())
self.BackgroundTypeComboBox.addItem(QtCore.QString()) self.BackgroundTypeComboBox.addItem(QtCore.QString())
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
1, QtGui.QFormLayout.FieldRole, self.BackgroundTypeComboBox) self.BackgroundTypeComboBox)
self.Color1Label = QtGui.QLabel(self.BackgroundTab) self.Color1Label = QtGui.QLabel(self.BackgroundTab)
self.Color1Label.setObjectName(u'Color1Label') self.Color1Label.setObjectName(u'Color1Label')
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
2, QtGui.QFormLayout.LabelRole, self.Color1Label) self.Color1Label)
self.Color1PushButton = QtGui.QPushButton(self.BackgroundTab) self.Color1PushButton = QtGui.QPushButton(self.BackgroundTab)
self.Color1PushButton.setObjectName(u'Color1PushButton') self.Color1PushButton.setObjectName(u'Color1PushButton')
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
2, QtGui.QFormLayout.FieldRole, self.Color1PushButton) self.Color1PushButton)
self.Color2Label = QtGui.QLabel(self.BackgroundTab) self.Color2Label = QtGui.QLabel(self.BackgroundTab)
self.Color2Label.setObjectName(u'Color2Label') self.Color2Label.setObjectName(u'Color2Label')
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
3, QtGui.QFormLayout.LabelRole, self.Color2Label) self.Color2Label)
self.Color2PushButton = QtGui.QPushButton(self.BackgroundTab) self.Color2PushButton = QtGui.QPushButton(self.BackgroundTab)
self.Color2PushButton.setObjectName(u'Color2PushButton') self.Color2PushButton.setObjectName(u'Color2PushButton')
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
3, QtGui.QFormLayout.FieldRole, self.Color2PushButton) self.Color2PushButton)
self.ImageLabel = QtGui.QLabel(self.BackgroundTab) self.ImageLabel = QtGui.QLabel(self.BackgroundTab)
self.ImageLabel.setObjectName(u'ImageLabel') self.ImageLabel.setObjectName(u'ImageLabel')
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
4, QtGui.QFormLayout.LabelRole, self.ImageLabel) self.ImageLabel)
self.GradientLabel = QtGui.QLabel(self.BackgroundTab) self.GradientLabel = QtGui.QLabel(self.BackgroundTab)
self.GradientLabel.setObjectName(u'GradientLabel') self.GradientLabel.setObjectName(u'GradientLabel')
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(6, QtGui.QFormLayout.LabelRole,
6, QtGui.QFormLayout.LabelRole, self.GradientLabel) self.GradientLabel)
self.GradientComboBox = QtGui.QComboBox(self.BackgroundTab) self.GradientComboBox = QtGui.QComboBox(self.BackgroundTab)
self.GradientComboBox.setObjectName(u'GradientComboBox') self.GradientComboBox.setObjectName(u'GradientComboBox')
self.GradientComboBox.addItem(QtCore.QString()) self.GradientComboBox.addItem(QtCore.QString())
self.GradientComboBox.addItem(QtCore.QString()) self.GradientComboBox.addItem(QtCore.QString())
self.GradientComboBox.addItem(QtCore.QString()) self.GradientComboBox.addItem(QtCore.QString())
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(6, QtGui.QFormLayout.FieldRole,
6, QtGui.QFormLayout.FieldRole, self.GradientComboBox) self.GradientComboBox)
self.ImageFilenameWidget = QtGui.QWidget(self.BackgroundTab) self.ImageFilenameWidget = QtGui.QWidget(self.BackgroundTab)
self.ImageFilenameWidget.setObjectName(u'ImageFilenameWidget') self.ImageFilenameWidget.setObjectName(u'ImageFilenameWidget')
self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ImageFilenameWidget) self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ImageFilenameWidget)
@ -132,8 +132,8 @@ class Ui_AmendThemeDialog(object):
self.ImageToolButton.setIcon(icon1) self.ImageToolButton.setIcon(icon1)
self.ImageToolButton.setObjectName(u'ImageToolButton') self.ImageToolButton.setObjectName(u'ImageToolButton')
self.horizontalLayout_2.addWidget(self.ImageToolButton) self.horizontalLayout_2.addWidget(self.ImageToolButton)
self.BackgroundLayout.setWidget( self.BackgroundLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
4, QtGui.QFormLayout.FieldRole, self.ImageFilenameWidget) self.ImageFilenameWidget)
self.ThemeTabWidget.addTab(self.BackgroundTab, u'') self.ThemeTabWidget.addTab(self.BackgroundTab, u'')
self.FontMainTab = QtGui.QWidget() self.FontMainTab = QtGui.QWidget()
self.FontMainTab.setObjectName(u'FontMainTab') self.FontMainTab.setObjectName(u'FontMainTab')
@ -150,34 +150,34 @@ class Ui_AmendThemeDialog(object):
self.FontMainGroupBox = QtGui.QGroupBox(self.MainLeftWidget) self.FontMainGroupBox = QtGui.QGroupBox(self.MainLeftWidget)
self.FontMainGroupBox.setObjectName(u'FontMainGroupBox') self.FontMainGroupBox.setObjectName(u'FontMainGroupBox')
self.MainFontLayout = QtGui.QFormLayout(self.FontMainGroupBox) self.MainFontLayout = QtGui.QFormLayout(self.FontMainGroupBox)
self.MainFontLayout.setFormAlignment( self.MainFontLayout.setFormAlignment(QtCore.Qt.AlignLeading |
QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
self.MainFontLayout.setMargin(8) self.MainFontLayout.setMargin(8)
self.MainFontLayout.setSpacing(8) self.MainFontLayout.setSpacing(8)
self.MainFontLayout.setObjectName(u'MainFontLayout') self.MainFontLayout.setObjectName(u'MainFontLayout')
self.FontMainlabel = QtGui.QLabel(self.FontMainGroupBox) self.FontMainlabel = QtGui.QLabel(self.FontMainGroupBox)
self.FontMainlabel.setObjectName(u'FontMainlabel') self.FontMainlabel.setObjectName(u'FontMainlabel')
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
0, QtGui.QFormLayout.LabelRole, self.FontMainlabel) self.FontMainlabel)
self.FontMainComboBox = QtGui.QFontComboBox(self.FontMainGroupBox) self.FontMainComboBox = QtGui.QFontComboBox(self.FontMainGroupBox)
self.FontMainComboBox.setObjectName(u'FontMainComboBox') self.FontMainComboBox.setObjectName(u'FontMainComboBox')
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
0, QtGui.QFormLayout.FieldRole, self.FontMainComboBox) self.FontMainComboBox)
self.FontMainColorLabel = QtGui.QLabel(self.FontMainGroupBox) self.FontMainColorLabel = QtGui.QLabel(self.FontMainGroupBox)
self.FontMainColorLabel.setObjectName(u'FontMainColorLabel') self.FontMainColorLabel.setObjectName(u'FontMainColorLabel')
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
1, QtGui.QFormLayout.LabelRole, self.FontMainColorLabel) self.FontMainColorLabel)
self.FontMainColorPushButton = QtGui.QPushButton(self.FontMainGroupBox) self.FontMainColorPushButton = QtGui.QPushButton(self.FontMainGroupBox)
self.FontMainColorPushButton.setObjectName(u'FontMainColorPushButton') self.FontMainColorPushButton.setObjectName(u'FontMainColorPushButton')
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
1, QtGui.QFormLayout.FieldRole, self.FontMainColorPushButton) self.FontMainColorPushButton)
self.FontMainSize = QtGui.QLabel(self.FontMainGroupBox) self.FontMainSize = QtGui.QLabel(self.FontMainGroupBox)
self.FontMainSize.setObjectName(u'FontMainSize') self.FontMainSize.setObjectName(u'FontMainSize')
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
2, QtGui.QFormLayout.LabelRole, self.FontMainSize) self.FontMainSize)
self.FontMainSizeSpinBox = QtGui.QSpinBox(self.FontMainGroupBox) self.FontMainSizeSpinBox = QtGui.QSpinBox(self.FontMainGroupBox)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
@ -187,20 +187,20 @@ class Ui_AmendThemeDialog(object):
self.FontMainSizeSpinBox.setProperty(u'value', QtCore.QVariant(16)) self.FontMainSizeSpinBox.setProperty(u'value', QtCore.QVariant(16))
self.FontMainSizeSpinBox.setMaximum(999) self.FontMainSizeSpinBox.setMaximum(999)
self.FontMainSizeSpinBox.setObjectName(u'FontMainSizeSpinBox') self.FontMainSizeSpinBox.setObjectName(u'FontMainSizeSpinBox')
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
2, QtGui.QFormLayout.FieldRole, self.FontMainSizeSpinBox) self.FontMainSizeSpinBox)
self.FontMainWeightComboBox = QtGui.QComboBox(self.FontMainGroupBox) self.FontMainWeightComboBox = QtGui.QComboBox(self.FontMainGroupBox)
self.FontMainWeightComboBox.setObjectName(u'FontMainWeightComboBox') self.FontMainWeightComboBox.setObjectName(u'FontMainWeightComboBox')
self.FontMainWeightComboBox.addItem(QtCore.QString()) self.FontMainWeightComboBox.addItem(QtCore.QString())
self.FontMainWeightComboBox.addItem(QtCore.QString()) self.FontMainWeightComboBox.addItem(QtCore.QString())
self.FontMainWeightComboBox.addItem(QtCore.QString()) self.FontMainWeightComboBox.addItem(QtCore.QString())
self.FontMainWeightComboBox.addItem(QtCore.QString()) self.FontMainWeightComboBox.addItem(QtCore.QString())
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
3, QtGui.QFormLayout.FieldRole, self.FontMainWeightComboBox) self.FontMainWeightComboBox)
self.FontMainWeightLabel = QtGui.QLabel(self.FontMainGroupBox) self.FontMainWeightLabel = QtGui.QLabel(self.FontMainGroupBox)
self.FontMainWeightLabel.setObjectName(u'FontMainWeightLabel') self.FontMainWeightLabel.setObjectName(u'FontMainWeightLabel')
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
3, QtGui.QFormLayout.LabelRole, self.FontMainWeightLabel) self.FontMainWeightLabel)
self.MainLeftLayout.addWidget(self.FontMainGroupBox) self.MainLeftLayout.addWidget(self.FontMainGroupBox)
self.FontMainWrapLineAdjustmentLabel = QtGui.QLabel( self.FontMainWrapLineAdjustmentLabel = QtGui.QLabel(
self.FontMainGroupBox) self.FontMainGroupBox)
@ -213,25 +213,25 @@ class Ui_AmendThemeDialog(object):
self.FontMainLineAdjustmentSpinBox.setObjectName( self.FontMainLineAdjustmentSpinBox.setObjectName(
u'FontMainLineAdjustmentSpinBox') u'FontMainLineAdjustmentSpinBox')
self.FontMainLineAdjustmentSpinBox.setMinimum(-99) self.FontMainLineAdjustmentSpinBox.setMinimum(-99)
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
4, QtGui.QFormLayout.FieldRole, self.FontMainLineAdjustmentSpinBox) self.FontMainLineAdjustmentSpinBox)
self.FontMainWrapIndentationLabel = QtGui.QLabel(self.FontMainGroupBox) self.FontMainWrapIndentationLabel = QtGui.QLabel(self.FontMainGroupBox)
self.FontMainWrapIndentationLabel.setObjectName( self.FontMainWrapIndentationLabel.setObjectName(
u'FontMainWrapIndentationLabel') u'FontMainWrapIndentationLabel')
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(5, QtGui.QFormLayout.LabelRole,
5, QtGui.QFormLayout.LabelRole, self.FontMainWrapIndentationLabel) self.FontMainWrapIndentationLabel)
self.FontMainLineSpacingSpinBox = QtGui.QSpinBox(self.FontMainGroupBox) self.FontMainLineSpacingSpinBox = QtGui.QSpinBox(self.FontMainGroupBox)
self.FontMainLineSpacingSpinBox.setObjectName( self.FontMainLineSpacingSpinBox.setObjectName(
"FontMainLineSpacingSpinBox") u'FontMainLineSpacingSpinBox')
self.FontMainLineSpacingSpinBox.setMaximum(10) self.FontMainLineSpacingSpinBox.setMaximum(10)
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(5, QtGui.QFormLayout.FieldRole,
5, QtGui.QFormLayout.FieldRole, self.FontMainLineSpacingSpinBox) self.FontMainLineSpacingSpinBox)
self.FontMainLinesPageLabel = QtGui.QLabel(self.FontMainGroupBox) self.FontMainLinesPageLabel = QtGui.QLabel(self.FontMainGroupBox)
self.FontMainLinesPageLabel.setObjectName(u'FontMainLinesPageLabel') self.FontMainLinesPageLabel.setObjectName(u'FontMainLinesPageLabel')
self.MainFontLayout.setWidget( self.MainFontLayout.setWidget(6, QtGui.QFormLayout.LabelRole,
6, QtGui.QFormLayout.LabelRole, self.FontMainLinesPageLabel) self.FontMainLinesPageLabel)
spacerItem1 = QtGui.QSpacerItem( spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.MainLeftLayout.addItem(spacerItem1) self.MainLeftLayout.addItem(spacerItem1)
self.FontMainLayout.addWidget(self.MainLeftWidget) self.FontMainLayout.addWidget(self.MainLeftWidget)
self.MainRightWidget = QtGui.QWidget(self.FontMainTab) self.MainRightWidget = QtGui.QWidget(self.FontMainTab)
@ -248,33 +248,33 @@ class Ui_AmendThemeDialog(object):
self.MainLocationLayout.setObjectName(u'MainLocationLayout') self.MainLocationLayout.setObjectName(u'MainLocationLayout')
self.DefaultLocationLabel = QtGui.QLabel(self.MainLocationGroupBox) self.DefaultLocationLabel = QtGui.QLabel(self.MainLocationGroupBox)
self.DefaultLocationLabel.setObjectName(u'DefaultLocationLabel') self.DefaultLocationLabel.setObjectName(u'DefaultLocationLabel')
self.MainLocationLayout.setWidget( self.MainLocationLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
0, QtGui.QFormLayout.LabelRole, self.DefaultLocationLabel) self.DefaultLocationLabel)
self.FontMainDefaultCheckBox = QtGui.QCheckBox( self.FontMainDefaultCheckBox = QtGui.QCheckBox(
self.MainLocationGroupBox) self.MainLocationGroupBox)
self.FontMainDefaultCheckBox.setTristate(False) self.FontMainDefaultCheckBox.setTristate(False)
self.FontMainDefaultCheckBox.setObjectName(u'FontMainDefaultCheckBox') self.FontMainDefaultCheckBox.setObjectName(u'FontMainDefaultCheckBox')
self.MainLocationLayout.setWidget( self.MainLocationLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
0, QtGui.QFormLayout.FieldRole, self.FontMainDefaultCheckBox) self.FontMainDefaultCheckBox)
self.FontMainXLabel = QtGui.QLabel(self.MainLocationGroupBox) self.FontMainXLabel = QtGui.QLabel(self.MainLocationGroupBox)
self.FontMainXLabel.setObjectName(u'FontMainXLabel') self.FontMainXLabel.setObjectName(u'FontMainXLabel')
self.MainLocationLayout.setWidget( self.MainLocationLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
1, QtGui.QFormLayout.LabelRole, self.FontMainXLabel) self.FontMainXLabel)
self.FontMainYLabel = QtGui.QLabel(self.MainLocationGroupBox) self.FontMainYLabel = QtGui.QLabel(self.MainLocationGroupBox)
self.FontMainYLabel.setObjectName(u'FontMainYLabel') self.FontMainYLabel.setObjectName(u'FontMainYLabel')
self.MainLocationLayout.setWidget( self.MainLocationLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
2, QtGui.QFormLayout.LabelRole, self.FontMainYLabel) self.FontMainYLabel)
self.FontMainWidthLabel = QtGui.QLabel(self.MainLocationGroupBox) self.FontMainWidthLabel = QtGui.QLabel(self.MainLocationGroupBox)
self.FontMainWidthLabel.setObjectName(u'FontMainWidthLabel') self.FontMainWidthLabel.setObjectName(u'FontMainWidthLabel')
self.MainLocationLayout.setWidget( self.MainLocationLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
3, QtGui.QFormLayout.LabelRole, self.FontMainWidthLabel) self.FontMainWidthLabel)
self.FontMainHeightLabel = QtGui.QLabel(self.MainLocationGroupBox) self.FontMainHeightLabel = QtGui.QLabel(self.MainLocationGroupBox)
self.FontMainHeightLabel.setObjectName(u'FontMainHeightLabel') self.FontMainHeightLabel.setObjectName(u'FontMainHeightLabel')
self.MainLocationLayout.setWidget( self.MainLocationLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
4, QtGui.QFormLayout.LabelRole, self.FontMainHeightLabel) self.FontMainHeightLabel)
self.FontMainXSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox) self.FontMainXSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
@ -284,11 +284,11 @@ class Ui_AmendThemeDialog(object):
self.FontMainXSpinBox.setProperty(u'value', QtCore.QVariant(0)) self.FontMainXSpinBox.setProperty(u'value', QtCore.QVariant(0))
self.FontMainXSpinBox.setMaximum(9999) self.FontMainXSpinBox.setMaximum(9999)
self.FontMainXSpinBox.setObjectName(u'FontMainXSpinBox') self.FontMainXSpinBox.setObjectName(u'FontMainXSpinBox')
self.MainLocationLayout.setWidget( self.MainLocationLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
1, QtGui.QFormLayout.FieldRole, self.FontMainXSpinBox) self.FontMainXSpinBox)
self.FontMainYSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox) self.FontMainYSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
@ -297,11 +297,11 @@ class Ui_AmendThemeDialog(object):
self.FontMainYSpinBox.setMinimumSize(QtCore.QSize(78, 0)) self.FontMainYSpinBox.setMinimumSize(QtCore.QSize(78, 0))
self.FontMainYSpinBox.setMaximum(9999) self.FontMainYSpinBox.setMaximum(9999)
self.FontMainYSpinBox.setObjectName(u'FontMainYSpinBox') self.FontMainYSpinBox.setObjectName(u'FontMainYSpinBox')
self.MainLocationLayout.setWidget( self.MainLocationLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
2, QtGui.QFormLayout.FieldRole, self.FontMainYSpinBox) self.FontMainYSpinBox)
self.FontMainWidthSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox) self.FontMainWidthSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
@ -310,11 +310,11 @@ class Ui_AmendThemeDialog(object):
self.FontMainWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0)) self.FontMainWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0))
self.FontMainWidthSpinBox.setMaximum(9999) self.FontMainWidthSpinBox.setMaximum(9999)
self.FontMainWidthSpinBox.setObjectName(u'FontMainWidthSpinBox') self.FontMainWidthSpinBox.setObjectName(u'FontMainWidthSpinBox')
self.MainLocationLayout.setWidget( self.MainLocationLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
3, QtGui.QFormLayout.FieldRole, self.FontMainWidthSpinBox) self.FontMainWidthSpinBox)
self.FontMainHeightSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox) self.FontMainHeightSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
@ -323,11 +323,11 @@ class Ui_AmendThemeDialog(object):
self.FontMainHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0)) self.FontMainHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0))
self.FontMainHeightSpinBox.setMaximum(9999) self.FontMainHeightSpinBox.setMaximum(9999)
self.FontMainHeightSpinBox.setObjectName(u'FontMainHeightSpinBox') self.FontMainHeightSpinBox.setObjectName(u'FontMainHeightSpinBox')
self.MainLocationLayout.setWidget( self.MainLocationLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
4, QtGui.QFormLayout.FieldRole, self.FontMainHeightSpinBox) self.FontMainHeightSpinBox)
self.MainRightLayout.addWidget(self.MainLocationGroupBox) self.MainRightLayout.addWidget(self.MainLocationGroupBox)
spacerItem2 = QtGui.QSpacerItem( spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.MainRightLayout.addItem(spacerItem2) self.MainRightLayout.addItem(spacerItem2)
self.FontMainLayout.addWidget(self.MainRightWidget) self.FontMainLayout.addWidget(self.MainRightWidget)
self.ThemeTabWidget.addTab(self.FontMainTab, u'') self.ThemeTabWidget.addTab(self.FontMainTab, u'')
@ -348,36 +348,36 @@ class Ui_AmendThemeDialog(object):
self.FooterFontLayout = QtGui.QFormLayout(self.FooterFontGroupBox) self.FooterFontLayout = QtGui.QFormLayout(self.FooterFontGroupBox)
self.FooterFontLayout.setFieldGrowthPolicy( self.FooterFontLayout.setFieldGrowthPolicy(
QtGui.QFormLayout.ExpandingFieldsGrow) QtGui.QFormLayout.ExpandingFieldsGrow)
self.FooterFontLayout.setFormAlignment( self.FooterFontLayout.setFormAlignment(QtCore.Qt.AlignLeading |
QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
self.FooterFontLayout.setMargin(8) self.FooterFontLayout.setMargin(8)
self.FooterFontLayout.setSpacing(8) self.FooterFontLayout.setSpacing(8)
self.FooterFontLayout.setObjectName(u'FooterFontLayout') self.FooterFontLayout.setObjectName(u'FooterFontLayout')
self.FontFooterLabel = QtGui.QLabel(self.FooterFontGroupBox) self.FontFooterLabel = QtGui.QLabel(self.FooterFontGroupBox)
self.FontFooterLabel.setObjectName(u'FontFooterLabel') self.FontFooterLabel.setObjectName(u'FontFooterLabel')
self.FooterFontLayout.setWidget( self.FooterFontLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
0, QtGui.QFormLayout.LabelRole, self.FontFooterLabel) self.FontFooterLabel)
self.FontFooterComboBox = QtGui.QFontComboBox(self.FooterFontGroupBox) self.FontFooterComboBox = QtGui.QFontComboBox(self.FooterFontGroupBox)
self.FontFooterComboBox.setObjectName(u'FontFooterComboBox') self.FontFooterComboBox.setObjectName(u'FontFooterComboBox')
self.FooterFontLayout.setWidget( self.FooterFontLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
0, QtGui.QFormLayout.FieldRole, self.FontFooterComboBox) self.FontFooterComboBox)
self.FontFooterColorLabel = QtGui.QLabel(self.FooterFontGroupBox) self.FontFooterColorLabel = QtGui.QLabel(self.FooterFontGroupBox)
self.FontFooterColorLabel.setObjectName(u'FontFooterColorLabel') self.FontFooterColorLabel.setObjectName(u'FontFooterColorLabel')
self.FooterFontLayout.setWidget( self.FooterFontLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
1, QtGui.QFormLayout.LabelRole, self.FontFooterColorLabel) self.FontFooterColorLabel)
self.FontFooterColorPushButton = QtGui.QPushButton( self.FontFooterColorPushButton = QtGui.QPushButton(
self.FooterFontGroupBox) self.FooterFontGroupBox)
self.FontFooterColorPushButton.setObjectName( self.FontFooterColorPushButton.setObjectName(
u'FontFooterColorPushButton') u'FontFooterColorPushButton')
self.FooterFontLayout.setWidget( self.FooterFontLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
1, QtGui.QFormLayout.FieldRole, self.FontFooterColorPushButton) self.FontFooterColorPushButton)
self.FontFooterSizeLabel = QtGui.QLabel(self.FooterFontGroupBox) self.FontFooterSizeLabel = QtGui.QLabel(self.FooterFontGroupBox)
self.FontFooterSizeLabel.setObjectName(u'FontFooterSizeLabel') self.FontFooterSizeLabel.setObjectName(u'FontFooterSizeLabel')
self.FooterFontLayout.setWidget( self.FooterFontLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
2, QtGui.QFormLayout.LabelRole, self.FontFooterSizeLabel) self.FontFooterSizeLabel)
self.FontFooterSizeSpinBox = QtGui.QSpinBox(self.FooterFontGroupBox) self.FontFooterSizeSpinBox = QtGui.QSpinBox(self.FooterFontGroupBox)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
@ -387,23 +387,23 @@ class Ui_AmendThemeDialog(object):
self.FontFooterSizeSpinBox.setProperty(u'value', QtCore.QVariant(10)) self.FontFooterSizeSpinBox.setProperty(u'value', QtCore.QVariant(10))
self.FontFooterSizeSpinBox.setMaximum(999) self.FontFooterSizeSpinBox.setMaximum(999)
self.FontFooterSizeSpinBox.setObjectName(u'FontFooterSizeSpinBox') self.FontFooterSizeSpinBox.setObjectName(u'FontFooterSizeSpinBox')
self.FooterFontLayout.setWidget( self.FooterFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
2, QtGui.QFormLayout.FieldRole, self.FontFooterSizeSpinBox) self.FontFooterSizeSpinBox)
self.FontFooterWeightComboBox = QtGui.QComboBox(self.FooterFontGroupBox) self.FontFooterWeightComboBox = QtGui.QComboBox(self.FooterFontGroupBox)
self.FontFooterWeightComboBox.setObjectName(u'FontFooterWeightComboBox') self.FontFooterWeightComboBox.setObjectName(u'FontFooterWeightComboBox')
self.FontFooterWeightComboBox.addItem(QtCore.QString()) self.FontFooterWeightComboBox.addItem(QtCore.QString())
self.FontFooterWeightComboBox.addItem(QtCore.QString()) self.FontFooterWeightComboBox.addItem(QtCore.QString())
self.FontFooterWeightComboBox.addItem(QtCore.QString()) self.FontFooterWeightComboBox.addItem(QtCore.QString())
self.FontFooterWeightComboBox.addItem(QtCore.QString()) self.FontFooterWeightComboBox.addItem(QtCore.QString())
self.FooterFontLayout.setWidget( self.FooterFontLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
3, QtGui.QFormLayout.FieldRole, self.FontFooterWeightComboBox) self.FontFooterWeightComboBox)
self.FontFooterWeightLabel = QtGui.QLabel(self.FooterFontGroupBox) self.FontFooterWeightLabel = QtGui.QLabel(self.FooterFontGroupBox)
self.FontFooterWeightLabel.setObjectName(u'FontFooterWeightLabel') self.FontFooterWeightLabel.setObjectName(u'FontFooterWeightLabel')
self.FooterFontLayout.setWidget( self.FooterFontLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
3, QtGui.QFormLayout.LabelRole, self.FontFooterWeightLabel) self.FontFooterWeightLabel)
self.FooterLeftLayout.addWidget(self.FooterFontGroupBox) self.FooterLeftLayout.addWidget(self.FooterFontGroupBox)
spacerItem3 = QtGui.QSpacerItem( spacerItem3 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.FooterLeftLayout.addItem(spacerItem3) self.FooterLeftLayout.addItem(spacerItem3)
self.FontFooterLayout.addWidget(self.FooterLeftWidget) self.FontFooterLayout.addWidget(self.FooterLeftWidget)
self.FooterRightWidget = QtGui.QWidget(self.FontFooterTab) self.FooterRightWidget = QtGui.QWidget(self.FontFooterTab)
@ -418,41 +418,41 @@ class Ui_AmendThemeDialog(object):
self.LocationFooterGroupBox) self.LocationFooterGroupBox)
self.LocationFooterLayout.setFieldGrowthPolicy( self.LocationFooterLayout.setFieldGrowthPolicy(
QtGui.QFormLayout.ExpandingFieldsGrow) QtGui.QFormLayout.ExpandingFieldsGrow)
self.LocationFooterLayout.setFormAlignment( self.LocationFooterLayout.setFormAlignment(QtCore.Qt.AlignLeading |
QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
self.LocationFooterLayout.setMargin(8) self.LocationFooterLayout.setMargin(8)
self.LocationFooterLayout.setSpacing(8) self.LocationFooterLayout.setSpacing(8)
self.LocationFooterLayout.setObjectName(u'LocationFooterLayout') self.LocationFooterLayout.setObjectName(u'LocationFooterLayout')
self.FontFooterDefaultLabel = QtGui.QLabel(self.LocationFooterGroupBox) self.FontFooterDefaultLabel = QtGui.QLabel(self.LocationFooterGroupBox)
self.FontFooterDefaultLabel.setObjectName(u'FontFooterDefaultLabel') self.FontFooterDefaultLabel.setObjectName(u'FontFooterDefaultLabel')
self.LocationFooterLayout.setWidget( self.LocationFooterLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
0, QtGui.QFormLayout.LabelRole, self.FontFooterDefaultLabel) self.FontFooterDefaultLabel)
self.FontFooterDefaultCheckBox = QtGui.QCheckBox( self.FontFooterDefaultCheckBox = QtGui.QCheckBox(
self.LocationFooterGroupBox) self.LocationFooterGroupBox)
self.FontFooterDefaultCheckBox.setTristate(False) self.FontFooterDefaultCheckBox.setTristate(False)
self.FontFooterDefaultCheckBox.setObjectName( self.FontFooterDefaultCheckBox.setObjectName(
u'FontFooterDefaultCheckBox') u'FontFooterDefaultCheckBox')
self.LocationFooterLayout.setWidget( self.LocationFooterLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
0, QtGui.QFormLayout.FieldRole, self.FontFooterDefaultCheckBox) self.FontFooterDefaultCheckBox)
self.FontFooterXLabel = QtGui.QLabel(self.LocationFooterGroupBox) self.FontFooterXLabel = QtGui.QLabel(self.LocationFooterGroupBox)
self.FontFooterXLabel.setObjectName(u'FontFooterXLabel') self.FontFooterXLabel.setObjectName(u'FontFooterXLabel')
self.LocationFooterLayout.setWidget( self.LocationFooterLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
1, QtGui.QFormLayout.LabelRole, self.FontFooterXLabel) self.FontFooterXLabel)
self.FontFooterYLabel = QtGui.QLabel(self.LocationFooterGroupBox) self.FontFooterYLabel = QtGui.QLabel(self.LocationFooterGroupBox)
self.FontFooterYLabel.setObjectName(u'FontFooterYLabel') self.FontFooterYLabel.setObjectName(u'FontFooterYLabel')
self.LocationFooterLayout.setWidget( self.LocationFooterLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
2, QtGui.QFormLayout.LabelRole, self.FontFooterYLabel) self.FontFooterYLabel)
self.FontFooterWidthLabel = QtGui.QLabel(self.LocationFooterGroupBox) self.FontFooterWidthLabel = QtGui.QLabel(self.LocationFooterGroupBox)
self.FontFooterWidthLabel.setObjectName(u'FontFooterWidthLabel') self.FontFooterWidthLabel.setObjectName(u'FontFooterWidthLabel')
self.LocationFooterLayout.setWidget( self.LocationFooterLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
3, QtGui.QFormLayout.LabelRole, self.FontFooterWidthLabel) self.FontFooterWidthLabel)
self.FontFooterHeightLabel = QtGui.QLabel(self.LocationFooterGroupBox) self.FontFooterHeightLabel = QtGui.QLabel(self.LocationFooterGroupBox)
self.FontFooterHeightLabel.setObjectName(u'FontFooterHeightLabel') self.FontFooterHeightLabel.setObjectName(u'FontFooterHeightLabel')
self.LocationFooterLayout.setWidget( self.LocationFooterLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
4, QtGui.QFormLayout.LabelRole, self.FontFooterHeightLabel) self.FontFooterHeightLabel)
self.FontFooterXSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox) self.FontFooterXSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
@ -462,11 +462,11 @@ class Ui_AmendThemeDialog(object):
self.FontFooterXSpinBox.setProperty(u'value', QtCore.QVariant(0)) self.FontFooterXSpinBox.setProperty(u'value', QtCore.QVariant(0))
self.FontFooterXSpinBox.setMaximum(9999) self.FontFooterXSpinBox.setMaximum(9999)
self.FontFooterXSpinBox.setObjectName(u'FontFooterXSpinBox') self.FontFooterXSpinBox.setObjectName(u'FontFooterXSpinBox')
self.LocationFooterLayout.setWidget( self.LocationFooterLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
1, QtGui.QFormLayout.FieldRole, self.FontFooterXSpinBox) self.FontFooterXSpinBox)
self.FontFooterYSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox) self.FontFooterYSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
@ -476,25 +476,25 @@ class Ui_AmendThemeDialog(object):
self.FontFooterYSpinBox.setProperty(u'value', QtCore.QVariant(0)) self.FontFooterYSpinBox.setProperty(u'value', QtCore.QVariant(0))
self.FontFooterYSpinBox.setMaximum(9999) self.FontFooterYSpinBox.setMaximum(9999)
self.FontFooterYSpinBox.setObjectName(u'FontFooterYSpinBox') self.FontFooterYSpinBox.setObjectName(u'FontFooterYSpinBox')
self.LocationFooterLayout.setWidget( self.LocationFooterLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
2, QtGui.QFormLayout.FieldRole, self.FontFooterYSpinBox) self.FontFooterYSpinBox)
self.FontFooterWidthSpinBox = QtGui.QSpinBox( self.FontFooterWidthSpinBox = QtGui.QSpinBox(
self.LocationFooterGroupBox) self.LocationFooterGroupBox)
self.FontFooterWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0)) self.FontFooterWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0))
self.FontFooterWidthSpinBox.setMaximum(9999) self.FontFooterWidthSpinBox.setMaximum(9999)
self.FontFooterWidthSpinBox.setObjectName(u'FontFooterWidthSpinBox') self.FontFooterWidthSpinBox.setObjectName(u'FontFooterWidthSpinBox')
self.LocationFooterLayout.setWidget( self.LocationFooterLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
3, QtGui.QFormLayout.FieldRole, self.FontFooterWidthSpinBox) self.FontFooterWidthSpinBox)
self.FontFooterHeightSpinBox = QtGui.QSpinBox( self.FontFooterHeightSpinBox = QtGui.QSpinBox(
self.LocationFooterGroupBox) self.LocationFooterGroupBox)
self.FontFooterHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0)) self.FontFooterHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0))
self.FontFooterHeightSpinBox.setMaximum(9999) self.FontFooterHeightSpinBox.setMaximum(9999)
self.FontFooterHeightSpinBox.setObjectName(u'FontFooterHeightSpinBox') self.FontFooterHeightSpinBox.setObjectName(u'FontFooterHeightSpinBox')
self.LocationFooterLayout.setWidget( self.LocationFooterLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
4, QtGui.QFormLayout.FieldRole, self.FontFooterHeightSpinBox) self.FontFooterHeightSpinBox)
self.FooterRightLayout.addWidget(self.LocationFooterGroupBox) self.FooterRightLayout.addWidget(self.LocationFooterGroupBox)
spacerItem4 = QtGui.QSpacerItem( spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.FooterRightLayout.addItem(spacerItem4) self.FooterRightLayout.addItem(spacerItem4)
self.FontFooterLayout.addWidget(self.FooterRightWidget) self.FontFooterLayout.addWidget(self.FooterRightWidget)
self.ThemeTabWidget.addTab(self.FontFooterTab, u'') self.ThemeTabWidget.addTab(self.FontFooterTab, u'')
@ -524,29 +524,29 @@ class Ui_AmendThemeDialog(object):
self.OutlineLayout.setObjectName(u'OutlineLayout') self.OutlineLayout.setObjectName(u'OutlineLayout')
self.OutlineCheckBox = QtGui.QCheckBox(self.OutlineWidget) self.OutlineCheckBox = QtGui.QCheckBox(self.OutlineWidget)
self.OutlineCheckBox.setObjectName(u'OutlineCheckBox') self.OutlineCheckBox.setObjectName(u'OutlineCheckBox')
self.OutlineLayout.setWidget( self.OutlineLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
0, QtGui.QFormLayout.FieldRole, self.OutlineCheckBox) self.OutlineCheckBox)
self.OutlineSpinBox = QtGui.QSpinBox(self.OutlineWidget) self.OutlineSpinBox = QtGui.QSpinBox(self.OutlineWidget)
self.OutlineSpinBox.setObjectName(u'OutlineSpinBox') self.OutlineSpinBox.setObjectName(u'OutlineSpinBox')
self.OutlineSpinBox.setMaximum(10) self.OutlineSpinBox.setMaximum(10)
self.OutlineLayout.setWidget( self.OutlineLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
1, QtGui.QFormLayout.FieldRole, self.OutlineSpinBox) self.OutlineSpinBox)
self.OutlineSpinBoxLabel = QtGui.QLabel(self.OutlineWidget) self.OutlineSpinBoxLabel = QtGui.QLabel(self.OutlineWidget)
self.OutlineSpinBoxLabel.setObjectName(u'OutlineSpinBoxLabel') self.OutlineSpinBoxLabel.setObjectName(u'OutlineSpinBoxLabel')
self.OutlineLayout.setWidget( self.OutlineLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
1, QtGui.QFormLayout.LabelRole, self.OutlineSpinBoxLabel) self.OutlineSpinBoxLabel)
self.OutlineColorLabel = QtGui.QLabel(self.OutlineWidget) self.OutlineColorLabel = QtGui.QLabel(self.OutlineWidget)
self.OutlineColorLabel.setObjectName(u'OutlineColorLabel') self.OutlineColorLabel.setObjectName(u'OutlineColorLabel')
self.OutlineLayout.setWidget( self.OutlineLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
2, QtGui.QFormLayout.LabelRole, self.OutlineColorLabel) self.OutlineColorLabel)
self.OutlineColorPushButton = QtGui.QPushButton(self.OutlineWidget) self.OutlineColorPushButton = QtGui.QPushButton(self.OutlineWidget)
self.OutlineColorPushButton.setObjectName(u'OutlineColorPushButton') self.OutlineColorPushButton.setObjectName(u'OutlineColorPushButton')
self.OutlineLayout.setWidget( self.OutlineLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
2, QtGui.QFormLayout.FieldRole, self.OutlineColorPushButton) self.OutlineColorPushButton)
self.OutlineEnabledLabel = QtGui.QLabel(self.OutlineWidget) self.OutlineEnabledLabel = QtGui.QLabel(self.OutlineWidget)
self.OutlineEnabledLabel.setObjectName(u'OutlineEnabledLabel') self.OutlineEnabledLabel.setObjectName(u'OutlineEnabledLabel')
self.OutlineLayout.setWidget( self.OutlineLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
0, QtGui.QFormLayout.LabelRole, self.OutlineEnabledLabel) self.OutlineEnabledLabel)
self.verticalLayout.addWidget(self.OutlineWidget) self.verticalLayout.addWidget(self.OutlineWidget)
self.OptionsLeftLayout.addWidget(self.OutlineGroupBox) self.OptionsLeftLayout.addWidget(self.OutlineGroupBox)
self.ShadowGroupBox = QtGui.QGroupBox(self.OptionsLeftWidget) self.ShadowGroupBox = QtGui.QGroupBox(self.OptionsLeftWidget)
@ -563,33 +563,33 @@ class Ui_AmendThemeDialog(object):
self.ShadowLayout.setObjectName(u'ShadowLayout') self.ShadowLayout.setObjectName(u'ShadowLayout')
self.ShadowCheckBox = QtGui.QCheckBox(self.ShadowWidget) self.ShadowCheckBox = QtGui.QCheckBox(self.ShadowWidget)
self.ShadowCheckBox.setObjectName(u'ShadowCheckBox') self.ShadowCheckBox.setObjectName(u'ShadowCheckBox')
self.ShadowLayout.setWidget( self.ShadowLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
0, QtGui.QFormLayout.FieldRole, self.ShadowCheckBox) self.ShadowCheckBox)
self.ShadowSpinBox = QtGui.QSpinBox(self.OutlineWidget) self.ShadowSpinBox = QtGui.QSpinBox(self.OutlineWidget)
self.ShadowSpinBox.setObjectName(u'ShadowSpinBox') self.ShadowSpinBox.setObjectName(u'ShadowSpinBox')
self.ShadowSpinBox.setMaximum(10) self.ShadowSpinBox.setMaximum(10)
self.ShadowLayout.setWidget( self.ShadowLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
1, QtGui.QFormLayout.FieldRole, self.ShadowSpinBox) self.ShadowSpinBox)
self.ShadowSpinBoxLabel = QtGui.QLabel(self.OutlineWidget) self.ShadowSpinBoxLabel = QtGui.QLabel(self.OutlineWidget)
self.ShadowSpinBoxLabel.setObjectName(u'ShadowSpinBoxLabel') self.ShadowSpinBoxLabel.setObjectName(u'ShadowSpinBoxLabel')
self.ShadowLayout.setWidget( self.ShadowLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
1, QtGui.QFormLayout.LabelRole, self.ShadowSpinBoxLabel) self.ShadowSpinBoxLabel)
self.ShadowColorLabel = QtGui.QLabel(self.ShadowWidget) self.ShadowColorLabel = QtGui.QLabel(self.ShadowWidget)
self.ShadowColorLabel.setObjectName(u'ShadowColorLabel') self.ShadowColorLabel.setObjectName(u'ShadowColorLabel')
self.ShadowLayout.setWidget( self.ShadowLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
2, QtGui.QFormLayout.LabelRole, self.ShadowColorLabel) self.ShadowColorLabel)
self.ShadowColorPushButton = QtGui.QPushButton(self.ShadowWidget) self.ShadowColorPushButton = QtGui.QPushButton(self.ShadowWidget)
self.ShadowColorPushButton.setObjectName(u'ShadowColorPushButton') self.ShadowColorPushButton.setObjectName(u'ShadowColorPushButton')
self.ShadowLayout.setWidget( self.ShadowLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
2, QtGui.QFormLayout.FieldRole, self.ShadowColorPushButton) self.ShadowColorPushButton)
self.ShadowEnabledLabel = QtGui.QLabel(self.ShadowWidget) self.ShadowEnabledLabel = QtGui.QLabel(self.ShadowWidget)
self.ShadowEnabledLabel.setObjectName(u'ShadowEnabledLabel') self.ShadowEnabledLabel.setObjectName(u'ShadowEnabledLabel')
self.ShadowLayout.setWidget( self.ShadowLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
0, QtGui.QFormLayout.LabelRole, self.ShadowEnabledLabel) self.ShadowEnabledLabel)
self.verticalLayout.addWidget(self.ShadowWidget) self.verticalLayout.addWidget(self.ShadowWidget)
self.OptionsLeftLayout.addWidget(self.ShadowGroupBox) self.OptionsLeftLayout.addWidget(self.ShadowGroupBox)
spacerItem5 = QtGui.QSpacerItem( spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.OptionsLeftLayout.addItem(spacerItem5) self.OptionsLeftLayout.addItem(spacerItem5)
self.OtherOptionsLayout.addWidget(self.OptionsLeftWidget) self.OtherOptionsLayout.addWidget(self.OptionsLeftWidget)
self.OptionsRightWidget = QtGui.QWidget(self.OtherOptionsTab) self.OptionsRightWidget = QtGui.QWidget(self.OtherOptionsTab)
@ -635,8 +635,8 @@ class Ui_AmendThemeDialog(object):
self.SlideTransitionCheckedBox.setTristate(False) self.SlideTransitionCheckedBox.setTristate(False)
self.gridLayout_5.addWidget(self.SlideTransitionCheckedBox, 0, 1, 1, 1) self.gridLayout_5.addWidget(self.SlideTransitionCheckedBox, 0, 1, 1, 1)
self.OptionsRightLayout.addWidget(self.TransitionGroupBox) self.OptionsRightLayout.addWidget(self.TransitionGroupBox)
spacerItem6 = QtGui.QSpacerItem( spacerItem6 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.OptionsRightLayout.addItem(spacerItem6) self.OptionsRightLayout.addItem(spacerItem6)
self.OtherOptionsLayout.addWidget(self.OptionsRightWidget) self.OtherOptionsLayout.addWidget(self.OptionsRightWidget)
self.ThemeTabWidget.addTab(self.OtherOptionsTab, u'') self.ThemeTabWidget.addTab(self.OtherOptionsTab, u'')
@ -648,12 +648,12 @@ class Ui_AmendThemeDialog(object):
self.ThemePreviewLayout.setSpacing(8) self.ThemePreviewLayout.setSpacing(8)
self.ThemePreviewLayout.setMargin(8) self.ThemePreviewLayout.setMargin(8)
self.ThemePreviewLayout.setObjectName(u'ThemePreviewLayout') self.ThemePreviewLayout.setObjectName(u'ThemePreviewLayout')
spacerItem7 = QtGui.QSpacerItem( spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding,
40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.ThemePreviewLayout.addItem(spacerItem7) self.ThemePreviewLayout.addItem(spacerItem7)
self.ThemePreview = QtGui.QLabel(self.PreviewGroupBox) self.ThemePreview = QtGui.QLabel(self.PreviewGroupBox)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
@ -666,13 +666,13 @@ class Ui_AmendThemeDialog(object):
self.ThemePreview.setScaledContents(True) self.ThemePreview.setScaledContents(True)
self.ThemePreview.setObjectName(u'ThemePreview') self.ThemePreview.setObjectName(u'ThemePreview')
self.ThemePreviewLayout.addWidget(self.ThemePreview) self.ThemePreviewLayout.addWidget(self.ThemePreview)
spacerItem8 = QtGui.QSpacerItem( spacerItem8 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding,
40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.ThemePreviewLayout.addItem(spacerItem8) self.ThemePreviewLayout.addItem(spacerItem8)
self.AmendThemeLayout.addWidget(self.PreviewGroupBox) self.AmendThemeLayout.addWidget(self.PreviewGroupBox)
self.ThemeButtonBox = QtGui.QDialogButtonBox(AmendThemeDialog) self.ThemeButtonBox = QtGui.QDialogButtonBox(AmendThemeDialog)
self.ThemeButtonBox.setStandardButtons( self.ThemeButtonBox.setStandardButtons(
QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Ok)
self.ThemeButtonBox.setObjectName(u'ThemeButtonBox') self.ThemeButtonBox.setObjectName(u'ThemeButtonBox')
self.AmendThemeLayout.addWidget(self.ThemeButtonBox) self.AmendThemeLayout.addWidget(self.ThemeButtonBox)
@ -685,68 +685,68 @@ class Ui_AmendThemeDialog(object):
QtCore.QMetaObject.connectSlotsByName(AmendThemeDialog) QtCore.QMetaObject.connectSlotsByName(AmendThemeDialog)
AmendThemeDialog.setTabOrder(self.ThemeButtonBox, self.ThemeNameEdit) AmendThemeDialog.setTabOrder(self.ThemeButtonBox, self.ThemeNameEdit)
AmendThemeDialog.setTabOrder(self.ThemeNameEdit, self.ThemeTabWidget) AmendThemeDialog.setTabOrder(self.ThemeNameEdit, self.ThemeTabWidget)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.ThemeTabWidget,
self.ThemeTabWidget, self.BackgroundComboBox) self.BackgroundComboBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.BackgroundComboBox,
self.BackgroundComboBox, self.BackgroundTypeComboBox) self.BackgroundTypeComboBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.BackgroundTypeComboBox,
self.BackgroundTypeComboBox, self.Color1PushButton) self.Color1PushButton)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.Color1PushButton,
self.Color1PushButton, self.Color2PushButton) self.Color2PushButton)
AmendThemeDialog.setTabOrder(self.Color2PushButton, self.ImageLineEdit) AmendThemeDialog.setTabOrder(self.Color2PushButton, self.ImageLineEdit)
AmendThemeDialog.setTabOrder(self.ImageLineEdit, self.ImageToolButton) AmendThemeDialog.setTabOrder(self.ImageLineEdit, self.ImageToolButton)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.ImageToolButton,
self.ImageToolButton, self.GradientComboBox) self.GradientComboBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.GradientComboBox,
self.GradientComboBox, self.FontMainComboBox) self.FontMainComboBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontMainComboBox,
self.FontMainComboBox, self.FontMainColorPushButton) self.FontMainColorPushButton)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontMainColorPushButton,
self.FontMainColorPushButton, self.FontMainSizeSpinBox) self.FontMainSizeSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontMainSizeSpinBox,
self.FontMainSizeSpinBox, self.FontMainWeightComboBox) self.FontMainWeightComboBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontMainWeightComboBox,
self.FontMainWeightComboBox, self.FontMainLineSpacingSpinBox) self.FontMainLineSpacingSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontMainLineSpacingSpinBox,
self.FontMainLineSpacingSpinBox, self.FontMainDefaultCheckBox) self.FontMainDefaultCheckBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontMainDefaultCheckBox,
self.FontMainDefaultCheckBox, self.FontMainXSpinBox) self.FontMainXSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontMainXSpinBox,
self.FontMainXSpinBox, self.FontMainYSpinBox) self.FontMainYSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontMainYSpinBox,
self.FontMainYSpinBox, self.FontMainWidthSpinBox) self.FontMainWidthSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontMainWidthSpinBox,
self.FontMainWidthSpinBox, self.FontMainHeightSpinBox) self.FontMainHeightSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontMainHeightSpinBox,
self.FontMainHeightSpinBox, self.FontFooterComboBox) self.FontFooterComboBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontFooterComboBox,
self.FontFooterComboBox, self.FontFooterColorPushButton) self.FontFooterColorPushButton)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontFooterColorPushButton,
self.FontFooterColorPushButton, self.FontFooterSizeSpinBox) self.FontFooterSizeSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontFooterSizeSpinBox,
self.FontFooterSizeSpinBox, self.FontFooterWeightComboBox) self.FontFooterWeightComboBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontFooterWeightComboBox,
self.FontFooterWeightComboBox, self.FontFooterDefaultCheckBox) self.FontFooterDefaultCheckBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontFooterDefaultCheckBox,
self.FontFooterDefaultCheckBox, self.FontFooterXSpinBox) self.FontFooterXSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontFooterXSpinBox,
self.FontFooterXSpinBox, self.FontFooterYSpinBox) self.FontFooterYSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontFooterYSpinBox,
self.FontFooterYSpinBox, self.FontFooterWidthSpinBox) self.FontFooterWidthSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontFooterWidthSpinBox,
self.FontFooterWidthSpinBox, self.FontFooterHeightSpinBox) self.FontFooterHeightSpinBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.FontFooterHeightSpinBox,
self.FontFooterHeightSpinBox, self.OutlineCheckBox) self.OutlineCheckBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.OutlineCheckBox,
self.OutlineCheckBox, self.OutlineColorPushButton) self.OutlineColorPushButton)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.OutlineColorPushButton,
self.OutlineColorPushButton, self.ShadowCheckBox) self.ShadowCheckBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.ShadowCheckBox,
self.ShadowCheckBox, self.ShadowColorPushButton) self.ShadowColorPushButton)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.ShadowColorPushButton,
self.ShadowColorPushButton, self.HorizontalComboBox) self.HorizontalComboBox)
AmendThemeDialog.setTabOrder( AmendThemeDialog.setTabOrder(self.HorizontalComboBox,
self.HorizontalComboBox, self.VerticalComboBox) self.VerticalComboBox)
def retranslateUi(self, AmendThemeDialog): def retranslateUi(self, AmendThemeDialog):
AmendThemeDialog.setWindowTitle( AmendThemeDialog.setWindowTitle(

8
openlp/core/ui/servicemanager.py
View File

@ -507,10 +507,10 @@ class ServiceManager(QtGui.QWidget):
if serviceitem.notes: if serviceitem.notes:
icon = QtGui.QImage(serviceitem.icon) icon = QtGui.QImage(serviceitem.icon)
icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
QtCore.Qt.SmoothTransformation) QtCore.Qt.SmoothTransformation)
overlay = QtGui.QImage(':/services/service_item_notes.png') overlay = QtGui.QImage(':/services/service_item_notes.png')
overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio, overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio,
QtCore.Qt.SmoothTransformation) QtCore.Qt.SmoothTransformation)
painter = QtGui.QPainter(icon) painter = QtGui.QPainter(icon)
painter.drawImage(0, 0, overlay) painter.drawImage(0, 0, overlay)
painter.end() painter.end()
@ -518,8 +518,8 @@ class ServiceManager(QtGui.QWidget):
else: else:
treewidgetitem.setIcon(0, serviceitem.iconic_representation) treewidgetitem.setIcon(0, serviceitem.iconic_representation)
else: else:
treewidgetitem.setIcon( treewidgetitem.setIcon(0,
0, build_icon(u':/general/general_delete.png')) build_icon(u':/general/general_delete.png'))
treewidgetitem.setText(0, serviceitem.title) treewidgetitem.setText(0, serviceitem.title)
treewidgetitem.setToolTip(0, serviceitem.notes) treewidgetitem.setToolTip(0, serviceitem.notes)
treewidgetitem.setData(0, QtCore.Qt.UserRole, treewidgetitem.setData(0, QtCore.Qt.UserRole,

4
openlp/core/ui/servicenotedialog.py
View File

@ -39,8 +39,8 @@ class Ui_ServiceNoteEdit(object):
self.textEdit.setObjectName(u'textEdit') self.textEdit.setObjectName(u'textEdit')
self.verticalLayout.addWidget(self.textEdit) self.verticalLayout.addWidget(self.textEdit)
self.buttonBox = QtGui.QDialogButtonBox(self.widget) self.buttonBox = QtGui.QDialogButtonBox(self.widget)
self.buttonBox.setStandardButtons( self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save) QtGui.QDialogButtonBox.Save)
self.buttonBox.setObjectName(u'buttonBox') self.buttonBox.setObjectName(u'buttonBox')
self.verticalLayout.addWidget(self.buttonBox) self.verticalLayout.addWidget(self.buttonBox)

31
openlp/plugins/alerts/forms/alertdialog.py
View File

@ -24,6 +24,7 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate
class Ui_AlertDialog(object): class Ui_AlertDialog(object):
@ -43,28 +44,28 @@ class Ui_AlertDialog(object):
self.AlertTextLayout.setSpacing(8) self.AlertTextLayout.setSpacing(8)
self.AlertTextLayout.setObjectName(u'AlertTextLayout') self.AlertTextLayout.setObjectName(u'AlertTextLayout')
self.AlertEntryLabel = QtGui.QLabel(AlertDialog) self.AlertEntryLabel = QtGui.QLabel(AlertDialog)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred,
QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
self.AlertEntryLabel.sizePolicy().hasHeightForWidth()) self.AlertEntryLabel.sizePolicy().hasHeightForWidth())
self.AlertEntryLabel.setSizePolicy(sizePolicy) self.AlertEntryLabel.setSizePolicy(sizePolicy)
self.AlertEntryLabel.setObjectName(u'AlertEntryLabel') self.AlertEntryLabel.setObjectName(u'AlertEntryLabel')
self.AlertTextLayout.setWidget( self.AlertTextLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
0, QtGui.QFormLayout.LabelRole, self.AlertEntryLabel) self.AlertEntryLabel)
self.AlertParameter = QtGui.QLabel(AlertDialog) self.AlertParameter = QtGui.QLabel(AlertDialog)
self.AlertParameter.setObjectName(u'AlertParameter') self.AlertParameter.setObjectName(u'AlertParameter')
self.AlertTextLayout.setWidget( self.AlertTextLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
1, QtGui.QFormLayout.LabelRole, self.AlertParameter) self.AlertParameter)
self.ParameterEdit = QtGui.QLineEdit(AlertDialog) self.ParameterEdit = QtGui.QLineEdit(AlertDialog)
self.ParameterEdit.setObjectName(u'ParameterEdit') self.ParameterEdit.setObjectName(u'ParameterEdit')
self.AlertTextLayout.setWidget( self.AlertTextLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
1, QtGui.QFormLayout.FieldRole, self.ParameterEdit) self.ParameterEdit)
self.AlertTextEdit = QtGui.QLineEdit(AlertDialog) self.AlertTextEdit = QtGui.QLineEdit(AlertDialog)
self.AlertTextEdit.setObjectName(u'AlertTextEdit') self.AlertTextEdit.setObjectName(u'AlertTextEdit')
self.AlertTextLayout.setWidget( self.AlertTextLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
0, QtGui.QFormLayout.FieldRole, self.AlertTextEdit) self.AlertTextEdit)
self.AlertDialogLayout.addLayout(self.AlertTextLayout) self.AlertDialogLayout.addLayout(self.AlertTextLayout)
self.ManagementLayout = QtGui.QHBoxLayout() self.ManagementLayout = QtGui.QHBoxLayout()
self.ManagementLayout.setSpacing(8) self.ManagementLayout.setSpacing(8)
@ -99,8 +100,8 @@ class Ui_AlertDialog(object):
self.DeleteButton.setIcon(icon3) self.DeleteButton.setIcon(icon3)
self.DeleteButton.setObjectName(u'DeleteButton') self.DeleteButton.setObjectName(u'DeleteButton')
self.ManageButtonLayout.addWidget(self.DeleteButton) self.ManageButtonLayout.addWidget(self.DeleteButton)
spacerItem = QtGui.QSpacerItem( spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.ManageButtonLayout.addItem(spacerItem) self.ManageButtonLayout.addItem(spacerItem)
self.ManagementLayout.addLayout(self.ManageButtonLayout) self.ManagementLayout.addLayout(self.ManageButtonLayout)
self.AlertDialogLayout.addLayout(self.ManagementLayout) self.AlertDialogLayout.addLayout(self.ManagementLayout)
@ -133,7 +134,8 @@ class Ui_AlertDialog(object):
self.AlertParameter.setBuddy(self.ParameterEdit) self.AlertParameter.setBuddy(self.ParameterEdit)
self.retranslateUi(AlertDialog) self.retranslateUi(AlertDialog)
QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL(u'clicked()'), AlertDialog.close) QtCore.QObject.connect(self.CloseButton, QtCore.SIGNAL(u'clicked()'),
AlertDialog.close)
QtCore.QMetaObject.connectSlotsByName(AlertDialog) QtCore.QMetaObject.connectSlotsByName(AlertDialog)
AlertDialog.setTabOrder(self.AlertTextEdit, self.ParameterEdit) AlertDialog.setTabOrder(self.AlertTextEdit, self.ParameterEdit)
AlertDialog.setTabOrder(self.ParameterEdit, self.AlertListWidget) AlertDialog.setTabOrder(self.ParameterEdit, self.AlertListWidget)
@ -152,6 +154,7 @@ class Ui_AlertDialog(object):
self.SaveButton.setText(translate('AlertForm', '&Save')) self.SaveButton.setText(translate('AlertForm', '&Save'))
self.DeleteButton.setText(translate('AlertForm', '&Delete')) self.DeleteButton.setText(translate('AlertForm', '&Delete'))
self.DisplayButton.setText(translate('AlertForm', 'Displ&ay')) self.DisplayButton.setText(translate('AlertForm', 'Displ&ay'))
self.DisplayCloseButton.setText(translate('AlertForm', 'Display && Cl&ose')) self.DisplayCloseButton.setText(
translate('AlertForm', 'Display && Cl&ose'))
self.CloseButton.setText(translate('AlertForm', '&Close')) self.CloseButton.setText(translate('AlertForm', '&Close'))

2
openlp/plugins/alerts/lib/models.py
View File

@ -34,6 +34,6 @@ def init_models(url):
engine = create_engine(url) engine = create_engine(url)
metadata.bind = engine metadata.bind = engine
session = scoped_session(sessionmaker(autoflush=True, autocommit=False, session = scoped_session(sessionmaker(autoflush=True, autocommit=False,
bind=engine)) bind=engine))
mapper(AlertItem, alerts_table) mapper(AlertItem, alerts_table)
return session return session

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

@ -308,29 +308,41 @@ class Ui_BibleImportWizard(object):
QtCore.QMetaObject.connectSlotsByName(BibleImportWizard) QtCore.QMetaObject.connectSlotsByName(BibleImportWizard)
def retranslateUi(self, BibleImportWizard): def retranslateUi(self, BibleImportWizard):
BibleImportWizard.setWindowTitle(translate('ImportWizardForm', 'Bible Import Wizard')) BibleImportWizard.setWindowTitle(
translate('ImportWizardForm', 'Bible Import Wizard'))
self.TitleLabel.setText( self.TitleLabel.setText(
u'<span style="font-size:14pt; font-weight:600;">%s</span>' % \ u'<span style="font-size:14pt; font-weight:600;">%s</span>' % \
translate('ImportWizardForm', 'Welcome to the Bible Import Wizard')) translate('ImportWizardForm', 'Welcome to the Bible Import Wizard'))
self.InformationLabel.setText( self.InformationLabel.setText(
translate('ImportWizardForm', 'This wizard will help you to import Bibles from a ' translate('ImportWizardForm',
'This wizard will help you to import Bibles from a '
'variety of formats. Click the next button below to start the ' 'variety of formats. Click the next button below to start the '
'process by selecting a format to import from.')) 'process by selecting a format to import from.'))
self.SelectPage.setTitle(translate('ImportWizardForm', 'Select Import Source')) self.SelectPage.setTitle(
self.SelectPage.setSubTitle( translate('ImportWizardForm', 'Select Import Source'))
translate('ImportWizardForm', 'Select the import format, and where to import from.')) self.SelectPage.setSubTitle(translate('ImportWizardForm',
'Select the import format, and where to import from.'))
self.FormatLabel.setText(translate('ImportWizardForm', 'Format:')) self.FormatLabel.setText(translate('ImportWizardForm', 'Format:'))
self.FormatComboBox.setItemText(0, translate('ImportWizardForm', 'OSIS')) self.FormatComboBox.setItemText(0,
translate('ImportWizardForm', 'OSIS'))
self.FormatComboBox.setItemText(1, translate('ImportWizardForm', 'CSV')) self.FormatComboBox.setItemText(1, translate('ImportWizardForm', 'CSV'))
self.FormatComboBox.setItemText(2, translate('ImportWizardForm', 'OpenSong')) self.FormatComboBox.setItemText(2,
self.FormatComboBox.setItemText(3, translate('ImportWizardForm', 'Web Download')) translate('ImportWizardForm', 'OpenSong'))
self.OsisLocationLabel.setText(translate('ImportWizardForm', 'File Location:')) self.FormatComboBox.setItemText(3,
self.BooksLocationLabel.setText(translate('ImportWizardForm', 'Books Location:')) translate('ImportWizardForm', 'Web Download'))
self.VerseLocationLabel.setText(translate('ImportWizardForm', 'Verse Location:')) self.OsisLocationLabel.setText(
self.OpenSongFileLabel.setText(translate('ImportWizardForm', 'Bible Filename:')) translate('ImportWizardForm', 'File Location:'))
self.BooksLocationLabel.setText(
translate('ImportWizardForm', 'Books Location:'))
self.VerseLocationLabel.setText(
translate('ImportWizardForm', 'Verse Location:'))
self.OpenSongFileLabel.setText(
translate('ImportWizardForm', 'Bible Filename:'))
self.LocationLabel.setText(translate('ImportWizardForm', 'Location:')) self.LocationLabel.setText(translate('ImportWizardForm', 'Location:'))
self.LocationComboBox.setItemText(0, translate('ImportWizardForm', 'Crosswalk')) self.LocationComboBox.setItemText(0,
self.LocationComboBox.setItemText(1, translate('ImportWizardForm', 'BibleGateway')) translate('ImportWizardForm', 'Crosswalk'))
self.LocationComboBox.setItemText(1,
translate('ImportWizardForm', 'BibleGateway'))
self.BibleLabel.setText(translate('ImportWizardForm', 'Bible:')) self.BibleLabel.setText(translate('ImportWizardForm', 'Bible:'))
self.WebDownloadTabWidget.setTabText( self.WebDownloadTabWidget.setTabText(
self.WebDownloadTabWidget.indexOf(self.DownloadOptionsTab), self.WebDownloadTabWidget.indexOf(self.DownloadOptionsTab),
@ -341,16 +353,19 @@ class Ui_BibleImportWizard(object):
self.WebDownloadTabWidget.setTabText( self.WebDownloadTabWidget.setTabText(
self.WebDownloadTabWidget.indexOf(self.ProxyServerTab), self.WebDownloadTabWidget.indexOf(self.ProxyServerTab),
translate('ImportWizardForm', 'Proxy Server (Optional)')) translate('ImportWizardForm', 'Proxy Server (Optional)'))
self.LicenseDetailsPage.setTitle(translate('ImportWizardForm', 'License Details')) self.LicenseDetailsPage.setTitle(
self.LicenseDetailsPage.setSubTitle( translate('ImportWizardForm', 'License Details'))
translate('ImportWizardForm', 'Set up the Bible\'s license details.')) self.LicenseDetailsPage.setSubTitle(translate('ImportWizardForm',
self.VersionNameLabel.setText(translate('ImportWizardForm', 'Version Name:')) 'Set up the Bible\'s license details.'))
self.VersionNameLabel.setText(
translate('ImportWizardForm', 'Version Name:'))
self.CopyrightLabel.setText(translate('ImportWizardForm', 'Copyright:')) self.CopyrightLabel.setText(translate('ImportWizardForm', 'Copyright:'))
self.PermissionLabel.setText(translate('ImportWizardForm', 'Permission:')) self.PermissionLabel.setText(
translate('ImportWizardForm', 'Permission:'))
self.ImportPage.setTitle(translate('ImportWizardForm', 'Importing')) self.ImportPage.setTitle(translate('ImportWizardForm', 'Importing'))
self.ImportPage.setSubTitle( self.ImportPage.setSubTitle(translate('ImportWizardForm',
translate('ImportWizardForm', 'Please wait while your Bible is imported.')) 'Please wait while your Bible is imported.'))
self.ImportProgressLabel.setText(translate('ImportWizardForm', 'Ready.')) self.ImportProgressLabel.setText(
translate('ImportWizardForm', 'Ready.'))
self.ImportProgressBar.setFormat(u'%p%') self.ImportProgressBar.setFormat(u'%p%')

16
openlp/plugins/bibles/forms/importwizardform.py
View File

@ -146,7 +146,8 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.CsvVerseLocationEdit.setFocus() self.CsvVerseLocationEdit.setFocus()
return False return False
elif self.field(u'source_format').toInt()[0] == BibleFormat.OpenSong: elif self.field(u'source_format').toInt()[0] == \
BibleFormat.OpenSong:
if self.field(u'opensong_file').toString() == u'': if self.field(u'opensong_file').toString() == u'':
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
self.trUtf8('Invalid OpenSong Bible'), self.trUtf8('Invalid OpenSong Bible'),
@ -159,7 +160,8 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
elif self.currentId() == 2: elif self.currentId() == 2:
# License details # License details
license_version = variant_to_unicode(self.field(u'license_version')) license_version = variant_to_unicode(self.field(u'license_version'))
license_copyright = variant_to_unicode(self.field(u'license_copyright')) license_copyright = variant_to_unicode(
self.field(u'license_copyright'))
if license_version == u'': if license_version == u'':
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
self.trUtf8('Empty Version Name'), self.trUtf8('Empty Version Name'),
@ -400,16 +402,19 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
if not isinstance(bible_version, unicode): if not isinstance(bible_version, unicode):
bible_version = unicode(bible_version, u'utf8') bible_version = unicode(bible_version, u'utf8')
if download_location == WebDownload.Crosswalk: if download_location == WebDownload.Crosswalk:
bible = self.web_bible_list[WebDownload.Crosswalk][bible_version] bible = \
self.web_bible_list[WebDownload.Crosswalk][bible_version]
elif download_location == WebDownload.BibleGateway: elif download_location == WebDownload.BibleGateway:
bible = self.web_bible_list[WebDownload.BibleGateway][bible_version] bible = \
self.web_bible_list[WebDownload.BibleGateway][bible_version]
importer = self.manager.import_bible( importer = self.manager.import_bible(
BibleFormat.WebDownload, BibleFormat.WebDownload,
name=license_version, name=license_version,
download_source=WebDownload.get_name(download_location), download_source=WebDownload.get_name(download_location),
download_name=bible, download_name=bible,
proxy_server=variant_to_unicode(self.field(u'proxy_server')), proxy_server=variant_to_unicode(self.field(u'proxy_server')),
proxy_username=variant_to_unicode(self.field(u'proxy_username')), proxy_username=variant_to_unicode(
self.field(u'proxy_username')),
proxy_password=variant_to_unicode(self.field(u'proxy_password')) proxy_password=variant_to_unicode(self.field(u'proxy_password'))
) )
success = importer.do_import() success = importer.do_import()
@ -429,4 +434,3 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard):
self.cancelButton.setVisible(False) self.cancelButton.setVisible(False)
Receiver.send_message(u'openlp_process_events') Receiver.send_message(u'openlp_process_events')

3
openlp/plugins/bibles/lib/common.py
View File

@ -30,7 +30,8 @@ import chardet
import htmlentitydefs import htmlentitydefs
only_verses = re.compile(r'([\w .]+)[ ]+([0-9]+)[ ]*[:|v|V][ ]*([0-9]+)' only_verses = re.compile(r'([\w .]+)[ ]+([0-9]+)[ ]*[:|v|V][ ]*([0-9]+)'
r'(?:[ ]*-[ ]*([0-9]+|end))?(?:[ ]*,[ ]*([0-9]+)(?:[ ]*-[ ]*([0-9]+|end))?)?', r'(?:[ ]*-[ ]*([0-9]+|end))?(?:[ ]*,[ ]*([0-9]+)'
r'(?:[ ]*-[ ]*([0-9]+|end))?)?',
re.UNICODE) re.UNICODE)
chapter_range = re.compile(r'([\w .]+)[ ]+([0-9]+)[ ]*[:|v|V][ ]*' chapter_range = re.compile(r'([\w .]+)[ ]+([0-9]+)[ ]*[:|v|V][ ]*'
r'([0-9]+|end)[ ]*-[ ]*([0-9]+)[ ]*[:|v|V][ ]*([0-9]+|end)', r'([0-9]+|end)[ ]*-[ ]*([0-9]+)[ ]*[:|v|V][ ]*([0-9]+|end)',

6
openlp/plugins/bibles/lib/db.py
View File

@ -320,12 +320,14 @@ class BibleDB(QtCore.QObject):
verses = self.session.query(Verse) verses = self.session.query(Verse)
if text.find(u',') > -1: if text.find(u',') > -1:
or_clause = [] or_clause = []
keywords = [u'%%%s%%' % keyword.strip() for keyword in text.split(u',')] keywords = [u'%%%s%%' % keyword.strip()
for keyword in text.split(u',')]
for keyword in keywords: for keyword in keywords:
or_clause.append(Verse.text.like(keyword)) or_clause.append(Verse.text.like(keyword))
verses = verses.filter(or_(*or_clause)) verses = verses.filter(or_(*or_clause))
else: else:
keywords = [u'%%%s%%' % keyword.strip() for keyword in text.split(u' ')] keywords = [u'%%%s%%' % keyword.strip()
for keyword in text.split(u' ')]
for keyword in keywords: for keyword in keywords:
verses = verses.filter(Verse.text.like(keyword)) verses = verses.filter(Verse.text.like(keyword))
verses = verses.all() verses = verses.all()

2
openlp/plugins/custom/lib/models.py
View File

@ -34,6 +34,6 @@ def init_models(url):
engine = create_engine(url) engine = create_engine(url)
metadata.bind = engine metadata.bind = engine
session = scoped_session(sessionmaker(autoflush=True, autocommit=False, session = scoped_session(sessionmaker(autoflush=True, autocommit=False,
bind=engine)) bind=engine))
mapper(CustomSlide, custom_slide_table) mapper(CustomSlide, custom_slide_table)
return session return session

15
openlp/plugins/songs/lib/models.py
View File

@ -33,15 +33,16 @@ from openlp.plugins.songs.lib.classes import *
def init_models(url): def init_models(url):
engine = create_engine(url) engine = create_engine(url)
metadata.bind = engine metadata.bind = engine
session = scoped_session(sessionmaker(autoflush=False, session = scoped_session(sessionmaker(autoflush=False, autocommit=False,
autocommit=False, bind=engine)) bind=engine))
mapper(Author, authors_table) mapper(Author, authors_table)
mapper(Book, song_books_table) mapper(Book, song_books_table)
mapper(Song, songs_table, mapper(Song, songs_table,
properties={'authors': relation(Author, backref='songs', properties={'authors': relation(Author, backref='songs',
secondary=authors_songs_table), secondary=authors_songs_table),
'book': relation(Book, backref='songs'), 'book': relation(Book, backref='songs'),
'topics': relation(Topic, backref='songs', 'topics': relation(Topic, backref='songs',
secondary=songs_topics_table)}) secondary=songs_topics_table)})
mapper(Topic, topics_table) mapper(Topic, topics_table)
return session return session

2
openlp/plugins/songusage/lib/models.py
View File

@ -34,6 +34,6 @@ def init_models(url):
engine = create_engine(url) engine = create_engine(url)
metadata.bind = engine metadata.bind = engine
session = scoped_session(sessionmaker(autoflush=True, autocommit=False, session = scoped_session(sessionmaker(autoflush=True, autocommit=False,
bind=engine)) bind=engine))
mapper(SongUsageItem, songusage_table) mapper(SongUsageItem, songusage_table)
return session return session