From 2eccd57acaf9bbb2ccefd8ffb215fae21e970f2f Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 28 Oct 2009 01:36:24 +0000 Subject: [PATCH 1/2] Fix mediaitem.pys i18n --- openlp/core/lib/mediamanageritem.py | 59 +++++++++++-------- openlp/core/lib/settingstab.py | 4 +- openlp/plugins/bibles/lib/mediaitem.py | 4 +- openlp/plugins/custom/lib/mediaitem.py | 4 +- openlp/plugins/images/lib/mediaitem.py | 4 +- openlp/plugins/media/lib/mediaitem.py | 4 +- openlp/plugins/presentations/lib/mediaitem.py | 4 +- openlp/plugins/songs/lib/mediaitem.py | 4 +- 8 files changed, 52 insertions(+), 35 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 016bb5259..c60b7d00f 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -62,14 +62,19 @@ class MediaManagerItem(QtGui.QWidget): This sets the translation context of all the text in the Media Manager item. - ``self.PluginTextShort`` - The shortened name for the plugin, e.g. *'Image'* for the - image plugin. + ``self.PluginNameShort`` + The shortened (usually singular) name for the plugin e.g. *'Song'* + for the Songs plugin. + + ``self.PluginNameVisible`` + The user visible name for a plugin which should use a suitable + translation function. This should normally be + ``self.trUtf8(self.PluginNameShort)``. ``self.ConfigSection`` The section in the configuration where the items in the media manager are stored. This could potentially be - ``self.PluginTextShort.lower()``. + ``self.PluginNameShort.lower()``. ``self.OnNewPrompt`` Defaults to *'Select Image(s)'*. @@ -116,6 +121,8 @@ class MediaManagerItem(QtGui.QWidget): self.PageLayout.setSpacing(0) self.PageLayout.setContentsMargins(4, 0, 4, 0) self.requiredIcons() + + def finishInit(self): self.setupUi() self.retranslateUi() @@ -204,51 +211,51 @@ class MediaManagerItem(QtGui.QWidget): ## File Button ## if self.hasFileIcon: self.addToolbarButton( - u'%s %s' % (self.trUtf8(u'Load'), self.PluginTextShort), - u'%s %s' % (self.trUtf8(u'Load a new'), self.PluginTextShort), + u'Load %s' % self.PluginNameShort, + u'%s %s' % (self.trUtf8(u'Load a new'), self.PluginNameVisible), u':%s_load.png' % self.IconPath, self.onFileClick, - u'%sFileItem' % self.PluginTextShort) + u'%sFileItem' % self.PluginNameShort) ## New Button ## if self.hasNewIcon: self.addToolbarButton( - u'%s %s' % (self.trUtf8(u'New'), self.PluginTextShort), - u'%s %s' % (self.trUtf8(u'Add a new'), self.PluginTextShort), + u'New %s' % self.PluginNameShort, + u'%s %s' % (self.trUtf8(u'Add a new'), self.PluginNameVisible), u':%s_new.png' % self.IconPath, self.onNewClick, - u'%sNewItem' % self.PluginTextShort) + u'%sNewItem' % self.PluginNameShort) ## Edit Button ## if self.hasEditIcon: self.addToolbarButton( - u'%s %s' % (self.trUtf8(u'Edit'), self.PluginTextShort), - u'%s %s' % (self.trUtf8(u'Edit the selected'), self.PluginTextShort), + u'Edit %s' % self.PluginNameShort, + u'%s %s' % (self.trUtf8(u'Edit the selected'), self.PluginNameVisible), u':%s_edit.png' % self.IconPath, self.onEditClick, - u'%sEditItem' % self.PluginTextShort) + u'%sEditItem' % self.PluginNameShort) ## Delete Button ## if self.hasDeleteIcon: self.addToolbarButton( - u'%s %s' % (self.trUtf8(u'Delete'), self.PluginTextShort), + u'Delete %s' % self.PluginNameShort, self.trUtf8(u'Delete the selected item'), u':%s_delete.png' % self.IconPath, self.onDeleteClick, - u'%sDeleteItem' % self.PluginTextShort) + u'%sDeleteItem' % self.PluginNameShort) ## Separator Line ## self.addToolbarSeparator() ## Preview ## self.addToolbarButton( - u'%s %s' % (self.trUtf8(u'Preview'), self.PluginTextShort), + u'Preview %s' % self.PluginNameShort, self.trUtf8(u'Preview the selected item'), u':/system/system_preview.png', self.onPreviewClick, u'PreviewItem') ## Live Button ## self.addToolbarButton( - self.trUtf8(u'Go Live'), + u'Go Live', self.trUtf8(u'Send the selected item live'), u':/system/system_live.png', self.onLiveClick, u'LiveItem') ## Add to service Button ## self.addToolbarButton( - u'%s %s %s' % (self.trUtf8(u'Add'), self.trUtf8(u'to Service'), self.PluginTextShort), + u'%s %s %s' % (u'Add', self.PluginNameShort, u'to Service'), self.trUtf8(u'Add the selected item(s) to the service'), u':/system/system_add.png', self.onAddClick, - u'%sAddServiceItem' % self.PluginTextShort) + u'%sAddServiceItem' % self.PluginNameShort) def addListViewToToolBar(self): #Add the List widget @@ -260,7 +267,7 @@ class MediaManagerItem(QtGui.QWidget): QtGui.QAbstractItemView.ExtendedSelection) self.ListView.setAlternatingRowColors(True) self.ListView.setDragEnabled(True) - self.ListView.setObjectName(u'%sListView' % self.PluginTextShort) + self.ListView.setObjectName(u'%sListView' % self.PluginNameShort) #Add tp PageLayout self.PageLayout.addWidget(self.ListView) #define and add the context menu @@ -269,13 +276,13 @@ class MediaManagerItem(QtGui.QWidget): self.ListView.addAction( contextMenuAction( self.ListView, u':%s_new.png' % self.IconPath, - u'%s %s' % (self.trUtf8(u'&Edit'), self.PluginTextShort), + u'%s %s' % (self.trUtf8(u'&Edit'), self.PluginNameVisible), self.onEditClick)) self.ListView.addAction(contextMenuSeparator(self.ListView)) self.ListView.addAction( contextMenuAction( self.ListView, u':/system/system_preview.png', - u'%s %s' % (self.trUtf8(u'&Preview'), self.PluginTextShort), + u'%s %s' % (self.trUtf8(u'&Preview'), self.PluginNameVisible), self.onPreviewClick)) self.ListView.addAction( contextMenuAction( @@ -351,19 +358,19 @@ class MediaManagerItem(QtGui.QWidget): u'to be defined by the plugin') def onPreviewClick(self): - log.debug(self.PluginTextShort + u' Preview Requested') + log.debug(self.PluginNameShort + u' Preview Requested') service_item = self.buildServiceItem() if service_item is not None: self.parent.preview_controller.addServiceItem(service_item) def onLiveClick(self): - log.debug(self.PluginTextShort + u' Live Requested') + log.debug(self.PluginNameShort + u' Live Requested') service_item = self.buildServiceItem() if service_item is not None: self.parent.live_controller.addServiceItem(service_item) def onAddClick(self): - log.debug(self.PluginTextShort + u' Add Requested') + log.debug(self.PluginNameShort + u' Add Requested') service_item = self.buildServiceItem() if service_item is not None: self.parent.service_manager.addServiceItem(service_item) @@ -374,7 +381,7 @@ class MediaManagerItem(QtGui.QWidget): """ service_item = ServiceItem(self.parent) service_item.addIcon( - u':/media/media_' + self.PluginTextShort.lower() + u'.png') + u':/media/media_' + self.PluginNameShort.lower() + u'.png') if self.generateSlideData(service_item): self.ListView.clearSelection() return service_item diff --git a/openlp/core/lib/settingstab.py b/openlp/core/lib/settingstab.py index bd9f22661..ef46ba781 100644 --- a/openlp/core/lib/settingstab.py +++ b/openlp/core/lib/settingstab.py @@ -44,9 +44,7 @@ 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.setupUi() self.retranslateUi() self.initialise() diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index f78c20ca5..39381d372 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -47,13 +47,15 @@ class BibleMediaItem(MediaManagerItem): def __init__(self, parent, icon, title): self.TranslationContext = u'BiblePlugin' - self.PluginTextShort = u'Bible' + self.PluginNameShort = u'Bible' self.ConfigSection = u'bibles' self.IconPath = u'songs/song' self.ListViewWithDnD_class = BibleListView self.ServiceItemIconName = u':/media/bible_image.png' self.servicePath = None MediaManagerItem.__init__(self, parent, icon, title) + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.finishInit() # place to store the search results self.search_results = {} QtCore.QObject.connect(Receiver().get_receiver(), diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 32b0d574d..6501f20f5 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -43,7 +43,7 @@ class CustomMediaItem(MediaManagerItem): def __init__(self, parent, icon, title): self.TranslationContext = u'CustomPlugin' - self.PluginTextShort = u'Custom' + self.PluginNameShort = u'Custom' self.ConfigSection = u'custom' self.IconPath = u'custom/custom' # this next is a class, not an instance of a class - it will @@ -52,6 +52,8 @@ class CustomMediaItem(MediaManagerItem): self.ServiceItemIconName = u':/custom/custom_image.png' self.servicePath = None MediaManagerItem.__init__(self, parent, icon, title) + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.finishInit() self.parent = parent def requiredIcons(self): diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index fb947cc0d..8ed85b4e3 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -45,7 +45,7 @@ class ImageMediaItem(MediaManagerItem): def __init__(self, parent, icon, title): self.TranslationContext = u'ImagePlugin' - self.PluginTextShort = u'Image' + self.PluginNameShort = u'Image' self.ConfigSection = u'images' self.IconPath = u'images/image' # this next is a class, not an instance of a class - it will @@ -54,6 +54,8 @@ class ImageMediaItem(MediaManagerItem): self.ServiceItemIconName = u':/media/media_image.png' self.servicePath = None MediaManagerItem.__init__(self, parent, icon, title) + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.finishInit() self.overrideActive = False def retranslateUi(self): diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index cb8b50c6e..fdae61b4b 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -44,8 +44,8 @@ class MediaMediaItem(MediaManagerItem): def __init__(self, parent, icon, title): self.TranslationContext = u'MediaPlugin' + self.PluginNameShort = u'Media' self.IconPath = u'images/image' - self.PluginTextShort = u'Media' self.ConfigSection = u'media' self.OnNewPrompt = u'Select Media(s)' self.OnNewFileMasks = \ @@ -56,6 +56,8 @@ class MediaMediaItem(MediaManagerItem): #self.ServiceItemIconName = u':/media/media_image.png' self.PreviewFunction = self.video_get_preview MediaManagerItem.__init__(self, parent, icon, title) + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.finishInit() def requiredIcons(self): MediaManagerItem.requiredIcons(self) diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index abbf83ac2..1fa23afea 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -49,7 +49,7 @@ class PresentationMediaItem(MediaManagerItem): def __init__(self, parent, icon, title, controllers): self.controllers = controllers self.TranslationContext = u'PresentationPlugin' - self.PluginTextShort = u'Presentation' + self.PluginNameShort = u'Presentation' self.ConfigSection = u'presentations' self.IconPath = u'presentations/presentation' self.OnNewPrompt = u'Select Presentation(s)' @@ -58,6 +58,8 @@ class PresentationMediaItem(MediaManagerItem): # be instanced by the base MediaManagerItem self.ListViewWithDnD_class = PresentationListView MediaManagerItem.__init__(self, parent, icon, title) + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.finishInit() self.message_listener = MessageListener(controllers) def requiredIcons(self): diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 575968f31..d9deaad0c 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -45,13 +45,15 @@ class SongMediaItem(MediaManagerItem): def __init__(self, parent, icon, title): self.TranslationContext = u'SongPlugin' - self.PluginTextShort = u'Song' + self.PluginNameShort = u'Song' self.ConfigSection = u'songs' self.IconPath = u'songs/song' self.ListViewWithDnD_class = SongListView self.ServiceItemIconName = u':/media/song_image.png' self.servicePath = None MediaManagerItem.__init__(self, parent, icon, title) + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.finishInit() self.edit_song_form = EditSongForm(self.parent.songmanager, self) self.song_maintenance_form = SongMaintenanceForm( self.parent.songmanager, self) From 8de21d057f4f741ed927a5e22d50d86db20d2909 Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Thu, 29 Oct 2009 01:48:43 +0000 Subject: [PATCH 2/2] PluginNameVisible without splitting __init__ --- openlp/core/lib/mediamanageritem.py | 6 ++++-- openlp/plugins/bibles/lib/mediaitem.py | 5 +++-- openlp/plugins/custom/lib/mediaitem.py | 5 +++-- openlp/plugins/images/lib/mediaitem.py | 5 +++-- openlp/plugins/media/lib/mediaitem.py | 3 ++- openlp/plugins/presentations/lib/mediaitem.py | 5 +++-- openlp/plugins/songs/lib/mediaitem.py | 5 +++-- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index c60b7d00f..651029e5a 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -121,11 +121,13 @@ class MediaManagerItem(QtGui.QWidget): self.PageLayout.setSpacing(0) self.PageLayout.setContentsMargins(4, 0, 4, 0) self.requiredIcons() - - def finishInit(self): + self.initPluginNameVisible() self.setupUi() self.retranslateUi() + def initPluginNameVisible(self): + pass + def requiredIcons(self): """ This method is called to define the icons for the plugin. diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 39381d372..b4491b60c 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -54,13 +54,14 @@ class BibleMediaItem(MediaManagerItem): self.ServiceItemIconName = u':/media/bible_image.png' self.servicePath = None MediaManagerItem.__init__(self, parent, icon, title) - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) - self.finishInit() # place to store the search results self.search_results = {} QtCore.QObject.connect(Receiver().get_receiver(), QtCore.SIGNAL(u'openlpreloadbibles'), self.reloadBibles) + def initPluginNameVisible(self): + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + def requiredIcons(self): MediaManagerItem.requiredIcons(self) self.hasEditIcon = False diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 6501f20f5..2ce947468 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -52,10 +52,11 @@ class CustomMediaItem(MediaManagerItem): self.ServiceItemIconName = u':/custom/custom_image.png' self.servicePath = None MediaManagerItem.__init__(self, parent, icon, title) - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) - self.finishInit() self.parent = parent + def initPluginNameVisible(self): + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + def requiredIcons(self): MediaManagerItem.requiredIcons(self) self.hasFileIcon = False diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 8ed85b4e3..afd3606c8 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -54,10 +54,11 @@ class ImageMediaItem(MediaManagerItem): self.ServiceItemIconName = u':/media/media_image.png' self.servicePath = None MediaManagerItem.__init__(self, parent, icon, title) - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) - self.finishInit() self.overrideActive = False + def initPluginNameVisible(self): + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + def retranslateUi(self): self.OnNewPrompt = self.trUtf8(u'Select Image(s)') self.OnNewFileMasks = \ diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index fdae61b4b..5ce1669a0 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -56,8 +56,9 @@ class MediaMediaItem(MediaManagerItem): #self.ServiceItemIconName = u':/media/media_image.png' self.PreviewFunction = self.video_get_preview MediaManagerItem.__init__(self, parent, icon, title) + + def initPluginNameVisible(self): self.PluginNameVisible = self.trUtf8(self.PluginNameShort) - self.finishInit() def requiredIcons(self): MediaManagerItem.requiredIcons(self) diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 1fa23afea..f6b19a579 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -58,10 +58,11 @@ class PresentationMediaItem(MediaManagerItem): # be instanced by the base MediaManagerItem self.ListViewWithDnD_class = PresentationListView MediaManagerItem.__init__(self, parent, icon, title) - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) - self.finishInit() self.message_listener = MessageListener(controllers) + def initPluginNameVisible(self): + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + def requiredIcons(self): MediaManagerItem.requiredIcons(self) self.hasFileIcon = True diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index d9deaad0c..8e9b64ee1 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -52,13 +52,14 @@ class SongMediaItem(MediaManagerItem): self.ServiceItemIconName = u':/media/song_image.png' self.servicePath = None MediaManagerItem.__init__(self, parent, icon, title) - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) - self.finishInit() self.edit_song_form = EditSongForm(self.parent.songmanager, self) self.song_maintenance_form = SongMaintenanceForm( self.parent.songmanager, self) self.fromPreview = None + def initPluginNameVisible(self): + self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + def requiredIcons(self): MediaManagerItem.requiredIcons(self) self.hasFileIcon = False