From fcd5836e0fd5eb9b193bfa89d7e7ee6794e9fa20 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 28 Oct 2009 21:52:13 +0000 Subject: [PATCH] Fix i18n for tabs v3 --- openlp/core/lib/settingstab.py | 17 ----------------- openlp/core/ui/alertstab.py | 3 +-- openlp/core/ui/generaltab.py | 3 +-- openlp/core/ui/settingsdialog.py | 15 ++++++++++----- openlp/core/ui/settingsform.py | 10 +++++----- openlp/core/ui/themestab.py | 3 +-- 6 files changed, 18 insertions(+), 33 deletions(-) diff --git a/openlp/core/lib/settingstab.py b/openlp/core/lib/settingstab.py index b82860618..f9eb60964 100644 --- a/openlp/core/lib/settingstab.py +++ b/openlp/core/lib/settingstab.py @@ -46,8 +46,6 @@ class SettingsTab(QtGui.QWidget): QtGui.QWidget.__init__(self) self.tabTitle = title self.tabTitleVisible = None - # Use the line below when pulling the translation template file. - #self.tabTitle = title self.setupUi() self.retranslateUi() self.initialise() @@ -57,21 +55,6 @@ class SettingsTab(QtGui.QWidget): self.config = PluginConfig(section) self.load() - def setTitle(self, title): - """ - Set the title of the tab. - - ``title`` - The title of the tab, which is usually displayed on the tab. - """ - self.tabTitle = title - - def title(self): - """ - Get the title of the tab. - """ - return self.tabTitle - def setupUi(self): """ Setup the tab's interface. diff --git a/openlp/core/ui/alertstab.py b/openlp/core/ui/alertstab.py index e7ce0a013..e2b8892fa 100644 --- a/openlp/core/ui/alertstab.py +++ b/openlp/core/ui/alertstab.py @@ -32,13 +32,12 @@ class AlertsTab(SettingsTab): """ 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.bg_color = '#660000' def setupUi(self): self.setObjectName(u'AlertsTab') + self.tabTitleVisible = self.trUtf8(u'Alerts') self.AlertsLayout = QtGui.QHBoxLayout(self) self.AlertsLayout.setSpacing(8) self.AlertsLayout.setMargin(8) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 98479af3e..54031ec1a 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -33,11 +33,10 @@ class GeneralTab(SettingsTab): def __init__(self, screen_list): self.screen_list = screen_list 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): self.setObjectName(u'GeneralTab') + self.tabTitleVisible = self.trUtf8(u'General') self.GeneralLayout = QtGui.QHBoxLayout(self) self.GeneralLayout.setSpacing(8) self.GeneralLayout.setMargin(8) diff --git a/openlp/core/ui/settingsdialog.py b/openlp/core/ui/settingsdialog.py index a936f9f2f..28618ea3f 100644 --- a/openlp/core/ui/settingsdialog.py +++ b/openlp/core/ui/settingsdialog.py @@ -36,20 +36,25 @@ class Ui_SettingsDialog(object): self.SettingsTabWidget.setObjectName(u'SettingsTabWidget') self.SettingsLayout.addWidget(self.SettingsTabWidget) self.ButtonsBox = QtGui.QDialogButtonBox(SettingsDialog) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + sizePolicy = QtGui.QSizePolicy( + QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.ButtonsBox.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.ButtonsBox.sizePolicy().hasHeightForWidth()) self.ButtonsBox.setSizePolicy(sizePolicy) self.ButtonsBox.setMaximumSize(QtCore.QSize(16777215, 16777215)) self.ButtonsBox.setOrientation(QtCore.Qt.Horizontal) - self.ButtonsBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) + self.ButtonsBox.setStandardButtons( + QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) self.ButtonsBox.setObjectName(u'ButtonsBox') self.SettingsLayout.addWidget(self.ButtonsBox) self.retranslateUi(SettingsDialog) self.SettingsTabWidget.setCurrentIndex(0) - QtCore.QObject.connect(self.ButtonsBox, QtCore.SIGNAL(u'accepted()'), SettingsDialog.accept) - QtCore.QObject.connect(self.ButtonsBox, QtCore.SIGNAL(u'rejected()'), SettingsDialog.reject) + QtCore.QObject.connect(self.ButtonsBox, + QtCore.SIGNAL(u'accepted()'), SettingsDialog.accept) + QtCore.QObject.connect(self.ButtonsBox, + QtCore.SIGNAL(u'rejected()'), SettingsDialog.reject) QtCore.QMetaObject.connectSlotsByName(SettingsDialog) def retranslateUi(self, SettingsDialog): diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 6d17009af..6c6de14b2 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -48,18 +48,18 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog): self.addTab(u'Alerts', self.AlertsTab) def addTab(self, name, tab): - log.info(u'Adding %s tab' % tab.title()) - self.SettingsTabWidget.addTab(tab, tab.title()) + log.info(u'Adding %s tab' % tab.tabTitle) + self.SettingsTabWidget.addTab(tab, tab.tabTitleVisible) def insertTab(self, tab, location): - log.debug(u'Inserting %s tab' % tab.title()) - self.SettingsTabWidget.insertTab(location + 13, tab, tab.title()) + log.debug(u'Inserting %s tab' % tab.tabTitle) + self.SettingsTabWidget.insertTab(location + 13, tab, tab.tabTitleVisible) def removeTab(self, name): log.debug(u'remove %s tab' % name) for tab_index in range(0, self.SettingsTabWidget.count()): if self.SettingsTabWidget.widget(tab_index) is not None: - if self.SettingsTabWidget.widget(tab_index).title() == name: + if self.SettingsTabWidget.widget(tab_index).tabTitle == name: self.SettingsTabWidget.removeTab(tab_index) def accept(self): diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py index f50e6d227..d53ebb7d9 100644 --- a/openlp/core/ui/themestab.py +++ b/openlp/core/ui/themestab.py @@ -33,11 +33,10 @@ class ThemesTab(SettingsTab): def __init__(self, parent): self.parent = parent SettingsTab.__init__(self, 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): self.setObjectName(u'ThemesTab') + self.tabTitleVisible = self.trUtf8(u'Themes') self.ThemesTabLayout = QtGui.QHBoxLayout(self) self.ThemesTabLayout.setSpacing(8) self.ThemesTabLayout.setMargin(8)