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

Initial go at i18n

This commit is contained in:
Raoul Snyman 2009-10-23 15:17:43 +02:00
parent 53ba5ed0c1
commit 8d4cdc71ba
32 changed files with 2862 additions and 718 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2175
i18n/openlp_en.ts Normal file
View File

File diff suppressed because it is too large Load Diff

4
openlp/core/lib/settingstab.py
View File

@ -44,7 +44,9 @@ class SettingsTab(QtGui.QWidget):
to write to when the ``save`` method is called. to write to when the ``save`` method is called.
""" """
QtGui.QWidget.__init__(self) QtGui.QWidget.__init__(self)
self.tabTitle = title self.tabTitle = self.trUtf8(title)
# Use the line below when pulling the translation template file.
#self.tabTitle = title
self.setupUi() self.setupUi()
self.retranslateUi() self.retranslateUi()
self.initialise() self.initialise()

20
openlp/core/test/test_mediamanageritem.py
View File

@ -31,31 +31,31 @@ class TestMediaManager:
self.main_window.resize(200, 600) self.main_window.resize(200, 600)
self.MediaManagerDock = QtGui.QDockWidget(self.main_window) self.MediaManagerDock = QtGui.QDockWidget(self.main_window)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
self.MediaManagerDock.sizePolicy().hasHeightForWidth()) self.MediaManagerDock.sizePolicy().hasHeightForWidth())
self.MediaManagerDock.setSizePolicy(sizePolicy) self.MediaManagerDock.setSizePolicy(sizePolicy)
icon = QtGui.QIcon() icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(u':/system/system_mediamanager.png'), icon.addPixmap(QtGui.QPixmap(u':/system/system_mediamanager.png'),
QtGui.QIcon.Normal, QtGui.QIcon.Off) QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.MediaManagerDock.setWindowIcon(icon) self.MediaManagerDock.setWindowIcon(icon)
self.MediaManagerDock.setFloating(False) self.MediaManagerDock.setFloating(False)
self.MediaManagerContents = QtGui.QWidget() self.MediaManagerContents = QtGui.QWidget()
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth( sizePolicy.setHeightForWidth(
self.MediaManagerContents.sizePolicy().hasHeightForWidth()) self.MediaManagerContents.sizePolicy().hasHeightForWidth())
self.MediaManagerContents.setSizePolicy(sizePolicy) self.MediaManagerContents.setSizePolicy(sizePolicy)
self.MediaManagerLayout = QtGui.QHBoxLayout(self.MediaManagerContents) self.MediaManagerLayout = QtGui.QHBoxLayout(self.MediaManagerContents)
self.MediaManagerLayout.setContentsMargins(0, 2, 0, 0) self.MediaManagerLayout.setContentsMargins(0, 2, 0, 0)
self.MediaToolBox = QtGui.QToolBox(self.MediaManagerContents) self.MediaToolBox = QtGui.QToolBox(self.MediaManagerContents)
self.MediaManagerDock.setWidget(self.MediaManagerContents) self.MediaManagerDock.setWidget(self.MediaManagerContents)
self.main_window.addDockWidget(QtCore.Qt.DockWidgetArea(1), self.main_window.addDockWidget(QtCore.Qt.DockWidgetArea(1),
self.MediaManagerDock) self.MediaManagerDock)
self.MediaManagerLayout.addWidget(self.MediaToolBox) self.MediaManagerLayout.addWidget(self.MediaToolBox)
def test1(self): def test1(self):
log=logging.getLogger(u'test1') log=logging.getLogger(u'test1')
@ -68,10 +68,10 @@ class TestMediaManager:
i1.addToolbarButton(u'Test1', u'Test1', None) i1.addToolbarButton(u'Test1', u'Test1', None)
i2.addToolbar() i2.addToolbar()
i2.addToolbarButton(u'Test2', u'Test2', None) i2.addToolbarButton(u'Test2', u'Test2', None)
self.MediaToolBox.setItemText(self.MediaToolBox.indexOf(i1), self.MediaToolBox.setItemText(
translate(u'main_window', u'Item1')) self.MediaToolBox.indexOf(i1), self.trUtf8(u'Item1'))
self.MediaToolBox.setItemText(self.MediaToolBox.indexOf(i2), self.MediaToolBox.setItemText(
translate(u'main_window', u'Item2')) self.MediaToolBox.indexOf(i2), self.trUtf8(u'Item2'))
log.info(u'Show window') log.info(u'Show window')
self.main_window.show() self.main_window.show()
log.info(u'End') log.info(u'End')

51
openlp/core/ui/about.py
View File

@ -94,6 +94,9 @@ class AboutForm(QtGui.QDialog):
self.License3Label.setWordWrap(True) self.License3Label.setWordWrap(True)
self.License3Label.setObjectName(u'License3Label') self.License3Label.setObjectName(u'License3Label')
self.LicenseTabLayout.addWidget(self.License3Label) self.LicenseTabLayout.addWidget(self.License3Label)
self.LicenseSpacer = QtGui.QSpacerItem(20, 40,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
self.LicenseTabLayout.addItem(self.LicenseSpacer)
self.AboutNotebook.addTab(self.LicenseTab, u'License') self.AboutNotebook.addTab(self.LicenseTab, u'License')
self.CreditsTab = QtGui.QWidget() self.CreditsTab = QtGui.QWidget()
self.CreditsTab.setObjectName(u'CreditsTab') self.CreditsTab.setObjectName(u'CreditsTab')
@ -138,21 +141,31 @@ class AboutForm(QtGui.QDialog):
""" """
Set up translation Set up translation
""" """
AboutForm.setWindowTitle(translate(u'AboutDialog', u'About openlp.org')) AboutForm.setWindowTitle(self.trUtf8(u'About openlp.org'))
self.CopyrightLabel.setText(translate(u'AboutDialog', self.CopyrightLabel.setText(
u'Copyright (c) 2004-2009 openlp.org Foundation')) self.trUtf8(u'Copyright \xa9 2004-2009 openlp.org Foundation'))
self.AboutAuthors.setText(translate(u'AboutDialog', self.AboutAuthors.setText(self.trUtf8(
u'openlp.org is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.')) u'openlp.org is written and maintained by volunteers. If you would '
self.License1Label.setText(translate(u'AboutDialog', u'like to see more free Christian software being written, please '
u'This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.')) u'consider contributing by using the button below.'))
self.License2Label.setText(translate(u'AboutDialog', self.License1Label.setText(self.trUtf8(
u'You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.')) u'This program is free software; you can redistribute it and/or '
self.License3Label.setText(translate(u'AboutDialog', u'modify it under the terms of the GNU General Public License as '
u'This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.')) u'published by the Free Software Foundation; either version 2 of '
u'the License, or (at your option) any later version.'))
self.License2Label.setText(self.trUtf8(
u'You should have received a copy of the GNU General Public '
u'License along with this program; if not, write to the Free '
u'Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, '
u'MA 02111-1307 USA.'))
self.License3Label.setText(self.trUtf8(
u'This program is distributed in the hope that it will be useful, '
u'but WITHOUT ANY WARRANTY; without even the implied warranty of '
u'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU '
u'General Public License for more details.'))
self.AboutNotebook.setTabText( self.AboutNotebook.setTabText(
self.AboutNotebook.indexOf(self.LicenseTab), self.AboutNotebook.indexOf(self.LicenseTab), self.trUtf8(u'License'))
translate(u'AboutDialog', u'License')) self.CreditsTextEdit.setPlainText(self.trUtf8(
self.CreditsTextEdit.setPlainText(translate(u'AboutDialog',
u'Project Lead\n' u'Project Lead\n'
u' Raoul \"superfly\" Snyman\n' u' Raoul \"superfly\" Snyman\n'
u'\n' u'\n'
@ -165,11 +178,10 @@ class AboutForm(QtGui.QDialog):
u' Jon \"Meths\" Tibble\n' u' Jon \"Meths\" Tibble\n'
u' Carsten \"catini\" Tingaard')) u' Carsten \"catini\" Tingaard'))
self.AboutNotebook.setTabText( self.AboutNotebook.setTabText(
self.AboutNotebook.indexOf(self.CreditsTab), self.AboutNotebook.indexOf(self.CreditsTab), self.trUtf8(u'Credits'))
translate(u'AboutDialog', u'Credits')) self.ContributeButton.setText(self.trUtf8(u'Contribute'))
self.ContributeButton.setText(translate(u'AboutDialog', u'Contribute')) self.CloseButton.setText(self.trUtf8(u'Close'))
self.CloseButton.setText(translate(u'AboutDialog', u'Close')) self.extContributeItem.setText(self.trUtf8(u'&Contribute'))
self.extContributeItem.setText(translate(u'AboutDialog', u'&Contribute'))
def onContributeButtonClicked(self): def onContributeButtonClicked(self):
""" """
@ -178,3 +190,4 @@ class AboutForm(QtGui.QDialog):
import webbrowser import webbrowser
url = "http://www.openlp.org/en/documentation/introduction/contributing.html" url = "http://www.openlp.org/en/documentation/introduction/contributing.html"
webbrowser.open_new(url) webbrowser.open_new(url)

8
openlp/core/ui/alertform.py
View File

@ -92,10 +92,10 @@ class AlertForm(QtGui.QDialog):
QtCore.QMetaObject.connectSlotsByName(AlertForm) QtCore.QMetaObject.connectSlotsByName(AlertForm)
def retranslateUi(self, AlertForm): def retranslateUi(self, AlertForm):
AlertForm.setWindowTitle(translate(u'AlertForm', u'Alert Message')) AlertForm.setWindowTitle(self.trUtf8(u'Alert Message'))
self.AlertEntryLabel.setText(translate(u'AlertForm', u'Alert Text:')) self.AlertEntryLabel.setText(self.trUtf8(u'Alert Text:'))
self.DisplayButton.setText(translate(u'AlertForm', u'Display')) self.DisplayButton.setText(self.trUtf8(u'Display'))
self.CancelButton.setText(translate(u'AlertForm', u'Cancel')) self.CancelButton.setText(self.trUtf8(u'Cancel'))
def onDisplayClicked(self): def onDisplayClicked(self):
self.parent.mainDisplay.displayAlert(self.AlertEntryEditItem.text()) self.parent.mainDisplay.displayAlert(self.AlertEntryEditItem.text())

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

@ -31,10 +31,11 @@ class AlertsTab(SettingsTab):
AlertsTab is the alerts settings tab in the settings dialog. AlertsTab is the alerts settings tab in the settings dialog.
""" """
def __init__(self): def __init__(self):
SettingsTab.__init__(self, u'Alerts', u'Alerts')
# Use the line below when pulling the translation template file.
#SettingsTab.__init__(self, self.trUtf8(u'Alerts'), u'Alerts')
self.font_color = '#ffffff' self.font_color = '#ffffff'
self.bg_color = '#660000' self.bg_color = '#660000'
SettingsTab.__init__(
self, translate(u'AlertsTab', u'Alerts'), u'Alerts')
def setupUi(self): def setupUi(self):
self.setObjectName(u'AlertsTab') self.setObjectName(u'AlertsTab')
@ -147,16 +148,14 @@ class AlertsTab(SettingsTab):
QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged) QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
def retranslateUi(self): def retranslateUi(self):
self.FontGroupBox.setTitle(translate(u'AlertsTab', u'Font')) self.FontGroupBox.setTitle(self.trUtf8(u'Font'))
self.FontLabel.setText(translate(u'AlertsTab', u'Font Name:')) self.FontLabel.setText(self.trUtf8(u'Font Name:'))
self.FontColorLabel.setText(translate(u'AlertsTab', u'Font Color:')) self.FontColorLabel.setText(self.trUtf8(u'Font Color:'))
self.BackgroundColorLabel.setText( self.BackgroundColorLabel.setText(self.trUtf8(u'Background Color:'))
translate(u'AlertsTab', u'Background Color:')) self.TimeoutLabel.setText(self.trUtf8(u'Alert timeout:'))
self.TimeoutLabel.setText(translate(u'AlertsTab', u'Alert timeout:')) self.TimeoutSpinBox.setSuffix(self.trUtf8(u's'))
self.TimeoutSpinBox.setSuffix(translate(u'AlertsTab', u's')) self.PreviewGroupBox.setTitle(self.trUtf8(u'Preview'))
self.PreviewGroupBox.setTitle(translate(u'AlertsTab', u'Preview')) self.FontPreview.setText(self.trUtf8(u'openlp.org 2.0 rocks!'))
self.FontPreview.setText(
translate(u'AlertsTab', u'openlp.org 2.0 rocks!'))
def onBackgroundColorButtonClicked(self): def onBackgroundColorButtonClicked(self):
self.bg_color = QtGui.QColorDialog.getColor( self.bg_color = QtGui.QColorDialog.getColor(

162
openlp/core/ui/amendthemedialog.py
View File

@ -562,79 +562,91 @@ class Ui_AmendThemeDialog(object):
AmendThemeDialog.setTabOrder(self.HorizontalComboBox, self.VerticalComboBox) AmendThemeDialog.setTabOrder(self.HorizontalComboBox, self.VerticalComboBox)
def retranslateUi(self, AmendThemeDialog): def retranslateUi(self, AmendThemeDialog):
AmendThemeDialog.setWindowTitle(translate(u'AmendThemeDialog', u'Theme Maintenance')) AmendThemeDialog.setWindowTitle(self.trUtf8(u'Theme Maintenance'))
self.ThemeNameLabel.setText(translate(u'AmendThemeDialog', u'Theme Name:')) self.ThemeNameLabel.setText(self.trUtf8(u'Theme Name:'))
self.BackgroundLabel.setText(translate(u'AmendThemeDialog', u'Background:')) self.BackgroundLabel.setText(self.trUtf8(u'Background:'))
self.BackgroundComboBox.setItemText(0, translate(u'AmendThemeDialog', u'Opaque')) self.BackgroundComboBox.setItemText(0, self.trUtf8(u'Opaque'))
self.BackgroundComboBox.setItemText(1, translate(u'AmendThemeDialog', u'Transparent')) self.BackgroundComboBox.setItemText(1, self.trUtf8(u'Transparent'))
self.BackgroundTypeLabel.setText(translate(u'AmendThemeDialog', u'Background Type:')) self.BackgroundTypeLabel.setText(self.trUtf8(u'Background Type:'))
self.BackgroundTypeComboBox.setItemText(0, translate(u'AmendThemeDialog', u'Solid Color')) self.BackgroundTypeComboBox.setItemText(0, self.trUtf8(u'Solid Color'))
self.BackgroundTypeComboBox.setItemText(1, translate(u'AmendThemeDialog', u'Gradient')) self.BackgroundTypeComboBox.setItemText(1, self.trUtf8(u'Gradient'))
self.BackgroundTypeComboBox.setItemText(2, translate(u'AmendThemeDialog', u'Image')) self.BackgroundTypeComboBox.setItemText(2, self.trUtf8(u'Image'))
self.Color1Label.setText(translate(u'AmendThemeDialog', u'<Color1>')) self.Color1Label.setText(self.trUtf8(u'<Color1>'))
self.Color2Label.setText(translate(u'AmendThemeDialog', u'<Color2>')) self.Color2Label.setText(self.trUtf8(u'<Color2>'))
self.ImageLabel.setText(translate(u'AmendThemeDialog', u'Image:')) self.ImageLabel.setText(self.trUtf8(u'Image:'))
self.GradientLabel.setText(translate(u'AmendThemeDialog', u'Gradient :')) self.GradientLabel.setText(self.trUtf8(u'Gradient :'))
self.GradientComboBox.setItemText(0, translate(u'AmendThemeDialog', u'Horizontal')) self.GradientComboBox.setItemText(0, self.trUtf8(u'Horizontal'))
self.GradientComboBox.setItemText(1, translate(u'AmendThemeDialog', u'Vertical')) self.GradientComboBox.setItemText(1, self.trUtf8(u'Vertical'))
self.GradientComboBox.setItemText(2, translate(u'AmendThemeDialog', u'Circular')) self.GradientComboBox.setItemText(2, self.trUtf8(u'Circular'))
self.ThemeTabWidget.setTabText(self.ThemeTabWidget.indexOf(self.BackgroundTab), translate(u'AmendThemeDialog', u'Background')) self.ThemeTabWidget.setTabText(
self.FontMainGroupBox.setTitle(translate(u'AmendThemeDialog', u'Main Font')) self.ThemeTabWidget.indexOf(self.BackgroundTab),
self.FontMainlabel.setText(translate(u'AmendThemeDialog', u'Font:')) self.trUtf8(u'Background'))
self.FontMainColorLabel.setText(translate(u'AmendThemeDialog', u'Font Color:')) self.FontMainGroupBox.setTitle(self.trUtf8(u'Main Font'))
self.FontMainSize.setText(translate(u'AmendThemeDialog', u'Size:')) self.FontMainlabel.setText(self.trUtf8(u'Font:'))
self.FontMainSizeSpinBox.setSuffix(translate(u'AmendThemeDialog', u'pt')) self.FontMainColorLabel.setText(self.trUtf8(u'Font Color:'))
self.FontMainWrapIndentationLabel.setText(translate(u'AmendThemeDialog', u'Wrap Indentation')) self.FontMainSize.setText(self.trUtf8(u'Size:'))
self.FontMainWeightComboBox.setItemText(0, translate(u'AmendThemeDialog', u'Normal')) self.FontMainSizeSpinBox.setSuffix(self.trUtf8(u'pt'))
self.FontMainWeightComboBox.setItemText(1, translate(u'AmendThemeDialog', u'Bold')) self.FontMainWrapIndentationLabel.setText(self.trUtf8(u'Wrap Indentation'))
self.FontMainWeightComboBox.setItemText(2, translate(u'AmendThemeDialog', u'Italics')) self.FontMainWeightComboBox.setItemText(0, self.trUtf8(u'Normal'))
self.FontMainWeightComboBox.setItemText(3, translate(u'AmendThemeDialog', u'Bold/Italics')) self.FontMainWeightComboBox.setItemText(1, self.trUtf8(u'Bold'))
self.FontMainWeightComboBox.setItemText(2, self.trUtf8(u'Italics'))
self.FontMainWeightComboBox.setItemText(3, self.trUtf8(u'Bold/Italics'))
self.FontMainWeightLabel.setText(translate("AmendThemeDialog", u'Font Weight:')) self.FontMainWeightLabel.setText(translate("AmendThemeDialog", u'Font Weight:'))
self.MainLocationGroupBox.setTitle(translate(u'AmendThemeDialog', u'Display Location')) self.MainLocationGroupBox.setTitle(self.trUtf8(u'Display Location'))
self.DefaultLocationLabel.setText(translate(u'AmendThemeDialog', u'Use Default Location:')) self.DefaultLocationLabel.setText(self.trUtf8(u'Use Default Location:'))
self.FontMainXLabel.setText(translate(u'AmendThemeDialog', u'X Position:')) self.FontMainXLabel.setText(self.trUtf8(u'X Position:'))
self.FontMainYLabel.setText(translate(u'AmendThemeDialog', u'Y Position:')) self.FontMainYLabel.setText(self.trUtf8(u'Y Position:'))
self.FontMainWidthLabel.setText(translate(u'AmendThemeDialog', u'Width:')) self.FontMainWidthLabel.setText(self.trUtf8(u'Width:'))
self.FontMainHeightLabel.setText(translate(u'AmendThemeDialog', u'Height:')) self.FontMainHeightLabel.setText(self.trUtf8(u'Height:'))
self.FontMainXSpinBox.setSuffix(translate(u'AmendThemeDialog', u'px')) self.FontMainXSpinBox.setSuffix(self.trUtf8(u'px'))
self.FontMainYSpinBox.setSuffix(translate(u'AmendThemeDialog', u'px')) self.FontMainYSpinBox.setSuffix(self.trUtf8(u'px'))
self.FontMainWidthSpinBox.setSuffix(translate(u'AmendThemeDialog', u'px')) self.FontMainWidthSpinBox.setSuffix(self.trUtf8(u'px'))
self.FontMainHeightSpinBox.setSuffix(translate(u'AmendThemeDialog', u'px')) self.FontMainHeightSpinBox.setSuffix(self.trUtf8(u'px'))
self.ThemeTabWidget.setTabText(self.ThemeTabWidget.indexOf(self.FontMainTab), translate(u'AmendThemeDialog', u'Font Main')) self.ThemeTabWidget.setTabText(
self.FooterFontGroupBox.setTitle(translate(u'AmendThemeDialog', u'Footer Font')) self.ThemeTabWidget.indexOf(self.FontMainTab),
self.FontFooterLabel.setText(translate(u'AmendThemeDialog', u'Font:')) self.trUtf8(u'Font Main'))
self.FontFooterColorLabel.setText(translate(u'AmendThemeDialog', u'Font Color:')) self.FooterFontGroupBox.setTitle(self.trUtf8(u'Footer Font'))
self.FontFooterSizeLabel.setText(translate(u'AmendThemeDialog', u'Size:')) self.FontFooterLabel.setText(self.trUtf8(u'Font:'))
self.FontFooterSizeSpinBox.setSuffix(translate(u'AmendThemeDialog', u'pt')) self.FontFooterColorLabel.setText(self.trUtf8(u'Font Color:'))
self.FontFooterWeightComboBox.setItemText(0, translate("AmendThemeDialog", u'Normal')) self.FontFooterSizeLabel.setText(self.trUtf8(u'Size:'))
self.FontFooterWeightComboBox.setItemText(1, translate("AmendThemeDialog", u'Bold')) self.FontFooterSizeSpinBox.setSuffix(self.trUtf8(u'pt'))
self.FontFooterWeightComboBox.setItemText(2, translate("AmendThemeDialog", u'Italics')) self.FontFooterWeightComboBox.setItemText(
self.FontFooterWeightComboBox.setItemText(3, translate("AmendThemeDialog", u'Bold/Italics')) 0, translate("AmendThemeDialog", u'Normal'))
self.FontFooterWeightLabel.setText(translate("AmendThemeDialog", u'Font Weight:')) self.FontFooterWeightComboBox.setItemText(
self.LocationFooterGroupBox.setTitle(translate(u'AmendThemeDialog', u'Display Location')) 1, translate("AmendThemeDialog", u'Bold'))
self.FontFooterDefaultLabel.setText(translate(u'AmendThemeDialog', u'Use Default Location:')) self.FontFooterWeightComboBox.setItemText(
self.FontFooterXLabel.setText(translate(u'AmendThemeDialog', u'X Position:')) 2, translate("AmendThemeDialog", u'Italics'))
self.FontFooterYLabel.setText(translate(u'AmendThemeDialog', u'Y Position:')) self.FontFooterWeightComboBox.setItemText(
self.FontFooterWidthLabel.setText(translate(u'AmendThemeDialog', u'Width:')) 3, translate("AmendThemeDialog", u'Bold/Italics'))
self.FontFooterHeightLabel.setText(translate(u'AmendThemeDialog', u'Height:')) self.FontFooterWeightLabel.setText(self.trUtf8(u'Font Weight:'))
self.FontFooterXSpinBox.setSuffix(translate(u'AmendThemeDialog', u'px')) self.LocationFooterGroupBox.setTitle(self.trUtf8(u'Display Location'))
self.FontFooterYSpinBox.setSuffix(translate(u'AmendThemeDialog', u'px')) self.FontFooterDefaultLabel.setText(self.trUtf8(u'Use Default Location:'))
self.FontFooterWidthSpinBox.setSuffix(translate(u'AmendThemeDialog', u'px')) self.FontFooterXLabel.setText(self.trUtf8(u'X Position:'))
self.FontFooterHeightSpinBox.setSuffix(translate(u'AmendThemeDialog', u'px')) self.FontFooterYLabel.setText(self.trUtf8(u'Y Position:'))
self.ThemeTabWidget.setTabText(self.ThemeTabWidget.indexOf(self.FontFooterTab), translate(u'AmendThemeDialog', u'Font Footer')) self.FontFooterWidthLabel.setText(self.trUtf8(u'Width:'))
self.ShadowGroupBox.setTitle(translate(u'AmendThemeDialog', u'Shadow && Outline')) self.FontFooterHeightLabel.setText(self.trUtf8(u'Height:'))
self.OutlineColorLabel.setText(translate(u'AmendThemeDialog', u'Outline Color:')) self.FontFooterXSpinBox.setSuffix(self.trUtf8(u'px'))
self.OutlineEnabledLabel.setText(translate(u'AmendThemeDialog', u'Show Outline:')) self.FontFooterYSpinBox.setSuffix(self.trUtf8(u'px'))
self.ShadowColorLabel.setText(translate(u'AmendThemeDialog', u'Shadow Color:')) self.FontFooterWidthSpinBox.setSuffix(self.trUtf8(u'px'))
self.ShadowEnabledLabel.setText(translate(u'AmendThemeDialog', u'Show Shadow:')) self.FontFooterHeightSpinBox.setSuffix(self.trUtf8(u'px'))
self.AlignmentGroupBox.setTitle(translate(u'AmendThemeDialog', u'Alignment')) self.ThemeTabWidget.setTabText(
self.HorizontalLabel.setText(translate(u'AmendThemeDialog', u'Horizontal Align:')) self.ThemeTabWidget.indexOf(self.FontFooterTab),
self.HorizontalComboBox.setItemText(0, translate(u'AmendThemeDialog', u'Left')) self.trUtf8(u'Font Footer'))
self.HorizontalComboBox.setItemText(1, translate(u'AmendThemeDialog', u'Right')) self.ShadowGroupBox.setTitle(self.trUtf8(u'Shadow && Outline'))
self.HorizontalComboBox.setItemText(2, translate(u'AmendThemeDialog', u'Center')) self.OutlineColorLabel.setText(self.trUtf8(u'Outline Color:'))
self.VerticalLabel.setText(translate(u'AmendThemeDialog', u'Vertical Align:')) self.OutlineEnabledLabel.setText(self.trUtf8(u'Show Outline:'))
self.VerticalComboBox.setItemText(0, translate(u'AmendThemeDialog', u'Top')) self.ShadowColorLabel.setText(self.trUtf8(u'Shadow Color:'))
self.VerticalComboBox.setItemText(1, translate(u'AmendThemeDialog', u'Middle')) self.ShadowEnabledLabel.setText(self.trUtf8(u'Show Shadow:'))
self.VerticalComboBox.setItemText(2, translate(u'AmendThemeDialog', u'Bottom')) self.AlignmentGroupBox.setTitle(self.trUtf8(u'Alignment'))
self.ThemeTabWidget.setTabText(self.ThemeTabWidget.indexOf(self.OtherOptionsTab), translate(u'AmendThemeDialog', u'Other Options')) self.HorizontalLabel.setText(self.trUtf8(u'Horizontal Align:'))
self.PreviewGroupBox.setTitle(translate(u'AmendThemeDialog', u'Preview')) self.HorizontalComboBox.setItemText(0, self.trUtf8(u'Left'))
self.HorizontalComboBox.setItemText(1, self.trUtf8(u'Right'))
self.HorizontalComboBox.setItemText(2, self.trUtf8(u'Center'))
self.VerticalLabel.setText(self.trUtf8(u'Vertical Align:'))
self.VerticalComboBox.setItemText(0, self.trUtf8(u'Top'))
self.VerticalComboBox.setItemText(1, self.trUtf8(u'Middle'))
self.VerticalComboBox.setItemText(2, self.trUtf8(u'Bottom'))
self.ThemeTabWidget.setTabText(
self.ThemeTabWidget.indexOf(self.OtherOptionsTab),
self.trUtf8(u'Other Options'))
self.PreviewGroupBox.setTitle(self.trUtf8(u'Preview'))

16
openlp/core/ui/amendthemeform.py
View File

@ -199,7 +199,8 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
self.previewTheme(self.theme) self.previewTheme(self.theme)
def onImageToolButtonClicked(self): def onImageToolButtonClicked(self):
filename = QtGui.QFileDialog.getOpenFileName(self, 'Open file') filename = QtGui.QFileDialog.getOpenFileName(
self, self.trUtf8('Open file'))
if filename != u'': if filename != u'':
self.ImageLineEdit.setText(filename) self.ImageLineEdit.setText(filename)
self.theme.background_filename = filename self.theme.background_filename = filename
@ -592,8 +593,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
if theme.background_type == u'solid': if theme.background_type == u'solid':
self.Color1PushButton.setStyleSheet( self.Color1PushButton.setStyleSheet(
u'background-color: %s' % unicode(theme.background_color)) u'background-color: %s' % unicode(theme.background_color))
self.Color1Label.setText(translate(u'ThemeManager', self.Color1Label.setText(self.trUtf8(u'Background Color:'))
u'Background Color:'))
self.Color1Label.setVisible(True) self.Color1Label.setVisible(True)
self.Color1PushButton.setVisible(True) self.Color1PushButton.setVisible(True)
self.Color2Label.setVisible(False) self.Color2Label.setVisible(False)
@ -608,10 +608,8 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
% unicode(theme.background_startColor)) % unicode(theme.background_startColor))
self.Color2PushButton.setStyleSheet(u'background-color: %s' \ self.Color2PushButton.setStyleSheet(u'background-color: %s' \
% unicode(theme.background_endColor)) % unicode(theme.background_endColor))
self.Color1Label.setText(translate(u'ThemeManager', self.Color1Label.setText(self.trUtf8(u'First Color:'))
u'First Color:')) self.Color2Label.setText(self.trUtf8(u'Second Color:'))
self.Color2Label.setText(translate(u'ThemeManager',
u'Second Color:'))
self.Color1Label.setVisible(True) self.Color1Label.setVisible(True)
self.Color1PushButton.setVisible(True) self.Color1PushButton.setVisible(True)
self.Color2Label.setVisible(True) self.Color2Label.setVisible(True)
@ -675,8 +673,8 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
int(main_weight), # weight int(main_weight), # weight
self.theme.font_main_italics)# italic self.theme.font_main_italics)# italic
metrics = QtGui.QFontMetrics(mainFont) metrics = QtGui.QFontMetrics(mainFont)
page_length = (int(self.FontMainHeightSpinBox.value()) / metrics.height() - 2 ) - 1 page_length = (int(self.FontMainHeightSpinBox.value()) / metrics.height() - 2) - 1
self.FontMainLinesPageLabel.setText( self.FontMainLinesPageLabel.setText(
translate(u'ThemeManager', u'Slide Height is %s rows' % page_length )) self.trUtf8(u'Slide Height is %s rows') % page_length)
frame = self.thememanager.generateImage(theme) frame = self.thememanager.generateImage(theme)
self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame)) self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame))

30
openlp/core/ui/generaltab.py
View File

@ -32,7 +32,9 @@ class GeneralTab(SettingsTab):
""" """
def __init__(self, screen_list): def __init__(self, screen_list):
self.screen_list = screen_list self.screen_list = screen_list
SettingsTab.__init__(self, translate(u'GeneralTab', u'General'), u'General') SettingsTab.__init__(self, u'General', u'General')
# Use this line when pulling the translation template
#SettingsTab.__init__(self, self.trUtf8(u'General'), u'General')
def setupUi(self): def setupUi(self):
self.setObjectName(u'GeneralTab') self.setObjectName(u'GeneralTab')
@ -131,16 +133,16 @@ class GeneralTab(SettingsTab):
QtCore.SIGNAL(u'editingFinished()'), self.onPasswordEditLostFocus) QtCore.SIGNAL(u'editingFinished()'), self.onPasswordEditLostFocus)
def retranslateUi(self): def retranslateUi(self):
self.MonitorGroupBox.setTitle(translate(u'GeneralTab', u'Monitors')) self.MonitorGroupBox.setTitle(self.trUtf8(u'Monitors'))
self.MonitorLabel.setText(translate(u'GeneralTab', u'Select monitor for output display:')) self.MonitorLabel.setText(self.trUtf8(u'Select monitor for output display:'))
self.StartupGroupBox.setTitle(translate(u'GeneralTab', u'Application Startup')) self.StartupGroupBox.setTitle(self.trUtf8(u'Application Startup'))
self.WarningCheckBox.setText(translate(u'GeneralTab', u'Show blank screen warning')) self.WarningCheckBox.setText(self.trUtf8(u'Show blank screen warning'))
self.AutoOpenCheckBox.setText(translate(u'GeneralTab', u'Automatically open the last service')) self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service'))
self.ShowSplashCheckBox.setText(translate(u'GeneralTab', u'Show the splash screen')) self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen'))
self.CCLIGroupBox.setTitle(translate(u'GeneralTab', u'CCLI Details')) self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details'))
self.NumberLabel.setText(translate(u'GeneralTab', u'CCLI Number:')) self.NumberLabel.setText(self.trUtf8(u'CCLI Number:'))
self.UsernameLabel.setText(translate(u'GeneralTab', u'SongSelect Username:')) self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:'))
self.PasswordLabel.setText(translate(u'GeneralTab', u'SongSelect Password:')) self.PasswordLabel.setText(self.trUtf8(u'SongSelect Password:'))
def onMonitorComboBoxChanged(self): def onMonitorComboBoxChanged(self):
self.MonitorNumber = self.MonitorComboBox.currentIndex() self.MonitorNumber = self.MonitorComboBox.currentIndex()
@ -165,11 +167,9 @@ class GeneralTab(SettingsTab):
def load(self): def load(self):
for screen in self.screen_list: for screen in self.screen_list:
screen_name = translate(u'GeneralTab', u'Screen') + u' ' + \ screen_name = self.trUtf8(u'Screen %d') % (screen[u'number'] + 1)
unicode(screen[u'number'] + 1)
if screen[u'primary']: if screen[u'primary']:
screen_name = screen_name + u' (' + \ screen_name = self.trUtf8(u'%s (primary)') % screen_name
translate(u'GeneralTab', u'primary') + u')'
self.MonitorComboBox.addItem(screen_name) self.MonitorComboBox.addItem(screen_name)
# Get the configs # Get the configs
self.MonitorNumber = int(self.config.get_config(u'Monitor', u'0')) self.MonitorNumber = int(self.config.get_config(u'Monitor', u'0'))

196
openlp/core/ui/mainwindow.py
View File

@ -307,114 +307,98 @@ class Ui_MainWindow(object):
""" """
Set up the translation system Set up the translation system
""" """
MainWindow.mainTitle = translate(u'mainWindow', u'OpenLP 2.0') MainWindow.mainTitle = self.trUtf8(u'OpenLP 2.0')
MainWindow.defaultThemeText = translate(u'mainWindow', MainWindow.defaultThemeText = self.trUtf8(
'Default Theme: ') 'Default Theme: ')
MainWindow.setWindowTitle(MainWindow.mainTitle) MainWindow.setWindowTitle(MainWindow.mainTitle)
self.FileMenu.setTitle(translate(u'mainWindow', u'&File')) self.FileMenu.setTitle(self.trUtf8(u'&File'))
self.FileImportMenu.setTitle(translate(u'mainWindow', u'&Import')) self.FileImportMenu.setTitle(self.trUtf8(u'&Import'))
self.FileExportMenu.setTitle(translate(u'mainWindow', u'&Export')) self.FileExportMenu.setTitle(self.trUtf8(u'&Export'))
self.OptionsMenu.setTitle(translate(u'mainWindow', u'&Options')) self.OptionsMenu.setTitle(self.trUtf8(u'&Options'))
self.OptionsViewMenu.setTitle(translate(u'mainWindow', u'&View')) self.OptionsViewMenu.setTitle(self.trUtf8(u'&View'))
self.ViewModeMenu.setTitle(translate(u'mainWindow', u'M&ode')) self.ViewModeMenu.setTitle(self.trUtf8(u'M&ode'))
self.OptionsLanguageMenu.setTitle(translate(u'mainWindow', self.OptionsLanguageMenu.setTitle(self.trUtf8(
u'&Language')) u'&Language'))
self.ToolsMenu.setTitle(translate(u'mainWindow', u'&Tools')) self.ToolsMenu.setTitle(self.trUtf8(u'&Tools'))
self.HelpMenu.setTitle(translate(u'mainWindow', u'&Help')) self.HelpMenu.setTitle(self.trUtf8(u'&Help'))
self.MediaManagerDock.setWindowTitle( self.MediaManagerDock.setWindowTitle(
translate(u'mainWindow', u'Media Manager')) self.trUtf8(u'Media Manager'))
self.ServiceManagerDock.setWindowTitle( self.ServiceManagerDock.setWindowTitle(
translate(u'mainWindow', u'Service Manager')) self.trUtf8(u'Service Manager'))
self.ThemeManagerDock.setWindowTitle( self.ThemeManagerDock.setWindowTitle(
translate(u'mainWindow', u'Theme Manager')) self.trUtf8(u'Theme Manager'))
self.FileNewItem.setText(translate(u'mainWindow', u'&New')) self.FileNewItem.setText(self.trUtf8(u'&New'))
self.FileNewItem.setToolTip(translate(u'mainWindow', u'New Service')) self.FileNewItem.setToolTip(self.trUtf8(u'New Service'))
self.FileNewItem.setStatusTip( self.FileNewItem.setStatusTip(self.trUtf8(u'Create a new Service'))
translate(u'mainWindow', u'Create a new Service')) self.FileNewItem.setShortcut(self.trUtf8(u'Ctrl+N'))
self.FileNewItem.setShortcut(translate(u'mainWindow', u'Ctrl+N')) self.FileOpenItem.setText(self.trUtf8(u'&Open'))
self.FileOpenItem.setText(translate(u'mainWindow', u'&Open')) self.FileOpenItem.setToolTip(self.trUtf8(u'Open Service'))
self.FileOpenItem.setToolTip(translate(u'mainWindow', u'Open Service')) self.FileOpenItem.setStatusTip(self.trUtf8(u'Open an existing service'))
self.FileOpenItem.setStatusTip( self.FileOpenItem.setShortcut(self.trUtf8(u'Ctrl+O'))
translate(u'mainWindow', u'Open an existing service')) self.FileSaveItem.setText(self.trUtf8(u'&Save'))
self.FileOpenItem.setShortcut(translate(u'mainWindow', u'Ctrl+O')) self.FileSaveItem.setToolTip(self.trUtf8(u'Save Service'))
self.FileSaveItem.setText(translate(u'mainWindow', u'&Save'))
self.FileSaveItem.setToolTip(translate(u'mainWindow', u'Save Service'))
self.FileSaveItem.setStatusTip( self.FileSaveItem.setStatusTip(
translate(u'mainWindow', u'Save the current service to disk')) self.trUtf8(u'Save the current service to disk'))
self.FileSaveItem.setShortcut(translate(u'mainWindow', u'Ctrl+S')) self.FileSaveItem.setShortcut(self.trUtf8(u'Ctrl+S'))
self.FileSaveAsItem.setText(translate(u'mainWindow', u'Save &As...')) self.FileSaveAsItem.setText(self.trUtf8(u'Save &As...'))
self.FileSaveAsItem.setToolTip( self.FileSaveAsItem.setToolTip(self.trUtf8(u'Save Service As'))
translate(u'mainWindow', u'Save Service As')) self.FileSaveAsItem.setStatusTip(
self.FileSaveAsItem.setStatusTip(translate(u'mainWindow', self.trUtf8(u'Save the current service under a new name'))
u'Save the current service under a new name')) self.FileSaveAsItem.setShortcut(self.trUtf8(u'F12'))
self.FileSaveAsItem.setShortcut(translate(u'mainWindow', u'F12')) self.FileExitItem.setText(self.trUtf8(u'E&xit'))
self.FileExitItem.setText(translate(u'mainWindow', u'E&xit')) self.FileExitItem.setStatusTip(self.trUtf8(u'Quit OpenLP'))
self.FileExitItem.setStatusTip(translate(u'mainWindow', u'Quit OpenLP')) self.FileExitItem.setShortcut(self.trUtf8(u'Alt+F4'))
self.FileExitItem.setShortcut(translate(u'mainWindow', u'Alt+F4')) self.ImportThemeItem.setText(self.trUtf8(u'&Theme'))
self.ImportThemeItem.setText(translate(u'mainWindow', u'&Theme')) self.ImportLanguageItem.setText(self.trUtf8(u'&Language'))
self.ImportLanguageItem.setText(translate(u'mainWindow', u'&Language')) self.ExportThemeItem.setText(self.trUtf8(u'&Theme'))
self.ExportThemeItem.setText(translate(u'mainWindow', u'&Theme')) self.ExportLanguageItem.setText(self.trUtf8(u'&Language'))
self.ExportLanguageItem.setText(translate(u'mainWindow', u'&Language')) self.actionLook_Feel.setText(self.trUtf8(u'Look && &Feel'))
self.actionLook_Feel.setText(translate(u'mainWindow', u'Look && &Feel')) self.OptionsSettingsItem.setText(self.trUtf8(u'&Settings'))
self.OptionsSettingsItem.setText(translate(u'mainWindow', u'&Settings')) self.ViewMediaManagerItem.setText(self.trUtf8(u'&Media Manager'))
self.ViewMediaManagerItem.setText( self.ViewMediaManagerItem.setToolTip(self.trUtf8(u'Toggle Media Manager'))
translate(u'mainWindow', u'&Media Manager')) self.ViewMediaManagerItem.setStatusTip(
self.ViewMediaManagerItem.setToolTip( self.trUtf8(u'Toggle the visibility of the Media Manager'))
translate(u'mainWindow', u'Toggle Media Manager')) self.ViewMediaManagerItem.setShortcut(self.trUtf8(u'F8'))
self.ViewMediaManagerItem.setStatusTip(translate(u'mainWindow', self.ViewThemeManagerItem.setText(self.trUtf8(u'&Theme Manager'))
u'Toggle the visibility of the Media Manager')) self.ViewThemeManagerItem.setToolTip(self.trUtf8(u'Toggle Theme Manager'))
self.ViewMediaManagerItem.setShortcut(translate(u'mainWindow', u'F8')) self.ViewThemeManagerItem.setStatusTip(
self.ViewThemeManagerItem.setText( self.trUtf8(u'Toggle the visibility of the Theme Manager'))
translate(u'mainWindow', u'&Theme Manager')) self.ViewThemeManagerItem.setShortcut(self.trUtf8(u'F10'))
self.ViewThemeManagerItem.setToolTip( self.ViewServiceManagerItem.setText(self.trUtf8(u'&Service Manager'))
translate(u'mainWindow', u'Toggle Theme Manager'))
self.ViewThemeManagerItem.setStatusTip(translate(u'mainWindow',
u'Toggle the visibility of the Theme Manager'))
self.ViewThemeManagerItem.setShortcut(translate(u'mainWindow', u'F10'))
self.ViewServiceManagerItem.setText(
translate(u'mainWindow', u'&Service Manager'))
self.ViewServiceManagerItem.setToolTip( self.ViewServiceManagerItem.setToolTip(
translate(u'mainWindow', u'Toggle Service Manager')) self.trUtf8(u'Toggle Service Manager'))
self.ViewServiceManagerItem.setStatusTip(translate(u'mainWindow', self.ViewServiceManagerItem.setStatusTip(
u'Toggle the visibility of the Service Manager')) self.trUtf8(u'Toggle the visibility of the Service Manager'))
self.ViewServiceManagerItem.setShortcut(translate(u'mainWindow', u'F9')) self.ViewServiceManagerItem.setShortcut(self.trUtf8(u'F9'))
self.action_Preview_Panel.setText( self.action_Preview_Panel.setText(self.trUtf8(u'&Preview Panel'))
translate(u'mainWindow', u'&Preview Panel')) self.action_Preview_Panel.setToolTip(self.trUtf8(u'Toggle Preview Panel'))
self.action_Preview_Panel.setToolTip( self.action_Preview_Panel.setStatusTip(
translate(u'mainWindow', u'Toggle Preview Panel')) self.trUtf8(u'Toggle the visibility of the Preview Panel'))
self.action_Preview_Panel.setStatusTip(translate(u'mainWindow', self.action_Preview_Panel.setShortcut(self.trUtf8(u'F11'))
u'Toggle the visibility of the Preview Panel')) self.ToolsAlertItem.setText(self.trUtf8(u'&Alert'))
self.action_Preview_Panel.setShortcut(translate(u'mainWindow', u'F11')) self.ToolsAlertItem.setStatusTip(self.trUtf8(u'Show an alert message'))
self.ToolsAlertItem.setText(translate(u'mainWindow', u'&Alert')) self.ToolsAlertItem.setShortcut(self.trUtf8(u'F7'))
self.ToolsAlertItem.setStatusTip( self.PluginItem.setText(self.trUtf8(u'&Plugin List'))
translate(u'mainWindow', u'Show an alert message')) self.PluginItem.setStatusTip(self.trUtf8(u'List the Plugins'))
self.ToolsAlertItem.setShortcut(translate(u'mainWindow', u'F7')) self.PluginItem.setShortcut(self.trUtf8(u'Alt+F7'))
self.PluginItem.setText(translate(u'mainWindow', u'&Plugin List')) self.HelpDocumentationItem.setText(self.trUtf8(u'&User Guide'))
self.PluginItem.setStatusTip( self.HelpAboutItem.setText(self.trUtf8(u'&About'))
translate(u'mainWindow', u'List the Plugins'))
self.PluginItem.setShortcut(translate(u'mainWindow', u'Alt+F7'))
self.HelpDocumentationItem.setText(
translate(u'mainWindow', u'&User Guide'))
self.HelpAboutItem.setText(translate(u'mainWindow', u'&About'))
self.HelpAboutItem.setStatusTip( self.HelpAboutItem.setStatusTip(
translate(u'mainWindow', u'More information about OpenLP')) self.trUtf8(u'More information about OpenLP'))
self.HelpAboutItem.setShortcut(translate(u'mainWindow', u'Ctrl+F1')) self.HelpAboutItem.setShortcut(self.trUtf8(u'Ctrl+F1'))
self.HelpOnlineHelpItem.setText( self.HelpOnlineHelpItem.setText(self.trUtf8(u'&Online Help'))
translate(u'mainWindow', u'&Online Help')) self.HelpWebSiteItem.setText(self.trUtf8(u'&Web Site'))
self.HelpWebSiteItem.setText(translate(u'mainWindow', u'&Web Site')) self.LanguageTranslateItem.setText(self.trUtf8(u'&Translate'))
self.LanguageTranslateItem.setText( self.LanguageTranslateItem.setStatusTip(
translate(u'mainWindow', u'&Translate')) self.trUtf8(u'Translate the interface to your language'))
self.LanguageTranslateItem.setStatusTip(translate(u'mainWindow', self.LanguageEnglishItem.setText(self.trUtf8(u'English'))
u'Translate the interface to your language')) self.LanguageEnglishItem.setStatusTip(
self.LanguageEnglishItem.setText(translate(u'mainWindow', u'English')) self.trUtf8(u'Set the interface language to English'))
self.LanguageEnglishItem.setStatusTip(translate(u'mainWindow', self.ToolsAddToolItem.setText(self.trUtf8(u'&Add Tool...'))
u'Set the interface language to English')) self.ToolsAddToolItem.setStatusTip(
self.ToolsAddToolItem.setText(translate(u'mainWindow', u'&Add Tool...')) self.trUtf8(u'Add an application to the list of tools'))
self.ToolsAddToolItem.setStatusTip(translate(u'mainWindow', self.action_Preview_Panel.setText(self.trUtf8(u'&Preview Pane'))
u'Add an application to the list of tools')) self.ModeLiveItem.setText(self.trUtf8(u'&Live'))
self.action_Preview_Panel.setText(
translate(u'mainWindow', u'&Preview Pane'))
self.ModeLiveItem.setText(translate(u'mainWindow', u'&Live'))
class MainWindow(QtGui.QMainWindow, Ui_MainWindow): class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
@ -546,9 +530,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
version = check_latest_version(self.generalConfig, applicationVersion) version = check_latest_version(self.generalConfig, applicationVersion)
if applicationVersion != version: if applicationVersion != version:
QtGui.QMessageBox.question(None, QtGui.QMessageBox.question(None,
translate(u'mainWindow', u'OpenLP version Updated'), self.trUtf8(u'OpenLP version Updated'),
translate(u'mainWindow', u'OpenLP version %s has been updated to version %s' self.trUtf8(u'OpenLP version %s has been updated to version %s')
% (applicationVersion, version)), % (applicationVersion, version),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok) QtGui.QMessageBox.Ok)
self.generalConfig.set_config(u'Application version', version) self.generalConfig.set_config(u'Application version', version)
@ -584,8 +568,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
if str_to_bool(self.generalConfig.get_config(u'Screen Blank', False)) \ if str_to_bool(self.generalConfig.get_config(u'Screen Blank', False)) \
and str_to_bool(self.generalConfig.get_config(u'Blank Warning', False)): and str_to_bool(self.generalConfig.get_config(u'Blank Warning', False)):
QtGui.QMessageBox.question(None, QtGui.QMessageBox.question(None,
translate(u'mainWindow', u'OpenLP Main Display Blanked'), self.trUtf8(u'OpenLP Main Display Blanked'),
translate(u'mainWindow', u'The Main Display has been blanked out'), self.trUtf8(u'The Main Display has been blanked out'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok) QtGui.QMessageBox.Ok)
self.LiveController.blackPushButton.setChecked(True) self.LiveController.blackPushButton.setChecked(True)
@ -624,8 +608,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
""" """
if self.serviceNotSaved == True: if self.serviceNotSaved == True:
ret = QtGui.QMessageBox.question(None, ret = QtGui.QMessageBox.question(None,
translate(u'mainWindow', u'Save Changes to Service?'), self.trUtf8(u'Save Changes to Service?'),
translate(u'mainWindow', u'Your service has changed, do you want to save those changes?'), self.trUtf8(u'Your service has changed, do you want to save those changes?'),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Cancel | QtGui.QMessageBox.Cancel |
QtGui.QMessageBox.Discard | QtGui.QMessageBox.Discard |

28
openlp/core/ui/plugindialog.py
View File

@ -93,25 +93,17 @@ class Ui_PluginViewDialog(object):
self.PluginLayout.addWidget(self.PluginListButtonBox) self.PluginLayout.addWidget(self.PluginListButtonBox)
self.retranslateUi(PluginViewDialog) self.retranslateUi(PluginViewDialog)
QtCore.QObject.connect( QtCore.QObject.connect(self.PluginListButtonBox,
self.PluginListButtonBox, QtCore.SIGNAL(u'accepted()'), PluginViewDialog.close)
QtCore.SIGNAL(u'accepted()'),
PluginViewDialog.close)
QtCore.QMetaObject.connectSlotsByName(PluginViewDialog) QtCore.QMetaObject.connectSlotsByName(PluginViewDialog)
def retranslateUi(self, PluginViewDialog): def retranslateUi(self, PluginViewDialog):
PluginViewDialog.setWindowTitle( PluginViewDialog.setWindowTitle(self.trUtf8(u'Plugin List'))
translate(u'PluginViewDialog', u'Plugin List')) self.PluginInfoGroupBox.setTitle(self.trUtf8(u'Plugin Details'))
self.PluginInfoGroupBox.setTitle( self.VersionLabel.setText(self.trUtf8(u'Version:'))
translate(u'PluginViewDialog', u'Plugin Details')) self.VersionNumberLabel.setText(self.trUtf8(u'TextLabel'))
self.VersionLabel.setText( self.AboutLabel.setText(self.trUtf8(u'About:'))
translate(u'PluginViewDialog', u'Version:')) self.StatusLabel.setText(self.trUtf8(u'Status:'))
self.VersionNumberLabel.setText( self.StatusComboBox.setItemText(0, self.trUtf8(u'Active'))
translate(u'PluginViewDialog', u'TextLabel')) self.StatusComboBox.setItemText(1, self.trUtf8(u'Inactive'))
self.AboutLabel.setText(translate(u'PluginViewDialog', u'About:'))
self.StatusLabel.setText(translate(u'PluginViewDialog', u'Status:'))
self.StatusComboBox.setItemText(
0, translate(u'PluginViewDialog', u'Active'))
self.StatusComboBox.setItemText(
1, translate(u'PluginViewDialog', u'Inactive'))

71
openlp/core/ui/servicemanager.py
View File

@ -116,25 +116,22 @@ class ServiceManager(QtGui.QWidget):
self.Layout.setMargin(0) self.Layout.setMargin(0)
# Create the top toolbar # Create the top toolbar
self.Toolbar = OpenLPToolbar(self) self.Toolbar = OpenLPToolbar(self)
self.Toolbar.addToolbarButton(u'New Service', self.Toolbar.addToolbarButton(
u':/services/service_new.png', self.trUtf8(u'New Service'), u':/services/service_new.png',
translate(u'ServiceManager', u'Create a new service'), self.trUtf8(u'Create a new service'), self.onNewService)
self.onNewService) self.Toolbar.addToolbarButton(
self.Toolbar.addToolbarButton(u'Open Service', self.trUtf8(u'Open Service'), u':/services/service_open.png',
u':/services/service_open.png', self.trUtf8(u'Load an existing service'), self.onLoadService)
translate(u'ServiceManager', u'Load an existing service'), self.Toolbar.addToolbarButton(
self.onLoadService) self.trUtf8(u'Save Service'), u':/services/service_save.png',
self.Toolbar.addToolbarButton(u'Save Service', self.trUtf8(u'Save this service'), self.onSaveService)
u':/services/service_save.png',
translate(u'ServiceManager', u'Save this service'),
self.onSaveService)
self.Toolbar.addSeparator() self.Toolbar.addSeparator()
self.ThemeLabel = QtGui.QLabel(translate(u'ServiceManager', u'Theme:'), self.ThemeLabel = QtGui.QLabel(self.trUtf8(u'Theme:'),
self) self)
self.ThemeLabel.setMargin(3) self.ThemeLabel.setMargin(3)
self.Toolbar.addWidget(self.ThemeLabel) self.Toolbar.addWidget(self.ThemeLabel)
self.ThemeComboBox = QtGui.QComboBox(self.Toolbar) self.ThemeComboBox = QtGui.QComboBox(self.Toolbar)
self.ThemeComboBox.setToolTip(translate(u'ServiceManager', self.ThemeComboBox.setToolTip(self.trUtf8(
u'Select a theme for the service')) u'Select a theme for the service'))
self.ThemeComboBox.setSizeAdjustPolicy( self.ThemeComboBox.setSizeAdjustPolicy(
QtGui.QComboBox.AdjustToContents) QtGui.QComboBox.AdjustToContents)
@ -162,37 +159,34 @@ class ServiceManager(QtGui.QWidget):
QtCore.Qt.ActionsContextMenu) QtCore.Qt.ActionsContextMenu)
self.ServiceManagerList.addAction(contextMenuAction( self.ServiceManagerList.addAction(contextMenuAction(
self.ServiceManagerList, ':/system/system_preview.png', self.ServiceManagerList, ':/system/system_preview.png',
translate(u'ServiceManager',u'&Preview Verse'), self.makePreview)) self.trUtf8(u'&Preview Verse'), self.makePreview))
self.ServiceManagerList.addAction(contextMenuAction( self.ServiceManagerList.addAction(contextMenuAction(
self.ServiceManagerList, ':/system/system_live.png', self.ServiceManagerList, ':/system/system_live.png',
translate(u'ServiceManager',u'&Show Live'), self.makeLive)) self.trUtf8(u'&Show Live'), self.makeLive))
self.ServiceManagerList.addAction(contextMenuSeparator( self.ServiceManagerList.addAction(contextMenuSeparator(
self.ServiceManagerList)) self.ServiceManagerList))
self.ServiceManagerList.addAction(contextMenuAction( self.ServiceManagerList.addAction(contextMenuAction(
self.ServiceManagerList, ':/services/service_delete', self.ServiceManagerList, ':/services/service_delete',
translate(u'ServiceManager',u'&Remove from Service'), self.trUtf8(u'&Remove from Service'), self.onDeleteFromService))
self.onDeleteFromService))
self.Layout.addWidget(self.ServiceManagerList) self.Layout.addWidget(self.ServiceManagerList)
# Add the bottom toolbar # Add the bottom toolbar
self.OrderToolbar = OpenLPToolbar(self) self.OrderToolbar = OpenLPToolbar(self)
self.OrderToolbar.addToolbarButton(u'Move to top', self.OrderToolbar.addToolbarButton(
u':/services/service_top.png', self.trUtf8(u'Move to top'), u':/services/service_top.png',
translate(u'ServiceManager', u'Move to top'), self.onServiceTop) self.trUtf8(u'Move to top'), self.onServiceTop)
self.OrderToolbar.addToolbarButton(u'Move up', self.OrderToolbar.addToolbarButton(
u':/services/service_up.png', self.trUtf8(u'Move up'), u':/services/service_up.png',
translate(u'ServiceManager', u'Move up order'), self.onServiceUp) self.trUtf8(u'Move up order'), self.onServiceUp)
self.OrderToolbar.addToolbarButton(u'Move down', self.OrderToolbar.addToolbarButton(
u':/services/service_down.png', self.trUtf8(u'Move down'), u':/services/service_down.png',
translate(u'ServiceManager', u'Move down order'), self.trUtf8(u'Move down order'), self.onServiceDown)
self.onServiceDown) self.OrderToolbar.addToolbarButton(
self.OrderToolbar.addToolbarButton(u'Move to bottom', self.trUtf8(u'Move to bottom'), u':/services/service_bottom.png',
u':/services/service_bottom.png', self.trUtf8(u'Move to end'), self.onServiceEnd)
translate(u'ServiceManager', u'Move to end'), self.onServiceEnd)
self.OrderToolbar.addSeparator() self.OrderToolbar.addSeparator()
self.OrderToolbar.addToolbarButton(u'Delete From Service', self.OrderToolbar.addToolbarButton(
u':/services/service_delete.png', self.trUtf8(u'Delete From Service'), u':/services/service_delete.png',
translate(u'ServiceManager', u'Delete From Service'), self.trUtf8(u'Delete From Service'), self.onDeleteFromService)
self.onDeleteFromService)
self.Layout.addWidget(self.OrderToolbar) self.Layout.addWidget(self.OrderToolbar)
# Connect up our signals and slots # Connect up our signals and slots
QtCore.QObject.connect(self.ThemeComboBox, QtCore.QObject.connect(self.ThemeComboBox,
@ -429,10 +423,9 @@ class ServiceManager(QtGui.QWidget):
if lastService: if lastService:
filename = self.config.get_last_dir() filename = self.config.get_last_dir()
else: else:
filename = QtGui.QFileDialog.getOpenFileName(self, filename = QtGui.QFileDialog.getOpenFileName(
translate(u'ThemeManager', u'Open Service'), self, self.trUtf8(u'Open Service'),
self.config.get_last_dir(), self.config.get_last_dir(), u'Services (*.osz)')
u'Services (*.osz)')
filename = unicode(filename) filename = unicode(filename)
name = filename.split(os.path.sep) name = filename.split(os.path.sep)
if filename != u'': if filename != u'':

2
openlp/core/ui/settingsdialog.py
View File

@ -54,4 +54,4 @@ class Ui_SettingsDialog(object):
QtCore.QMetaObject.connectSlotsByName(SettingsDialog) QtCore.QMetaObject.connectSlotsByName(SettingsDialog)
def retranslateUi(self, SettingsDialog): def retranslateUi(self, SettingsDialog):
SettingsDialog.setWindowTitle(translate(u'SettingsDialog', u'Settings')) SettingsDialog.setWindowTitle(self.trUtf8(u'Settings'))

55
openlp/core/ui/slidecontroller.py
View File

@ -98,9 +98,9 @@ class SlideController(QtGui.QWidget):
# Type label for the top of the slide controller # Type label for the top of the slide controller
self.TypeLabel = QtGui.QLabel(self.Panel) self.TypeLabel = QtGui.QLabel(self.Panel)
if self.isLive: if self.isLive:
self.TypeLabel.setText(u'<strong>%s</strong>' % translate(u'SlideController', u'Live')) self.TypeLabel.setText(u'<strong>%s</strong>' % self.trUtf8(u'Live'))
else: else:
self.TypeLabel.setText(u'<strong>%s</strong>' % translate(u'SlideController', u'Preview')) self.TypeLabel.setText(u'<strong>%s</strong>' % self.trUtf8(u'Preview'))
self.TypeLabel.setAlignment(QtCore.Qt.AlignCenter) self.TypeLabel.setAlignment(QtCore.Qt.AlignCenter)
self.PanelLayout.addWidget(self.TypeLabel) self.PanelLayout.addWidget(self.TypeLabel)
# Splitter # Splitter
@ -135,46 +135,39 @@ class SlideController(QtGui.QWidget):
self.Toolbar.sizePolicy().hasHeightForWidth()) self.Toolbar.sizePolicy().hasHeightForWidth())
self.Toolbar.setSizePolicy(sizeToolbarPolicy) self.Toolbar.setSizePolicy(sizeToolbarPolicy)
if self.isLive: if self.isLive:
self.Toolbar.addToolbarButton(u'First Slide', self.Toolbar.addToolbarButton(
u':/slides/slide_first.png', self.trUtf8(u'First Slide'), u':/slides/slide_first.png',
translate(u'SlideController', u'Move to first'), self.trUtf8(u'Move to first'), self.onSlideSelectedFirst)
self.onSlideSelectedFirst) self.Toolbar.addToolbarButton(
self.Toolbar.addToolbarButton(u'Previous Slide', self.trUtf8(u'Previous Slide'), u':/slides/slide_previous.png',
u':/slides/slide_previous.png', self.trUtf8(u'Move to previous'), self.onSlideSelectedPrevious)
translate(u'SlideController', u'Move to previous'), self.Toolbar.addToolbarButton(
self.onSlideSelectedPrevious) self.trUtf8(u'Next Slide'), u':/slides/slide_next.png',
self.Toolbar.addToolbarButton(u'Next Slide', self.trUtf8(u'Move to next'), self.onSlideSelectedNext)
u':/slides/slide_next.png',
translate(u'SlideController', u'Move to next'),
self.onSlideSelectedNext)
if self.isLive: if self.isLive:
self.Toolbar.addToolbarButton(u'Last Slide', self.Toolbar.addToolbarButton(
u':/slides/slide_last.png', self.trUtf8(u'Last Slide'), u':/slides/slide_last.png',
translate(u'SlideController', u'Move to last'), self.trUtf8(u'Move to last'), self.onSlideSelectedLast)
self.onSlideSelectedLast)
if self.isLive: if self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator') self.Toolbar.addToolbarSeparator(u'Close Separator')
self.blackPushButton = self.Toolbar.addPushButton( self.blackPushButton = self.Toolbar.addPushButton(
u':/slides/slide_close.png') u':/slides/slide_close.png')
if not self.isLive: if not self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator') self.Toolbar.addToolbarSeparator(u'Close Separator')
self.Toolbar.addToolbarButton(u'Go Live', self.Toolbar.addToolbarButton(
u':/system/system_live.png', self.trUtf8(u'Go Live'), u':/system/system_live.png',
translate(u'SlideController', u'Move to live'), self.trUtf8(u'Move to live'), self.onGoLive)
self.onGoLive)
if isLive: if isLive:
self.Toolbar.addToolbarSeparator(u'Loop Separator') self.Toolbar.addToolbarSeparator(u'Loop Separator')
self.Toolbar.addToolbarButton(u'Start Loop', self.Toolbar.addToolbarButton(
u':/media/media_time.png', self.trUtf8(u'Start Loop'), u':/media/media_time.png',
translate(u'SlideController', u'Start continuous loop'), self.trUtf8(u'Start continuous loop'), self.onStartLoop)
self.onStartLoop) self.Toolbar.addToolbarButton(
self.Toolbar.addToolbarButton(u'Stop Loop', self.trUtf8(u'Stop Loop'), u':/media/media_stop.png',
u':/media/media_stop.png', self.trUtf8(u'Stop continuous loop'), self.onStopLoop)
translate(u'SlideController', u'Stop continuous loop'),
self.onStopLoop)
self.DelaySpinBox = QtGui.QSpinBox() self.DelaySpinBox = QtGui.QSpinBox()
self.Toolbar.addToolbarWidget(u'Image SpinBox', self.DelaySpinBox) self.Toolbar.addToolbarWidget(u'Image SpinBox', self.DelaySpinBox)
self.DelaySpinBox.setSuffix(translate(u'SlideController', u's')) self.DelaySpinBox.setSuffix(self.trUtf8(u's'))
self.ControllerLayout.addWidget(self.Toolbar) self.ControllerLayout.addWidget(self.Toolbar)
# Screen preview area # Screen preview area

6
openlp/core/ui/splashscreen.py
View File

@ -29,8 +29,7 @@ class SplashScreen(object):
def __init__(self, version): def __init__(self, version):
self.splash_screen = QtGui.QSplashScreen() self.splash_screen = QtGui.QSplashScreen()
self.setupUi() self.setupUi()
starting = translate(u'SplashScreen', u'Starting') self.message = self.trUtf8(u'Starting') + u'..... ' + version
self.message = starting + u'..... ' + version
def setupUi(self): def setupUi(self):
self.splash_screen.setObjectName(u'splash_screen') self.splash_screen.setObjectName(u'splash_screen')
@ -56,8 +55,7 @@ class SplashScreen(object):
QtCore.QMetaObject.connectSlotsByName(self.splash_screen) QtCore.QMetaObject.connectSlotsByName(self.splash_screen)
def retranslateUi(self): def retranslateUi(self):
self.splash_screen.setWindowTitle( self.splash_screen.setWindowTitle(self.trUtf8(u'Splash Screen'))
translate(u'splash_screen', u'Splash Screen'))
def show(self): def show(self):
self.splash_screen.show() self.splash_screen.show()

103
openlp/core/ui/thememanager.py
View File

@ -53,25 +53,21 @@ class ThemeManager(QtGui.QWidget):
self.amendThemeForm = AmendThemeForm(self) self.amendThemeForm = AmendThemeForm(self)
self.Toolbar = OpenLPToolbar(self) self.Toolbar = OpenLPToolbar(self)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate(u'ThemeManager', u'New Theme'), u':/themes/theme_new.png', self.trUtf8(u'New Theme'), u':/themes/theme_new.png',
translate(u'ThemeManager', u'Create a new theme'), self.onAddTheme) self.trUtf8(u'Create a new theme'), self.onAddTheme)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate(u'ThemeManager', u'Edit Theme'), self.trUtf8(u'Edit Theme'), u':/themes/theme_edit.png',
u':/themes/theme_edit.png', self.trUtf8(u'Edit a theme'), self.onEditTheme)
translate(u'ThemeManager', u'Edit a theme'), self.onEditTheme)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate(u'ThemeManager', u'Delete Theme'), self.trUtf8(u'Delete Theme'), u':/themes/theme_delete.png',
u':/themes/theme_delete.png', self.trUtf8(u'Delete a theme'), self.onDeleteTheme)
translate(u'ThemeManager', u'Delete a theme'), self.onDeleteTheme)
self.Toolbar.addSeparator() self.Toolbar.addSeparator()
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate(u'ThemeManager', u'Import Theme'), self.trUtf8(u'Import Theme'), u':/themes/theme_import.png',
u':/themes/theme_import.png', self.trUtf8(u'Import a theme'), self.onImportTheme)
translate(u'ThemeManager', u'Import a theme'), self.onImportTheme)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate(u'ThemeManager', u'Export Theme'), self.trUtf8(u'Export Theme'), u':/themes/theme_export.png',
u':/themes/theme_export.png', self.trUtf8(u'Export a theme'), self.onExportTheme)
translate(u'ThemeManager', u'Export a theme'), self.onExportTheme)
self.ThemeWidget = QtGui.QWidgetAction(self.Toolbar) self.ThemeWidget = QtGui.QWidgetAction(self.Toolbar)
self.Layout.addWidget(self.Toolbar) self.Layout.addWidget(self.Toolbar)
self.ThemeListWidget = QtGui.QListWidget(self) self.ThemeListWidget = QtGui.QListWidget(self)
@ -79,23 +75,19 @@ class ThemeManager(QtGui.QWidget):
self.ThemeListWidget.setIconSize(QtCore.QSize(88,50)) self.ThemeListWidget.setIconSize(QtCore.QSize(88,50))
self.Layout.addWidget(self.ThemeListWidget) self.Layout.addWidget(self.ThemeListWidget)
self.ThemeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) self.ThemeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
self.ThemeListWidget.addAction(contextMenuAction(self.ThemeListWidget, self.ThemeListWidget.addAction(
u':/themes/theme_edit.png', contextMenuAction(self.ThemeListWidget, u':/themes/theme_edit.png',
translate(u'ThemeManager', u'Edit a theme'), self.trUtf8(u'Edit a theme'), self.onEditTheme))
self.onEditTheme))
self.ThemeListWidget.addAction(contextMenuSeparator(self.ThemeListWidget)) self.ThemeListWidget.addAction(contextMenuSeparator(self.ThemeListWidget))
self.ThemeListWidget.addAction(contextMenuAction(self.ThemeListWidget, self.ThemeListWidget.addAction(
u':/themes/theme_delete.png', contextMenuAction(self.ThemeListWidget, u':/themes/theme_delete.png',
translate(u'ThemeManager', u'Delete theme'), self.trUtf8(u'Delete theme'), self.onDeleteTheme))
self.onDeleteTheme)) self.ThemeListWidget.addAction(
self.ThemeListWidget.addAction(contextMenuAction(self.ThemeListWidget, contextMenuAction(self.ThemeListWidget, u':/themes/theme_export.png',
u':/themes/theme_export.png', self.trUtf8(u'Make Global'), self.changeGlobalFromScreen))
translate(u'ThemeManager', u'Make Global'), self.ThemeListWidget.addAction(
self.changeGlobalFromScreen)) contextMenuAction(self.ThemeListWidget, u':/themes/theme_export.png',
self.ThemeListWidget.addAction(contextMenuAction(self.ThemeListWidget, self.trUtf8(u'Export theme'), self.onExportTheme))
u':/themes/theme_export.png',
translate(u'ThemeManager', u'Export theme'),
self.onExportTheme))
self.ThemeListWidget.addAction(contextMenuSeparator(self.ThemeListWidget)) self.ThemeListWidget.addAction(contextMenuSeparator(self.ThemeListWidget))
#Signals #Signals
QtCore.QObject.connect(self.ThemeListWidget, QtCore.QObject.connect(self.ThemeListWidget,
@ -125,8 +117,7 @@ class ThemeManager(QtGui.QWidget):
self.ThemeListWidget.item(count).setText(newName) self.ThemeListWidget.item(count).setText(newName)
#Set the new name #Set the new name
if themeName == newName: if themeName == newName:
name = u'%s (%s)' % (newName, translate(u'ThemeManager', name = self.trUtf8(u'%s (default)') % newName
u'default'))
self.ThemeListWidget.item(count).setText(name) self.ThemeListWidget.item(count).setText(name)
def changeGlobalFromScreen(self, index = -1): def changeGlobalFromScreen(self, index = -1):
@ -143,12 +134,11 @@ class ThemeManager(QtGui.QWidget):
if count == selected_row: if count == selected_row:
self.global_theme = unicode( self.global_theme = unicode(
self.ThemeListWidget.item(count).text()) self.ThemeListWidget.item(count).text())
name = u'%s (%s)' % (self.global_theme, name = self.trUtf8(u'%s (default)') % self.global_theme
translate(u'ThemeManager', u'default'))
self.ThemeListWidget.item(count).setText(name) self.ThemeListWidget.item(count).setText(name)
self.config.set_config(u'theme global theme', self.global_theme) self.config.set_config(u'theme global theme', self.global_theme)
Receiver().send_message(u'update_global_theme', Receiver().send_message(
self.global_theme) u'update_global_theme', self.global_theme)
self.pushThemes() self.pushThemes()
def onAddTheme(self): def onAddTheme(self):
@ -172,10 +162,9 @@ class ThemeManager(QtGui.QWidget):
theme = unicode(item.text()) theme = unicode(item.text())
# should be the same unless default # should be the same unless default
if theme != unicode(item.data(QtCore.Qt.UserRole).toString()): if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(
translate(u'ThemeManager', u'Error'), self, self.trUtf8(u'Error'),
translate(u'ThemeManager', self.trUtf8(u'You are unable to delete the default theme!'),
u'You are unable to delete the default theme!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
else: else:
self.themelist.remove(theme) self.themelist.remove(theme)
@ -203,15 +192,13 @@ class ThemeManager(QtGui.QWidget):
""" """
item = self.ThemeListWidget.currentItem() item = self.ThemeListWidget.currentItem()
if item is None: if item is None:
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self, self.trUtf8(u'Error'),
translate(u'ThemeManager', u'Error'), self.trUtf8(u'You have not selected a theme!'),
translate(u'ThemeManager',
u'You have not selected a theme!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return return
theme = unicode(item.data(QtCore.Qt.UserRole).toString()) theme = unicode(item.data(QtCore.Qt.UserRole).toString())
path = QtGui.QFileDialog.getExistingDirectory(self, path = QtGui.QFileDialog.getExistingDirectory(self,
u'Save Theme - (%s)' % theme, self.trUtf8(u'Save Theme - (%s)') % theme,
self.config.get_last_dir(1) ) self.config.get_last_dir(1) )
path = unicode(path) path = unicode(path)
if path != u'': if path != u'':
@ -226,10 +213,9 @@ class ThemeManager(QtGui.QWidget):
zip.close() zip.close()
def onImportTheme(self): def onImportTheme(self):
files = QtGui.QFileDialog.getOpenFileNames(self, files = QtGui.QFileDialog.getOpenFileNames(
translate(u'ThemeManager', u'Select Theme Import File'), self, self.trUtf8(u'Select Theme Import File'),
self.config.get_last_dir(), self.config.get_last_dir(), u'Theme (*.*)')
u'Theme (*.*)')
log.info(u'New Themes %s', unicode(files)) log.info(u'New Themes %s', unicode(files))
if len(files) > 0: if len(files) > 0:
for file in files: for file in files:
@ -256,7 +242,7 @@ class ThemeManager(QtGui.QWidget):
textName = os.path.splitext(name)[0] textName = os.path.splitext(name)[0]
if textName == self.global_theme: if textName == self.global_theme:
name = u'%s (%s)' % (textName, name = u'%s (%s)' % (textName,
translate(u'ThemeManager', u'default')) self.trUtf8(u'default'))
else: else:
name = textName name = textName
item_name = QtGui.QListWidgetItem(name) item_name = QtGui.QListWidgetItem(name)
@ -281,7 +267,7 @@ class ThemeManager(QtGui.QWidget):
xml = file_to_xml(xml_file) xml = file_to_xml(xml_file)
except: except:
newtheme = ThemeXML() newtheme = ThemeXML()
newtheme.new_document(u'New Theme') newtheme.new_document(self.trUtf8(u'New Theme'))
newtheme.add_background_solid(unicode(u'#000000')) newtheme.add_background_solid(unicode(u'#000000'))
newtheme.add_font(unicode(QtGui.QFont().family()), newtheme.add_font(unicode(QtGui.QFont().family()),
unicode(u'#FFFFFF'), unicode(30), u'False') unicode(u'#FFFFFF'), unicode(30), u'False')
@ -312,10 +298,9 @@ class ThemeManager(QtGui.QWidget):
try: try:
zip = zipfile.ZipFile(filename) zip = zipfile.ZipFile(filename)
except: except:
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(
translate(u'ThemeManager', u'Error'), self, self.trUtf8(u'Error'),
translate(u'ThemeManager', self.trUtf8(u'File is not a valid theme!'),
u'File is not a valid theme!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return return
filexml = None filexml = None
@ -418,9 +403,9 @@ class ThemeManager(QtGui.QWidget):
if self.saveThemeName != name: if self.saveThemeName != name:
if os.path.exists(theme_file): if os.path.exists(theme_file):
result = QtGui.QMessageBox.question( result = QtGui.QMessageBox.question(
self, self, self.trUtf8(u'Theme Exists'),
translate(u'ThemeManager', u'Theme Exists'), self.trUtf8(u'A theme with this name already exists, '
translate(u'ThemeManager', u'A theme with this name already exists, would you like to overwrite it?'), u'would you like to overwrite it?'),
(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No), (QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
QtGui.QMessageBox.No) QtGui.QMessageBox.No)
else: else:
@ -469,7 +454,7 @@ class ThemeManager(QtGui.QWidget):
def baseTheme(self): def baseTheme(self):
log.debug(u'base theme created') log.debug(u'base theme created')
newtheme = ThemeXML() newtheme = ThemeXML()
newtheme.new_document(u'New Theme') newtheme.new_document(self.trUtf8(u'New Theme'))
newtheme.add_background_solid(unicode(u'#000000')) newtheme.add_background_solid(unicode(u'#000000'))
newtheme.add_font(unicode(QtGui.QFont().family()), unicode(u'#FFFFFF'), newtheme.add_font(unicode(QtGui.QFont().family()), unicode(u'#FFFFFF'),
unicode(30), u'False') unicode(30), u'False')

37
openlp/core/ui/themestab.py
View File

@ -32,8 +32,9 @@ class ThemesTab(SettingsTab):
""" """
def __init__(self, parent): def __init__(self, parent):
self.parent = parent self.parent = parent
SettingsTab.__init__( SettingsTab.__init__(self, u'Themes', u'Themes')
self, translate(u'ThemesTab', u'Themes'), u'Themes') # Use the line below when pulling the translation template file.
#SettingsTab.__init__(self, self.trUtf8(u'Themes'), u'Themes')
def setupUi(self): def setupUi(self):
self.setObjectName(u'ThemesTab') self.setObjectName(u'ThemesTab')
@ -105,17 +106,21 @@ class ThemesTab(SettingsTab):
QtCore.SIGNAL(u'update_themes'), self.updateThemeList) QtCore.SIGNAL(u'update_themes'), self.updateThemeList)
def retranslateUi(self): def retranslateUi(self):
self.GlobalGroupBox.setTitle(translate(u'ThemesTab', u'Global theme')) self.GlobalGroupBox.setTitle(self.trUtf8(u'Global theme'))
self.LevelGroupBox.setTitle(translate(u'ThemesTab', u'Theme level')) self.LevelGroupBox.setTitle(self.trUtf8(u'Theme level'))
self.SongLevelRadioButton.setText( self.SongLevelRadioButton.setText(self.trUtf8(u'Song level'))
translate(u'ThemesTab', u'Song level')) self.SongLevelLabel.setText(self.trUtf8(u'Use the theme from each song '
self.SongLevelLabel.setText(translate(u'ThemesTab', u'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.')) u'in the database. If a song doesn\'t have a theme associated with '
self.ServiceLevelRadioButton.setText( u'it, then use the service\'s theme. If the service doesn\'t have '
translate(u'ThemesTab', u'Service level')) u'a theme, then use the global theme.'))
self.ServiceLevelLabel.setText(translate(u'ThemesTab', u'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.')) self.ServiceLevelRadioButton.setText(self.trUtf8(u'Service level'))
self.GlobalLevelRadioButton.setText( self.ServiceLevelLabel.setText(self.trUtf8(u'Use the theme from the '
translate(u'ThemesTab', u'Global level')) u'service, overriding any of the individual songs\' themes. If the '
self.GlobalLevelLabel.setText(translate(u'ThemesTab', u'Use the global theme, overriding any themes associated with either the service or the songs.')) u'service doesn\'t have a theme, then use the global theme.'))
self.GlobalLevelRadioButton.setText(self.trUtf8(u'Global level'))
self.GlobalLevelLabel.setText(self.trUtf8(u'Use the global theme, '
u'overriding any themes associated with either the service or the '
u'songs.'))
def load(self): def load(self):
self.global_style = self.config.get_config( self.global_style = self.config.get_config(
@ -137,17 +142,17 @@ class ThemesTab(SettingsTab):
Receiver().send_message(u'update_global_theme', self.global_theme ) Receiver().send_message(u'update_global_theme', self.global_theme )
def onSongLevelButtonPressed(self): def onSongLevelButtonPressed(self):
self.global_style= u'Song' self.global_style = u'Song'
self.parent.RenderManager.set_global_theme( self.parent.RenderManager.set_global_theme(
self.global_theme, self.global_style) self.global_theme, self.global_style)
def onServiceLevelButtonPressed(self): def onServiceLevelButtonPressed(self):
self.global_style= u'Service' self.global_style = u'Service'
self.parent.RenderManager.set_global_theme( self.parent.RenderManager.set_global_theme(
self.global_theme, self.global_style) self.global_theme, self.global_style)
def onGlobalLevelButtonPressed(self): def onGlobalLevelButtonPressed(self):
self.global_style= u'Global' self.global_style = u'Global'
self.parent.RenderManager.set_global_theme( self.parent.RenderManager.set_global_theme(
self.global_theme, self.global_style) self.global_theme, self.global_style)

23
openlp/plugins/audit/auditplugin.py
View File

@ -62,21 +62,18 @@ class AuditPlugin(Plugin):
self.toolsMenu = tools_menu self.toolsMenu = tools_menu
self.AuditMenu = QtGui.QMenu(tools_menu) self.AuditMenu = QtGui.QMenu(tools_menu)
self.AuditMenu.setObjectName(u'AuditMenu') self.AuditMenu.setObjectName(u'AuditMenu')
self.AuditMenu.setTitle( self.AuditMenu.setTitle(self.trUtf8(u'&Audit'))
translate(u'AuditPlugin', u'&Audit'))
#Audit Delete #Audit Delete
self.AuditDelete = QtGui.QAction(tools_menu) self.AuditDelete = QtGui.QAction(tools_menu)
self.AuditDelete.setText( self.AuditDelete.setText(self.trUtf8(u'Audit &Delete'))
translate(u'AuditPlugin', u'Audit &Delete'))
self.AuditDelete.setStatusTip( self.AuditDelete.setStatusTip(
translate(u'AuditPlugin', u'Delete all audit data to sepecified date')) self.trUtf8(u'Delete all audit data to sepecified date'))
self.AuditDelete.setObjectName(u'AuditDelete') self.AuditDelete.setObjectName(u'AuditDelete')
#Audit Report #Audit Report
self.AuditReport = QtGui.QAction(tools_menu) self.AuditReport = QtGui.QAction(tools_menu)
self.AuditReport.setText( self.AuditReport.setText(self.trUtf8(u'Au&dit &Extract'))
translate(u'AuditPlugin', u'Au&dit &Extract'))
self.AuditReport.setStatusTip( self.AuditReport.setStatusTip(
translate(u'AuditPlugin', u'Generate Extracts on Audit Data')) self.trUtf8(u'Generate Extracts on Audit Data'))
self.AuditReport.setObjectName(u'AuditReport') self.AuditReport.setObjectName(u'AuditReport')
#Audit activation #Audit activation
AuditIcon = buildIcon(u':/tools/tools_alert.png') AuditIcon = buildIcon(u':/tools/tools_alert.png')
@ -84,10 +81,10 @@ class AuditPlugin(Plugin):
self.AuditStatus.setIcon(AuditIcon) self.AuditStatus.setIcon(AuditIcon)
self.AuditStatus.setCheckable(True) self.AuditStatus.setCheckable(True)
self.AuditStatus.setChecked(False) self.AuditStatus.setChecked(False)
self.AuditStatus.setText(translate(u'AuditPlugin', u'A&udit Status')) self.AuditStatus.setText(self.trUtf8(u'A&udit Status'))
self.AuditStatus.setStatusTip( self.AuditStatus.setStatusTip(
translate(u'AuditPlugin', u'Start/Stop live song auditing')) self.trUtf8(u'Start/Stop live song auditing'))
self.AuditStatus.setShortcut(translate(u'AuditPlugin', u'F4')) self.AuditStatus.setShortcut(self.trUtf8(u'F4'))
self.AuditStatus.setObjectName(u'AuditStatus') self.AuditStatus.setObjectName(u'AuditStatus')
#Add Menus together #Add Menus together
self.toolsMenu.addAction(self.AuditMenu.menuAction()) self.toolsMenu.addAction(self.AuditMenu.menuAction())
@ -166,4 +163,6 @@ class AuditPlugin(Plugin):
self.auditdetailform.exec_() self.auditdetailform.exec_()
def about(self): def about(self):
return u'<b>Audit Plugin</b> <br>This plugin records the use of songs and when they have been used during a live service' about_text = u'<b>Audit Plugin</b><br />This plugin records the use '\
u'of songs and when they have been used during a live service'
return about_text

4
openlp/plugins/audit/forms/auditdeleteform.py
View File

@ -44,8 +44,8 @@ class AuditDeleteForm(QtGui.QDialog, Ui_AuditDeleteDialog):
def accept(self): def accept(self):
ret = QtGui.QMessageBox.question(self, ret = QtGui.QMessageBox.question(self,
translate(u'mainWindow', u'Delete Selected Audit Events?'), self.trUtf8(u'Delete Selected Audit Events?'),
translate(u'mainWindow', u'Are you sure you want to delete selected Audit Data?'), self.trUtf8(u'Are you sure you want to delete selected Audit Data?'),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok | QtGui.QMessageBox.Ok |
QtGui.QMessageBox.Cancel), QtGui.QMessageBox.Cancel),

10
openlp/plugins/bibles/bibleplugin.py
View File

@ -73,7 +73,7 @@ class BiblePlugin(Plugin):
self.ImportBibleItem = QtGui.QAction(import_menu) self.ImportBibleItem = QtGui.QAction(import_menu)
self.ImportBibleItem.setObjectName(u'ImportBibleItem') self.ImportBibleItem.setObjectName(u'ImportBibleItem')
import_menu.addAction(self.ImportBibleItem) import_menu.addAction(self.ImportBibleItem)
self.ImportBibleItem.setText(translate(u'BiblePlugin', u'&Bible')) self.ImportBibleItem.setText(self.trUtf8(u'&Bible'))
# Signals and slots # Signals and slots
QtCore.QObject.connect(self.ImportBibleItem, QtCore.QObject.connect(self.ImportBibleItem,
QtCore.SIGNAL(u'triggered()'), self.onBibleNewClick) QtCore.SIGNAL(u'triggered()'), self.onBibleNewClick)
@ -83,7 +83,7 @@ class BiblePlugin(Plugin):
self.ExportBibleItem = QtGui.QAction(export_menu) self.ExportBibleItem = QtGui.QAction(export_menu)
self.ExportBibleItem.setObjectName(u'ExportBibleItem') self.ExportBibleItem.setObjectName(u'ExportBibleItem')
export_menu.addAction(self.ExportBibleItem) export_menu.addAction(self.ExportBibleItem)
self.ExportBibleItem.setText(translate(u'BiblePlugin', u'&Bible')) self.ExportBibleItem.setText(self.trUtf8(u'&Bible'))
self.ExportBibleItem.setVisible(False) self.ExportBibleItem.setVisible(False)
def onBibleNewClick(self): def onBibleNewClick(self):
@ -91,4 +91,8 @@ class BiblePlugin(Plugin):
self.media_item.onNewClick() self.media_item.onNewClick()
def about(self): def about(self):
return u'<b>Bible Plugin</b> <br>This plugin allows bible verse from different sources to be displayed on the screen during the service.<br><br>This is a core plugin and cannot be made inactive</b>' about_text = u'<strong>Bible Plugin</strong><br />This plugin allows '\
u'bible verse from different sources to be displayed on the '\
u'screen during the service.<br /><br /><strong>This is a core '\
u'plugin and cannot be made inactive</strong>'
return about_text

59
openlp/plugins/bibles/forms/bibleimportdialog.py
View File

@ -224,31 +224,34 @@ class Ui_BibleImportDialog(object):
BibleImportDialog.setTabOrder(self.CopyrightEdit, self.PermisionEdit) BibleImportDialog.setTabOrder(self.CopyrightEdit, self.PermisionEdit)
def retranslateUi(self, BibleImportDialog): def retranslateUi(self, BibleImportDialog):
BibleImportDialog.setWindowTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Bible Registration', None, QtGui.QApplication.UnicodeUTF8)) BibleImportDialog.setWindowTitle(self.trUtf8(u'Bible Registration'))
self.LicenceDetailsGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Licence Details', None, QtGui.QApplication.UnicodeUTF8)) self.LicenceDetailsGroupBox.setTitle(self.trUtf8(u'Licence Details'))
self.VersionNameLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Version Name:', None, QtGui.QApplication.UnicodeUTF8)) self.VersionNameLabel.setText(self.trUtf8(u'Version Name:'))
self.CopyrightLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Copyright:', None, QtGui.QApplication.UnicodeUTF8)) self.CopyrightLabel.setText(self.trUtf8(u'Copyright:'))
self.PermisionLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Permission:', None, QtGui.QApplication.UnicodeUTF8)) self.PermisionLabel.setText(self.trUtf8(u'Permission:'))
self.ProgressGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Import Progress', None, QtGui.QApplication.UnicodeUTF8)) self.ProgressGroupBox.setTitle(self.trUtf8(u'Import Progress'))
self.ProgressBar.setFormat(QtGui.QApplication.translate(u'BibleImportDialog', u'%p', None, QtGui.QApplication.UnicodeUTF8)) self.ProgressBar.setFormat(self.trUtf8(u'%p'))
self.ImportButton.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Import', None, QtGui.QApplication.UnicodeUTF8)) self.ImportButton.setText(self.trUtf8(u'Import'))
self.CancelButton.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Cancel', None, QtGui.QApplication.UnicodeUTF8)) self.CancelButton.setText(self.trUtf8(u'Cancel'))
self.OSISGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'OSIS Bible', None, QtGui.QApplication.UnicodeUTF8)) self.OSISGroupBox.setTitle(self.trUtf8(u'OSIS Bible'))
self.BibleNameLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Bible Name:', None, QtGui.QApplication.UnicodeUTF8)) self.BibleNameLabel.setText(self.trUtf8(u'Bible Name:'))
self.LocatioLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'File Location:', None, QtGui.QApplication.UnicodeUTF8)) self.LocatioLabel.setText(self.trUtf8(u'File Location:'))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.OsisTab), QtGui.QApplication.translate(u'BibleImportDialog', u'Osis (Sword) Imports', None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.OsisTab),
self.CVSGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'CVS Bible', None, QtGui.QApplication.UnicodeUTF8)) self.trUtf8(u'Osis (Sword) Imports'))
self.BooksLocationLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Books Location:', None, QtGui.QApplication.UnicodeUTF8)) self.CVSGroupBox.setTitle(self.trUtf8(u'CVS Bible'))
self.VerseLocationLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Verse Location:', None, QtGui.QApplication.UnicodeUTF8)) self.BooksLocationLabel.setText(self.trUtf8(u'Books Location:'))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.CsvTab), QtGui.QApplication.translate(u'BibleImportDialog', u'CSV File Imports', None, QtGui.QApplication.UnicodeUTF8)) self.VerseLocationLabel.setText(self.trUtf8(u'Verse Location:'))
self.OptionsGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Download Options', None, QtGui.QApplication.UnicodeUTF8)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.CsvTab),
self.LocationLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Location:', None, QtGui.QApplication.UnicodeUTF8)) self.trUtf8(u'CSV File Imports'))
self.LocationComboBox.setItemText(0, QtGui.QApplication.translate(u'BibleImportDialog', u'Crosswalk', None, QtGui.QApplication.UnicodeUTF8)) self.OptionsGroupBox.setTitle(self.trUtf8(u'Download Options'))
self.BibleLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Bible:', None, QtGui.QApplication.UnicodeUTF8)) self.LocationLabel.setText(self.trUtf8(u'Location:'))
self.BibleComboBox.setItemText(1, QtGui.QApplication.translate(u'BibleImportDialog', u'NIV', None, QtGui.QApplication.UnicodeUTF8)) self.LocationComboBox.setItemText(0, self.trUtf8(u'Crosswalk'))
self.BibleComboBox.setItemText(2, QtGui.QApplication.translate(u'BibleImportDialog', u'KJV', None, QtGui.QApplication.UnicodeUTF8)) self.BibleLabel.setText(self.trUtf8(u'Bible:'))
self.ProxyGroupBox.setTitle(QtGui.QApplication.translate(u'BibleImportDialog', u'Proxy Settings (Optional)', None, QtGui.QApplication.UnicodeUTF8)) self.BibleComboBox.setItemText(1, self.trUtf8(u'NIV'))
self.AddressLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Proxy Address:', None, QtGui.QApplication.UnicodeUTF8)) self.BibleComboBox.setItemText(2, self.trUtf8(u'KJV'))
self.UsernameLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Username:', None, QtGui.QApplication.UnicodeUTF8)) self.ProxyGroupBox.setTitle(self.trUtf8(u'Proxy Settings (Optional)'))
self.PasswordLabel.setText(QtGui.QApplication.translate(u'BibleImportDialog', u'Password:', None, QtGui.QApplication.UnicodeUTF8)) self.AddressLabel.setText(self.trUtf8(u'Proxy Address:'))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.HttpTab), QtGui.QApplication.translate(u'BibleImportDialog', u'Web Downloads', None, QtGui.QApplication.UnicodeUTF8)) self.UsernameLabel.setText(self.trUtf8(u'Username:'))
self.PasswordLabel.setText(self.trUtf8(u'Password:'))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.HttpTab),
self.trUtf8(u'Web Downloads'))

26
openlp/plugins/bibles/forms/bibleimportform.py
View File

@ -57,7 +57,7 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
filepath = os.path.split(os.path.abspath(__file__))[0] filepath = os.path.split(os.path.abspath(__file__))[0]
filepath = os.path.abspath(os.path.join(filepath, u'..', filepath = os.path.abspath(os.path.join(filepath, u'..',
u'resources',u'crosswalkbooks.csv')) u'resources', u'crosswalkbooks.csv'))
fbibles=open(filepath, 'r') fbibles=open(filepath, 'r')
self.bible_versions = {} self.bible_versions = {}
self.BibleComboBox.clear() self.BibleComboBox.clear()
@ -101,21 +101,24 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
def onVersesFileButtonClicked(self): def onVersesFileButtonClicked(self):
filename = QtGui.QFileDialog.getOpenFileName(self, u'Open file',self.config.get_last_dir(1)) filename = QtGui.QFileDialog.getOpenFileName(
self, self.trUtf8(u'Open file'), self.config.get_last_dir(1))
if filename != u'': if filename != u'':
self.VerseLocationEdit.setText(filename) self.VerseLocationEdit.setText(filename)
self.config.set_last_dir(filename, 1) self.config.set_last_dir(filename, 1)
self.setCsv() self.setCsv()
def onBooksFileButtonClicked(self): def onBooksFileButtonClicked(self):
filename = QtGui.QFileDialog.getOpenFileName(self, u'Open file',self.config.get_last_dir(2)) filename = QtGui.QFileDialog.getOpenFileName(
self, self.trUtf8(u'Open file'), self.config.get_last_dir(2))
if filename != u'': if filename != u'':
self.BooksLocationEdit.setText(filename) self.BooksLocationEdit.setText(filename)
self.config.set_last_dir(filename, 2) self.config.set_last_dir(filename, 2)
self.setCsv() self.setCsv()
def onOsisFileButtonClicked(self): def onOsisFileButtonClicked(self):
filename = QtGui.QFileDialog.getOpenFileName(self, u'Open file',self.config.get_last_dir(3)) filename = QtGui.QFileDialog.getOpenFileName(
self, self.trUtf8(u'Open file'), self.config.get_last_dir(3))
if filename != u'': if filename != u'':
self.OSISLocationEdit.setText(filename) self.OSISLocationEdit.setText(filename)
self.config.set_last_dir(filename, 3) self.config.set_last_dir(filename, 3)
@ -157,18 +160,18 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
def onCancelButtonClicked(self): def onCancelButtonClicked(self):
# tell import to stop # tell import to stop
self.message = u'Bible import stopped' self.message = self.trUtf8(u'Bible import stopped')
Receiver().send_message(u'stop_import') Receiver().send_message(u'stop_import')
# tell bibleplugin to reload the bibles # tell bibleplugin to reload the bibles
Receiver().send_message(u'pre_load_bibles') Receiver().send_message(u'pre_load_bibles')
self.close() self.close()
def onImportButtonClicked(self): def onImportButtonClicked(self):
message = u'Bible import completed' message = self.trUtf8(u'Bible import completed')
if self.biblemanager is not None: if self.biblemanager is not None:
if not self.bible_type is None and \ if not self.bible_type is None and \
len(self.BibleNameEdit.displayText()) > 0: len(self.BibleNameEdit.displayText()) > 0:
self.MessageLabel.setText(u'Import Started') self.MessageLabel.setText(self.trUtf8(u'Import Started'))
self.ProgressBar.setMinimum(0) self.ProgressBar.setMinimum(0)
self.setMax(65) self.setMax(65)
self.ProgressBar.setValue(0) self.ProgressBar.setValue(0)
@ -181,8 +184,7 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
# tell bibleplugin to reload the bibles # tell bibleplugin to reload the bibles
Receiver().send_message(u'pre_load_bibles') Receiver().send_message(u'pre_load_bibles')
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate(u'BibleMediaItem', u'Information'), self.trUtf8(u'Information'), self.trUtf8(message))
translate(u'BibleMediaItem', message))
def setMax(self, max): def setMax(self, max):
log.debug(u'set Max %s', max) log.debug(u'set Max %s', max)
@ -191,8 +193,8 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
def incrementProgressBar(self, text ): def incrementProgressBar(self, text ):
log.debug(u'IncrementBar %s', text) log.debug(u'IncrementBar %s', text)
self.MessageLabel.setText(u'Import processing ' + text) self.MessageLabel.setText(self.trUtf8(u'Import processing %s') % text)
self.ProgressBar.setValue(self.ProgressBar.value()+1) self.ProgressBar.setValue(self.ProgressBar.value() + 1)
def importBible(self): def importBible(self):
log.debug(u'Import Bible') log.debug(u'Import Bible')
@ -224,7 +226,7 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
unicode(self.CopyrightEdit.displayText()), unicode(self.CopyrightEdit.displayText()),
unicode(self.PermisionEdit.displayText())) unicode(self.PermisionEdit.displayText()))
else: else:
message = u'Bible import failed' message = self.trUtf8(u'Bible import failed')
self.bible_type = None self.bible_type = None
# free the screen state restrictions # free the screen state restrictions
self.resetScreenFieldStates() self.resetScreenFieldStates()

4
openlp/plugins/bibles/lib/bibleOSISimpl.py
View File

@ -149,8 +149,8 @@ class BibleOSISImpl():
testament += 1 testament += 1
book_ptr = p[0] book_ptr = p[0]
book = self.bibledb.create_book( book = self.bibledb.create_book(
unicode(translate(u'BibleBooks', self.booksOfBible[p[0]])), unicode(self.booksOfBible[p[0]]),
unicode(translate(u'BibleBooks', self.abbrevOfBible[p[0]])), unicode(self.abbrevOfBible[p[0]]),
testament) testament)
dialogobject.incrementProgressBar( dialogobject.incrementProgressBar(
self.booksOfBible[p[0]]) self.booksOfBible[p[0]])

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

@ -41,8 +41,8 @@ class BiblesTab(SettingsTab):
self.paragraph_style = True self.paragraph_style = True
self.show_new_chapters = False self.show_new_chapters = False
self.display_style = 0 self.display_style = 0
SettingsTab.__init__( SettingsTab.__init__(self, u'Bibles', u'Bibles')
self, translate(u'BiblesTab', u'Bibles'), u'Bibles') #SettingsTab.__init__(self, self.trUtf8(u'Bibles'), u'Bibles')
def setupUi(self): def setupUi(self):
self.setObjectName(u'BiblesTab') self.setObjectName(u'BiblesTab')
@ -130,52 +130,40 @@ class BiblesTab(SettingsTab):
self.BibleRightLayout.setMargin(0) self.BibleRightLayout.setMargin(0)
self.BibleLayout.addWidget(self.BibleRightWidget) self.BibleLayout.addWidget(self.BibleRightWidget)
# Signals and slots # Signals and slots
QtCore.QObject.connect(self.NewChaptersCheckBox, QtCore.QObject.connect(
QtCore.SIGNAL(u'stateChanged(int)'), self.NewChaptersCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
self.onNewChaptersCheckBoxChanged) self.onNewChaptersCheckBoxChanged)
QtCore.QObject.connect(self.DisplayStyleComboBox, QtCore.QObject.connect(
QtCore.SIGNAL(u'activated(int)'), self.DisplayStyleComboBox, QtCore.SIGNAL(u'activated(int)'),
self.onDisplayStyleComboBoxChanged) self.onDisplayStyleComboBoxChanged)
QtCore.QObject.connect(self.BibleThemeComboBox, QtCore.QObject.connect(
QtCore.SIGNAL(u'activated(int)'), self.onBibleThemeComboBoxChanged) self.BibleThemeComboBox, QtCore.SIGNAL(u'activated(int)'),
QtCore.QObject.connect(self.LayoutStyleComboBox, self.onBibleThemeComboBoxChanged)
QtCore.SIGNAL(u'activated(int)'), QtCore.QObject.connect(
self.LayoutStyleComboBox, QtCore.SIGNAL(u'activated(int)'),
self.onLayoutStyleComboBoxChanged) self.onLayoutStyleComboBoxChanged)
QtCore.QObject.connect(self.BibleDualCheckBox, QtCore.QObject.connect(
QtCore.SIGNAL(u'stateChanged(int)'), self.BibleDualCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
self.onBibleDualCheckBox) self.onBibleDualCheckBox)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'update_themes'), self.updateThemeList) QtCore.SIGNAL(u'update_themes'), self.updateThemeList)
def retranslateUi(self): def retranslateUi(self):
self.VerseDisplayGroupBox.setTitle( self.VerseDisplayGroupBox.setTitle(self.trUtf8(u'Verse Display'))
translate(u'SettingsForm', u'Verse Display')) self.NewChaptersCheckBox.setText(self.trUtf8(u'Only show new chapter numbers'))
self.NewChaptersCheckBox.setText( self.LayoutStyleLabel.setText(self.trUtf8(u'Layout Style:'))
translate(u'SettingsForm', u'Only show new chapter numbers')) self.DisplayStyleLabel.setText(self.trUtf8(u'Display Style:'))
self.LayoutStyleLabel.setText( self.BibleThemeLabel.setText(self.trUtf8(u'Bible Theme:'))
translate(u'SettingsForm', u'Layout Style:')) self.LayoutStyleComboBox.setItemText(0, self.trUtf8(u'verse per slide'))
self.DisplayStyleLabel.setText( self.LayoutStyleComboBox.setItemText(1, self.trUtf8(u'verse per line'))
translate(u'SettingsForm', u'Display Style:')) self.LayoutStyleComboBox.setItemText(2, self.trUtf8(u'continuous'))
self.BibleThemeLabel.setText( self.DisplayStyleComboBox.setItemText(0, self.trUtf8(u'No brackets'))
translate(u'SettingsForm', u'Bible Theme:')) self.DisplayStyleComboBox.setItemText(1, self.trUtf8(u'( and )'))
self.LayoutStyleComboBox.setItemText( self.DisplayStyleComboBox.setItemText(2, self.trUtf8(u'{ and }'))
0, translate(u'SettingsForm', u'verse per slide')) self.DisplayStyleComboBox.setItemText(3, self.trUtf8(u'[ and ]'))
self.LayoutStyleComboBox.setItemText( self.ChangeNoteLabel.setText(
1, translate(u'SettingsForm', u'verse per line')) self.trUtf8(u'Note:\nChanges don\'t affect verses already in the service'))
self.LayoutStyleComboBox.setItemText( self.BibleDualCheckBox.setText(self.trUtf8(u'Display Dual Bible Verses'))
2, translate(u'SettingsForm', u'continuous'))
self.DisplayStyleComboBox.setItemText(
0, translate(u'SettingsForm', u'No brackets'))
self.DisplayStyleComboBox.setItemText(
1, translate(u'SettingsForm', u'( and )'))
self.DisplayStyleComboBox.setItemText(
2, translate(u'SettingsForm', u'{ and }'))
self.DisplayStyleComboBox.setItemText(
3, translate(u'SettingsForm', u'[ and ]'))
self.ChangeNoteLabel.setText(translate(u'SettingsForm',
u'Note:\nChanges don\'t affect verses already in the service'))
self.BibleDualCheckBox.setText(
translate(u'SettingsForm', u'Display Dual Bible Verses'))
def onBibleThemeComboBoxChanged(self): def onBibleThemeComboBoxChanged(self):
self.bible_theme = self.BibleThemeComboBox.currentText() self.bible_theme = self.BibleThemeComboBox.currentText()

11
openlp/plugins/bibles/lib/manager.py
View File

@ -57,7 +57,7 @@ class BibleManager(object):
""" """
self.config = config self.config = config
log.debug(u'Bible Initialising') log.debug(u'Bible Initialising')
self.web = translate(u'BibleManager', u'Web') self.web = self.trUtf8(u'Web')
# dict of bible database objects # dict of bible database objects
self.bible_db_cache = None self.bible_db_cache = None
# dict of bible http readers # dict of bible http readers
@ -352,8 +352,8 @@ class BibleManager(object):
if book is None: if book is None:
log.debug(u'get_verse_text : new book') log.debug(u'get_verse_text : new book')
for chapter in range(schapter, echapter + 1): for chapter in range(schapter, echapter + 1):
self.media.setQuickMessage \ self.media.setQuickMessage(
(u'Downloading %s: %s'% (bookname, chapter)) self.trUtf8(u'Downloading %s: %s') % (bookname, chapter))
search_results = \ search_results = \
self.bible_http_cache[bible].get_bible_chapter( self.bible_http_cache[bible].get_bible_chapter(
bible, 0, bookname, chapter) bible, 0, bookname, chapter)
@ -381,8 +381,9 @@ class BibleManager(object):
v = self.bible_db_cache[bible].get_bible_chapter( v = self.bible_db_cache[bible].get_bible_chapter(
book.id, chapter) book.id, chapter)
if v is None: if v is None:
self.media.setQuickMessage \ self.media.setQuickMessage(
(u'%Downloading %s: %s'% (bookname, chapter)) self.trUtf8(u'%Downloading %s: %s')\
% (bookname, chapter))
self.bible_db_cache[bible].create_chapter( self.bible_db_cache[bible].create_chapter(
book.id, chapter, book.id, chapter,
search_results.get_verselist()) search_results.get_verselist())

74
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -128,7 +128,7 @@ class BibleMediaItem(MediaManagerItem):
self.QuickMessage = QtGui.QLabel(self.QuickTab) self.QuickMessage = QtGui.QLabel(self.QuickTab)
self.QuickMessage.setObjectName(u'QuickMessage') self.QuickMessage.setObjectName(u'QuickMessage')
self.QuickLayout.addWidget(self.QuickMessage, 6, 0, 1, 3) self.QuickLayout.addWidget(self.QuickMessage, 6, 0, 1, 3)
self.SearchTabWidget.addTab(self.QuickTab, 'Quick') self.SearchTabWidget.addTab(self.QuickTab, self.trUtf8(u'Quick'))
QuickSpacerItem = QtGui.QSpacerItem(20, 35, QtGui.QSizePolicy.Minimum, QuickSpacerItem = QtGui.QSpacerItem(20, 35, QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Expanding) QtGui.QSizePolicy.Expanding)
self.QuickLayout.addItem(QuickSpacerItem, 6, 2, 1, 1) self.QuickLayout.addItem(QuickSpacerItem, 6, 2, 1, 1)
@ -206,7 +206,7 @@ class BibleMediaItem(MediaManagerItem):
self.AdvancedMessage = QtGui.QLabel(self.AdvancedTab) self.AdvancedMessage = QtGui.QLabel(self.AdvancedTab)
self.AdvancedMessage.setObjectName(u'AdvancedMessage') self.AdvancedMessage.setObjectName(u'AdvancedMessage')
self.AdvancedLayout.addWidget(self.AdvancedMessage, 8, 0, 1, 3) self.AdvancedLayout.addWidget(self.AdvancedMessage, 8, 0, 1, 3)
self.SearchTabWidget.addTab(self.AdvancedTab, u'Advanced') self.SearchTabWidget.addTab(self.AdvancedTab, self.trUtf8(u'Advanced'))
# Add the search tab widget to the page layout # Add the search tab widget to the page layout
self.PageLayout.addWidget(self.SearchTabWidget) self.PageLayout.addWidget(self.SearchTabWidget)
# Combo Boxes # Combo Boxes
@ -243,41 +243,27 @@ class BibleMediaItem(MediaManagerItem):
def retranslateUi(self): def retranslateUi(self):
log.debug(u'retranslateUi') log.debug(u'retranslateUi')
self.QuickVersionLabel.setText( self.QuickVersionLabel.setText(self.trUtf8(u'Version:'))
translate(u'BibleMediaItem', u'Version:')) self.QuickSecondVersionLabel.setText(self.trUtf8(u'Dual:'))
self.QuickSecondVersionLabel.setText( self.QuickSearchLabel.setText(self.trUtf8(u'Search Type:'))
translate(u'BibleMediaItem', u'Dual:')) self.QuickSearchLabel.setText(self.trUtf8(u'Find:'))
self.QuickSearchLabel.setText( self.QuickSearchButton.setText(self.trUtf8(u'Search'))
translate(u'BibleMediaItem', u'Search Type:')) self.QuickClearLabel.setText(self.trUtf8(u'Results:'))
self.QuickSearchLabel.setText(translate(u'BibleMediaItem', u'Find:')) self.AdvancedVersionLabel.setText(self.trUtf8(u'Version:'))
self.QuickSearchButton.setText(translate(u'BibleMediaItem', u'Search')) self.AdvancedSecondBibleLabel.setText(self.trUtf8(u'Dual:'))
self.QuickClearLabel.setText(translate(u'BibleMediaItem', u'Results:')) self.AdvancedBookLabel.setText(self.trUtf8(u'Book:'))
self.AdvancedVersionLabel.setText( self.AdvancedChapterLabel.setText(self.trUtf8(u'Chapter:'))
translate(u'BibleMediaItem', u'Version:')) self.AdvancedVerseLabel.setText(self.trUtf8(u'Verse:'))
self.AdvancedSecondBibleLabel.setText( self.AdvancedFromLabel.setText(self.trUtf8(u'From:'))
translate(u'BibleMediaItem', u'Dual:')) self.AdvancedToLabel.setText(self.trUtf8(u'To:'))
self.AdvancedBookLabel.setText(translate(u'BibleMediaItem', u'Book:')) self.AdvancedClearLabel.setText(self.trUtf8(u'Results:'))
self.AdvancedChapterLabel.setText( self.AdvancedSearchButton.setText(self.trUtf8(u'Search'))
translate(u'BibleMediaItem', u'Chapter:')) self.QuickSearchComboBox.addItem(self.trUtf8(u'Verse Search'))
self.AdvancedVerseLabel.setText(translate(u'BibleMediaItem', u'Verse:')) self.QuickSearchComboBox.addItem(self.trUtf8(u'Text Search'))
self.AdvancedFromLabel.setText(translate(u'BibleMediaItem', u'From:')) self.ClearQuickSearchComboBox.addItem(self.trUtf8(u'Clear'))
self.AdvancedToLabel.setText(translate(u'BibleMediaItem', u'To:')) self.ClearQuickSearchComboBox.addItem(self.trUtf8(u'Keep'))
self.AdvancedClearLabel.setText( self.ClearAdvancedSearchComboBox.addItem(self.trUtf8(u'Clear'))
translate(u'BibleMediaItem', u'Results:')) self.ClearAdvancedSearchComboBox.addItem(self.trUtf8(u'Keep'))
self.AdvancedSearchButton.setText(
translate(u'BibleMediaItem', u'Search'))
self.QuickSearchComboBox.addItem(
translate(u'BibleMediaItem', u'Verse Search'))
self.QuickSearchComboBox.addItem(
translate(u'BibleMediaItem', u'Text Search'))
self.ClearQuickSearchComboBox.addItem(
translate(u'BibleMediaItem', u'Clear'))
self.ClearQuickSearchComboBox.addItem(
translate(u'BibleMediaItem', u'Keep'))
self.ClearAdvancedSearchComboBox.addItem(
translate(u'BibleMediaItem', u'Clear'))
self.ClearAdvancedSearchComboBox.addItem(
translate(u'BibleMediaItem', u'Keep'))
def initialise(self): def initialise(self):
log.debug(u'bible manager initialise') log.debug(u'bible manager initialise')
@ -287,8 +273,8 @@ class BibleMediaItem(MediaManagerItem):
log.debug(u'bible manager initialise complete') log.debug(u'bible manager initialise complete')
def setQuickMessage(self, text): def setQuickMessage(self, text):
self.QuickMessage.setText(translate(u'BibleMediaItem', unicode(text))) self.QuickMessage.setText(text)
self.AdvancedMessage.setText(translate(u'BibleMediaItem', unicode(text))) self.AdvancedMessage.setText(text)
Receiver().send_message(u'process_events') Receiver().send_message(u'process_events')
#minor delay to get the events processed #minor delay to get the events processed
time.sleep(0.1) time.sleep(0.1)
@ -498,8 +484,7 @@ class BibleMediaItem(MediaManagerItem):
book, 1) book, 1)
if self.verses == 0: if self.verses == 0:
self.AdvancedSearchButton.setEnabled(False) self.AdvancedSearchButton.setEnabled(False)
self.AdvancedMessage.setText( self.AdvancedMessage.setText(self.trUtf8(u'Bible not fully loaded'))
translate(u'BibleMediaItem', u'Bible not fully loaded'))
else: else:
self.AdvancedSearchButton.setEnabled(True) self.AdvancedSearchButton.setEnabled(True)
self.AdvancedMessage.setText(u'') self.AdvancedMessage.setText(u'')
@ -592,7 +577,7 @@ class BibleMediaItem(MediaManagerItem):
if end_verse == u'': if end_verse == u'':
end_verse = 99 end_verse = 99
if start_chapter == u'': if start_chapter == u'':
message = u'No chapter found for search criteria' message = self.trUtf8(u'No chapter found for search criteria')
log.debug(u'results = %s @ %s : %s @ %s : %s'% \ log.debug(u'results = %s @ %s : %s @ %s : %s'% \
(unicode(book), unicode(start_chapter), unicode(end_chapter), (unicode(book), unicode(start_chapter), unicode(end_chapter),
unicode(start_verse), unicode(end_verse))) unicode(start_verse), unicode(end_verse)))
@ -608,6 +593,5 @@ class BibleMediaItem(MediaManagerItem):
self.version = unicode(self.parent.biblemanager.get_meta_data( self.version = unicode(self.parent.biblemanager.get_meta_data(
bible, u'Version').value) bible, u'Version').value)
else: else:
QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(
translate(u'BibleMediaItem', u'Information'), self, self.trUtf8(u'Information'), message)
translate(u'BibleMediaItem', message))

39
openlp/plugins/custom/forms/editcustomdialog.py
View File

@ -78,7 +78,6 @@ class Ui_customEditDialog(object):
self.verticalLayout_2.setObjectName(u'verticalLayout_2') self.verticalLayout_2.setObjectName(u'verticalLayout_2')
self.AddButton = QtGui.QPushButton(self.ButtonWidge) self.AddButton = QtGui.QPushButton(self.ButtonWidge)
self.AddButton.setObjectName(u'AddButton') self.AddButton.setObjectName(u'AddButton')
self.AddButton.setToolTip(translate(u'customEditDialog', u'Add new slide at bottom'))
self.verticalLayout_2.addWidget(self.AddButton) self.verticalLayout_2.addWidget(self.AddButton)
self.EditButton = QtGui.QPushButton(self.ButtonWidge) self.EditButton = QtGui.QPushButton(self.ButtonWidge)
self.EditButton.setObjectName(u'EditButton') self.EditButton.setObjectName(u'EditButton')
@ -138,22 +137,22 @@ class Ui_customEditDialog(object):
customEditDialog.setTabOrder(self.ThemeComboBox, self.buttonBox) customEditDialog.setTabOrder(self.ThemeComboBox, self.buttonBox)
def retranslateUi(self, customEditDialog): def retranslateUi(self, customEditDialog):
self.UpButton.setToolTip(translate(u'customEditDialog', u'Move slide Up 1')) self.UpButton.setToolTip(self.trUtf8(u'Move slide Up 1'))
self.DownButton.setToolTip(translate(u'customEditDialog', u'Move slide down 1')) self.DownButton.setToolTip(self.trUtf8(u'Move slide down 1'))
customEditDialog.setWindowTitle(translate(u'customEditDialog', 'Edit Custom Slides')) customEditDialog.setWindowTitle(self.trUtf8(u'Edit Custom Slides'))
self.TitleLabel.setText(translate(u'customEditDialog', 'Title:')) self.TitleLabel.setText(self.trUtf8(u'Title:'))
self.AddButton.setText(translate(u'customEditDialog', 'Add New')) self.AddButton.setText(self.trUtf8(u'Add New'))
self.AddButton.setToolTip(translate(u'customEditDialog', u'Add new slide at bottom')) self.AddButton.setToolTip(self.trUtf8(u'Add new slide at bottom'))
self.EditButton.setText(translate(u'customEditDialog', 'Edit')) self.EditButton.setText(self.trUtf8(u'Edit'))
self.EditButton.setToolTip(translate(u'customEditDialog', u'Edit selected slide')) self.EditButton.setToolTip(self.trUtf8(u'Edit selected slide'))
self.EditAllButton.setText(translate(u'customEditDialog', 'Edit All')) self.EditAllButton.setText(self.trUtf8(u'Edit All'))
self.EditAllButton.setToolTip(translate(u'customEditDialog', u'Edit all slides')) self.EditAllButton.setToolTip(self.trUtf8(u'Edit all slides'))
self.SaveButton.setText(translate(u'customEditDialog', 'Save')) self.SaveButton.setText(self.trUtf8(u'Save'))
self.SaveButton.setToolTip(translate(u'customEditDialog', u'Replace edited slide')) self.SaveButton.setToolTip(self.trUtf8(u'Replace edited slide'))
self.DeleteButton.setText(translate(u'customEditDialog', 'Delete')) self.DeleteButton.setText(self.trUtf8(u'Delete'))
self.DeleteButton.setToolTip(translate(u'customEditDialog', u'Delete selected slide')) self.DeleteButton.setToolTip(self.trUtf8(u'Delete selected slide'))
self.ClearButton.setText(translate(u'customEditDialog', 'Clear')) self.ClearButton.setText(self.trUtf8(u'Clear'))
self.ClearButton.setToolTip(translate(u'customEditDialog', u'Clear edit area')) self.ClearButton.setToolTip(self.trUtf8(u'Clear edit area'))
self.ThemeLabel.setText(translate(u'customEditDialog', 'Theme:')) self.ThemeLabel.setText(self.trUtf8(u'Theme:'))
self.ThemeComboBox.setToolTip(translate(u'customEditDialog', u'Set Theme for Slides')) self.ThemeComboBox.setToolTip(self.trUtf8(u'Set Theme for Slides'))
self.CreditLabel.setText(translate(u'customEditDialog', 'Credits:')) self.CreditLabel.setText(self.trUtf8(u'Credits:'))

15
openlp/plugins/custom/forms/editcustomform.py
View File

@ -60,7 +60,6 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
QtCore.SIGNAL(u'pressed()'), self.onUpButtonPressed) QtCore.SIGNAL(u'pressed()'), self.onUpButtonPressed)
QtCore.QObject.connect(self.DownButton, QtCore.QObject.connect(self.DownButton,
QtCore.SIGNAL(u'pressed()'), self.onDownButtonPressed) QtCore.SIGNAL(u'pressed()'), self.onDownButtonPressed)
QtCore.QObject.connect(self.VerseListView, QtCore.QObject.connect(self.VerseListView,
QtCore.SIGNAL(u'itemDoubleClicked(QListWidgetItem*)'), QtCore.SIGNAL(u'itemDoubleClicked(QListWidgetItem*)'),
self.onVerseListViewSelected) self.onVerseListViewSelected)
@ -117,17 +116,15 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
def accept(self): def accept(self):
valid, message = self._validate() valid, message = self._validate()
if not valid: if not valid:
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self, self.trUtf8(u'Error'), message,
translate(u'customEditDialog', u'Error'), message, QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return return
sxml = SongXMLBuilder() sxml = SongXMLBuilder()
sxml.new_document() sxml.new_document()
sxml.add_lyrics_to_song() sxml.add_lyrics_to_song()
count = 1 count = 1
for i in range (0, self.VerseListView.count()): for i in range (0, self.VerseListView.count()):
sxml.add_verse_to_lyrics( sxml.add_verse_to_lyrics(u'custom', unicode(count),
u'custom', unicode(count),
unicode(self.VerseListView.item(i).text())) unicode(self.VerseListView.item(i).text()))
count += 1 count += 1
self.customSlide.title = unicode(self.TitleEdit.displayText()) self.customSlide.title = unicode(self.TitleEdit.displayText())
@ -229,11 +226,9 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
def _validate(self): def _validate(self):
if len(self.TitleEdit.displayText()) == 0: if len(self.TitleEdit.displayText()) == 0:
self.TitleEdit.setFocus() self.TitleEdit.setFocus()
return False, translate( return False, self.trUtf8(u'You need to enter a title \n')
u'customEditDialog', u'You need to enter a title \n')
# must have 1 slide # must have 1 slide
if self.VerseListView.count() == 0: if self.VerseListView.count() == 0:
self.VerseTextEdit.setFocus() self.VerseTextEdit.setFocus()
return False, translate( return False, self.trUtf8(u'You need to enter a slide \n')
u'customEditDialog', u'You need to enter a slide \n')
return True, u'' return True, u''

13
openlp/plugins/images/lib/imagetab.py
View File

@ -31,7 +31,8 @@ class ImageTab(SettingsTab):
ImageTab is the Image settings tab in the settings dialog. ImageTab is the Image settings tab in the settings dialog.
""" """
def __init__(self): def __init__(self):
SettingsTab.__init__(self, translate(u'ImageTab', u'Images'), u'Image') #SettingsTab.__init__(self, self.trUtf8(u'Images'), u'Image')
SettingsTab.__init__(self, u'Images', u'Image')
def setupUi(self): def setupUi(self):
self.setObjectName(u'ImageTab') self.setObjectName(u'ImageTab')
@ -60,9 +61,9 @@ class ImageTab(SettingsTab):
QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged) QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
def retranslateUi(self): def retranslateUi(self):
self.ImageSettingsGroupBox.setTitle(translate(u'ImageTab', u'Image Settings')) self.ImageSettingsGroupBox.setTitle(self.trUtf8(u'Image Settings'))
self.TimeoutLabel.setText(translate(u'ImageTab', u'Slide Loop Delay:')) self.TimeoutLabel.setText(self.trUtf8(u'Slide Loop Delay:'))
self.TimeoutSpinBox.setSuffix(translate(u'ImageTab', u's')) self.TimeoutSpinBox.setSuffix(self.trUtf8(u'sec'))
def onTimeoutSpinBoxChanged(self): def onTimeoutSpinBoxChanged(self):
self.loop_delay = self.TimeoutSpinBox.value() self.loop_delay = self.TimeoutSpinBox.value()
@ -73,7 +74,7 @@ class ImageTab(SettingsTab):
def save(self): def save(self):
self.config.set_config(u'loop delay', self.loop_delay) self.config.set_config(u'loop delay', self.loop_delay)
Receiver().send_message(u'update_spin_delay', self.loop_delay ) Receiver().send_message(u'update_spin_delay', self.loop_delay)
def postSetUp(self): def postSetUp(self):
Receiver().send_message(u'update_spin_delay', self.loop_delay ) Receiver().send_message(u'update_spin_delay', self.loop_delay)

11
openlp/plugins/images/lib/mediaitem.py
View File

@ -48,8 +48,9 @@ class ImageMediaItem(MediaManagerItem):
self.PluginTextShort = u'Image' self.PluginTextShort = u'Image'
self.ConfigSection = u'images' self.ConfigSection = u'images'
self.IconPath = u'images/image' self.IconPath = u'images/image'
self.OnNewPrompt = u'Select Image(s)' self.OnNewPrompt = self.trUtf8(u'Select Image(s)')
self.OnNewFileMasks = u'Images (*.jpg *jpeg *.gif *.png *.bmp)' self.OnNewFileMasks = \
self.trUtf8(u'Images (*.jpg *jpeg *.gif *.png *.bmp)')
# this next is a class, not an instance of a class - it will # this next is a class, not an instance of a class - it will
# be instanced by the base MediaManagerItem # be instanced by the base MediaManagerItem
self.ListViewWithDnD_class = ImageListView self.ListViewWithDnD_class = ImageListView
@ -94,9 +95,9 @@ class ImageMediaItem(MediaManagerItem):
self.OverrideCheckBox.setObjectName(u'OverrideCheckBox') self.OverrideCheckBox.setObjectName(u'OverrideCheckBox')
self.OverrideCheckBox.setCheckable(True) self.OverrideCheckBox.setCheckable(True)
self.OverrideCheckBox.setChecked(False) self.OverrideCheckBox.setChecked(False)
self.OverrideCheckBox.setText(translate(u'ImagePlugin', u'Override background')) self.OverrideCheckBox.setText(self.trUtf8(u'Override background'))
self.OverrideCheckBox.setStatusTip( self.OverrideCheckBox.setStatusTip(
translate(u'ImageMedia', u'Allow background of live slide to be overridden')) self.trUtf8(u'Allow background of live slide to be overridden'))
self.OverrideLayout.addWidget(self.OverrideCheckBox) self.OverrideLayout.addWidget(self.OverrideCheckBox)
self.OverrideLabel = QtGui.QLabel(self.ImageWidget) self.OverrideLabel = QtGui.QLabel(self.ImageWidget)
self.OverrideLabel.setObjectName(u'OverrideLabel') self.OverrideLabel.setObjectName(u'OverrideLabel')
@ -139,7 +140,7 @@ class ImageMediaItem(MediaManagerItem):
items = self.ListView.selectedIndexes() items = self.ListView.selectedIndexes()
if len(items) == 0: if len(items) == 0:
return False return False
service_item.title = u'Image(s)' service_item.title = self.trUtf8(u'Image(s)')
for item in items: for item in items:
bitem = self.ListView.item(item.row()) bitem = self.ListView.item(item.row())
filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())

62
openlp/plugins/songs/forms/editsongdialog.py
View File

@ -414,33 +414,37 @@ class Ui_EditSongDialog(object):
EditSongDialog.setTabOrder(self.CommentsEdit, self.ButtonBox) EditSongDialog.setTabOrder(self.CommentsEdit, self.ButtonBox)
def retranslateUi(self, EditSongDialog): def retranslateUi(self, EditSongDialog):
EditSongDialog.setWindowTitle(translate(u'EditSongDialog', u'Song Editor')) EditSongDialog.setWindowTitle(self.trUtf8(u'Song Editor'))
self.TitleLabel.setText(translate(u'EditSongDialog', u'Title:')) self.TitleLabel.setText(self.trUtf8(u'Title:'))
self.AlternativeTitleLabel.setText(translate(u'EditSongDialog', u'Alternative Title:')) self.AlternativeTitleLabel.setText(self.trUtf8(u'Alternative Title:'))
self.LyricsLabel.setText(translate(u'EditSongDialog', u'Lyrics:')) self.LyricsLabel.setText(self.trUtf8(u'Lyrics:'))
self.VerseOrderLabel.setText(translate(u'EditSongDialog', u'Verse Order:')) self.VerseOrderLabel.setText(self.trUtf8(u'Verse Order:'))
self.VerseAddButton.setText(translate(u'EditSongDialog', u'Add')) self.VerseAddButton.setText(self.trUtf8(u'Add'))
self.VerseEditButton.setText(translate(u'EditSongDialog', u'Edit')) self.VerseEditButton.setText(self.trUtf8(u'Edit'))
self.VerseEditAllButton.setText(translate(u'EditSongDialog', u'Edit All')) self.VerseEditAllButton.setText(self.trUtf8(u'Edit All'))
self.VerseDeleteButton.setText(translate(u'EditSongDialog', u'Delete')) self.VerseDeleteButton.setText(self.trUtf8(u'Delete'))
self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.LyricsTab), self.SongTabWidget.setTabText(
translate(u'EditSongDialog', u'Title && Lyrics')) self.SongTabWidget.indexOf(self.LyricsTab),
self.AuthorsGroupBox.setTitle(translate(u'EditSongDialog', u'Authors')) self.trUtf8(u'Title && Lyrics'))
self.AuthorAddButton.setText(translate(u'EditSongDialog', u'&Add to Song')) self.AuthorsGroupBox.setTitle(self.trUtf8(u'Authors'))
self.AuthorRemoveButton.setText(translate(u'EditSongDialog', u'&Remove')) self.AuthorAddButton.setText(self.trUtf8(u'&Add to Song'))
self.MaintenanceButton.setText(translate(u'EditSongDialog', u'&Manage Authors, Topics, Books')) self.AuthorRemoveButton.setText(self.trUtf8(u'&Remove'))
self.TopicGroupBox.setTitle(translate(u'EditSongDialog', u'Topic')) self.MaintenanceButton.setText(
self.TopicAddButton.setText(translate(u'EditSongDialog', u'A&dd to Song')) self.trUtf8(u'&Manage Authors, Topics, Books'))
self.TopicRemoveButton.setText(translate(u'EditSongDialog', u'R&emove')) self.TopicGroupBox.setTitle(self.trUtf8(u'Topic'))
self.SongBookGroup.setTitle(translate(u'EditSongDialog', u'Song Book')) self.TopicAddButton.setText(self.trUtf8(u'A&dd to Song'))
self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.AuthorsTab), self.TopicRemoveButton.setText(self.trUtf8(u'R&emove'))
translate(u'EditSongDialog', u'Authors, Topics && Book')) self.SongBookGroup.setTitle(self.trUtf8(u'Song Book'))
self.ThemeGroupBox.setTitle(translate(u'EditSongDialog', u'Theme')) self.SongTabWidget.setTabText(
self.ThemeAddButton.setText(translate(u'EditSongDialog', u'Add a Theme')) self.SongTabWidget.indexOf(self.AuthorsTab),
self.CopyrightGroupBox.setTitle(translate(u'EditSongDialog', u'Copyright Information')) self.trUtf8(u'Authors, Topics && Book'))
self.CopyrightInsertButton.setText(translate(u'EditSongDialog', '©')) self.ThemeGroupBox.setTitle(self.trUtf8(u'Theme'))
self.CCLILabel.setText(translate(u'EditSongDialog', u'CCLI Number:')) self.ThemeAddButton.setText(self.trUtf8(u'Add a Theme'))
self.CommentsGroupBox.setTitle(translate(u'EditSongDialog', u'Comments')) self.CopyrightGroupBox.setTitle(self.trUtf8(u'Copyright Information'))
self.SongTabWidget.setTabText(self.SongTabWidget.indexOf(self.ThemeTab), self.CopyrightInsertButton.setText(self.trUtf8(u'\xa9'))
translate(u'EditSongDialog', u'Theme, Copyright Info && Comments')) self.CCLILabel.setText(self.trUtf8(u'CCLI Number:'))
self.CommentsGroupBox.setTitle(self.trUtf8(u'Comments'))
self.SongTabWidget.setTabText(
self.SongTabWidget.indexOf(self.ThemeTab),
self.trUtf8(u'Theme, Copyright Info && Comments'))

174
resources/forms/about.ui
View File

@ -1,7 +1,8 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AboutDialog</class> <class>AboutDialog</class>
<widget class="QDialog" name="AboutDialog" > <widget class="QDialog" name="AboutDialog">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -9,152 +10,165 @@
<height>481</height> <height>481</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>About openlp.org</string> <string>About openlp.org</string>
</property> </property>
<property name="windowIcon" > <property name="windowIcon">
<iconset> <iconset>
<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="AboutDialogLayout" > <layout class="QVBoxLayout" name="AboutDialogLayout">
<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="Logo" > <widget class="QLabel" name="Logo">
<property name="autoFillBackground" > <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="styleSheet" > <property name="styleSheet">
<string notr="true" >background-color: rgb(255, 255, 255);</string> <string notr="true">background-color: rgb(255, 255, 255);</string>
</property> </property>
<property name="frameShape" > <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="lineWidth" > <property name="lineWidth">
<number>1</number> <number>1</number>
</property> </property>
<property name="text" > <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap" > <property name="pixmap">
<pixmap resource="../images/openlp-2.qrc" >:/graphics/about-new.bmp</pixmap> <pixmap resource="../images/openlp-2.qrc">:/graphics/about-new.bmp</pixmap>
</property> </property>
<property name="scaledContents" > <property name="scaledContents">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTabWidget" name="AboutNotebook" > <widget class="QTabWidget" name="AboutNotebook">
<property name="currentIndex" > <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="LicenseTab" > <widget class="QWidget" name="LicenseTab">
<attribute name="title" > <attribute name="title">
<string>License</string> <string>License</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="LicenseTabLayout" > <layout class="QVBoxLayout" name="LicenseTabLayout">
<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="CopyrightLabel" > <widget class="QLabel" name="CopyrightLabel">
<property name="text" > <property name="text">
<string>Copyright © 2004-2008 openlp.org Foundation</string> <string>Copyright © 2004-2008 openlp.org Foundation</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="AboutAuthors" > <widget class="QLabel" name="AboutAuthors">
<property name="text" > <property name="text">
<string>openlp.org is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.</string> <string>openlp.org is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignJustify|Qt::AlignVCenter</set> <set>Qt::AlignJustify|Qt::AlignVCenter</set>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="License1Label" > <widget class="QLabel" name="License1Label">
<property name="text" > <property name="text">
<string>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</string> <string>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignJustify|Qt::AlignVCenter</set> <set>Qt::AlignJustify|Qt::AlignVCenter</set>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="License2Label" > <widget class="QLabel" name="License2Label">
<property name="text" > <property name="text">
<string>You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.</string> <string>You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignJustify|Qt::AlignVCenter</set> <set>Qt::AlignJustify|Qt::AlignVCenter</set>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="License3Label" > <widget class="QLabel" name="License3Label">
<property name="text" > <property name="text">
<string>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</string> <string>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignJustify|Qt::AlignVCenter</set> <set>Qt::AlignJustify|Qt::AlignVCenter</set>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="LicenseSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="CreditsTab" > <widget class="QWidget" name="CreditsTab">
<attribute name="title" > <attribute name="title">
<string>Credits</string> <string>Credits</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="CreditsTabLayout" > <layout class="QVBoxLayout" name="CreditsTabLayout">
<property name="spacing" > <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>8</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QPlainTextEdit" name="plainTextEdit" > <widget class="QPlainTextEdit" name="plainTextEdit">
<property name="readOnly" > <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="plainText" > <property name="plainText">
<string>Project Lead <string>Project Lead
Raoul "superfly" Snyman Raoul &quot;superfly&quot; Snyman
Developers Developers
Tim "TRB143" Bentley Tim &quot;TRB143&quot; Bentley
Jonathan "gushie" Corwin Jonathan &quot;gushie&quot; Corwin
Scott "sguerrieri" Guerrieri Scott &quot;sguerrieri&quot; Guerrieri
Raoul "superfly" Snyman Raoul &quot;superfly&quot; Snyman
Martin "mijiti" Thompson Martin &quot;mijiti&quot; Thompson
Carsten "catini" Tingaard</string> Carsten &quot;catini&quot; Tingaard</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -163,20 +177,20 @@ Developers
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QWidget" native="1" name="ButtonWidget" > <widget class="QWidget" name="ButtonWidget" native="true">
<layout class="QHBoxLayout" name="ButtonWidgetLayout" > <layout class="QHBoxLayout" name="ButtonWidgetLayout">
<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>
<spacer name="horizontalSpacer" > <spacer name="horizontalSpacer">
<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>275</width> <width>275</width>
<height>20</height> <height>20</height>
@ -185,15 +199,15 @@ Developers
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="ContributeButton" > <widget class="QPushButton" name="ContributeButton">
<property name="text" > <property name="text">
<string>Contribute</string> <string>Contribute</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="CloseButton" > <widget class="QPushButton" name="CloseButton">
<property name="text" > <property name="text">
<string>Close</string> <string>Close</string>
</property> </property>
</widget> </widget>
@ -202,8 +216,8 @@ Developers
</widget> </widget>
</item> </item>
</layout> </layout>
<action name="extContributeItem" > <action name="extContributeItem">
<property name="text" > <property name="text">
<string>&amp;Contribute</string> <string>&amp;Contribute</string>
</property> </property>
</action> </action>
@ -212,7 +226,7 @@ Developers
<tabstop>ContributeButton</tabstop> <tabstop>ContributeButton</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../images/openlp-2.qrc" /> <include location="../images/openlp-2.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
@ -221,11 +235,11 @@ Developers
<receiver>AboutDialog</receiver> <receiver>AboutDialog</receiver>
<slot>close()</slot> <slot>close()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>348</x> <x>348</x>
<y>361</y> <y>361</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>196</x> <x>196</x>
<y>189</y> <y>189</y>
</hint> </hint>
@ -233,19 +247,19 @@ Developers
</connection> </connection>
</connections> </connections>
<designerdata> <designerdata>
<property name="gridDeltaX" > <property name="gridDeltaX">
<number>10</number> <number>10</number>
</property> </property>
<property name="gridDeltaY" > <property name="gridDeltaY">
<number>10</number> <number>10</number>
</property> </property>
<property name="gridSnapX" > <property name="gridSnapX">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="gridSnapY" > <property name="gridSnapY">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="gridVisible" > <property name="gridVisible">
<bool>true</bool> <bool>true</bool>
</property> </property>
</designerdata> </designerdata>