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

More Fixes and clean ups

Browse Source 
bzr-revno: 358
This commit is contained in:
Tim Bentley 2009-03-02 22:35:32 +00:00
parent 86115ec964
commit 2faca83bd9
3 changed files with 256 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
openlp/core/ui/alertstab.py
View File

@ -19,6 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
""" """
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from PyQt4.QtGui import QColor
from openlp.core import translate from openlp.core import translate
from openlp.core.lib import SettingsTab from openlp.core.lib import SettingsTab
@ -30,6 +31,7 @@ class AlertsTab(SettingsTab):
""" """
def __init__(self): def __init__(self):
SettingsTab.__init__(self, u'Alerts') SettingsTab.__init__(self, u'Alerts')
self.load()
def setupUi(self): def setupUi(self):
self.setObjectName(u'AlertsTab') self.setObjectName(u'AlertsTab')
@ -64,22 +66,35 @@ class AlertsTab(SettingsTab):
self.FontColorLabel = QtGui.QLabel(self.ColorWidget) self.FontColorLabel = QtGui.QLabel(self.ColorWidget)
self.FontColorLabel.setObjectName(u'FontColorLabel') self.FontColorLabel.setObjectName(u'FontColorLabel')
self.ColorLayout.addWidget(self.FontColorLabel) self.ColorLayout.addWidget(self.FontColorLabel)
self.FontColorPanel = QtGui.QGraphicsView(self.ColorWidget)
self.FontColorPanel.setMinimumSize(QtCore.QSize(24, 24)) self.FontColourButton = QtGui.QPushButton(self.ColorWidget)
self.FontColorPanel.setMaximumSize(QtCore.QSize(24, 24)) self.FontColourButton.setObjectName("FontColourButton")
self.FontColorPanel.setObjectName(u'FontColorPanel') self.ColorLayout.addWidget(self.FontColourButton)
self.ColorLayout.addWidget(self.FontColorPanel)
# self.FontColorPanel = QtGui.QGraphicsView(self.ColorWidget)
# self.FontColorPanel.setMinimumSize(QtCore.QSize(24, 24))
# self.FontColorPanel.setMaximumSize(QtCore.QSize(24, 24))
# self.FontColorPanel.setObjectName(u'FontColorPanel')
# self.ColorLayout.addWidget(self.FontColorPanel)
self.ColorSpacerItem = QtGui.QSpacerItem(40, 20, self.ColorSpacerItem = QtGui.QSpacerItem(40, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.ColorLayout.addItem(self.ColorSpacerItem) self.ColorLayout.addItem(self.ColorSpacerItem)
self.BackgroundColorLabel = QtGui.QLabel(self.ColorWidget) self.BackgroundColorLabel = QtGui.QLabel(self.ColorWidget)
self.BackgroundColorLabel.setObjectName(u'BackgroundColorLabel') self.BackgroundColorLabel.setObjectName(u'BackgroundColorLabel')
self.ColorLayout.addWidget(self.BackgroundColorLabel) self.ColorLayout.addWidget(self.BackgroundColorLabel)
self.BackgroundColorPanel = QtGui.QGraphicsView(self.ColorWidget)
self.BackgroundColorPanel.setMinimumSize(QtCore.QSize(24, 24)) self.BackgroundColourButton = QtGui.QPushButton(self.ColorWidget)
self.BackgroundColorPanel.setMaximumSize(QtCore.QSize(24, 24)) self.BackgroundColourButton.setObjectName("BackgroundColourButton")
self.BackgroundColorPanel.setObjectName(u'BackgroundColorPanel') self.ColorLayout.addWidget(self.BackgroundColourButton)
self.ColorLayout.addWidget(self.BackgroundColorPanel)
# self.BackgroundColorPanel = QtGui.QGraphicsView(self.ColorWidget)
# self.BackgroundColorPanel.setMinimumSize(QtCore.QSize(24, 24))
# self.BackgroundColorPanel.setMaximumSize(QtCore.QSize(24, 24))
# self.BackgroundColorPanel.setObjectName(u'BackgroundColorPanel')
# self.ColorLayout.addWidget(self.BackgroundColorPanel)
self.FontLayout.addWidget(self.ColorWidget) self.FontLayout.addWidget(self.ColorWidget)
self.LengthWidget = QtGui.QWidget(self.FontGroupBox) self.LengthWidget = QtGui.QWidget(self.FontGroupBox)
self.LengthWidget.setObjectName(u'LengthWidget') self.LengthWidget.setObjectName(u'LengthWidget')
@ -131,7 +146,8 @@ class AlertsTab(SettingsTab):
self.SlideRightLayout.addItem(self.SlideRightSpacer) self.SlideRightLayout.addItem(self.SlideRightSpacer)
self.AlertsLayout.addWidget(self.AlertRightColumn) self.AlertsLayout.addWidget(self.AlertRightColumn)
QtCore.QObject.connect(self.BackgroundColorPanel, QtCore.SIGNAL("pressed()"), self.onBackgroundColorPanelclicked) QtCore.QObject.connect(self.BackgroundColourButton, QtCore.SIGNAL("pressed()"), self.onBackgroundColourButtonclicked)
QtCore.QObject.connect(self.FontColourButton, QtCore.SIGNAL("pressed()"), self.onFontColourButtonclicked)
def retranslateUi(self): def retranslateUi(self):
self.FontGroupBox.setTitle(translate(u'AlertsTab', u'Font')) self.FontGroupBox.setTitle(translate(u'AlertsTab', u'Font'))
@ -142,5 +158,18 @@ class AlertsTab(SettingsTab):
self.LengthSpinBox.setSuffix(translate(u'AlertsTab', u's')) self.LengthSpinBox.setSuffix(translate(u'AlertsTab', u's'))
self.PreviewGroupBox.setTitle(translate(u'AlertsTab', u'Preview')) self.PreviewGroupBox.setTitle(translate(u'AlertsTab', u'Preview'))
def onBackgroundColorPanelclicked(self): def onBackgroundColourButtonclicked(self):
print "pressed background" print "pressed background"
def onFontColourButtonclicked(self):
print "pressed font"
old_name = 0
colour = QtGui.QColorDialog.getColor(QColor(old_name), self).name()
print colour
self.FontColourButton.setStyleSheet('background-color: %s' % colour)
def load(self):
pass
def save(self):
pass

38
openlp/plugins/bibles/lib/biblestab.py
View File

@ -30,6 +30,7 @@ class BiblesTab(SettingsTab):
""" """
def __init__(self): def __init__(self):
SettingsTab.__init__(self, u'Bibles') SettingsTab.__init__(self, u'Bibles')
self.load()
def setupUi(self): def setupUi(self):
self.setObjectName(u'BiblesTab') self.setObjectName(u'BiblesTab')
@ -128,28 +129,25 @@ class BiblesTab(SettingsTab):
self.BibleSearchCheckBox.setText(translate("SettingsForm", "Search-as-you-type")) self.BibleSearchCheckBox.setText(translate("SettingsForm", "Search-as-you-type"))
def load(self): def load(self):
bible_output_style = self.config.get_config("bible_output_style", "Paragraph") bible_output_style = self.config.get_config("output style", "P")
if bible_output_style == "Paragraph": if bible_output_style == "P":
self.ParagraphRadioButton.setChecked() self.ParagraphRadioButton.setChecked(True)
self.paragraph_format = True
else: else:
self.VerseRadioButton.setChecked() self.VerseRadioButton.setChecked(True)
# self.SettingsOutputStyleComboBox.setCurrentIndex(int(self.config.get_config("bible_output_style", 0))) self.paragraph_format = False
# self.SettingsVerseStyleComboBox.setCurrentIndex(int(self.config.get_config("bible_verse_style", 0))) display_new_chapters = self.config.get_config("display new chapters", "0")
# try: #self.NewChaptersCheckBox.setState(display_new_chapters)
# self.SettingsNewChapterCheck.setCheckState(int(self.config.get_config("bible_new_chapter", 0))) if display_new_chapters == 0:
#except: self.display_new_chapters = True
# pass
def save(self): def save(self):
print "VRB =- ", self.VerseRadioButton.isChecked()
print "PRB =- ", self.ParagraphRadioButton.isChecked()
if self.ParagraphRadioButton.isChecked(): if self.ParagraphRadioButton.isChecked():
self.config.set_config("bible_output_style", "Paragraph") self.config.set_config("output style", "P")
else: else:
self.config.set_config("bible_output_style", "Verse") self.config.set_config("output style", "V")
print "NCCB =- ", self.NewChaptersCheckBox.checkState() self.config.set_config("display new chapter", str(self.NewChaptersCheckBox.checkState()))
print "DSCB =- ", self.DisplayStyleComboBox.currentIndex() self.config.set_config("display brackets", str(self.DisplayStyleComboBox.currentIndex()))
print "BSCB =- ",self.BibleSearchCheckBox.checkState() self.config.set_config("search as type", str(self.BibleSearchCheckBox.checkState()))
#self.config.set_config("bible_output_style", str(self.SettingsOutputStyleComboBox.currentIndex()))
#self.config.set_config("bible_verse_style", str(self.SettingsVerseStyleComboBox.currentIndex()))
#self.config.set_config("bible_new_chapter", str(self.SettingsNewChapterCheck.checkState()))

417
resources/forms/settings.ui
View File

@ -1,7 +1,8 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SettingsDialog</class> <class>SettingsDialog</class>
<widget class="QDialog" name="SettingsDialog" > <widget class="QDialog" name="SettingsDialog">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -9,67 +10,67 @@
<height>502</height> <height>502</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
<property name="windowIcon" > <property name="windowIcon">
<iconset resource="../images/openlp-2.qrc" > <iconset resource="../images/openlp-2.qrc">
<normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset> <normaloff>:/icon/openlp.org-icon-32.bmp</normaloff>:/icon/openlp.org-icon-32.bmp</iconset>
</property> </property>
<layout class="QVBoxLayout" name="SettingsLayout" > <layout class="QVBoxLayout" name="SettingsLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QTabWidget" name="SettingsTabWidget" > <widget class="QTabWidget" name="SettingsTabWidget">
<property name="currentIndex" > <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="GeneralTab" > <widget class="QWidget" name="GeneralTab">
<attribute name="title" > <attribute name="title">
<string>General</string> <string>General</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="GeneralLayout" > <layout class="QHBoxLayout" name="GeneralLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QWidget" native="1" name="GeneralLeftWidget" > <widget class="QWidget" name="GeneralLeftWidget" native="true">
<layout class="QVBoxLayout" name="verticalLayout" > <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QGroupBox" name="MonitorGroupBox" > <widget class="QGroupBox" name="MonitorGroupBox">
<property name="title" > <property name="title">
<string>Monitors</string> <string>Monitors</string>
</property> </property>
<layout class="QVBoxLayout" name="MonitorLayout" > <layout class="QVBoxLayout" name="MonitorLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="MonitorLabel" > <widget class="QLabel" name="MonitorLabel">
<property name="text" > <property name="text">
<string>Select monitor for output display:</string> <string>Select monitor for output display:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="MonitorComboBox" > <widget class="QComboBox" name="MonitorComboBox">
<item> <item>
<property name="text" > <property name="text">
<string>Monitor 1 on X11 Windowing System</string> <string>Monitor 1 on X11 Windowing System</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Monitor 2 on X11 Windowing System</string> <string>Monitor 2 on X11 Windowing System</string>
</property> </property>
</item> </item>
@ -79,20 +80,20 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="BlankScreenGroupBox" > <widget class="QGroupBox" name="BlankScreenGroupBox">
<property name="title" > <property name="title">
<string>Blank Screen</string> <string>Blank Screen</string>
</property> </property>
<layout class="QVBoxLayout" name="BlankScreenLayout" > <layout class="QVBoxLayout" name="BlankScreenLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QCheckBox" name="WarningCheckBox" > <widget class="QCheckBox" name="WarningCheckBox">
<property name="text" > <property name="text">
<string>Show warning on startup</string> <string>Show warning on startup</string>
</property> </property>
</widget> </widget>
@ -101,14 +102,14 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="AutoOpenGroupBox" > <widget class="QGroupBox" name="AutoOpenGroupBox">
<property name="title" > <property name="title">
<string>Auto Open Last Service</string> <string>Auto Open Last Service</string>
</property> </property>
<layout class="QVBoxLayout" name="AutoOpenLayout" > <layout class="QVBoxLayout" name="AutoOpenLayout">
<item> <item>
<widget class="QCheckBox" name="AutoOpenCheckBox" > <widget class="QCheckBox" name="AutoOpenCheckBox">
<property name="text" > <property name="text">
<string>Automatically open the last service at startup</string> <string>Automatically open the last service at startup</string>
</property> </property>
</widget> </widget>
@ -117,11 +118,11 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="GeneralLeftSpacer" > <spacer name="GeneralLeftSpacer">
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -133,56 +134,56 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QWidget" native="1" name="GeneralRightWidget" > <widget class="QWidget" name="GeneralRightWidget" native="true">
<layout class="QVBoxLayout" name="GeneralRightLayout" > <layout class="QVBoxLayout" name="GeneralRightLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="CCLIGroupBox" > <widget class="QGroupBox" name="CCLIGroupBox">
<property name="title" > <property name="title">
<string>CCLI Details</string> <string>CCLI Details</string>
</property> </property>
<layout class="QGridLayout" name="CCLILayout" > <layout class="QGridLayout" name="CCLILayout">
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="NumberLabel" > <widget class="QLabel" name="NumberLabel">
<property name="text" > <property name="text">
<string>CCLI Number:</string> <string>CCLI Number:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QLineEdit" name="NumberEdit" /> <widget class="QLineEdit" name="NumberEdit"/>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QLabel" name="UsernameLabel" > <widget class="QLabel" name="UsernameLabel">
<property name="text" > <property name="text">
<string>SongSelect Username:</string> <string>SongSelect Username:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QLineEdit" name="UsernameEdit" /> <widget class="QLineEdit" name="UsernameEdit"/>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QLabel" name="PasswordLabel" > <widget class="QLabel" name="PasswordLabel">
<property name="text" > <property name="text">
<string>SongSelect Password:</string> <string>SongSelect Password:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="1">
<widget class="QLineEdit" name="PasswordEdit" > <widget class="QLineEdit" name="PasswordEdit">
<property name="echoMode" > <property name="echoMode">
<enum>QLineEdit::Password</enum> <enum>QLineEdit::Password</enum>
</property> </property>
</widget> </widget>
@ -191,11 +192,11 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="GeneralRightSpacer" > <spacer name="GeneralRightSpacer">
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -208,125 +209,125 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="ThemesTab" > <widget class="QWidget" name="ThemesTab">
<attribute name="title" > <attribute name="title">
<string>Themes</string> <string>Themes</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="ThemesTabLayout" > <layout class="QHBoxLayout" name="ThemesTabLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="GlobalGroupBox" > <widget class="QGroupBox" name="GlobalGroupBox">
<property name="title" > <property name="title">
<string>Global theme</string> <string>Global theme</string>
</property> </property>
<layout class="QVBoxLayout" name="GlobalGroupBoxLayout" > <layout class="QVBoxLayout" name="GlobalGroupBoxLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QComboBox" name="DefaultComboBox" > <widget class="QComboBox" name="DefaultComboBox">
<item> <item>
<property name="text" > <property name="text">
<string>African Sunset</string> <string>African Sunset</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Snowy Mountains</string> <string>Snowy Mountains</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Wilderness</string> <string>Wilderness</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QListView" name="DefaultListView" /> <widget class="QListView" name="DefaultListView"/>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="LevelGroupBox" > <widget class="QGroupBox" name="LevelGroupBox">
<property name="title" > <property name="title">
<string>Theme level</string> <string>Theme level</string>
</property> </property>
<layout class="QFormLayout" name="formLayout" > <layout class="QFormLayout" name="formLayout">
<property name="labelAlignment" > <property name="labelAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="formAlignment" > <property name="formAlignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="horizontalSpacing" > <property name="horizontalSpacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="verticalSpacing" > <property name="verticalSpacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QRadioButton" name="SongLevelRadioButton" > <widget class="QRadioButton" name="SongLevelRadioButton">
<property name="text" > <property name="text">
<string>Song level</string> <string>Song level</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QLabel" name="SongLevelLabel" > <widget class="QLabel" name="SongLevelLabel">
<property name="text" > <property name="text">
<string>Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme.</string> <string>Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme.</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QRadioButton" name="ServiceLevelRadioButton" > <widget class="QRadioButton" name="ServiceLevelRadioButton">
<property name="text" > <property name="text">
<string>Service level</string> <string>Service level</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QLabel" name="ServiceLevelLabel" > <widget class="QLabel" name="ServiceLevelLabel">
<property name="text" > <property name="text">
<string>Use the theme from the service , overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme.</string> <string>Use the theme from the service , overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme.</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QRadioButton" name="GlobalLevelRadioButton" > <widget class="QRadioButton" name="GlobalLevelRadioButton">
<property name="text" > <property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Global level</string> <string>Global level</string>
</property> </property>
<property name="checked" >
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="1">
<widget class="QLabel" name="GlobalLevelLabel" > <widget class="QLabel" name="GlobalLevelLabel">
<property name="text" > <property name="text">
<string>Use the global theme, overriding any themes associated wither either the service or the songs.</string> <string>Use the global theme, overriding any themes associated wither either the service or the songs.</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
@ -336,86 +337,71 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="AlertsTab" > <widget class="QWidget" name="AlertsTab">
<attribute name="title" > <attribute name="title">
<string>Alerts</string> <string>Alerts</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="AlertsLayout" > <layout class="QHBoxLayout" name="AlertsLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QWidget" native="1" name="AlertLeftColumn" > <widget class="QWidget" name="AlertLeftColumn" native="true">
<layout class="QVBoxLayout" name="SlideLeftLayout" > <layout class="QVBoxLayout" name="SlideLeftLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="FontGroupBox" > <widget class="QGroupBox" name="FontGroupBox">
<property name="title" > <property name="title">
<string>Font</string> <string>Font</string>
</property> </property>
<layout class="QVBoxLayout" name="FontLayout" > <layout class="QVBoxLayout" name="FontLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="FontLabel" > <widget class="QLabel" name="FontLabel">
<property name="text" > <property name="text">
<string>Font Name:</string> <string>Font Name:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QFontComboBox" name="FontComboBox" /> <widget class="QFontComboBox" name="FontComboBox"/>
</item> </item>
<item> <item>
<widget class="QWidget" native="1" name="ColorWidget" > <widget class="QWidget" name="ColorWidget" native="true">
<layout class="QHBoxLayout" name="ColorLayout" > <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing" >
<number>8</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="FontColorLabel" > <widget class="QLabel" name="FontColorLabel">
<property name="text" > <property name="text">
<string>Font Color:</string> <string>Font Color:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGraphicsView" name="FontColorPanel" > <widget class="QPushButton" name="FontColourButton">
<property name="minimumSize" > <property name="text">
<size> <string/>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="ColorSpacer" > <spacer name="ColorSpacer">
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -424,25 +410,16 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="BackgroundColorLabel" > <widget class="QLabel" name="BackgroundColorLabel">
<property name="text" > <property name="text">
<string>Background Color:</string> <string>Background Color:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGraphicsView" name="BackgroundColorPanel" > <widget class="QPushButton" name="BackgroundColourButton">
<property name="minimumSize" > <property name="text">
<size> <string/>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
@ -450,40 +427,40 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QWidget" native="1" name="LengthWidget" > <widget class="QWidget" name="LengthWidget" native="true">
<layout class="QHBoxLayout" name="LengthLayout" > <layout class="QHBoxLayout" name="LengthLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="LengthLabel" > <widget class="QLabel" name="LengthLabel">
<property name="text" > <property name="text">
<string>Display length:</string> <string>Display length:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QSpinBox" name="LengthSpinBox" > <widget class="QSpinBox" name="LengthSpinBox">
<property name="suffix" > <property name="value">
<number>5</number>
</property>
<property name="suffix">
<string>s</string> <string>s</string>
</property> </property>
<property name="maximum" > <property name="maximum">
<number>180</number> <number>180</number>
</property> </property>
<property name="value" >
<number>5</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="LengthSpacer" > <spacer name="LengthSpacer">
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>147</width> <width>147</width>
<height>20</height> <height>20</height>
@ -498,11 +475,11 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="SlideLeftSpacer" > <spacer name="SlideLeftSpacer">
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>94</height> <height>94</height>
@ -514,35 +491,35 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QWidget" native="1" name="SlideRightColumn" > <widget class="QWidget" name="SlideRightColumn" native="true">
<layout class="QVBoxLayout" name="SlideRightLayout" > <layout class="QVBoxLayout" name="SlideRightLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="PreviewGroupBox" > <widget class="QGroupBox" name="PreviewGroupBox">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Minimum" hsizetype="Minimum" > <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title" > <property name="title">
<string>Preview</string> <string>Preview</string>
</property> </property>
<layout class="QVBoxLayout" name="PreviewLayout" > <layout class="QVBoxLayout" name="PreviewLayout">
<property name="spacing" > <property name="spacing">
<number>8</number> <number>8</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QGraphicsView" name="FontPreview" > <widget class="QGraphicsView" name="FontPreview">
<property name="maximumSize" > <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>64</height> <height>64</height>
@ -554,11 +531,11 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="SlideRightSpacer" > <spacer name="SlideRightSpacer">
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -574,23 +551,23 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QDialogButtonBox" name="ButtonsBox" > <widget class="QDialogButtonBox" name="ButtonsBox">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Minimum" hsizetype="Expanding" > <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize" > <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="standardButtons" > <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property> </property>
</widget> </widget>
@ -598,7 +575,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../images/openlp-2.qrc" /> <include location="../images/openlp-2.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
@ -607,11 +584,11 @@
<receiver>SettingsDialog</receiver> <receiver>SettingsDialog</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>248</x> <x>248</x>
<y>254</y> <y>254</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>157</x> <x>157</x>
<y>274</y> <y>274</y>
</hint> </hint>
@ -623,11 +600,11 @@
<receiver>SettingsDialog</receiver> <receiver>SettingsDialog</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>316</x> <x>316</x>
<y>260</y> <y>260</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>286</x> <x>286</x>
<y>274</y> <y>274</y>
</hint> </hint>