Head r1301

openlp/core/lib/plugin.py

@@ -335,38 +335,40 @@ class Plugin(QtCore.QObject):
         """
         return self.textStrings[name]
 
-    def setPluginTextStrings(self):
+    def setPluginUiTextStrings(self, tooltips):
         """
         Called to define all translatable texts of the plugin
         """
         self.nameStrings = self.textStrings[StringContent.Name]
         ## Load Action ##
-        self._setSingularTextString(StringContent.Load,
+        self.__setNameTextString(StringContent.Load,
-            UiStrings.Load, UiStrings.LoadANew)
+            UiStrings.Load, tooltips[u'load'])
+        ## Import Action ##
+        self.__setNameTextString(StringContent.Import,
+            UiStrings.Import, tooltips[u'import'])
         ## New Action ##
-        self._setSingularTextString(StringContent.New,
+        self.__setNameTextString(StringContent.New,
-            UiStrings.Add, UiStrings.AddANew)
+            UiStrings.Add, tooltips[u'new'])
         ## Edit Action ##
-        self._setSingularTextString(StringContent.Edit,
+        self.__setNameTextString(StringContent.Edit,
-            UiStrings.Edit, UiStrings.EditSelect)
+            UiStrings.Edit, tooltips[u'edit'])
         ## Delete Action ##
-        self._setSingularTextString(StringContent.Delete,
+        self.__setNameTextString(StringContent.Delete,
-            UiStrings.Delete, UiStrings.DeleteSelect)
+            UiStrings.Delete, tooltips[u'delete'])
         ## Preview Action ##
-        self._setSingularTextString(StringContent.Preview,
+        self.__setNameTextString(StringContent.Preview,
-            UiStrings.Preview, UiStrings.PreviewSelect)
+            UiStrings.Preview, tooltips[u'preview'])
         ## Send Live Action ##
-        self._setSingularTextString(StringContent.Live,
+        self.__setNameTextString(StringContent.Live,
-            UiStrings.Live, UiStrings.SendSelectLive)
+            UiStrings.Live, tooltips[u'live'])
         ## Add to Service Action ##
-        self._setSingularTextString(StringContent.Service,
+        self.__setNameTextString(StringContent.Service,
-            UiStrings.Service, UiStrings.AddSelectService)
+            UiStrings.Service, tooltips[u'service'])
 
-    def _setSingularTextString(self, name, title, tooltip):
+    def __setNameTextString(self, name, title, tooltip):
         """
         Utility method for creating a plugin's textStrings. This method makes
         use of the singular name of the plugin object so must only be called
         after this has been set.
         """
-        self.textStrings[name] = { u'title': title, u'tooltip': tooltip %
+        self.textStrings[name] = {u'title': title, u'tooltip': tooltip}
-            self.nameStrings[u'singular']}

openlp/core/lib/ui.py

@@ -42,69 +42,50 @@ class UiStrings(object):
     # Should some/more/less of these have an & attached?
     About = translate('OpenLP.Ui', 'About')
     Add = translate('OpenLP.Ui', '&Add')
-    AddANew = unicode(translate('OpenLP.Ui', 'Add a new %s.'))
-    AddSelectService = unicode(translate('OpenLP.Ui',
-        'Add the selected %s to the service.'))
-    AddType = unicode(translate('OpenLP.Ui', 'Add %s'))
     Advanced = translate('OpenLP.Ui', 'Advanced')
     AllFiles = translate('OpenLP.Ui', 'All Files')
     Browse = translate('OpenLP.Ui', 'Browse...')
-    CreateANew = unicode(translate('OpenLP.Ui', 'Create a new %s.'))
+    Authors = translate('OpenLP.Ui', 'Authors')
+    CreateService = translate('OpenLP.Ui', 'Create a new service.')
     Delete = translate('OpenLP.Ui', '&Delete')
-    DeleteSelect = unicode(translate('OpenLP.Ui', 'Delete the selected %s.'))
-    DeleteType = unicode(translate('OpenLP.Ui', 'Delete %s'))
-    AmpDeleteType = unicode(translate('OpenLP.Ui', '&Delete %s'))
     Edit = translate('OpenLP.Ui', '&Edit')
-    EditSelect = unicode(translate('OpenLP.Ui', 'Edit the selected %s.'))
-    EditType = unicode(translate('OpenLP.Ui', '&Edit %s'))
     EmptyField = translate('OpenLP.Ui', 'Empty Field')
     Error = translate('OpenLP.Ui', 'Error')
     Export = translate('OpenLP.Ui', 'Export')
-    ExportType = unicode(translate('OpenLP.Ui', '&Export %s'))
     Image = translate('OpenLP.Ui', 'Image')
     Import = translate('OpenLP.Ui', 'Import')
-    ImportType = unicode(translate('OpenLP.Ui', 'Import %s'))
     LengthTime = unicode(translate('OpenLP.Ui', 'Length %s'))
     Live = translate('OpenLP.Ui', 'Live')
     LiveBGError = translate('OpenLP.Ui', 'Live Background Error')
     LivePanel = translate('OpenLP.Ui', 'Live Panel')
     Load = translate('OpenLP.Ui', 'Load')
-    LoadANew = unicode(translate('OpenLP.Ui', 'Load a new %s.'))
     MediaManager = translate('OpenLP.Ui', 'Media Manager')
     New = translate('OpenLP.Ui', 'New')
-    NewType = unicode(translate('OpenLP.Ui', 'New %s'))
     NFSs = translate('OpenLP.Ui', 'No File Selected', 'Singular')
     NFSp = translate('OpenLP.Ui', 'No Files Selected', 'Plural')
     NISs = translate('OpenLP.Ui', 'No Item Selected', 'Singular')
     NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural')
     OLPV1 = translate('OpenLP.Ui', 'openlp.org 1.x')
+    NewService = translate('OpenLP.Ui', 'New Service')
     OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.0')
-    OpenType = unicode(translate('OpenLP.Ui', 'Open %s'))
+    OpenService = translate('OpenLP.Ui', 'Open Service')
     Preview = translate('OpenLP.Ui', 'Preview')
     PreviewPanel = translate('OpenLP.Ui', 'Preview Panel')
-    PreviewSelect = unicode(translate('OpenLP.Ui', 'Preview the selected %s.'))
-    ProbReplaceBG = unicode(translate('OpenLP.Ui', 'There was a problem '
-        'replacing your background, the %s file "%s" no longer exists.'))
     ReplaceBG = translate('OpenLP.Ui', 'Replace Background')
     ReplaceLiveBG = translate('OpenLP.Ui', 'Replace Live Background')
     ResetBG = translate('OpenLP.Ui', 'Reset Background')
     ResetLiveBG = translate('OpenLP.Ui', 'Reset Live Background')
     S = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds')
-    SaveType = unicode(translate('OpenLP.Ui', 'Save %s'))
     Search = translate('OpenLP.Ui', 'Search')
     SelectDelete = translate('OpenLP.Ui', 'You must select an item to delete.')
     SelectEdit = translate('OpenLP.Ui', 'You must select an item to edit.')
-    SendSelectLive = unicode(translate('OpenLP.Ui',
+    SaveService = translate('OpenLP.Ui', 'Save Service')
-        'Send the selected %s live.'))
     Service = translate('OpenLP.Ui', 'Service')
     ServiceManager = translate('OpenLP.Ui', 'Service Manager')
     StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s'))
     Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
     Themes = translate('OpenLP.Ui', 'Themes', 'Plural')
     ThemeManager = translate('OpenLP.Ui', 'Theme Manager')
-    ToggleType = unicode(translate('OpenLP.Ui', 'Toggle %s'))
-    ToggleVisibility = unicode(translate('OpenLP.Ui',
-        'Toggle the visibility of the %s.'))
     Version = translate('OpenLP.Ui', 'Version')
 
 def add_welcome_page(parent, image):

openlp/core/ui/mainwindow.py

@@ -316,17 +316,16 @@ class Ui_MainWindow(object):
         self.serviceManagerDock.setWindowTitle(UiStrings.ServiceManager)
         self.themeManagerDock.setWindowTitle(UiStrings.ThemeManager)
         self.FileNewItem.setText(translate('OpenLP.MainWindow', '&New'))
-        self.FileNewItem.setToolTip(UiStrings.NewType % UiStrings.Service)
+        self.FileNewItem.setToolTip(UiStrings.NewService)
-        self.FileNewItem.setStatusTip(
+        self.FileNewItem.setStatusTip(UiStrings.CreateService)
-            UiStrings.CreateANew % UiStrings.Service.toLower())
         self.FileNewItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+N'))
         self.FileOpenItem.setText(translate('OpenLP.MainWindow', '&Open'))
-        self.FileOpenItem.setToolTip(UiStrings.OpenType % UiStrings.Service)
+        self.FileOpenItem.setToolTip(UiStrings.OpenService)
         self.FileOpenItem.setStatusTip(
             translate('OpenLP.MainWindow', 'Open an existing service.'))
         self.FileOpenItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+O'))
         self.FileSaveItem.setText(translate('OpenLP.MainWindow', '&Save'))
-        self.FileSaveItem.setToolTip(UiStrings.SaveType % UiStrings.Service)
+        self.FileSaveItem.setToolTip(UiStrings.SaveService)
         self.FileSaveItem.setStatusTip(
             translate('OpenLP.MainWindow', 'Save the current service to disk.'))
         self.FileSaveItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+S'))

openlp/core/ui/servicemanager.py

@@ -96,18 +96,14 @@ class ServiceManager(QtGui.QWidget):
         # Create the top toolbar
         self.toolbar = OpenLPToolbar(self)
         self.toolbar.addToolbarButton(
-            UiStrings.NewType % UiStrings.Service,
+            UiStrings.NewService, u':/general/general_new.png',
-            u':/general/general_new.png',
+            UiStrings.CreateService, self.onNewServiceClicked)
-            UiStrings.CreateANew % UiStrings.Service.toLower(),
-            self.onNewServiceClicked)
         self.toolbar.addToolbarButton(
-            UiStrings.OpenType % UiStrings.Service,
+            UiStrings.OpenService, u':/general/general_open.png',
-            u':/general/general_open.png',
             translate('OpenLP.ServiceManager', 'Load an existing service'),
             self.onLoadServiceClicked)
         self.toolbar.addToolbarButton(
-            UiStrings.SaveType % UiStrings.Service,
+            UiStrings.SaveService, u':/general/general_save.png',
-            u':/general/general_save.png',
             translate('OpenLP.ServiceManager', 'Save this service'),
             self.saveFile)
         self.toolbar.addSeparator()
@@ -468,7 +464,7 @@ class ServiceManager(QtGui.QWidget):
         save the file.
         """
         fileName = unicode(QtGui.QFileDialog.getSaveFileName(self.mainwindow,
-            UiStrings.SaveType % UiStrings.Service,
+            UiStrings.SaveService,
             SettingsManager.get_last_dir(
             self.mainwindow.serviceSettingsSection),
             translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz)')))

openlp/core/ui/themeform.py

@@ -483,7 +483,8 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         Background Image button pushed.
         """
         images_filter = get_images_filter()
-        images_filter = '%s;;%s (*.*) (*)' % (images_filter, UiStrings.AllFiles)
+        images_filter = u'%s;;%s (*.*) (*)' % (
+            images_filter, UiStrings.AllFiles)
         filename = QtGui.QFileDialog.getOpenFileName(self,
             translate('OpenLP.ThemeForm', 'Select Image'), u'',
             images_filter)

openlp/core/ui/thememanager.py

@@ -63,28 +63,28 @@ class ThemeManager(QtGui.QWidget):
         self.layout.setObjectName(u'layout')
         self.toolbar = OpenLPToolbar(self)
         self.toolbar.addToolbarButton(
-            UiStrings.NewType % UiStrings.Theme,
+            translate('OpenLP.ThemeManager', 'New Theme'),
             u':/themes/theme_new.png',
-            UiStrings.CreateANew % UiStrings.Theme.toLower(),
+            translate('OpenLP.ThemeManager', 'Create a new theme.'),
             self.onAddTheme)
         self.toolbar.addToolbarButton(
-            UiStrings.EditType % UiStrings.Theme,
+            translate('OpenLP.ThemeManager', 'Edit Theme'),
             u':/themes/theme_edit.png',
             translate('OpenLP.ThemeManager', 'Edit a theme.'),
             self.onEditTheme)
         self.deleteToolbarAction = self.toolbar.addToolbarButton(
-            UiStrings.DeleteType % UiStrings.Theme,
+            translate('OpenLP.ThemeManager', 'Delete Theme'),
             u':/general/general_delete.png',
             translate('OpenLP.ThemeManager', 'Delete a theme.'),
             self.onDeleteTheme)
         self.toolbar.addSeparator()
         self.toolbar.addToolbarButton(
-            UiStrings.ImportType % UiStrings.Theme,
+            translate('OpenLP.ThemeManager', 'Import Theme'),
             u':/general/general_import.png',
             translate('OpenLP.ThemeManager', 'Import a theme.'),
             self.onImportTheme)
         self.toolbar.addToolbarButton(
-            UiStrings.ExportType % UiStrings.Theme,
+            translate('OpenLP.ThemeManager', 'Export Theme'),
             u':/general/general_export.png',
             translate('OpenLP.ThemeManager', 'Export a theme.'),
             self.onExportTheme)
@@ -405,8 +405,8 @@ class ThemeManager(QtGui.QWidget):
         files = QtGui.QFileDialog.getOpenFileNames(self,
             translate('OpenLP.ThemeManager', 'Select Theme Import File'),
             SettingsManager.get_last_dir(self.settingsSection),
-            translate('OpenLP.ThemeManager', 'Theme v1 (*.theme);;'
+            unicode(translate('OpenLP.ThemeManager', 'Theme v1 (*.theme);;'
-            'Theme v2 (*.otz);;%s (*.*)') % UiStrings.AllFiles)
+            'Theme v2 (*.otz);;%s (*.*)')) % UiStrings.AllFiles)
         log.info(u'New Themes %s', unicode(files))
         if files:
             for file in files:

openlp/plugins/bibles/bibleplugin.py

@@ -129,9 +129,15 @@ class BiblePlugin(Plugin):
             u'title': translate('BiblesPlugin', 'Bibles', 'container title')
         }
         # Middle Header Bar
-        ## Import Action ##
+        tooltips = {
-        self.textStrings[StringContent.Import] = {
+            u'load': u'',
-            u'title': UiStrings.Import,
+            u'import': translate('BiblesPlugin', 'Import a Bible'),
-            u'tooltip': translate('BiblesPlugin', 'Import a Bible')
+            u'new': translate('BiblesPlugin', 'Add a new Bible'),
+            u'edit': translate('BiblesPlugin', 'Edit the selected Bible'),
+            u'delete': translate('BiblesPlugin', 'Delete the selected Bible'),
+            u'preview': translate('BiblesPlugin', 'Preview the selected Bible'),
+            u'live': translate('BiblesPlugin', 'Send the selected Bible live'),
+            u'service': translate('BiblesPlugin',
+                'Add the selected Bible to the service')
         }
-        Plugin.setPluginTextStrings(self)
+        self.setPluginUiTextStrings(tooltips)

openlp/plugins/custom/customplugin.py

@@ -106,13 +106,20 @@ class CustomPlugin(Plugin):
             u'title': translate('CustomsPlugin', 'Custom', 'container title')
         }
         # Middle Header Bar
-        ## Import Action ##
+        tooltips = {
-        self.textStrings[StringContent.Import] = {
+            u'load': translate('CustomsPlugin', 'Load a new Custom'),
-            u'title': UiStrings.Import,
+            u'import': translate('CustomsPlugin', 'Import a Custom'),
-            u'tooltip': translate('CustomsPlugin',
+            u'new': translate('CustomsPlugin', 'Add a new Custom'),
-                'Import a Custom')
+            u'edit': translate('CustomsPlugin', 'Edit the selected Custom'),
+            u'delete': translate('CustomsPlugin', 'Delete the selected Custom'),
+            u'preview': translate('CustomsPlugin',
+                'Preview the selected Custom'),
+            u'live': translate('CustomsPlugin',
+                'Send the selected Custom live'),
+            u'service': translate('CustomsPlugin',
+                'Add the selected Custom to the service')
         }
-        Plugin.setPluginTextStrings(self)
+        self.setPluginUiTextStrings(tooltips)
 
     def finalise(self):
         """

openlp/plugins/images/imageplugin.py

@@ -69,4 +69,15 @@ class ImagePlugin(Plugin):
             u'title': translate('ImagePlugin', 'Images', 'container title')
         }
         # Middle Header Bar
-        Plugin.setPluginTextStrings(self)
+        tooltips = {
+            u'load': translate('ImagePlugin', 'Load a new Image'),
+            u'import': u'',
+            u'new': translate('ImagePlugin', 'Add a new Image'),
+            u'edit': translate('ImagePlugin', 'Edit the selected Image'),
+            u'delete': translate('ImagePlugin', 'Delete the selected Image'),
+            u'preview': translate('ImagePlugin', 'Preview the selected Image'),
+            u'live': translate('ImagePlugin', 'Send the selected Image live'),
+            u'service': translate('ImagePlugin',
+                'Add the selected Image to the service')
+        }
+        self.setPluginUiTextStrings(tooltips)

openlp/plugins/media/mediaplugin.py

@@ -95,4 +95,15 @@ class MediaPlugin(Plugin):
             u'title': translate('MediaPlugin', 'Media', 'container title')
         }
         # Middle Header Bar
-        Plugin.setPluginTextStrings(self)
+        tooltips = {
+            u'load': translate('MediaPlugin', 'Load a new Media'),
+            u'import': u'',
+            u'new': translate('MediaPlugin', 'Add a new Media'),
+            u'edit': translate('MediaPlugin', 'Edit the selected Media'),
+            u'delete': translate('MediaPlugin', 'Delete the selected Media'),
+            u'preview': translate('MediaPlugin', 'Preview the selected Media'),
+            u'live': translate('MediaPlugin', 'Send the selected Media live'),
+            u'service': translate('MediaPlugin',
+                'Add the selected Media to the service')
+        }
+        self.setPluginUiTextStrings(tooltips)

openlp/plugins/presentations/presentationplugin.py

@@ -167,4 +167,18 @@ class PresentationPlugin(Plugin):
                 'container title')
         }
         # Middle Header Bar
-        Plugin.setPluginTextStrings(self)
+        tooltips = {
+            u'load': translate('PresentationPlugin', 'Load a new Presentation'),
+            u'import': u'',
+            u'new': u'',
+            u'edit': u'',
+            u'delete': translate('PresentationPlugin',
+                'Delete the selected Presentation'),
+            u'preview': translate('PresentationPlugin',
+                'Preview the selected Presentation'),
+            u'live': translate('PresentationPlugin',
+                'Send the selected Presentation live'),
+            u'service': translate('PresentationPlugin',
+                'Add the selected Presentation to the service')
+        }
+        self.setPluginUiTextStrings(tooltips)

openlp/plugins/songs/songsplugin.py

@@ -228,7 +228,18 @@ class SongsPlugin(Plugin):
             u'title': translate('SongsPlugin', 'Songs', 'container title')
         }
         # Middle Header Bar
-        Plugin.setPluginTextStrings(self)
+        tooltips = {
+            u'load': u'',
+            u'import': u'',
+            u'new': translate('SongsPlugin', 'Add a new Song'),
+            u'edit': translate('SongsPlugin', 'Edit the selected Song'),
+            u'delete': translate('SongsPlugin', 'Delete the selected Song'),
+            u'preview': translate('SongsPlugin', 'Preview the selected Song'),
+            u'live': translate('SongsPlugin', 'Send the selected Song live'),
+            u'service': translate('SongsPlugin',
+                'Add the selected Song to the service')
+        }
+        self.setPluginUiTextStrings(tooltips)
 
     def finalise(self):
         """