diff --git a/openlp/core/lib/settingstab.py b/openlp/core/lib/settingstab.py
index bd9f22661..f9eb60964 100644
--- a/openlp/core/lib/settingstab.py
+++ b/openlp/core/lib/settingstab.py
@@ -44,9 +44,8 @@ class SettingsTab(QtGui.QWidget):
to write to when the ``save`` method is called.
"""
QtGui.QWidget.__init__(self)
- self.tabTitle = self.trUtf8(title)
- # Use the line below when pulling the translation template file.
- #self.tabTitle = title
+ self.tabTitle = title
+ self.tabTitleVisible = None
self.setupUi()
self.retranslateUi()
self.initialise()
@@ -56,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 c90447c59..00e9dbf29 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -48,19 +48,19 @@ 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())
+ log.debug(u'Inserting %s tab' % tab.tabTitle)
#13 : There are 3 tables currently and locations starts at -10
- self.SettingsTabWidget.insertTab(location + 13, tab, tab.title())
+ 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)
diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py
index bf08acbec..91e051169 100644
--- a/openlp/plugins/bibles/lib/biblestab.py
+++ b/openlp/plugins/bibles/lib/biblestab.py
@@ -42,10 +42,10 @@ class BiblesTab(SettingsTab):
self.show_new_chapters = False
self.display_style = 0
SettingsTab.__init__(self, u'Bibles', u'Bibles')
- #SettingsTab.__init__(self, self.trUtf8(u'Bibles'), u'Bibles')
def setupUi(self):
self.setObjectName(u'BiblesTab')
+ self.tabTitleVisible = self.trUtf8(u'Bibles')
self.BibleLayout = QtGui.QHBoxLayout(self)
self.BibleLayout.setSpacing(8)
self.BibleLayout.setMargin(8)
diff --git a/openlp/plugins/images/lib/imagetab.py b/openlp/plugins/images/lib/imagetab.py
index f5472b02c..893d156a5 100644
--- a/openlp/plugins/images/lib/imagetab.py
+++ b/openlp/plugins/images/lib/imagetab.py
@@ -31,11 +31,11 @@ class ImageTab(SettingsTab):
ImageTab is the Image settings tab in the settings dialog.
"""
def __init__(self):
- #SettingsTab.__init__(self, self.trUtf8(u'Images'), u'Images')
SettingsTab.__init__(self, u'Images', u'Images')
def setupUi(self):
self.setObjectName(u'ImageTab')
+ self.tabTitleVisible = self.trUtf8(u'Images')
self.ImageLayout = QtGui.QFormLayout(self)
self.ImageLayout.setObjectName(u'ImageLayout')
self.ImageSettingsGroupBox = QtGui.QGroupBox(self)
diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py
index 69440faa8..398aa7ca6 100644
--- a/openlp/plugins/media/lib/mediatab.py
+++ b/openlp/plugins/media/lib/mediatab.py
@@ -32,10 +32,10 @@ class MediaTab(SettingsTab):
"""
def __init__(self):
SettingsTab.__init__(self, u'Media', u'Media')
- #SettingsTab.__init__(self, self.trUtf8(u'Media'), u'Media')
def setupUi(self):
self.setObjectName(u'MediaTab')
+ self.tabTitleVisible = self.trUtf8(u'Media')
self.MediaLayout = QtGui.QFormLayout(self)
self.MediaLayout.setObjectName(u'MediaLayout')
self.MediaModeGroupBox = QtGui.QGroupBox(self)
diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py
index 410e3cde9..83921f234 100644
--- a/openlp/plugins/presentations/lib/presentationtab.py
+++ b/openlp/plugins/presentations/lib/presentationtab.py
@@ -32,10 +32,11 @@ class PresentationTab(SettingsTab):
"""
def __init__(self, controllers):
self.controllers = controllers
- SettingsTab.__init__(self, u'Presentation', u'Presentations')
+ SettingsTab.__init__(self, u'Presentations', u'Presentations')
def setupUi(self):
self.setObjectName(u'PresentationTab')
+ self.tabTitleVisible = self.trUtf8(u'Presentations')
self.PresentationLayout = QtGui.QHBoxLayout(self)
self.PresentationLayout.setSpacing(8)
self.PresentationLayout.setMargin(8)
diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py
index b5ea37ece..0fcfa1e20 100644
--- a/openlp/plugins/presentations/presentationplugin.py
+++ b/openlp/plugins/presentations/presentationplugin.py
@@ -62,7 +62,11 @@ class PresentationPlugin(Plugin):
def finalise(self):
log.info(u'Plugin Finalise')
- Plugin.finalise(self)
+ #Ask each controller to tidy up
+ for key in self.controllers:
+ controller = self.controllers[key]
+ if controller.enabled:
+ controller.kill()
self.remove_toolbox_item()
def get_media_manager_item(self):
@@ -105,13 +109,5 @@ class PresentationPlugin(Plugin):
else:
return False
- def finalise(self):
- log.debug(u'Finalise')
- #Ask each controller to tidy up
- for key in self.controllers:
- controller = self.controllers[key]
- if controller.enabled:
- controller.kill()
-
def about(self):
return u'Presentation Plugin
Delivers the ability to show presentations using a number of different programs. The choice of available presentaion programs is available in a drop down.'
diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py
index a1f473c7c..26b5eea30 100644
--- a/openlp/plugins/remotes/lib/remotetab.py
+++ b/openlp/plugins/remotes/lib/remotetab.py
@@ -31,6 +31,7 @@ class RemoteTab(SettingsTab):
def setupUi(self):
self.setObjectName(u'RemoteTab')
+ self.tabTitleVisible = self.trUtf8(u'Remotes')
self.RemoteLayout = QtGui.QFormLayout(self)
self.RemoteLayout.setObjectName(u'RemoteLayout')
self.RemoteModeGroupBox = QtGui.QGroupBox(self)
diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py
index c5c2adbdc..d347c74a6 100644
--- a/openlp/plugins/songs/lib/songstab.py
+++ b/openlp/plugins/songs/lib/songstab.py
@@ -35,6 +35,7 @@ class SongsTab(SettingsTab):
def setupUi(self):
self.setObjectName(u'SongsTab')
+ self.tabTitleVisible = self.trUtf8(u'Songs')
self.SongsLayout = QtGui.QFormLayout(self)
self.SongsLayout.setObjectName(u'SongsLayout')
self.SongsModeGroupBox = QtGui.QGroupBox(self)