Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/48960
Fix EasiSlide method calls
Dedupe, fix and cleanups in wizards and alerts.
--
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/48960
Your team OpenLP Core is requested to review the proposed merge of
lp:~meths/openlp/trivialfixes into lp:openlp.
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2011-02-05 01:24:19 +0000
+++ openlp/core/lib/ui.py 2011-02-08 18:36:28 +0000
@@ -219,3 +219,25 @@
completer = QtGui.QCompleter(cache)
completer.setCaseSensitivity(QtCore.Qt.CaseInsensitive)
widget.setCompleter(completer)
+
+def create_valign_combo(parent, layout):
+ """
+ Creates a standard label and combo box for asking users to select a
+ vertical alignment.
+
+ ``parent``
+ The parent object. This should be a ``QWidget`` descendant.
+
+ ``layout``
+ A layout object to add the label and combo widgets to.
+ """
+ verticalLabel = QtGui.QLabel(parent)
+ verticalLabel.setObjectName(u'VerticalLabel')
+ verticalLabel.setText(translate('OpenLP.Ui', '&Vertical Align:'))
+ verticalComboBox = QtGui.QComboBox(parent)
+ verticalComboBox.setObjectName(u'VerticalComboBox')
+ verticalComboBox.addItem(translate('OpenLP.Ui', 'Top'))
+ verticalComboBox.addItem(translate('OpenLP.Ui', 'Middle'))
+ verticalComboBox.addItem(translate('OpenLP.Ui', 'Bottom'))
+ verticalLabel.setBuddy(verticalComboBox)
+ layout.addRow(verticalLabel, verticalComboBox)
=== modified file 'openlp/core/ui/themewizard.py'
--- openlp/core/ui/themewizard.py 2011-02-03 21:32:32 +0000
+++ openlp/core/ui/themewizard.py 2011-02-08 18:36:28 +0000
@@ -27,7 +27,7 @@
from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate, build_icon
-from openlp.core.lib.ui import add_welcome_page
+from openlp.core.lib.ui import add_welcome_page, create_valign_combo
class Ui_ThemeWizard(object):
def setupUi(self, themeWizard):
@@ -242,12 +242,7 @@
self.horizontalComboBox.setObjectName(u'HorizontalComboBox')
self.alignmentLayout.addRow(self.horizontalLabel,
self.horizontalComboBox)
- self.verticalLabel = QtGui.QLabel(self.alignmentPage)
- self.verticalLabel.setObjectName(u'VerticalLabel')
- self.verticalComboBox = QtGui.QComboBox(self.alignmentPage)
- self.verticalComboBox.addItems([u'', u'', u''])
- self.verticalComboBox.setObjectName(u'VerticalComboBox')
- self.alignmentLayout.addRow(self.verticalLabel, self.verticalComboBox)
+ create_valign_combo(self.alignmentPage, self.alignmentLayout)
self.transitionsLabel = QtGui.QLabel(self.alignmentPage)
self.transitionsLabel.setObjectName(u'TransitionsLabel')
self.transitionsCheckBox = QtGui.QCheckBox(self.alignmentPage)
@@ -450,8 +445,7 @@
self.mainAreaPage.setSubTitle(
translate('OpenLP.ThemeWizard', 'Define the font and display '
'characteristics for the Display text'))
- self.mainFontLabel.setText(
- translate('OpenLP.ThemeWizard', 'Font:'))
+ self.mainFontLabel.setText(translate('OpenLP.ThemeWizard', 'Font:'))
self.mainColorLabel.setText(translate('OpenLP.ThemeWizard', 'Color:'))
self.mainSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
self.mainSizeSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt'))
@@ -465,8 +459,7 @@
self.shadowCheckBox.setText(translate('OpenLP.ThemeWizard', '&Shadow:'))
self.shadowSizeLabel.setText(translate('OpenLP.ThemeWizard', 'Size:'))
self.shadowSizeSpinBox.setSuffix(translate('OpenLP.ThemeWizard', 'pt'))
- self.mainBoldCheckBox.setText(
- translate('OpenLP.ThemeWizard', 'Bold'))
+ self.mainBoldCheckBox.setText(translate('OpenLP.ThemeWizard', 'Bold'))
self.mainItalicsCheckBox.setText(
translate('OpenLP.ThemeWizard', 'Italic'))
self.footerAreaPage.setTitle(
@@ -491,14 +484,6 @@
translate('OpenLP.ThemeWizard', 'Right'))
self.horizontalComboBox.setItemText(2,
translate('OpenLP.ThemeWizard', 'Center'))
- self.verticalLabel.setText(
- translate('OpenLP.ThemeWizard', 'Vertical Align:'))
- self.verticalComboBox.setItemText(0,
- translate('OpenLP.ThemeWizard', 'Top'))
- self.verticalComboBox.setItemText(1,
- translate('OpenLP.ThemeWizard', 'Middle'))
- self.verticalComboBox.setItemText(2,
- translate('OpenLP.ThemeWizard', 'Bottom'))
self.transitionsLabel.setText(
translate('OpenLP.ThemeWizard', 'Transitions:'))
self.areaPositionPage.setTitle(
=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
--- openlp/plugins/alerts/lib/alertstab.py 2011-01-03 11:25:30 +0000
+++ openlp/plugins/alerts/lib/alertstab.py 2011-02-08 18:36:28 +0000
@@ -27,6 +27,7 @@
from PyQt4 import QtCore, QtGui
from openlp.core.lib import SettingsTab, translate
+from openlp.core.lib.ui import create_valign_combo
class AlertsTab(SettingsTab):
"""
@@ -40,48 +41,43 @@
def setupUi(self):
self.setObjectName(u'AlertsTab')
SettingsTab.setupUi(self)
- self.FontGroupBox = QtGui.QGroupBox(self.leftColumn)
- self.FontGroupBox.setObjectName(u'FontGroupBox')
- self.FontLayout = QtGui.QFormLayout(self.FontGroupBox)
- self.FontLayout.setObjectName(u'FontLayout')
- self.FontLabel = QtGui.QLabel(self.FontGroupBox)
+ self.fontGroupBox = QtGui.QGroupBox(self.leftColumn)
+ self.fontGroupBox.setObjectName(u'fontGroupBox')
+ self.fontLayout = QtGui.QFormLayout(self.fontGroupBox)
+ self.fontLayout.setObjectName(u'fontLayout')
+ self.FontLabel = QtGui.QLabel(self.fontGroupBox)
self.FontLabel.setObjectName(u'FontLabel')
- self.FontComboBox = QtGui.QFontComboBox(self.FontGroupBox)
+ self.FontComboBox = QtGui.QFontComboBox(self.fontGroupBox)
self.FontComboBox.setObjectName(u'FontComboBox')
- self.FontLayout.addRow(self.FontLabel, self.FontComboBox)
- self.FontColorLabel = QtGui.QLabel(self.FontGroupBox)
+ self.fontLayout.addRow(self.FontLabel, self.FontComboBox)
+ self.FontColorLabel = QtGui.QLabel(self.fontGroupBox)
self.FontColorLabel.setObjectName(u'FontColorLabel')
self.ColorLayout = QtGui.QHBoxLayout()
self.ColorLayout.setObjectName(u'ColorLayout')
- self.FontColorButton = QtGui.QPushButton(self.FontGroupBox)
+ self.FontColorButton = QtGui.QPushButton(self.fontGroupBox)
self.FontColorButton.setObjectName(u'FontColorButton')
self.ColorLayout.addWidget(self.FontColorButton)
self.ColorLayout.addSpacing(20)
- self.BackgroundColorLabel = QtGui.QLabel(self.FontGroupBox)
+ self.BackgroundColorLabel = QtGui.QLabel(self.fontGroupBox)
self.BackgroundColorLabel.setObjectName(u'BackgroundColorLabel')
self.ColorLayout.addWidget(self.BackgroundColorLabel)
- self.BackgroundColorButton = QtGui.QPushButton(self.FontGroupBox)
+ self.BackgroundColorButton = QtGui.QPushButton(self.fontGroupBox)
self.BackgroundColorButton.setObjectName(u'BackgroundColorButton')
self.ColorLayout.addWidget(self.BackgroundColorButton)
- self.FontLayout.addRow(self.FontColorLabel, self.ColorLayout)
- self.FontSizeLabel = QtGui.QLabel(self.FontGroupBox)
+ self.fontLayout.addRow(self.FontColorLabel, self.ColorLayout)
+ self.FontSizeLabel = QtGui.QLabel(self.fontGroupBox)
self.FontSizeLabel.setObjectName(u'FontSizeLabel')
- self.FontSizeSpinBox = QtGui.QSpinBox(self.FontGroupBox)
+ self.FontSizeSpinBox = QtGui.QSpinBox(self.fontGroupBox)
self.FontSizeSpinBox.setObjectName(u'FontSizeSpinBox')
- self.FontLayout.addRow(self.FontSizeLabel, self.FontSizeSpinBox)
- self.TimeoutLabel = QtGui.QLabel(self.FontGroupBox)
+ self.fontLayout.addRow(self.FontSizeLabel, self.FontSizeSpinBox)
+ self.TimeoutLabel = QtGui.QLabel(self.fontGroupBox)
self.TimeoutLabel.setObjectName(u'TimeoutLabel')
- self.TimeoutSpinBox = QtGui.QSpinBox(self.FontGroupBox)
+ self.TimeoutSpinBox = QtGui.QSpinBox(self.fontGroupBox)
self.TimeoutSpinBox.setMaximum(180)
self.TimeoutSpinBox.setObjectName(u'TimeoutSpinBox')
- self.FontLayout.addRow(self.TimeoutLabel, self.TimeoutSpinBox)
- self.LocationLabel = QtGui.QLabel(self.FontGroupBox)
- self.LocationLabel.setObjectName(u'LocationLabel')
- self.LocationComboBox = QtGui.QComboBox(self.FontGroupBox)
- self.LocationComboBox.addItems([u'', u'', u''])
- self.LocationComboBox.setObjectName(u'LocationComboBox')
- self.FontLayout.addRow(self.LocationLabel, self.LocationComboBox)
- self.leftLayout.addWidget(self.FontGroupBox)
+ self.fontLayout.addRow(self.TimeoutLabel, self.TimeoutSpinBox)
+ create_valign_combo(self.fontGroupBox, self.fontLayout)
+ self.leftLayout.addWidget(self.fontGroupBox)
self.leftLayout.addStretch()
self.PreviewGroupBox = QtGui.QGroupBox(self.rightColumn)
self.PreviewGroupBox.setObjectName(u'PreviewGroupBox')
@@ -99,15 +95,13 @@
QtCore.SIGNAL(u'pressed()'), self.onFontColorButtonClicked)
QtCore.QObject.connect(self.FontComboBox,
QtCore.SIGNAL(u'activated(int)'), self.onFontComboBoxClicked)
- QtCore.QObject.connect(self.LocationComboBox,
- QtCore.SIGNAL(u'activated(int)'), self.onLocationComboBoxClicked)
QtCore.QObject.connect(self.TimeoutSpinBox,
QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
QtCore.QObject.connect(self.FontSizeSpinBox,
QtCore.SIGNAL(u'valueChanged(int)'), self.onFontSizeSpinBoxChanged)
def retranslateUi(self):
- self.FontGroupBox.setTitle(
+ self.fontGroupBox.setTitle(
translate('AlertsPlugin.AlertsTab', 'Font'))
self.FontLabel.setText(
translate('AlertsPlugin.AlertsTab', 'Font name:'))
@@ -123,18 +117,10 @@
translate('AlertsPlugin.AlertsTab', 'Alert timeout:'))
self.TimeoutSpinBox.setSuffix(
translate('AlertsPlugin.AlertsTab', 's'))
- self.LocationLabel.setText(
- translate('AlertsPlugin.AlertsTab', 'Location:'))
self.PreviewGroupBox.setTitle(
translate('AlertsPlugin.AlertsTab', 'Preview'))
self.FontPreview.setText(
translate('AlertsPlugin.AlertsTab', 'OpenLP 2.0'))
- self.LocationComboBox.setItemText(0,
- translate('AlertsPlugin.AlertsTab', 'Top'))
- self.LocationComboBox.setItemText(1,
- translate('AlertsPlugin.AlertsTab', 'Middle'))
- self.LocationComboBox.setItemText(2,
- translate('AlertsPlugin.AlertsTab', 'Bottom'))
def onBackgroundColorButtonClicked(self):
new_color = QtGui.QColorDialog.getColor(
@@ -148,9 +134,6 @@
def onFontComboBoxClicked(self):
self.updateDisplay()
- def onLocationComboBoxClicked(self, location):
- self.location = location
-
def onFontColorButtonClicked(self):
new_color = QtGui.QColorDialog.getColor(
QtGui.QColor(self.font_color), self)
@@ -197,14 +180,14 @@
def save(self):
settings = QtCore.QSettings()
settings.beginGroup(self.settingsSection)
- self.font_face = self.FontComboBox.currentFont().family()
settings.setValue(u'background color', QtCore.QVariant(self.bg_color))
settings.setValue(u'font color', QtCore.QVariant(self.font_color))
settings.setValue(u'font size', QtCore.QVariant(self.font_size))
+ self.font_face = self.FontComboBox.currentFont().family()
settings.setValue(u'font face', QtCore.QVariant(self.font_face))
settings.setValue(u'timeout', QtCore.QVariant(self.timeout))
- settings.setValue(u'location',
- QtCore.QVariant(self.LocationComboBox.currentIndex()))
+ self.location = self.LocationComboBox.currentIndex()
+ settings.setValue(u'location', QtCore.QVariant(self.location))
settings.endGroup()
def updateDisplay(self):
=== modified file 'openlp/plugins/songs/lib/easislidesimport.py'
--- openlp/plugins/songs/lib/easislidesimport.py 2011-02-01 18:05:59 +0000
+++ openlp/plugins/songs/lib/easislidesimport.py 2011-02-08 18:36:28 +0000
@@ -81,14 +81,14 @@
def _parse_song(self, song):
self._success = True
- self._add_title(self.title, song.Title1, True)
- self._add_alttitle(self.alternate_title, song.Title2)
- self._add_number(self.song_number, song.SongNumber)
+ self._add_unicode_attribute(self.title, song.Title1, True)
+ self._add_unicode_attribute(self.alternate_title, song.Title2)
+ self._add_unicode_attribute(self.song_number, song.SongNumber)
if self.song_number == u'0':
self.song_number = u''
self._add_authors(song)
self._add_copyright(song)
- self._add_book(self.song_book_name, song.BookReference)
+ self._add_unicode_attribute(self.song_book_name, song.BookReference)
self._parse_and_add_lyrics(song)
return self._success
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
