openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #02794
[Merge] lp:~meths/openlp/trivialfixes into lp:openlp
Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Lots of naming and new line at end of file cleanups
--
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/31039
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.
=== modified file 'openlp.pyw'
--- openlp.pyw 2010-07-24 22:10:47 +0000
+++ openlp.pyw 2010-07-27 12:35:56 +0000
@@ -201,4 +201,4 @@
"""
Instantiate and run the application.
"""
- main()
\ No newline at end of file
+ main()
=== modified file 'openlp/__init__.py'
--- openlp/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/__init__.py 2010-07-27 12:35:56 +0000
@@ -25,4 +25,4 @@
###############################################################################
"""
The :mod:`openlp` module contains all the project produced OpenLP functionality
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/core/__init__.py'
--- openlp/core/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/core/__init__.py 2010-07-27 12:35:56 +0000
@@ -28,4 +28,4 @@
All the core functions of the OpenLP application including the GUI, settings,
logging and a plugin framework are contained within the openlp.core module.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/__init__.py 2010-07-27 12:35:56 +0000
@@ -219,4 +219,4 @@
from renderer import Renderer
from rendermanager import RenderManager
from mediamanageritem import MediaManagerItem
-from baselistwithdnd import BaseListWithDnD
\ No newline at end of file
+from baselistwithdnd import BaseListWithDnD
=== modified file 'openlp/core/lib/baselistwithdnd.py'
--- openlp/core/lib/baselistwithdnd.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/baselistwithdnd.py 2010-07-27 12:35:56 +0000
@@ -52,4 +52,4 @@
mimeData = QtCore.QMimeData()
drag.setMimeData(mimeData)
mimeData.setText(self.PluginName)
- drag.start(QtCore.Qt.CopyAction)
\ No newline at end of file
+ drag.start(QtCore.Qt.CopyAction)
=== modified file 'openlp/core/lib/db.py'
--- openlp/core/lib/db.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/db.py 2010-07-27 12:35:56 +0000
@@ -245,4 +245,4 @@
except InvalidRequestError:
self.session.rollback()
log.exception(u'Failed to delete %s records', object_class.__name__)
- return False
\ No newline at end of file
+ return False
=== modified file 'openlp/core/lib/dockwidget.py'
--- openlp/core/lib/dockwidget.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/dockwidget.py 2010-07-27 12:35:56 +0000
@@ -46,4 +46,4 @@
if name:
self.setObjectName(name)
self.setFloating(False)
- log.debug(u'Init done')
\ No newline at end of file
+ log.debug(u'Init done')
=== modified file 'openlp/core/lib/eventreceiver.py'
--- openlp/core/lib/eventreceiver.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/eventreceiver.py 2010-07-27 12:35:56 +0000
@@ -270,4 +270,4 @@
"""
Get the global ``eventreceiver`` instance.
"""
- return Receiver.eventreceiver
\ No newline at end of file
+ return Receiver.eventreceiver
=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/plugin.py 2010-07-27 12:35:56 +0000
@@ -288,4 +288,4 @@
``newTheme``
The new name the plugin should now use.
"""
- pass
\ No newline at end of file
+ pass
=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/pluginmanager.py 2010-07-27 12:35:56 +0000
@@ -219,4 +219,4 @@
for plugin in self.plugins:
if plugin.isActive():
plugin.finalise()
- log.info(u'Finalisation Complete for %s ' % plugin.name)
\ No newline at end of file
+ log.info(u'Finalisation Complete for %s ' % plugin.name)
=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/renderer.py 2010-07-27 12:35:56 +0000
@@ -593,4 +593,4 @@
"""
image.save(u'renderer.png', u'png')
if image2:
- image2.save(u'renderer2.png', u'png')
\ No newline at end of file
+ image2.save(u'renderer2.png', u'png')
=== modified file 'openlp/core/lib/rendermanager.py'
--- openlp/core/lib/rendermanager.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/rendermanager.py 2010-07-27 12:35:56 +0000
@@ -224,4 +224,4 @@
log.debug(u'calculate default %d, %d, %f',
self.width, self.height, self.screen_ratio )
# 90% is start of footer
- self.footer_start = int(self.height * 0.90)
\ No newline at end of file
+ self.footer_start = int(self.height * 0.90)
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/serviceitem.py 2010-07-27 12:35:56 +0000
@@ -389,4 +389,4 @@
"""
Clear's the service item's cache.
"""
- self.cache = {}
\ No newline at end of file
+ self.cache = {}
=== modified file 'openlp/core/lib/settingstab.py'
--- openlp/core/lib/settingstab.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/settingstab.py 2010-07-27 12:35:56 +0000
@@ -88,4 +88,4 @@
"""
Changes which need to be made after setup of application
"""
- pass
\ No newline at end of file
+ pass
=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/theme.py 2010-07-27 12:35:56 +0000
@@ -415,4 +415,4 @@
for key in dir(self):
if key[0:1] != u'_':
theme_strings.append(u'%30s: %s' % (key, getattr(self, key)))
- return u'\n'.join(theme_strings)
\ No newline at end of file
+ return u'\n'.join(theme_strings)
=== modified file 'openlp/core/lib/toolbar.py'
--- openlp/core/lib/toolbar.py 2010-07-24 22:10:47 +0000
+++ openlp/core/lib/toolbar.py 2010-07-27 12:35:56 +0000
@@ -154,4 +154,4 @@
push_button.setCheckable(True)
push_button.setFlat(True)
self.addWidget(push_button)
- return push_button
\ No newline at end of file
+ return push_button
=== modified file 'openlp/core/theme/__init__.py'
--- openlp/core/theme/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/core/theme/__init__.py 2010-07-27 12:35:56 +0000
@@ -24,4 +24,4 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-from openlp.core.theme.theme import Theme
\ No newline at end of file
+from openlp.core.theme.theme import Theme
=== modified file 'openlp/core/theme/theme.py'
--- openlp/core/theme/theme.py 2010-07-24 22:10:47 +0000
+++ openlp/core/theme/theme.py 2010-07-27 12:35:56 +0000
@@ -222,4 +222,4 @@
for key in dir(self):
if key[0:1] != u'_':
theme_strings.append(u'%30s : %s' % (key, getattr(self, key)))
- return u'\n'.join(theme_strings)
\ No newline at end of file
+ return u'\n'.join(theme_strings)
=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/__init__.py 2010-07-27 12:35:56 +0000
@@ -60,4 +60,4 @@
__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
- 'AmendThemeForm', 'MediaDockManager', 'ServiceItemEditForm']
\ No newline at end of file
+ 'AmendThemeForm', 'MediaDockManager', 'ServiceItemEditForm']
=== modified file 'openlp/core/ui/aboutform.py'
--- openlp/core/ui/aboutform.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/aboutform.py 2010-07-27 12:35:56 +0000
@@ -61,4 +61,4 @@
import webbrowser
url = u'http://www.openlp.org/en/documentation/introduction/' \
+ u'contributing.html'
- webbrowser.open_new(url)
\ No newline at end of file
+ webbrowser.open_new(url)
=== modified file 'openlp/core/ui/amendthemedialog.py'
--- openlp/core/ui/amendthemedialog.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/amendthemedialog.py 2010-07-27 12:35:56 +0000
@@ -29,801 +29,801 @@
from openlp.core.lib import build_icon, translate
class Ui_AmendThemeDialog(object):
- def setupUi(self, AmendThemeDialog):
- AmendThemeDialog.setObjectName(u'AmendThemeDialog')
- AmendThemeDialog.setWindowModality(QtCore.Qt.ApplicationModal)
- AmendThemeDialog.resize(586, 651)
+ def setupUi(self, amendThemeDialog):
+ amendThemeDialog.setObjectName(u'amendThemeDialog')
+ amendThemeDialog.setWindowModality(QtCore.Qt.ApplicationModal)
+ amendThemeDialog.resize(586, 651)
icon = build_icon(u':/icon/openlp-logo-16x16.png')
- AmendThemeDialog.setWindowIcon(icon)
- AmendThemeDialog.setModal(True)
- self.AmendThemeLayout = QtGui.QVBoxLayout(AmendThemeDialog)
- self.AmendThemeLayout.setSpacing(8)
- self.AmendThemeLayout.setMargin(8)
- self.AmendThemeLayout.setObjectName(u'AmendThemeLayout')
- self.ThemeNameWidget = QtGui.QWidget(AmendThemeDialog)
- self.ThemeNameWidget.setObjectName(u'ThemeNameWidget')
- self.ThemeNameLayout = QtGui.QHBoxLayout(self.ThemeNameWidget)
- self.ThemeNameLayout.setSpacing(8)
- self.ThemeNameLayout.setMargin(0)
- self.ThemeNameLayout.setObjectName(u'ThemeNameLayout')
- self.ThemeNameLabel = QtGui.QLabel(self.ThemeNameWidget)
- self.ThemeNameLabel.setObjectName(u'ThemeNameLabel')
- self.ThemeNameLayout.addWidget(self.ThemeNameLabel)
- self.ThemeNameEdit = QtGui.QLineEdit(self.ThemeNameWidget)
- self.ThemeNameEdit.setObjectName(u'ThemeNameEdit')
- self.ThemeNameLabel.setBuddy(self.ThemeNameEdit)
- self.ThemeNameLayout.addWidget(self.ThemeNameEdit)
- self.AmendThemeLayout.addWidget(self.ThemeNameWidget)
- self.ContentWidget = QtGui.QWidget(AmendThemeDialog)
- self.ContentWidget.setObjectName(u'ContentWidget')
- self.ContentLayout = QtGui.QHBoxLayout(self.ContentWidget)
- self.ContentLayout.setSpacing(8)
- self.ContentLayout.setMargin(0)
- self.ContentLayout.setObjectName(u'ContentLayout')
- self.ThemeTabWidget = QtGui.QTabWidget(self.ContentWidget)
- self.ThemeTabWidget.setObjectName(u'ThemeTabWidget')
- self.BackgroundTab = QtGui.QWidget()
- self.BackgroundTab.setObjectName(u'BackgroundTab')
- self.BackgroundLayout = QtGui.QFormLayout(self.BackgroundTab)
- self.BackgroundLayout.setMargin(8)
- self.BackgroundLayout.setSpacing(8)
- self.BackgroundLayout.setObjectName(u'BackgroundLayout')
- self.BackgroundLabel = QtGui.QLabel(self.BackgroundTab)
- self.BackgroundLabel.setObjectName(u'BackgroundLabel')
- self.BackgroundLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.BackgroundLabel)
- self.BackgroundComboBox = QtGui.QComboBox(self.BackgroundTab)
- self.BackgroundComboBox.setObjectName(u'BackgroundComboBox')
- self.BackgroundLabel.setBuddy(self.BackgroundComboBox)
- self.BackgroundComboBox.addItem(QtCore.QString())
- self.BackgroundComboBox.addItem(QtCore.QString())
- self.BackgroundLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
- self.BackgroundComboBox)
- self.BackgroundTypeLabel = QtGui.QLabel(self.BackgroundTab)
- self.BackgroundTypeLabel.setObjectName(u'BackgroundTypeLabel')
- self.BackgroundLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
- self.BackgroundTypeLabel)
- self.BackgroundTypeComboBox = QtGui.QComboBox(self.BackgroundTab)
- self.BackgroundTypeComboBox.setObjectName(u'BackgroundTypeComboBox')
- self.BackgroundTypeComboBox.addItem(QtCore.QString())
- self.BackgroundTypeComboBox.addItem(QtCore.QString())
- self.BackgroundTypeComboBox.addItem(QtCore.QString())
- self.BackgroundLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
- self.BackgroundTypeComboBox)
- self.Color1Label = QtGui.QLabel(self.BackgroundTab)
- self.Color1Label.setObjectName(u'Color1Label')
- self.BackgroundLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
- self.Color1Label)
- self.Color1PushButton = QtGui.QPushButton(self.BackgroundTab)
- self.Color1PushButton.setObjectName(u'Color1PushButton')
- self.BackgroundLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
- self.Color1PushButton)
- self.Color2Label = QtGui.QLabel(self.BackgroundTab)
- self.Color2Label.setObjectName(u'Color2Label')
- self.BackgroundLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
- self.Color2Label)
- self.Color2PushButton = QtGui.QPushButton(self.BackgroundTab)
- self.Color2PushButton.setObjectName(u'Color2PushButton')
- self.BackgroundLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
- self.Color2PushButton)
- self.ImageLabel = QtGui.QLabel(self.BackgroundTab)
- self.ImageLabel.setObjectName(u'ImageLabel')
- self.BackgroundLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
- self.ImageLabel)
- self.GradientLabel = QtGui.QLabel(self.BackgroundTab)
- self.GradientLabel.setObjectName(u'GradientLabel')
- self.BackgroundLayout.setWidget(6, QtGui.QFormLayout.LabelRole,
- self.GradientLabel)
- self.GradientComboBox = QtGui.QComboBox(self.BackgroundTab)
- self.GradientComboBox.setObjectName(u'GradientComboBox')
- self.GradientComboBox.addItem(QtCore.QString())
- self.GradientComboBox.addItem(QtCore.QString())
- self.GradientComboBox.addItem(QtCore.QString())
- self.BackgroundLayout.setWidget(6, QtGui.QFormLayout.FieldRole,
- self.GradientComboBox)
- self.ImageFilenameWidget = QtGui.QWidget(self.BackgroundTab)
- self.ImageFilenameWidget.setObjectName(u'ImageFilenameWidget')
- self.horizontalLayout_2 = QtGui.QHBoxLayout(self.ImageFilenameWidget)
- self.horizontalLayout_2.setSpacing(0)
- self.horizontalLayout_2.setMargin(0)
- self.horizontalLayout_2.setObjectName(u'horizontalLayout_2')
- self.ImageLineEdit = QtGui.QLineEdit(self.ImageFilenameWidget)
- self.ImageLineEdit.setObjectName(u'ImageLineEdit')
- self.horizontalLayout_2.addWidget(self.ImageLineEdit)
- self.ImageToolButton = QtGui.QToolButton(self.ImageFilenameWidget)
- self.ImageToolButton.setIcon(build_icon(u':/general/general_open.png'))
- self.ImageToolButton.setObjectName(u'ImageToolButton')
- self.ImageToolButton.setAutoRaise(True)
- self.horizontalLayout_2.addWidget(self.ImageToolButton)
- self.BackgroundLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
- self.ImageFilenameWidget)
- self.ThemeTabWidget.addTab(self.BackgroundTab, u'')
- self.FontMainTab = QtGui.QWidget()
- self.FontMainTab.setObjectName(u'FontMainTab')
- self.FontMainLayout = QtGui.QHBoxLayout(self.FontMainTab)
- self.FontMainLayout.setSpacing(8)
- self.FontMainLayout.setMargin(8)
- self.FontMainLayout.setObjectName(u'FontMainLayout')
- self.MainLeftWidget = QtGui.QWidget(self.FontMainTab)
- self.MainLeftWidget.setObjectName(u'MainLeftWidget')
- self.MainLeftLayout = QtGui.QVBoxLayout(self.MainLeftWidget)
- self.MainLeftLayout.setSpacing(8)
- self.MainLeftLayout.setMargin(0)
- self.MainLeftLayout.setObjectName(u'MainLeftLayout')
- self.FontMainGroupBox = QtGui.QGroupBox(self.MainLeftWidget)
- self.FontMainGroupBox.setObjectName(u'FontMainGroupBox')
- self.MainFontLayout = QtGui.QFormLayout(self.FontMainGroupBox)
- self.MainFontLayout.setFormAlignment(QtCore.Qt.AlignLeading |
+ amendThemeDialog.setWindowIcon(icon)
+ amendThemeDialog.setModal(True)
+ self.amendThemeLayout = QtGui.QVBoxLayout(amendThemeDialog)
+ self.amendThemeLayout.setSpacing(8)
+ self.amendThemeLayout.setMargin(8)
+ self.amendThemeLayout.setObjectName(u'amendThemeLayout')
+ self.themeNameWidget = QtGui.QWidget(amendThemeDialog)
+ self.themeNameWidget.setObjectName(u'themeNameWidget')
+ self.themeNameLayout = QtGui.QHBoxLayout(self.themeNameWidget)
+ self.themeNameLayout.setSpacing(8)
+ self.themeNameLayout.setMargin(0)
+ self.themeNameLayout.setObjectName(u'themeNameLayout')
+ self.themeNameLabel = QtGui.QLabel(self.themeNameWidget)
+ self.themeNameLabel.setObjectName(u'themeNameLabel')
+ self.themeNameLayout.addWidget(self.themeNameLabel)
+ self.themeNameEdit = QtGui.QLineEdit(self.themeNameWidget)
+ self.themeNameEdit.setObjectName(u'themeNameEdit')
+ self.themeNameLabel.setBuddy(self.themeNameEdit)
+ self.themeNameLayout.addWidget(self.themeNameEdit)
+ self.amendThemeLayout.addWidget(self.themeNameWidget)
+ self.contentWidget = QtGui.QWidget(amendThemeDialog)
+ self.contentWidget.setObjectName(u'contentWidget')
+ self.contentLayout = QtGui.QHBoxLayout(self.contentWidget)
+ self.contentLayout.setSpacing(8)
+ self.contentLayout.setMargin(0)
+ self.contentLayout.setObjectName(u'contentLayout')
+ self.themeTabWidget = QtGui.QTabWidget(self.contentWidget)
+ self.themeTabWidget.setObjectName(u'themeTabWidget')
+ self.backgroundTab = QtGui.QWidget()
+ self.backgroundTab.setObjectName(u'backgroundTab')
+ self.backgroundLayout = QtGui.QFormLayout(self.backgroundTab)
+ self.backgroundLayout.setMargin(8)
+ self.backgroundLayout.setSpacing(8)
+ self.backgroundLayout.setObjectName(u'backgroundLayout')
+ self.backgroundLabel = QtGui.QLabel(self.backgroundTab)
+ self.backgroundLabel.setObjectName(u'backgroundLabel')
+ self.backgroundLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.backgroundLabel)
+ self.backgroundComboBox = QtGui.QComboBox(self.backgroundTab)
+ self.backgroundComboBox.setObjectName(u'backgroundComboBox')
+ self.backgroundLabel.setBuddy(self.backgroundComboBox)
+ self.backgroundComboBox.addItem(QtCore.QString())
+ self.backgroundComboBox.addItem(QtCore.QString())
+ self.backgroundLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+ self.backgroundComboBox)
+ self.backgroundTypeLabel = QtGui.QLabel(self.backgroundTab)
+ self.backgroundTypeLabel.setObjectName(u'backgroundTypeLabel')
+ self.backgroundLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+ self.backgroundTypeLabel)
+ self.backgroundTypeComboBox = QtGui.QComboBox(self.backgroundTab)
+ self.backgroundTypeComboBox.setObjectName(u'backgroundTypeComboBox')
+ self.backgroundTypeComboBox.addItem(QtCore.QString())
+ self.backgroundTypeComboBox.addItem(QtCore.QString())
+ self.backgroundTypeComboBox.addItem(QtCore.QString())
+ self.backgroundLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+ self.backgroundTypeComboBox)
+ self.color1Label = QtGui.QLabel(self.backgroundTab)
+ self.color1Label.setObjectName(u'color1Label')
+ self.backgroundLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+ self.color1Label)
+ self.color1PushButton = QtGui.QPushButton(self.backgroundTab)
+ self.color1PushButton.setObjectName(u'color1PushButton')
+ self.backgroundLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+ self.color1PushButton)
+ self.color2Label = QtGui.QLabel(self.backgroundTab)
+ self.color2Label.setObjectName(u'color2Label')
+ self.backgroundLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
+ self.color2Label)
+ self.color2PushButton = QtGui.QPushButton(self.backgroundTab)
+ self.color2PushButton.setObjectName(u'color2PushButton')
+ self.backgroundLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
+ self.color2PushButton)
+ self.imageLabel = QtGui.QLabel(self.backgroundTab)
+ self.imageLabel.setObjectName(u'imageLabel')
+ self.backgroundLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
+ self.imageLabel)
+ self.gradientLabel = QtGui.QLabel(self.backgroundTab)
+ self.gradientLabel.setObjectName(u'gradientLabel')
+ self.backgroundLayout.setWidget(6, QtGui.QFormLayout.LabelRole,
+ self.gradientLabel)
+ self.gradientComboBox = QtGui.QComboBox(self.backgroundTab)
+ self.gradientComboBox.setObjectName(u'gradientComboBox')
+ self.gradientComboBox.addItem(QtCore.QString())
+ self.gradientComboBox.addItem(QtCore.QString())
+ self.gradientComboBox.addItem(QtCore.QString())
+ self.backgroundLayout.setWidget(6, QtGui.QFormLayout.FieldRole,
+ self.gradientComboBox)
+ self.imageFilenameWidget = QtGui.QWidget(self.backgroundTab)
+ self.imageFilenameWidget.setObjectName(u'imageFilenameWidget')
+ self.horizontalLayout2 = QtGui.QHBoxLayout(self.imageFilenameWidget)
+ self.horizontalLayout2.setSpacing(0)
+ self.horizontalLayout2.setMargin(0)
+ self.horizontalLayout2.setObjectName(u'horizontalLayout2')
+ self.imageLineEdit = QtGui.QLineEdit(self.imageFilenameWidget)
+ self.imageLineEdit.setObjectName(u'imageLineEdit')
+ self.horizontalLayout2.addWidget(self.imageLineEdit)
+ self.imageToolButton = QtGui.QToolButton(self.imageFilenameWidget)
+ self.imageToolButton.setIcon(build_icon(u':/general/general_open.png'))
+ self.imageToolButton.setObjectName(u'imageToolButton')
+ self.imageToolButton.setAutoRaise(True)
+ self.horizontalLayout2.addWidget(self.imageToolButton)
+ self.backgroundLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
+ self.imageFilenameWidget)
+ self.themeTabWidget.addTab(self.backgroundTab, u'')
+ self.fontMainTab = QtGui.QWidget()
+ self.fontMainTab.setObjectName(u'fontMainTab')
+ self.fontMainLayout = QtGui.QHBoxLayout(self.fontMainTab)
+ self.fontMainLayout.setSpacing(8)
+ self.fontMainLayout.setMargin(8)
+ self.fontMainLayout.setObjectName(u'fontMainLayout')
+ self.mainLeftWidget = QtGui.QWidget(self.fontMainTab)
+ self.mainLeftWidget.setObjectName(u'mainLeftWidget')
+ self.mainLeftLayout = QtGui.QVBoxLayout(self.mainLeftWidget)
+ self.mainLeftLayout.setSpacing(8)
+ self.mainLeftLayout.setMargin(0)
+ self.mainLeftLayout.setObjectName(u'mainLeftLayout')
+ self.fontMainGroupBox = QtGui.QGroupBox(self.mainLeftWidget)
+ self.fontMainGroupBox.setObjectName(u'fontMainGroupBox')
+ self.mainFontLayout = QtGui.QFormLayout(self.fontMainGroupBox)
+ self.mainFontLayout.setFormAlignment(QtCore.Qt.AlignLeading |
QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
- self.MainFontLayout.setMargin(8)
- self.MainFontLayout.setSpacing(8)
- self.MainFontLayout.setObjectName(u'MainFontLayout')
- self.FontMainlabel = QtGui.QLabel(self.FontMainGroupBox)
- self.FontMainlabel.setObjectName(u'FontMainlabel')
- self.MainFontLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.FontMainlabel)
- self.FontMainComboBox = QtGui.QFontComboBox(self.FontMainGroupBox)
- self.FontMainComboBox.setObjectName(u'FontMainComboBox')
- self.MainFontLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
- self.FontMainComboBox)
- self.FontMainColorLabel = QtGui.QLabel(self.FontMainGroupBox)
- self.FontMainColorLabel.setObjectName(u'FontMainColorLabel')
- self.MainFontLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
- self.FontMainColorLabel)
- self.FontMainColorPushButton = QtGui.QPushButton(self.FontMainGroupBox)
- self.FontMainColorPushButton.setObjectName(u'FontMainColorPushButton')
- self.MainFontLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
- self.FontMainColorPushButton)
- self.FontMainSize = QtGui.QLabel(self.FontMainGroupBox)
- self.FontMainSize.setObjectName(u'FontMainSize')
- self.MainFontLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
- self.FontMainSize)
- self.FontMainSizeSpinBox = QtGui.QSpinBox(self.FontMainGroupBox)
+ self.mainFontLayout.setMargin(8)
+ self.mainFontLayout.setSpacing(8)
+ self.mainFontLayout.setObjectName(u'mainFontLayout')
+ self.fontMainlabel = QtGui.QLabel(self.fontMainGroupBox)
+ self.fontMainlabel.setObjectName(u'fontMainlabel')
+ self.mainFontLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.fontMainlabel)
+ self.fontMainComboBox = QtGui.QFontComboBox(self.fontMainGroupBox)
+ self.fontMainComboBox.setObjectName(u'fontMainComboBox')
+ self.mainFontLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+ self.fontMainComboBox)
+ self.fontMainColorLabel = QtGui.QLabel(self.fontMainGroupBox)
+ self.fontMainColorLabel.setObjectName(u'fontMainColorLabel')
+ self.mainFontLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+ self.fontMainColorLabel)
+ self.fontMainColorPushButton = QtGui.QPushButton(self.fontMainGroupBox)
+ self.fontMainColorPushButton.setObjectName(u'fontMainColorPushButton')
+ self.mainFontLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+ self.fontMainColorPushButton)
+ self.fontMainSize = QtGui.QLabel(self.fontMainGroupBox)
+ self.fontMainSize.setObjectName(u'fontMainSize')
+ self.mainFontLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+ self.fontMainSize)
+ self.fontMainSizeSpinBox = QtGui.QSpinBox(self.fontMainGroupBox)
defaultSizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Fixed)
defaultSizePolicy.setHeightForWidth(
- self.FontMainSizeSpinBox.sizePolicy().hasHeightForWidth())
- self.FontMainSizeSpinBox.setSizePolicy(defaultSizePolicy)
- self.FontMainSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0))
- self.FontMainSizeSpinBox.setProperty(u'value', QtCore.QVariant(16))
- self.FontMainSizeSpinBox.setMaximum(999)
- self.FontMainSizeSpinBox.setObjectName(u'FontMainSizeSpinBox')
- self.MainFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
- self.FontMainSizeSpinBox)
- self.FontMainWeightComboBox = QtGui.QComboBox(self.FontMainGroupBox)
- self.FontMainWeightComboBox.setObjectName(u'FontMainWeightComboBox')
- self.FontMainWeightComboBox.addItem(QtCore.QString())
- self.FontMainWeightComboBox.addItem(QtCore.QString())
- self.FontMainWeightComboBox.addItem(QtCore.QString())
- self.FontMainWeightComboBox.addItem(QtCore.QString())
- self.MainFontLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
- self.FontMainWeightComboBox)
- self.FontMainWeightLabel = QtGui.QLabel(self.FontMainGroupBox)
- self.FontMainWeightLabel.setObjectName(u'FontMainWeightLabel')
- self.MainFontLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
- self.FontMainWeightLabel)
- self.MainLeftLayout.addWidget(self.FontMainGroupBox)
- self.FontMainWrapLineAdjustmentLabel = QtGui.QLabel(
- self.FontMainGroupBox)
- self.FontMainWrapLineAdjustmentLabel.setObjectName(
- u'FontMainWrapLineAdjustmentLabel')
- self.MainFontLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
- self.FontMainWrapLineAdjustmentLabel)
- self.FontMainLineAdjustmentSpinBox = QtGui.QSpinBox(
- self.FontMainGroupBox)
- self.FontMainLineAdjustmentSpinBox.setObjectName(
- u'FontMainLineAdjustmentSpinBox')
- self.FontMainLineAdjustmentSpinBox.setMinimum(-99)
- self.MainFontLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
- self.FontMainLineAdjustmentSpinBox)
- self.FontMainWrapIndentationLabel = QtGui.QLabel(self.FontMainGroupBox)
- self.FontMainWrapIndentationLabel.setObjectName(
- u'FontMainWrapIndentationLabel')
- self.MainFontLayout.setWidget(5, QtGui.QFormLayout.LabelRole,
- self.FontMainWrapIndentationLabel)
- self.FontMainLineSpacingSpinBox = QtGui.QSpinBox(self.FontMainGroupBox)
- self.FontMainLineSpacingSpinBox.setObjectName(
- u'FontMainLineSpacingSpinBox')
- self.FontMainLineSpacingSpinBox.setMaximum(10)
- self.MainFontLayout.setWidget(5, QtGui.QFormLayout.FieldRole,
- self.FontMainLineSpacingSpinBox)
- self.FontMainLinesPageLabel = QtGui.QLabel(self.FontMainGroupBox)
- self.FontMainLinesPageLabel.setObjectName(u'FontMainLinesPageLabel')
- self.MainFontLayout.addRow(self.FontMainLinesPageLabel)
+ self.fontMainSizeSpinBox.sizePolicy().hasHeightForWidth())
+ self.fontMainSizeSpinBox.setSizePolicy(defaultSizePolicy)
+ self.fontMainSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0))
+ self.fontMainSizeSpinBox.setProperty(u'value', QtCore.QVariant(16))
+ self.fontMainSizeSpinBox.setMaximum(999)
+ self.fontMainSizeSpinBox.setObjectName(u'fontMainSizeSpinBox')
+ self.mainFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+ self.fontMainSizeSpinBox)
+ self.fontMainWeightComboBox = QtGui.QComboBox(self.fontMainGroupBox)
+ self.fontMainWeightComboBox.setObjectName(u'fontMainWeightComboBox')
+ self.fontMainWeightComboBox.addItem(QtCore.QString())
+ self.fontMainWeightComboBox.addItem(QtCore.QString())
+ self.fontMainWeightComboBox.addItem(QtCore.QString())
+ self.fontMainWeightComboBox.addItem(QtCore.QString())
+ self.mainFontLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
+ self.fontMainWeightComboBox)
+ self.fontMainWeightLabel = QtGui.QLabel(self.fontMainGroupBox)
+ self.fontMainWeightLabel.setObjectName(u'fontMainWeightLabel')
+ self.mainFontLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
+ self.fontMainWeightLabel)
+ self.mainLeftLayout.addWidget(self.fontMainGroupBox)
+ self.fontMainWrapLineAdjustmentLabel = QtGui.QLabel(
+ self.fontMainGroupBox)
+ self.fontMainWrapLineAdjustmentLabel.setObjectName(
+ u'fontMainWrapLineAdjustmentLabel')
+ self.mainFontLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
+ self.fontMainWrapLineAdjustmentLabel)
+ self.fontMainLineAdjustmentSpinBox = QtGui.QSpinBox(
+ self.fontMainGroupBox)
+ self.fontMainLineAdjustmentSpinBox.setObjectName(
+ u'fontMainLineAdjustmentSpinBox')
+ self.fontMainLineAdjustmentSpinBox.setMinimum(-99)
+ self.mainFontLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
+ self.fontMainLineAdjustmentSpinBox)
+ self.fontMainWrapIndentationLabel = QtGui.QLabel(self.fontMainGroupBox)
+ self.fontMainWrapIndentationLabel.setObjectName(
+ u'fontMainWrapIndentationLabel')
+ self.mainFontLayout.setWidget(5, QtGui.QFormLayout.LabelRole,
+ self.fontMainWrapIndentationLabel)
+ self.fontMainLineSpacingSpinBox = QtGui.QSpinBox(self.fontMainGroupBox)
+ self.fontMainLineSpacingSpinBox.setObjectName(
+ u'fontMainLineSpacingSpinBox')
+ self.fontMainLineSpacingSpinBox.setMaximum(10)
+ self.mainFontLayout.setWidget(5, QtGui.QFormLayout.FieldRole,
+ self.fontMainLineSpacingSpinBox)
+ self.fontMainLinesPageLabel = QtGui.QLabel(self.fontMainGroupBox)
+ self.fontMainLinesPageLabel.setObjectName(u'fontMainLinesPageLabel')
+ self.mainFontLayout.addRow(self.fontMainLinesPageLabel)
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(u'MainRightWidget')
- self.MainRightLayout = QtGui.QVBoxLayout(self.MainRightWidget)
- self.MainRightLayout.setSpacing(8)
- self.MainRightLayout.setMargin(0)
- self.MainRightLayout.setObjectName(u'MainRightLayout')
- self.MainLocationGroupBox = QtGui.QGroupBox(self.MainRightWidget)
- self.MainLocationGroupBox.setObjectName(u'MainLocationGroupBox')
- self.MainLocationLayout = QtGui.QFormLayout(self.MainLocationGroupBox)
- self.MainLocationLayout.setMargin(8)
- self.MainLocationLayout.setSpacing(8)
- self.MainLocationLayout.setObjectName(u'MainLocationLayout')
- self.DefaultLocationLabel = QtGui.QLabel(self.MainLocationGroupBox)
- self.DefaultLocationLabel.setObjectName(u'DefaultLocationLabel')
- self.MainLocationLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.DefaultLocationLabel)
- self.FontMainDefaultCheckBox = QtGui.QCheckBox(
- self.MainLocationGroupBox)
- self.FontMainDefaultCheckBox.setTristate(False)
- self.FontMainDefaultCheckBox.setObjectName(u'FontMainDefaultCheckBox')
- self.MainLocationLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
- self.FontMainDefaultCheckBox)
- self.FontMainXLabel = QtGui.QLabel(self.MainLocationGroupBox)
- self.FontMainXLabel.setObjectName(u'FontMainXLabel')
- self.MainLocationLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
- self.FontMainXLabel)
- self.FontMainYLabel = QtGui.QLabel(self.MainLocationGroupBox)
- self.FontMainYLabel.setObjectName(u'FontMainYLabel')
- self.MainLocationLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
- self.FontMainYLabel)
- self.FontMainWidthLabel = QtGui.QLabel(self.MainLocationGroupBox)
- self.FontMainWidthLabel.setObjectName(u'FontMainWidthLabel')
- self.MainLocationLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
- self.FontMainWidthLabel)
- self.FontMainHeightLabel = QtGui.QLabel(self.MainLocationGroupBox)
- self.FontMainHeightLabel.setObjectName(u'FontMainHeightLabel')
- self.MainLocationLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
- self.FontMainHeightLabel)
- self.FontMainXSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox)
- defaultSizePolicy.setHeightForWidth(
- self.FontMainXSpinBox.sizePolicy().hasHeightForWidth())
- self.FontMainXSpinBox.setSizePolicy(defaultSizePolicy)
- self.FontMainXSpinBox.setMinimumSize(QtCore.QSize(78, 0))
- self.FontMainXSpinBox.setProperty(u'value', QtCore.QVariant(0))
- self.FontMainXSpinBox.setMaximum(9999)
- self.FontMainXSpinBox.setObjectName(u'FontMainXSpinBox')
- self.MainLocationLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
- self.FontMainXSpinBox)
- self.FontMainYSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox)
- defaultSizePolicy.setHeightForWidth(
- self.FontMainYSpinBox.sizePolicy().hasHeightForWidth())
- self.FontMainYSpinBox.setSizePolicy(defaultSizePolicy)
- self.FontMainYSpinBox.setMinimumSize(QtCore.QSize(78, 0))
- self.FontMainYSpinBox.setMaximum(9999)
- self.FontMainYSpinBox.setObjectName(u'FontMainYSpinBox')
- self.MainLocationLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
- self.FontMainYSpinBox)
- self.FontMainWidthSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox)
- defaultSizePolicy.setHeightForWidth(
- self.FontMainWidthSpinBox.sizePolicy().hasHeightForWidth())
- self.FontMainWidthSpinBox.setSizePolicy(defaultSizePolicy)
- self.FontMainWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0))
- self.FontMainWidthSpinBox.setMaximum(9999)
- self.FontMainWidthSpinBox.setObjectName(u'FontMainWidthSpinBox')
- self.MainLocationLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
- self.FontMainWidthSpinBox)
- self.FontMainHeightSpinBox = QtGui.QSpinBox(self.MainLocationGroupBox)
- defaultSizePolicy.setHeightForWidth(
- self.FontMainHeightSpinBox.sizePolicy().hasHeightForWidth())
- self.FontMainHeightSpinBox.setSizePolicy(defaultSizePolicy)
- self.FontMainHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0))
- self.FontMainHeightSpinBox.setMaximum(9999)
- self.FontMainHeightSpinBox.setObjectName(u'FontMainHeightSpinBox')
- self.MainLocationLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
- self.FontMainHeightSpinBox)
- self.MainRightLayout.addWidget(self.MainLocationGroupBox)
+ self.mainLeftLayout.addItem(spacerItem1)
+ self.fontMainLayout.addWidget(self.mainLeftWidget)
+ self.mainRightWidget = QtGui.QWidget(self.fontMainTab)
+ self.mainRightWidget.setObjectName(u'mainRightWidget')
+ self.mainRightLayout = QtGui.QVBoxLayout(self.mainRightWidget)
+ self.mainRightLayout.setSpacing(8)
+ self.mainRightLayout.setMargin(0)
+ self.mainRightLayout.setObjectName(u'mainRightLayout')
+ self.mainLocationGroupBox = QtGui.QGroupBox(self.mainRightWidget)
+ self.mainLocationGroupBox.setObjectName(u'mainLocationGroupBox')
+ self.mainLocationLayout = QtGui.QFormLayout(self.mainLocationGroupBox)
+ self.mainLocationLayout.setMargin(8)
+ self.mainLocationLayout.setSpacing(8)
+ self.mainLocationLayout.setObjectName(u'mainLocationLayout')
+ self.defaultLocationLabel = QtGui.QLabel(self.mainLocationGroupBox)
+ self.defaultLocationLabel.setObjectName(u'defaultLocationLabel')
+ self.mainLocationLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.defaultLocationLabel)
+ self.fontMainDefaultCheckBox = QtGui.QCheckBox(
+ self.mainLocationGroupBox)
+ self.fontMainDefaultCheckBox.setTristate(False)
+ self.fontMainDefaultCheckBox.setObjectName(u'fontMainDefaultCheckBox')
+ self.mainLocationLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+ self.fontMainDefaultCheckBox)
+ self.fontMainXLabel = QtGui.QLabel(self.mainLocationGroupBox)
+ self.fontMainXLabel.setObjectName(u'fontMainXLabel')
+ self.mainLocationLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+ self.fontMainXLabel)
+ self.fontMainYLabel = QtGui.QLabel(self.mainLocationGroupBox)
+ self.fontMainYLabel.setObjectName(u'fontMainYLabel')
+ self.mainLocationLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+ self.fontMainYLabel)
+ self.fontMainWidthLabel = QtGui.QLabel(self.mainLocationGroupBox)
+ self.fontMainWidthLabel.setObjectName(u'fontMainWidthLabel')
+ self.mainLocationLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
+ self.fontMainWidthLabel)
+ self.fontMainHeightLabel = QtGui.QLabel(self.mainLocationGroupBox)
+ self.fontMainHeightLabel.setObjectName(u'fontMainHeightLabel')
+ self.mainLocationLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
+ self.fontMainHeightLabel)
+ self.fontMainXSpinBox = QtGui.QSpinBox(self.mainLocationGroupBox)
+ defaultSizePolicy.setHeightForWidth(
+ self.fontMainXSpinBox.sizePolicy().hasHeightForWidth())
+ self.fontMainXSpinBox.setSizePolicy(defaultSizePolicy)
+ self.fontMainXSpinBox.setMinimumSize(QtCore.QSize(78, 0))
+ self.fontMainXSpinBox.setProperty(u'value', QtCore.QVariant(0))
+ self.fontMainXSpinBox.setMaximum(9999)
+ self.fontMainXSpinBox.setObjectName(u'fontMainXSpinBox')
+ self.mainLocationLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+ self.fontMainXSpinBox)
+ self.fontMainYSpinBox = QtGui.QSpinBox(self.mainLocationGroupBox)
+ defaultSizePolicy.setHeightForWidth(
+ self.fontMainYSpinBox.sizePolicy().hasHeightForWidth())
+ self.fontMainYSpinBox.setSizePolicy(defaultSizePolicy)
+ self.fontMainYSpinBox.setMinimumSize(QtCore.QSize(78, 0))
+ self.fontMainYSpinBox.setMaximum(9999)
+ self.fontMainYSpinBox.setObjectName(u'fontMainYSpinBox')
+ self.mainLocationLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+ self.fontMainYSpinBox)
+ self.fontMainWidthSpinBox = QtGui.QSpinBox(self.mainLocationGroupBox)
+ defaultSizePolicy.setHeightForWidth(
+ self.fontMainWidthSpinBox.sizePolicy().hasHeightForWidth())
+ self.fontMainWidthSpinBox.setSizePolicy(defaultSizePolicy)
+ self.fontMainWidthSpinBox.setMinimumSize(QtCore.QSize(78, 0))
+ self.fontMainWidthSpinBox.setMaximum(9999)
+ self.fontMainWidthSpinBox.setObjectName(u'fontMainWidthSpinBox')
+ self.mainLocationLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
+ self.fontMainWidthSpinBox)
+ self.fontMainHeightSpinBox = QtGui.QSpinBox(self.mainLocationGroupBox)
+ defaultSizePolicy.setHeightForWidth(
+ self.fontMainHeightSpinBox.sizePolicy().hasHeightForWidth())
+ self.fontMainHeightSpinBox.setSizePolicy(defaultSizePolicy)
+ self.fontMainHeightSpinBox.setMinimumSize(QtCore.QSize(78, 0))
+ self.fontMainHeightSpinBox.setMaximum(9999)
+ self.fontMainHeightSpinBox.setObjectName(u'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, u'')
- self.FontFooterTab = QtGui.QWidget()
- self.FontFooterTab.setObjectName(u'FontFooterTab')
- self.FontFooterLayout = QtGui.QHBoxLayout(self.FontFooterTab)
- self.FontFooterLayout.setSpacing(8)
- self.FontFooterLayout.setMargin(8)
- self.FontFooterLayout.setObjectName(u'FontFooterLayout')
- self.FooterLeftWidget = QtGui.QWidget(self.FontFooterTab)
- self.FooterLeftWidget.setObjectName(u'FooterLeftWidget')
- self.FooterLeftLayout = QtGui.QVBoxLayout(self.FooterLeftWidget)
- self.FooterLeftLayout.setSpacing(8)
- self.FooterLeftLayout.setMargin(0)
- self.FooterLeftLayout.setObjectName(u'FooterLeftLayout')
- self.FooterFontGroupBox = QtGui.QGroupBox(self.FooterLeftWidget)
- self.FooterFontGroupBox.setObjectName(u'FooterFontGroupBox')
- self.FooterFontLayout = QtGui.QFormLayout(self.FooterFontGroupBox)
- self.FooterFontLayout.setFieldGrowthPolicy(
+ self.mainRightLayout.addItem(spacerItem2)
+ self.fontMainLayout.addWidget(self.mainRightWidget)
+ self.themeTabWidget.addTab(self.fontMainTab, u'')
+ self.fontFooterTab = QtGui.QWidget()
+ self.fontFooterTab.setObjectName(u'fontFooterTab')
+ self.fontFooterLayout = QtGui.QHBoxLayout(self.fontFooterTab)
+ self.fontFooterLayout.setSpacing(8)
+ self.fontFooterLayout.setMargin(8)
+ self.fontFooterLayout.setObjectName(u'fontFooterLayout')
+ self.footerLeftWidget = QtGui.QWidget(self.fontFooterTab)
+ self.footerLeftWidget.setObjectName(u'footerLeftWidget')
+ self.footerLeftLayout = QtGui.QVBoxLayout(self.footerLeftWidget)
+ self.footerLeftLayout.setSpacing(8)
+ self.footerLeftLayout.setMargin(0)
+ self.footerLeftLayout.setObjectName(u'footerLeftLayout')
+ self.footerFontGroupBox = QtGui.QGroupBox(self.footerLeftWidget)
+ self.footerFontGroupBox.setObjectName(u'footerFontGroupBox')
+ self.footerFontLayout = QtGui.QFormLayout(self.footerFontGroupBox)
+ self.footerFontLayout.setFieldGrowthPolicy(
QtGui.QFormLayout.ExpandingFieldsGrow)
- self.FooterFontLayout.setFormAlignment(QtCore.Qt.AlignLeading |
+ self.footerFontLayout.setFormAlignment(QtCore.Qt.AlignLeading |
QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
- self.FooterFontLayout.setMargin(8)
- self.FooterFontLayout.setSpacing(8)
- self.FooterFontLayout.setObjectName(u'FooterFontLayout')
- self.FontFooterLabel = QtGui.QLabel(self.FooterFontGroupBox)
- self.FontFooterLabel.setObjectName(u'FontFooterLabel')
- self.FooterFontLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.FontFooterLabel)
- self.FontFooterComboBox = QtGui.QFontComboBox(self.FooterFontGroupBox)
- self.FontFooterComboBox.setObjectName(u'FontFooterComboBox')
- self.FooterFontLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
- self.FontFooterComboBox)
- self.FontFooterColorLabel = QtGui.QLabel(self.FooterFontGroupBox)
- self.FontFooterColorLabel.setObjectName(u'FontFooterColorLabel')
- self.FooterFontLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
- self.FontFooterColorLabel)
- self.FontFooterColorPushButton = QtGui.QPushButton(
- self.FooterFontGroupBox)
- self.FontFooterColorPushButton.setObjectName(
- u'FontFooterColorPushButton')
- self.FooterFontLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
- self.FontFooterColorPushButton)
- self.FontFooterSizeLabel = QtGui.QLabel(self.FooterFontGroupBox)
- self.FontFooterSizeLabel.setObjectName(u'FontFooterSizeLabel')
- self.FooterFontLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
- self.FontFooterSizeLabel)
- self.FontFooterSizeSpinBox = QtGui.QSpinBox(self.FooterFontGroupBox)
+ self.footerFontLayout.setMargin(8)
+ self.footerFontLayout.setSpacing(8)
+ self.footerFontLayout.setObjectName(u'footerFontLayout')
+ self.fontFooterLabel = QtGui.QLabel(self.footerFontGroupBox)
+ self.fontFooterLabel.setObjectName(u'fontFooterLabel')
+ self.footerFontLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.fontFooterLabel)
+ self.fontFooterComboBox = QtGui.QFontComboBox(self.footerFontGroupBox)
+ self.fontFooterComboBox.setObjectName(u'fontFooterComboBox')
+ self.footerFontLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+ self.fontFooterComboBox)
+ self.fontFooterColorLabel = QtGui.QLabel(self.footerFontGroupBox)
+ self.fontFooterColorLabel.setObjectName(u'fontFooterColorLabel')
+ self.footerFontLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+ self.fontFooterColorLabel)
+ self.fontFooterColorPushButton = QtGui.QPushButton(
+ self.footerFontGroupBox)
+ self.fontFooterColorPushButton.setObjectName(
+ u'fontFooterColorPushButton')
+ self.footerFontLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+ self.fontFooterColorPushButton)
+ self.fontFooterSizeLabel = QtGui.QLabel(self.footerFontGroupBox)
+ self.fontFooterSizeLabel.setObjectName(u'fontFooterSizeLabel')
+ self.footerFontLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+ self.fontFooterSizeLabel)
+ self.fontFooterSizeSpinBox = QtGui.QSpinBox(self.footerFontGroupBox)
defaultSizePolicy.setHeightForWidth(
- self.FontFooterSizeSpinBox.sizePolicy().hasHeightForWidth())
- self.FontFooterSizeSpinBox.setSizePolicy(defaultSizePolicy)
- self.FontFooterSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0))
- self.FontFooterSizeSpinBox.setProperty(u'value', QtCore.QVariant(10))
- self.FontFooterSizeSpinBox.setMaximum(999)
- self.FontFooterSizeSpinBox.setObjectName(u'FontFooterSizeSpinBox')
- self.FooterFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
- self.FontFooterSizeSpinBox)
- self.FontFooterWeightComboBox = QtGui.QComboBox(self.FooterFontGroupBox)
- self.FontFooterWeightComboBox.setObjectName(u'FontFooterWeightComboBox')
- self.FontFooterWeightComboBox.addItem(QtCore.QString())
- self.FontFooterWeightComboBox.addItem(QtCore.QString())
- self.FontFooterWeightComboBox.addItem(QtCore.QString())
- self.FontFooterWeightComboBox.addItem(QtCore.QString())
- self.FooterFontLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
- self.FontFooterWeightComboBox)
- self.FontFooterWeightLabel = QtGui.QLabel(self.FooterFontGroupBox)
- self.FontFooterWeightLabel.setObjectName(u'FontFooterWeightLabel')
- self.FooterFontLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
- self.FontFooterWeightLabel)
- self.FooterLeftLayout.addWidget(self.FooterFontGroupBox)
+ self.fontFooterSizeSpinBox.sizePolicy().hasHeightForWidth())
+ self.fontFooterSizeSpinBox.setSizePolicy(defaultSizePolicy)
+ self.fontFooterSizeSpinBox.setMinimumSize(QtCore.QSize(70, 0))
+ self.fontFooterSizeSpinBox.setProperty(u'value', QtCore.QVariant(10))
+ self.fontFooterSizeSpinBox.setMaximum(999)
+ self.fontFooterSizeSpinBox.setObjectName(u'fontFooterSizeSpinBox')
+ self.footerFontLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+ self.fontFooterSizeSpinBox)
+ self.fontFooterWeightComboBox = QtGui.QComboBox(self.footerFontGroupBox)
+ self.fontFooterWeightComboBox.setObjectName(u'fontFooterWeightComboBox')
+ self.fontFooterWeightComboBox.addItem(QtCore.QString())
+ self.fontFooterWeightComboBox.addItem(QtCore.QString())
+ self.fontFooterWeightComboBox.addItem(QtCore.QString())
+ self.fontFooterWeightComboBox.addItem(QtCore.QString())
+ self.footerFontLayout.setWidget(3, QtGui.QFormLayout.FieldRole,
+ self.fontFooterWeightComboBox)
+ self.fontFooterWeightLabel = QtGui.QLabel(self.footerFontGroupBox)
+ self.fontFooterWeightLabel.setObjectName(u'fontFooterWeightLabel')
+ self.footerFontLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
+ self.fontFooterWeightLabel)
+ 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(u'FooterRightWidget')
- self.FooterRightLayout = QtGui.QVBoxLayout(self.FooterRightWidget)
- self.FooterRightLayout.setSpacing(8)
- self.FooterRightLayout.setMargin(0)
- self.FooterRightLayout.setObjectName(u'FooterRightLayout')
- self.LocationFooterGroupBox = QtGui.QGroupBox(self.FooterRightWidget)
- self.LocationFooterGroupBox.setObjectName(u'LocationFooterGroupBox')
- self.LocationFooterLayout = QtGui.QFormLayout(
- self.LocationFooterGroupBox)
- self.LocationFooterLayout.setFieldGrowthPolicy(
+ self.footerLeftLayout.addItem(spacerItem3)
+ self.fontFooterLayout.addWidget(self.footerLeftWidget)
+ self.footerRightWidget = QtGui.QWidget(self.fontFooterTab)
+ self.footerRightWidget.setObjectName(u'footerRightWidget')
+ self.footerRightLayout = QtGui.QVBoxLayout(self.footerRightWidget)
+ self.footerRightLayout.setSpacing(8)
+ self.footerRightLayout.setMargin(0)
+ self.footerRightLayout.setObjectName(u'footerRightLayout')
+ self.locationFooterGroupBox = QtGui.QGroupBox(self.footerRightWidget)
+ self.locationFooterGroupBox.setObjectName(u'locationFooterGroupBox')
+ self.locationFooterLayout = QtGui.QFormLayout(
+ self.locationFooterGroupBox)
+ self.locationFooterLayout.setFieldGrowthPolicy(
QtGui.QFormLayout.ExpandingFieldsGrow)
- self.LocationFooterLayout.setFormAlignment(QtCore.Qt.AlignLeading |
+ self.locationFooterLayout.setFormAlignment(QtCore.Qt.AlignLeading |
QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
- self.LocationFooterLayout.setMargin(8)
- self.LocationFooterLayout.setSpacing(8)
- self.LocationFooterLayout.setObjectName(u'LocationFooterLayout')
- self.FontFooterDefaultLabel = QtGui.QLabel(self.LocationFooterGroupBox)
- self.FontFooterDefaultLabel.setObjectName(u'FontFooterDefaultLabel')
- self.LocationFooterLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.FontFooterDefaultLabel)
- self.FontFooterDefaultCheckBox = QtGui.QCheckBox(
- self.LocationFooterGroupBox)
- self.FontFooterDefaultCheckBox.setTristate(False)
- self.FontFooterDefaultCheckBox.setObjectName(
- u'FontFooterDefaultCheckBox')
- self.LocationFooterLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
- self.FontFooterDefaultCheckBox)
- self.FontFooterXLabel = QtGui.QLabel(self.LocationFooterGroupBox)
- self.FontFooterXLabel.setObjectName(u'FontFooterXLabel')
- self.LocationFooterLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
- self.FontFooterXLabel)
- self.FontFooterYLabel = QtGui.QLabel(self.LocationFooterGroupBox)
- self.FontFooterYLabel.setObjectName(u'FontFooterYLabel')
- self.LocationFooterLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
- self.FontFooterYLabel)
- self.FontFooterWidthLabel = QtGui.QLabel(self.LocationFooterGroupBox)
- self.FontFooterWidthLabel.setObjectName(u'FontFooterWidthLabel')
- self.LocationFooterLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
- self.FontFooterWidthLabel)
- self.FontFooterHeightLabel = QtGui.QLabel(self.LocationFooterGroupBox)
- self.FontFooterHeightLabel.setObjectName(u'FontFooterHeightLabel')
- self.LocationFooterLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
- self.FontFooterHeightLabel)
- self.FontFooterXSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox)
- defaultSizePolicy.setHeightForWidth(
- self.FontFooterXSpinBox.sizePolicy().hasHeightForWidth())
- self.FontFooterXSpinBox.setSizePolicy(defaultSizePolicy)
- self.FontFooterXSpinBox.setMinimumSize(QtCore.QSize(78, 0))
- self.FontFooterXSpinBox.setProperty(u'value', QtCore.QVariant(0))
- self.FontFooterXSpinBox.setMaximum(9999)
- self.FontFooterXSpinBox.setObjectName(u'FontFooterXSpinBox')
- self.LocationFooterLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
- self.FontFooterXSpinBox)
- self.FontFooterYSpinBox = QtGui.QSpinBox(self.LocationFooterGroupBox)
- defaultSizePolicy.setHeightForWidth(
- self.FontFooterXSpinBox.sizePolicy().hasHeightForWidth())
- self.FontFooterYSpinBox.setSizePolicy(defaultSizePolicy)
- self.FontFooterYSpinBox.setMinimumSize(QtCore.QSize(78, 0))
- self.FontFooterYSpinBox.setProperty(u'value', QtCore.QVariant(0))
- self.FontFooterYSpinBox.setMaximum(9999)
- self.FontFooterYSpinBox.setObjectName(u'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(u'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(u'FontFooterHeightSpinBox')
- self.LocationFooterLayout.setWidget(4, QtGui.QFormLayout.FieldRole,
- self.FontFooterHeightSpinBox)
- self.FooterRightLayout.addWidget(self.LocationFooterGroupBox)
+ self.locationFooterLayout.setMargin(8)
+ self.locationFooterLayout.setSpacing(8)
+ self.locationFooterLayout.setObjectName(u'locationFooterLayout')
+ self.fontFooterDefaultLabel = QtGui.QLabel(self.locationFooterGroupBox)
+ self.fontFooterDefaultLabel.setObjectName(u'fontFooterDefaultLabel')
+ self.locationFooterLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.fontFooterDefaultLabel)
+ self.fontFooterDefaultCheckBox = QtGui.QCheckBox(
+ self.locationFooterGroupBox)
+ self.fontFooterDefaultCheckBox.setTristate(False)
+ self.fontFooterDefaultCheckBox.setObjectName(
+ u'fontFooterDefaultCheckBox')
+ self.locationFooterLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+ self.fontFooterDefaultCheckBox)
+ self.fontFooterXLabel = QtGui.QLabel(self.locationFooterGroupBox)
+ self.fontFooterXLabel.setObjectName(u'fontFooterXLabel')
+ self.locationFooterLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+ self.fontFooterXLabel)
+ self.fontFooterYLabel = QtGui.QLabel(self.locationFooterGroupBox)
+ self.fontFooterYLabel.setObjectName(u'fontFooterYLabel')
+ self.locationFooterLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+ self.fontFooterYLabel)
+ self.fontFooterWidthLabel = QtGui.QLabel(self.locationFooterGroupBox)
+ self.fontFooterWidthLabel.setObjectName(u'fontFooterWidthLabel')
+ self.locationFooterLayout.setWidget(3, QtGui.QFormLayout.LabelRole,
+ self.fontFooterWidthLabel)
+ self.fontFooterHeightLabel = QtGui.QLabel(self.locationFooterGroupBox)
+ self.fontFooterHeightLabel.setObjectName(u'fontFooterHeightLabel')
+ self.locationFooterLayout.setWidget(4, QtGui.QFormLayout.LabelRole,
+ self.fontFooterHeightLabel)
+ self.fontFooterXSpinBox = QtGui.QSpinBox(self.locationFooterGroupBox)
+ defaultSizePolicy.setHeightForWidth(
+ self.fontFooterXSpinBox.sizePolicy().hasHeightForWidth())
+ self.fontFooterXSpinBox.setSizePolicy(defaultSizePolicy)
+ self.fontFooterXSpinBox.setMinimumSize(QtCore.QSize(78, 0))
+ self.fontFooterXSpinBox.setProperty(u'value', QtCore.QVariant(0))
+ self.fontFooterXSpinBox.setMaximum(9999)
+ self.fontFooterXSpinBox.setObjectName(u'fontFooterXSpinBox')
+ self.locationFooterLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+ self.fontFooterXSpinBox)
+ self.fontFooterYSpinBox = QtGui.QSpinBox(self.locationFooterGroupBox)
+ defaultSizePolicy.setHeightForWidth(
+ self.fontFooterXSpinBox.sizePolicy().hasHeightForWidth())
+ self.fontFooterYSpinBox.setSizePolicy(defaultSizePolicy)
+ self.fontFooterYSpinBox.setMinimumSize(QtCore.QSize(78, 0))
+ self.fontFooterYSpinBox.setProperty(u'value', QtCore.QVariant(0))
+ self.fontFooterYSpinBox.setMaximum(9999)
+ self.fontFooterYSpinBox.setObjectName(u'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(u'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(u'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, u'')
- self.OtherOptionsTab = QtGui.QWidget()
- self.OtherOptionsTab.setObjectName(u'OtherOptionsTab')
- self.OtherOptionsLayout = QtGui.QHBoxLayout(self.OtherOptionsTab)
- self.OtherOptionsLayout.setSpacing(8)
- self.OtherOptionsLayout.setMargin(8)
- self.OtherOptionsLayout.setObjectName(u'OtherOptionsLayout')
- self.OptionsLeftWidget = QtGui.QWidget(self.OtherOptionsTab)
- self.OptionsLeftWidget.setObjectName(u'OptionsLeftWidget')
- self.OptionsLeftLayout = QtGui.QVBoxLayout(self.OptionsLeftWidget)
- self.OptionsLeftLayout.setSpacing(8)
- self.OptionsLeftLayout.setMargin(0)
- self.OptionsLeftLayout.setObjectName(u'OptionsLeftLayout')
- self.OutlineGroupBox = QtGui.QGroupBox(self.OptionsLeftWidget)
- self.OutlineGroupBox.setObjectName(u'OutlineGroupBox')
- self.verticalLayout = QtGui.QVBoxLayout(self.OutlineGroupBox)
- self.verticalLayout.setSpacing(8)
- self.verticalLayout.setMargin(8)
- self.verticalLayout.setObjectName(u'verticalLayout')
- self.OutlineWidget = QtGui.QWidget(self.OutlineGroupBox)
- self.OutlineWidget.setObjectName(u'OutlineWidget')
- self.OutlineLayout = QtGui.QFormLayout(self.OutlineWidget)
- self.OutlineLayout.setMargin(0)
- self.OutlineLayout.setSpacing(8)
- self.OutlineLayout.setObjectName(u'OutlineLayout')
- self.OutlineCheckBox = QtGui.QCheckBox(self.OutlineWidget)
- self.OutlineCheckBox.setObjectName(u'OutlineCheckBox')
- self.OutlineLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
- self.OutlineCheckBox)
- self.OutlineSpinBox = QtGui.QSpinBox(self.OutlineWidget)
- self.OutlineSpinBox.setObjectName(u'OutlineSpinBox')
- self.OutlineSpinBox.setMaximum(10)
- self.OutlineLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
- self.OutlineSpinBox)
- self.OutlineSpinBoxLabel = QtGui.QLabel(self.OutlineWidget)
- self.OutlineSpinBoxLabel.setObjectName(u'OutlineSpinBoxLabel')
- self.OutlineLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
- self.OutlineSpinBoxLabel)
- self.OutlineColorLabel = QtGui.QLabel(self.OutlineWidget)
- self.OutlineColorLabel.setObjectName(u'OutlineColorLabel')
- self.OutlineLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
- self.OutlineColorLabel)
- self.OutlineColorPushButton = QtGui.QPushButton(self.OutlineWidget)
- self.OutlineColorPushButton.setObjectName(u'OutlineColorPushButton')
- self.OutlineLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
- self.OutlineColorPushButton)
- self.OutlineEnabledLabel = QtGui.QLabel(self.OutlineWidget)
- self.OutlineEnabledLabel.setObjectName(u'OutlineEnabledLabel')
- self.OutlineLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.OutlineEnabledLabel)
- self.verticalLayout.addWidget(self.OutlineWidget)
- self.OptionsLeftLayout.addWidget(self.OutlineGroupBox)
- self.ShadowGroupBox = QtGui.QGroupBox(self.OptionsLeftWidget)
- self.ShadowGroupBox.setObjectName(u'ShadowGroupBox')
- self.verticalLayout = QtGui.QVBoxLayout(self.ShadowGroupBox)
- self.verticalLayout.setSpacing(8)
- self.verticalLayout.setMargin(8)
- self.verticalLayout.setObjectName(u'verticalLayout')
- self.ShadowWidget = QtGui.QWidget(self.ShadowGroupBox)
- self.ShadowWidget.setObjectName(u'ShadowWidget')
- self.ShadowLayout = QtGui.QFormLayout(self.ShadowWidget)
- self.ShadowLayout.setMargin(0)
- self.ShadowLayout.setSpacing(8)
- self.ShadowLayout.setObjectName(u'ShadowLayout')
- self.ShadowCheckBox = QtGui.QCheckBox(self.ShadowWidget)
- self.ShadowCheckBox.setObjectName(u'ShadowCheckBox')
- self.ShadowLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
- self.ShadowCheckBox)
- self.ShadowSpinBox = QtGui.QSpinBox(self.OutlineWidget)
- self.ShadowSpinBox.setObjectName(u'ShadowSpinBox')
- self.ShadowSpinBox.setMaximum(10)
- self.ShadowLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
- self.ShadowSpinBox)
- self.ShadowSpinBoxLabel = QtGui.QLabel(self.OutlineWidget)
- self.ShadowSpinBoxLabel.setObjectName(u'ShadowSpinBoxLabel')
- self.ShadowLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
- self.ShadowSpinBoxLabel)
- self.ShadowColorLabel = QtGui.QLabel(self.ShadowWidget)
- self.ShadowColorLabel.setObjectName(u'ShadowColorLabel')
- self.ShadowLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
- self.ShadowColorLabel)
- self.ShadowColorPushButton = QtGui.QPushButton(self.ShadowWidget)
- self.ShadowColorPushButton.setObjectName(u'ShadowColorPushButton')
- self.ShadowLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
- self.ShadowColorPushButton)
- self.ShadowEnabledLabel = QtGui.QLabel(self.ShadowWidget)
- self.ShadowEnabledLabel.setObjectName(u'ShadowEnabledLabel')
- self.ShadowLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.ShadowEnabledLabel)
- self.verticalLayout.addWidget(self.ShadowWidget)
- self.OptionsLeftLayout.addWidget(self.ShadowGroupBox)
+ self.footerRightLayout.addItem(spacerItem4)
+ self.fontFooterLayout.addWidget(self.footerRightWidget)
+ self.themeTabWidget.addTab(self.fontFooterTab, u'')
+ self.otherOptionsTab = QtGui.QWidget()
+ self.otherOptionsTab.setObjectName(u'otherOptionsTab')
+ self.otherOptionsLayout = QtGui.QHBoxLayout(self.otherOptionsTab)
+ self.otherOptionsLayout.setSpacing(8)
+ self.otherOptionsLayout.setMargin(8)
+ self.otherOptionsLayout.setObjectName(u'otherOptionsLayout')
+ self.optionsLeftWidget = QtGui.QWidget(self.otherOptionsTab)
+ self.optionsLeftWidget.setObjectName(u'optionsLeftWidget')
+ self.optionsLeftLayout = QtGui.QVBoxLayout(self.optionsLeftWidget)
+ self.optionsLeftLayout.setSpacing(8)
+ self.optionsLeftLayout.setMargin(0)
+ self.optionsLeftLayout.setObjectName(u'optionsLeftLayout')
+ self.outlineGroupBox = QtGui.QGroupBox(self.optionsLeftWidget)
+ self.outlineGroupBox.setObjectName(u'outlineGroupBox')
+ self.verticalLayout = QtGui.QVBoxLayout(self.outlineGroupBox)
+ self.verticalLayout.setSpacing(8)
+ self.verticalLayout.setMargin(8)
+ self.verticalLayout.setObjectName(u'verticalLayout')
+ self.outlineWidget = QtGui.QWidget(self.outlineGroupBox)
+ self.outlineWidget.setObjectName(u'outlineWidget')
+ self.outlineLayout = QtGui.QFormLayout(self.outlineWidget)
+ self.outlineLayout.setMargin(0)
+ self.outlineLayout.setSpacing(8)
+ self.outlineLayout.setObjectName(u'outlineLayout')
+ self.outlineCheckBox = QtGui.QCheckBox(self.outlineWidget)
+ self.outlineCheckBox.setObjectName(u'outlineCheckBox')
+ self.outlineLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+ self.outlineCheckBox)
+ self.outlineSpinBox = QtGui.QSpinBox(self.outlineWidget)
+ self.outlineSpinBox.setObjectName(u'outlineSpinBox')
+ self.outlineSpinBox.setMaximum(10)
+ self.outlineLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+ self.outlineSpinBox)
+ self.outlineSpinBoxLabel = QtGui.QLabel(self.outlineWidget)
+ self.outlineSpinBoxLabel.setObjectName(u'outlineSpinBoxLabel')
+ self.outlineLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+ self.outlineSpinBoxLabel)
+ self.outlineColorLabel = QtGui.QLabel(self.outlineWidget)
+ self.outlineColorLabel.setObjectName(u'outlineColorLabel')
+ self.outlineLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+ self.outlineColorLabel)
+ self.outlineColorPushButton = QtGui.QPushButton(self.outlineWidget)
+ self.outlineColorPushButton.setObjectName(u'outlineColorPushButton')
+ self.outlineLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+ self.outlineColorPushButton)
+ self.outlineEnabledLabel = QtGui.QLabel(self.outlineWidget)
+ self.outlineEnabledLabel.setObjectName(u'outlineEnabledLabel')
+ self.outlineLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.outlineEnabledLabel)
+ self.verticalLayout.addWidget(self.outlineWidget)
+ self.optionsLeftLayout.addWidget(self.outlineGroupBox)
+ self.shadowGroupBox = QtGui.QGroupBox(self.optionsLeftWidget)
+ self.shadowGroupBox.setObjectName(u'shadowGroupBox')
+ self.verticalLayout = QtGui.QVBoxLayout(self.shadowGroupBox)
+ self.verticalLayout.setSpacing(8)
+ self.verticalLayout.setMargin(8)
+ self.verticalLayout.setObjectName(u'verticalLayout')
+ self.shadowWidget = QtGui.QWidget(self.shadowGroupBox)
+ self.shadowWidget.setObjectName(u'shadowWidget')
+ self.shadowLayout = QtGui.QFormLayout(self.shadowWidget)
+ self.shadowLayout.setMargin(0)
+ self.shadowLayout.setSpacing(8)
+ self.shadowLayout.setObjectName(u'shadowLayout')
+ self.shadowCheckBox = QtGui.QCheckBox(self.shadowWidget)
+ self.shadowCheckBox.setObjectName(u'shadowCheckBox')
+ self.shadowLayout.setWidget(0, QtGui.QFormLayout.FieldRole,
+ self.shadowCheckBox)
+ self.shadowSpinBox = QtGui.QSpinBox(self.outlineWidget)
+ self.shadowSpinBox.setObjectName(u'shadowSpinBox')
+ self.shadowSpinBox.setMaximum(10)
+ self.shadowLayout.setWidget(1, QtGui.QFormLayout.FieldRole,
+ self.shadowSpinBox)
+ self.shadowSpinBoxLabel = QtGui.QLabel(self.outlineWidget)
+ self.shadowSpinBoxLabel.setObjectName(u'shadowSpinBoxLabel')
+ self.shadowLayout.setWidget(1, QtGui.QFormLayout.LabelRole,
+ self.shadowSpinBoxLabel)
+ self.shadowColorLabel = QtGui.QLabel(self.shadowWidget)
+ self.shadowColorLabel.setObjectName(u'shadowColorLabel')
+ self.shadowLayout.setWidget(2, QtGui.QFormLayout.LabelRole,
+ self.shadowColorLabel)
+ self.shadowColorPushButton = QtGui.QPushButton(self.shadowWidget)
+ self.shadowColorPushButton.setObjectName(u'shadowColorPushButton')
+ self.shadowLayout.setWidget(2, QtGui.QFormLayout.FieldRole,
+ self.shadowColorPushButton)
+ self.shadowEnabledLabel = QtGui.QLabel(self.shadowWidget)
+ self.shadowEnabledLabel.setObjectName(u'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(u'OptionsRightWidget')
- self.OptionsRightLayout = QtGui.QVBoxLayout(self.OptionsRightWidget)
- self.OptionsRightLayout.setSpacing(8)
- self.OptionsRightLayout.setMargin(0)
- self.OptionsRightLayout.setObjectName(u'OptionsRightLayout')
- self.AlignmentGroupBox = QtGui.QGroupBox(self.OptionsRightWidget)
- self.AlignmentGroupBox.setObjectName(u'AlignmentGroupBox')
- self.gridLayout_4 = QtGui.QGridLayout(self.AlignmentGroupBox)
- self.gridLayout_4.setObjectName(u'gridLayout_4')
- self.HorizontalLabel = QtGui.QLabel(self.AlignmentGroupBox)
- self.HorizontalLabel.setObjectName(u'HorizontalLabel')
- self.gridLayout_4.addWidget(self.HorizontalLabel, 0, 0, 1, 1)
- self.HorizontalComboBox = QtGui.QComboBox(self.AlignmentGroupBox)
- self.HorizontalComboBox.setObjectName(u'HorizontalComboBox')
- self.HorizontalComboBox.addItem(QtCore.QString())
- self.HorizontalComboBox.addItem(QtCore.QString())
- self.HorizontalComboBox.addItem(QtCore.QString())
- self.gridLayout_4.addWidget(self.HorizontalComboBox, 0, 1, 1, 1)
- self.VerticalLabel = QtGui.QLabel(self.AlignmentGroupBox)
- self.VerticalLabel.setObjectName(u'VerticalLabel')
- self.gridLayout_4.addWidget(self.VerticalLabel, 1, 0, 1, 1)
- self.VerticalComboBox = QtGui.QComboBox(self.AlignmentGroupBox)
- self.VerticalComboBox.setObjectName(u'VerticalComboBox')
- self.VerticalComboBox.addItem(QtCore.QString())
- self.VerticalComboBox.addItem(QtCore.QString())
- self.VerticalComboBox.addItem(QtCore.QString())
- self.gridLayout_4.addWidget(self.VerticalComboBox, 1, 1, 1, 1)
- self.OptionsRightLayout.addWidget(self.AlignmentGroupBox)
- self.TransitionGroupBox = QtGui.QGroupBox(self.OptionsRightWidget)
- self.TransitionGroupBox.setObjectName(u'TransitionGroupBox')
- self.gridLayout_5 = QtGui.QGridLayout(self.TransitionGroupBox)
- self.gridLayout_5.setObjectName(u'gridLayout_5')
- self.SlideTransitionCheckBoxLabel = QtGui.QLabel(
- self.TransitionGroupBox)
- self.SlideTransitionCheckBoxLabel.setObjectName(
- u'SlideTransitionCheckBoxLabel')
- self.gridLayout_5.addWidget(
- self.SlideTransitionCheckBoxLabel, 0, 0, 1, 1)
- self.SlideTransitionCheckBox = QtGui.QCheckBox(self.AlignmentGroupBox)
- self.SlideTransitionCheckBox.setTristate(False)
- self.gridLayout_5.addWidget(self.SlideTransitionCheckBox, 0, 1, 1, 1)
- self.OptionsRightLayout.addWidget(self.TransitionGroupBox)
+ self.optionsLeftLayout.addItem(spacerItem5)
+ self.otherOptionsLayout.addWidget(self.optionsLeftWidget)
+ self.optionsRightWidget = QtGui.QWidget(self.otherOptionsTab)
+ self.optionsRightWidget.setObjectName(u'optionsRightWidget')
+ self.optionsRightLayout = QtGui.QVBoxLayout(self.optionsRightWidget)
+ self.optionsRightLayout.setSpacing(8)
+ self.optionsRightLayout.setMargin(0)
+ self.optionsRightLayout.setObjectName(u'optionsRightLayout')
+ self.alignmentGroupBox = QtGui.QGroupBox(self.optionsRightWidget)
+ self.alignmentGroupBox.setObjectName(u'alignmentGroupBox')
+ self.gridLayout4 = QtGui.QGridLayout(self.alignmentGroupBox)
+ self.gridLayout4.setObjectName(u'gridLayout4')
+ self.horizontalLabel = QtGui.QLabel(self.alignmentGroupBox)
+ self.horizontalLabel.setObjectName(u'horizontalLabel')
+ self.gridLayout4.addWidget(self.horizontalLabel, 0, 0, 1, 1)
+ self.horizontalComboBox = QtGui.QComboBox(self.alignmentGroupBox)
+ self.horizontalComboBox.setObjectName(u'horizontalComboBox')
+ self.horizontalComboBox.addItem(QtCore.QString())
+ self.horizontalComboBox.addItem(QtCore.QString())
+ self.horizontalComboBox.addItem(QtCore.QString())
+ self.gridLayout4.addWidget(self.horizontalComboBox, 0, 1, 1, 1)
+ self.verticalLabel = QtGui.QLabel(self.alignmentGroupBox)
+ self.verticalLabel.setObjectName(u'verticalLabel')
+ self.gridLayout4.addWidget(self.verticalLabel, 1, 0, 1, 1)
+ self.verticalComboBox = QtGui.QComboBox(self.alignmentGroupBox)
+ self.verticalComboBox.setObjectName(u'verticalComboBox')
+ self.verticalComboBox.addItem(QtCore.QString())
+ self.verticalComboBox.addItem(QtCore.QString())
+ self.verticalComboBox.addItem(QtCore.QString())
+ self.gridLayout4.addWidget(self.verticalComboBox, 1, 1, 1, 1)
+ self.optionsRightLayout.addWidget(self.alignmentGroupBox)
+ self.transitionGroupBox = QtGui.QGroupBox(self.optionsRightWidget)
+ self.transitionGroupBox.setObjectName(u'transitionGroupBox')
+ self.gridLayout5 = QtGui.QGridLayout(self.transitionGroupBox)
+ self.gridLayout5.setObjectName(u'gridLayout5')
+ self.slideTransitionCheckBoxLabel = QtGui.QLabel(
+ self.transitionGroupBox)
+ self.slideTransitionCheckBoxLabel.setObjectName(
+ u'slideTransitionCheckBoxLabel')
+ self.gridLayout5.addWidget(
+ self.slideTransitionCheckBoxLabel, 0, 0, 1, 1)
+ self.slideTransitionCheckBox = QtGui.QCheckBox(self.alignmentGroupBox)
+ self.slideTransitionCheckBox.setTristate(False)
+ self.gridLayout5.addWidget(self.slideTransitionCheckBox, 0, 1, 1, 1)
+ self.optionsRightLayout.addWidget(self.transitionGroupBox)
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, u'')
- self.ContentLayout.addWidget(self.ThemeTabWidget)
- self.AmendThemeLayout.addWidget(self.ContentWidget)
- self.PreviewGroupBox = QtGui.QGroupBox(AmendThemeDialog)
- self.PreviewGroupBox.setObjectName(u'PreviewGroupBox')
- self.ThemePreviewLayout = QtGui.QHBoxLayout(self.PreviewGroupBox)
- self.ThemePreviewLayout.setSpacing(8)
- self.ThemePreviewLayout.setMargin(8)
- self.ThemePreviewLayout.setObjectName(u'ThemePreviewLayout')
+ self.optionsRightLayout.addItem(spacerItem6)
+ self.otherOptionsLayout.addWidget(self.optionsRightWidget)
+ self.themeTabWidget.addTab(self.otherOptionsTab, u'')
+ self.contentLayout.addWidget(self.themeTabWidget)
+ self.amendThemeLayout.addWidget(self.contentWidget)
+ self.previewGroupBox = QtGui.QGroupBox(amendThemeDialog)
+ self.previewGroupBox.setObjectName(u'previewGroupBox')
+ self.themePreviewLayout = QtGui.QHBoxLayout(self.previewGroupBox)
+ self.themePreviewLayout.setSpacing(8)
+ self.themePreviewLayout.setMargin(8)
+ self.themePreviewLayout.setObjectName(u'themePreviewLayout')
spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding,
QtGui.QSizePolicy.Expanding)
- self.ThemePreviewLayout.addItem(spacerItem7)
- self.ThemePreview = QtGui.QLabel(self.PreviewGroupBox)
+ 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.setMaximumSize(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(u'ThemePreview')
- self.ThemePreviewLayout.addWidget(self.ThemePreview)
+ self.themePreview.sizePolicy().hasHeightForWidth())
+ self.themePreview.setSizePolicy(sizePolicy)
+ self.themePreview.setMaximumSize(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(u'themePreview')
+ self.themePreviewLayout.addWidget(self.themePreview)
spacerItem8 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding,
QtGui.QSizePolicy.Expanding)
- self.ThemePreviewLayout.addItem(spacerItem8)
- self.AmendThemeLayout.addWidget(self.PreviewGroupBox)
- self.ThemeButtonBox = QtGui.QDialogButtonBox(AmendThemeDialog)
- self.ThemeButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
+ 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(u'ThemeButtonBox')
- self.AmendThemeLayout.addWidget(self.ThemeButtonBox)
-
- self.retranslateUi(AmendThemeDialog)
- self.ThemeTabWidget.setCurrentIndex(0)
- QtCore.QObject.connect(self.ThemeButtonBox,
- QtCore.SIGNAL(u'accepted()'), AmendThemeDialog.accept)
- QtCore.QObject.connect(self.ThemeButtonBox,
- QtCore.SIGNAL(u'rejected()'), AmendThemeDialog.reject)
- QtCore.QMetaObject.connectSlotsByName(AmendThemeDialog)
-
- def retranslateUi(self, AmendThemeDialog):
- AmendThemeDialog.setWindowTitle(
+ self.themeButtonBox.setObjectName(u'themeButtonBox')
+ self.amendThemeLayout.addWidget(self.themeButtonBox)
+
+ self.retranslateUi(amendThemeDialog)
+ self.themeTabWidget.setCurrentIndex(0)
+ QtCore.QObject.connect(self.themeButtonBox,
+ QtCore.SIGNAL(u'accepted()'), amendThemeDialog.accept)
+ QtCore.QObject.connect(self.themeButtonBox,
+ QtCore.SIGNAL(u'rejected()'), amendThemeDialog.reject)
+ QtCore.QMetaObject.connectSlotsByName(amendThemeDialog)
+
+ def retranslateUi(self, amendThemeDialog):
+ amendThemeDialog.setWindowTitle(
translate('OpenLP.AmendThemeForm', 'Theme Maintenance'))
- self.ThemeNameLabel.setText(
+ self.themeNameLabel.setText(
translate('OpenLP.AmendThemeForm', 'Theme &name:'))
- self.BackgroundLabel.setText(
+ self.backgroundLabel.setText(
translate('OpenLP.AmendThemeForm', '&Visibility:'))
- self.BackgroundComboBox.setItemText(0,
+ self.backgroundComboBox.setItemText(0,
translate('OpenLP.AmendThemeForm', 'Opaque'))
- self.BackgroundComboBox.setItemText(1,
+ self.backgroundComboBox.setItemText(1,
translate('OpenLP.AmendThemeForm', 'Transparent'))
- self.BackgroundTypeLabel.setText(
+ self.backgroundTypeLabel.setText(
translate('OpenLP.AmendThemeForm', 'Type:'))
- self.BackgroundTypeComboBox.setItemText(0,
+ self.backgroundTypeComboBox.setItemText(0,
translate('OpenLP.AmendThemeForm', 'Solid Color'))
- self.BackgroundTypeComboBox.setItemText(1,
+ self.backgroundTypeComboBox.setItemText(1,
translate('OpenLP.AmendThemeForm', 'Gradient'))
- self.BackgroundTypeComboBox.setItemText(2,
+ self.backgroundTypeComboBox.setItemText(2,
translate('OpenLP.AmendThemeForm', 'Image'))
- self.Color1Label.setText(u'<Color1>:')
- self.Color2Label.setText(u'<Color2>:')
- self.ImageLabel.setText(
+ self.color1Label.setText(u'<color1>:')
+ self.color2Label.setText(u'<color2>:')
+ self.imageLabel.setText(
translate('OpenLP.AmendThemeForm', 'Image:'))
- self.GradientLabel.setText(
+ self.gradientLabel.setText(
translate('OpenLP.AmendThemeForm', 'Gradient:'))
- self.GradientComboBox.setItemText(0,
+ self.gradientComboBox.setItemText(0,
translate('OpenLP.AmendThemeForm', 'Horizontal'))
- self.GradientComboBox.setItemText(1,
+ self.gradientComboBox.setItemText(1,
translate('OpenLP.AmendThemeForm', 'Vertical'))
- self.GradientComboBox.setItemText(2,
+ self.gradientComboBox.setItemText(2,
translate('OpenLP.AmendThemeForm', 'Circular'))
- self.ThemeTabWidget.setTabText(
- self.ThemeTabWidget.indexOf(self.BackgroundTab),
+ self.themeTabWidget.setTabText(
+ self.themeTabWidget.indexOf(self.backgroundTab),
translate('OpenLP.AmendThemeForm', '&Background'))
- self.FontMainGroupBox.setTitle(
+ self.fontMainGroupBox.setTitle(
translate('OpenLP.AmendThemeForm', 'Main Font'))
- self.FontMainlabel.setText(
+ self.fontMainlabel.setText(
translate('OpenLP.AmendThemeForm', 'Font:'))
- self.FontMainColorLabel.setText(
+ self.fontMainColorLabel.setText(
translate('OpenLP.AmendThemeForm', 'Color:'))
- self.FontMainSize.setText(
+ self.fontMainSize.setText(
translate('OpenLP.AmendThemeForm', 'Size:'))
- self.FontMainSizeSpinBox.setSuffix(
+ self.fontMainSizeSpinBox.setSuffix(
translate('OpenLP.AmendThemeForm', 'pt'))
- self.FontMainWrapIndentationLabel.setText(
+ self.fontMainWrapIndentationLabel.setText(
translate('OpenLP.AmendThemeForm', 'Wrap indentation:'))
- self.FontMainWrapLineAdjustmentLabel.setText(
+ self.fontMainWrapLineAdjustmentLabel.setText(
translate('OpenLP.AmendThemeForm', 'Adjust line spacing:'))
- self.FontMainWeightComboBox.setItemText(0,
+ self.fontMainWeightComboBox.setItemText(0,
translate('OpenLP.AmendThemeForm', 'Normal'))
- self.FontMainWeightComboBox.setItemText(1,
+ self.fontMainWeightComboBox.setItemText(1,
translate('OpenLP.AmendThemeForm', 'Bold'))
- self.FontMainWeightComboBox.setItemText(2,
+ self.fontMainWeightComboBox.setItemText(2,
translate('OpenLP.AmendThemeForm', 'Italics'))
- self.FontMainWeightComboBox.setItemText(3,
+ self.fontMainWeightComboBox.setItemText(3,
translate('OpenLP.AmendThemeForm', 'Bold/Italics'))
- self.FontMainWeightLabel.setText(
+ self.fontMainWeightLabel.setText(
translate('OpenLP.AmendThemeForm', 'Style:'))
- self.MainLocationGroupBox.setTitle(
+ self.mainLocationGroupBox.setTitle(
translate('OpenLP.AmendThemeForm', 'Display Location'))
- self.DefaultLocationLabel.setText(
+ self.defaultLocationLabel.setText(
translate('OpenLP.AmendThemeForm', 'Use default location'))
- self.FontMainXLabel.setText(
+ self.fontMainXLabel.setText(
translate('OpenLP.AmendThemeForm', 'X position:'))
- self.FontMainYLabel.setText(
+ self.fontMainYLabel.setText(
translate('OpenLP.AmendThemeForm', 'Y position:'))
- self.FontMainWidthLabel.setText(
+ self.fontMainWidthLabel.setText(
translate('OpenLP.AmendThemeForm', 'Width:'))
- self.FontMainHeightLabel.setText(
+ self.fontMainHeightLabel.setText(
translate('OpenLP.AmendThemeForm', 'Height:'))
- self.FontMainXSpinBox.setSuffix(
- translate('OpenLP.AmendThemeForm', 'px'))
- self.FontMainYSpinBox.setSuffix(
- translate('OpenLP.AmendThemeForm', 'px'))
- self.FontMainWidthSpinBox.setSuffix(
- translate('OpenLP.AmendThemeForm', 'px'))
- self.FontMainHeightSpinBox.setSuffix(
- translate('OpenLP.AmendThemeForm', 'px'))
- self.ThemeTabWidget.setTabText(
- self.ThemeTabWidget.indexOf(self.FontMainTab),
+ self.fontMainXSpinBox.setSuffix(
+ translate('OpenLP.AmendThemeForm', 'px'))
+ self.fontMainYSpinBox.setSuffix(
+ translate('OpenLP.AmendThemeForm', 'px'))
+ self.fontMainWidthSpinBox.setSuffix(
+ translate('OpenLP.AmendThemeForm', 'px'))
+ self.fontMainHeightSpinBox.setSuffix(
+ translate('OpenLP.AmendThemeForm', 'px'))
+ self.themeTabWidget.setTabText(
+ self.themeTabWidget.indexOf(self.fontMainTab),
translate('OpenLP.AmendThemeForm', '&Main Font'))
- self.FooterFontGroupBox.setTitle(
+ self.footerFontGroupBox.setTitle(
translate('OpenLP.AmendThemeForm', 'Footer Font'))
- self.FontFooterLabel.setText(
+ self.fontFooterLabel.setText(
translate('OpenLP.AmendThemeForm', 'Font:'))
- self.FontFooterColorLabel.setText(
+ self.fontFooterColorLabel.setText(
translate('OpenLP.AmendThemeForm', 'Color:'))
- self.FontFooterSizeLabel.setText(
+ self.fontFooterSizeLabel.setText(
translate('OpenLP.AmendThemeForm', 'Size:'))
- self.FontFooterSizeSpinBox.setSuffix(
+ self.fontFooterSizeSpinBox.setSuffix(
translate('OpenLP.AmendThemeForm', 'pt'))
- self.FontFooterWeightComboBox.setItemText(0,
+ self.fontFooterWeightComboBox.setItemText(0,
translate('OpenLP.AmendThemeForm', 'Normal'))
- self.FontFooterWeightComboBox.setItemText(1,
+ self.fontFooterWeightComboBox.setItemText(1,
translate('OpenLP.AmendThemeForm', 'Bold'))
- self.FontFooterWeightComboBox.setItemText(2,
+ self.fontFooterWeightComboBox.setItemText(2,
translate('OpenLP.AmendThemeForm', 'Italics'))
- self.FontFooterWeightComboBox.setItemText(3,
+ self.fontFooterWeightComboBox.setItemText(3,
translate('OpenLP.AmendThemeForm', 'Bold/Italics'))
- self.FontFooterWeightLabel.setText(
+ self.fontFooterWeightLabel.setText(
translate('OpenLP.AmendThemeForm', 'Style:'))
- self.LocationFooterGroupBox.setTitle(
+ self.locationFooterGroupBox.setTitle(
translate('OpenLP.AmendThemeForm', 'Display Location'))
- self.FontFooterDefaultLabel.setText(
+ self.fontFooterDefaultLabel.setText(
translate('OpenLP.AmendThemeForm', 'Use default location'))
- self.FontFooterXLabel.setText(
+ self.fontFooterXLabel.setText(
translate('OpenLP.AmendThemeForm', 'X position:'))
- self.FontFooterYLabel.setText(
+ self.fontFooterYLabel.setText(
translate('OpenLP.AmendThemeForm', 'Y position:'))
- self.FontFooterWidthLabel.setText(
+ self.fontFooterWidthLabel.setText(
translate('OpenLP.AmendThemeForm', 'Width:'))
- self.FontFooterHeightLabel.setText(
+ self.fontFooterHeightLabel.setText(
translate('OpenLP.AmendThemeForm', 'Height:'))
- self.FontFooterXSpinBox.setSuffix(
- translate('OpenLP.AmendThemeForm', 'px'))
- self.FontFooterYSpinBox.setSuffix(
- translate('OpenLP.AmendThemeForm', 'px'))
- self.FontFooterWidthSpinBox.setSuffix(
- translate('OpenLP.AmendThemeForm', 'px'))
- self.FontFooterHeightSpinBox.setSuffix(
- translate('OpenLP.AmendThemeForm', 'px'))
- self.ThemeTabWidget.setTabText(
- self.ThemeTabWidget.indexOf(self.FontFooterTab),
+ self.fontFooterXSpinBox.setSuffix(
+ translate('OpenLP.AmendThemeForm', 'px'))
+ self.fontFooterYSpinBox.setSuffix(
+ translate('OpenLP.AmendThemeForm', 'px'))
+ self.fontFooterWidthSpinBox.setSuffix(
+ translate('OpenLP.AmendThemeForm', 'px'))
+ self.fontFooterHeightSpinBox.setSuffix(
+ translate('OpenLP.AmendThemeForm', 'px'))
+ self.themeTabWidget.setTabText(
+ self.themeTabWidget.indexOf(self.fontFooterTab),
translate('OpenLP.AmendThemeForm', '&Footer Font'))
- self.OutlineGroupBox.setTitle(
+ self.outlineGroupBox.setTitle(
translate('OpenLP.AmendThemeForm', 'Outline'))
- self.OutlineSpinBoxLabel.setText(
+ self.outlineSpinBoxLabel.setText(
translate('OpenLP.AmendThemeForm', 'Outline size:'))
- self.OutlineSpinBox.setSuffix(
+ self.outlineSpinBox.setSuffix(
translate('OpenLP.AmendThemeForm', 'px'))
- self.OutlineColorLabel.setText(
+ self.outlineColorLabel.setText(
translate('OpenLP.AmendThemeForm', 'Outline color:'))
- self.OutlineEnabledLabel.setText(
+ self.outlineEnabledLabel.setText(
translate('OpenLP.AmendThemeForm', 'Show outline:'))
- self.ShadowGroupBox.setTitle(
+ self.shadowGroupBox.setTitle(
translate('OpenLP.AmendThemeForm', 'Shadow'))
- self.ShadowSpinBoxLabel.setText(
+ self.shadowSpinBoxLabel.setText(
translate('OpenLP.AmendThemeForm', 'Shadow size:'))
- self.ShadowSpinBox.setSuffix(
+ self.shadowSpinBox.setSuffix(
translate('OpenLP.AmendThemeForm', 'px'))
- self.ShadowColorLabel.setText(
+ self.shadowColorLabel.setText(
translate('OpenLP.AmendThemeForm', 'Shadow color:'))
- self.ShadowEnabledLabel.setText(
+ self.shadowEnabledLabel.setText(
translate('OpenLP.AmendThemeForm', 'Show shadow:'))
- self.AlignmentGroupBox.setTitle(
+ self.alignmentGroupBox.setTitle(
translate('OpenLP.AmendThemeForm', 'Alignment'))
- self.HorizontalLabel.setText(
+ self.horizontalLabel.setText(
translate('OpenLP.AmendThemeForm', 'Horizontal align:'))
- self.HorizontalComboBox.setItemText(0,
+ self.horizontalComboBox.setItemText(0,
translate('OpenLP.AmendThemeForm', 'Left'))
- self.HorizontalComboBox.setItemText(1,
+ self.horizontalComboBox.setItemText(1,
translate('OpenLP.AmendThemeForm', 'Right'))
- self.HorizontalComboBox.setItemText(2,
+ self.horizontalComboBox.setItemText(2,
translate('OpenLP.AmendThemeForm', 'Center'))
- self.VerticalLabel.setText(
+ self.verticalLabel.setText(
translate('OpenLP.AmendThemeForm', 'Vertical align:'))
- self.VerticalComboBox.setItemText(0,
+ self.verticalComboBox.setItemText(0,
translate('OpenLP.AmendThemeForm', 'Top'))
- self.VerticalComboBox.setItemText(1,
+ self.verticalComboBox.setItemText(1,
translate('OpenLP.AmendThemeForm', 'Middle'))
- self.VerticalComboBox.setItemText(2,
+ self.verticalComboBox.setItemText(2,
translate('OpenLP.AmendThemeForm', 'Bottom'))
- self.TransitionGroupBox.setTitle(
+ self.transitionGroupBox.setTitle(
translate('OpenLP.AmendThemeForm', 'Slide Transition'))
- self.SlideTransitionCheckBoxLabel.setText(
+ self.slideTransitionCheckBoxLabel.setText(
translate('OpenLP.AmendThemeForm', 'Transition active'))
- self.ThemeTabWidget.setTabText(
- self.ThemeTabWidget.indexOf(self.OtherOptionsTab),
+ self.themeTabWidget.setTabText(
+ self.themeTabWidget.indexOf(self.otherOptionsTab),
translate('OpenLP.AmendThemeForm', '&Other Options'))
- self.PreviewGroupBox.setTitle(
- translate('OpenLP.AmendThemeForm', 'Preview'))
\ No newline at end of file
+ self.previewGroupBox.setTitle(
+ translate('OpenLP.AmendThemeForm', 'Preview'))
=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py 2010-07-26 15:19:11 +0000
+++ openlp/core/ui/amendthemeform.py 2010-07-27 12:35:56 +0000
@@ -52,102 +52,102 @@
self.setupUi(self)
# define signals
# Buttons
- QtCore.QObject.connect(self.Color1PushButton,
+ QtCore.QObject.connect(self.color1PushButton,
QtCore.SIGNAL(u'pressed()'), self.onColor1PushButtonClicked)
- QtCore.QObject.connect(self.Color2PushButton,
+ QtCore.QObject.connect(self.color2PushButton,
QtCore.SIGNAL(u'pressed()'), self.onColor2PushButtonClicked)
- QtCore.QObject.connect(self.FontMainColorPushButton,
+ QtCore.QObject.connect(self.fontMainColorPushButton,
QtCore.SIGNAL(u'pressed()'), self.onFontMainColorPushButtonClicked)
- QtCore.QObject.connect(self.FontFooterColorPushButton,
+ QtCore.QObject.connect(self.fontFooterColorPushButton,
QtCore.SIGNAL(u'pressed()'),
self.onFontFooterColorPushButtonClicked)
- QtCore.QObject.connect(self.OutlineColorPushButton,
+ QtCore.QObject.connect(self.outlineColorPushButton,
QtCore.SIGNAL(u'pressed()'), self.onOutlineColorPushButtonClicked)
- QtCore.QObject.connect(self.ShadowColorPushButton,
+ QtCore.QObject.connect(self.shadowColorPushButton,
QtCore.SIGNAL(u'pressed()'), self.onShadowColorPushButtonClicked)
- QtCore.QObject.connect(self.ImageToolButton,
+ QtCore.QObject.connect(self.imageToolButton,
QtCore.SIGNAL(u'clicked()'), self.onImageToolButtonClicked)
# Combo boxes
- QtCore.QObject.connect(self.BackgroundComboBox,
+ QtCore.QObject.connect(self.backgroundComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onBackgroundComboBoxSelected)
- QtCore.QObject.connect(self.BackgroundTypeComboBox,
+ QtCore.QObject.connect(self.backgroundTypeComboBox,
QtCore.SIGNAL(u'activated(int)'),
self.onBackgroundTypeComboBoxSelected)
- QtCore.QObject.connect(self.GradientComboBox,
+ QtCore.QObject.connect(self.gradientComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onGradientComboBoxSelected)
- QtCore.QObject.connect(self.FontMainComboBox,
+ QtCore.QObject.connect(self.fontMainComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onFontMainComboBoxSelected)
- QtCore.QObject.connect(self.FontMainWeightComboBox,
+ QtCore.QObject.connect(self.fontMainWeightComboBox,
QtCore.SIGNAL(u'activated(int)'),
self.onFontMainWeightComboBoxSelected)
- QtCore.QObject.connect(self.FontFooterComboBox,
+ QtCore.QObject.connect(self.fontFooterComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onFontFooterComboBoxSelected)
- QtCore.QObject.connect(self.FontFooterWeightComboBox,
+ QtCore.QObject.connect(self.fontFooterWeightComboBox,
QtCore.SIGNAL(u'activated(int)'),
self.onFontFooterWeightComboBoxSelected)
- QtCore.QObject.connect(self.HorizontalComboBox,
+ QtCore.QObject.connect(self.horizontalComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onHorizontalComboBoxSelected)
- QtCore.QObject.connect(self.VerticalComboBox,
+ QtCore.QObject.connect(self.verticalComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onVerticalComboBoxSelected)
# Spin boxes
- QtCore.QObject.connect(self.FontMainSizeSpinBox,
+ QtCore.QObject.connect(self.fontMainSizeSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontMainSizeSpinBoxChanged)
- QtCore.QObject.connect(self.FontFooterSizeSpinBox,
+ QtCore.QObject.connect(self.fontFooterSizeSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontFooterSizeSpinBoxChanged)
- QtCore.QObject.connect(self.FontMainXSpinBox,
+ QtCore.QObject.connect(self.fontMainXSpinBox,
QtCore.SIGNAL(u'editingFinished()'), self.onFontMainXSpinBoxChanged)
- QtCore.QObject.connect(self.FontMainYSpinBox,
+ QtCore.QObject.connect(self.fontMainYSpinBox,
QtCore.SIGNAL(u'editingFinished()'), self.onFontMainYSpinBoxChanged)
- QtCore.QObject.connect(self.FontMainWidthSpinBox,
+ QtCore.QObject.connect(self.fontMainWidthSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontMainWidthSpinBoxChanged)
- QtCore.QObject.connect(self.FontMainHeightSpinBox,
+ QtCore.QObject.connect(self.fontMainHeightSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontMainHeightSpinBoxChanged)
- QtCore.QObject.connect(self.FontMainLineAdjustmentSpinBox,
+ QtCore.QObject.connect(self.fontMainLineAdjustmentSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontMainLineAdjustmentSpinBoxChanged)
- QtCore.QObject.connect(self.FontMainLineSpacingSpinBox,
+ QtCore.QObject.connect(self.fontMainLineSpacingSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontMainLineSpacingSpinBoxChanged)
- QtCore.QObject.connect(self.FontFooterXSpinBox,
+ QtCore.QObject.connect(self.fontFooterXSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontFooterXSpinBoxChanged)
- QtCore.QObject.connect(self.FontFooterYSpinBox,
+ QtCore.QObject.connect(self.fontFooterYSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontFooterYSpinBoxChanged)
- QtCore.QObject.connect(self.FontFooterWidthSpinBox,
+ QtCore.QObject.connect(self.fontFooterWidthSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontFooterWidthSpinBoxChanged)
- QtCore.QObject.connect(self.FontFooterHeightSpinBox,
+ QtCore.QObject.connect(self.fontFooterHeightSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onFontFooterHeightSpinBoxChanged)
- QtCore.QObject.connect(self.ShadowSpinBox,
+ QtCore.QObject.connect(self.shadowSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onShadowSpinBoxChanged)
- QtCore.QObject.connect(self.OutlineSpinBox,
+ QtCore.QObject.connect(self.outlineSpinBox,
QtCore.SIGNAL(u'editingFinished()'),
self.onOutlineSpinBoxChanged)
# CheckBoxes
- QtCore.QObject.connect(self.FontMainDefaultCheckBox,
+ QtCore.QObject.connect(self.fontMainDefaultCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'),
self.onFontMainDefaultCheckBoxChanged)
- QtCore.QObject.connect(self.FontFooterDefaultCheckBox,
+ QtCore.QObject.connect(self.fontFooterDefaultCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'),
self.onFontFooterDefaultCheckBoxChanged)
- QtCore.QObject.connect(self.OutlineCheckBox,
+ QtCore.QObject.connect(self.outlineCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'), self.onOutlineCheckBoxChanged)
- QtCore.QObject.connect(self.ShadowCheckBox,
+ QtCore.QObject.connect(self.shadowCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'), self.onShadowCheckBoxChanged)
- QtCore.QObject.connect(self.SlideTransitionCheckBox,
+ QtCore.QObject.connect(self.slideTransitionCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'),
self.onSlideTransitionCheckBoxChanged)
def accept(self):
new_theme = ThemeXML()
- theme_name = unicode(self.ThemeNameEdit.text())
+ theme_name = unicode(self.themeNameEdit.text())
new_theme.new_document(theme_name)
save_from = None
save_to = None
@@ -225,7 +225,7 @@
translate('OpenLP.AmendThemeForm', 'Select Image'), u'',
images_filter)
if filename:
- self.ImageLineEdit.setText(filename)
+ self.imageLineEdit.setText(filename)
self.theme.background_filename = filename
self.previewTheme()
@@ -233,7 +233,7 @@
#Main Font Tab
#
def onFontMainComboBoxSelected(self):
- self.theme.font_main_name = self.FontMainComboBox.currentFont().family()
+ self.theme.font_main_name = self.fontMainComboBox.currentFont().family()
self.previewTheme()
def onFontMainWeightComboBoxSelected(self, value):
@@ -256,13 +256,13 @@
QtGui.QColor(self.theme.font_main_color), self)
if new_color.isValid():
self.theme.font_main_color = new_color.name()
- self.FontMainColorPushButton.setStyleSheet(
+ self.fontMainColorPushButton.setStyleSheet(
u'background-color: %s' % unicode(self.theme.font_main_color))
self.previewTheme()
def onFontMainSizeSpinBoxChanged(self):
- if self.theme.font_main_proportion != self.FontMainSizeSpinBox.value():
- self.theme.font_main_proportion = self.FontMainSizeSpinBox.value()
+ if self.theme.font_main_proportion != self.fontMainSizeSpinBox.value():
+ self.theme.font_main_proportion = self.fontMainSizeSpinBox.value()
self.previewTheme()
def onFontMainDefaultCheckBoxChanged(self, value):
@@ -277,49 +277,49 @@
self.theme.font_main_y = u'10'
self.theme.font_main_width = u'1024'
self.theme.font_main_height = u'730'
- self.FontMainXSpinBox.setValue(self.theme.font_main_x)
- self.FontMainYSpinBox.setValue(self.theme.font_main_y)
- self.FontMainWidthSpinBox.setValue(self.theme.font_main_width)
- self.FontMainHeightSpinBox.setValue(self.theme.font_main_height)
- self.FontMainLineAdjustmentSpinBox.setValue(
+ self.fontMainXSpinBox.setValue(self.theme.font_main_x)
+ self.fontMainYSpinBox.setValue(self.theme.font_main_y)
+ self.fontMainWidthSpinBox.setValue(self.theme.font_main_width)
+ self.fontMainHeightSpinBox.setValue(self.theme.font_main_height)
+ self.fontMainLineAdjustmentSpinBox.setValue(
self.theme.font_main_line_adjustment)
- self.FontMainLineSpacingSpinBox.setValue(
+ self.fontMainLineSpacingSpinBox.setValue(
self.theme.font_main_indentation)
self.stateChanging(self.theme)
self.previewTheme()
def onFontMainXSpinBoxChanged(self):
- if self.theme.font_main_x != self.FontMainXSpinBox.value():
- self.theme.font_main_x = self.FontMainXSpinBox.value()
+ if self.theme.font_main_x != self.fontMainXSpinBox.value():
+ self.theme.font_main_x = self.fontMainXSpinBox.value()
self.previewTheme()
def onFontMainYSpinBoxChanged(self):
- if self.theme.font_main_y != self.FontMainYSpinBox.value():
- self.theme.font_main_y = self.FontMainYSpinBox.value()
+ if self.theme.font_main_y != self.fontMainYSpinBox.value():
+ self.theme.font_main_y = self.fontMainYSpinBox.value()
self.previewTheme()
def onFontMainWidthSpinBoxChanged(self):
- if self.theme.font_main_width != self.FontMainWidthSpinBox.value():
- self.theme.font_main_width = self.FontMainWidthSpinBox.value()
+ if self.theme.font_main_width != self.fontMainWidthSpinBox.value():
+ self.theme.font_main_width = self.fontMainWidthSpinBox.value()
self.previewTheme()
def onFontMainLineAdjustmentSpinBoxChanged(self):
if self.theme.font_main_line_adjustment != \
- self.FontMainLineAdjustmentSpinBox.value():
+ self.fontMainLineAdjustmentSpinBox.value():
self.theme.font_main_line_adjustment = \
- self.FontMainLineAdjustmentSpinBox.value()
+ self.fontMainLineAdjustmentSpinBox.value()
self.previewTheme()
def onFontMainLineSpacingSpinBoxChanged(self):
if self.theme.font_main_indentation != \
- self.FontMainLineSpacingSpinBox.value():
+ self.fontMainLineSpacingSpinBox.value():
self.theme.font_main_indentation = \
- self.FontMainLineSpacingSpinBox.value()
+ self.fontMainLineSpacingSpinBox.value()
self.previewTheme()
def onFontMainHeightSpinBoxChanged(self):
- if self.theme.font_main_height != self.FontMainHeightSpinBox.value():
- self.theme.font_main_height = self.FontMainHeightSpinBox.value()
+ if self.theme.font_main_height != self.fontMainHeightSpinBox.value():
+ self.theme.font_main_height = self.fontMainHeightSpinBox.value()
self.previewTheme()
#
@@ -327,7 +327,7 @@
#
def onFontFooterComboBoxSelected(self):
self.theme.font_footer_name = \
- self.FontFooterComboBox.currentFont().family()
+ self.fontFooterComboBox.currentFont().family()
self.previewTheme()
def onFontFooterWeightComboBoxSelected(self, value):
@@ -350,15 +350,15 @@
QtGui.QColor(self.theme.font_footer_color), self)
if new_color.isValid():
self.theme.font_footer_color = new_color.name()
- self.FontFooterColorPushButton.setStyleSheet(
+ self.fontFooterColorPushButton.setStyleSheet(
u'background-color: %s' % unicode(self.theme.font_footer_color))
self.previewTheme()
def onFontFooterSizeSpinBoxChanged(self):
if self.theme.font_footer_proportion != \
- self.FontFooterSizeSpinBox.value():
+ self.fontFooterSizeSpinBox.value():
self.theme.font_footer_proportion = \
- self.FontFooterSizeSpinBox.value()
+ self.fontFooterSizeSpinBox.value()
self.previewTheme()
def onFontFooterDefaultCheckBoxChanged(self, value):
@@ -373,41 +373,41 @@
self.theme.font_footer_y = u'730'
self.theme.font_footer_width = u'1024'
self.theme.font_footer_height = u'38'
- self.FontFooterXSpinBox.setValue(self.theme.font_footer_x)
- self.FontFooterYSpinBox.setValue(self.theme.font_footer_y)
- self.FontFooterWidthSpinBox.setValue(self.theme.font_footer_width)
- self.FontFooterHeightSpinBox.setValue(
+ self.fontFooterXSpinBox.setValue(self.theme.font_footer_x)
+ self.fontFooterYSpinBox.setValue(self.theme.font_footer_y)
+ self.fontFooterWidthSpinBox.setValue(self.theme.font_footer_width)
+ self.fontFooterHeightSpinBox.setValue(
self.theme.font_footer_height)
self.stateChanging(self.theme)
self.previewTheme()
def onFontFooterXSpinBoxChanged(self):
- if self.theme.font_footer_x != self.FontFooterXSpinBox.value():
- self.theme.font_footer_x = self.FontFooterXSpinBox.value()
+ if self.theme.font_footer_x != self.fontFooterXSpinBox.value():
+ self.theme.font_footer_x = self.fontFooterXSpinBox.value()
self.previewTheme()
def onFontFooterYSpinBoxChanged(self):
- if self.theme.font_footer_y != self.FontFooterYSpinBox.value():
- self.theme.font_footer_y = self.FontFooterYSpinBox.value()
+ if self.theme.font_footer_y != self.fontFooterYSpinBox.value():
+ self.theme.font_footer_y = self.fontFooterYSpinBox.value()
self.previewTheme()
def onFontFooterWidthSpinBoxChanged(self):
- if self.theme.font_footer_width != self.FontFooterWidthSpinBox.value():
- self.theme.font_footer_width = self.FontFooterWidthSpinBox.value()
+ if self.theme.font_footer_width != self.fontFooterWidthSpinBox.value():
+ self.theme.font_footer_width = self.fontFooterWidthSpinBox.value()
self.previewTheme()
def onFontFooterHeightSpinBoxChanged(self):
if self.theme.font_footer_height != \
- self.FontFooterHeightSpinBox.value():
+ self.fontFooterHeightSpinBox.value():
self.theme.font_footer_height = \
- self.FontFooterHeightSpinBox.value()
+ self.fontFooterHeightSpinBox.value()
self.previewTheme()
#
#Background Tab
#
def onGradientComboBoxSelected(self, currentIndex):
- self.setBackground(self.BackgroundTypeComboBox.currentIndex(),
+ self.setBackground(self.backgroundTypeComboBox.currentIndex(),
currentIndex)
def onBackgroundComboBoxSelected(self, currentIndex):
@@ -419,14 +419,14 @@
self.previewTheme()
def onBackgroundTypeComboBoxSelected(self, currentIndex):
- self.setBackground(currentIndex, self.GradientComboBox.currentIndex())
+ self.setBackground(currentIndex, self.gradientComboBox.currentIndex())
def setBackground(self, background, gradient):
if background == 0: # Solid
self.theme.background_type = u'solid'
if self.theme.background_color is None:
self.theme.background_color = u'#000000'
- self.ImageLineEdit.setText(u'')
+ self.imageLineEdit.setText(u'')
elif background == 1: # Gradient
self.theme.background_type = u'gradient'
if gradient == 0: # Horizontal
@@ -439,7 +439,7 @@
self.theme.background_startColor = u'#000000'
if self.theme.background_endColor is None:
self.theme.background_endColor = u'#ff0000'
- self.ImageLineEdit.setText(u'')
+ self.imageLineEdit.setText(u'')
else:
self.theme.background_type = u'image'
self.stateChanging(self.theme)
@@ -451,14 +451,14 @@
QtGui.QColor(self.theme.background_color), self)
if new_color.isValid():
self.theme.background_color = new_color.name()
- self.Color1PushButton.setStyleSheet(u'background-color: %s' %
+ self.color1PushButton.setStyleSheet(u'background-color: %s' %
unicode(self.theme.background_color))
else:
new_color = QtGui.QColorDialog.getColor(
QtGui.QColor(self.theme.background_startColor), self)
if new_color.isValid():
self.theme.background_startColor = new_color.name()
- self.Color1PushButton.setStyleSheet(u'background-color: %s' %
+ self.color1PushButton.setStyleSheet(u'background-color: %s' %
unicode(self.theme.background_startColor))
self.previewTheme()
@@ -467,7 +467,7 @@
QtGui.QColor(self.theme.background_endColor), self)
if new_color.isValid():
self.theme.background_endColor = new_color.name()
- self.Color2PushButton.setStyleSheet(u'background-color: %s' %
+ self.color2PushButton.setStyleSheet(u'background-color: %s' %
unicode(self.theme.background_endColor))
self.previewTheme()
@@ -483,13 +483,13 @@
self.previewTheme()
def onOutlineSpinBoxChanged(self):
- if self.theme.display_outline_size != self.OutlineSpinBox.value():
- self.theme.display_outline_size = self.OutlineSpinBox.value()
+ if self.theme.display_outline_size != self.outlineSpinBox.value():
+ self.theme.display_outline_size = self.outlineSpinBox.value()
self.previewTheme()
def onShadowSpinBoxChanged(self):
- if self.theme.display_shadow_size != self.ShadowSpinBox.value():
- self.theme.display_shadow_size = self.ShadowSpinBox.value()
+ if self.theme.display_shadow_size != self.shadowSpinBox.value():
+ self.theme.display_shadow_size = self.shadowSpinBox.value()
self.previewTheme()
def onOutlineColorPushButtonClicked(self):
@@ -497,7 +497,7 @@
QtGui.QColor(self.theme.display_outline_color), self)
if new_color.isValid():
self.theme.display_outline_color = new_color.name()
- self.OutlineColorPushButton.setStyleSheet(u'background-color: %s' %
+ self.outlineColorPushButton.setStyleSheet(u'background-color: %s' %
unicode(self.theme.display_outline_color))
self.previewTheme()
@@ -522,7 +522,7 @@
QtGui.QColor(self.theme.display_shadow_color), self)
if new_color.isValid():
self.theme.display_shadow_color = new_color.name()
- self.ShadowColorPushButton.setStyleSheet(u'background-color: %s' %
+ self.shadowColorPushButton.setStyleSheet(u'background-color: %s' %
unicode(self.theme.display_shadow_color))
self.previewTheme()
@@ -541,194 +541,194 @@
#
def paintUi(self, theme):
self.stateChanging(theme)
- self.ThemeNameEdit.setText(self.theme.theme_name)
+ self.themeNameEdit.setText(self.theme.theme_name)
# Background Tab
if self.theme.background_mode == u'opaque':
- self.BackgroundComboBox.setCurrentIndex(0)
+ self.backgroundComboBox.setCurrentIndex(0)
else:
- self.BackgroundComboBox.setCurrentIndex(1)
- self.ImageLineEdit.setText(u'')
+ self.backgroundComboBox.setCurrentIndex(1)
+ self.imageLineEdit.setText(u'')
if theme.background_type == u'solid':
- self.BackgroundTypeComboBox.setCurrentIndex(0)
+ self.backgroundTypeComboBox.setCurrentIndex(0)
elif theme.background_type == u'gradient':
- self.BackgroundTypeComboBox.setCurrentIndex(1)
+ self.backgroundTypeComboBox.setCurrentIndex(1)
else:
- self.BackgroundTypeComboBox.setCurrentIndex(2)
- self.ImageLineEdit.setText(self.theme.background_filename)
+ self.backgroundTypeComboBox.setCurrentIndex(2)
+ self.imageLineEdit.setText(self.theme.background_filename)
if self.theme.background_direction == u'horizontal':
- self.GradientComboBox.setCurrentIndex(0)
+ self.gradientComboBox.setCurrentIndex(0)
elif self.theme.background_direction == u'vertical':
- self.GradientComboBox.setCurrentIndex(1)
+ self.gradientComboBox.setCurrentIndex(1)
else:
- self.GradientComboBox.setCurrentIndex(2)
+ self.gradientComboBox.setCurrentIndex(2)
# Font Main Tab
- self.FontMainComboBox.setCurrentFont(
+ self.fontMainComboBox.setCurrentFont(
QtGui.QFont(self.theme.font_main_name))
- self.FontMainSizeSpinBox.setValue(self.theme.font_main_proportion)
+ self.fontMainSizeSpinBox.setValue(self.theme.font_main_proportion)
if not self.theme.font_main_italics and \
self.theme.font_main_weight == u'Normal':
- self.FontMainWeightComboBox.setCurrentIndex(0)
+ self.fontMainWeightComboBox.setCurrentIndex(0)
elif not self.theme.font_main_italics and \
self.theme.font_main_weight == u'Bold':
- self.FontMainWeightComboBox.setCurrentIndex(1)
+ self.fontMainWeightComboBox.setCurrentIndex(1)
elif self.theme.font_main_italics and \
self.theme.font_main_weight == u'Normal':
- self.FontMainWeightComboBox.setCurrentIndex(2)
+ self.fontMainWeightComboBox.setCurrentIndex(2)
else:
- self.FontMainWeightComboBox.setCurrentIndex(3)
- self.FontMainLineSpacingSpinBox.setValue(
+ self.fontMainWeightComboBox.setCurrentIndex(3)
+ self.fontMainLineSpacingSpinBox.setValue(
self.theme.font_main_indentation)
- self.FontMainXSpinBox.setValue(self.theme.font_main_x)
- self.FontMainYSpinBox.setValue(self.theme.font_main_y)
- self.FontMainWidthSpinBox.setValue(self.theme.font_main_width)
- self.FontMainHeightSpinBox.setValue(self.theme.font_main_height)
+ self.fontMainXSpinBox.setValue(self.theme.font_main_x)
+ self.fontMainYSpinBox.setValue(self.theme.font_main_y)
+ self.fontMainWidthSpinBox.setValue(self.theme.font_main_width)
+ self.fontMainHeightSpinBox.setValue(self.theme.font_main_height)
# Font Footer Tab
- self.FontFooterComboBox.setCurrentFont(
+ self.fontFooterComboBox.setCurrentFont(
QtGui.QFont(self.theme.font_footer_name))
- self.FontFooterSizeSpinBox.setValue(
+ self.fontFooterSizeSpinBox.setValue(
self.theme.font_footer_proportion)
if not self.theme.font_footer_italics and \
self.theme.font_footer_weight == u'Normal':
- self.FontFooterWeightComboBox.setCurrentIndex(0)
+ self.fontFooterWeightComboBox.setCurrentIndex(0)
elif not self.theme.font_footer_italics and \
self.theme.font_footer_weight == u'Bold':
- self.FontFooterWeightComboBox.setCurrentIndex(1)
+ self.fontFooterWeightComboBox.setCurrentIndex(1)
elif self.theme.font_footer_italics and \
self.theme.font_footer_weight == u'Normal':
- self.FontFooterWeightComboBox.setCurrentIndex(2)
+ self.fontFooterWeightComboBox.setCurrentIndex(2)
else:
- self.FontFooterWeightComboBox.setCurrentIndex(3)
- self.FontFooterXSpinBox.setValue(self.theme.font_footer_x)
- self.FontFooterYSpinBox.setValue(self.theme.font_footer_y)
- self.FontFooterWidthSpinBox.setValue(self.theme.font_footer_width)
- self.FontFooterHeightSpinBox.setValue(self.theme.font_footer_height)
- self.FontMainColorPushButton.setStyleSheet(
+ self.fontFooterWeightComboBox.setCurrentIndex(3)
+ self.fontFooterXSpinBox.setValue(self.theme.font_footer_x)
+ self.fontFooterYSpinBox.setValue(self.theme.font_footer_y)
+ self.fontFooterWidthSpinBox.setValue(self.theme.font_footer_width)
+ self.fontFooterHeightSpinBox.setValue(self.theme.font_footer_height)
+ self.fontMainColorPushButton.setStyleSheet(
u'background-color: %s' % unicode(theme.font_main_color))
- self.FontFooterColorPushButton.setStyleSheet(
+ self.fontFooterColorPushButton.setStyleSheet(
u'background-color: %s' % unicode(theme.font_footer_color))
if not self.theme.font_main_override:
- self.FontMainDefaultCheckBox.setChecked(True)
+ self.fontMainDefaultCheckBox.setChecked(True)
else:
- self.FontMainDefaultCheckBox.setChecked(False)
+ self.fontMainDefaultCheckBox.setChecked(False)
if not self.theme.font_footer_override:
- self.FontFooterDefaultCheckBox.setChecked(True)
+ self.fontFooterDefaultCheckBox.setChecked(True)
else:
- self.FontFooterDefaultCheckBox.setChecked(False)
- self.OutlineColorPushButton.setStyleSheet(
+ self.fontFooterDefaultCheckBox.setChecked(False)
+ self.outlineColorPushButton.setStyleSheet(
u'background-color: %s' % unicode(theme.display_outline_color))
- self.ShadowColorPushButton.setStyleSheet(
+ self.shadowColorPushButton.setStyleSheet(
u'background-color: %s' % unicode(theme.display_shadow_color))
if self.theme.display_outline:
- self.OutlineCheckBox.setChecked(True)
- self.OutlineColorPushButton.setEnabled(True)
+ self.outlineCheckBox.setChecked(True)
+ self.outlineColorPushButton.setEnabled(True)
else:
- self.OutlineCheckBox.setChecked(False)
- self.OutlineColorPushButton.setEnabled(False)
- self.OutlineSpinBox.setValue(int(self.theme.display_outline_size))
+ self.outlineCheckBox.setChecked(False)
+ self.outlineColorPushButton.setEnabled(False)
+ self.outlineSpinBox.setValue(int(self.theme.display_outline_size))
if self.theme.display_shadow:
- self.ShadowCheckBox.setChecked(True)
- self.ShadowColorPushButton.setEnabled(True)
+ self.shadowCheckBox.setChecked(True)
+ self.shadowColorPushButton.setEnabled(True)
else:
- self.ShadowCheckBox.setChecked(False)
- self.ShadowColorPushButton.setEnabled(False)
- self.ShadowSpinBox.setValue(int(self.theme.display_shadow_size))
+ self.shadowCheckBox.setChecked(False)
+ self.shadowColorPushButton.setEnabled(False)
+ self.shadowSpinBox.setValue(int(self.theme.display_shadow_size))
if self.theme.display_slideTransition:
- self.SlideTransitionCheckBox.setCheckState(QtCore.Qt.Checked)
+ self.slideTransitionCheckBox.setCheckState(QtCore.Qt.Checked)
else:
- self.SlideTransitionCheckBox.setCheckState(QtCore.Qt.Unchecked)
- self.HorizontalComboBox.setCurrentIndex(
+ self.slideTransitionCheckBox.setCheckState(QtCore.Qt.Unchecked)
+ self.horizontalComboBox.setCurrentIndex(
self.theme.display_horizontalAlign)
- self.VerticalComboBox.setCurrentIndex(self.theme.display_verticalAlign)
+ self.verticalComboBox.setCurrentIndex(self.theme.display_verticalAlign)
def stateChanging(self, theme):
if theme.background_mode == u'transparent':
- self.Color1Label.setVisible(False)
- self.Color1PushButton.setVisible(False)
- self.Color2Label.setVisible(False)
- self.Color2PushButton.setVisible(False)
- self.ImageLabel.setVisible(False)
- self.ImageLineEdit.setVisible(False)
- self.ImageFilenameWidget.setVisible(False)
- self.GradientLabel.setVisible(False)
- self.GradientComboBox.setVisible(False)
- self.BackgroundTypeComboBox.setVisible(False)
- self.BackgroundTypeLabel.setVisible(False)
+ self.color1Label.setVisible(False)
+ self.color1PushButton.setVisible(False)
+ self.color2Label.setVisible(False)
+ self.color2PushButton.setVisible(False)
+ self.imageLabel.setVisible(False)
+ self.imageLineEdit.setVisible(False)
+ self.imageFilenameWidget.setVisible(False)
+ self.gradientLabel.setVisible(False)
+ self.gradientComboBox.setVisible(False)
+ self.backgroundTypeComboBox.setVisible(False)
+ self.backgroundTypeLabel.setVisible(False)
else:
- self.BackgroundTypeComboBox.setVisible(True)
- self.BackgroundTypeLabel.setVisible(True)
+ self.backgroundTypeComboBox.setVisible(True)
+ self.backgroundTypeLabel.setVisible(True)
if theme.background_type == u'solid':
- self.Color1PushButton.setStyleSheet(
+ self.color1PushButton.setStyleSheet(
u'background-color: %s' % unicode(theme.background_color))
- self.Color1Label.setText(
+ self.color1Label.setText(
translate('OpenLP.AmendThemeForm', 'Color:'))
- self.Color1Label.setVisible(True)
- self.Color1PushButton.setVisible(True)
- self.Color2Label.setVisible(False)
- self.Color2PushButton.setVisible(False)
- self.ImageLabel.setVisible(False)
- self.ImageLineEdit.setVisible(False)
- self.ImageFilenameWidget.setVisible(False)
- self.GradientLabel.setVisible(False)
- self.GradientComboBox.setVisible(False)
+ self.color1Label.setVisible(True)
+ self.color1PushButton.setVisible(True)
+ self.color2Label.setVisible(False)
+ self.color2PushButton.setVisible(False)
+ self.imageLabel.setVisible(False)
+ self.imageLineEdit.setVisible(False)
+ self.imageFilenameWidget.setVisible(False)
+ self.gradientLabel.setVisible(False)
+ self.gradientComboBox.setVisible(False)
elif theme.background_type == u'gradient':
- self.Color1PushButton.setStyleSheet(u'background-color: %s' \
+ self.color1PushButton.setStyleSheet(u'background-color: %s' \
% unicode(theme.background_startColor))
- self.Color2PushButton.setStyleSheet(u'background-color: %s' \
+ self.color2PushButton.setStyleSheet(u'background-color: %s' \
% unicode(theme.background_endColor))
- self.Color1Label.setText(
+ self.color1Label.setText(
translate('OpenLP.AmendThemeForm', 'First color:'))
- self.Color2Label.setText(
+ self.color2Label.setText(
translate('OpenLP.AmendThemeForm', 'Second color:'))
- self.Color1Label.setVisible(True)
- self.Color1PushButton.setVisible(True)
- self.Color2Label.setVisible(True)
- self.Color2PushButton.setVisible(True)
- self.ImageLabel.setVisible(False)
- self.ImageLineEdit.setVisible(False)
- self.ImageFilenameWidget.setVisible(False)
- self.GradientLabel.setVisible(True)
- self.GradientComboBox.setVisible(True)
+ self.color1Label.setVisible(True)
+ self.color1PushButton.setVisible(True)
+ self.color2Label.setVisible(True)
+ self.color2PushButton.setVisible(True)
+ self.imageLabel.setVisible(False)
+ self.imageLineEdit.setVisible(False)
+ self.imageFilenameWidget.setVisible(False)
+ self.gradientLabel.setVisible(True)
+ self.gradientComboBox.setVisible(True)
else: # must be image
- self.Color1Label.setVisible(False)
- self.Color1PushButton.setVisible(False)
- self.Color2Label.setVisible(False)
- self.Color2PushButton.setVisible(False)
- self.ImageLabel.setVisible(True)
- self.ImageLineEdit.setVisible(True)
- self.ImageFilenameWidget.setVisible(True)
- self.GradientLabel.setVisible(False)
- self.GradientComboBox.setVisible(False)
+ self.color1Label.setVisible(False)
+ self.color1PushButton.setVisible(False)
+ self.color2Label.setVisible(False)
+ self.color2PushButton.setVisible(False)
+ self.imageLabel.setVisible(True)
+ self.imageLineEdit.setVisible(True)
+ self.imageFilenameWidget.setVisible(True)
+ self.gradientLabel.setVisible(False)
+ self.gradientComboBox.setVisible(False)
if not theme.font_main_override:
- self.FontMainXSpinBox.setEnabled(False)
- self.FontMainYSpinBox.setEnabled(False)
- self.FontMainWidthSpinBox.setEnabled(False)
- self.FontMainHeightSpinBox.setEnabled(False)
+ self.fontMainXSpinBox.setEnabled(False)
+ self.fontMainYSpinBox.setEnabled(False)
+ self.fontMainWidthSpinBox.setEnabled(False)
+ self.fontMainHeightSpinBox.setEnabled(False)
else:
- self.FontMainXSpinBox.setEnabled(True)
- self.FontMainYSpinBox.setEnabled(True)
- self.FontMainWidthSpinBox.setEnabled(True)
- self.FontMainHeightSpinBox.setEnabled(True)
+ self.fontMainXSpinBox.setEnabled(True)
+ self.fontMainYSpinBox.setEnabled(True)
+ self.fontMainWidthSpinBox.setEnabled(True)
+ self.fontMainHeightSpinBox.setEnabled(True)
if not theme.font_footer_override:
- self.FontFooterXSpinBox.setEnabled(False)
- self.FontFooterYSpinBox.setEnabled(False)
- self.FontFooterWidthSpinBox.setEnabled(False)
- self.FontFooterHeightSpinBox.setEnabled(False)
+ self.fontFooterXSpinBox.setEnabled(False)
+ self.fontFooterYSpinBox.setEnabled(False)
+ self.fontFooterWidthSpinBox.setEnabled(False)
+ self.fontFooterHeightSpinBox.setEnabled(False)
else:
- self.FontFooterXSpinBox.setEnabled(True)
- self.FontFooterYSpinBox.setEnabled(True)
- self.FontFooterWidthSpinBox.setEnabled(True)
- self.FontFooterHeightSpinBox.setEnabled(True)
+ self.fontFooterXSpinBox.setEnabled(True)
+ self.fontFooterYSpinBox.setEnabled(True)
+ self.fontFooterWidthSpinBox.setEnabled(True)
+ self.fontFooterHeightSpinBox.setEnabled(True)
if self.theme.display_outline:
- self.OutlineColorPushButton.setEnabled(True)
+ self.outlineColorPushButton.setEnabled(True)
else:
- self.OutlineColorPushButton.setEnabled(False)
+ self.outlineColorPushButton.setEnabled(False)
if self.theme.display_shadow:
- self.ShadowColorPushButton.setEnabled(True)
+ self.shadowColorPushButton.setEnabled(True)
else:
- self.ShadowColorPushButton.setEnabled(False)
+ self.shadowColorPushButton.setEnabled(False)
def previewTheme(self):
if self.allowPreview:
@@ -742,15 +742,15 @@
# pixels top/bottom
line_height += 2 * int(self.theme.display_outline_size)
page_length = \
- ((self.FontMainHeightSpinBox.value()) / line_height )
+ ((self.fontMainHeightSpinBox.value()) / line_height )
log.debug(u'Page Length area height %s, metrics %s, lines %s' %
- (self.FontMainHeightSpinBox.value(), metrics.height(),
+ (self.fontMainHeightSpinBox.value(), metrics.height(),
page_length))
page_length_text = unicode(
translate('OpenLP.AmendThemeForm', 'Slide height is %s rows.'))
- self.FontMainLinesPageLabel.setText(page_length_text % page_length)
+ self.fontMainLinesPageLabel.setText(page_length_text % page_length)
frame = self.thememanager.generateImage(self.theme)
- self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame))
+ self.themePreview.setPixmap(QtGui.QPixmap.fromImage(frame))
def _getThemeMetrics(self):
main_weight = 50
@@ -765,5 +765,5 @@
# Validate that the screen width is big enough to display the text
if self.theme.font_main_width < metrics.maxWidth() * 2 + 64:
self.theme.font_main_width = metrics.maxWidth() * 2 + 64
- self.FontMainWidthSpinBox.setValue(self.theme.font_main_width)
+ self.fontMainWidthSpinBox.setValue(self.theme.font_main_width)
return metrics
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2010-07-26 15:19:11 +0000
+++ openlp/core/ui/generaltab.py 2010-07-27 12:35:56 +0000
@@ -61,96 +61,95 @@
"""
self.setObjectName(u'GeneralTab')
self.tabTitleVisible = translate('OpenLP.GeneralTab', 'General')
- self.GeneralLayout = QtGui.QHBoxLayout(self)
- self.GeneralLayout.setSpacing(8)
- self.GeneralLayout.setMargin(8)
- self.GeneralLayout.setObjectName(u'GeneralLayout')
- self.GeneralLeftLayout = QtGui.QVBoxLayout()
- self.GeneralLeftLayout.setObjectName(u'GeneralLeftLayout')
- self.GeneralLeftLayout.setSpacing(8)
- self.GeneralLeftLayout.setMargin(0)
- self.GeneralLayout.addLayout(self.GeneralLeftLayout)
- self.MonitorGroupBox = QtGui.QGroupBox(self)
- self.MonitorGroupBox.setObjectName(u'MonitorGroupBox')
- self.MonitorLayout = QtGui.QVBoxLayout(self.MonitorGroupBox)
- self.MonitorLayout.setSpacing(8)
- self.MonitorLayout.setMargin(8)
- self.MonitorLayout.setObjectName(u'MonitorLayout')
- self.MonitorLabel = QtGui.QLabel(self.MonitorGroupBox)
- self.MonitorLabel.setObjectName(u'MonitorLabel')
- self.MonitorLayout.addWidget(self.MonitorLabel)
- self.MonitorComboBox = QtGui.QComboBox(self.MonitorGroupBox)
- self.MonitorComboBox.setObjectName(u'MonitorComboBox')
- self.MonitorLayout.addWidget(self.MonitorComboBox)
- self.MonitorLayout.addWidget(self.MonitorComboBox)
- self.DisplayOnMonitorCheck = QtGui.QCheckBox(self.MonitorGroupBox)
- self.DisplayOnMonitorCheck.setObjectName(u'MonitorComboBox')
- self.MonitorLayout.addWidget(self.DisplayOnMonitorCheck)
- self.GeneralLeftLayout.addWidget(self.MonitorGroupBox)
- self.StartupGroupBox = QtGui.QGroupBox(self)
- self.StartupGroupBox.setObjectName(u'StartupGroupBox')
- self.StartupLayout = QtGui.QVBoxLayout(self.StartupGroupBox)
- self.StartupLayout.setSpacing(8)
- self.StartupLayout.setMargin(8)
- self.StartupLayout.setObjectName(u'StartupLayout')
- self.WarningCheckBox = QtGui.QCheckBox(self.StartupGroupBox)
- self.WarningCheckBox.setObjectName(u'WarningCheckBox')
- self.StartupLayout.addWidget(self.WarningCheckBox)
- self.AutoOpenCheckBox = QtGui.QCheckBox(self.StartupGroupBox)
- self.AutoOpenCheckBox.setObjectName(u'AutoOpenCheckBox')
- self.StartupLayout.addWidget(self.AutoOpenCheckBox)
- self.ShowSplashCheckBox = QtGui.QCheckBox(self.StartupGroupBox)
- self.ShowSplashCheckBox.setObjectName(u'ShowSplashCheckBox')
- self.StartupLayout.addWidget(self.ShowSplashCheckBox)
- self.GeneralLeftLayout.addWidget(self.StartupGroupBox)
- self.SettingsGroupBox = QtGui.QGroupBox(self)
- self.SettingsGroupBox.setObjectName(u'SettingsGroupBox')
- self.SettingsLayout = QtGui.QVBoxLayout(self.SettingsGroupBox)
- self.SettingsLayout.setSpacing(8)
- self.SettingsLayout.setMargin(8)
- self.SettingsLayout.setObjectName(u'SettingsLayout')
- self.SaveCheckServiceCheckBox = QtGui.QCheckBox(self.SettingsGroupBox)
- self.SaveCheckServiceCheckBox.setObjectName(u'SaveCheckServiceCheckBox')
- self.SettingsLayout.addWidget(self.SaveCheckServiceCheckBox)
- self.GeneralLeftLayout.addWidget(self.SettingsGroupBox)
- self.AutoPreviewCheckBox = QtGui.QCheckBox(self.SettingsGroupBox)
- self.AutoPreviewCheckBox.setObjectName(u'AutoPreviewCheckBox')
- self.SettingsLayout.addWidget(self.AutoPreviewCheckBox)
- self.GeneralLeftLayout.addWidget(self.SettingsGroupBox)
- self.GeneralLeftSpacer = QtGui.QSpacerItem(20, 40,
+ self.generalLayout = QtGui.QHBoxLayout(self)
+ self.generalLayout.setSpacing(8)
+ self.generalLayout.setMargin(8)
+ self.generalLayout.setObjectName(u'generalLayout')
+ self.generalLeftLayout = QtGui.QVBoxLayout()
+ self.generalLeftLayout.setObjectName(u'generalLeftLayout')
+ self.generalLeftLayout.setSpacing(8)
+ self.generalLeftLayout.setMargin(0)
+ self.generalLayout.addLayout(self.generalLeftLayout)
+ self.monitorGroupBox = QtGui.QGroupBox(self)
+ self.monitorGroupBox.setObjectName(u'monitorGroupBox')
+ self.monitorLayout = QtGui.QVBoxLayout(self.monitorGroupBox)
+ self.monitorLayout.setSpacing(8)
+ self.monitorLayout.setMargin(8)
+ self.monitorLayout.setObjectName(u'monitorLayout')
+ self.monitorLabel = QtGui.QLabel(self.monitorGroupBox)
+ self.monitorLabel.setObjectName(u'monitorLabel')
+ self.monitorLayout.addWidget(self.monitorLabel)
+ self.monitorComboBox = QtGui.QComboBox(self.monitorGroupBox)
+ self.monitorComboBox.setObjectName(u'monitorComboBox')
+ self.monitorLayout.addWidget(self.monitorComboBox)
+ self.displayOnMonitorCheck = QtGui.QCheckBox(self.monitorGroupBox)
+ self.displayOnMonitorCheck.setObjectName(u'monitorComboBox')
+ self.monitorLayout.addWidget(self.displayOnMonitorCheck)
+ self.generalLeftLayout.addWidget(self.monitorGroupBox)
+ self.startupGroupBox = QtGui.QGroupBox(self)
+ self.startupGroupBox.setObjectName(u'startupGroupBox')
+ self.startupLayout = QtGui.QVBoxLayout(self.startupGroupBox)
+ self.startupLayout.setSpacing(8)
+ self.startupLayout.setMargin(8)
+ self.startupLayout.setObjectName(u'startupLayout')
+ self.warningCheckBox = QtGui.QCheckBox(self.startupGroupBox)
+ self.warningCheckBox.setObjectName(u'warningCheckBox')
+ self.startupLayout.addWidget(self.warningCheckBox)
+ self.autoOpenCheckBox = QtGui.QCheckBox(self.startupGroupBox)
+ self.autoOpenCheckBox.setObjectName(u'autoOpenCheckBox')
+ self.startupLayout.addWidget(self.autoOpenCheckBox)
+ self.showSplashCheckBox = QtGui.QCheckBox(self.startupGroupBox)
+ self.showSplashCheckBox.setObjectName(u'showSplashCheckBox')
+ self.startupLayout.addWidget(self.showSplashCheckBox)
+ self.generalLeftLayout.addWidget(self.startupGroupBox)
+ self.settingsGroupBox = QtGui.QGroupBox(self)
+ self.settingsGroupBox.setObjectName(u'settingsGroupBox')
+ self.settingsLayout = QtGui.QVBoxLayout(self.settingsGroupBox)
+ self.settingsLayout.setSpacing(8)
+ self.settingsLayout.setMargin(8)
+ self.settingsLayout.setObjectName(u'settingsLayout')
+ self.saveCheckServiceCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
+ self.saveCheckServiceCheckBox.setObjectName(u'saveCheckServiceCheckBox')
+ self.settingsLayout.addWidget(self.saveCheckServiceCheckBox)
+ self.generalLeftLayout.addWidget(self.settingsGroupBox)
+ self.autoPreviewCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
+ self.autoPreviewCheckBox.setObjectName(u'autoPreviewCheckBox')
+ self.settingsLayout.addWidget(self.autoPreviewCheckBox)
+ self.generalLeftLayout.addWidget(self.settingsGroupBox)
+ self.generalLeftSpacer = QtGui.QSpacerItem(20, 40,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
- self.GeneralLeftLayout.addItem(self.GeneralLeftSpacer)
- self.GeneralRightLayout = QtGui.QVBoxLayout()
- self.GeneralRightLayout.setSpacing(8)
- self.GeneralRightLayout.setMargin(0)
- self.GeneralRightLayout.setObjectName(u'GeneralRightLayout')
- self.GeneralLayout.addLayout(self.GeneralRightLayout)
- self.CCLIGroupBox = QtGui.QGroupBox(self)
- self.CCLIGroupBox.setObjectName(u'CCLIGroupBox')
- self.CCLILayout = QtGui.QGridLayout(self.CCLIGroupBox)
- self.CCLILayout.setMargin(8)
- self.CCLILayout.setSpacing(8)
- self.CCLILayout.setObjectName(u'CCLILayout')
- self.NumberLabel = QtGui.QLabel(self.CCLIGroupBox)
- self.NumberLabel.setObjectName(u'NumberLabel')
- self.CCLILayout.addWidget(self.NumberLabel, 0, 0, 1, 1)
- self.NumberEdit = QtGui.QLineEdit(self.CCLIGroupBox)
- self.NumberEdit.setObjectName(u'NumberEdit')
- self.CCLILayout.addWidget(self.NumberEdit, 0, 1, 1, 1)
- self.UsernameLabel = QtGui.QLabel(self.CCLIGroupBox)
- self.UsernameLabel.setObjectName(u'UsernameLabel')
- self.CCLILayout.addWidget(self.UsernameLabel, 1, 0, 1, 1)
- self.UsernameEdit = QtGui.QLineEdit(self.CCLIGroupBox)
- self.UsernameEdit.setObjectName(u'UsernameEdit')
- self.CCLILayout.addWidget(self.UsernameEdit, 1, 1, 1, 1)
- self.PasswordLabel = QtGui.QLabel(self.CCLIGroupBox)
- self.PasswordLabel.setObjectName(u'PasswordLabel')
- self.CCLILayout.addWidget(self.PasswordLabel, 2, 0, 1, 1)
- self.PasswordEdit = QtGui.QLineEdit(self.CCLIGroupBox)
- self.PasswordEdit.setEchoMode(QtGui.QLineEdit.Password)
- self.PasswordEdit.setObjectName(u'PasswordEdit')
- self.CCLILayout.addWidget(self.PasswordEdit, 2, 1, 1, 1)
- self.GeneralRightLayout.addWidget(self.CCLIGroupBox)
+ self.generalLeftLayout.addItem(self.generalLeftSpacer)
+ self.generalRightLayout = QtGui.QVBoxLayout()
+ self.generalRightLayout.setSpacing(8)
+ self.generalRightLayout.setMargin(0)
+ self.generalRightLayout.setObjectName(u'generalRightLayout')
+ self.generalLayout.addLayout(self.generalRightLayout)
+ self.ccliGroupBox = QtGui.QGroupBox(self)
+ self.ccliGroupBox.setObjectName(u'ccliGroupBox')
+ self.ccliLayout = QtGui.QGridLayout(self.ccliGroupBox)
+ self.ccliLayout.setMargin(8)
+ self.ccliLayout.setSpacing(8)
+ self.ccliLayout.setObjectName(u'ccliLayout')
+ self.numberLabel = QtGui.QLabel(self.ccliGroupBox)
+ self.numberLabel.setObjectName(u'numberLabel')
+ self.ccliLayout.addWidget(self.numberLabel, 0, 0, 1, 1)
+ self.numberEdit = QtGui.QLineEdit(self.ccliGroupBox)
+ self.numberEdit.setObjectName(u'numberEdit')
+ self.ccliLayout.addWidget(self.numberEdit, 0, 1, 1, 1)
+ self.usernameLabel = QtGui.QLabel(self.ccliGroupBox)
+ self.usernameLabel.setObjectName(u'usernameLabel')
+ self.ccliLayout.addWidget(self.usernameLabel, 1, 0, 1, 1)
+ self.usernameEdit = QtGui.QLineEdit(self.ccliGroupBox)
+ self.usernameEdit.setObjectName(u'usernameEdit')
+ self.ccliLayout.addWidget(self.usernameEdit, 1, 1, 1, 1)
+ self.passwordLabel = QtGui.QLabel(self.ccliGroupBox)
+ self.passwordLabel.setObjectName(u'passwordLabel')
+ self.ccliLayout.addWidget(self.passwordLabel, 2, 0, 1, 1)
+ self.passwordEdit = QtGui.QLineEdit(self.ccliGroupBox)
+ self.passwordEdit.setEchoMode(QtGui.QLineEdit.Password)
+ self.passwordEdit.setObjectName(u'passwordEdit')
+ self.ccliLayout.addWidget(self.passwordEdit, 2, 1, 1, 1)
+ self.generalRightLayout.addWidget(self.ccliGroupBox)
# Moved here from display tab
self.displayGroupBox = QtGui.QGroupBox(self)
self.displayGroupBox.setObjectName(u'displayGroupBox')
@@ -219,7 +218,7 @@
self.overrideCheckBox = QtGui.QCheckBox(self.displayGroupBox)
self.overrideCheckBox.setObjectName(u'overrideCheckBox')
self.displayLayout.addWidget(self.overrideCheckBox)
- self.GeneralRightLayout.addWidget(self.displayGroupBox)
+ self.generalRightLayout.addWidget(self.displayGroupBox)
# Custom position
self.customLayout = QtGui.QHBoxLayout()
self.customLayout.setSpacing(8)
@@ -276,9 +275,9 @@
self.customLayout.addLayout(self.customWidthLayout)
self.displayLayout.addLayout(self.customLayout)
# Bottom spacer
- self.GeneralRightSpacer = QtGui.QSpacerItem(20, 40,
+ self.generalRightSpacer = QtGui.QSpacerItem(20, 40,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
- self.GeneralRightLayout.addItem(self.GeneralRightSpacer)
+ self.generalRightLayout.addItem(self.generalRightSpacer)
# Signals and slots
QtCore.QObject.connect(self.overrideCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.onOverrideCheckBoxToggled)
@@ -287,33 +286,33 @@
"""
Translate the general settings tab to the currently selected language
"""
- self.MonitorGroupBox.setTitle(translate('OpenLP.GeneralTab',
+ self.monitorGroupBox.setTitle(translate('OpenLP.GeneralTab',
'Monitors'))
- self.MonitorLabel.setText(translate('OpenLP.GeneralTab',
+ self.monitorLabel.setText(translate('OpenLP.GeneralTab',
'Select monitor for output display:'))
- self.DisplayOnMonitorCheck.setText(
+ self.displayOnMonitorCheck.setText(
translate('OpenLP.GeneralTab', 'Display if a single screen'))
- self.StartupGroupBox.setTitle(
+ self.startupGroupBox.setTitle(
translate('OpenLP.GeneralTab', 'Application Startup'))
- self.WarningCheckBox.setText(
+ self.warningCheckBox.setText(
translate('OpenLP.GeneralTab', 'Show blank screen warning'))
- self.AutoOpenCheckBox.setText(translate('OpenLP.GeneralTab',
+ self.autoOpenCheckBox.setText(translate('OpenLP.GeneralTab',
'Automatically open the last service'))
- self.ShowSplashCheckBox.setText(
+ self.showSplashCheckBox.setText(
translate('OpenLP.GeneralTab', 'Show the splash screen'))
- self.SettingsGroupBox.setTitle(
+ self.settingsGroupBox.setTitle(
translate('OpenLP.GeneralTab', 'Application Settings'))
- self.SaveCheckServiceCheckBox.setText(translate('OpenLP.GeneralTab',
+ self.saveCheckServiceCheckBox.setText(translate('OpenLP.GeneralTab',
'Prompt to save before starting a new service'))
- self.AutoPreviewCheckBox.setText(translate('OpenLP.GeneralTab',
+ self.autoPreviewCheckBox.setText(translate('OpenLP.GeneralTab',
'Automatically preview next item in service'))
- self.CCLIGroupBox.setTitle(
+ self.ccliGroupBox.setTitle(
translate('OpenLP.GeneralTab', 'CCLI Details'))
- self.NumberLabel.setText(
+ self.numberLabel.setText(
translate('OpenLP.GeneralTab', 'CCLI number:'))
- self.UsernameLabel.setText(
+ self.usernameLabel.setText(
translate('OpenLP.GeneralTab', 'SongSelect username:'))
- self.PasswordLabel.setText(
+ self.passwordLabel.setText(
translate('OpenLP.GeneralTab', 'SongSelect password:'))
# Moved from display tab
self.displayGroupBox.setTitle(
@@ -348,24 +347,24 @@
if screen[u'primary']:
screen_name = u'%s (%s)' % (screen_name,
translate('OpenLP.GeneralTab', 'primary'))
- self.MonitorComboBox.addItem(screen_name)
- self.NumberEdit.setText(unicode(settings.value(
+ self.monitorComboBox.addItem(screen_name)
+ self.numberEdit.setText(unicode(settings.value(
u'ccli number', QtCore.QVariant(u'')).toString()))
- self.UsernameEdit.setText(unicode(settings.value(
+ self.usernameEdit.setText(unicode(settings.value(
u'songselect username', QtCore.QVariant(u'')).toString()))
- self.PasswordEdit.setText(unicode(settings.value(
+ self.passwordEdit.setText(unicode(settings.value(
u'songselect password', QtCore.QVariant(u'')).toString()))
- self.SaveCheckServiceCheckBox.setChecked(settings.value(u'save prompt',
- QtCore.QVariant(False)).toBool())
- self.MonitorComboBox.setCurrentIndex(self.monitorNumber)
- self.DisplayOnMonitorCheck.setChecked(self.screens.display)
- self.WarningCheckBox.setChecked(settings.value(u'blank warning',
- QtCore.QVariant(False)).toBool())
- self.AutoOpenCheckBox.setChecked(settings.value(u'auto open',
- QtCore.QVariant(False)).toBool())
- self.ShowSplashCheckBox.setChecked(settings.value(u'show splash',
+ self.saveCheckServiceCheckBox.setChecked(settings.value(u'save prompt',
+ QtCore.QVariant(False)).toBool())
+ self.monitorComboBox.setCurrentIndex(self.monitorNumber)
+ self.displayOnMonitorCheck.setChecked(self.screens.display)
+ self.warningCheckBox.setChecked(settings.value(u'blank warning',
+ QtCore.QVariant(False)).toBool())
+ self.autoOpenCheckBox.setChecked(settings.value(u'auto open',
+ QtCore.QVariant(False)).toBool())
+ self.showSplashCheckBox.setChecked(settings.value(u'show splash',
QtCore.QVariant(True)).toBool())
- self.AutoPreviewCheckBox.setChecked(settings.value(u'auto preview',
+ self.autoPreviewCheckBox.setChecked(settings.value(u'auto preview',
QtCore.QVariant(False)).toBool())
self.currentXValueLabel.setText(
unicode(self.screens.current[u'size'].x()))
@@ -402,34 +401,34 @@
self.customYValueEdit.setEnabled(self.overrideCheckBox.isChecked())
self.customHeightValueEdit.setEnabled(self.overrideCheckBox.isChecked())
self.customWidthValueEdit.setEnabled(self.overrideCheckBox.isChecked())
- self.override_changed = False
+ self.overrideChanged = False
def save(self):
"""
Save the settings from the form
"""
- self.monitorNumber = self.MonitorComboBox.currentIndex()
+ self.monitorNumber = self.monitorComboBox.currentIndex()
settings = QtCore.QSettings()
settings.beginGroup(self.settingsSection)
settings.setValue(u'monitor', QtCore.QVariant(self.monitorNumber))
settings.setValue(u'display on monitor',
- QtCore.QVariant(self.DisplayOnMonitorCheck.isChecked()))
+ QtCore.QVariant(self.displayOnMonitorCheck.isChecked()))
settings.setValue(u'blank warning',
- QtCore.QVariant(self.WarningCheckBox.isChecked()))
+ QtCore.QVariant(self.warningCheckBox.isChecked()))
settings.setValue(u'auto open',
- QtCore.QVariant(self.AutoOpenCheckBox.isChecked()))
+ QtCore.QVariant(self.autoOpenCheckBox.isChecked()))
settings.setValue(u'show splash',
- QtCore.QVariant(self.ShowSplashCheckBox.isChecked()))
+ QtCore.QVariant(self.showSplashCheckBox.isChecked()))
settings.setValue(u'save prompt',
- QtCore.QVariant(self.SaveCheckServiceCheckBox.isChecked()))
+ QtCore.QVariant(self.saveCheckServiceCheckBox.isChecked()))
settings.setValue(u'auto preview',
- QtCore.QVariant(self.AutoPreviewCheckBox.isChecked()))
+ QtCore.QVariant(self.autoPreviewCheckBox.isChecked()))
settings.setValue(u'ccli number',
- QtCore.QVariant(self.NumberEdit.displayText()))
+ QtCore.QVariant(self.numberEdit.displayText()))
settings.setValue(u'songselect username',
- QtCore.QVariant(self.UsernameEdit.displayText()))
+ QtCore.QVariant(self.usernameEdit.displayText()))
settings.setValue(u'songselect password',
- QtCore.QVariant(self.PasswordEdit.displayText()))
+ QtCore.QVariant(self.passwordEdit.displayText()))
settings.setValue(u'x position',
QtCore.QVariant(self.customXValueEdit.text()))
settings.setValue(u'y position',
@@ -441,7 +440,7 @@
settings.setValue(u'override position',
QtCore.QVariant(self.overrideCheckBox.isChecked()))
settings.endGroup()
- self.screens.display = self.DisplayOnMonitorCheck.isChecked()
+ self.screens.display = self.displayOnMonitorCheck.isChecked()
#Monitor Number has changed.
if self.screens.monitor_number != self.monitorNumber:
self.screens.monitor_number = self.monitorNumber
@@ -474,4 +473,4 @@
self.customYValueEdit.setEnabled(checked)
self.customHeightValueEdit.setEnabled(checked)
self.customWidthValueEdit.setEnabled(checked)
- self.override_changed = True
+ self.overrideChanged = True
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2010-07-26 20:31:05 +0000
+++ openlp/core/ui/maindisplay.py 2010-07-27 12:35:56 +0000
@@ -708,4 +708,4 @@
Clean up the Object queue
"""
log.debug(u'AudioPlayer Reached end of media playlist')
- self.mediaObject.clearQueue()
\ No newline at end of file
+ self.mediaObject.clearQueue()
=== modified file 'openlp/core/ui/mediadockmanager.py'
--- openlp/core/ui/mediadockmanager.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/mediadockmanager.py 2010-07-27 12:35:56 +0000
@@ -80,4 +80,4 @@
if self.media_dock.widget(dock_index).settingsSection == \
name.lower():
self.media_dock.widget(dock_index).hide()
- self.media_dock.removeItem(dock_index)
\ No newline at end of file
+ self.media_dock.removeItem(dock_index)
=== modified file 'openlp/core/ui/plugindialog.py'
--- openlp/core/ui/plugindialog.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/plugindialog.py 2010-07-27 12:35:56 +0000
@@ -28,91 +28,91 @@
from openlp.core.lib import translate
class Ui_PluginViewDialog(object):
- def setupUi(self, PluginViewDialog):
- PluginViewDialog.setObjectName(u'PluginViewDialog')
- PluginViewDialog.setWindowModality(QtCore.Qt.ApplicationModal)
- PluginViewDialog.resize(554, 344)
- self.PluginLayout = QtGui.QVBoxLayout(PluginViewDialog)
- self.PluginLayout.setSpacing(8)
- self.PluginLayout.setMargin(8)
- self.PluginLayout.setObjectName(u'PluginLayout')
- self.ListLayout = QtGui.QHBoxLayout()
- self.ListLayout.setSpacing(8)
- self.ListLayout.setObjectName(u'ListLayout')
- self.PluginListWidget = QtGui.QListWidget(PluginViewDialog)
+ def setupUi(self, pluginViewDialog):
+ pluginViewDialog.setObjectName(u'pluginViewDialog')
+ pluginViewDialog.setWindowModality(QtCore.Qt.ApplicationModal)
+ pluginViewDialog.resize(554, 344)
+ self.pluginLayout = QtGui.QVBoxLayout(pluginViewDialog)
+ self.pluginLayout.setSpacing(8)
+ self.pluginLayout.setMargin(8)
+ self.pluginLayout.setObjectName(u'pluginLayout')
+ self.listLayout = QtGui.QHBoxLayout()
+ self.listLayout.setSpacing(8)
+ self.listLayout.setObjectName(u'listLayout')
+ self.pluginListWidget = QtGui.QListWidget(pluginViewDialog)
sizePolicy = QtGui.QSizePolicy(
QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(
- self.PluginListWidget.sizePolicy().hasHeightForWidth())
- self.PluginListWidget.setSizePolicy(sizePolicy)
- self.PluginListWidget.setMaximumSize(QtCore.QSize(192, 16777215))
- self.PluginListWidget.setObjectName(u'PluginListWidget')
- self.ListLayout.addWidget(self.PluginListWidget)
- self.PluginInfoGroupBox = QtGui.QGroupBox(PluginViewDialog)
- self.PluginInfoGroupBox.setAlignment(
+ self.pluginListWidget.sizePolicy().hasHeightForWidth())
+ self.pluginListWidget.setSizePolicy(sizePolicy)
+ self.pluginListWidget.setMaximumSize(QtCore.QSize(192, 16777215))
+ self.pluginListWidget.setObjectName(u'pluginListWidget')
+ self.listLayout.addWidget(self.pluginListWidget)
+ self.pluginInfoGroupBox = QtGui.QGroupBox(pluginViewDialog)
+ self.pluginInfoGroupBox.setAlignment(
QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
- self.PluginInfoGroupBox.setFlat(False)
- self.PluginInfoGroupBox.setObjectName(u'PluginInfoGroupBox')
- self.PluginInfoLayout = QtGui.QFormLayout(self.PluginInfoGroupBox)
- self.PluginInfoLayout.setMargin(8)
- self.PluginInfoLayout.setSpacing(8)
- self.PluginInfoLayout.setObjectName(u'PluginInfoLayout')
- self.VersionLabel = QtGui.QLabel(self.PluginInfoGroupBox)
- self.VersionLabel.setObjectName(u'VersionLabel')
- self.PluginInfoLayout.setWidget(
- 1, QtGui.QFormLayout.LabelRole, self.VersionLabel)
- self.VersionNumberLabel = QtGui.QLabel(self.PluginInfoGroupBox)
- self.VersionNumberLabel.setObjectName(u'VersionNumberLabel')
- self.PluginInfoLayout.setWidget(
- 1, QtGui.QFormLayout.FieldRole, self.VersionNumberLabel)
- self.AboutLabel = QtGui.QLabel(self.PluginInfoGroupBox)
- self.AboutLabel.setObjectName(u'AboutLabel')
- self.PluginInfoLayout.setWidget(
- 2, QtGui.QFormLayout.LabelRole, self.AboutLabel)
- self.StatusLabel = QtGui.QLabel(self.PluginInfoGroupBox)
- self.StatusLabel.setObjectName(u'StatusLabel')
- self.PluginInfoLayout.setWidget(
- 0, QtGui.QFormLayout.LabelRole, self.StatusLabel)
- self.StatusComboBox = QtGui.QComboBox(self.PluginInfoGroupBox)
- self.StatusComboBox.setObjectName(u'StatusComboBox')
- self.StatusComboBox.addItem(QtCore.QString())
- self.StatusComboBox.addItem(QtCore.QString())
- self.PluginInfoLayout.setWidget(
- 0, QtGui.QFormLayout.FieldRole, self.StatusComboBox)
- self.AboutTextBrowser = QtGui.QTextBrowser(self.PluginInfoGroupBox)
- self.AboutTextBrowser.setTextInteractionFlags(
+ self.pluginInfoGroupBox.setFlat(False)
+ self.pluginInfoGroupBox.setObjectName(u'pluginInfoGroupBox')
+ self.pluginInfoLayout = QtGui.QFormLayout(self.pluginInfoGroupBox)
+ self.pluginInfoLayout.setMargin(8)
+ self.pluginInfoLayout.setSpacing(8)
+ self.pluginInfoLayout.setObjectName(u'pluginInfoLayout')
+ self.versionLabel = QtGui.QLabel(self.pluginInfoGroupBox)
+ self.versionLabel.setObjectName(u'versionLabel')
+ self.pluginInfoLayout.setWidget(
+ 1, QtGui.QFormLayout.LabelRole, self.versionLabel)
+ self.versionNumberLabel = QtGui.QLabel(self.pluginInfoGroupBox)
+ self.versionNumberLabel.setObjectName(u'versionNumberLabel')
+ self.pluginInfoLayout.setWidget(
+ 1, QtGui.QFormLayout.FieldRole, self.versionNumberLabel)
+ self.aboutLabel = QtGui.QLabel(self.pluginInfoGroupBox)
+ self.aboutLabel.setObjectName(u'aboutLabel')
+ self.pluginInfoLayout.setWidget(
+ 2, QtGui.QFormLayout.LabelRole, self.aboutLabel)
+ self.statusLabel = QtGui.QLabel(self.pluginInfoGroupBox)
+ self.statusLabel.setObjectName(u'statusLabel')
+ self.pluginInfoLayout.setWidget(
+ 0, QtGui.QFormLayout.LabelRole, self.statusLabel)
+ self.statusComboBox = QtGui.QComboBox(self.pluginInfoGroupBox)
+ self.statusComboBox.setObjectName(u'statusComboBox')
+ self.statusComboBox.addItem(QtCore.QString())
+ self.statusComboBox.addItem(QtCore.QString())
+ self.pluginInfoLayout.setWidget(
+ 0, QtGui.QFormLayout.FieldRole, self.statusComboBox)
+ self.aboutTextBrowser = QtGui.QTextBrowser(self.pluginInfoGroupBox)
+ self.aboutTextBrowser.setTextInteractionFlags(
QtCore.Qt.LinksAccessibleByMouse)
- self.AboutTextBrowser.setObjectName(u'AboutTextBrowser')
- self.PluginInfoLayout.setWidget(
- 2, QtGui.QFormLayout.FieldRole, self.AboutTextBrowser)
- self.ListLayout.addWidget(self.PluginInfoGroupBox)
- self.PluginLayout.addLayout(self.ListLayout)
- self.PluginListButtonBox = QtGui.QDialogButtonBox(PluginViewDialog)
- self.PluginListButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok)
- self.PluginListButtonBox.setObjectName(u'PluginListButtonBox')
- self.PluginLayout.addWidget(self.PluginListButtonBox)
-
- self.retranslateUi(PluginViewDialog)
- QtCore.QObject.connect(self.PluginListButtonBox,
- QtCore.SIGNAL(u'accepted()'), PluginViewDialog.close)
- QtCore.QMetaObject.connectSlotsByName(PluginViewDialog)
-
- def retranslateUi(self, PluginViewDialog):
- PluginViewDialog.setWindowTitle(
+ self.aboutTextBrowser.setObjectName(u'aboutTextBrowser')
+ self.pluginInfoLayout.setWidget(
+ 2, QtGui.QFormLayout.FieldRole, self.aboutTextBrowser)
+ self.listLayout.addWidget(self.pluginInfoGroupBox)
+ self.pluginLayout.addLayout(self.listLayout)
+ self.pluginListButtonBox = QtGui.QDialogButtonBox(pluginViewDialog)
+ self.pluginListButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok)
+ self.pluginListButtonBox.setObjectName(u'pluginListButtonBox')
+ self.pluginLayout.addWidget(self.pluginListButtonBox)
+
+ self.retranslateUi(pluginViewDialog)
+ QtCore.QObject.connect(self.pluginListButtonBox,
+ QtCore.SIGNAL(u'accepted()'), pluginViewDialog.close)
+ QtCore.QMetaObject.connectSlotsByName(pluginViewDialog)
+
+ def retranslateUi(self, pluginViewDialog):
+ pluginViewDialog.setWindowTitle(
translate('OpenLP.PluginForm', 'Plugin List'))
- self.PluginInfoGroupBox.setTitle(
+ self.pluginInfoGroupBox.setTitle(
translate('OpenLP.PluginForm', 'Plugin Details'))
- self.VersionLabel.setText(
+ self.versionLabel.setText(
translate('OpenLP.PluginForm', 'Version:'))
- self.VersionNumberLabel.setText(
+ self.versionNumberLabel.setText(
translate('OpenLP.PluginForm', 'TextLabel'))
- self.AboutLabel.setText(
+ self.aboutLabel.setText(
translate('OpenLP.PluginForm', 'About:'))
- self.StatusLabel.setText(
+ self.statusLabel.setText(
translate('OpenLP.PluginForm', 'Status:'))
- self.StatusComboBox.setItemText(0,
+ self.statusComboBox.setItemText(0,
translate('OpenLP.PluginForm', 'Active'))
- self.StatusComboBox.setItemText(1,
- translate('OpenLP.PluginForm', 'Inactive'))
\ No newline at end of file
+ self.statusComboBox.setItemText(1,
+ translate('OpenLP.PluginForm', 'Inactive'))
=== modified file 'openlp/core/ui/pluginform.py'
--- openlp/core/ui/pluginform.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/pluginform.py 2010-07-27 12:35:56 +0000
@@ -45,11 +45,11 @@
self._clearDetails()
# Right, now let's put some signals and slots together!
QtCore.QObject.connect(
- self.PluginListWidget,
+ self.pluginListWidget,
QtCore.SIGNAL(u'itemSelectionChanged()'),
self.onPluginListWidgetSelectionChanged)
QtCore.QObject.connect(
- self.StatusComboBox,
+ self.statusComboBox,
QtCore.SIGNAL(u'currentIndexChanged(int)'),
self.onStatusComboBoxChanged)
@@ -57,9 +57,9 @@
"""
Load the plugin details into the screen
"""
- self.PluginListWidget.clear()
+ self.pluginListWidget.clear()
for plugin in self.parent.plugin_manager.plugins:
- item = QtGui.QListWidgetItem(self.PluginListWidget)
+ item = QtGui.QListWidgetItem(self.pluginListWidget)
# We do this just to make 100% sure the status is an integer as
# sometimes when it's loaded from the config, it isn't cast to int.
plugin.status = int(plugin.status)
@@ -79,31 +79,31 @@
# If the plugin has an icon, set it!
if plugin.icon:
item.setIcon(plugin.icon)
- self.PluginListWidget.addItem(item)
+ self.pluginListWidget.addItem(item)
def _clearDetails(self):
- self.StatusComboBox.setCurrentIndex(-1)
- self.VersionNumberLabel.setText(u'')
- self.AboutTextBrowser.setHtml(u'')
- self.StatusComboBox.setEnabled(False)
+ self.statusComboBox.setCurrentIndex(-1)
+ self.versionNumberLabel.setText(u'')
+ self.aboutTextBrowser.setHtml(u'')
+ self.statusComboBox.setEnabled(False)
def _setDetails(self):
log.debug('PluginStatus: %s', str(self.activePlugin.status))
- self.VersionNumberLabel.setText(self.activePlugin.version)
- self.AboutTextBrowser.setHtml(self.activePlugin.about())
+ self.versionNumberLabel.setText(self.activePlugin.version)
+ self.aboutTextBrowser.setHtml(self.activePlugin.about())
self.programaticChange = True
status = 1
if self.activePlugin.status == PluginStatus.Active:
status = 0
- self.StatusComboBox.setCurrentIndex(status)
- self.StatusComboBox.setEnabled(True)
+ self.statusComboBox.setCurrentIndex(status)
+ self.statusComboBox.setEnabled(True)
self.programaticChange = False
def onPluginListWidgetSelectionChanged(self):
- if self.PluginListWidget.currentItem() is None:
+ if self.pluginListWidget.currentItem() is None:
self._clearDetails()
return
- plugin_name = self.PluginListWidget.currentItem().text().split(u' ')[0]
+ plugin_name = self.pluginListWidget.currentItem().text().split(u' ')[0]
self.activePlugin = None
for plugin in self.parent.plugin_manager.plugins:
if plugin.name == plugin_name:
@@ -134,5 +134,5 @@
elif self.activePlugin.status == PluginStatus.Disabled:
status_text = unicode(
translate('OpenLP.PluginForm', '%s (Disabled)'))
- self.PluginListWidget.currentItem().setText(
- status_text % self.activePlugin.name)
\ No newline at end of file
+ self.pluginListWidget.currentItem().setText(
+ status_text % self.activePlugin.name)
=== modified file 'openlp/core/ui/screen.py'
--- openlp/core/ui/screen.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/screen.py 2010-07-27 12:35:56 +0000
@@ -99,4 +99,4 @@
user wants to use the correct screen attributes
"""
log.debug(u'reset_current_display')
- self.set_current_display(self.current_display)
\ No newline at end of file
+ self.set_current_display(self.current_display)
=== modified file 'openlp/core/ui/serviceitemeditdialog.py'
--- openlp/core/ui/serviceitemeditdialog.py 2010-07-26 15:19:11 +0000
+++ openlp/core/ui/serviceitemeditdialog.py 2010-07-27 12:35:56 +0000
@@ -28,10 +28,10 @@
from openlp.core.lib import translate
class Ui_ServiceItemEditDialog(object):
- def setupUi(self, ServiceItemEditDialog):
- ServiceItemEditDialog.setObjectName(u'ServiceItemEditDialog')
- ServiceItemEditDialog.resize(386, 272)
- self.layoutWidget = QtGui.QWidget(ServiceItemEditDialog)
+ def setupUi(self, serviceItemEditDialog):
+ serviceItemEditDialog.setObjectName(u'serviceItemEditDialog')
+ serviceItemEditDialog.resize(386, 272)
+ self.layoutWidget = QtGui.QWidget(serviceItemEditDialog)
self.layoutWidget.setGeometry(QtCore.QRect(20, 20, 351, 241))
self.layoutWidget.setObjectName(u'layoutWidget')
self.outerLayout = QtGui.QVBoxLayout(self.layoutWidget)
@@ -47,8 +47,8 @@
self.upButton = QtGui.QPushButton(self.layoutWidget)
self.upButton.setObjectName(u'upButton')
self.buttonLayout.addWidget(self.upButton)
- spacerItem = QtGui.QSpacerItem(20, 40,
- QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+ spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
+ QtGui.QSizePolicy.Expanding)
self.buttonLayout.addItem(spacerItem)
self.deleteButton = QtGui.QPushButton(self.layoutWidget)
self.deleteButton.setObjectName(u'deleteButton')
@@ -59,16 +59,16 @@
self.topLayout.addLayout(self.buttonLayout)
self.outerLayout.addLayout(self.topLayout)
self.buttonBox = QtGui.QDialogButtonBox(self.layoutWidget)
- self.buttonBox.setStandardButtons(
- QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
+ self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
+ QtGui.QDialogButtonBox.Save)
self.buttonBox.setObjectName(u'buttonBox')
self.outerLayout.addWidget(self.buttonBox)
- self.retranslateUi(ServiceItemEditDialog)
- QtCore.QMetaObject.connectSlotsByName(ServiceItemEditDialog)
+ self.retranslateUi(serviceItemEditDialog)
+ QtCore.QMetaObject.connectSlotsByName(serviceItemEditDialog)
- def retranslateUi(self, ServiceItemEditDialog):
- ServiceItemEditDialog.setWindowTitle(
+ def retranslateUi(self, serviceItemEditDialog):
+ serviceItemEditDialog.setWindowTitle(
translate('OpenLP.ServiceItemEditForm', 'Reorder Service Item'))
self.upButton.setText(translate('OpenLP.ServiceItemEditForm', 'Up'))
self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm',
=== modified file 'openlp/core/ui/serviceitemeditform.py'
--- openlp/core/ui/serviceitemeditform.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/serviceitemeditform.py 2010-07-27 12:35:56 +0000
@@ -123,4 +123,4 @@
self.itemList.remove(self.itemList[row])
self.itemList.insert(row + 1, temp)
self.loadData()
- self.listWidget.setCurrentRow(row + 1)
\ No newline at end of file
+ self.listWidget.setCurrentRow(row + 1)
=== modified file 'openlp/core/ui/servicenotedialog.py'
--- openlp/core/ui/servicenotedialog.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/servicenotedialog.py 2010-07-27 12:35:56 +0000
@@ -28,10 +28,10 @@
from openlp.core.lib import translate
class Ui_ServiceNoteEdit(object):
- def setupUi(self, ServiceNoteEdit):
- ServiceNoteEdit.setObjectName(u'ServiceNoteEdit')
- ServiceNoteEdit.resize(400, 243)
- self.widget = QtGui.QWidget(ServiceNoteEdit)
+ def setupUi(self, serviceNoteEdit):
+ serviceNoteEdit.setObjectName(u'serviceNoteEdit')
+ serviceNoteEdit.resize(400, 243)
+ self.widget = QtGui.QWidget(serviceNoteEdit)
self.widget.setGeometry(QtCore.QRect(20, 10, 361, 223))
self.widget.setObjectName(u'widget')
self.verticalLayout = QtGui.QVBoxLayout(self.widget)
@@ -45,9 +45,9 @@
self.buttonBox.setObjectName(u'buttonBox')
self.verticalLayout.addWidget(self.buttonBox)
- self.retranslateUi(ServiceNoteEdit)
- QtCore.QMetaObject.connectSlotsByName(ServiceNoteEdit)
+ self.retranslateUi(serviceNoteEdit)
+ QtCore.QMetaObject.connectSlotsByName(serviceNoteEdit)
- def retranslateUi(self, ServiceNoteEdit):
- ServiceNoteEdit.setWindowTitle(
- translate('OpenLP.ServiceNoteForm', 'Service Item Notes'))
\ No newline at end of file
+ def retranslateUi(self, serviceNoteEdit):
+ serviceNoteEdit.setWindowTitle(
+ translate('OpenLP.ServiceNoteForm', 'Service Item Notes'))
=== modified file 'openlp/core/ui/servicenoteform.py'
--- openlp/core/ui/servicenoteform.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/servicenoteform.py 2010-07-27 12:35:56 +0000
@@ -41,4 +41,4 @@
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
self.accept)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
- self.reject)
\ No newline at end of file
+ self.reject)
=== modified file 'openlp/core/ui/settingsdialog.py'
--- openlp/core/ui/settingsdialog.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/settingsdialog.py 2010-07-27 12:35:56 +0000
@@ -29,19 +29,19 @@
from openlp.core.lib import translate, build_icon
class Ui_SettingsDialog(object):
- def setupUi(self, SettingsDialog):
- SettingsDialog.setObjectName(u'SettingsDialog')
- SettingsDialog.resize(724, 502)
- SettingsDialog.setWindowIcon(
+ def setupUi(self, settingsDialog):
+ settingsDialog.setObjectName(u'settingsDialog')
+ settingsDialog.resize(724, 502)
+ settingsDialog.setWindowIcon(
build_icon(u':/system/system_settings.png'))
- self.settingsLayout = QtGui.QVBoxLayout(SettingsDialog)
+ self.settingsLayout = QtGui.QVBoxLayout(settingsDialog)
self.settingsLayout.setSpacing(8)
self.settingsLayout.setMargin(8)
self.settingsLayout.setObjectName(u'settingsLayout')
- self.settingsTabWidget = QtGui.QTabWidget(SettingsDialog)
+ self.settingsTabWidget = QtGui.QTabWidget(settingsDialog)
self.settingsTabWidget.setObjectName(u'settingsTabWidget')
self.settingsLayout.addWidget(self.settingsTabWidget)
- self.buttonBox = QtGui.QDialogButtonBox(SettingsDialog)
+ self.buttonBox = QtGui.QDialogButtonBox(settingsDialog)
sizePolicy = QtGui.QSizePolicy(
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
sizePolicy.setHorizontalStretch(0)
@@ -55,14 +55,14 @@
QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Ok)
self.buttonBox.setObjectName(u'buttonBox')
self.settingsLayout.addWidget(self.buttonBox)
- self.retranslateUi(SettingsDialog)
+ self.retranslateUi(settingsDialog)
self.settingsTabWidget.setCurrentIndex(0)
QtCore.QObject.connect(self.buttonBox,
- QtCore.SIGNAL(u'accepted()'), SettingsDialog.accept)
+ QtCore.SIGNAL(u'accepted()'), settingsDialog.accept)
QtCore.QObject.connect(self.buttonBox,
- QtCore.SIGNAL(u'rejected()'), SettingsDialog.reject)
- QtCore.QMetaObject.connectSlotsByName(SettingsDialog)
+ QtCore.SIGNAL(u'rejected()'), settingsDialog.reject)
+ QtCore.QMetaObject.connectSlotsByName(settingsDialog)
- def retranslateUi(self, SettingsDialog):
- SettingsDialog.setWindowTitle(translate('OpenLP.SettingsForm',
- 'Configure OpenLP'))
\ No newline at end of file
+ def retranslateUi(self, settingsDialog):
+ settingsDialog.setWindowTitle(translate('OpenLP.SettingsForm',
+ 'Configure OpenLP'))
=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/settingsform.py 2010-07-27 12:35:56 +0000
@@ -94,4 +94,4 @@
Run any post-setup code for the tabs on the form
"""
for tabIndex in range(0, self.settingsTabWidget.count()):
- self.settingsTabWidget.widget(tabIndex).postSetUp()
\ No newline at end of file
+ self.settingsTabWidget.widget(tabIndex).postSetUp()
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/slidecontroller.py 2010-07-27 12:35:56 +0000
@@ -984,4 +984,4 @@
self.mediaObject.stop()
self.video.hide()
self.SlidePreview.clear()
- self.SlidePreview.show()
\ No newline at end of file
+ self.SlidePreview.show()
=== modified file 'openlp/core/ui/splashscreen.py'
--- openlp/core/ui/splashscreen.py 2010-07-25 08:21:02 +0000
+++ openlp/core/ui/splashscreen.py 2010-07-27 12:35:56 +0000
@@ -55,4 +55,4 @@
self.splash_screen.show()
def finish(self, widget):
- self.splash_screen.finish(widget)
\ No newline at end of file
+ self.splash_screen.finish(widget)
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2010-07-25 11:47:53 +0000
+++ openlp/core/ui/thememanager.py 2010-07-27 12:35:56 +0000
@@ -50,70 +50,70 @@
self.parent = parent
self.settingsSection = u'themes'
self.serviceComboBox = self.parent.ServiceManagerContents.ThemeComboBox
- self.Layout = QtGui.QVBoxLayout(self)
- self.Layout.setSpacing(0)
- self.Layout.setMargin(0)
+ self.layout = QtGui.QVBoxLayout(self)
+ self.layout.setSpacing(0)
+ self.layout.setMargin(0)
self.amendThemeForm = AmendThemeForm(self)
- self.Toolbar = OpenLPToolbar(self)
- self.Toolbar.addToolbarButton(
+ self.toolbar = OpenLPToolbar(self)
+ self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'New Theme'),
u':/themes/theme_new.png',
translate('OpenLP.ThemeManager', 'Create a new theme.'),
self.onAddTheme)
- self.Toolbar.addToolbarButton(
+ self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'Edit Theme'),
u':/themes/theme_edit.png',
translate('OpenLP.ThemeManager', 'Edit a theme.'),
self.onEditTheme)
- self.Toolbar.addToolbarButton(
+ self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'Delete Theme'),
u':/general/general_delete.png',
translate('OpenLP.ThemeManager', 'Delete a theme.'),
self.onDeleteTheme)
- self.Toolbar.addSeparator()
- self.Toolbar.addToolbarButton(
+ self.toolbar.addSeparator()
+ self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'Import Theme'),
u':/general/general_import.png',
translate('OpenLP.ThemeManager', 'Import a theme.'),
self.onImportTheme)
- self.Toolbar.addToolbarButton(
+ self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'Export Theme'),
u':/general/general_export.png',
translate('OpenLP.ThemeManager', 'Export a theme.'),
self.onExportTheme)
- self.ThemeWidget = QtGui.QWidgetAction(self.Toolbar)
- self.Layout.addWidget(self.Toolbar)
- self.ThemeListWidget = QtGui.QListWidget(self)
- self.ThemeListWidget.setAlternatingRowColors(True)
- self.ThemeListWidget.setIconSize(QtCore.QSize(88, 50))
- self.Layout.addWidget(self.ThemeListWidget)
- self.ThemeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
- self.ThemeListWidget.addAction(
- context_menu_action(self.ThemeListWidget,
+ self.themeWidget = QtGui.QWidgetAction(self.toolbar)
+ self.layout.addWidget(self.toolbar)
+ self.themeListWidget = QtGui.QListWidget(self)
+ self.themeListWidget.setAlternatingRowColors(True)
+ self.themeListWidget.setIconSize(QtCore.QSize(88, 50))
+ self.layout.addWidget(self.themeListWidget)
+ self.themeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
+ self.themeListWidget.addAction(
+ context_menu_action(self.themeListWidget,
u':/themes/theme_edit.png',
translate('OpenLP.ThemeManager', '&Edit Theme'),
self.onEditTheme))
- self.ThemeListWidget.addAction(
- context_menu_separator(self.ThemeListWidget))
- self.ThemeListWidget.addAction(
- context_menu_action(self.ThemeListWidget,
+ self.themeListWidget.addAction(
+ context_menu_separator(self.themeListWidget))
+ self.themeListWidget.addAction(
+ context_menu_action(self.themeListWidget,
u':/general/general_delete.png',
translate('OpenLP.ThemeManager', '&Delete Theme'),
self.onDeleteTheme))
- self.ThemeListWidget.addAction(
- context_menu_action(self.ThemeListWidget,
+ self.themeListWidget.addAction(
+ context_menu_action(self.themeListWidget,
u':/general/general_export.png',
translate('OpenLP.ThemeManager', 'Set As &Global Default'),
self.changeGlobalFromScreen))
- self.ThemeListWidget.addAction(
- context_menu_action(self.ThemeListWidget,
+ self.themeListWidget.addAction(
+ context_menu_action(self.themeListWidget,
u':/general/general_export.png',
translate('OpenLP.ThemeManager', 'E&xport Theme'),
self.onExportTheme))
- self.ThemeListWidget.addAction(
- context_menu_separator(self.ThemeListWidget))
+ self.themeListWidget.addAction(
+ context_menu_separator(self.themeListWidget))
#Signals
- QtCore.QObject.connect(self.ThemeListWidget,
+ QtCore.QObject.connect(self.themeListWidget,
QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
self.changeGlobalFromScreen)
QtCore.QObject.connect(Receiver.get_receiver(),
@@ -138,18 +138,18 @@
tab
"""
log.debug(u'changeGlobalFromTab %s', themeName)
- for count in range (0, self.ThemeListWidget.count()):
+ for count in range (0, self.themeListWidget.count()):
#reset the old name
- item = self.ThemeListWidget.item(count)
+ item = self.themeListWidget.item(count)
oldName = item.text()
newName = unicode(item.data(QtCore.Qt.UserRole).toString())
if oldName != newName:
- self.ThemeListWidget.item(count).setText(newName)
+ self.themeListWidget.item(count).setText(newName)
#Set the new name
if themeName == newName:
name = unicode(translate('OpenLP.ThemeManager',
'%s (default)')) % newName
- self.ThemeListWidget.item(count).setText(name)
+ self.themeListWidget.item(count).setText(name)
def changeGlobalFromScreen(self, index = -1):
"""
@@ -157,21 +157,21 @@
Theme Manager list
"""
log.debug(u'changeGlobalFromScreen %s', index)
- selected_row = self.ThemeListWidget.currentRow()
- for count in range (0, self.ThemeListWidget.count()):
- item = self.ThemeListWidget.item(count)
+ selected_row = self.themeListWidget.currentRow()
+ for count in range (0, self.themeListWidget.count()):
+ item = self.themeListWidget.item(count)
oldName = item.text()
#reset the old name
if oldName != unicode(item.data(QtCore.Qt.UserRole).toString()):
- self.ThemeListWidget.item(count).setText(
+ self.themeListWidget.item(count).setText(
unicode(item.data(QtCore.Qt.UserRole).toString()))
#Set the new name
if count == selected_row:
self.global_theme = unicode(
- self.ThemeListWidget.item(count).text())
+ self.themeListWidget.item(count).text())
name = unicode(translate('OpenLP.ThemeManager',
'%s (default)')) % self.global_theme
- self.ThemeListWidget.item(count).setText(name)
+ self.themeListWidget.item(count).setText(name)
QtCore.QSettings().setValue(
self.settingsSection + u'/global theme',
QtCore.QVariant(self.global_theme))
@@ -194,10 +194,10 @@
Loads the settings for the theme that is to be edited and launches the
theme editing form so the user can make their changes.
"""
- if check_item_selected(self.ThemeListWidget,
+ if check_item_selected(self.themeListWidget,
translate('OpenLP.ThemeManager',
'You must select a theme to edit.')):
- item = self.ThemeListWidget.currentItem()
+ item = self.themeListWidget.currentItem()
themeName = unicode(item.text())
if themeName != unicode(item.data(QtCore.Qt.UserRole).toString()):
self.editingDefault = True
@@ -217,10 +217,10 @@
self.global_theme = unicode(QtCore.QSettings().value(
self.settingsSection + u'/global theme',
QtCore.QVariant(u'')).toString())
- if check_item_selected(self.ThemeListWidget,
+ if check_item_selected(self.themeListWidget,
translate('OpenLP.ThemeManager',
'You must select a theme to delete.')):
- item = self.ThemeListWidget.currentItem()
+ item = self.themeListWidget.currentItem()
theme = unicode(item.text())
# confirm deletion
answer = QtGui.QMessageBox.question(self,
@@ -252,8 +252,8 @@
unicode(translate('OpenLP.ThemeManager',
'Theme %s is use by the service manager.')) % theme)
return
- row = self.ThemeListWidget.row(item)
- self.ThemeListWidget.takeItem(row)
+ row = self.themeListWidget.row(item)
+ self.themeListWidget.takeItem(row)
self.deleteTheme(theme)
def deleteTheme(self, theme):
@@ -281,7 +281,7 @@
"""
Save the theme in a zip file
"""
- item = self.ThemeListWidget.currentItem()
+ item = self.themeListWidget.currentItem()
if item is None:
QtGui.QMessageBox.critical(self,
translate('OpenLP.ThemeManager', 'Error'),
@@ -346,7 +346,7 @@
"""
log.debug(u'Load themes from dir')
self.themelist = []
- self.ThemeListWidget.clear()
+ self.themeListWidget.clear()
#root, dirs, files = os.walk(self.path)
dirList = os.listdir(self.path)
for name in dirList:
@@ -371,7 +371,7 @@
item_name.setIcon(icon)
item_name.setData(QtCore.Qt.UserRole,
QtCore.QVariant(textName))
- self.ThemeListWidget.addItem(item_name)
+ self.themeListWidget.addItem(item_name)
self.themelist.append(textName)
self.pushThemes()
@@ -622,15 +622,15 @@
self.serviceComboBox.setCurrentIndex(newThemeIndex)
if self.editingDefault:
if self.saveThemeName != name:
- newThemeItem = self.ThemeListWidget.findItems(name,
+ newThemeItem = self.themeListWidget.findItems(name,
QtCore.Qt.MatchExactly)[0]
- newThemeIndex = self.ThemeListWidget.indexFromItem(
+ newThemeIndex = self.themeListWidget.indexFromItem(
newThemeItem).row()
self.global_theme = unicode(
- self.ThemeListWidget.item(newThemeIndex).text())
+ self.themeListWidget.item(newThemeIndex).text())
newName = unicode(translate('OpenLP.ThemeManager',
'%s (default)')) % self.global_theme
- self.ThemeListWidget.item(newThemeIndex).setText(newName)
+ self.themeListWidget.item(newThemeIndex).setText(newName)
QtCore.QSettings().setValue(
self.settingsSection + u'/global theme',
QtCore.QVariant(self.global_theme))
=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py 2010-07-24 22:10:47 +0000
+++ openlp/core/ui/themestab.py 2010-07-27 12:35:56 +0000
@@ -207,4 +207,4 @@
if not preview.isNull():
preview = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio,
QtCore.Qt.SmoothTransformation)
- self.DefaultListView.setPixmap(preview)
\ No newline at end of file
+ self.DefaultListView.setPixmap(preview)
=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/core/utils/__init__.py 2010-07-27 12:35:56 +0000
@@ -213,4 +213,4 @@
from languagemanager import LanguageManager
__all__ = [u'AppLocation', u'check_latest_version', u'add_actions',
- u'get_filesystem_encoding', u'LanguageManager']
\ No newline at end of file
+ u'get_filesystem_encoding', u'LanguageManager']
=== modified file 'openlp/plugins/__init__.py'
--- openlp/plugins/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/__init__.py 2010-07-27 12:35:56 +0000
@@ -25,4 +25,4 @@
###############################################################################
"""
The :mod:`plugins` module provides all the project produced plugins
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/alerts/__init__.py'
--- openlp/plugins/alerts/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/alerts/__init__.py 2010-07-27 12:35:56 +0000
@@ -26,4 +26,4 @@
"""
The :mod:`alerts` module provides the Alerts plugin for producing impromptu
on-screen announcements during a service.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/alerts/alertsplugin.py 2010-07-27 12:35:56 +0000
@@ -103,4 +103,4 @@
about_text = translate('AlertsPlugin', '<strong>Alerts Plugin</strong>'
'<br />The alert plugin controls the displaying of nursery alerts '
'on the display screen')
- return about_text
\ No newline at end of file
+ return about_text
=== modified file 'openlp/plugins/alerts/forms/__init__.py'
--- openlp/plugins/alerts/forms/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/alerts/forms/__init__.py 2010-07-27 12:35:56 +0000
@@ -24,4 +24,4 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-from alertform import AlertForm
\ No newline at end of file
+from alertform import AlertForm
=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
--- openlp/plugins/alerts/forms/alertdialog.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/alerts/forms/alertdialog.py 2010-07-27 12:35:56 +0000
@@ -140,4 +140,4 @@
self.DisplayCloseButton.setText(
translate('AlertsPlugin.AlertForm', 'Display && Cl&ose'))
self.CloseButton.setText(
- translate('AlertsPlugin.AlertForm', '&Close'))
\ No newline at end of file
+ translate('AlertsPlugin.AlertForm', '&Close'))
=== modified file 'openlp/plugins/alerts/forms/alertform.py'
--- openlp/plugins/alerts/forms/alertform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/alerts/forms/alertform.py 2010-07-27 12:35:56 +0000
@@ -155,4 +155,4 @@
text = text.replace(u'<>', unicode(self.ParameterEdit.text()))
self.parent.alertsmanager.displayAlert(text)
return True
- return False
\ No newline at end of file
+ return False
=== modified file 'openlp/plugins/alerts/lib/__init__.py'
--- openlp/plugins/alerts/lib/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/alerts/lib/__init__.py 2010-07-27 12:35:56 +0000
@@ -25,4 +25,4 @@
###############################################################################
from alertsmanager import AlertsManager
-from alertstab import AlertsTab
\ No newline at end of file
+from alertstab import AlertsTab
=== modified file 'openlp/plugins/alerts/lib/alertsmanager.py'
--- openlp/plugins/alerts/lib/alertsmanager.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/alerts/lib/alertsmanager.py 2010-07-27 12:35:56 +0000
@@ -117,4 +117,4 @@
alertTab.location)
self.killTimer(self.timer_id)
self.timer_id = 0
- self.generateAlert()
\ No newline at end of file
+ self.generateAlert()
=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
--- openlp/plugins/alerts/lib/alertstab.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/alerts/lib/alertstab.py 2010-07-27 12:35:56 +0000
@@ -295,4 +295,4 @@
font.setPointSize(self.font_size)
self.FontPreview.setFont(font)
self.FontPreview.setStyleSheet(u'background-color: %s; color: %s' %
- (self.bg_color, self.font_color))
\ No newline at end of file
+ (self.bg_color, self.font_color))
=== modified file 'openlp/plugins/alerts/lib/db.py'
--- openlp/plugins/alerts/lib/db.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/alerts/lib/db.py 2010-07-27 12:35:56 +0000
@@ -55,4 +55,4 @@
mapper(AlertItem, alerts_table)
metadata.create_all(checkfirst=True)
- return session
\ No newline at end of file
+ return session
=== modified file 'openlp/plugins/bibles/__init__.py'
--- openlp/plugins/bibles/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/bibles/__init__.py 2010-07-27 12:35:56 +0000
@@ -26,4 +26,4 @@
"""
The :mod:`bibles' module provides the Bible plugin to enable OpenLP to display
scripture.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/bibles/bibleplugin.py 2010-07-27 12:35:56 +0000
@@ -117,4 +117,4 @@
``newTheme``
The new name the plugin should now use.
"""
- self.settings_tab.bible_theme = newTheme
\ No newline at end of file
+ self.settings_tab.bible_theme = newTheme
=== modified file 'openlp/plugins/bibles/forms/__init__.py'
--- openlp/plugins/bibles/forms/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/bibles/forms/__init__.py 2010-07-27 12:35:56 +0000
@@ -26,4 +26,4 @@
from importwizardform import ImportWizardForm
-__all__ = ['ImportWizardForm']
\ No newline at end of file
+__all__ = ['ImportWizardForm']
=== modified file 'openlp/plugins/bibles/forms/bibleimportwizard.py'
--- openlp/plugins/bibles/forms/bibleimportwizard.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/bibles/forms/bibleimportwizard.py 2010-07-27 12:35:56 +0000
@@ -381,4 +381,4 @@
'Please wait while your Bible is imported.'))
self.ImportProgressLabel.setText(
translate('BiblesPlugin.ImportWizardForm', 'Ready.'))
- self.ImportProgressBar.setFormat(u'%p%')
\ No newline at end of file
+ self.ImportProgressBar.setFormat(u'%p%')
=== modified file 'openlp/plugins/bibles/forms/importwizardform.py'
--- openlp/plugins/bibles/forms/importwizardform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/bibles/forms/importwizardform.py 2010-07-27 12:35:56 +0000
@@ -457,4 +457,4 @@
self.ImportProgressBar.setValue(self.ImportProgressBar.maximum())
self.finishButton.setVisible(True)
self.cancelButton.setVisible(False)
- Receiver.send_message(u'openlp_process_events')
\ No newline at end of file
+ Receiver.send_message(u'openlp_process_events')
=== modified file 'openlp/plugins/bibles/lib/__init__.py'
--- openlp/plugins/bibles/lib/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/bibles/lib/__init__.py 2010-07-27 12:35:56 +0000
@@ -27,4 +27,4 @@
from common import BibleCommon
from manager import BibleManager
from biblestab import BiblesTab
-from mediaitem import BibleMediaItem
\ No newline at end of file
+from mediaitem import BibleMediaItem
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/bibles/lib/biblestab.py 2010-07-27 12:35:56 +0000
@@ -247,4 +247,4 @@
# Not Found
id = 0
self.bible_theme = u''
- self.BibleThemeComboBox.setCurrentIndex(id)
\ No newline at end of file
+ self.BibleThemeComboBox.setCurrentIndex(id)
=== modified file 'openlp/plugins/bibles/lib/csvbible.py'
--- openlp/plugins/bibles/lib/csvbible.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/bibles/lib/csvbible.py 2010-07-27 12:35:56 +0000
@@ -113,4 +113,4 @@
self.wizard.incrementProgressBar(u'Import canceled!')
return False
else:
- return success
\ No newline at end of file
+ return success
=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py 2010-07-25 11:47:53 +0000
+++ openlp/plugins/bibles/lib/db.py 2010-07-27 12:35:56 +0000
@@ -431,4 +431,4 @@
log.debug(books)
log.debug(u'...............................Verses ')
verses = self.session.query(Verse).all()
- log.debug(verses)
\ No newline at end of file
+ log.debug(verses)
=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py 2010-07-25 11:47:53 +0000
+++ openlp/plugins/bibles/lib/manager.py 2010-07-27 12:35:56 +0000
@@ -266,4 +266,4 @@
bible = unicode(bible)
if bible == name:
return True
- return False
\ No newline at end of file
+ return False
=== modified file 'openlp/plugins/bibles/lib/opensong.py'
--- openlp/plugins/bibles/lib/opensong.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/bibles/lib/opensong.py 2010-07-27 12:35:56 +0000
@@ -102,4 +102,4 @@
self.wizard.incrementProgressBar(u'Import canceled!')
return False
else:
- return success
\ No newline at end of file
+ return success
=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/bibles/lib/osis.py 2010-07-27 12:35:56 +0000
@@ -184,4 +184,4 @@
self.wizard.incrementProgressBar(u'Import canceled!')
return False
else:
- return success
\ No newline at end of file
+ return success
=== modified file 'openlp/plugins/custom/__init__.py'
--- openlp/plugins/custom/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/custom/__init__.py 2010-07-27 12:35:56 +0000
@@ -27,4 +27,4 @@
The :mod:`custom` module provides the Custom plugin which allows custom,
themed, text based items to be displayed without having to misuse another item
type.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/custom/customplugin.py 2010-07-27 12:35:56 +0000
@@ -96,4 +96,4 @@
CustomSlide.theme_name == oldTheme)
for custom in customsUsingTheme:
custom.theme_name = newTheme
- self.custommanager.save_object(custom)
\ No newline at end of file
+ self.custommanager.save_object(custom)
=== modified file 'openlp/plugins/custom/forms/__init__.py'
--- openlp/plugins/custom/forms/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/custom/forms/__init__.py 2010-07-27 12:35:56 +0000
@@ -24,4 +24,4 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-from editcustomform import EditCustomForm
\ No newline at end of file
+from editcustomform import EditCustomForm
=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py 2010-07-27 12:35:56 +0000
@@ -28,7 +28,7 @@
from openlp.core.lib import build_icon, translate
-class Ui_customEditDialog(object):
+class Ui_CustomEditDialog(object):
def setupUi(self, customEditDialog):
customEditDialog.setObjectName(u'customEditDialog')
customEditDialog.resize(590, 541)
@@ -38,94 +38,94 @@
self.gridLayout.setObjectName(u'gridLayout')
self.horizontalLayout = QtGui.QHBoxLayout()
self.horizontalLayout.setObjectName(u'horizontalLayout')
- self.TitleLabel = QtGui.QLabel(customEditDialog)
- self.TitleLabel.setObjectName(u'TitleLabel')
- self.horizontalLayout.addWidget(self.TitleLabel)
- self.TitleEdit = QtGui.QLineEdit(customEditDialog)
- self.TitleLabel.setBuddy(self.TitleEdit)
- self.TitleEdit.setObjectName(u'TitleEdit')
- self.horizontalLayout.addWidget(self.TitleEdit)
+ self.titleLabel = QtGui.QLabel(customEditDialog)
+ self.titleLabel.setObjectName(u'titleLabel')
+ self.horizontalLayout.addWidget(self.titleLabel)
+ self.titleEdit = QtGui.QLineEdit(customEditDialog)
+ self.titleLabel.setBuddy(self.titleEdit)
+ self.titleEdit.setObjectName(u'titleEdit')
+ self.horizontalLayout.addWidget(self.titleEdit)
self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1)
- self.horizontalLayout_4 = QtGui.QHBoxLayout()
- self.horizontalLayout_4.setObjectName(u'horizontalLayout_4')
- self.VerseListView = QtGui.QListWidget(customEditDialog)
- self.VerseListView.setAlternatingRowColors(True)
- self.VerseListView.setObjectName(u'VerseListView')
- self.horizontalLayout_4.addWidget(self.VerseListView)
+ self.horizontalLayout4 = QtGui.QHBoxLayout()
+ self.horizontalLayout4.setObjectName(u'horizontalLayout4')
+ self.verseListView = QtGui.QListWidget(customEditDialog)
+ self.verseListView.setAlternatingRowColors(True)
+ self.verseListView.setObjectName(u'verseListView')
+ self.horizontalLayout4.addWidget(self.verseListView)
self.verticalLayout = QtGui.QVBoxLayout()
self.verticalLayout.setObjectName(u'verticalLayout')
- self.UpButton = QtGui.QPushButton(customEditDialog)
- self.UpButton.setIcon(build_icon(u':/services/service_up.png'))
- self.UpButton.setObjectName(u'UpButton')
- self.verticalLayout.addWidget(self.UpButton)
+ self.upButton = QtGui.QPushButton(customEditDialog)
+ self.upButton.setIcon(build_icon(u':/services/service_up.png'))
+ self.upButton.setObjectName(u'upButton')
+ self.verticalLayout.addWidget(self.upButton)
spacerItem = QtGui.QSpacerItem(20, 128, QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Expanding)
self.verticalLayout.addItem(spacerItem)
- self.DownButton = QtGui.QPushButton(customEditDialog)
- self.DownButton.setIcon(build_icon(u':/services/service_down.png'))
- self.DownButton.setObjectName(u'DownButton')
- self.verticalLayout.addWidget(self.DownButton)
- self.horizontalLayout_4.addLayout(self.verticalLayout)
- self.gridLayout.addLayout(self.horizontalLayout_4, 1, 0, 1, 1)
- self.EditWidget = QtGui.QWidget(customEditDialog)
- self.EditWidget.setObjectName(u'EditWidget')
- self.EditLayout_3 = QtGui.QHBoxLayout(self.EditWidget)
- self.EditLayout_3.setSpacing(8)
- self.EditLayout_3.setMargin(0)
- self.EditLayout_3.setObjectName(u'EditLayout_3')
- self.VerseTextEdit = QtGui.QTextEdit(self.EditWidget)
- self.VerseTextEdit.setObjectName(u'VerseTextEdit')
- self.EditLayout_3.addWidget(self.VerseTextEdit)
- self.ButtonWidge = QtGui.QWidget(self.EditWidget)
- self.ButtonWidge.setObjectName(u'ButtonWidge')
- self.verticalLayout_2 = QtGui.QVBoxLayout(self.ButtonWidge)
- self.verticalLayout_2.setObjectName(u'verticalLayout_2')
- self.AddButton = QtGui.QPushButton(self.ButtonWidge)
- self.AddButton.setObjectName(u'AddButton')
- self.verticalLayout_2.addWidget(self.AddButton)
- self.EditButton = QtGui.QPushButton(self.ButtonWidge)
- self.EditButton.setObjectName(u'EditButton')
- self.verticalLayout_2.addWidget(self.EditButton)
- self.EditAllButton = QtGui.QPushButton(self.ButtonWidge)
- self.EditAllButton.setObjectName(u'EditAllButton')
- self.verticalLayout_2.addWidget(self.EditAllButton)
- self.SaveButton = QtGui.QPushButton(self.ButtonWidge)
- self.SaveButton.setObjectName(u'SaveButton')
- self.verticalLayout_2.addWidget(self.SaveButton)
- self.DeleteButton = QtGui.QPushButton(self.ButtonWidge)
- self.DeleteButton.setObjectName(u'DeleteButton')
- self.verticalLayout_2.addWidget(self.DeleteButton)
- self.ClearButton = QtGui.QPushButton(self.ButtonWidge)
- self.ClearButton.setObjectName(u'ClearButton')
- self.verticalLayout_2.addWidget(self.ClearButton)
- self.SplitButton = QtGui.QPushButton(self.ButtonWidge)
- self.SplitButton.setObjectName(u'SplitButton')
- self.verticalLayout_2.addWidget(self.SplitButton)
+ self.downButton = QtGui.QPushButton(customEditDialog)
+ self.downButton.setIcon(build_icon(u':/services/service_down.png'))
+ self.downButton.setObjectName(u'downButton')
+ self.verticalLayout.addWidget(self.downButton)
+ self.horizontalLayout4.addLayout(self.verticalLayout)
+ self.gridLayout.addLayout(self.horizontalLayout4, 1, 0, 1, 1)
+ self.editWidget = QtGui.QWidget(customEditDialog)
+ self.editWidget.setObjectName(u'editWidget')
+ self.editLayout3 = QtGui.QHBoxLayout(self.editWidget)
+ self.editLayout3.setSpacing(8)
+ self.editLayout3.setMargin(0)
+ self.editLayout3.setObjectName(u'editLayout3')
+ self.verseTextEdit = QtGui.QTextEdit(self.editWidget)
+ self.verseTextEdit.setObjectName(u'verseTextEdit')
+ self.editLayout3.addWidget(self.verseTextEdit)
+ self.buttonWidget = QtGui.QWidget(self.editWidget)
+ self.buttonWidget.setObjectName(u'buttonWidget')
+ self.verticalLayout2 = QtGui.QVBoxLayout(self.buttonWidget)
+ self.verticalLayout2.setObjectName(u'verticalLayout2')
+ self.addButton = QtGui.QPushButton(self.buttonWidget)
+ self.addButton.setObjectName(u'addButton')
+ self.verticalLayout2.addWidget(self.addButton)
+ self.editButton = QtGui.QPushButton(self.buttonWidget)
+ self.editButton.setObjectName(u'editButton')
+ self.verticalLayout2.addWidget(self.editButton)
+ self.editAllButton = QtGui.QPushButton(self.buttonWidget)
+ self.editAllButton.setObjectName(u'editAllButton')
+ self.verticalLayout2.addWidget(self.editAllButton)
+ self.saveButton = QtGui.QPushButton(self.buttonWidget)
+ self.saveButton.setObjectName(u'saveButton')
+ self.verticalLayout2.addWidget(self.saveButton)
+ self.deleteButton = QtGui.QPushButton(self.buttonWidget)
+ self.deleteButton.setObjectName(u'deleteButton')
+ self.verticalLayout2.addWidget(self.deleteButton)
+ self.clearButton = QtGui.QPushButton(self.buttonWidget)
+ self.clearButton.setObjectName(u'clearButton')
+ self.verticalLayout2.addWidget(self.clearButton)
+ self.splitButton = QtGui.QPushButton(self.buttonWidget)
+ self.splitButton.setObjectName(u'splitButton')
+ self.verticalLayout2.addWidget(self.splitButton)
spacerItem1 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Expanding)
- self.verticalLayout_2.addItem(spacerItem1)
- self.EditLayout_3.addWidget(self.ButtonWidge)
- self.gridLayout.addWidget(self.EditWidget, 2, 0, 1, 1)
- self.horizontalLayout_3 = QtGui.QHBoxLayout()
- self.horizontalLayout_3.setObjectName(u'horizontalLayout_3')
- self.ThemeLabel = QtGui.QLabel(customEditDialog)
- self.ThemeLabel.setObjectName(u'ThemeLabel')
- self.horizontalLayout_3.addWidget(self.ThemeLabel)
- self.ThemeComboBox = QtGui.QComboBox(customEditDialog)
- self.ThemeLabel.setBuddy(self.ThemeComboBox)
- self.ThemeComboBox.setObjectName(u'ThemeComboBox')
- self.horizontalLayout_3.addWidget(self.ThemeComboBox)
- self.gridLayout.addLayout(self.horizontalLayout_3, 3, 0, 1, 1)
- self.horizontalLayout_2 = QtGui.QHBoxLayout()
- self.horizontalLayout_2.setObjectName(u'horizontalLayout_2')
- self.CreditLabel = QtGui.QLabel(customEditDialog)
- self.CreditLabel.setObjectName(u'CreditLabel')
- self.horizontalLayout_2.addWidget(self.CreditLabel)
- self.CreditEdit = QtGui.QLineEdit(customEditDialog)
- self.CreditLabel.setBuddy(self.CreditEdit)
- self.CreditEdit.setObjectName(u'CreditEdit')
- self.horizontalLayout_2.addWidget(self.CreditEdit)
- self.gridLayout.addLayout(self.horizontalLayout_2, 4, 0, 1, 1)
+ self.verticalLayout2.addItem(spacerItem1)
+ self.editLayout3.addWidget(self.buttonWidget)
+ self.gridLayout.addWidget(self.editWidget, 2, 0, 1, 1)
+ self.horizontalLayout3 = QtGui.QHBoxLayout()
+ self.horizontalLayout3.setObjectName(u'horizontalLayout3')
+ self.themeLabel = QtGui.QLabel(customEditDialog)
+ self.themeLabel.setObjectName(u'themeLabel')
+ self.horizontalLayout3.addWidget(self.themeLabel)
+ self.themeComboBox = QtGui.QComboBox(customEditDialog)
+ self.themeLabel.setBuddy(self.themeComboBox)
+ self.themeComboBox.setObjectName(u'themeComboBox')
+ self.horizontalLayout3.addWidget(self.themeComboBox)
+ self.gridLayout.addLayout(self.horizontalLayout3, 3, 0, 1, 1)
+ self.horizontalLayout2 = QtGui.QHBoxLayout()
+ self.horizontalLayout2.setObjectName(u'horizontalLayout2')
+ self.creditLabel = QtGui.QLabel(customEditDialog)
+ self.creditLabel.setObjectName(u'creditLabel')
+ self.horizontalLayout2.addWidget(self.creditLabel)
+ self.creditEdit = QtGui.QLineEdit(customEditDialog)
+ self.creditLabel.setBuddy(self.creditEdit)
+ self.creditEdit.setObjectName(u'creditEdit')
+ self.horizontalLayout2.addWidget(self.creditEdit)
+ self.gridLayout.addLayout(self.horizontalLayout2, 4, 0, 1, 1)
self.buttonBox = QtGui.QDialogButtonBox(customEditDialog)
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
QtGui.QDialogButtonBox.Save)
@@ -141,49 +141,49 @@
def retranslateUi(self, customEditDialog):
customEditDialog.setWindowTitle(
translate('CustomPlugin.EditCustomForm', 'Edit Custom Slides'))
- self.UpButton.setToolTip(
+ self.upButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Move slide up once '
'position.'))
- self.DownButton.setToolTip(
+ self.downButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Move slide down one '
'position.'))
- self.TitleLabel.setText(
+ self.titleLabel.setText(
translate('CustomPlugin.EditCustomForm', '&Title:'))
- self.AddButton.setText(
+ self.addButton.setText(
translate('CustomPlugin.EditCustomForm', 'Add New'))
- self.AddButton.setToolTip(
+ self.addButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Add a new slide at '
'bottom.'))
- self.EditButton.setText(
+ self.editButton.setText(
translate('CustomPlugin.EditCustomForm', 'Edit'))
- self.EditButton.setToolTip(
+ self.editButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Edit the selected '
'slide.'))
- self.EditAllButton.setText(
+ self.editAllButton.setText(
translate('CustomPlugin.EditCustomForm', 'Edit All'))
- self.EditAllButton.setToolTip(
+ self.editAllButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Edit all the slides at '
'once.'))
- self.SaveButton.setText(
+ self.saveButton.setText(
translate('CustomPlugin.EditCustomForm', 'Save'))
- self.SaveButton.setToolTip(
+ self.saveButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Save the slide currently '
'being edited.'))
- self.DeleteButton.setText(
+ self.deleteButton.setText(
translate('CustomPlugin.EditCustomForm', 'Delete'))
- self.DeleteButton.setToolTip(
+ self.deleteButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Delete the selected '
'slide.'))
- self.ClearButton.setText(
+ self.clearButton.setText(
translate('CustomPlugin.EditCustomForm', 'Clear'))
- self.ClearButton.setToolTip(
+ self.clearButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Clear edit area'))
- self.SplitButton.setText(
+ self.splitButton.setText(
translate('CustomPlugin.EditCustomForm', 'Split Slide'))
- self.SplitButton.setToolTip(
+ self.splitButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Split a slide into two '
'by inserting a slide splitter.'))
- self.ThemeLabel.setText(
+ self.themeLabel.setText(
translate('CustomPlugin.EditCustomForm', 'The&me:'))
- self.CreditLabel.setText(
- translate('CustomPlugin.EditCustomForm', '&Credits:'))
\ No newline at end of file
+ self.creditLabel.setText(
+ translate('CustomPlugin.EditCustomForm', '&Credits:'))
=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/custom/forms/editcustomform.py 2010-07-27 12:35:56 +0000
@@ -28,14 +28,14 @@
from PyQt4 import QtCore, QtGui
-from editcustomdialog import Ui_customEditDialog
from openlp.core.lib import Receiver, translate
from openlp.plugins.custom.lib import CustomXMLBuilder, CustomXMLParser
from openlp.plugins.custom.lib.db import CustomSlide
+from editcustomdialog import Ui_CustomEditDialog
log = logging.getLogger(__name__)
-class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
+class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
"""
Class documentation goes here.
"""
@@ -55,28 +55,28 @@
self.previewButton, QtGui.QDialogButtonBox.ActionRole)
QtCore.QObject.connect(self.buttonBox,
QtCore.SIGNAL(u'clicked(QAbstractButton*)'), self.onPreview)
- QtCore.QObject.connect(self.AddButton,
+ QtCore.QObject.connect(self.addButton,
QtCore.SIGNAL(u'pressed()'), self.onAddButtonPressed)
- QtCore.QObject.connect(self.EditButton,
+ QtCore.QObject.connect(self.editButton,
QtCore.SIGNAL(u'pressed()'), self.onEditButtonPressed)
- QtCore.QObject.connect(self.EditAllButton,
+ QtCore.QObject.connect(self.editAllButton,
QtCore.SIGNAL(u'pressed()'), self.onEditAllButtonPressed)
- QtCore.QObject.connect(self.SaveButton,
+ QtCore.QObject.connect(self.saveButton,
QtCore.SIGNAL(u'pressed()'), self.onSaveButtonPressed)
- QtCore.QObject.connect(self.DeleteButton,
+ QtCore.QObject.connect(self.deleteButton,
QtCore.SIGNAL(u'pressed()'), self.onDeleteButtonPressed)
- QtCore.QObject.connect(self.ClearButton,
+ QtCore.QObject.connect(self.clearButton,
QtCore.SIGNAL(u'pressed()'), self.onClearButtonPressed)
- QtCore.QObject.connect(self.UpButton,
+ QtCore.QObject.connect(self.upButton,
QtCore.SIGNAL(u'pressed()'), self.onUpButtonPressed)
- QtCore.QObject.connect(self.DownButton,
+ QtCore.QObject.connect(self.downButton,
QtCore.SIGNAL(u'pressed()'), self.onDownButtonPressed)
- QtCore.QObject.connect(self.SplitButton,
+ QtCore.QObject.connect(self.splitButton,
QtCore.SIGNAL(u'pressed()'), self.onSplitButtonPressed)
- QtCore.QObject.connect(self.VerseListView,
+ QtCore.QObject.connect(self.verseListView,
QtCore.SIGNAL(u'itemDoubleClicked(QListWidgetItem*)'),
self.onVerseListViewSelected)
- QtCore.QObject.connect(self.VerseListView,
+ QtCore.QObject.connect(self.verseListView,
QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'),
self.onVerseListViewPressed)
QtCore.QObject.connect(Receiver.get_receiver(),
@@ -93,45 +93,45 @@
def initialise(self):
self.editAll = False
- self.AddButton.setEnabled(True)
- self.DeleteButton.setEnabled(False)
- self.EditButton.setEnabled(False)
- self.EditAllButton.setEnabled(True)
- self.SaveButton.setEnabled(False)
- self.ClearButton.setEnabled(False)
- self.SplitButton.setEnabled(False)
- self.TitleEdit.setText(u'')
- self.CreditEdit.setText(u'')
- self.VerseTextEdit.clear()
- self.VerseListView.clear()
+ self.addButton.setEnabled(True)
+ self.deleteButton.setEnabled(False)
+ self.editButton.setEnabled(False)
+ self.editAllButton.setEnabled(True)
+ self.saveButton.setEnabled(False)
+ self.clearButton.setEnabled(False)
+ self.splitButton.setEnabled(False)
+ self.titleEdit.setText(u'')
+ self.creditEdit.setText(u'')
+ self.verseTextEdit.clear()
+ self.verseListView.clear()
#make sure we have a new item
self.customSlide = CustomSlide()
- self.ThemeComboBox.addItem(u'')
+ self.themeComboBox.addItem(u'')
def loadThemes(self, themelist):
- self.ThemeComboBox.clear()
- self.ThemeComboBox.addItem(u'')
+ self.themeComboBox.clear()
+ self.themeComboBox.addItem(u'')
for themename in themelist:
- self.ThemeComboBox.addItem(themename)
+ self.themeComboBox.addItem(themename)
def loadCustom(self, id, preview=False):
self.customSlide = CustomSlide()
self.initialise()
if id != 0:
self.customSlide = self.custommanager.get_object(CustomSlide, id)
- self.TitleEdit.setText(self.customSlide.title)
- self.CreditEdit.setText(self.customSlide.credits)
+ self.titleEdit.setText(self.customSlide.title)
+ self.creditEdit.setText(self.customSlide.credits)
customXML = CustomXMLParser(self.customSlide.text)
verseList = customXML.get_verses()
for verse in verseList:
- self.VerseListView.addItem(verse[1])
+ self.verseListView.addItem(verse[1])
theme = self.customSlide.theme_name
- id = self.ThemeComboBox.findText(theme, QtCore.Qt.MatchExactly)
+ id = self.themeComboBox.findText(theme, QtCore.Qt.MatchExactly)
if id == -1:
id = 0 # Not Found
- self.ThemeComboBox.setCurrentIndex(id)
+ self.themeComboBox.setCurrentIndex(id)
else:
- self.ThemeComboBox.setCurrentIndex(0)
+ self.themeComboBox.setCurrentIndex(0)
#if not preview hide the preview button
self.previewButton.setVisible(False)
if preview:
@@ -158,127 +158,127 @@
sxml.new_document()
sxml.add_lyrics_to_song()
count = 1
- for i in range (0, self.VerseListView.count()):
+ for i in range (0, self.verseListView.count()):
sxml.add_verse_to_lyrics(u'custom', unicode(count),
- unicode(self.VerseListView.item(i).text()))
+ unicode(self.verseListView.item(i).text()))
count += 1
- self.customSlide.title = unicode(self.TitleEdit.displayText(), u'utf-8')
+ self.customSlide.title = unicode(self.titleEdit.displayText(), u'utf-8')
self.customSlide.text = unicode(sxml.extract_xml(), u'utf-8')
- self.customSlide.credits = unicode(self.CreditEdit.displayText(),
+ self.customSlide.credits = unicode(self.creditEdit.displayText(),
u'utf-8')
- self.customSlide.theme_name = unicode(self.ThemeComboBox.currentText(),
+ self.customSlide.theme_name = unicode(self.themeComboBox.currentText(),
u'utf-8')
return self.custommanager.save_object(self.customSlide)
def onUpButtonPressed(self):
- selectedRow = self.VerseListView.currentRow()
+ selectedRow = self.verseListView.currentRow()
if selectedRow != 0:
- qw = self.VerseListView.takeItem(selectedRow)
- self.VerseListView.insertItem(selectedRow - 1, qw)
- self.VerseListView.setCurrentRow(selectedRow - 1)
+ qw = self.verseListView.takeItem(selectedRow)
+ self.verseListView.insertItem(selectedRow - 1, qw)
+ self.verseListView.setCurrentRow(selectedRow - 1)
def onDownButtonPressed(self):
- selectedRow = self.VerseListView.currentRow()
+ selectedRow = self.verseListView.currentRow()
# zero base arrays
- if selectedRow != self.VerseListView.count() - 1:
- qw = self.VerseListView.takeItem(selectedRow)
- self.VerseListView.insertItem(selectedRow + 1, qw)
- self.VerseListView.setCurrentRow(selectedRow + 1)
+ if selectedRow != self.verseListView.count() - 1:
+ qw = self.verseListView.takeItem(selectedRow)
+ self.verseListView.insertItem(selectedRow + 1, qw)
+ self.verseListView.setCurrentRow(selectedRow + 1)
def onClearButtonPressed(self):
- self.VerseTextEdit.clear()
+ self.verseTextEdit.clear()
self.editAll = False
- self.AddButton.setEnabled(True)
- self.EditAllButton.setEnabled(True)
- self.SaveButton.setEnabled(False)
+ self.addButton.setEnabled(True)
+ self.editAllButton.setEnabled(True)
+ self.saveButton.setEnabled(False)
def onVerseListViewPressed(self, item):
- self.DeleteButton.setEnabled(True)
- self.EditButton.setEnabled(True)
+ self.deleteButton.setEnabled(True)
+ self.editButton.setEnabled(True)
def onVerseListViewSelected(self, item):
self.editText(item.text())
def onAddButtonPressed(self):
- self.VerseListView.addItem(self.VerseTextEdit.toPlainText())
- self.DeleteButton.setEnabled(False)
- self.VerseTextEdit.clear()
+ self.verseListView.addItem(self.verseTextEdit.toPlainText())
+ self.deleteButton.setEnabled(False)
+ self.verseTextEdit.clear()
def onEditButtonPressed(self):
- self.editText(self.VerseListView.currentItem().text())
+ self.editText(self.verseListView.currentItem().text())
def onEditAllButtonPressed(self):
self.editAll = True
- self.AddButton.setEnabled(False)
- self.SplitButton.setEnabled(True)
- if self.VerseListView.count() > 0:
+ self.addButton.setEnabled(False)
+ self.splitButton.setEnabled(True)
+ if self.verseListView.count() > 0:
verse_list = u''
- for row in range(0, self.VerseListView.count()):
- item = self.VerseListView.item(row)
+ for row in range(0, self.verseListView.count()):
+ item = self.verseListView.item(row)
verse_list += item.text()
- if row != self.VerseListView.count() - 1:
+ if row != self.verseListView.count() - 1:
verse_list += u'\n[---]\n'
self.editText(verse_list)
def editText(self, text):
self.beforeText = text
- self.VerseTextEdit.setPlainText(text)
- self.DeleteButton.setEnabled(False)
- self.EditButton.setEnabled(False)
- self.EditAllButton.setEnabled(False)
- self.SaveButton.setEnabled(True)
- self.ClearButton.setEnabled(True)
+ self.verseTextEdit.setPlainText(text)
+ self.deleteButton.setEnabled(False)
+ self.editButton.setEnabled(False)
+ self.editAllButton.setEnabled(False)
+ self.saveButton.setEnabled(True)
+ self.clearButton.setEnabled(True)
def onSaveButtonPressed(self):
if self.editAll:
- self.VerseListView.clear()
- for row in unicode(self.VerseTextEdit.toPlainText()).split(
+ self.verseListView.clear()
+ for row in unicode(self.verseTextEdit.toPlainText()).split(
u'\n[---]\n'):
- self.VerseListView.addItem(row)
+ self.verseListView.addItem(row)
else:
- self.VerseListView.currentItem().setText(
- self.VerseTextEdit.toPlainText())
+ self.verseListView.currentItem().setText(
+ self.verseTextEdit.toPlainText())
#number of lines has change
if len(self.beforeText.split(u'\n')) != \
- len(self.VerseTextEdit.toPlainText().split(u'\n')):
+ len(self.verseTextEdit.toPlainText().split(u'\n')):
tempList = {}
- for row in range(0, self.VerseListView.count()):
- tempList[row] = self.VerseListView.item(row).text()
- self.VerseListView.clear()
+ for row in range(0, self.verseListView.count()):
+ tempList[row] = self.verseListView.item(row).text()
+ self.verseListView.clear()
for row in range (0, len(tempList)):
- self.VerseListView.addItem(tempList[row])
- self.VerseListView.repaint()
- self.AddButton.setEnabled(True)
- self.SaveButton.setEnabled(False)
- self.EditButton.setEnabled(False)
- self.EditAllButton.setEnabled(True)
- self.SplitButton.setEnabled(False)
- self.VerseTextEdit.clear()
+ self.verseListView.addItem(tempList[row])
+ self.verseListView.repaint()
+ self.addButton.setEnabled(True)
+ self.saveButton.setEnabled(False)
+ self.editButton.setEnabled(False)
+ self.editAllButton.setEnabled(True)
+ self.splitButton.setEnabled(False)
+ self.verseTextEdit.clear()
def onSplitButtonPressed(self):
- if self.VerseTextEdit.textCursor().columnNumber() != 0:
- self.VerseTextEdit.insertPlainText(u'\n')
- self.VerseTextEdit.insertPlainText(u'[---]\n' )
- self.VerseTextEdit.setFocus()
+ if self.verseTextEdit.textCursor().columnNumber() != 0:
+ self.verseTextEdit.insertPlainText(u'\n')
+ self.verseTextEdit.insertPlainText(u'[---]\n' )
+ self.verseTextEdit.setFocus()
def onDeleteButtonPressed(self):
- self.VerseListView.takeItem(self.VerseListView.currentRow())
- self.EditButton.setEnabled(False)
- self.EditAllButton.setEnabled(True)
+ self.verseListView.takeItem(self.verseListView.currentRow())
+ self.editButton.setEnabled(False)
+ self.editAllButton.setEnabled(True)
def _validate(self):
- if len(self.TitleEdit.displayText()) == 0:
- self.TitleEdit.setFocus()
+ if len(self.titleEdit.displayText()) == 0:
+ self.titleEdit.setFocus()
return False, translate('CustomPlugin.EditCustomForm',
'You need to type in a title.')
# must have 1 slide
- if self.VerseListView.count() == 0:
- self.VerseTextEdit.setFocus()
+ if self.verseListView.count() == 0:
+ self.verseTextEdit.setFocus()
return False, translate('CustomPlugin.EditCustomForm',
'You need to add at least one slide')
- if self.VerseTextEdit.toPlainText():
- self.VerseTextEdit.setFocus()
+ if self.verseTextEdit.toPlainText():
+ self.verseTextEdit.setFocus()
return False, translate('CustomPlugin.EditCustomForm',
'You have one or more unsaved slides, please either save your '
'slide(s) or clear your changes.')
- return True, u''
\ No newline at end of file
+ return True, u''
=== modified file 'openlp/plugins/custom/lib/__init__.py'
--- openlp/plugins/custom/lib/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/custom/lib/__init__.py 2010-07-27 12:35:56 +0000
@@ -26,4 +26,4 @@
from customxmlhandler import CustomXMLBuilder, CustomXMLParser
from mediaitem import CustomMediaItem
-from customtab import CustomTab
\ No newline at end of file
+from customtab import CustomTab
=== modified file 'openlp/plugins/custom/lib/customtab.py'
--- openlp/plugins/custom/lib/customtab.py 2010-07-25 08:21:02 +0000
+++ openlp/plugins/custom/lib/customtab.py 2010-07-27 12:35:56 +0000
@@ -77,4 +77,4 @@
def save(self):
QtCore.QSettings().setValue(self.settingsSection + u'/display footer',
- QtCore.QVariant(self.displayFooter))
\ No newline at end of file
+ QtCore.QVariant(self.displayFooter))
=== modified file 'openlp/plugins/custom/lib/customxmlhandler.py'
--- openlp/plugins/custom/lib/customxmlhandler.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/custom/lib/customxmlhandler.py 2010-07-27 12:35:56 +0000
@@ -154,4 +154,4 @@
"""
Debugging aid to dump XML so that we can see what we have.
"""
- return dump(self.custom_xml)
\ No newline at end of file
+ return dump(self.custom_xml)
=== modified file 'openlp/plugins/custom/lib/db.py'
--- openlp/plugins/custom/lib/db.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/custom/lib/db.py 2010-07-27 12:35:56 +0000
@@ -59,4 +59,4 @@
mapper(CustomSlide, custom_slide_table)
metadata.create_all(checkfirst=True)
- return session
\ No newline at end of file
+ return session
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/custom/lib/mediaitem.py 2010-07-27 12:35:56 +0000
@@ -183,4 +183,4 @@
else:
raw_footer.append(u'')
service_item.raw_footer = raw_footer
- return True
\ No newline at end of file
+ return True
=== modified file 'openlp/plugins/images/__init__.py'
--- openlp/plugins/images/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/images/__init__.py 2010-07-27 12:35:56 +0000
@@ -26,4 +26,4 @@
"""
The :mod:`images` module provides the Images plugin. The Images plugin
provides the facility to display images from OpenLP.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/images/imageplugin.py 2010-07-27 12:35:56 +0000
@@ -60,4 +60,4 @@
'background, which renders text-based items like songs with the '
'selected image as a background instead of the background '
'provided by the theme.')
- return about_text
\ No newline at end of file
+ return about_text
=== modified file 'openlp/plugins/images/lib/__init__.py'
--- openlp/plugins/images/lib/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/images/lib/__init__.py 2010-07-27 12:35:56 +0000
@@ -25,4 +25,4 @@
###############################################################################
from mediaitem import ImageMediaItem
-from imagetab import ImageTab
\ No newline at end of file
+from imagetab import ImageTab
=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py 2010-07-25 08:21:02 +0000
+++ openlp/plugins/images/lib/imagetab.py 2010-07-27 12:35:56 +0000
@@ -90,4 +90,4 @@
def postSetUp(self):
Receiver.send_message(u'slidecontroller_live_spin_delay',
- self.loop_delay)
\ No newline at end of file
+ self.loop_delay)
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2010-07-27 12:35:56 +0000
@@ -181,4 +181,4 @@
self.parent.displayManager.displayImageWithText(frame)
def onPreviewClick(self):
- MediaManagerItem.onPreviewClick(self)
\ No newline at end of file
+ MediaManagerItem.onPreviewClick(self)
=== modified file 'openlp/plugins/media/__init__.py'
--- openlp/plugins/media/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/media/__init__.py 2010-07-27 12:35:56 +0000
@@ -28,4 +28,4 @@
display videos. The media supported depends not only on the Python support
but also extensively on the codecs installed on the underlying operating system
being picked up and usable by Python.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/media/lib/__init__.py'
--- openlp/plugins/media/lib/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/media/lib/__init__.py 2010-07-27 12:35:56 +0000
@@ -26,4 +26,4 @@
from mediaitem import MediaMediaItem
-__all__ = ['MediaMediaItem']
\ No newline at end of file
+__all__ = ['MediaMediaItem']
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2010-07-27 12:35:56 +0000
@@ -149,4 +149,4 @@
img = QtGui.QPixmap(u':/media/media_video.png').toImage()
item_name.setIcon(build_icon(img))
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
- self.listView.addItem(item_name)
\ No newline at end of file
+ self.listView.addItem(item_name)
=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/media/mediaplugin.py 2010-07-27 12:35:56 +0000
@@ -76,4 +76,4 @@
def about(self):
about_text = translate('MediaPlugin', '<strong>Media Plugin</strong>'
'<br />The media plugin provides playback of audio and video.')
- return about_text
\ No newline at end of file
+ return about_text
=== modified file 'openlp/plugins/presentations/__init__.py'
--- openlp/plugins/presentations/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/presentations/__init__.py 2010-07-27 12:35:56 +0000
@@ -26,4 +26,4 @@
"""
The :mod:`presentations` module provides the Presentations plugin which allows
OpenLP to show presentations from most popular presentation packages.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/presentations/lib/__init__.py'
--- openlp/plugins/presentations/lib/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/presentations/lib/__init__.py 2010-07-27 12:35:56 +0000
@@ -27,4 +27,4 @@
from presentationcontroller import PresentationController
from messagelistener import MessageListener
from mediaitem import PresentationMediaItem
-from presentationtab import PresentationTab
\ No newline at end of file
+from presentationtab import PresentationTab
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py 2010-07-27 12:35:56 +0000
@@ -463,4 +463,4 @@
shape = notes.getByIndex(idx)
if shape.supportsService("com.sun.star.drawing.Text"):
text += shape.getString() + '\n'
- return text
\ No newline at end of file
+ return text
=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py 2010-07-27 12:35:56 +0000
@@ -367,4 +367,4 @@
to check which slide is currently displayed so the slidecontroller
view can be updated
"""
- self.live_handler.poll()
\ No newline at end of file
+ self.live_handler.poll()
=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py 2010-07-27 12:35:56 +0000
@@ -310,4 +310,4 @@
shape = shapes(idx + 1)
if shape.HasTextFrame:
text += shape.TextFrame.TextRange.Text + '\n'
- return text
\ No newline at end of file
+ return text
=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
--- openlp/plugins/presentations/lib/presentationcontroller.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/presentations/lib/presentationcontroller.py 2010-07-27 12:35:56 +0000
@@ -435,4 +435,4 @@
``slide_no``
The slide the notes are required for, starting at 1
"""
- return ''
\ No newline at end of file
+ return ''
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py 2010-07-27 12:35:56 +0000
@@ -162,4 +162,4 @@
QtCore.QVariant(self.OverrideAppCheckBox.checkState()))
changed = True
if changed:
- Receiver.send_message(u'mediaitem_presentation_rebuild')
\ No newline at end of file
+ Receiver.send_message(u'mediaitem_presentation_rebuild')
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py 2010-07-25 11:47:53 +0000
+++ openlp/plugins/presentations/presentationplugin.py 2010-07-27 12:35:56 +0000
@@ -142,4 +142,4 @@
'ability to show presentations using a number of different '
'programs. The choice of available presentation programs is '
'available to the user in a drop down box.')
- return about_text
\ No newline at end of file
+ return about_text
=== modified file 'openlp/plugins/remotes/__init__.py'
--- openlp/plugins/remotes/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/remotes/__init__.py 2010-07-27 12:35:56 +0000
@@ -26,4 +26,4 @@
"""
The :mod:`remotes` plugin allows OpenLP to be controlled from another machine
over a network connection.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/remotes/lib/__init__.py'
--- openlp/plugins/remotes/lib/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/remotes/lib/__init__.py 2010-07-27 12:35:56 +0000
@@ -25,4 +25,4 @@
###############################################################################
from remotetab import RemoteTab
-from httpserver import HttpServer
\ No newline at end of file
+from httpserver import HttpServer
=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/remotes/lib/httpserver.py 2010-07-27 12:35:56 +0000
@@ -337,4 +337,4 @@
log.debug(u'close socket')
self.socket.close()
self.socket = None
- self.parent.close_connection(self)
\ No newline at end of file
+ self.parent.close_connection(self)
=== modified file 'openlp/plugins/remotes/remoteplugin.py'
--- openlp/plugins/remotes/remoteplugin.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/remotes/remoteplugin.py 2010-07-27 12:35:56 +0000
@@ -75,4 +75,4 @@
'<br/ >The remote plugin provides the ability to send messages to '
'a running version of OpenLP on a different computer via a web '
'browser or through the remote API.')
- return about_text
\ No newline at end of file
+ return about_text
=== modified file 'openlp/plugins/songs/__init__.py'
--- openlp/plugins/songs/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/__init__.py 2010-07-27 12:35:56 +0000
@@ -26,4 +26,4 @@
"""
The :mod:`songs` module provides the Songs plugin. The Songs plugin provides
the main lyric projection function of OpenLP.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/songs/forms/__init__.py'
--- openlp/plugins/songs/forms/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/__init__.py 2010-07-27 12:35:56 +0000
@@ -30,4 +30,4 @@
from editverseform import EditVerseForm
from editsongform import EditSongForm
from songmaintenanceform import SongMaintenanceForm
-from songimportform import ImportWizardForm
\ No newline at end of file
+from songimportform import ImportWizardForm
=== modified file 'openlp/plugins/songs/forms/authorsdialog.py'
--- openlp/plugins/songs/forms/authorsdialog.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/authorsdialog.py 2010-07-27 12:35:56 +0000
@@ -83,4 +83,4 @@
self.FirstNameLabel.setText(
translate('SongsPlugin.AuthorsForm', 'First name:'))
self.LastNameLabel.setText(
- translate('SongsPlugin.AuthorsForm', 'Last name:'))
\ No newline at end of file
+ translate('SongsPlugin.AuthorsForm', 'Last name:'))
=== modified file 'openlp/plugins/songs/forms/authorsform.py'
--- openlp/plugins/songs/forms/authorsform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/authorsform.py 2010-07-27 12:35:56 +0000
@@ -111,4 +111,4 @@
self.DisplayEdit.setFocus()
return False
else:
- return QtGui.QDialog.accept(self)
\ No newline at end of file
+ return QtGui.QDialog.accept(self)
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py 2010-07-27 12:35:56 +0000
@@ -459,4 +459,4 @@
self.SongTabWidget.setTabText(
self.SongTabWidget.indexOf(self.ThemeTab),
translate('SongsPlugin.EditSongForm',
- 'Theme, Copyright Info && Comments'))
\ No newline at end of file
+ 'Theme, Copyright Info && Comments'))
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2010-07-27 12:35:56 +0000
@@ -685,4 +685,4 @@
def processTitle(self):
log.debug(u'processTitle')
self.song.search_title = \
- re.sub(r'[\'"`,;:(){}?]+', u'', unicode(self.song.search_title))
\ No newline at end of file
+ re.sub(r'[\'"`,;:(){}?]+', u'', unicode(self.song.search_title))
=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/editversedialog.py 2010-07-27 12:35:56 +0000
@@ -103,4 +103,4 @@
self.VerseTypeComboBox.setItemText(6,
VerseType.to_string(VerseType.Other))
self.InsertButton.setText(
- translate('SongsPlugin.EditVerseForm', '&Insert'))
\ No newline at end of file
+ translate('SongsPlugin.EditVerseForm', '&Insert'))
=== modified file 'openlp/plugins/songs/forms/editverseform.py'
--- openlp/plugins/songs/forms/editverseform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/editverseform.py 2010-07-27 12:35:56 +0000
@@ -138,4 +138,4 @@
if not text.startsWith(u'---['):
text = u'---[%s:1]---\n%s' % (VerseType.to_string(VerseType.Verse),
text)
- return text
\ No newline at end of file
+ return text
=== modified file 'openlp/plugins/songs/forms/songbookdialog.py'
--- openlp/plugins/songs/forms/songbookdialog.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/songbookdialog.py 2010-07-27 12:35:56 +0000
@@ -74,4 +74,4 @@
translate('SongsPlugin.SongBookForm', 'Song Book Maintenance'))
self.NameLabel.setText(translate('SongsPlugin.SongBookForm', '&Name:'))
self.PublisherLabel.setText(
- translate('SongsPlugin.SongBookForm', '&Publisher:'))
\ No newline at end of file
+ translate('SongsPlugin.SongBookForm', '&Publisher:'))
=== modified file 'openlp/plugins/songs/forms/songbookform.py'
--- openlp/plugins/songs/forms/songbookform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/songbookform.py 2010-07-27 12:35:56 +0000
@@ -57,4 +57,4 @@
self.NameEdit.setFocus()
return False
else:
- return QtGui.QDialog.accept(self)
\ No newline at end of file
+ return QtGui.QDialog.accept(self)
=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/songimportform.py 2010-07-27 12:35:56 +0000
@@ -255,4 +255,4 @@
self.ImportProgressBar.setValue(self.ImportProgressBar.maximum())
self.finishButton.setVisible(True)
self.cancelButton.setVisible(False)
- Receiver.send_message(u'process_events')
\ No newline at end of file
+ Receiver.send_message(u'process_events')
=== modified file 'openlp/plugins/songs/forms/songimportwizard.py'
--- openlp/plugins/songs/forms/songimportwizard.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/songimportwizard.py 2010-07-27 12:35:56 +0000
@@ -272,4 +272,4 @@
self.ImportProgressLabel.setText(
translate('SongsPlugin.ImportWizardForm', 'Ready.'))
self.ImportProgressBar.setFormat(
- translate('SongsPlugin.ImportWizardForm', '%p%'))
\ No newline at end of file
+ translate('SongsPlugin.ImportWizardForm', '%p%'))
=== modified file 'openlp/plugins/songs/forms/songmaintenancedialog.py'
--- openlp/plugins/songs/forms/songmaintenancedialog.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/songmaintenancedialog.py 2010-07-27 12:35:56 +0000
@@ -236,4 +236,4 @@
self.BookEditButton.setText(
translate('SongsPlugin.SongMaintenanceForm', '&Edit'))
self.BookDeleteButton.setText(
- translate('SongsPlugin.SongMaintenanceForm', '&Delete'))
\ No newline at end of file
+ translate('SongsPlugin.SongMaintenanceForm', '&Delete'))
=== modified file 'openlp/plugins/songs/forms/songmaintenanceform.py'
--- openlp/plugins/songs/forms/songmaintenanceform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/songmaintenanceform.py 2010-07-27 12:35:56 +0000
@@ -482,4 +482,4 @@
translate('SongsPlugin.SongMaintenanceForm',
'This book cannot be deleted, it is currently '
'assigned to at least one song.'),
- translate('SongsPlugin.SongMaintenanceForm', 'No book selected!'))
\ No newline at end of file
+ translate('SongsPlugin.SongMaintenanceForm', 'No book selected!'))
=== modified file 'openlp/plugins/songs/forms/topicsdialog.py'
--- openlp/plugins/songs/forms/topicsdialog.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/topicsdialog.py 2010-07-27 12:35:56 +0000
@@ -65,4 +65,4 @@
TopicsDialog.setWindowTitle(
translate('SongsPlugin.TopicsForm', 'Topic Maintenance'))
self.NameLabel.setText(
- translate('SongsPlugin.TopicsForm', 'Topic name:'))
\ No newline at end of file
+ translate('SongsPlugin.TopicsForm', 'Topic name:'))
=== modified file 'openlp/plugins/songs/forms/topicsform.py'
--- openlp/plugins/songs/forms/topicsform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/forms/topicsform.py 2010-07-27 12:35:56 +0000
@@ -56,4 +56,4 @@
self.NameEdit.setFocus()
return False
else:
- return QtGui.QDialog.accept(self)
\ No newline at end of file
+ return QtGui.QDialog.accept(self)
=== modified file 'openlp/plugins/songs/lib/__init__.py'
--- openlp/plugins/songs/lib/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/lib/__init__.py 2010-07-27 12:35:56 +0000
@@ -148,4 +148,4 @@
from sofimport import SofImport
from oooimport import OooImport
except ImportError:
- pass
\ No newline at end of file
+ pass
=== modified file 'openlp/plugins/songs/lib/db.py'
--- openlp/plugins/songs/lib/db.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/lib/db.py 2010-07-27 12:35:56 +0000
@@ -181,4 +181,4 @@
mapper(Topic, topics_table)
metadata.create_all(checkfirst=True)
- return session
\ No newline at end of file
+ return session
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2010-07-27 12:35:56 +0000
@@ -372,4 +372,4 @@
service_item.audit = [
song.title, author_audit, song.copyright, song.ccli_number
]
- return True
\ No newline at end of file
+ return True
=== modified file 'openlp/plugins/songs/lib/olpimport.py'
--- openlp/plugins/songs/lib/olpimport.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/lib/olpimport.py 2010-07-27 12:35:56 +0000
@@ -209,4 +209,4 @@
# new_song.media_files.append(MediaFile.populate(
# file_name=media_file.file_name))
self.master_manager.save_object(new_song)
- engine.dispose()
\ No newline at end of file
+ engine.dispose()
=== modified file 'openlp/plugins/songs/lib/oooimport.py'
--- openlp/plugins/songs/lib/oooimport.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/lib/oooimport.py 2010-07-27 12:35:56 +0000
@@ -198,4 +198,4 @@
text += paratext + u'\n'
songs = SongImport.process_songs_text(self.manager, text)
for song in songs:
- song.finish()
\ No newline at end of file
+ song.finish()
=== modified file 'openlp/plugins/songs/lib/opensongimport.py'
--- openlp/plugins/songs/lib/opensongimport.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/lib/opensongimport.py 2010-07-27 12:35:56 +0000
@@ -240,4 +240,4 @@
def finish(self):
""" Separate function, allows test suite to not pollute database"""
- self.song_import.finish()
\ No newline at end of file
+ self.song_import.finish()
=== modified file 'openlp/plugins/songs/lib/sofimport.py'
--- openlp/plugins/songs/lib/sofimport.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/lib/sofimport.py 2010-07-27 12:35:56 +0000
@@ -535,4 +535,4 @@
return 6
if song_number == 1119:
return 7
- return None
\ No newline at end of file
+ return None
=== modified file 'openlp/plugins/songs/lib/songimport.py'
--- openlp/plugins/songs/lib/songimport.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/lib/songimport.py 2010-07-27 12:35:56 +0000
@@ -310,4 +310,4 @@
if self.theme_name:
print u'THEME: ' + self.theme_name
if self.ccli_number:
- print u'CCLI: ' + self.ccli_number
\ No newline at end of file
+ print u'CCLI: ' + self.ccli_number
=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py 2010-07-25 08:21:02 +0000
+++ openlp/plugins/songs/lib/songstab.py 2010-07-27 12:35:56 +0000
@@ -99,4 +99,4 @@
settings.beginGroup(self.settingsSection)
settings.setValue(u'search as type', QtCore.QVariant(self.song_search))
settings.setValue(u'display songbar', QtCore.QVariant(self.song_bar))
- settings.endGroup()
\ No newline at end of file
+ settings.endGroup()
=== modified file 'openlp/plugins/songs/lib/songxml.py'
--- openlp/plugins/songs/lib/songxml.py 2010-07-25 11:47:53 +0000
+++ openlp/plugins/songs/lib/songxml.py 2010-07-27 12:35:56 +0000
@@ -422,4 +422,4 @@
return res
__all__ = ['SongException', 'SongTitleError', 'SongSlideError', 'SongTypeError',
- 'SongFeatureError', 'Song']
\ No newline at end of file
+ 'SongFeatureError', 'Song']
=== modified file 'openlp/plugins/songs/lib/test/test_opensongimport.py'
--- openlp/plugins/songs/lib/test/test_opensongimport.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/lib/test/test_opensongimport.py 2010-07-27 12:35:56 +0000
@@ -86,4 +86,4 @@
pass
if __name__ == "__main__":
- test()
\ No newline at end of file
+ test()
=== modified file 'openlp/plugins/songs/lib/xml.py'
--- openlp/plugins/songs/lib/xml.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/lib/xml.py 2010-07-27 12:35:56 +0000
@@ -238,4 +238,4 @@
(language[u'language'], verse_output)
song_output = u'<?xml version="1.0" encoding="UTF-8"?>' + \
u'<song version="1.0">%s</song>' % lyrics_output
- return song_output
\ No newline at end of file
+ return song_output
=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songs/songsplugin.py 2010-07-27 12:35:56 +0000
@@ -290,4 +290,4 @@
Song.theme_name == oldTheme)
for song in songsUsingTheme:
song.theme_name = newTheme
- self.custommanager.save_object(song)
\ No newline at end of file
+ self.custommanager.save_object(song)
=== modified file 'openlp/plugins/songusage/__init__.py'
--- openlp/plugins/songusage/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songusage/__init__.py 2010-07-27 12:35:56 +0000
@@ -27,4 +27,4 @@
The :mod:`songusage` module contains the Song Usage plugin. The Song Usage
plugin provides auditing capabilities for reporting the songs you are using to
copyright license organisations.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/songusage/forms/__init__.py'
--- openlp/plugins/songusage/forms/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songusage/forms/__init__.py 2010-07-27 12:35:56 +0000
@@ -25,4 +25,4 @@
###############################################################################
from songusagedeleteform import SongUsageDeleteForm
-from songusagedetailform import SongUsageDetailForm
\ No newline at end of file
+from songusagedetailform import SongUsageDetailForm
=== modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py'
--- openlp/plugins/songusage/forms/songusagedeletedialog.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songusage/forms/songusagedeletedialog.py 2010-07-27 12:35:56 +0000
@@ -28,37 +28,37 @@
from openlp.core.lib import translate
class Ui_SongUsageDeleteDialog(object):
- def setupUi(self, SongUsageDeleteDialog):
- SongUsageDeleteDialog.setObjectName(u'SongUsageDeleteDialog')
- SongUsageDeleteDialog.resize(291, 243)
- self.layoutWidget = QtGui.QWidget(SongUsageDeleteDialog)
+ def setupUi(self, songUsageDeleteDialog):
+ songUsageDeleteDialog.setObjectName(u'songUsageDeleteDialog')
+ songUsageDeleteDialog.resize(291, 243)
+ self.layoutWidget = QtGui.QWidget(songUsageDeleteDialog)
self.layoutWidget.setGeometry(QtCore.QRect(20, 10, 247, 181))
self.layoutWidget.setObjectName(u'layoutWidget')
self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget)
self.verticalLayout.setObjectName(u'verticalLayout')
- self.DeleteCalendar = QtGui.QCalendarWidget(self.layoutWidget)
- self.DeleteCalendar.setFirstDayOfWeek(QtCore.Qt.Sunday)
- self.DeleteCalendar.setGridVisible(True)
- self.DeleteCalendar.setVerticalHeaderFormat(
+ self.deleteCalendar = QtGui.QCalendarWidget(self.layoutWidget)
+ self.deleteCalendar.setFirstDayOfWeek(QtCore.Qt.Sunday)
+ self.deleteCalendar.setGridVisible(True)
+ self.deleteCalendar.setVerticalHeaderFormat(
QtGui.QCalendarWidget.NoVerticalHeader)
- self.DeleteCalendar.setObjectName(u'DeleteCalendar')
- self.verticalLayout.addWidget(self.DeleteCalendar)
- self.buttonBox = QtGui.QDialogButtonBox(SongUsageDeleteDialog)
+ self.deleteCalendar.setObjectName(u'deleteCalendar')
+ self.verticalLayout.addWidget(self.deleteCalendar)
+ self.buttonBox = QtGui.QDialogButtonBox(songUsageDeleteDialog)
self.buttonBox.setGeometry(QtCore.QRect(30, 210, 245, 25))
self.buttonBox.setStandardButtons(
QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
self.buttonBox.setObjectName(u'buttonBox')
- self.retranslateUi(SongUsageDeleteDialog)
+ self.retranslateUi(songUsageDeleteDialog)
QtCore.QObject.connect(
self.buttonBox, QtCore.SIGNAL(u'accepted()'),
- SongUsageDeleteDialog.accept)
+ songUsageDeleteDialog.accept)
QtCore.QObject.connect(
self.buttonBox, QtCore.SIGNAL(u'rejected()'),
- SongUsageDeleteDialog.close)
- QtCore.QMetaObject.connectSlotsByName(SongUsageDeleteDialog)
+ songUsageDeleteDialog.close)
+ QtCore.QMetaObject.connectSlotsByName(songUsageDeleteDialog)
- def retranslateUi(self, SongUsageDeleteDialog):
- SongUsageDeleteDialog.setWindowTitle(
+ def retranslateUi(self, songUsageDeleteDialog):
+ songUsageDeleteDialog.setWindowTitle(
translate('SongUsagePlugin.SongUsageDeleteForm',
- 'Delete Song Usage Data'))
\ No newline at end of file
+ 'Delete Song Usage Data'))
=== modified file 'openlp/plugins/songusage/forms/songusagedeleteform.py'
--- openlp/plugins/songusage/forms/songusagedeleteform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songusage/forms/songusagedeleteform.py 2010-07-27 12:35:56 +0000
@@ -48,12 +48,11 @@
'Delete Selected Song Usage Events?'),
translate('SongUsagePlugin.SongUsageDeleteForm',
'Are you sure you want to delete selected Song Usage data?'),
- QtGui.QMessageBox.StandardButtons(
- QtGui.QMessageBox.Ok |
+ QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok |
QtGui.QMessageBox.Cancel),
QtGui.QMessageBox.Cancel)
if ret == QtGui.QMessageBox.Ok:
- deleteDate = self.DeleteCalendar.selectedDate().toPyDate()
+ deleteDate = self.deleteCalendar.selectedDate().toPyDate()
self.songusagemanager.delete_all_objects(SongUsageItem,
SongUsageItem.usagedate <= deleteDate)
- self.close()
\ No newline at end of file
+ self.close()
=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
--- openlp/plugins/songusage/forms/songusagedetaildialog.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songusage/forms/songusagedetaildialog.py 2010-07-27 12:35:56 +0000
@@ -29,71 +29,71 @@
from openlp.core.lib import build_icon, translate
class Ui_SongUsageDetailDialog(object):
- def setupUi(self, SongUsageDetailDialog):
- SongUsageDetailDialog.setObjectName(u'SongUsageDetailDialog')
- SongUsageDetailDialog.resize(609, 413)
- self.verticalLayout = QtGui.QVBoxLayout(SongUsageDetailDialog)
+ def setupUi(self, songUsageDetailDialog):
+ songUsageDetailDialog.setObjectName(u'songUsageDetailDialog')
+ songUsageDetailDialog.resize(609, 413)
+ self.verticalLayout = QtGui.QVBoxLayout(songUsageDetailDialog)
self.verticalLayout.setObjectName(u'verticalLayout')
- self.DateRangeGroupBox = QtGui.QGroupBox(SongUsageDetailDialog)
- self.DateRangeGroupBox.setObjectName(u'DateRangeGroupBox')
- self.verticalLayout_2 = QtGui.QVBoxLayout(self.DateRangeGroupBox)
- self.verticalLayout_2.setObjectName(u'verticalLayout_2')
- self.DateHorizontalLayout = QtGui.QHBoxLayout()
- self.DateHorizontalLayout.setObjectName(u'DateHorizontalLayout')
- self.FromDate = QtGui.QCalendarWidget(self.DateRangeGroupBox)
- self.FromDate.setObjectName(u'FromDate')
- self.DateHorizontalLayout.addWidget(self.FromDate)
- self.ToLabel = QtGui.QLabel(self.DateRangeGroupBox)
- self.ToLabel.setScaledContents(False)
- self.ToLabel.setAlignment(QtCore.Qt.AlignCenter)
- self.ToLabel.setObjectName(u'ToLabel')
- self.DateHorizontalLayout.addWidget(self.ToLabel)
- self.ToDate = QtGui.QCalendarWidget(self.DateRangeGroupBox)
- self.ToDate.setObjectName(u'ToDate')
- self.DateHorizontalLayout.addWidget(self.ToDate)
- self.verticalLayout_2.addLayout(self.DateHorizontalLayout)
- self.FileGroupBox = QtGui.QGroupBox(self.DateRangeGroupBox)
- self.FileGroupBox.setObjectName(u'FileGroupBox')
- self.verticalLayout_4 = QtGui.QVBoxLayout(self.FileGroupBox)
- self.verticalLayout_4.setObjectName(u'verticalLayout_4')
+ self.dateRangeGroupBox = QtGui.QGroupBox(songUsageDetailDialog)
+ self.dateRangeGroupBox.setObjectName(u'dateRangeGroupBox')
+ self.verticalLayout2 = QtGui.QVBoxLayout(self.dateRangeGroupBox)
+ self.verticalLayout2.setObjectName(u'verticalLayout2')
+ self.dateHorizontalLayout = QtGui.QHBoxLayout()
+ self.dateHorizontalLayout.setObjectName(u'dateHorizontalLayout')
+ self.fromDate = QtGui.QCalendarWidget(self.dateRangeGroupBox)
+ self.fromDate.setObjectName(u'fromDate')
+ self.dateHorizontalLayout.addWidget(self.fromDate)
+ self.toLabel = QtGui.QLabel(self.dateRangeGroupBox)
+ self.toLabel.setScaledContents(False)
+ self.toLabel.setAlignment(QtCore.Qt.AlignCenter)
+ self.toLabel.setObjectName(u'toLabel')
+ self.dateHorizontalLayout.addWidget(self.toLabel)
+ self.toDate = QtGui.QCalendarWidget(self.dateRangeGroupBox)
+ self.toDate.setObjectName(u'toDate')
+ self.dateHorizontalLayout.addWidget(self.toDate)
+ self.verticalLayout2.addLayout(self.dateHorizontalLayout)
+ self.fileGroupBox = QtGui.QGroupBox(self.dateRangeGroupBox)
+ self.fileGroupBox.setObjectName(u'fileGroupBox')
+ self.verticalLayout4 = QtGui.QVBoxLayout(self.fileGroupBox)
+ self.verticalLayout4.setObjectName(u'verticalLayout4')
self.horizontalLayout = QtGui.QHBoxLayout()
self.horizontalLayout.setObjectName(u'horizontalLayout')
- self.FileLineEdit = QtGui.QLineEdit(self.FileGroupBox)
- self.FileLineEdit.setObjectName(u'FileLineEdit')
- self.horizontalLayout.addWidget(self.FileLineEdit)
- self.SaveFilePushButton = QtGui.QPushButton(self.FileGroupBox)
- self.SaveFilePushButton.setIcon(
+ self.fileLineEdit = QtGui.QLineEdit(self.fileGroupBox)
+ self.fileLineEdit.setObjectName(u'fileLineEdit')
+ self.horizontalLayout.addWidget(self.fileLineEdit)
+ self.saveFilePushButton = QtGui.QPushButton(self.fileGroupBox)
+ self.saveFilePushButton.setIcon(
build_icon(u':/general/general_load.png'))
- self.SaveFilePushButton.setObjectName(u'SaveFilePushButton')
- self.horizontalLayout.addWidget(self.SaveFilePushButton)
- self.verticalLayout_4.addLayout(self.horizontalLayout)
- self.verticalLayout_2.addWidget(self.FileGroupBox)
- self.verticalLayout.addWidget(self.DateRangeGroupBox)
- self.buttonBox = QtGui.QDialogButtonBox(SongUsageDetailDialog)
+ self.saveFilePushButton.setObjectName(u'saveFilePushButton')
+ self.horizontalLayout.addWidget(self.saveFilePushButton)
+ self.verticalLayout4.addLayout(self.horizontalLayout)
+ self.verticalLayout2.addWidget(self.fileGroupBox)
+ self.verticalLayout.addWidget(self.dateRangeGroupBox)
+ self.buttonBox = QtGui.QDialogButtonBox(songUsageDetailDialog)
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
QtGui.QDialogButtonBox.Ok)
self.buttonBox.setObjectName(u'buttonBox')
self.verticalLayout.addWidget(self.buttonBox)
- self.retranslateUi(SongUsageDetailDialog)
+ self.retranslateUi(songUsageDetailDialog)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
- SongUsageDetailDialog.accept)
+ songUsageDetailDialog.accept)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
- SongUsageDetailDialog.close)
- QtCore.QObject.connect(self.SaveFilePushButton,
+ songUsageDetailDialog.close)
+ QtCore.QObject.connect(self.saveFilePushButton,
QtCore.SIGNAL(u'pressed()'),
- SongUsageDetailDialog.defineOutputLocation)
- QtCore.QMetaObject.connectSlotsByName(SongUsageDetailDialog)
+ songUsageDetailDialog.defineOutputLocation)
+ QtCore.QMetaObject.connectSlotsByName(songUsageDetailDialog)
- def retranslateUi(self, SongUsageDetailDialog):
- SongUsageDetailDialog.setWindowTitle(
+ def retranslateUi(self, songUsageDetailDialog):
+ songUsageDetailDialog.setWindowTitle(
translate('SongUsagePlugin.SongUsageDetailForm',
'Song Usage Extraction'))
- self.DateRangeGroupBox.setTitle(
+ self.dateRangeGroupBox.setTitle(
translate('SongUsagePlugin.SongUsageDetailForm',
'Select Date Range'))
- self.ToLabel.setText(
+ self.toLabel.setText(
translate('SongUsagePlugin.SongUsageDetailForm', 'to'))
- self.FileGroupBox.setTitle(
+ self.fileGroupBox.setTitle(
translate('SongUsagePlugin.SongUsageDetailForm',
- 'Report Location'))
\ No newline at end of file
+ 'Report Location'))
=== modified file 'openlp/plugins/songusage/forms/songusagedetailform.py'
--- openlp/plugins/songusage/forms/songusagedetailform.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songusage/forms/songusagedetailform.py 2010-07-27 12:35:56 +0000
@@ -56,9 +56,9 @@
year -= 1
toDate = QtCore.QDate(year, 8, 31)
fromDate = QtCore.QDate(year - 1, 9, 1)
- self.FromDate.setSelectedDate(fromDate)
- self.ToDate.setSelectedDate(toDate)
- self.FileLineEdit.setText(
+ self.fromDate.setSelectedDate(fromDate)
+ self.toDate.setSelectedDate(toDate)
+ self.fileLineEdit.setText(
SettingsManager.get_last_dir(self.parent.settingsSection, 1))
def defineOutputLocation(self):
@@ -69,19 +69,19 @@
path = unicode(path)
if path != u'':
SettingsManager.set_last_dir(self.parent.settingsSection, path, 1)
- self.FileLineEdit.setText(path)
+ self.fileLineEdit.setText(path)
def accept(self):
log.debug(u'Detailed report generated')
filename = u'usage_detail_%s_%s.txt' % (
- self.FromDate.selectedDate().toString(u'ddMMyyyy'),
- self.ToDate.selectedDate().toString(u'ddMMyyyy'))
+ self.fromDate.selectedDate().toString(u'ddMMyyyy'),
+ self.toDate.selectedDate().toString(u'ddMMyyyy'))
usage = self.parent.songusagemanager.get_all_objects(
SongUsageItem, and_(
- SongUsageItem.usagedate >= self.FromDate.selectedDate().toPyDate(),
- SongUsageItem.usagedate < self.ToDate.selectedDate().toPyDate()),
+ SongUsageItem.usagedate >= self.fromDate.selectedDate().toPyDate(),
+ SongUsageItem.usagedate < self.toDate.selectedDate().toPyDate()),
[SongUsageItem.usagedate, SongUsageItem.usagetime])
- outname = os.path.join(unicode(self.FileLineEdit.text()), filename)
+ outname = os.path.join(unicode(self.fileLineEdit.text()), filename)
file = None
try:
file = open(outname, u'w')
@@ -94,4 +94,4 @@
log.exception(u'Failed to write out song usage records')
finally:
if file:
- file.close()
\ No newline at end of file
+ file.close()
=== modified file 'openlp/plugins/songusage/lib/__init__.py'
--- openlp/plugins/songusage/lib/__init__.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songusage/lib/__init__.py 2010-07-27 12:35:56 +0000
@@ -25,4 +25,4 @@
###############################################################################
"""
The :mod:`lib` module contains the library functions for the songusage plugin.
-"""
\ No newline at end of file
+"""
=== modified file 'openlp/plugins/songusage/lib/db.py'
--- openlp/plugins/songusage/lib/db.py 2010-07-24 22:10:47 +0000
+++ openlp/plugins/songusage/lib/db.py 2010-07-27 12:35:56 +0000
@@ -61,4 +61,4 @@
mapper(SongUsageItem, songusage_table)
metadata.create_all(checkfirst=True)
- return session
\ No newline at end of file
+ return session
=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py 2010-07-25 08:21:02 +0000
+++ openlp/plugins/songusage/songusageplugin.py 2010-07-27 12:35:56 +0000
@@ -160,4 +160,4 @@
about_text = translate('SongUsagePlugin', '<strong>SongUsage Plugin'
'</strong><br />This plugin tracks the usage of songs in '
'services.')
- return about_text
\ No newline at end of file
+ return about_text
=== modified file 'resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py'
--- resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py 2010-07-24 22:10:47 +0000
+++ resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py 2010-07-27 12:35:56 +0000
@@ -26,4 +26,4 @@
hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller',
'openlp.plugins.presentations.lib.powerpointcontroller',
- 'openlp.plugins.presentations.lib.pptviewcontroller']
\ No newline at end of file
+ 'openlp.plugins.presentations.lib.pptviewcontroller']
=== modified file 'resources/pyinstaller/hook-openlp.py'
--- resources/pyinstaller/hook-openlp.py 2010-07-24 22:10:47 +0000
+++ resources/pyinstaller/hook-openlp.py 2010-07-27 12:35:56 +0000
@@ -32,4 +32,4 @@
'plugins.custom.customplugin',
'plugins.songusage.songusageplugin',
'plugins.remotes.remoteplugin',
- 'plugins.alerts.alertsplugin']
\ No newline at end of file
+ 'plugins.alerts.alertsplugin']
=== modified file 'scripts/bible-1to2-converter.py'
--- scripts/bible-1to2-converter.py 2010-07-24 22:10:47 +0000
+++ scripts/bible-1to2-converter.py 2010-07-27 12:35:56 +0000
@@ -303,4 +303,4 @@
os.unlink(new_db)
verbose = options.verbose
debug = options.debug
- main(old_db, new_db)
\ No newline at end of file
+ main(old_db, new_db)
=== modified file 'scripts/openlp-1to2-converter.py'
--- scripts/openlp-1to2-converter.py 2010-07-24 22:10:47 +0000
+++ scripts/openlp-1to2-converter.py 2010-07-27 12:35:56 +0000
@@ -320,4 +320,4 @@
os.unlink(new_db)
verbose = options.verbose
debug = options.debug
- main(old_db, new_db)
\ No newline at end of file
+ main(old_db, new_db)
=== modified file 'scripts/openlp-remoteclient.py'
--- scripts/openlp-remoteclient.py 2010-07-24 22:10:47 +0000
+++ scripts/openlp-remoteclient.py 2010-07-27 12:35:56 +0000
@@ -64,4 +64,4 @@
sendData(options)
if __name__ == u'__main__':
- main()
\ No newline at end of file
+ main()
=== modified file 'scripts/translation_utils.py'
--- scripts/translation_utils.py 2010-07-24 22:10:47 +0000
+++ scripts/translation_utils.py 2010-07-27 12:35:56 +0000
@@ -236,4 +236,4 @@
if os.path.split(os.path.abspath(u'.'))[1] != u'scripts':
print u'You need to run this script from the scripts directory.'
else:
- main()
\ No newline at end of file
+ main()
=== modified file 'scripts/windows-builder.py'
--- scripts/windows-builder.py 2010-07-24 22:10:47 +0000
+++ scripts/windows-builder.py 2010-07-27 12:35:56 +0000
@@ -165,4 +165,4 @@
print "Done."
if __name__ == u'__main__':
- main()
\ No newline at end of file
+ main()
=== modified file 'setup.py'
--- setup.py 2010-07-24 22:10:47 +0000
+++ setup.py 2010-07-27 12:35:56 +0000
@@ -79,4 +79,4 @@
entry_points="""
# -*- Entry points: -*-
"""
-)
\ No newline at end of file
+)
Follow ups
