openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


The way we do titles in plugintabs at the moment will not let scripts/pylupdate4 get the correct context for translation so you would end up with all plugins translating their title to the same string - obviously not helpful.
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/14060
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py	2009-10-24 16:40:36 +0000
+++ openlp/plugins/bibles/lib/biblestab.py	2009-10-28 01:45:21 +0000
@@ -41,11 +41,11 @@
         self.paragraph_style = True
         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')
+        SettingsTab.__init__(self, section=u'Bibles')
 
     def setupUi(self):
         self.setObjectName(u'BiblesTab')
+        self.setTitle(self.trUtf8(u'Bibles'))
         self.BibleLayout = QtGui.QHBoxLayout(self)
         self.BibleLayout.setSpacing(8)
         self.BibleLayout.setMargin(8)

=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py	2009-10-24 16:40:36 +0000
+++ openlp/plugins/images/lib/imagetab.py	2009-10-28 01:45:21 +0000
@@ -31,11 +31,11 @@
     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')
+        SettingsTab.__init__(self, section=u'Images')
 
     def setupUi(self):
         self.setObjectName(u'ImageTab')
+        self.setTitle(self.trUtf8(u'Images'))
         self.ImageLayout = QtGui.QFormLayout(self)
         self.ImageLayout.setObjectName(u'ImageLayout')
         self.ImageSettingsGroupBox = QtGui.QGroupBox(self)

=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py	2009-10-24 16:40:36 +0000
+++ openlp/plugins/media/lib/mediatab.py	2009-10-28 01:45:21 +0000
@@ -31,11 +31,11 @@
     mediaTab is the media settings tab in the settings dialog.
     """
     def __init__(self):
-        SettingsTab.__init__(self, u'Media', u'Media')
-        #SettingsTab.__init__(self, self.trUtf8(u'Media'), u'Media')
+        SettingsTab.__init__(self, section=u'Media')
 
     def setupUi(self):
         self.setObjectName(u'MediaTab')
+        self.setTitle(self.trUtf8(u'Media'))
         self.MediaLayout = QtGui.QFormLayout(self)
         self.MediaLayout.setObjectName(u'MediaLayout')
         self.MediaModeGroupBox = QtGui.QGroupBox(self)

=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py	2009-10-24 16:40:36 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py	2009-10-28 01:45:21 +0000
@@ -32,10 +32,11 @@
     """
     def __init__(self, controllers):
         self.controllers = controllers
-        SettingsTab.__init__(self, u'Presentation', u'Presentations')
+        SettingsTab.__init__(self, section=u'Presentations')
 
     def setupUi(self):
         self.setObjectName(u'PresentationTab')
+        self.setTitle(self.trUtf8(u'Presentations'))
         self.PresentationLayout = QtGui.QHBoxLayout(self)
         self.PresentationLayout.setSpacing(8)
         self.PresentationLayout.setMargin(8)

=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py	2009-10-24 16:40:36 +0000
+++ openlp/plugins/remotes/lib/remotetab.py	2009-10-28 01:45:21 +0000
@@ -27,10 +27,11 @@
     RemoteTab is the Remotes settings tab in the settings dialog.
     """
     def __init__(self):
-        SettingsTab.__init__(self, u'Remotes', u'Remotes')
+        SettingsTab.__init__(self, section=u'Remotes')
 
     def setupUi(self):
         self.setObjectName(u'RemoteTab')
+        self.setTitle(self.trUtf8(u'Remotes'))
         self.RemoteLayout = QtGui.QFormLayout(self)
         self.RemoteLayout.setObjectName(u'RemoteLayout')
         self.RemoteModeGroupBox = QtGui.QGroupBox(self)

=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py	2009-10-26 06:30:08 +0000
+++ openlp/plugins/songs/lib/songstab.py	2009-10-28 01:45:21 +0000
@@ -31,10 +31,11 @@
     SongsTab is the Songs settings tab in the settings dialog.
     """
     def __init__(self):
-        SettingsTab.__init__(self, u'Songs', u'Songs')
+        SettingsTab.__init__(self, section=u'Songs')
 
     def setupUi(self):
         self.setObjectName(u'SongsTab')
+        self.setTitle(self.trUtf8(u'Songs'))
         self.SongsLayout = QtGui.QFormLayout(self)
         self.SongsLayout.setObjectName(u'SongsLayout')
         self.SongsModeGroupBox = QtGui.QGroupBox(self)