Andreas Preikschat has proposed merging lp:~googol-hush/openlp/i18n into
lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol-hush/openlp/i18n/+merge/65902
Hello,
I removed the TranslatedNames lists because they were not used at all. Besides
that they are not translated because they are class constants ("translated" at
a time where we are not able to translate strings). For the same reason I
removed lines 31-35 and added the lines 137-145.
I made a few strings translatable and moved a few other strings to the
retranslateUi method.
Also I removed the "close button" (between the "Options" and "Copy" buttons
because it takes extra space. See:
http://manual.openlp.org/_images/printservice2.png (note, that there is
actually a combobox to choose the size of the preview).
Things to be done (as a consequence of this proposal):
- add a comment on bug #796440 that the strings mentioned in comment #8 and #9
are fixed
- file a bug report to update the service print image in the online manual
--
https://code.launchpad.net/~googol-hush/openlp/i18n/+merge/65902
Your team OpenLP Core is requested to review the proposed merge of
lp:~googol-hush/openlp/i18n into lp:openlp.
=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py 2011-06-12 16:02:52 +0000
+++ openlp/core/lib/theme.py 2011-06-26 16:19:23 +0000
@@ -178,10 +178,6 @@
Center = 2
Names = [u'left', u'right', u'center']
- TranslatedNames = [
- translate('OpenLP.ThemeWizard', 'Left'),
- translate('OpenLP.ThemeWizard', 'Right'),
- translate('OpenLP.ThemeWizard', 'Center')]
class VerticalType(object):
@@ -193,7 +189,6 @@
Bottom = 2
Names = [u'top', u'middle', u'bottom']
- TranslatedNames = [UiStrings().Top, UiStrings().Middle, UiStrings().Bottom]
BOOLEAN_LIST = [u'bold', u'italics', u'override', u'outline', u'shadow',
=== modified file 'openlp/core/ui/printservicedialog.py'
--- openlp/core/ui/printservicedialog.py 2011-06-12 16:02:52 +0000
+++ openlp/core/ui/printservicedialog.py 2011-06-26 16:19:23 +0000
@@ -41,11 +41,6 @@
Fifty = 4
TwentyFive = 5
- Sizes = [
- translate('OpenLP.PrintServiceDialog', 'Fit Page'),
- translate('OpenLP.PrintServiceDialog', 'Fit Width'),
- u'100%', u'75%', u'50%', u'25%']
-
class Ui_PrintServiceDialog(object):
def setupUi(self, printServiceDialog):
@@ -59,18 +54,14 @@
self.toolbar.setIconSize(QtCore.QSize(22, 22))
self.toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
self.printButton = self.toolbar.addAction(
- build_icon(u':/general/general_print.png'), 'Print')
+ build_icon(u':/general/general_print.png'),
+ translate('OpenLP.PrintServiceForm', 'Print'))
self.optionsButton = QtGui.QToolButton(self.toolbar)
- self.optionsButton.setText(translate('OpenLP.PrintServiceForm',
- 'Options'))
self.optionsButton.setToolButtonStyle(
QtCore.Qt.ToolButtonTextBesideIcon)
self.optionsButton.setIcon(build_icon(u':/system/system_configure.png'))
self.optionsButton.setCheckable(True)
self.toolbar.addWidget(self.optionsButton)
- self.closeButton = self.toolbar.addAction(
- build_icon(u':/system/system_close.png'),
- translate('OpenLP.PrintServiceForm', 'Close'))
self.toolbar.addSeparator()
self.plainCopy = self.toolbar.addAction(
build_icon(u':/system/system_edit_copy.png'),
@@ -81,24 +72,18 @@
self.toolbar.addSeparator()
self.zoomInButton = QtGui.QToolButton(self.toolbar)
self.zoomInButton.setIcon(build_icon(u':/general/general_zoom_in.png'))
- self.zoomInButton.setToolTip(translate('OpenLP.PrintServiceForm',
- 'Zoom In'))
self.zoomInButton.setObjectName(u'zoomInButton')
self.zoomInButton.setIconSize(QtCore.QSize(22, 22))
self.toolbar.addWidget(self.zoomInButton)
self.zoomOutButton = QtGui.QToolButton(self.toolbar)
self.zoomOutButton.setIcon(
build_icon(u':/general/general_zoom_out.png'))
- self.zoomOutButton.setToolTip(translate('OpenLP.PrintServiceForm',
- 'Zoom Out'))
self.zoomOutButton.setObjectName(u'zoomOutButton')
self.zoomOutButton.setIconSize(QtCore.QSize(22, 22))
self.toolbar.addWidget(self.zoomOutButton)
self.zoomOriginalButton = QtGui.QToolButton(self.toolbar)
self.zoomOriginalButton.setIcon(
build_icon(u':/general/general_zoom_original.png'))
- self.zoomOriginalButton.setToolTip(translate('OpenLP.PrintServiceForm',
- 'Zoom Original'))
self.zoomOriginalButton.setObjectName(u'zoomOriginalButton')
self.zoomOriginalButton.setIconSize(QtCore.QSize(22, 22))
self.toolbar.addWidget(self.zoomOriginalButton)
@@ -116,20 +101,17 @@
self.optionsLayout.setContentsMargins(8, 8, 8, 8)
self.titleLabel = QtGui.QLabel(self.optionsWidget)
self.titleLabel.setObjectName(u'titleLabel')
- self.titleLabel.setText(u'Title:')
self.optionsLayout.addWidget(self.titleLabel)
self.titleLineEdit = QtGui.QLineEdit(self.optionsWidget)
self.titleLineEdit.setObjectName(u'titleLineEdit')
self.optionsLayout.addWidget(self.titleLineEdit)
self.footerLabel = QtGui.QLabel(self.optionsWidget)
self.footerLabel.setObjectName(u'footerLabel')
- self.footerLabel.setText(u'Custom Footer Text:')
self.optionsLayout.addWidget(self.footerLabel)
self.footerTextEdit = SpellTextEdit(self.optionsWidget)
self.footerTextEdit.setObjectName(u'footerTextEdit')
self.optionsLayout.addWidget(self.footerTextEdit)
- self.optionsGroupBox = QtGui.QGroupBox(
- translate('OpenLP.PrintServiceForm','Other Options'))
+ self.optionsGroupBox = QtGui.QGroupBox()
self.groupLayout = QtGui.QVBoxLayout()
self.slideTextCheckBox = QtGui.QCheckBox()
self.groupLayout.addWidget(self.slideTextCheckBox)
@@ -150,6 +132,19 @@
def retranslateUi(self, printServiceDialog):
printServiceDialog.setWindowTitle(UiStrings().PrintService)
+ self.zoomOutButton.setToolTip(translate('OpenLP.PrintServiceForm',
+ 'Zoom Out'))
+ self.zoomOriginalButton.setToolTip(translate('OpenLP.PrintServiceForm',
+ 'Zoom Original'))
+ self.zoomInButton.setToolTip(translate('OpenLP.PrintServiceForm',
+ 'Zoom In'))
+ self.optionsButton.setText(translate('OpenLP.PrintServiceForm',
+ 'Options'))
+ self.titleLabel.setText(translate('OpenLP.PrintServiceForm', 'Title:'))
+ self.footerLabel.setText(translate('OpenLP.PrintServiceForm',
+ 'Custom Footer Text:'))
+ self.optionsGroupBox.setTitle(
+ translate('OpenLP.PrintServiceForm','Other Options'))
self.slideTextCheckBox.setText(translate('OpenLP.PrintServiceForm',
'Include slide text if available'))
self.pageBreakAfterText.setText(translate('OpenLP.PrintServiceForm',
@@ -160,10 +155,13 @@
'Include play length of media items'))
self.titleLineEdit.setText(translate('OpenLP.PrintServiceForm',
'Service Sheet'))
- self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Page])
- self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Width])
- self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.OneHundred])
- self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.SeventyFive])
- self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.Fifty])
- self.zoomComboBox.addItem(ZoomSize.Sizes[ZoomSize.TwentyFive])
+ # Do not change the order.
+ self.zoomComboBox.addItems([
+ translate('OpenLP.PrintServiceDialog', 'Fit Page'),
+ translate('OpenLP.PrintServiceDialog', 'Fit Width'),
+ u'100%',
+ u'75%',
+ u'50%',
+ u'25%']
+ )
=== modified file 'openlp/core/ui/printserviceform.py'
--- openlp/core/ui/printserviceform.py 2011-06-12 16:02:52 +0000
+++ openlp/core/ui/printserviceform.py 2011-06-26 16:19:23 +0000
@@ -137,8 +137,6 @@
# Signals
QtCore.QObject.connect(self.printButton,
QtCore.SIGNAL(u'triggered()'), self.printServiceOrder)
- QtCore.QObject.connect(self.closeButton,
- QtCore.SIGNAL(u'triggered()'), self.accept)
QtCore.QObject.connect(self.zoomOutButton,
QtCore.SIGNAL(u'clicked()'), self.zoomOut)
QtCore.QObject.connect(self.zoomInButton,
@@ -326,8 +324,7 @@
"""
Copies the display text to the clipboard as plain text
"""
- self.mainWindow.clipboard.setText(
- self.document.toPlainText())
+ self.mainWindow.clipboard.setText(self.document.toPlainText())
def copyHtmlText(self):
"""
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
