From a02835f0f89c12ea823cd8176a292434e309a658 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 19 Apr 2009 09:15:40 +0100 Subject: [PATCH] Add new dialog and fix the Theme import code not to include old style preview code --- openlp/core/ui/amendthemedialog.py | 719 +++++++---- openlp/core/ui/amendthemeform.py | 3 - openlp/core/ui/thememanager.py | 33 +- resources/forms/amendthemedialog.ui | 1712 +++++++++++++++++---------- 4 files changed, 1564 insertions(+), 903 deletions(-) diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py index c43180995..0fe2dd27c 100644 --- a/openlp/core/ui/amendthemedialog.py +++ b/openlp/core/ui/amendthemedialog.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'amendthemedialog.ui' # -# Created: Fri Apr 10 20:38:33 2009 +# Created: Sun Apr 19 07:51:09 2009 # by: PyQt4 UI code generator 4.4.4 # # WARNING! All changes made in this file will be lost! @@ -12,272 +12,416 @@ from PyQt4 import QtCore, QtGui class Ui_AmendThemeDialog(object): def setupUi(self, AmendThemeDialog): AmendThemeDialog.setObjectName("AmendThemeDialog") - AmendThemeDialog.resize(752, 533) + AmendThemeDialog.setWindowModality(QtCore.Qt.ApplicationModal) + AmendThemeDialog.resize(586, 651) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(":/icon/openlp.org-icon-32.bmp"), QtGui.QIcon.Normal, QtGui.QIcon.Off) AmendThemeDialog.setWindowIcon(icon) - self.ThemeButtonBox = QtGui.QDialogButtonBox(AmendThemeDialog) - self.ThemeButtonBox.setGeometry(QtCore.QRect(580, 500, 156, 26)) - self.ThemeButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) - self.ThemeButtonBox.setObjectName("ThemeButtonBox") - self.layoutWidget = QtGui.QWidget(AmendThemeDialog) - self.layoutWidget.setGeometry(QtCore.QRect(50, 20, 441, 41)) - self.layoutWidget.setObjectName("layoutWidget") - self.horizontalLayout = QtGui.QHBoxLayout(self.layoutWidget) - self.horizontalLayout.setObjectName("horizontalLayout") - self.ThemeNameLabel = QtGui.QLabel(self.layoutWidget) + AmendThemeDialog.setModal(True) + self.AmendThemeLayout = QtGui.QVBoxLayout(AmendThemeDialog) + self.AmendThemeLayout.setSpacing(8) + self.AmendThemeLayout.setMargin(8) + self.AmendThemeLayout.setObjectName("AmendThemeLayout") + self.ThemeNameWidget = QtGui.QWidget(AmendThemeDialog) + self.ThemeNameWidget.setObjectName("ThemeNameWidget") + self.ThemeNameLayout = QtGui.QHBoxLayout(self.ThemeNameWidget) + self.ThemeNameLayout.setSpacing(8) + self.ThemeNameLayout.setMargin(0) + self.ThemeNameLayout.setObjectName("ThemeNameLayout") + self.ThemeNameLabel = QtGui.QLabel(self.ThemeNameWidget) self.ThemeNameLabel.setObjectName("ThemeNameLabel") - self.horizontalLayout.addWidget(self.ThemeNameLabel) - self.ThemeNameEdit = QtGui.QLineEdit(self.layoutWidget) + self.ThemeNameLayout.addWidget(self.ThemeNameLabel) + self.ThemeNameEdit = QtGui.QLineEdit(self.ThemeNameWidget) self.ThemeNameEdit.setObjectName("ThemeNameEdit") - self.horizontalLayout.addWidget(self.ThemeNameEdit) - self.widget = QtGui.QWidget(AmendThemeDialog) - self.widget.setGeometry(QtCore.QRect(31, 71, 721, 411)) - self.widget.setObjectName("widget") - self.horizontalLayout_2 = QtGui.QHBoxLayout(self.widget) - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.LeftSide = QtGui.QWidget(self.widget) - self.LeftSide.setObjectName("LeftSide") - self.tabWidget = QtGui.QTabWidget(self.LeftSide) - self.tabWidget.setGeometry(QtCore.QRect(0, 0, 341, 401)) - self.tabWidget.setObjectName("tabWidget") + self.ThemeNameLayout.addWidget(self.ThemeNameEdit) + self.AmendThemeLayout.addWidget(self.ThemeNameWidget) + self.ContentWidget = QtGui.QWidget(AmendThemeDialog) + self.ContentWidget.setObjectName("ContentWidget") + self.ContentLayout = QtGui.QHBoxLayout(self.ContentWidget) + self.ContentLayout.setSpacing(8) + self.ContentLayout.setMargin(0) + self.ContentLayout.setObjectName("ContentLayout") + self.ThemeTabWidget = QtGui.QTabWidget(self.ContentWidget) + self.ThemeTabWidget.setObjectName("ThemeTabWidget") self.BackgroundTab = QtGui.QWidget() self.BackgroundTab.setObjectName("BackgroundTab") - self.layoutWidget1 = QtGui.QWidget(self.BackgroundTab) - self.layoutWidget1.setGeometry(QtCore.QRect(10, 10, 321, 351)) - self.layoutWidget1.setObjectName("layoutWidget1") - self.gridLayout = QtGui.QGridLayout(self.layoutWidget1) - self.gridLayout.setObjectName("gridLayout") - self.BackgroundLabel = QtGui.QLabel(self.layoutWidget1) + self.BackgroundLayout = QtGui.QFormLayout(self.BackgroundTab) + self.BackgroundLayout.setMargin(8) + self.BackgroundLayout.setSpacing(8) + self.BackgroundLayout.setObjectName("BackgroundLayout") + self.BackgroundLabel = QtGui.QLabel(self.BackgroundTab) self.BackgroundLabel.setObjectName("BackgroundLabel") - self.gridLayout.addWidget(self.BackgroundLabel, 0, 0, 1, 2) - self.BackgroundComboBox = QtGui.QComboBox(self.layoutWidget1) + self.BackgroundLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.BackgroundLabel) + self.BackgroundComboBox = QtGui.QComboBox(self.BackgroundTab) self.BackgroundComboBox.setObjectName("BackgroundComboBox") self.BackgroundComboBox.addItem(QtCore.QString()) self.BackgroundComboBox.addItem(QtCore.QString()) - self.gridLayout.addWidget(self.BackgroundComboBox, 0, 2, 1, 2) - self.BackgroundTypeLabel = QtGui.QLabel(self.layoutWidget1) + self.BackgroundLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.BackgroundComboBox) + self.BackgroundTypeLabel = QtGui.QLabel(self.BackgroundTab) self.BackgroundTypeLabel.setObjectName("BackgroundTypeLabel") - self.gridLayout.addWidget(self.BackgroundTypeLabel, 1, 0, 1, 2) - self.BackgroundTypeComboBox = QtGui.QComboBox(self.layoutWidget1) + self.BackgroundLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.BackgroundTypeLabel) + self.BackgroundTypeComboBox = QtGui.QComboBox(self.BackgroundTab) self.BackgroundTypeComboBox.setObjectName("BackgroundTypeComboBox") self.BackgroundTypeComboBox.addItem(QtCore.QString()) self.BackgroundTypeComboBox.addItem(QtCore.QString()) self.BackgroundTypeComboBox.addItem(QtCore.QString()) - self.gridLayout.addWidget(self.BackgroundTypeComboBox, 1, 2, 1, 2) - self.Color1Label = QtGui.QLabel(self.layoutWidget1) + self.BackgroundLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.BackgroundTypeComboBox) + self.Color1Label = QtGui.QLabel(self.BackgroundTab) self.Color1Label.setObjectName("Color1Label") - self.gridLayout.addWidget(self.Color1Label, 2, 0, 1, 1) - self.Color1PushButton = QtGui.QPushButton(self.layoutWidget1) + self.BackgroundLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.Color1Label) + self.Color1PushButton = QtGui.QPushButton(self.BackgroundTab) self.Color1PushButton.setObjectName("Color1PushButton") - self.gridLayout.addWidget(self.Color1PushButton, 2, 2, 1, 2) - self.Color2Label = QtGui.QLabel(self.layoutWidget1) + self.BackgroundLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.Color1PushButton) + self.Color2Label = QtGui.QLabel(self.BackgroundTab) self.Color2Label.setObjectName("Color2Label") - self.gridLayout.addWidget(self.Color2Label, 3, 0, 1, 1) - self.Color2PushButton = QtGui.QPushButton(self.layoutWidget1) + self.BackgroundLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.Color2Label) + self.Color2PushButton = QtGui.QPushButton(self.BackgroundTab) self.Color2PushButton.setObjectName("Color2PushButton") - self.gridLayout.addWidget(self.Color2PushButton, 3, 2, 1, 2) - self.ImageLabel = QtGui.QLabel(self.layoutWidget1) + self.BackgroundLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.Color2PushButton) + self.ImageLabel = QtGui.QLabel(self.BackgroundTab) self.ImageLabel.setObjectName("ImageLabel") - self.gridLayout.addWidget(self.ImageLabel, 4, 0, 1, 1) - self.ImageLineEdit = QtGui.QLineEdit(self.layoutWidget1) - self.ImageLineEdit.setObjectName("ImageLineEdit") - self.gridLayout.addWidget(self.ImageLineEdit, 4, 1, 1, 2) - self.ImagePushButton = QtGui.QPushButton(self.layoutWidget1) - icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(":/services/service_open.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - self.ImagePushButton.setIcon(icon1) - self.ImagePushButton.setObjectName("ImagePushButton") - self.gridLayout.addWidget(self.ImagePushButton, 4, 3, 1, 1) - self.GradientLabel = QtGui.QLabel(self.layoutWidget1) + self.BackgroundLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.ImageLabel) + self.GradientLabel = QtGui.QLabel(self.BackgroundTab) self.GradientLabel.setObjectName("GradientLabel") - self.gridLayout.addWidget(self.GradientLabel, 5, 0, 1, 1) - self.GradientComboBox = QtGui.QComboBox(self.layoutWidget1) + self.BackgroundLayout.setWidget(6, QtGui.QFormLayout.LabelRole, self.GradientLabel) + self.GradientComboBox = QtGui.QComboBox(self.BackgroundTab) self.GradientComboBox.setObjectName("GradientComboBox") self.GradientComboBox.addItem(QtCore.QString()) self.GradientComboBox.addItem(QtCore.QString()) self.GradientComboBox.addItem(QtCore.QString()) - self.gridLayout.addWidget(self.GradientComboBox, 5, 2, 1, 2) - self.tabWidget.addTab(self.BackgroundTab, "") + self.BackgroundLayout.setWidget(6, QtGui.QFormLayout.FieldRole, self.GradientComboBox) + self.ImageFilenameWidget = QtGui.QWidget(self.BackgroundTab) + self.ImageFilenameWidget.setObjectName("ImageFilenameWidget") + self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ImageFilenameWidget) + self.horizontalLayout_2.setSpacing(0) + self.horizontalLayout_2.setMargin(0) + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.ImageLineEdit = QtGui.QLineEdit(self.ImageFilenameWidget) + self.ImageLineEdit.setObjectName("ImageLineEdit") + self.horizontalLayout_2.addWidget(self.ImageLineEdit) + self.ImageToolButton = QtGui.QToolButton(self.ImageFilenameWidget) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(":/images/image_load.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.ImageToolButton.setIcon(icon1) + self.ImageToolButton.setObjectName("ImageToolButton") + self.horizontalLayout_2.addWidget(self.ImageToolButton) + self.BackgroundLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.ImageFilenameWidget) + spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + #self.BackgroundLayout.addItem(spacerItem, 7, 1, 1, 1) + self.ThemeTabWidget.addTab(self.BackgroundTab, "") self.FontMainTab = QtGui.QWidget() self.FontMainTab.setObjectName("FontMainTab") - self.MainFontGroupBox = QtGui.QGroupBox(self.FontMainTab) - self.MainFontGroupBox.setGeometry(QtCore.QRect(20, 10, 307, 119)) + self.FontMainLayout = QtGui.QHBoxLayout(self.FontMainTab) + self.FontMainLayout.setSpacing(8) + self.FontMainLayout.setMargin(8) + self.FontMainLayout.setObjectName("FontMainLayout") + self.MainLeftWidget = QtGui.QWidget(self.FontMainTab) + self.MainLeftWidget.setObjectName("MainLeftWidget") + self.MainLeftLayout = QtGui.QVBoxLayout(self.MainLeftWidget) + self.MainLeftLayout.setSpacing(8) + self.MainLeftLayout.setMargin(0) + self.MainLeftLayout.setObjectName("MainLeftLayout") + self.MainFontGroupBox = QtGui.QGroupBox(self.MainLeftWidget) self.MainFontGroupBox.setObjectName("MainFontGroupBox") - self.gridLayout_2 = QtGui.QGridLayout(self.MainFontGroupBox) - self.gridLayout_2.setObjectName("gridLayout_2") + self.MainFontLayout = QtGui.QFormLayout(self.MainFontGroupBox) + self.MainFontLayout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.MainFontLayout.setMargin(8) + self.MainFontLayout.setSpacing(8) + self.MainFontLayout.setObjectName("MainFontLayout") self.MainFontlabel = QtGui.QLabel(self.MainFontGroupBox) self.MainFontlabel.setObjectName("MainFontlabel") - self.gridLayout_2.addWidget(self.MainFontlabel, 0, 0, 1, 1) + self.MainFontLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.MainFontlabel) self.MainFontComboBox = QtGui.QFontComboBox(self.MainFontGroupBox) self.MainFontComboBox.setObjectName("MainFontComboBox") - self.gridLayout_2.addWidget(self.MainFontComboBox, 0, 1, 1, 2) + self.MainFontLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.MainFontComboBox) self.MainFontColorLabel = QtGui.QLabel(self.MainFontGroupBox) self.MainFontColorLabel.setObjectName("MainFontColorLabel") - self.gridLayout_2.addWidget(self.MainFontColorLabel, 1, 0, 1, 1) + self.MainFontLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.MainFontColorLabel) self.MainFontColorPushButton = QtGui.QPushButton(self.MainFontGroupBox) self.MainFontColorPushButton.setObjectName("MainFontColorPushButton") - self.gridLayout_2.addWidget(self.MainFontColorPushButton, 1, 2, 1, 1) + self.MainFontLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.MainFontColorPushButton) self.MainFontSize = QtGui.QLabel(self.MainFontGroupBox) self.MainFontSize.setObjectName("MainFontSize") - self.gridLayout_2.addWidget(self.MainFontSize, 2, 0, 1, 1) - self.MainFontSizeLineEdit = QtGui.QLineEdit(self.MainFontGroupBox) - self.MainFontSizeLineEdit.setObjectName("MainFontSizeLineEdit") - self.gridLayout_2.addWidget(self.MainFontSizeLineEdit, 2, 1, 1, 1) - self.MainFontlSlider = QtGui.QSlider(self.MainFontGroupBox) - self.MainFontlSlider.setProperty("value", QtCore.QVariant(15)) - self.MainFontlSlider.setMaximum(40) - self.MainFontlSlider.setOrientation(QtCore.Qt.Horizontal) - self.MainFontlSlider.setTickPosition(QtGui.QSlider.TicksBelow) - self.MainFontlSlider.setTickInterval(5) - self.MainFontlSlider.setObjectName("MainFontlSlider") - self.gridLayout_2.addWidget(self.MainFontlSlider, 2, 2, 1, 1) - self.FooterFontGroupBox = QtGui.QGroupBox(self.FontMainTab) - self.FooterFontGroupBox.setGeometry(QtCore.QRect(20, 160, 301, 190)) - self.FooterFontGroupBox.setObjectName("FooterFontGroupBox") - self.verticalLayout = QtGui.QVBoxLayout(self.FooterFontGroupBox) - self.verticalLayout.setObjectName("verticalLayout") - self.FontMainUseDefault = QtGui.QCheckBox(self.FooterFontGroupBox) + self.MainFontLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.MainFontSize) + self.MainFontSizeSpinBox = QtGui.QSpinBox(self.MainFontGroupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.MainFontSizeSpinBox.sizePolicy().hasHeightForWidth()) + self.MainFontSizeSpinBox.setSizePolicy(sizePolicy) + self.MainFontSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0)) + self.MainFontSizeSpinBox.setMaximum(999) + self.MainFontSizeSpinBox.setProperty("value", QtCore.QVariant(16)) + self.MainFontSizeSpinBox.setObjectName("MainFontSizeSpinBox") + self.MainFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.MainFontSizeSpinBox) + self.MainLeftLayout.addWidget(self.MainFontGroupBox) + spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.MainLeftLayout.addItem(spacerItem1) + self.FontMainLayout.addWidget(self.MainLeftWidget) + self.MainRightWidget = QtGui.QWidget(self.FontMainTab) + self.MainRightWidget.setObjectName("MainRightWidget") + self.MainRightLayout = QtGui.QVBoxLayout(self.MainRightWidget) + self.MainRightLayout.setSpacing(8) + self.MainRightLayout.setMargin(0) + self.MainRightLayout.setObjectName("MainRightLayout") + self.MainLocationGroupBox = QtGui.QGroupBox(self.MainRightWidget) + self.MainLocationGroupBox.setObjectName("MainLocationGroupBox") + self.MainLocationLayout = QtGui.QFormLayout(self.MainLocationGroupBox) + self.MainLocationLayout.setMargin(8) + self.MainLocationLayout.setSpacing(8) + self.MainLocationLayout.setObjectName("MainLocationLayout") + self.DefaultLocationLabel = QtGui.QLabel(self.MainLocationGroupBox) + self.DefaultLocationLabel.setObjectName("DefaultLocationLabel") + self.MainLocationLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.DefaultLocationLabel) + self.FontMainUseDefault = QtGui.QCheckBox(self.MainLocationGroupBox) self.FontMainUseDefault.setTristate(False) self.FontMainUseDefault.setObjectName("FontMainUseDefault") - self.verticalLayout.addWidget(self.FontMainUseDefault) - self.horizontalLayout_3 = QtGui.QHBoxLayout() - self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.FontMainXLabel = QtGui.QLabel(self.FooterFontGroupBox) + self.MainLocationLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.FontMainUseDefault) + self.FontMainXLabel = QtGui.QLabel(self.MainLocationGroupBox) self.FontMainXLabel.setObjectName("FontMainXLabel") - self.horizontalLayout_3.addWidget(self.FontMainXLabel) - self.FontMainXEdit = QtGui.QLineEdit(self.FooterFontGroupBox) - self.FontMainXEdit.setObjectName("FontMainXEdit") - self.horizontalLayout_3.addWidget(self.FontMainXEdit) - self.verticalLayout.addLayout(self.horizontalLayout_3) - self.horizontalLayout_4 = QtGui.QHBoxLayout() - self.horizontalLayout_4.setObjectName("horizontalLayout_4") - self.FontMainYLabel = QtGui.QLabel(self.FooterFontGroupBox) + self.MainLocationLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.FontMainXLabel) + self.FontMainYLabel = QtGui.QLabel(self.MainLocationGroupBox) self.FontMainYLabel.setObjectName("FontMainYLabel") - self.horizontalLayout_4.addWidget(self.FontMainYLabel) - self.FontMainYEdit = QtGui.QLineEdit(self.FooterFontGroupBox) - self.FontMainYEdit.setObjectName("FontMainYEdit") - self.horizontalLayout_4.addWidget(self.FontMainYEdit) - self.verticalLayout.addLayout(self.horizontalLayout_4) - self.horizontalLayout_5 = QtGui.QHBoxLayout() - self.horizontalLayout_5.setObjectName("horizontalLayout_5") - self.FontMainWidthLabel = QtGui.QLabel(self.FooterFontGroupBox) + self.MainLocationLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.FontMainYLabel) + self.FontMainWidthLabel = QtGui.QLabel(self.MainLocationGroupBox) self.FontMainWidthLabel.setObjectName("FontMainWidthLabel") - self.horizontalLayout_5.addWidget(self.FontMainWidthLabel) - self.FontMainWidthEdit = QtGui.QLineEdit(self.FooterFontGroupBox) - self.FontMainWidthEdit.setObjectName("FontMainWidthEdit") - self.horizontalLayout_5.addWidget(self.FontMainWidthEdit) - self.verticalLayout.addLayout(self.horizontalLayout_5) - self.horizontalLayout_6 = QtGui.QHBoxLayout() - self.horizontalLayout_6.setObjectName("horizontalLayout_6") - self.FontMainHeightLabel = QtGui.QLabel(self.FooterFontGroupBox) + self.MainLocationLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.FontMainWidthLabel) + self.FontMainHeightLabel = QtGui.QLabel(self.MainLocationGroupBox) self.FontMainHeightLabel.setObjectName("FontMainHeightLabel") - self.horizontalLayout_6.addWidget(self.FontMainHeightLabel) - self.FontMainHeightEdit = QtGui.QLineEdit(self.FooterFontGroupBox) - self.FontMainHeightEdit.setObjectName("FontMainHeightEdit") - self.horizontalLayout_6.addWidget(self.FontMainHeightEdit) - self.verticalLayout.addLayout(self.horizontalLayout_6) - self.tabWidget.addTab(self.FontMainTab, "") + self.MainLocationLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.FontMainHeightLabel) + self.FontMainXSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.FontMainXSpinBox.sizePolicy().hasHeightForWidth()) + self.FontMainXSpinBox.setSizePolicy(sizePolicy) + self.FontMainXSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.FontMainXSpinBox.setMaximum(9999) + self.FontMainXSpinBox.setProperty("value", QtCore.QVariant(0)) + self.FontMainXSpinBox.setObjectName("FontMainXSpinBox") + self.MainLocationLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.FontMainXSpinBox) + self.FontMainYSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.FontMainYSpinBox.sizePolicy().hasHeightForWidth()) + self.FontMainYSpinBox.setSizePolicy(sizePolicy) + self.FontMainYSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.FontMainYSpinBox.setMaximum(9999) + self.FontMainYSpinBox.setObjectName("FontMainYSpinBox") + self.MainLocationLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.FontMainYSpinBox) + self.FontMainWidthSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.FontMainWidthSpinBox.sizePolicy().hasHeightForWidth()) + self.FontMainWidthSpinBox.setSizePolicy(sizePolicy) + self.FontMainWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.FontMainWidthSpinBox.setMaximum(9999) + self.FontMainWidthSpinBox.setObjectName("FontMainWidthSpinBox") + self.MainLocationLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.FontMainWidthSpinBox) + self.FontMainHeightSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.FontMainHeightSpinBox.sizePolicy().hasHeightForWidth()) + self.FontMainHeightSpinBox.setSizePolicy(sizePolicy) + self.FontMainHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.FontMainHeightSpinBox.setMaximum(9999) + self.FontMainHeightSpinBox.setObjectName("FontMainHeightSpinBox") + self.MainLocationLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.FontMainHeightSpinBox) + self.MainRightLayout.addWidget(self.MainLocationGroupBox) + spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.MainRightLayout.addItem(spacerItem2) + self.FontMainLayout.addWidget(self.MainRightWidget) + self.ThemeTabWidget.addTab(self.FontMainTab, "") self.FontFooterTab = QtGui.QWidget() self.FontFooterTab.setObjectName("FontFooterTab") - self.FooterFontGroupBox_2 = QtGui.QGroupBox(self.FontFooterTab) - self.FooterFontGroupBox_2.setGeometry(QtCore.QRect(20, 160, 301, 190)) - self.FooterFontGroupBox_2.setObjectName("FooterFontGroupBox_2") - self.verticalLayout_2 = QtGui.QVBoxLayout(self.FooterFontGroupBox_2) - self.verticalLayout_2.setObjectName("verticalLayout_2") - self.FontMainUseDefault_2 = QtGui.QCheckBox(self.FooterFontGroupBox_2) - self.FontMainUseDefault_2.setTristate(False) - self.FontMainUseDefault_2.setObjectName("FontMainUseDefault_2") - self.verticalLayout_2.addWidget(self.FontMainUseDefault_2) - self.horizontalLayout_7 = QtGui.QHBoxLayout() - self.horizontalLayout_7.setObjectName("horizontalLayout_7") - self.FontFooterXLabel = QtGui.QLabel(self.FooterFontGroupBox_2) - self.FontFooterXLabel.setObjectName("FontFooterXLabel") - self.horizontalLayout_7.addWidget(self.FontFooterXLabel) - self.FontFooterXEdit = QtGui.QLineEdit(self.FooterFontGroupBox_2) - self.FontFooterXEdit.setObjectName("FontFooterXEdit") - self.horizontalLayout_7.addWidget(self.FontFooterXEdit) - self.verticalLayout_2.addLayout(self.horizontalLayout_7) - self.horizontalLayout_8 = QtGui.QHBoxLayout() - self.horizontalLayout_8.setObjectName("horizontalLayout_8") - self.FontFooterYLabel = QtGui.QLabel(self.FooterFontGroupBox_2) - self.FontFooterYLabel.setObjectName("FontFooterYLabel") - self.horizontalLayout_8.addWidget(self.FontFooterYLabel) - self.FontFooterYEdit = QtGui.QLineEdit(self.FooterFontGroupBox_2) - self.FontFooterYEdit.setObjectName("FontFooterYEdit") - self.horizontalLayout_8.addWidget(self.FontFooterYEdit) - self.verticalLayout_2.addLayout(self.horizontalLayout_8) - self.horizontalLayout_9 = QtGui.QHBoxLayout() - self.horizontalLayout_9.setObjectName("horizontalLayout_9") - self.FontFooterWidthLabel = QtGui.QLabel(self.FooterFontGroupBox_2) - self.FontFooterWidthLabel.setObjectName("FontFooterWidthLabel") - self.horizontalLayout_9.addWidget(self.FontFooterWidthLabel) - self.FontFooterWidthEdit = QtGui.QLineEdit(self.FooterFontGroupBox_2) - self.FontFooterWidthEdit.setObjectName("FontFooterWidthEdit") - self.horizontalLayout_9.addWidget(self.FontFooterWidthEdit) - self.verticalLayout_2.addLayout(self.horizontalLayout_9) - self.horizontalLayout_10 = QtGui.QHBoxLayout() - self.horizontalLayout_10.setObjectName("horizontalLayout_10") - self.FontFooterHeightLabel = QtGui.QLabel(self.FooterFontGroupBox_2) - self.FontFooterHeightLabel.setObjectName("FontFooterHeightLabel") - self.horizontalLayout_10.addWidget(self.FontFooterHeightLabel) - self.FontFooterHeightEdit = QtGui.QLineEdit(self.FooterFontGroupBox_2) - self.FontFooterHeightEdit.setObjectName("FontFooterHeightEdit") - self.horizontalLayout_10.addWidget(self.FontFooterHeightEdit) - self.verticalLayout_2.addLayout(self.horizontalLayout_10) - self.FooterFontGroupBox_3 = QtGui.QGroupBox(self.FontFooterTab) - self.FooterFontGroupBox_3.setGeometry(QtCore.QRect(20, 10, 307, 119)) - self.FooterFontGroupBox_3.setObjectName("FooterFontGroupBox_3") - self.gridLayout_3 = QtGui.QGridLayout(self.FooterFontGroupBox_3) - self.gridLayout_3.setObjectName("gridLayout_3") - self.FontFooterlabel = QtGui.QLabel(self.FooterFontGroupBox_3) - self.FontFooterlabel.setObjectName("FontFooterlabel") - self.gridLayout_3.addWidget(self.FontFooterlabel, 0, 0, 1, 1) - self.FontFooterComboBox = QtGui.QFontComboBox(self.FooterFontGroupBox_3) + self.FontFooterLayout = QtGui.QHBoxLayout(self.FontFooterTab) + self.FontFooterLayout.setSpacing(8) + self.FontFooterLayout.setMargin(8) + self.FontFooterLayout.setObjectName("FontFooterLayout") + self.FooterLeftWidget = QtGui.QWidget(self.FontFooterTab) + self.FooterLeftWidget.setObjectName("FooterLeftWidget") + self.FooterLeftLayout = QtGui.QVBoxLayout(self.FooterLeftWidget) + self.FooterLeftLayout.setSpacing(8) + self.FooterLeftLayout.setMargin(0) + self.FooterLeftLayout.setObjectName("FooterLeftLayout") + self.FooterFontGroupBox = QtGui.QGroupBox(self.FooterLeftWidget) + self.FooterFontGroupBox.setObjectName("FooterFontGroupBox") + self.FooterFontLayout = QtGui.QFormLayout(self.FooterFontGroupBox) + self.FooterFontLayout.setFieldGrowthPolicy(QtGui.QFormLayout.ExpandingFieldsGrow) + self.FooterFontLayout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.FooterFontLayout.setMargin(8) + self.FooterFontLayout.setSpacing(8) + self.FooterFontLayout.setObjectName("FooterFontLayout") + self.FontFooterLabel = QtGui.QLabel(self.FooterFontGroupBox) + self.FontFooterLabel.setObjectName("FontFooterLabel") + self.FooterFontLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.FontFooterLabel) + self.FontFooterComboBox = QtGui.QFontComboBox(self.FooterFontGroupBox) self.FontFooterComboBox.setObjectName("FontFooterComboBox") - self.gridLayout_3.addWidget(self.FontFooterComboBox, 0, 1, 1, 2) - self.FontFooterColorLabel = QtGui.QLabel(self.FooterFontGroupBox_3) + self.FooterFontLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.FontFooterComboBox) + self.FontFooterColorLabel = QtGui.QLabel(self.FooterFontGroupBox) self.FontFooterColorLabel.setObjectName("FontFooterColorLabel") - self.gridLayout_3.addWidget(self.FontFooterColorLabel, 1, 0, 1, 1) - self.FontFooterColorPushButton = QtGui.QPushButton(self.FooterFontGroupBox_3) + self.FooterFontLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.FontFooterColorLabel) + self.FontFooterColorPushButton = QtGui.QPushButton(self.FooterFontGroupBox) self.FontFooterColorPushButton.setObjectName("FontFooterColorPushButton") - self.gridLayout_3.addWidget(self.FontFooterColorPushButton, 1, 2, 1, 1) - self.FontFooterSizeLabel = QtGui.QLabel(self.FooterFontGroupBox_3) + self.FooterFontLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.FontFooterColorPushButton) + self.FontFooterSizeLabel = QtGui.QLabel(self.FooterFontGroupBox) self.FontFooterSizeLabel.setObjectName("FontFooterSizeLabel") - self.gridLayout_3.addWidget(self.FontFooterSizeLabel, 2, 0, 1, 1) - self.FontFooterSizeLineEdit = QtGui.QLineEdit(self.FooterFontGroupBox_3) - self.FontFooterSizeLineEdit.setObjectName("FontFooterSizeLineEdit") - self.gridLayout_3.addWidget(self.FontFooterSizeLineEdit, 2, 1, 1, 1) - self.FontFooterSlider = QtGui.QSlider(self.FooterFontGroupBox_3) - self.FontFooterSlider.setProperty("value", QtCore.QVariant(15)) - self.FontFooterSlider.setMaximum(40) - self.FontFooterSlider.setOrientation(QtCore.Qt.Horizontal) - self.FontFooterSlider.setTickPosition(QtGui.QSlider.TicksBelow) - self.FontFooterSlider.setTickInterval(5) - self.FontFooterSlider.setObjectName("FontFooterSlider") - self.gridLayout_3.addWidget(self.FontFooterSlider, 2, 2, 1, 1) - self.tabWidget.addTab(self.FontFooterTab, "") - self.OptionsTab = QtGui.QWidget() - self.OptionsTab.setObjectName("OptionsTab") - self.ShadowGroupBox = QtGui.QGroupBox(self.OptionsTab) - self.ShadowGroupBox.setGeometry(QtCore.QRect(20, 10, 301, 80)) + self.FooterFontLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.FontFooterSizeLabel) + self.FontFooterSizeSpinBox = QtGui.QSpinBox(self.FooterFontGroupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.FontFooterSizeSpinBox.sizePolicy().hasHeightForWidth()) + self.FontFooterSizeSpinBox.setSizePolicy(sizePolicy) + self.FontFooterSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0)) + self.FontFooterSizeSpinBox.setMaximum(999) + self.FontFooterSizeSpinBox.setProperty("value", QtCore.QVariant(10)) + self.FontFooterSizeSpinBox.setObjectName("FontFooterSizeSpinBox") + self.FooterFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.FontFooterSizeSpinBox) + self.FooterLeftLayout.addWidget(self.FooterFontGroupBox) + spacerItem3 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.FooterLeftLayout.addItem(spacerItem3) + self.FontFooterLayout.addWidget(self.FooterLeftWidget) + self.FooterRightWidget = QtGui.QWidget(self.FontFooterTab) + self.FooterRightWidget.setObjectName("FooterRightWidget") + self.FooterRightLayout = QtGui.QVBoxLayout(self.FooterRightWidget) + self.FooterRightLayout.setSpacing(8) + self.FooterRightLayout.setMargin(0) + self.FooterRightLayout.setObjectName("FooterRightLayout") + self.LocationFooterGroupBox = QtGui.QGroupBox(self.FooterRightWidget) + self.LocationFooterGroupBox.setObjectName("LocationFooterGroupBox") + self.LocationFooterLayout = QtGui.QFormLayout(self.LocationFooterGroupBox) + self.LocationFooterLayout.setFieldGrowthPolicy(QtGui.QFormLayout.ExpandingFieldsGrow) + self.LocationFooterLayout.setFormAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) + self.LocationFooterLayout.setMargin(8) + self.LocationFooterLayout.setSpacing(8) + self.LocationFooterLayout.setObjectName("LocationFooterLayout") + self.FontFooterDefaultLabel = QtGui.QLabel(self.LocationFooterGroupBox) + self.FontFooterDefaultLabel.setObjectName("FontFooterDefaultLabel") + self.LocationFooterLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.FontFooterDefaultLabel) + self.FontFooterDefaultCheckBox = QtGui.QCheckBox(self.LocationFooterGroupBox) + self.FontFooterDefaultCheckBox.setTristate(False) + self.FontFooterDefaultCheckBox.setObjectName("FontFooterDefaultCheckBox") + self.LocationFooterLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.FontFooterDefaultCheckBox) + self.FontFooterXLabel = QtGui.QLabel(self.LocationFooterGroupBox) + self.FontFooterXLabel.setObjectName("FontFooterXLabel") + self.LocationFooterLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.FontFooterXLabel) + self.FontFooterYLabel = QtGui.QLabel(self.LocationFooterGroupBox) + self.FontFooterYLabel.setObjectName("FontFooterYLabel") + self.LocationFooterLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.FontFooterYLabel) + self.FontFooterWidthLabel = QtGui.QLabel(self.LocationFooterGroupBox) + self.FontFooterWidthLabel.setObjectName("FontFooterWidthLabel") + self.LocationFooterLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.FontFooterWidthLabel) + self.FontFooterHeightLabel = QtGui.QLabel(self.LocationFooterGroupBox) + self.FontFooterHeightLabel.setObjectName("FontFooterHeightLabel") + self.LocationFooterLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.FontFooterHeightLabel) + self.FontFooterXSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.FontFooterXSpinBox.sizePolicy().hasHeightForWidth()) + self.FontFooterXSpinBox.setSizePolicy(sizePolicy) + self.FontFooterXSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.FontFooterXSpinBox.setMaximum(9999) + self.FontFooterXSpinBox.setProperty("value", QtCore.QVariant(0)) + self.FontFooterXSpinBox.setObjectName("FontFooterXSpinBox") + self.LocationFooterLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.FontFooterXSpinBox) + self.FontFooterYSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.FontFooterYSpinBox.sizePolicy().hasHeightForWidth()) + self.FontFooterYSpinBox.setSizePolicy(sizePolicy) + self.FontFooterYSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.FontFooterYSpinBox.setMaximum(9999) + self.FontFooterYSpinBox.setProperty("value", QtCore.QVariant(0)) + self.FontFooterYSpinBox.setObjectName("FontFooterYSpinBox") + self.LocationFooterLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.FontFooterYSpinBox) + self.FontFooterWidthspinBox = QtGui.QSpinBox(self.LocationFooterGroupBox) + self.FontFooterWidthspinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.FontFooterWidthspinBox.setMaximum(9999) + self.FontFooterWidthspinBox.setObjectName("FontFooterWidthspinBox") + self.LocationFooterLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.FontFooterWidthspinBox) + self.FontFooterHeightSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox) + self.FontFooterHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.FontFooterHeightSpinBox.setMaximum(9999) + self.FontFooterHeightSpinBox.setObjectName("FontFooterHeightSpinBox") + self.LocationFooterLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.FontFooterHeightSpinBox) + self.FooterRightLayout.addWidget(self.LocationFooterGroupBox) + spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.FooterRightLayout.addItem(spacerItem4) + self.FontFooterLayout.addWidget(self.FooterRightWidget) + self.ThemeTabWidget.addTab(self.FontFooterTab, "") + self.OtherOptionsTab = QtGui.QWidget() + self.OtherOptionsTab.setObjectName("OtherOptionsTab") + self.OtherOptionsLayout = QtGui.QHBoxLayout(self.OtherOptionsTab) + self.OtherOptionsLayout.setSpacing(8) + self.OtherOptionsLayout.setMargin(8) + self.OtherOptionsLayout.setObjectName("OtherOptionsLayout") + self.OptionsLeftWidget = QtGui.QWidget(self.OtherOptionsTab) + self.OptionsLeftWidget.setObjectName("OptionsLeftWidget") + self.OptionsLeftLayout = QtGui.QVBoxLayout(self.OptionsLeftWidget) + self.OptionsLeftLayout.setSpacing(8) + self.OptionsLeftLayout.setMargin(0) + self.OptionsLeftLayout.setObjectName("OptionsLeftLayout") + self.ShadowGroupBox = QtGui.QGroupBox(self.OptionsLeftWidget) self.ShadowGroupBox.setObjectName("ShadowGroupBox") - self.layoutWidget2 = QtGui.QWidget(self.ShadowGroupBox) - self.layoutWidget2.setGeometry(QtCore.QRect(10, 20, 281, 58)) - self.layoutWidget2.setObjectName("layoutWidget2") - self.formLayout = QtGui.QFormLayout(self.layoutWidget2) - self.formLayout.setObjectName("formLayout") - self.ShadowCheckBox = QtGui.QCheckBox(self.layoutWidget2) + self.verticalLayout = QtGui.QVBoxLayout(self.ShadowGroupBox) + self.verticalLayout.setSpacing(8) + self.verticalLayout.setMargin(8) + self.verticalLayout.setObjectName("verticalLayout") + self.OutlineWidget = QtGui.QWidget(self.ShadowGroupBox) + self.OutlineWidget.setObjectName("OutlineWidget") + self.OutlineLayout = QtGui.QFormLayout(self.OutlineWidget) + self.OutlineLayout.setMargin(0) + self.OutlineLayout.setSpacing(8) + self.OutlineLayout.setObjectName("OutlineLayout") + self.OutlineCheckBox = QtGui.QCheckBox(self.OutlineWidget) + self.OutlineCheckBox.setObjectName("OutlineCheckBox") + self.OutlineLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.OutlineCheckBox) + self.OutlineColorLabel = QtGui.QLabel(self.OutlineWidget) + self.OutlineColorLabel.setObjectName("OutlineColorLabel") + self.OutlineLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.OutlineColorLabel) + self.OutlineColorPushButton = QtGui.QPushButton(self.OutlineWidget) + self.OutlineColorPushButton.setObjectName("OutlineColorPushButton") + self.OutlineLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.OutlineColorPushButton) + self.OutlineEnabledLabel = QtGui.QLabel(self.OutlineWidget) + self.OutlineEnabledLabel.setObjectName("OutlineEnabledLabel") + self.OutlineLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.OutlineEnabledLabel) + self.verticalLayout.addWidget(self.OutlineWidget) + self.ShadowWidget = QtGui.QWidget(self.ShadowGroupBox) + self.ShadowWidget.setObjectName("ShadowWidget") + self.ShadowLayout = QtGui.QFormLayout(self.ShadowWidget) + self.ShadowLayout.setMargin(0) + self.ShadowLayout.setSpacing(8) + self.ShadowLayout.setObjectName("ShadowLayout") + self.ShadowCheckBox = QtGui.QCheckBox(self.ShadowWidget) self.ShadowCheckBox.setObjectName("ShadowCheckBox") - self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.ShadowCheckBox) - self.ShadowColorLabel = QtGui.QLabel(self.layoutWidget2) + self.ShadowLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.ShadowCheckBox) + self.ShadowColorLabel = QtGui.QLabel(self.ShadowWidget) self.ShadowColorLabel.setObjectName("ShadowColorLabel") - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.ShadowColorLabel) - self.ShadowColorPushButton = QtGui.QPushButton(self.layoutWidget2) + self.ShadowLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.ShadowColorLabel) + self.ShadowColorPushButton = QtGui.QPushButton(self.ShadowWidget) self.ShadowColorPushButton.setObjectName("ShadowColorPushButton") - self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.ShadowColorPushButton) - self.AlignmentGroupBox = QtGui.QGroupBox(self.OptionsTab) - self.AlignmentGroupBox.setGeometry(QtCore.QRect(10, 200, 321, 161)) + self.ShadowLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.ShadowColorPushButton) + self.ShadowEnabledLabel = QtGui.QLabel(self.ShadowWidget) + self.ShadowEnabledLabel.setObjectName("ShadowEnabledLabel") + self.ShadowLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.ShadowEnabledLabel) + self.verticalLayout.addWidget(self.ShadowWidget) + self.OptionsLeftLayout.addWidget(self.ShadowGroupBox) + spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.OptionsLeftLayout.addItem(spacerItem5) + self.OtherOptionsLayout.addWidget(self.OptionsLeftWidget) + self.OptionsRightWidget = QtGui.QWidget(self.OtherOptionsTab) + self.OptionsRightWidget.setObjectName("OptionsRightWidget") + self.OptionsRightLayout = QtGui.QVBoxLayout(self.OptionsRightWidget) + self.OptionsRightLayout.setSpacing(8) + self.OptionsRightLayout.setMargin(0) + self.OptionsRightLayout.setObjectName("OptionsRightLayout") + self.AlignmentGroupBox = QtGui.QGroupBox(self.OptionsRightWidget) self.AlignmentGroupBox.setObjectName("AlignmentGroupBox") self.gridLayout_4 = QtGui.QGridLayout(self.AlignmentGroupBox) self.gridLayout_4.setObjectName("gridLayout_4") @@ -299,43 +443,82 @@ class Ui_AmendThemeDialog(object): self.VerticalComboBox.addItem(QtCore.QString()) self.VerticalComboBox.addItem(QtCore.QString()) self.gridLayout_4.addWidget(self.VerticalComboBox, 1, 1, 1, 1) - self.OutlineGroupBox = QtGui.QGroupBox(self.OptionsTab) - self.OutlineGroupBox.setGeometry(QtCore.QRect(20, 110, 301, 80)) - self.OutlineGroupBox.setObjectName("OutlineGroupBox") - self.layoutWidget_3 = QtGui.QWidget(self.OutlineGroupBox) - self.layoutWidget_3.setGeometry(QtCore.QRect(10, 20, 281, 58)) - self.layoutWidget_3.setObjectName("layoutWidget_3") - self.OutlineformLayout = QtGui.QFormLayout(self.layoutWidget_3) - self.OutlineformLayout.setObjectName("OutlineformLayout") - self.OutlineCheckBox = QtGui.QCheckBox(self.layoutWidget_3) - self.OutlineCheckBox.setObjectName("OutlineCheckBox") - self.OutlineformLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.OutlineCheckBox) - self.OutlineColorLabel = QtGui.QLabel(self.layoutWidget_3) - self.OutlineColorLabel.setObjectName("OutlineColorLabel") - self.OutlineformLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.OutlineColorLabel) - self.OutlineColorPushButton = QtGui.QPushButton(self.layoutWidget_3) - self.OutlineColorPushButton.setObjectName("OutlineColorPushButton") - self.OutlineformLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.OutlineColorPushButton) - self.tabWidget.addTab(self.OptionsTab, "") - self.horizontalLayout_2.addWidget(self.LeftSide) - self.RightSide = QtGui.QWidget(self.widget) - self.RightSide.setObjectName("RightSide") - self.ThemePreview = QtGui.QLabel(self.RightSide) - self.ThemePreview.setGeometry(QtCore.QRect(20, 60, 311, 271)) - self.ThemePreview.setFrameShape(QtGui.QFrame.Box) - self.ThemePreview.setFrameShadow(QtGui.QFrame.Raised) - self.ThemePreview.setLineWidth(2) + self.OptionsRightLayout.addWidget(self.AlignmentGroupBox) + spacerItem6 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.OptionsRightLayout.addItem(spacerItem6) + self.OtherOptionsLayout.addWidget(self.OptionsRightWidget) + self.ThemeTabWidget.addTab(self.OtherOptionsTab, "") + self.ContentLayout.addWidget(self.ThemeTabWidget) + self.AmendThemeLayout.addWidget(self.ContentWidget) + self.PreviewGroupBox = QtGui.QGroupBox(AmendThemeDialog) + self.PreviewGroupBox.setObjectName("PreviewGroupBox") + self.ThemePreviewLayout = QtGui.QHBoxLayout(self.PreviewGroupBox) + self.ThemePreviewLayout.setSpacing(8) + self.ThemePreviewLayout.setMargin(8) + self.ThemePreviewLayout.setObjectName("ThemePreviewLayout") + spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.ThemePreviewLayout.addItem(spacerItem7) + self.ThemePreview = QtGui.QLabel(self.PreviewGroupBox) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.ThemePreview.sizePolicy().hasHeightForWidth()) + self.ThemePreview.setSizePolicy(sizePolicy) + self.ThemePreview.setMinimumSize(QtCore.QSize(300, 225)) + self.ThemePreview.setFrameShape(QtGui.QFrame.WinPanel) + self.ThemePreview.setFrameShadow(QtGui.QFrame.Sunken) + self.ThemePreview.setLineWidth(1) self.ThemePreview.setScaledContents(True) self.ThemePreview.setObjectName("ThemePreview") - self.horizontalLayout_2.addWidget(self.RightSide) + self.ThemePreviewLayout.addWidget(self.ThemePreview) + spacerItem8 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.ThemePreviewLayout.addItem(spacerItem8) + self.AmendThemeLayout.addWidget(self.PreviewGroupBox) + self.ThemeButtonBox = QtGui.QDialogButtonBox(AmendThemeDialog) + self.ThemeButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) + self.ThemeButtonBox.setObjectName("ThemeButtonBox") + self.AmendThemeLayout.addWidget(self.ThemeButtonBox) self.retranslateUi(AmendThemeDialog) - self.tabWidget.setCurrentIndex(0) + self.ThemeTabWidget.setCurrentIndex(0) + QtCore.QObject.connect(self.ThemeButtonBox, QtCore.SIGNAL("accepted()"), AmendThemeDialog.accept) + QtCore.QObject.connect(self.ThemeButtonBox, QtCore.SIGNAL("rejected()"), AmendThemeDialog.reject) QtCore.QMetaObject.connectSlotsByName(AmendThemeDialog) + AmendThemeDialog.setTabOrder(self.ThemeButtonBox, self.ThemeNameEdit) + AmendThemeDialog.setTabOrder(self.ThemeNameEdit, self.ThemeTabWidget) + AmendThemeDialog.setTabOrder(self.ThemeTabWidget, self.BackgroundComboBox) + AmendThemeDialog.setTabOrder(self.BackgroundComboBox, self.BackgroundTypeComboBox) + AmendThemeDialog.setTabOrder(self.BackgroundTypeComboBox, self.Color1PushButton) + AmendThemeDialog.setTabOrder(self.Color1PushButton, self.Color2PushButton) + AmendThemeDialog.setTabOrder(self.Color2PushButton, self.ImageLineEdit) + AmendThemeDialog.setTabOrder(self.ImageLineEdit, self.ImageToolButton) + AmendThemeDialog.setTabOrder(self.ImageToolButton, self.GradientComboBox) + AmendThemeDialog.setTabOrder(self.GradientComboBox, self.MainFontComboBox) + AmendThemeDialog.setTabOrder(self.MainFontComboBox, self.MainFontColorPushButton) + AmendThemeDialog.setTabOrder(self.MainFontColorPushButton, self.MainFontSizeSpinBox) + AmendThemeDialog.setTabOrder(self.MainFontSizeSpinBox, self.FontMainUseDefault) + AmendThemeDialog.setTabOrder(self.FontMainUseDefault, self.FontMainXSpinBox) + AmendThemeDialog.setTabOrder(self.FontMainXSpinBox, self.FontMainYSpinBox) + AmendThemeDialog.setTabOrder(self.FontMainYSpinBox, self.FontMainWidthSpinBox) + AmendThemeDialog.setTabOrder(self.FontMainWidthSpinBox, self.FontMainHeightSpinBox) + AmendThemeDialog.setTabOrder(self.FontMainHeightSpinBox, self.FontFooterComboBox) + AmendThemeDialog.setTabOrder(self.FontFooterComboBox, self.FontFooterColorPushButton) + AmendThemeDialog.setTabOrder(self.FontFooterColorPushButton, self.FontFooterSizeSpinBox) + AmendThemeDialog.setTabOrder(self.FontFooterSizeSpinBox, self.FontFooterDefaultCheckBox) + AmendThemeDialog.setTabOrder(self.FontFooterDefaultCheckBox, self.FontFooterXSpinBox) + AmendThemeDialog.setTabOrder(self.FontFooterXSpinBox, self.FontFooterYSpinBox) + AmendThemeDialog.setTabOrder(self.FontFooterYSpinBox, self.FontFooterWidthspinBox) + AmendThemeDialog.setTabOrder(self.FontFooterWidthspinBox, self.FontFooterHeightSpinBox) + AmendThemeDialog.setTabOrder(self.FontFooterHeightSpinBox, self.OutlineCheckBox) + AmendThemeDialog.setTabOrder(self.OutlineCheckBox, self.OutlineColorPushButton) + AmendThemeDialog.setTabOrder(self.OutlineColorPushButton, self.ShadowCheckBox) + AmendThemeDialog.setTabOrder(self.ShadowCheckBox, self.ShadowColorPushButton) + AmendThemeDialog.setTabOrder(self.ShadowColorPushButton, self.HorizontalComboBox) + AmendThemeDialog.setTabOrder(self.HorizontalComboBox, self.VerticalComboBox) def retranslateUi(self, AmendThemeDialog): AmendThemeDialog.setWindowTitle(QtGui.QApplication.translate("AmendThemeDialog", "Theme Maintance", None, QtGui.QApplication.UnicodeUTF8)) - self.ThemeNameLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Theme Name", None, QtGui.QApplication.UnicodeUTF8)) + self.ThemeNameLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Theme Name:", None, QtGui.QApplication.UnicodeUTF8)) self.BackgroundLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Background:", None, QtGui.QApplication.UnicodeUTF8)) self.BackgroundComboBox.setItemText(0, QtGui.QApplication.translate("AmendThemeDialog", "Opaque", None, QtGui.QApplication.UnicodeUTF8)) self.BackgroundComboBox.setItemText(1, QtGui.QApplication.translate("AmendThemeDialog", "Transparent", None, QtGui.QApplication.UnicodeUTF8)) @@ -350,32 +533,44 @@ class Ui_AmendThemeDialog(object): self.GradientComboBox.setItemText(0, QtGui.QApplication.translate("AmendThemeDialog", "Horizontal", None, QtGui.QApplication.UnicodeUTF8)) self.GradientComboBox.setItemText(1, QtGui.QApplication.translate("AmendThemeDialog", "Vertical", None, QtGui.QApplication.UnicodeUTF8)) self.GradientComboBox.setItemText(2, QtGui.QApplication.translate("AmendThemeDialog", "Circular", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.BackgroundTab), QtGui.QApplication.translate("AmendThemeDialog", "Background", None, QtGui.QApplication.UnicodeUTF8)) + self.ThemeTabWidget.setTabText(self.ThemeTabWidget.indexOf(self.BackgroundTab), QtGui.QApplication.translate("AmendThemeDialog", "Background", None, QtGui.QApplication.UnicodeUTF8)) self.MainFontGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Main Font", None, QtGui.QApplication.UnicodeUTF8)) self.MainFontlabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font:", None, QtGui.QApplication.UnicodeUTF8)) - self.MainFontColorLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font Color", None, QtGui.QApplication.UnicodeUTF8)) + self.MainFontColorLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font Color:", None, QtGui.QApplication.UnicodeUTF8)) self.MainFontSize.setText(QtGui.QApplication.translate("AmendThemeDialog", "Size:", None, QtGui.QApplication.UnicodeUTF8)) - self.FooterFontGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Display Location", None, QtGui.QApplication.UnicodeUTF8)) - self.FontMainUseDefault.setText(QtGui.QApplication.translate("AmendThemeDialog", "Use default location", None, QtGui.QApplication.UnicodeUTF8)) + self.MainFontSizeSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "pt", None, QtGui.QApplication.UnicodeUTF8)) + self.MainLocationGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Display Location", None, QtGui.QApplication.UnicodeUTF8)) + self.DefaultLocationLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Use Default Location:", None, QtGui.QApplication.UnicodeUTF8)) self.FontMainXLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "X Position:", None, QtGui.QApplication.UnicodeUTF8)) self.FontMainYLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Y Position:", None, QtGui.QApplication.UnicodeUTF8)) - self.FontMainWidthLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Width", None, QtGui.QApplication.UnicodeUTF8)) - self.FontMainHeightLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Height", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.FontMainTab), QtGui.QApplication.translate("AmendThemeDialog", "Font Main", None, QtGui.QApplication.UnicodeUTF8)) - self.FooterFontGroupBox_2.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Display Location", None, QtGui.QApplication.UnicodeUTF8)) - self.FontMainUseDefault_2.setText(QtGui.QApplication.translate("AmendThemeDialog", "Use default location", None, QtGui.QApplication.UnicodeUTF8)) + self.FontMainWidthLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Width:", None, QtGui.QApplication.UnicodeUTF8)) + self.FontMainHeightLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Height:", None, QtGui.QApplication.UnicodeUTF8)) + self.FontMainXSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.FontMainYSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.FontMainWidthSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.FontMainHeightSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.ThemeTabWidget.setTabText(self.ThemeTabWidget.indexOf(self.FontMainTab), QtGui.QApplication.translate("AmendThemeDialog", "Font Main", None, QtGui.QApplication.UnicodeUTF8)) + self.FooterFontGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Footer Font", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font:", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterColorLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font Color:", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterSizeLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Size:", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterSizeSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "pt", None, QtGui.QApplication.UnicodeUTF8)) + self.LocationFooterGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Display Location", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterDefaultLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Use Default Location:", None, QtGui.QApplication.UnicodeUTF8)) self.FontFooterXLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "X Position:", None, QtGui.QApplication.UnicodeUTF8)) self.FontFooterYLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Y Position:", None, QtGui.QApplication.UnicodeUTF8)) - self.FontFooterWidthLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Width", None, QtGui.QApplication.UnicodeUTF8)) - self.FontFooterHeightLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Height", None, QtGui.QApplication.UnicodeUTF8)) - self.FooterFontGroupBox_3.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Footer Font", None, QtGui.QApplication.UnicodeUTF8)) - self.FontFooterlabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font:", None, QtGui.QApplication.UnicodeUTF8)) - self.FontFooterColorLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Font Color", None, QtGui.QApplication.UnicodeUTF8)) - self.FontFooterSizeLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Size:", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.FontFooterTab), QtGui.QApplication.translate("AmendThemeDialog", "Font Footer", None, QtGui.QApplication.UnicodeUTF8)) - self.ShadowGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Shadow", None, QtGui.QApplication.UnicodeUTF8)) - self.ShadowCheckBox.setText(QtGui.QApplication.translate("AmendThemeDialog", "Use Shadow", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterWidthLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Width:", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterHeightLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Height:", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterXSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterYSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterWidthspinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.FontFooterHeightSpinBox.setSuffix(QtGui.QApplication.translate("AmendThemeDialog", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.ThemeTabWidget.setTabText(self.ThemeTabWidget.indexOf(self.FontFooterTab), QtGui.QApplication.translate("AmendThemeDialog", "Font Footer", None, QtGui.QApplication.UnicodeUTF8)) + self.ShadowGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Shadow && Outline", None, QtGui.QApplication.UnicodeUTF8)) + self.OutlineColorLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Outline Color:", None, QtGui.QApplication.UnicodeUTF8)) + self.OutlineEnabledLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Show Outline:", None, QtGui.QApplication.UnicodeUTF8)) self.ShadowColorLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Shadow Color:", None, QtGui.QApplication.UnicodeUTF8)) + self.ShadowEnabledLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Show Shadow:", None, QtGui.QApplication.UnicodeUTF8)) self.AlignmentGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Alignment", None, QtGui.QApplication.UnicodeUTF8)) self.HorizontalLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Horizontal Align:", None, QtGui.QApplication.UnicodeUTF8)) self.HorizontalComboBox.setItemText(0, QtGui.QApplication.translate("AmendThemeDialog", "Left", None, QtGui.QApplication.UnicodeUTF8)) @@ -385,8 +580,6 @@ class Ui_AmendThemeDialog(object): self.VerticalComboBox.setItemText(0, QtGui.QApplication.translate("AmendThemeDialog", "Top", None, QtGui.QApplication.UnicodeUTF8)) self.VerticalComboBox.setItemText(1, QtGui.QApplication.translate("AmendThemeDialog", "Middle", None, QtGui.QApplication.UnicodeUTF8)) self.VerticalComboBox.setItemText(2, QtGui.QApplication.translate("AmendThemeDialog", "Bottom", None, QtGui.QApplication.UnicodeUTF8)) - self.OutlineGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Outline", None, QtGui.QApplication.UnicodeUTF8)) - self.OutlineCheckBox.setText(QtGui.QApplication.translate("AmendThemeDialog", "Use Outline", None, QtGui.QApplication.UnicodeUTF8)) - self.OutlineColorLabel.setText(QtGui.QApplication.translate("AmendThemeDialog", "Outline Color:", None, QtGui.QApplication.UnicodeUTF8)) - self.tabWidget.setTabText(self.tabWidget.indexOf(self.OptionsTab), QtGui.QApplication.translate("AmendThemeDialog", "Alignment", None, QtGui.QApplication.UnicodeUTF8)) + self.ThemeTabWidget.setTabText(self.ThemeTabWidget.indexOf(self.OtherOptionsTab), QtGui.QApplication.translate("AmendThemeDialog", "Other Options", None, QtGui.QApplication.UnicodeUTF8)) + self.PreviewGroupBox.setTitle(QtGui.QApplication.translate("AmendThemeDialog", "Preview", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index c6cf4ae18..c9322f3b1 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -38,9 +38,6 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.setupUi(self) #define signals - #Exits - QtCore.QObject.connect(self.ThemeButtonBox, QtCore.SIGNAL("accepted()"), self.accept) - QtCore.QObject.connect(self.ThemeButtonBox, QtCore.SIGNAL("rejected()"), self.close) #Buttons QtCore.QObject.connect(self.Color1PushButton , QtCore.SIGNAL("pressed()"), self.onColor1PushButtonClicked) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index a71fe4ae6..21e15f3db 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -245,24 +245,23 @@ class ThemeManager(QWidget): os.mkdir(os.path.join(dir, file)) else: fullpath = os.path.join(dir, file) - if themename is None: - names = file.split(u'/') - themename = names[0] - xml_data = zip.read(file) - if os.path.splitext (file) [1].lower () in [u'.xml']: - if self.checkVersion1(xml_data): - filexml = self.migrateVersion122(filename, fullpath, xml_data) + names = file.split(u'/') + if len(names) > 1: # not preview file + if themename is None: + themename = names[0] + xml_data = zip.read(file) + if os.path.splitext (file) [1].lower () in [u'.xml']: + if self.checkVersion1(xml_data): + filexml = self.migrateVersion122(filename, fullpath, xml_data) + else: + file_xml = xml_data + outfile = open(fullpath, 'w') + outfile.write(filexml) + outfile.close() else: - file_xml = xml_data - outfile = open(fullpath, 'w') - outfile.write(filexml) - outfile.close() - if os.path.splitext (file) [1].lower () in [u'.bmp']: - print os.path.splitext (file) - else: - outfile = open(fullpath, 'w') - outfile.write(zip.read(file)) - outfile.close() + outfile = open(fullpath, 'w') + outfile.write(zip.read(file)) + outfile.close() self.generateImage(dir,themename, filexml) def checkVersion1(self, xmlfile): diff --git a/resources/forms/amendthemedialog.ui b/resources/forms/amendthemedialog.ui index d818a1bb0..febdd98bf 100644 --- a/resources/forms/amendthemedialog.ui +++ b/resources/forms/amendthemedialog.ui @@ -1,729 +1,1201 @@ - - + AmendThemeDialog - - + + + Qt::ApplicationModal + + 0 0 - 752 - 533 + 586 + 651 - + Theme Maintance - - + + :/icon/openlp.org-icon-32.bmp:/icon/openlp.org-icon-32.bmp - - - - 580 - 500 - 156 - 26 - + + true + + + + 8 - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + 8 - - - - - 50 - 20 - 441 - 41 - - - - - - - Theme Name + + + + + 8 - - - - - - - - - - - 31 - 71 - 721 - 411 - - - - - - - - - 0 - 0 - 341 - 401 - - - - 0 - - - - Background - - - - - 10 - 10 - 321 - 351 - - - - - - + + 0 + + + + + Theme Name: + + + + + + + + + + + + + + 8 + + + 0 + + + + + 0 + + + + Background + + + + 8 + + + 8 + + + 8 + + + + Background: - - + + - + Opaque - + Transparent - - - + + + Background Type: - - + + - + Solid Color - + Gradient - + Image - - - - <Color1> + + + + <Color1> - - - + + + - - - - <Color2> + + + + <Color2> - - - + + + - - - + + + Image: - - - - - - - - - - - :/services/service_open.png:/services/service_open.png - - - - - - + + + Gradient : - - + + - + Horizontal - + Vertical - + Circular - - - - - - Font Main - - - - - 20 - 10 - 307 - 119 - - - - Main Font - - - - - - Font: - + + + + + 0 + + + 0 + + + + + + + + + + + + :/images/image_load.png:/images/image_load.png + + + + - - - - - - - Font Color + + + + Qt::Vertical - - - - - - + + + 20 + 40 + - - - - - - Size: - - - - - - - - - - 15 - - - 40 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 5 - - + - - - - 20 - 160 - 301 - 190 - - - - Display Location - - - - - - Use default location - - - false - - - - - - - - - X Position: - - - - - - - - - - - - - - Y Position: - - - - - - - - - - - - - - Width - - - - - - - - - - - - - - Height - - - - - - - - - - - - - - Font Footer - - - - - 20 - 160 - 301 - 190 - - - - Display Location - - - - - - Use default location - - - false - - - - - - - - - X Position: - - - - - - - - - - - - - - Y Position: - - - - - - - - - - - - - - Width - - - - - - - - - - - - - - Height - - - - - - - - - - - - - - 20 - 10 - 307 - 119 - - - - Footer Font - - - - - - Font: - - - - - - - - - - Font Color - - - - - - - - - - - - - - Size: - - - - - - - - - - 15 - - - 40 - - - Qt::Horizontal - - - QSlider::TicksBelow - - - 5 - - - - - - - - - Alignment - - - - - 20 - 10 - 301 - 80 - - - - Shadow - - - - - 10 - 20 - 281 - 58 - + + + Font Main + + + + 8 - - - - - Use Shadow + + 8 + + + + + + 8 - - - - - - Shadow Color: + + 0 - - - - - - - - - - - - - - - - 10 - 200 - 321 - 161 - - - - Alignment - - - - - - Horizontal Align: - + + + + Main Font + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 8 + + + 8 + + + 8 + + + + + Font: + + + + + + + + + + Font Color: + + + + + + + + + + + + + + Size: + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + pt + + + 999 + + + 16 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - - - - Left + + + + + 8 - - - - Right + + 0 - - - - Center - - - - - - - - Vertical Align: - - - - - - - - Top - - - - - Middle - - - - - Bottom - - + + + + Display Location + + + + 8 + + + 8 + + + 8 + + + + + Use Default Location: + + + + + + + + + + false + + + + + + + X Position: + + + + + + + Y Position: + + + + + + + Width: + + + + + + + Height: + + + + + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + 0 + + + + + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + + + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + + + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + - - - - 20 - 110 - 301 - 80 - - - - Outline - - - - - 10 - 20 - 281 - 58 - + + + Font Footer + + + + 8 - - - - - Use Outline + + 8 + + + + + + 8 - - - - - - Outline Color: + + 0 - - - - - - + + + + Footer Font + + + + QFormLayout::ExpandingFieldsGrow + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 8 + + + 8 + + + 8 + + + + + Font: + + + + + + + + + + Font Color: + + + + + + + + + + + + + + Size: + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + pt + + + 999 + + + 10 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + 8 - - - - + + 0 + + + + + Display Location + + + + QFormLayout::ExpandingFieldsGrow + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 8 + + + 8 + + + 8 + + + + + Use Default Location: + + + + + + + + + + false + + + + + + + X Position: + + + + + + + Y Position: + + + + + + + Width: + + + + + + + Height: + + + + + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + 0 + + + + + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + 0 + + + + + + + + 78 + 0 + + + + px + + + 9999 + + + + + + + + 78 + 0 + + + + px + + + 9999 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Other Options + + + + 8 + + + 8 + + + + + + 8 + + + 0 + + + + + Shadow && Outline + + + + 8 + + + 8 + + + + + + 8 + + + 8 + + + 0 + + + + + + + + + + + + Outline Color: + + + + + + + + + + + + + + Show Outline: + + + + + + + + + + + 8 + + + 8 + + + 0 + + + + + + + + + + + + Shadow Color: + + + + + + + + + + + + + + Show Shadow: + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + 8 + + + 0 + + + + + Alignment + + + + + + Horizontal Align: + + + + + + + + Left + + + + + Right + + + + + Center + + + + + + + + Vertical Align: + + + + + + + + Top + + + + + Middle + + + + + Bottom + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + - - - - - - - - - 20 - 60 - 311 - 271 - - - - QFrame::Box - - - QFrame::Raised - - - 2 - - - - - - true - - - - - - + + + + + + + + Preview + + + + 8 + + + 8 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 300 + 225 + + + + QFrame::WinPanel + + + QFrame::Sunken + + + 1 + + + + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + ThemeButtonBox + ThemeNameEdit + ThemeTabWidget + BackgroundComboBox + BackgroundTypeComboBox + Color1PushButton + Color2PushButton + ImageLineEdit + ImageToolButton + GradientComboBox + MainFontComboBox + MainFontColorPushButton + MainFontSizeSpinBox + FontMainUseDefault + FontMainXSpinBox + FontMainYSpinBox + FontMainWidthSpinBox + FontMainHeightSpinBox + FontFooterComboBox + FontFooterColorPushButton + FontFooterSizeSpinBox + FontFooterDefaultCheckBox + FontFooterXSpinBox + FontFooterYSpinBox + FontFooterWidthspinBox + FontFooterHeightSpinBox + OutlineCheckBox + OutlineColorPushButton + ShadowCheckBox + ShadowColorPushButton + HorizontalComboBox + VerticalComboBox + - + - + + + ThemeButtonBox + accepted() + AmendThemeDialog + accept() + + + 375 + 466 + + + 375 + 241 + + + + + ThemeButtonBox + rejected() + AmendThemeDialog + reject() + + + 375 + 466 + + + 375 + 241 + + + +