From 76f6c8b87ca2598fc66f094c4c90de1bafcfb6d2 Mon Sep 17 00:00:00 2001 From: M2j Date: Tue, 29 Jun 2010 00:29:54 +0200 Subject: [PATCH 001/126] proof-of-concept songs search button --- openlp/core/lib/__init__.py | 9 ++- openlp/core/ui/servicemanager.py | 2 +- openlp/core/ui/slidecontroller.py | 2 +- openlp/plugins/songs/lib/mediaitem.py | 104 ++++++++++++++++---------- 4 files changed, 73 insertions(+), 44 deletions(-) diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 5a4d3f5b3..ae3d15fe1 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -35,7 +35,7 @@ from PyQt4 import QtCore, QtGui log = logging.getLogger(__name__) -def translate(context, text, comment=None): +def translate(context, text, comment=None, count=-1): """ A special shortcut method to wrap around the Qt4 translation functions. This abstracts the translation procedure so that we can change it if at a @@ -47,6 +47,13 @@ def translate(context, text, comment=None): ``text`` The text to put into the translation tables for translation. + + ``comment`` + A optional comment for translators. + + ``count`` + If count is given it replaces %n in the text. A propper plural form is + chosen. """ return QtCore.QCoreApplication.translate(context, text, comment) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index cccd34195..41704bc5d 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -108,7 +108,7 @@ class ServiceManager(QtGui.QWidget): #is a new service and has not been saved self.isNew = True self.serviceNoteForm = ServiceNoteForm() - self.serviceItemEditForm = ServiceItemEditForm() + self.serviceItemEditForm = ServiceItemEditForm(self) #start with the layout self.Layout = QtGui.QVBoxLayout(self) self.Layout.setSpacing(0) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 10cd3cff0..53327eb7e 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -802,7 +802,7 @@ class SlideController(QtGui.QWidget): QtCore.QTimer.singleShot(2.5, self.grabMainDisplay) else: label = self.PreviewListWidget.cellWidget( - self.PreviewListWidget.currentRow(), 1) + self.PreviewListWidget.currentRow(), 0) self.SlidePreview.setPixmap(label.pixmap()) def grabMainDisplay(self): diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index ab70c9659..1a87a6c23 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -74,45 +74,60 @@ class SongMediaItem(MediaManagerItem): u'Maintain the lists of authors, topics and books'), ':/songs/song_maintenance.png', self.onSongMaintenanceClick) self.PageLayout.setSpacing(4) - self.SearchLayout = QtGui.QFormLayout() - self.SearchLayout.setMargin(0) - self.SearchLayout.setSpacing(4) - self.SearchLayout.setObjectName(u'SearchLayout') + self.SearchLineLayout = QtGui.QHBoxLayout() + self.SearchLineLayout.setMargin(0) + self.SearchLineLayout.setSpacing(4) + self.SearchLineLayout.setObjectName(u'SearchLineLayout') + self.PageLayout.addLayout(self.SearchLineLayout) self.SearchTextLabel = QtGui.QLabel(self) - self.SearchTextLabel.setAlignment( - QtCore.Qt.AlignBottom|QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft) self.SearchTextLabel.setObjectName(u'SearchTextLabel') - self.SearchLayout.setWidget( - 0, QtGui.QFormLayout.LabelRole, self.SearchTextLabel) + self.SearchLineLayout.addWidget(self.SearchTextLabel) self.SearchTextEdit = QtGui.QLineEdit(self) self.SearchTextEdit.setObjectName(u'SearchTextEdit') - self.SearchLayout.setWidget( - 0, QtGui.QFormLayout.FieldRole, self.SearchTextEdit) - self.SearchTypeLabel = QtGui.QLabel(self) - self.SearchTypeLabel.setAlignment( - QtCore.Qt.AlignBottom|QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft) - self.SearchTypeLabel.setObjectName(u'SearchTypeLabel') - self.SearchLayout.setWidget( - 1, QtGui.QFormLayout.LabelRole, self.SearchTypeLabel) - self.SearchTypeComboBox = QtGui.QComboBox(self) - self.SearchTypeComboBox.setObjectName(u'SearchTypeComboBox') - self.SearchLayout.setWidget( - 1, QtGui.QFormLayout.FieldRole, self.SearchTypeComboBox) - self.PageLayout.addLayout(self.SearchLayout) + self.SearchLineLayout.addWidget(self.SearchTextEdit) self.SearchButtonLayout = QtGui.QHBoxLayout() self.SearchButtonLayout.setMargin(0) self.SearchButtonLayout.setSpacing(4) self.SearchButtonLayout.setObjectName(u'SearchButtonLayout') + self.PageLayout.addLayout(self.SearchButtonLayout) self.SearchButtonSpacer = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.SearchButtonLayout.addItem(self.SearchButtonSpacer) - self.SearchTextButton = QtGui.QPushButton(self) - self.SearchTextButton.setObjectName(u'SearchTextButton') - self.SearchButtonLayout.addWidget(self.SearchTextButton) + self.SearchButtonLayout.addSpacerItem(self.SearchButtonSpacer) self.ClearTextButton = QtGui.QPushButton(self) self.ClearTextButton.setObjectName(u'ClearTextButton') self.SearchButtonLayout.addWidget(self.ClearTextButton) - self.PageLayout.addLayout(self.SearchButtonLayout) + self.SearchTextButton = QtGui.QToolButton(self) + self.SearchTextButton.setObjectName(u'SearchTextButton') + self.SearchButtonLayout.addWidget(self.SearchTextButton) + self.SearchTitlesAction = QtGui.QAction(self) + self.SearchTitlesAction.setObjectName(u'SearchTitlesAction') + self.SearchTitlesAction.setCheckable(True) + self.SearchLyricsAction = QtGui.QAction(self) + self.SearchLyricsAction.setObjectName(u'SearchLyricsAction') + self.SearchLyricsAction.setCheckable(True) + self.SearchAuthorsAction = QtGui.QAction(self) + self.SearchAuthorsAction.setObjectName(u'SearchAuthorsAction') + self.SearchAuthorsAction.setCheckable(True) + self.SearchActionGroup = QtGui.QActionGroup(self) + self.SearchActionGroup.setObjectName(u'SearchActionGroup') + self.SearchActionGroup.setExclusive(True) + self.SearchActionGroup.addAction(self.SearchTitlesAction) + self.SearchActionGroup.addAction(self.SearchLyricsAction) + self.SearchActionGroup.addAction(self.SearchAuthorsAction) + self.SearchTypeMenu = QtGui.QMenu(self) + self.SearchTypeMenu.setObjectName(u'SearchTypeMenu') + self.SearchTypeMenu.addAction(self.SearchTitlesAction) + self.SearchTypeMenu.addAction(self.SearchLyricsAction) + self.SearchTypeMenu.addAction(self.SearchAuthorsAction) + self.SearchTextButton.setPopupMode(QtGui.QToolButton.MenuButtonPopup) + self.SearchTextButton.setMenu(self.SearchTypeMenu) + QtCore.QObject.connect(self.SearchTitlesAction, + QtCore.SIGNAL(u'triggered()'), self.onSearchTextButtonClick) + QtCore.QObject.connect(self.SearchLyricsAction, + QtCore.SIGNAL(u'triggered()'), self.onSearchTextButtonClick) + QtCore.QObject.connect(self.SearchAuthorsAction, + QtCore.SIGNAL(u'triggered()'), self.onSearchTextButtonClick) + # Signals and slots QtCore.QObject.connect(self.SearchTextEdit, QtCore.SIGNAL(u'returnPressed()'), self.onSearchTextButtonClick) @@ -142,38 +157,45 @@ class SongMediaItem(MediaManagerItem): def retranslateUi(self): self.SearchTextLabel.setText( translate(u'SongsPlugin.MediaItem', u'Search:')) - self.SearchTypeLabel.setText( - translate(u'SongsPlugin.MediaItem', u'Type:')) self.ClearTextButton.setText( translate(u'SongsPlugin.MediaItem', u'Clear')) - self.SearchTextButton.setText( - translate(u'SongsPlugin.MediaItem', u'Search')) + self.SearchTitlesAction.setText( + translate(u'SongsPlugin.MediaItem', u'Search Titles')) + self.SearchLyricsAction.setText( + translate(u'SongsPlugin.MediaItem', u'Search Lyrics')) + self.SearchAuthorsAction.setText( + translate(u'SongsPlugin.MediaItem', u'Search Authors')) + if self.SearchTitlesAction.isChecked(): + self.SearchTextButton.setText(self.SearchTitlesAction.text()) + if self.SearchLyricsAction.isChecked(): + self.SearchTextButton.setText(self.SearchLyricsAction.text()) + if self.SearchAuthorsAction.isChecked(): + self.SearchTextButton.setText(self.SearchAuthorsAction.text()) def initialise(self): - self.SearchTypeComboBox.addItem( - translate(u'SongsPlugin.MediaItem', u'Titles')) - self.SearchTypeComboBox.addItem( - translate(u'SongsPlugin.MediaItem', u'Lyrics')) - self.SearchTypeComboBox.addItem( - translate(u'SongsPlugin.MediaItem', u'Authors')) + self.SearchTitlesAction.setChecked(True) + self.SearchTextButton.setText(self.SearchTitlesAction.text()) self.configUpdated() def onSearchTextButtonClick(self): search_keywords = unicode(self.SearchTextEdit.displayText()) search_results = [] - search_type = self.SearchTypeComboBox.currentIndex() - if search_type == 0: +# search_type = self.SearchTypeComboBox.currentIndex() + if self.SearchTitlesAction.isChecked(): #search_type == 0: log.debug(u'Titles Search') + self.SearchTextButton.setText(self.SearchTitlesAction.text()) search_results = self.parent.manager.search_song_title( search_keywords) self.displayResultsSong(search_results) - elif search_type == 1: + elif self.SearchLyricsAction.isChecked(): #search_type == 1: log.debug(u'Lyrics Search') + self.SearchTextButton.setText(self.SearchLyricsAction.text()) search_results = self.parent.manager.search_song_lyrics( search_keywords) self.displayResultsSong(search_results) - elif search_type == 2: + elif self.SearchAuthorsAction.isChecked(): #search_type == 2: log.debug(u'Authors Search') + self.SearchTextButton.setText(self.SearchAuthorsAction.text()) search_results = self.parent.manager.get_song_from_author( search_keywords) self.displayResultsAuthor(search_results) @@ -228,7 +250,7 @@ class SongMediaItem(MediaManagerItem): """ if self.searchAsYouType: search_length = 1 - if self.SearchTypeComboBox.currentIndex() == 1: + if self.SearchLyricsAction.isChecked(): # self.SearchTypeComboBox.currentIndex() == 1: search_length = 7 if len(text) > search_length: self.onSearchTextButtonClick() From fc092ed919e7538c1c50d22e2cbbbc44ec3139de Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 3 Oct 2010 08:42:02 +0100 Subject: [PATCH 002/126] Theme wizard start --- openlp/core/lib/theme.py | 49 ++ openlp/core/ui/__init__.py | 1 + openlp/core/ui/thememanager.py | 81 +- openlp/core/ui/themewizard.py | 467 +++++++++++ openlp/core/ui/themewizardform.py | 210 +++++ resources/forms/themewizard.ui | 1290 +++++++++++++++-------------- 6 files changed, 1437 insertions(+), 661 deletions(-) create mode 100644 openlp/core/ui/themewizard.py create mode 100644 openlp/core/ui/themewizardform.py diff --git a/openlp/core/lib/theme.py b/openlp/core/lib/theme.py index def6f01cc..6fa7c5eb4 100644 --- a/openlp/core/lib/theme.py +++ b/openlp/core/lib/theme.py @@ -427,3 +427,52 @@ class ThemeXML(object): s1 = re.sub(u'(.)([A-Z][a-z]+)', r'\1_\2', name) return re.sub(u'([a-z0-9])([A-Z])', r'\1_\2', s1).lower() + def build_xml_from_attrs(self, ): + """ + Build the XML from the varables in the object + """ + if self.background_type == u'solid': + self.add_background_solid( + unicode(self.background_color)) + elif self.background_type == u'gradient': + self.add_background_gradient( + unicode(self.background_start_color), + unicode(self.background_end_color), + self.background_direction) + else: + filename = \ + os.path.split(unicode(self.background_filename))[1] + self.add_background_image(filename) + self.add_font(unicode(self.font_main_name), + unicode(self.font_main_color), + unicode(self.font_main_proportion), + unicode(self.font_main_override), u'main', + unicode(self.font_main_weight), + unicode(self.font_main_italics), + unicode(self.font_main_line_adjustment), + unicode(self.font_main_x), + unicode(self.font_main_y), + unicode(self.font_main_width), + unicode(self.font_main_height)) + self.add_font(unicode(self.font_footer_name), + unicode(self.font_footer_color), + unicode(self.font_footer_proportion), + unicode(self.font_footer_override), u'footer', + unicode(self.font_footer_weight), + unicode(self.font_footer_italics), + 0, # line adjustment + unicode(self.font_footer_x), + unicode(self.font_footer_y), + unicode(self.font_footer_width), + unicode(self.font_footer_height)) + self.add_display(unicode(self.display_shadow), + unicode(self.display_shadow_color), + unicode(self.display_outline), + unicode(self.display_outline_color), + unicode(self.display_horizontal_align), + unicode(self.display_vertical_align), + unicode(self.display_wrap_style), + unicode(self.display_slide_transition), + unicode(self.display_shadow_size), + unicode(self.display_outline_size)) + diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py index 80d677386..ca671f61a 100644 --- a/openlp/core/ui/__init__.py +++ b/openlp/core/ui/__init__.py @@ -37,6 +37,7 @@ class HideMode(object): Theme = 2 Screen = 3 +from themewizardform import ThemeWizardForm from filerenameform import FileRenameForm from maindisplay import MainDisplay from slidecontroller import HideMode diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index ff61b05e8..43958be8b 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -32,7 +32,7 @@ import logging from xml.etree.ElementTree import ElementTree, XML from PyQt4 import QtCore, QtGui -from openlp.core.ui import AmendThemeForm, FileRenameForm +from openlp.core.ui import AmendThemeForm, FileRenameForm, ThemeWizardForm from openlp.core.theme import Theme from openlp.core.lib import OpenLPToolbar, context_menu_action, \ ThemeXML, str_to_bool, get_text_file_string, build_icon, Receiver, \ @@ -54,6 +54,7 @@ class ThemeManager(QtGui.QWidget): self.layout.setSpacing(0) self.layout.setMargin(0) self.amendThemeForm = AmendThemeForm(self) + self.themeWizardForm = ThemeWizardForm(self) self.fileRenameForm = FileRenameForm(self) self.toolbar = OpenLPToolbar(self) self.toolbar.addToolbarButton( @@ -215,9 +216,10 @@ class ThemeManager(QtGui.QWidget): editing form for the user to make their customisations. """ theme = self.createThemeFromXml(self.baseTheme(), self.path) - self.amendThemeForm.loadTheme(theme) + #self.amendThemeForm.loadTheme(theme) self.saveThemeName = u'' - self.amendThemeForm.exec_() + self.themeWizardForm.theme = theme + self.themeWizardForm.exec_() def onRenameTheme(self): """ @@ -243,66 +245,25 @@ class ThemeManager(QtGui.QWidget): self.saveThemeName = u'' if self.fileRenameForm.exec_(): newThemeName = unicode(self.fileRenameForm.FileNameEdit.text()) - oldThemeData = self.getThemeData(oldThemeName) - self.cloneThemeData(oldThemeData, newThemeName) + themeData = self.getThemeData(oldThemeName) + self.cloneThemeData(themeData, newThemeName) self.loadThemes() - def cloneThemeData(self, oldThemeData, newThemeName): + def cloneThemeData(self, themeData, newThemeName): """ + Takes a theme and makes a new copy of it as well as saving it. """ log.debug(u'cloneThemeData') - new_theme = ThemeXML() - new_theme.new_document(newThemeName) - save_from = None + themeData.new_document(newThemeName) + themeData.build_xml_from_attrs() save_to = None - if oldThemeData.background_type == u'solid': - new_theme.add_background_solid( - unicode(oldThemeData.background_color)) - elif oldThemeData.background_type == u'gradient': - new_theme.add_background_gradient( - unicode(oldThemeData.background_start_color), - unicode(oldThemeData.background_end_color), - oldThemeData.background_direction) - else: - filename = \ - os.path.split(unicode(oldThemeData.background_filename))[1] - new_theme.add_background_image(filename) - save_to = os.path.join(self.path, theme_name, filename) - save_from = oldThemeData.background_filename - new_theme.add_font(unicode(oldThemeData.font_main_name), - unicode(oldThemeData.font_main_color), - unicode(oldThemeData.font_main_proportion), - unicode(oldThemeData.font_main_override), u'main', - unicode(oldThemeData.font_main_weight), - unicode(oldThemeData.font_main_italics), - unicode(oldThemeData.font_main_line_adjustment), - unicode(oldThemeData.font_main_x), - unicode(oldThemeData.font_main_y), - unicode(oldThemeData.font_main_width), - unicode(oldThemeData.font_main_height)) - new_theme.add_font(unicode(oldThemeData.font_footer_name), - unicode(oldThemeData.font_footer_color), - unicode(oldThemeData.font_footer_proportion), - unicode(oldThemeData.font_footer_override), u'footer', - unicode(oldThemeData.font_footer_weight), - unicode(oldThemeData.font_footer_italics), - 0, # line adjustment - unicode(oldThemeData.font_footer_x), - unicode(oldThemeData.font_footer_y), - unicode(oldThemeData.font_footer_width), - unicode(oldThemeData.font_footer_height)) - new_theme.add_display(unicode(oldThemeData.display_shadow), - unicode(oldThemeData.display_shadow_color), - unicode(oldThemeData.display_outline), - unicode(oldThemeData.display_outline_color), - unicode(oldThemeData.display_horizontal_align), - unicode(oldThemeData.display_vertical_align), - unicode(oldThemeData.display_wrap_style), - unicode(oldThemeData.display_slide_transition), - unicode(oldThemeData.display_shadow_size), - unicode(oldThemeData.display_outline_size)) - theme = new_theme.extract_xml() - pretty_theme = new_theme.extract_formatted_xml() + save_from = None + if themeData.background_type == u'image': + save_to = os.path.join(self.path, newThemeName, + os.path.split(unicode(themeData.background_filename))[1]) + save_from = themeData.background_filename + theme = themeData.extract_xml() + pretty_theme =themeData.extract_formatted_xml() self.saveTheme(newThemeName, theme, pretty_theme, save_from, save_to) def onEditTheme(self): @@ -321,10 +282,12 @@ class ThemeManager(QtGui.QWidget): unicode(item.data(QtCore.Qt.UserRole).toString())) if theme.background_type == u'image': self.oldBackgroundImage = theme.background_filename - self.amendThemeForm.loadTheme(theme) + #self.amendThemeForm.loadTheme(theme) self.saveThemeName = unicode( item.data(QtCore.Qt.UserRole).toString()) - self.amendThemeForm.exec_() + #self.amendThemeForm.exec_() + self.themeWizardForm.theme = theme + self.themeWizardForm.exec_() def onDeleteTheme(self): """ diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py new file mode 100644 index 000000000..80621d000 --- /dev/null +++ b/openlp/core/ui/themewizard.py @@ -0,0 +1,467 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'themewizard.ui' +# +# Created: Sat Oct 2 08:13:48 2010 +# by: PyQt4 UI code generator 4.7.4 +# +# WARNING! All changes made in this file will be lost! + +from PyQt4 import QtCore, QtGui + +class Ui_ThemeWizard(object): + def setupUi(self, ThemeWizard): + ThemeWizard.setObjectName("ThemeWizard") + ThemeWizard.resize(550, 386) + ThemeWizard.setModal(True) + ThemeWizard.setWizardStyle(QtGui.QWizard.ModernStyle) + ThemeWizard.setOptions(QtGui.QWizard.NoBackButtonOnStartPage) + self.welcomePage = QtGui.QWizardPage() + self.welcomePage.setTitle("") + self.welcomePage.setSubTitle("") + self.welcomePage.setObjectName("welcomePage") + self.WelcomeLayout = QtGui.QHBoxLayout(self.welcomePage) + self.WelcomeLayout.setSpacing(8) + self.WelcomeLayout.setMargin(0) + self.WelcomeLayout.setObjectName("WelcomeLayout") + self.importBibleImage = QtGui.QLabel(self.welcomePage) + self.importBibleImage.setMinimumSize(QtCore.QSize(163, 0)) + self.importBibleImage.setMaximumSize(QtCore.QSize(163, 16777215)) + self.importBibleImage.setLineWidth(0) + self.importBibleImage.setText("") + self.importBibleImage.setPixmap(QtGui.QPixmap(":/wizards/wizard_importbible.bmp")) + self.importBibleImage.setIndent(0) + self.importBibleImage.setObjectName("importBibleImage") + self.WelcomeLayout.addWidget(self.importBibleImage) + self.welcomePageLayout = QtGui.QVBoxLayout() + self.welcomePageLayout.setSpacing(8) + self.welcomePageLayout.setObjectName("welcomePageLayout") + self.titleLabel = QtGui.QLabel(self.welcomePage) + self.titleLabel.setObjectName("titleLabel") + self.welcomePageLayout.addWidget(self.titleLabel) + spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + self.welcomePageLayout.addItem(spacerItem) + self.informationLabel = QtGui.QLabel(self.welcomePage) + self.informationLabel.setWordWrap(True) + self.informationLabel.setMargin(10) + self.informationLabel.setObjectName("informationLabel") + self.welcomePageLayout.addWidget(self.informationLabel) + spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.welcomePageLayout.addItem(spacerItem1) + self.WelcomeLayout.addLayout(self.welcomePageLayout) + ThemeWizard.addPage(self.welcomePage) + self.backgroundPage = QtGui.QWizardPage() + self.backgroundPage.setObjectName("backgroundPage") + self.backgroundLayout = QtGui.QFormLayout(self.backgroundPage) + self.backgroundLayout.setFieldGrowthPolicy(QtGui.QFormLayout.ExpandingFieldsGrow) + self.backgroundLayout.setLabelAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) + self.backgroundLayout.setMargin(20) + self.backgroundLayout.setSpacing(8) + self.backgroundLayout.setObjectName("backgroundLayout") + self.backgroundTypeLabel = QtGui.QLabel(self.backgroundPage) + self.backgroundTypeLabel.setObjectName("backgroundTypeLabel") + self.backgroundLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.backgroundTypeLabel) + self.backgroundTypeComboBox = QtGui.QComboBox(self.backgroundPage) + self.backgroundTypeComboBox.setObjectName("backgroundTypeComboBox") + self.backgroundTypeComboBox.addItem("") + self.backgroundTypeComboBox.addItem("") + self.backgroundTypeComboBox.addItem("") + self.backgroundLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.backgroundTypeComboBox) + self.color1Label = QtGui.QLabel(self.backgroundPage) + self.color1Label.setObjectName("color1Label") + self.backgroundLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.color1Label) + self.color1PushButton = QtGui.QPushButton(self.backgroundPage) + self.color1PushButton.setText("") + self.color1PushButton.setObjectName("color1PushButton") + self.backgroundLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.color1PushButton) + self.color2Label = QtGui.QLabel(self.backgroundPage) + self.color2Label.setObjectName("color2Label") + self.backgroundLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.color2Label) + self.color2PushButton = QtGui.QPushButton(self.backgroundPage) + self.color2PushButton.setText("") + self.color2PushButton.setObjectName("color2PushButton") + self.backgroundLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.color2PushButton) + self.imageLabel = QtGui.QLabel(self.backgroundPage) + self.imageLabel.setObjectName("imageLabel") + self.backgroundLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.imageLabel) + self.imageLayout = QtGui.QHBoxLayout() + self.imageLayout.setSpacing(8) + self.imageLayout.setObjectName("imageLayout") + self.imageLineEdit = QtGui.QLineEdit(self.backgroundPage) + self.imageLineEdit.setObjectName("imageLineEdit") + self.imageLayout.addWidget(self.imageLineEdit) + self.imageBrowseButton = QtGui.QToolButton(self.backgroundPage) + self.imageBrowseButton.setText("") + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(":/general/general_open.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.imageBrowseButton.setIcon(icon) + self.imageBrowseButton.setObjectName("imageBrowseButton") + self.imageLayout.addWidget(self.imageBrowseButton) + self.backgroundLayout.setLayout(3, QtGui.QFormLayout.FieldRole, self.imageLayout) + self.gradientLabel = QtGui.QLabel(self.backgroundPage) + self.gradientLabel.setObjectName("gradientLabel") + self.backgroundLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.gradientLabel) + self.gradientComboBox = QtGui.QComboBox(self.backgroundPage) + self.gradientComboBox.setObjectName("gradientComboBox") + self.gradientComboBox.addItem("") + self.gradientComboBox.addItem("") + self.gradientComboBox.addItem("") + self.backgroundLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.gradientComboBox) + ThemeWizard.addPage(self.backgroundPage) + self.mainAreaPage = QtGui.QWizardPage() + self.mainAreaPage.setObjectName("mainAreaPage") + self.mainAreaLayout = QtGui.QFormLayout(self.mainAreaPage) + self.mainAreaLayout.setFieldGrowthPolicy(QtGui.QFormLayout.ExpandingFieldsGrow) + self.mainAreaLayout.setContentsMargins(50, 20, 20, 20) + self.mainAreaLayout.setSpacing(8) + self.mainAreaLayout.setObjectName("mainAreaLayout") + self.mainFontLabel = QtGui.QLabel(self.mainAreaPage) + self.mainFontLabel.setObjectName("mainFontLabel") + self.mainAreaLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.mainFontLabel) + self.mainFontComboBox = QtGui.QFontComboBox(self.mainAreaPage) + self.mainFontComboBox.setObjectName("mainFontComboBox") + self.mainAreaLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.mainFontComboBox) + self.mainColorLabel = QtGui.QLabel(self.mainAreaPage) + self.mainColorLabel.setObjectName("mainColorLabel") + self.mainAreaLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.mainColorLabel) + self.mainColorPushButton = QtGui.QPushButton(self.mainAreaPage) + self.mainColorPushButton.setText("") + self.mainColorPushButton.setObjectName("mainColorPushButton") + self.mainAreaLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.mainColorPushButton) + self.mainSizeLabel = QtGui.QLabel(self.mainAreaPage) + self.mainSizeLabel.setObjectName("mainSizeLabel") + self.mainAreaLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.mainSizeLabel) + self.mainSizeLayout = QtGui.QHBoxLayout() + self.mainSizeLayout.setSpacing(8) + self.mainSizeLayout.setMargin(0) + self.mainSizeLayout.setObjectName("mainSizeLayout") + self.mainSizeSpinBox = QtGui.QSpinBox(self.mainAreaPage) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.mainSizeSpinBox.sizePolicy().hasHeightForWidth()) + self.mainSizeSpinBox.setSizePolicy(sizePolicy) + self.mainSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0)) + self.mainSizeSpinBox.setMaximum(999) + self.mainSizeSpinBox.setProperty("value", 16) + self.mainSizeSpinBox.setObjectName("mainSizeSpinBox") + self.mainSizeLayout.addWidget(self.mainSizeSpinBox) + self.mainLineCountLabel = QtGui.QLabel(self.mainAreaPage) + self.mainLineCountLabel.setObjectName("mainLineCountLabel") + self.mainSizeLayout.addWidget(self.mainLineCountLabel) + self.mainAreaLayout.setLayout(2, QtGui.QFormLayout.FieldRole, self.mainSizeLayout) + self.mainOutlineCheckBox = QtGui.QCheckBox(self.mainAreaPage) + self.mainOutlineCheckBox.setObjectName("mainOutlineCheckBox") + self.mainAreaLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.mainOutlineCheckBox) + self.mainOutlineColorPushButton = QtGui.QPushButton(self.mainAreaPage) + self.mainOutlineColorPushButton.setEnabled(False) + self.mainOutlineColorPushButton.setText("") + self.mainOutlineColorPushButton.setObjectName("mainOutlineColorPushButton") + self.mainAreaLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.mainOutlineColorPushButton) + self.mainShadowCheckBox = QtGui.QCheckBox(self.mainAreaPage) + self.mainShadowCheckBox.setObjectName("mainShadowCheckBox") + self.mainAreaLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.mainShadowCheckBox) + self.mainShadowColorPushButton = QtGui.QPushButton(self.mainAreaPage) + self.mainShadowColorPushButton.setEnabled(False) + self.mainShadowColorPushButton.setText("") + self.mainShadowColorPushButton.setObjectName("mainShadowColorPushButton") + self.mainAreaLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.mainShadowColorPushButton) + ThemeWizard.addPage(self.mainAreaPage) + self.footerAreaPage = QtGui.QWizardPage() + self.footerAreaPage.setObjectName("footerAreaPage") + self.footerLayout = QtGui.QFormLayout(self.footerAreaPage) + self.footerLayout.setFieldGrowthPolicy(QtGui.QFormLayout.ExpandingFieldsGrow) + self.footerLayout.setContentsMargins(50, 20, 20, 20) + self.footerLayout.setSpacing(8) + self.footerLayout.setObjectName("footerLayout") + self.footerFontLabel = QtGui.QLabel(self.footerAreaPage) + self.footerFontLabel.setObjectName("footerFontLabel") + self.footerLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.footerFontLabel) + self.footerFontComboBox = QtGui.QFontComboBox(self.footerAreaPage) + self.footerFontComboBox.setObjectName("footerFontComboBox") + self.footerLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.footerFontComboBox) + self.footerColorLabel = QtGui.QLabel(self.footerAreaPage) + self.footerColorLabel.setObjectName("footerColorLabel") + self.footerLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.footerColorLabel) + self.footerColorPushButton = QtGui.QPushButton(self.footerAreaPage) + self.footerColorPushButton.setText("") + self.footerColorPushButton.setObjectName("footerColorPushButton") + self.footerLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.footerColorPushButton) + self.footerSizeLabel = QtGui.QLabel(self.footerAreaPage) + self.footerSizeLabel.setObjectName("footerSizeLabel") + self.footerLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.footerSizeLabel) + self.footerSizeSpinBox = QtGui.QSpinBox(self.footerAreaPage) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.footerSizeSpinBox.sizePolicy().hasHeightForWidth()) + self.footerSizeSpinBox.setSizePolicy(sizePolicy) + self.footerSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0)) + self.footerSizeSpinBox.setMaximum(999) + self.footerSizeSpinBox.setProperty("value", 10) + self.footerSizeSpinBox.setObjectName("footerSizeSpinBox") + self.footerLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.footerSizeSpinBox) + self.footerOutlineCheckBox = QtGui.QCheckBox(self.footerAreaPage) + self.footerOutlineCheckBox.setObjectName("footerOutlineCheckBox") + self.footerLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.footerOutlineCheckBox) + self.footerOutlineColorPushButton = QtGui.QPushButton(self.footerAreaPage) + self.footerOutlineColorPushButton.setEnabled(False) + self.footerOutlineColorPushButton.setText("") + self.footerOutlineColorPushButton.setObjectName("footerOutlineColorPushButton") + self.footerLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.footerOutlineColorPushButton) + self.footerShadowCheckBox = QtGui.QCheckBox(self.footerAreaPage) + self.footerShadowCheckBox.setObjectName("footerShadowCheckBox") + self.footerLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.footerShadowCheckBox) + self.footerShadowColorPushButton = QtGui.QPushButton(self.footerAreaPage) + self.footerShadowColorPushButton.setEnabled(False) + self.footerShadowColorPushButton.setText("") + self.footerShadowColorPushButton.setObjectName("footerShadowColorPushButton") + self.footerLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.footerShadowColorPushButton) + ThemeWizard.addPage(self.footerAreaPage) + self.areaPositionPage = QtGui.QWizardPage() + self.areaPositionPage.setObjectName("areaPositionPage") + self.gridLayout_2 = QtGui.QGridLayout(self.areaPositionPage) + self.gridLayout_2.setMargin(20) + self.gridLayout_2.setSpacing(8) + self.gridLayout_2.setObjectName("gridLayout_2") + self.mainPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage) + self.mainPositionGroupBox.setMinimumSize(QtCore.QSize(248, 0)) + self.mainPositionGroupBox.setObjectName("mainPositionGroupBox") + self.mainPositionLayout = QtGui.QFormLayout(self.mainPositionGroupBox) + self.mainPositionLayout.setMargin(8) + self.mainPositionLayout.setSpacing(8) + self.mainPositionLayout.setObjectName("mainPositionLayout") + self.mainDefaultPositionCheckBox = QtGui.QCheckBox(self.mainPositionGroupBox) + self.mainDefaultPositionCheckBox.setChecked(True) + self.mainDefaultPositionCheckBox.setTristate(False) + self.mainDefaultPositionCheckBox.setObjectName("mainDefaultPositionCheckBox") + self.mainPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.mainDefaultPositionCheckBox) + self.nainXLabel = QtGui.QLabel(self.mainPositionGroupBox) + self.nainXLabel.setObjectName("nainXLabel") + self.mainPositionLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.nainXLabel) + self.mainXSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) + self.mainXSpinBox.setEnabled(False) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.mainXSpinBox.sizePolicy().hasHeightForWidth()) + self.mainXSpinBox.setSizePolicy(sizePolicy) + self.mainXSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.mainXSpinBox.setMaximum(9999) + self.mainXSpinBox.setProperty("value", 0) + self.mainXSpinBox.setObjectName("mainXSpinBox") + self.mainPositionLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.mainXSpinBox) + self.mainYSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) + self.mainYSpinBox.setEnabled(False) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.mainYSpinBox.sizePolicy().hasHeightForWidth()) + self.mainYSpinBox.setSizePolicy(sizePolicy) + self.mainYSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.mainYSpinBox.setMaximum(9999) + self.mainYSpinBox.setObjectName("mainYSpinBox") + self.mainPositionLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.mainYSpinBox) + self.mainYLabel = QtGui.QLabel(self.mainPositionGroupBox) + self.mainYLabel.setObjectName("mainYLabel") + self.mainPositionLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.mainYLabel) + self.mainWidthSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) + self.mainWidthSpinBox.setEnabled(False) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.mainWidthSpinBox.sizePolicy().hasHeightForWidth()) + self.mainWidthSpinBox.setSizePolicy(sizePolicy) + self.mainWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.mainWidthSpinBox.setMaximum(9999) + self.mainWidthSpinBox.setObjectName("mainWidthSpinBox") + self.mainPositionLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.mainWidthSpinBox) + self.mainWidthLabel = QtGui.QLabel(self.mainPositionGroupBox) + self.mainWidthLabel.setObjectName("mainWidthLabel") + self.mainPositionLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.mainWidthLabel) + self.mainHeightSpinBox = QtGui.QSpinBox(self.mainPositionGroupBox) + self.mainHeightSpinBox.setEnabled(False) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.mainHeightSpinBox.sizePolicy().hasHeightForWidth()) + self.mainHeightSpinBox.setSizePolicy(sizePolicy) + self.mainHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.mainHeightSpinBox.setMaximum(9999) + self.mainHeightSpinBox.setObjectName("mainHeightSpinBox") + self.mainPositionLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.mainHeightSpinBox) + self.mainHeightLabel = QtGui.QLabel(self.mainPositionGroupBox) + self.mainHeightLabel.setObjectName("mainHeightLabel") + self.mainPositionLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.mainHeightLabel) + self.gridLayout_2.addWidget(self.mainPositionGroupBox, 1, 0, 1, 1) + self.footerPositionGroupBox = QtGui.QGroupBox(self.areaPositionPage) + self.footerPositionGroupBox.setMinimumSize(QtCore.QSize(248, 0)) + self.footerPositionGroupBox.setObjectName("footerPositionGroupBox") + self.footerPositionLayout = QtGui.QFormLayout(self.footerPositionGroupBox) + self.footerPositionLayout.setMargin(8) + self.footerPositionLayout.setSpacing(8) + self.footerPositionLayout.setObjectName("footerPositionLayout") + self.footerXLabel = QtGui.QLabel(self.footerPositionGroupBox) + self.footerXLabel.setObjectName("footerXLabel") + self.footerPositionLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.footerXLabel) + self.footerXSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox) + self.footerXSpinBox.setEnabled(False) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.footerXSpinBox.sizePolicy().hasHeightForWidth()) + self.footerXSpinBox.setSizePolicy(sizePolicy) + self.footerXSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.footerXSpinBox.setMaximum(9999) + self.footerXSpinBox.setProperty("value", 0) + self.footerXSpinBox.setObjectName("footerXSpinBox") + self.footerPositionLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.footerXSpinBox) + self.footerYLabel = QtGui.QLabel(self.footerPositionGroupBox) + self.footerYLabel.setObjectName("footerYLabel") + self.footerPositionLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.footerYLabel) + self.footerYSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox) + self.footerYSpinBox.setEnabled(False) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.footerYSpinBox.sizePolicy().hasHeightForWidth()) + self.footerYSpinBox.setSizePolicy(sizePolicy) + self.footerYSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.footerYSpinBox.setMaximum(9999) + self.footerYSpinBox.setProperty("value", 0) + self.footerYSpinBox.setObjectName("footerYSpinBox") + self.footerPositionLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.footerYSpinBox) + self.footerWidthLabel = QtGui.QLabel(self.footerPositionGroupBox) + self.footerWidthLabel.setObjectName("footerWidthLabel") + self.footerPositionLayout.setWidget(3, QtGui.QFormLayout.LabelRole, self.footerWidthLabel) + self.footerWidthSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox) + self.footerWidthSpinBox.setEnabled(False) + self.footerWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.footerWidthSpinBox.setMaximum(9999) + self.footerWidthSpinBox.setObjectName("footerWidthSpinBox") + self.footerPositionLayout.setWidget(3, QtGui.QFormLayout.FieldRole, self.footerWidthSpinBox) + self.footerHeightLabel = QtGui.QLabel(self.footerPositionGroupBox) + self.footerHeightLabel.setObjectName("footerHeightLabel") + self.footerPositionLayout.setWidget(4, QtGui.QFormLayout.LabelRole, self.footerHeightLabel) + self.footerHeightSpinBox = QtGui.QSpinBox(self.footerPositionGroupBox) + self.footerHeightSpinBox.setEnabled(False) + self.footerHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0)) + self.footerHeightSpinBox.setMaximum(9999) + self.footerHeightSpinBox.setObjectName("footerHeightSpinBox") + self.footerPositionLayout.setWidget(4, QtGui.QFormLayout.FieldRole, self.footerHeightSpinBox) + self.footerDefaultPositionCheckBox = QtGui.QCheckBox(self.footerPositionGroupBox) + self.footerDefaultPositionCheckBox.setChecked(True) + self.footerDefaultPositionCheckBox.setObjectName("footerDefaultPositionCheckBox") + self.footerPositionLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.footerDefaultPositionCheckBox) + self.gridLayout_2.addWidget(self.footerPositionGroupBox, 1, 1, 1, 1) + ThemeWizard.addPage(self.areaPositionPage) + self.previewPage = QtGui.QWizardPage() + self.previewPage.setObjectName("previewPage") + self.previewLayout = QtGui.QGridLayout(self.previewPage) + self.previewLayout.setMargin(20) + self.previewLayout.setSpacing(8) + self.previewLayout.setObjectName("previewLayout") + self.themeNameLabel = QtGui.QLabel(self.previewPage) + self.themeNameLabel.setTextFormat(QtCore.Qt.PlainText) + self.themeNameLabel.setObjectName("themeNameLabel") + self.previewLayout.addWidget(self.themeNameLabel, 0, 0, 1, 1) + self.previewLabel = QtGui.QLabel(self.previewPage) + self.previewLabel.setAlignment(QtCore.Qt.AlignCenter) + self.previewLabel.setObjectName("previewLabel") + self.previewLayout.addWidget(self.previewLabel, 2, 0, 1, 2) + self.themeNameEdit = QtGui.QLineEdit(self.previewPage) + self.themeNameEdit.setObjectName("themeNameEdit") + self.previewLayout.addWidget(self.themeNameEdit, 0, 1, 1, 1) + self.previewBoxLayout = QtGui.QHBoxLayout() + self.previewBoxLayout.setSpacing(0) + self.previewBoxLayout.setContentsMargins(0, 0, -1, -1) + self.previewBoxLayout.setObjectName("previewBoxLayout") + spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.previewBoxLayout.addItem(spacerItem2) + self.previewBoxLabel = QtGui.QLabel(self.previewPage) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.previewBoxLabel.sizePolicy().hasHeightForWidth()) + self.previewBoxLabel.setSizePolicy(sizePolicy) + self.previewBoxLabel.setMinimumSize(QtCore.QSize(300, 200)) + self.previewBoxLabel.setFrameShape(QtGui.QFrame.WinPanel) + self.previewBoxLabel.setFrameShadow(QtGui.QFrame.Sunken) + self.previewBoxLabel.setLineWidth(1) + self.previewBoxLabel.setText("") + self.previewBoxLabel.setScaledContents(True) + self.previewBoxLabel.setObjectName("previewBoxLabel") + self.previewBoxLayout.addWidget(self.previewBoxLabel) + spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.previewBoxLayout.addItem(spacerItem3) + self.previewLayout.addLayout(self.previewBoxLayout, 3, 0, 1, 2) + ThemeWizard.addPage(self.previewPage) + self.themeNameLabel.setBuddy(self.themeNameEdit) + + self.retranslateUi(ThemeWizard) + QtCore.QMetaObject.connectSlotsByName(ThemeWizard) + + def retranslateUi(self, ThemeWizard): + ThemeWizard.setWindowTitle(QtGui.QApplication.translate("ThemeWizard", "Theme Wizard", None, QtGui.QApplication.UnicodeUTF8)) + self.titleLabel.setText(QtGui.QApplication.translate("ThemeWizard", "\n" +"\n" +"

Welcome to the Theme Wizard

", None, QtGui.QApplication.UnicodeUTF8)) + self.informationLabel.setText(QtGui.QApplication.translate("ThemeWizard", "This wizard will help you to maintain Themes . Click the next button below to start the process by setting up your background.", None, QtGui.QApplication.UnicodeUTF8)) + self.backgroundPage.setTitle(QtGui.QApplication.translate("ThemeWizard", "Set Up Background", None, QtGui.QApplication.UnicodeUTF8)) + self.backgroundPage.setSubTitle(QtGui.QApplication.translate("ThemeWizard", "Set up your theme\'s background according to the parameters below.", None, QtGui.QApplication.UnicodeUTF8)) + self.backgroundTypeLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Background type:", None, QtGui.QApplication.UnicodeUTF8)) + self.backgroundTypeComboBox.setItemText(0, QtGui.QApplication.translate("ThemeWizard", "Solid Color", None, QtGui.QApplication.UnicodeUTF8)) + self.backgroundTypeComboBox.setItemText(1, QtGui.QApplication.translate("ThemeWizard", "Gradient", None, QtGui.QApplication.UnicodeUTF8)) + self.backgroundTypeComboBox.setItemText(2, QtGui.QApplication.translate("ThemeWizard", "Image", None, QtGui.QApplication.UnicodeUTF8)) + self.color1Label.setText(QtGui.QApplication.translate("ThemeWizard", "", None, QtGui.QApplication.UnicodeUTF8)) + self.color2Label.setText(QtGui.QApplication.translate("ThemeWizard", "", None, QtGui.QApplication.UnicodeUTF8)) + self.imageLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Image:", None, QtGui.QApplication.UnicodeUTF8)) + self.gradientLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Gradient:", None, QtGui.QApplication.UnicodeUTF8)) + self.gradientComboBox.setItemText(0, QtGui.QApplication.translate("ThemeWizard", "Horizontal", None, QtGui.QApplication.UnicodeUTF8)) + self.gradientComboBox.setItemText(1, QtGui.QApplication.translate("ThemeWizard", "Vertical", None, QtGui.QApplication.UnicodeUTF8)) + self.gradientComboBox.setItemText(2, QtGui.QApplication.translate("ThemeWizard", "Circular", None, QtGui.QApplication.UnicodeUTF8)) + self.mainAreaPage.setTitle(QtGui.QApplication.translate("ThemeWizard", "Main Area Font Details", None, QtGui.QApplication.UnicodeUTF8)) + self.mainAreaPage.setSubTitle(QtGui.QApplication.translate("ThemeWizard", "Define the font and display characteristics for the Display text", None, QtGui.QApplication.UnicodeUTF8)) + self.mainFontLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Font:", None, QtGui.QApplication.UnicodeUTF8)) + self.mainColorLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Color:", None, QtGui.QApplication.UnicodeUTF8)) + self.mainSizeLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Size:", None, QtGui.QApplication.UnicodeUTF8)) + self.mainSizeSpinBox.setSuffix(QtGui.QApplication.translate("ThemeWizard", "pt", None, QtGui.QApplication.UnicodeUTF8)) + self.mainLineCountLabel.setText(QtGui.QApplication.translate("ThemeWizard", "(%d lines per silde)", None, QtGui.QApplication.UnicodeUTF8)) + self.mainOutlineCheckBox.setText(QtGui.QApplication.translate("ThemeWizard", "&Outline:", None, QtGui.QApplication.UnicodeUTF8)) + self.mainShadowCheckBox.setText(QtGui.QApplication.translate("ThemeWizard", "&Shadow:", None, QtGui.QApplication.UnicodeUTF8)) + self.footerAreaPage.setTitle(QtGui.QApplication.translate("ThemeWizard", "Footer Area Font Details", None, QtGui.QApplication.UnicodeUTF8)) + self.footerAreaPage.setSubTitle(QtGui.QApplication.translate("ThemeWizard", "Define the font and display characteristics for the Footer text", None, QtGui.QApplication.UnicodeUTF8)) + self.footerFontLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Font:", None, QtGui.QApplication.UnicodeUTF8)) + self.footerColorLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Color:", None, QtGui.QApplication.UnicodeUTF8)) + self.footerSizeLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Size:", None, QtGui.QApplication.UnicodeUTF8)) + self.footerSizeSpinBox.setSuffix(QtGui.QApplication.translate("ThemeWizard", "pt", None, QtGui.QApplication.UnicodeUTF8)) + self.footerOutlineCheckBox.setText(QtGui.QApplication.translate("ThemeWizard", "&Outline:", None, QtGui.QApplication.UnicodeUTF8)) + self.footerShadowCheckBox.setText(QtGui.QApplication.translate("ThemeWizard", "&Shadow:", None, QtGui.QApplication.UnicodeUTF8)) + self.areaPositionPage.setTitle(QtGui.QApplication.translate("ThemeWizard", "Output Area Locations", None, QtGui.QApplication.UnicodeUTF8)) + self.areaPositionPage.setSubTitle(QtGui.QApplication.translate("ThemeWizard", "Allows you to change and move the Main and Footer areas.", None, QtGui.QApplication.UnicodeUTF8)) + self.mainPositionGroupBox.setTitle(QtGui.QApplication.translate("ThemeWizard", "&Main Area", None, QtGui.QApplication.UnicodeUTF8)) + self.mainDefaultPositionCheckBox.setText(QtGui.QApplication.translate("ThemeWizard", "&Use default location", None, QtGui.QApplication.UnicodeUTF8)) + self.nainXLabel.setText(QtGui.QApplication.translate("ThemeWizard", "X position:", None, QtGui.QApplication.UnicodeUTF8)) + self.mainXSpinBox.setSuffix(QtGui.QApplication.translate("ThemeWizard", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.mainYSpinBox.setSuffix(QtGui.QApplication.translate("ThemeWizard", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.mainYLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Y position:", None, QtGui.QApplication.UnicodeUTF8)) + self.mainWidthSpinBox.setSuffix(QtGui.QApplication.translate("ThemeWizard", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.mainWidthLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Width:", None, QtGui.QApplication.UnicodeUTF8)) + self.mainHeightSpinBox.setSuffix(QtGui.QApplication.translate("ThemeWizard", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.mainHeightLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Height:", None, QtGui.QApplication.UnicodeUTF8)) + self.footerPositionGroupBox.setTitle(QtGui.QApplication.translate("ThemeWizard", "Footer Area", None, QtGui.QApplication.UnicodeUTF8)) + self.footerXLabel.setText(QtGui.QApplication.translate("ThemeWizard", "X position:", None, QtGui.QApplication.UnicodeUTF8)) + self.footerXSpinBox.setSuffix(QtGui.QApplication.translate("ThemeWizard", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.footerYLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Y position:", None, QtGui.QApplication.UnicodeUTF8)) + self.footerYSpinBox.setSuffix(QtGui.QApplication.translate("ThemeWizard", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.footerWidthLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Width:", None, QtGui.QApplication.UnicodeUTF8)) + self.footerWidthSpinBox.setSuffix(QtGui.QApplication.translate("ThemeWizard", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.footerHeightLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Height:", None, QtGui.QApplication.UnicodeUTF8)) + self.footerHeightSpinBox.setSuffix(QtGui.QApplication.translate("ThemeWizard", "px", None, QtGui.QApplication.UnicodeUTF8)) + self.footerDefaultPositionCheckBox.setText(QtGui.QApplication.translate("ThemeWizard", "Use default location", None, QtGui.QApplication.UnicodeUTF8)) + self.previewPage.setTitle(QtGui.QApplication.translate("ThemeWizard", "Save and Preview", None, QtGui.QApplication.UnicodeUTF8)) + self.previewPage.setSubTitle(QtGui.QApplication.translate("ThemeWizard", "View the theme and save it replacing the current one or change the name to create a new theme", None, QtGui.QApplication.UnicodeUTF8)) + self.themeNameLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Theme name:", None, QtGui.QApplication.UnicodeUTF8)) + self.previewLabel.setText(QtGui.QApplication.translate("ThemeWizard", "Preview", None, QtGui.QApplication.UnicodeUTF8)) diff --git a/openlp/core/ui/themewizardform.py b/openlp/core/ui/themewizardform.py new file mode 100644 index 000000000..d47d4d3c8 --- /dev/null +++ b/openlp/core/ui/themewizardform.py @@ -0,0 +1,210 @@ +# -*- coding: utf-8 -*- +# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 + +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2010 Raoul Snyman # +# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael # +# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian # +# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, # +# Carsten Tinggaard, Frode Woldsund # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### + +import logging + +from PyQt4 import QtCore, QtGui + +from openlp.core.lib import translate +from themewizard import Ui_ThemeWizard + +log = logging.getLogger(__name__) + +class ThemeWizardForm(QtGui.QWizard, Ui_ThemeWizard): + """ + This is the Bible Import Wizard, which allows easy importing of Bibles + into OpenLP from other formats like OSIS, CSV and OpenSong. + """ + log.info(u'ThemeWizardForm loaded') + + def __init__(self, parent): + """ + Instantiate the wizard, and run any extra setup we need to. + + ``parent`` + The QWidget-derived parent of the wizard. + + ``manager`` + The Bible manager. + + ``bibleplugin`` + The Bible plugin. + """ + # Do not translate as internal + self.backgrounds = [u'solid', u'gradient', u'image'] + self.gradients = [u'horizontal', u'vertical', u'circular'] + QtGui.QWizard.__init__(self, parent) + self.setupUi(self) + self.registerFields() + self.finishButton = self.button(QtGui.QWizard.FinishButton) + self.cancelButton = self.button(QtGui.QWizard.CancelButton) + QtCore.QObject.connect(self.backgroundTypeComboBox, + QtCore.SIGNAL(u'currentIndexChanged(int)'), + self.onBackgroundComboBox) + QtCore.QObject.connect(self.gradientComboBox, + QtCore.SIGNAL(u'currentIndexChanged(int)'), + self.onGradientComboBox) + QtCore.QObject.connect(self.color1PushButton, + QtCore.SIGNAL(u'pressed()'), + self.onColor1PushButtonClicked) + QtCore.QObject.connect(self.color2PushButton, + QtCore.SIGNAL(u'pressed()'), + self.onColor2PushButtonClicked) + QtCore.QObject.connect(self.imageBrowseButton, + QtCore.SIGNAL(u'pressed()'), + self.onimageBrowseButtonClicked) + + def exec_(self): + """ + Run the wizard. + """ + self.setDefaults() + return QtGui.QWizard.exec_(self) + + def validateCurrentPage(self): + """ + Validate the current page before moving on to the next page. + """ + print "CURRENT id", self.currentId() + # Background Screen + if self.currentId() == 0: + print self.field(u'background_type').toString() + self.paintBackgroundScreen() + return True + + def paintBackgroundScreen(self): + if self.theme.background_type == u'solid': + self.setField(u'background_type', QtCore.QVariant(0)) + self.color1PushButton.setVisible(True) + self.color1Label.setVisible(True) + self.color1PushButton.setStyleSheet(u'background-color: %s' % + self.theme.background_color) + self.color1Label.setText( + translate('OpenLP.AmendThemeForm', 'Color:')) + self.color2PushButton.setVisible(False) + self.color2Label.setVisible(False) + self.gradientLabel.setVisible(False) + self.gradientComboBox.setVisible(False) + self.imageLabel.setVisible(False) + self.imageLineEdit.setVisible(False) + self.imageBrowseButton.setVisible(False) + self.imageLineEdit.setText(u'') + elif self.theme.background_type == u'gradient': + self.setField(u'background_type', QtCore.QVariant(1)) + self.color1PushButton.setVisible(True) + self.color1Label.setVisible(True) + self.color1PushButton.setStyleSheet(u'background-color: %s' % + self.theme.background_start_color) + self.color1Label.setText( + translate('OpenLP.AmendThemeForm', 'First color:')) + self.color2PushButton.setVisible(True) + self.color2Label.setVisible(True) + self.color2PushButton.setStyleSheet(u'background-color: %s' % + self.theme.background_end_color) + self.color2Label.setText( + translate('OpenLP.AmendThemeForm', 'Second color:')) + self.gradientLabel.setVisible(True) + self.gradientComboBox.setVisible(True) + self.imageLabel.setVisible(False) + self.imageLineEdit.setVisible(False) + self.imageBrowseButton.setVisible(False) + self.imageLineEdit.setText(u'') + else: + self.setField(u'background_type', QtCore.QVariant(2)) + self.color1PushButton.setVisible(False) + self.color1Label.setVisible(False) + self.color2PushButton.setVisible(False) + self.color2Label.setVisible(False) + self.gradientLabel.setVisible(False) + self.gradientComboBox.setVisible(False) + self.imageLineEdit.setVisible(True) + self.imageLabel.setVisible(True) + self.imageBrowseButton.setVisible(True) + self.imageLineEdit.setText(self.theme.background_filename) + if self.theme.background_direction == u'horizontal': + self.setField(u'gradient', QtCore.QVariant(0)) + elif self.theme.background_direction == u'vertical': + self.setField(u'gradient', QtCore.QVariant(1)) + else: + self.setField(u'gradient', QtCore.QVariant(2)) + + def setDefaults(self): + self.restart() + self.paintBackgroundScreen() + + def registerFields(self): + self.welcomePage.registerField( + u'background_type', self.backgroundTypeComboBox) + self.welcomePage.registerField( + u'color_1', self.color1PushButton) + self.welcomePage.registerField( + u'color_2', self.color2PushButton) + self.welcomePage.registerField( + u'background_image', self.imageLineEdit) + self.welcomePage.registerField( + u'gradient', self.gradientComboBox) + + def onBackgroundComboBox(self, index): + self.theme.background_type = self.backgrounds[index] + self.paintBackgroundScreen() + + def onGradientComboBox(self, index): + self.theme.background_direction = self.gradients[index] + self.paintBackgroundScreen() + + def onColor1PushButtonClicked(self): + if self.theme.background_type == u'solid': + self.theme.background_color = \ + self._colorButtonPushed(self.theme.background_color) + else: + self.theme.background_start_color = \ + self._colorButtonPushed(self.theme.background_start_color) + self.paintBackgroundScreen() + + def onColor2PushButtonClicked(self): + self.theme.background_end_color = \ + self._colorButtonPushed(self.theme.background_end_color) + self.paintBackgroundScreen() + + def onimageBrowseButtonClicked(self): + images_filter = get_images_filter() + images_filter = '%s;;%s (*.*) (*)' % (images_filter, + translate('OpenLP.AmendThemeForm', 'All Files')) + filename = QtGui.QFileDialog.getOpenFileName(self, + translate('OpenLP.AmendThemeForm', 'Select Image'), u'', + images_filter) + if filename: + self.theme.background_filename = filename + self.paintBackgroundScreen() + + def _colorButtonPushed(self, field): + new_color = QtGui.QColorDialog.getColor( + QtGui.QColor(field), self) + if new_color.isValid(): + field = new_color.name() + return field + + diff --git a/resources/forms/themewizard.ui b/resources/forms/themewizard.ui index a87052322..289d07113 100644 --- a/resources/forms/themewizard.ui +++ b/resources/forms/themewizard.ui @@ -1,13 +1,13 @@ - Wizard - + ThemeWizard + 0 0 - 559 - 487 + 550 + 386 @@ -20,9 +20,9 @@ QWizard::ModernStyle - QWizard::HaveCustomButton1|QWizard::NoBackButtonOnStartPage + QWizard::NoBackButtonOnStartPage - + @@ -37,7 +37,7 @@ 0 - + 163 @@ -57,7 +57,7 @@ - :/wizards/wizard_importbible.bmp + :/wizards/wizard_importbible.bmp 0 @@ -65,12 +65,12 @@ - + 8 - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> @@ -81,7 +81,7 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical @@ -97,9 +97,9 @@ p, li { white-space: pre-wrap; } - + - This wizard will help you to maintain Themes . Click the next button below to start the process.. + This wizard will help you to maintain Themes . Click the next button below to start the process by setting up your background. true @@ -110,7 +110,7 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical @@ -126,341 +126,339 @@ p, li { white-space: pre-wrap; } - + - Select Import Source + Set Up Background - Select the import format, and where to import from. + Set up your theme's background according to the parameters below. - + + + QFormLayout::ExpandingFieldsGrow + - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 8 + + + 8 + + + 20 - + + + Background type: + + + + + - - - Background: - - + + Solid Color + - - - - Opaque - - - - - Transparent - - - + + Gradient + - + + + Image + + + - - - - - Background Type: - - - - - - - - Solid Color - - - - - Gradient - - - - - Image - - - - - - - - - - - - <Color1> - - - - - - - - - - - - - - - - - - <Color2> - - - - - - - - - - - - - - - - - - Gradient : - - - - - - - - Horizontal - - - - - Vertical - - - - - Circular - - - - - - - - - - - - Image: - - - - - - - - - - ... - - - - - - - - - - Main Area Font Details - - - Define the font and display charaistics for the Display text - - - - + - Font: + <Color1> - + + + + + - + - Font Color: + <Color2> + + + + + + + + + + + + + + Image: - + + + 8 + + + + + + + + + + + + :/general/general_open.png:/general/general_open.png + + + + + + + - + Gradient: - - - Size: - - - - - - - - 0 - 0 - - - - - 70 - 0 - - - - pt - - - 999 - - - 16 - - - - - - - Wrap Indentation - - - - - - - - - - TextLabel - - - - - - - Show Outline: - - - - - - - - - - - - - - Outline Color: - - - - - - - - - - - - - - Show Shadow: - - - - - - - - - - - - - - Shadow Color: - - - - - - - - + + + + Horizontal + + + + + Vertical + + + + + Circular + + - + - Footer Area Font Details + Main Area Font Details - Define the font and display charaistics for the Footer text + Define the font and display characteristics for the Display text - + + + QFormLayout::ExpandingFieldsGrow + + + 8 + + + 8 + + + 50 + + + 20 + + + 20 + + + 20 + - + Font: - + - + - Font Color: + Color: - + - + Size: - + + + 8 + + + 0 + + + + + + 0 + 0 + + + + + 70 + 0 + + + + pt + + + 999 + + + 16 + + + + + + + (%d lines per silde) + + + + + + + + + &Outline: + + + + + + + false + + + + + + + + + + &Shadow: + + + + + + + false + + + + + + + + + + + Footer Area Font Details + + + Define the font and display characteristics for the Footer text + + + + QFormLayout::ExpandingFieldsGrow + + + 8 + + + 8 + + + 50 + + + 20 + + + 20 + + + 20 + + + + + Font: + + + + + + + + + + Color: + + + + + + + + + + + + + + Size: + + + + + 0 @@ -485,56 +483,34 @@ p, li { white-space: pre-wrap; } - + - Show Outline: + &Outline: - + + + false + - + - Shadow Color: + &Shadow: - - - + + + false - - - - - - Show Shadow: - - - - - - - - - - - - - - Outline Color: - - - - - @@ -542,316 +518,412 @@ p, li { white-space: pre-wrap; } - + - Text Display Layout + Output Area Locations Allows you to change and move the Main and Footer areas. - - - - + + 20 + + + 8 + + + + + + 248 + 0 + - - false + + &Main Area + + + 8 + + + 8 + + + 8 + + + + + &Use default location + + + true + + + false + + + + + + + X position: + + + + + + + false + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + 0 + + + + + + + false + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + + + + + Y position: + + + + + + + false + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + + + + + Width: + + + + + + + false + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + + + + + Height: + + + + - - - - - - Main Area - - - - - - - Footer Area - - - - - - - X Position: - - - - - - - - 0 - 0 - - - - - 78 - 0 - - - - px - - - 9999 - - - 0 - - - - - - - X Position: - - - - - - - - 0 - 0 - - - - - 78 - 0 - - - - px - - - 9999 - - - 0 - - - - - - - Y Position: - - - - - - - - 0 - 0 - - - - - 78 - 0 - - - - px - - - 9999 - - - - - - - Y Position: - - - - - - - - 0 - 0 - - - - - 78 - 0 - - - - px - - - 9999 - - - 0 - - - - - - - Width: - - - - - - - - 0 - 0 - - - - - 78 - 0 - - - - px - - - 9999 - - - - - - - Width: - - - - - - - - 78 - 0 - - - - px - - - 9999 - - - - - - - Height: - - - - - - - - 0 - 0 - - - - - 78 - 0 - - - - px - - - 9999 - - - - - - - Height: - - - - - - - - 78 - 0 - - - - px - - - 9999 - - - - - - - - - Use Default Location: + + + + + 248 + 0 + + + Footer Area + + + + 8 + + + 8 + + + 8 + + + + + X position: + + + + + + + false + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + 0 + + + + + + + Y position: + + + + + + + false + + + + 0 + 0 + + + + + 78 + 0 + + + + px + + + 9999 + + + 0 + + + + + + + Width: + + + + + + + false + + + + 78 + 0 + + + + px + + + 9999 + + + + + + + Height: + + + + + + + false + + + + 78 + 0 + + + + px + + + 9999 + + + + + + + Use default location + + + true + + + + - + Save and Preview View the theme and save it replacing the current one or change the name to create a new theme - + + + 20 + + + 8 + - - - - - Theme Name: - - - - - - - + + + Theme name: + + + Qt::PlainText + + + themeNameEdit + + - - + + + + Preview + + + Qt::AlignCenter + + + + + + + + + + 0 + + + 0 + + + 0 + - - - Preview + + + Qt::Horizontal - - Qt::AlignCenter + + + 40 + 20 + - + - + 0 @@ -861,7 +933,7 @@ p, li { white-space: pre-wrap; } 300 - 225 + 200 @@ -881,13 +953,27 @@ p, li { white-space: pre-wrap; } + + + + Qt::Horizontal + + + + 40 + 20 + + + + - + + From 4e8a7f47eb86c0d723e1d1dfbea8fc89884f1170 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Tue, 5 Oct 2010 20:52:28 +0100 Subject: [PATCH 003/126] Fix up theme xml handling to new schema --- openlp/core/lib/htmlbuilder.py | 46 +++--- openlp/core/lib/renderer.py | 6 +- openlp/core/lib/theme.py | 230 +++++++++++++++++------------- openlp/core/ui/thememanager.py | 4 +- openlp/core/ui/themewizard.py | 78 +++++++--- openlp/core/ui/themewizardform.py | 78 +++++++--- resources/forms/themewizard.ui | 114 +++++++++++---- 7 files changed, 355 insertions(+), 201 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 765d0f9fa..4bfe8e707 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -87,16 +87,16 @@ body { var transition = %s; function show_video(state, path, volume, loop){ - // Note, the preferred method for looping would be to use the + // Note, the preferred method for looping would be to use the // video tag loop attribute. // But QtWebKit doesn't support this. Neither does it support the // onended event, hence the setInterval() // In addition, setting the currentTime attribute to zero to restart // the video raises an INDEX_SIZE_ERROR: DOM Exception 1 - // To complicate it further, sometimes vid.currentTime stops + // To complicate it further, sometimes vid.currentTime stops // slightly short of vid.duration and vid.ended is intermittent! // - // Note, currently the background may go black between loops. Not + // Note, currently the background may go black between loops. Not // desirable. Need to investigate using two