openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #01880
[Merge] lp:~trb143/openlp/working into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/working into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Translate cleanup and disable Text over video for now.
--
https://code.launchpad.net/~trb143/openlp/working/+merge/27987
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/working into lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2010-06-17 14:06:47 +0000
+++ openlp/core/lib/mediamanageritem.py 2010-06-19 10:43:24 +0000
@@ -208,62 +208,62 @@
## Import Button ##
if self.hasImportIcon:
self.addToolbarButton(
- unicode(translate(u'MediaManagerItem', u'Import %s')) % \
+ unicode(translate('MediaManagerItem', 'Import %s')) % \
self.PluginNameShort,
- unicode(translate(u'MediaManagerItem', u'Import a %s')) % \
+ unicode(translate('MediaManagerItem', 'Import a %s')) % \
self.PluginNameVisible,
u':/general/general_import.png', self.onImportClick)
## File Button ##
if self.hasFileIcon:
self.addToolbarButton(
- unicode(translate(u'MediaManagerItem', u'Load %s')) % \
+ unicode(translate('MediaManagerItem', 'Load %s')) % \
self.PluginNameShort,
- unicode(translate(u'MediaManagerItem', u'Load a new %s')) % \
+ unicode(translate('MediaManagerItem', 'Load a new %s')) % \
self.PluginNameVisible,
u':/general/general_open.png', self.onFileClick)
## New Button ##
if self.hasNewIcon:
self.addToolbarButton(
- unicode(translate(u'MediaManagerItem', u'New %s')) % \
+ unicode(translate('MediaManagerItem', 'New %s')) % \
self.PluginNameShort,
- unicode(translate(u'MediaManagerItem', u'Add a new %s')) % \
+ unicode(translate('MediaManagerItem', 'Add a new %s')) % \
self.PluginNameVisible,
u':/general/general_new.png', self.onNewClick)
## Edit Button ##
if self.hasEditIcon:
self.addToolbarButton(
- unicode(translate(u'MediaManagerItem', u'Edit %s')) % \
+ unicode(translate('MediaManagerItem', 'Edit %s')) % \
self.PluginNameShort,
unicode(translate(
- u'MediaManagerItem', u'Edit the selected %s')) % \
+ 'MediaManagerItem', 'Edit the selected %s')) % \
self.PluginNameVisible,
u':/general/general_edit.png', self.onEditClick)
## Delete Button ##
if self.hasDeleteIcon:
self.addToolbarButton(
- unicode(translate(u'MediaManagerItem', u'Delete %s')) % \
+ unicode(translate('MediaManagerItem', 'Delete %s')) % \
self.PluginNameShort,
- translate(u'MediaManagerItem', u'Delete the selected item'),
+ translate('MediaManagerItem', 'Delete the selected item'),
u':/general/general_delete.png', self.onDeleteClick)
## Separator Line ##
self.addToolbarSeparator()
## Preview ##
self.addToolbarButton(
- unicode(translate(u'MediaManagerItem', u'Preview %s')) % \
+ unicode(translate('MediaManagerItem', 'Preview %s')) % \
self.PluginNameShort,
- translate(u'MediaManagerItem', u'Preview the selected item'),
+ translate('MediaManagerItem', 'Preview the selected item'),
u':/general/general_preview.png', self.onPreviewClick)
## Live Button ##
self.addToolbarButton(
u'Go Live',
- translate(u'MediaManagerItem', u'Send the selected item live'),
+ translate('MediaManagerItem', 'Send the selected item live'),
u':/general/general_live.png', self.onLiveClick)
## Add to service Button ##
self.addToolbarButton(
- unicode(translate(u'MediaManagerItem', u'Add %s to Service')) % \
+ unicode(translate('MediaManagerItem', 'Add %s to Service')) % \
self.PluginNameShort,
- translate(u'MediaManagerItem',
- u'Add the selected item(s) to the service'),
+ translate('MediaManagerItem',
+ 'Add the selected item(s) to the service'),
u':/general/general_add.png', self.onAddClick)
def addListViewToToolBar(self):
@@ -285,7 +285,7 @@
self.ListView.addAction(
context_menu_action(
self.ListView, u':/general/general_edit.png',
- unicode(translate(u'MediaManagerItem', u'&Edit %s')) % \
+ unicode(translate('MediaManagerItem', '&Edit %s')) % \
self.PluginNameVisible,
self.onEditClick))
self.ListView.addAction(context_menu_separator(self.ListView))
@@ -293,32 +293,32 @@
self.ListView.addAction(
context_menu_action(
self.ListView, u':/general/general_delete.png',
- unicode(translate(u'MediaManagerItem', u'&Delete %s')) % \
+ unicode(translate('MediaManagerItem', '&Delete %s')) % \
self.PluginNameVisible,
self.onDeleteClick))
self.ListView.addAction(context_menu_separator(self.ListView))
self.ListView.addAction(
context_menu_action(
self.ListView, u':/general/general_preview.png',
- unicode(translate(u'MediaManagerItem', u'&Preview %s')) % \
+ unicode(translate('MediaManagerItem', '&Preview %s')) % \
self.PluginNameVisible,
self.onPreviewClick))
self.ListView.addAction(
context_menu_action(
self.ListView, u':/general/general_live.png',
- translate(u'MediaManagerItem', u'&Show Live'),
+ translate('MediaManagerItem', '&Show Live'),
self.onLiveClick))
self.ListView.addAction(
context_menu_action(
self.ListView, u':/general/general_add.png',
- translate(u'MediaManagerItem', u'&Add to Service'),
+ translate('MediaManagerItem', '&Add to Service'),
self.onAddClick))
if self.addToServiceItem:
self.ListView.addAction(
context_menu_action(
self.ListView, u':/general/general_add.png',
- translate(u'MediaManagerItem',
- u'&Add to selected Service Item'),
+ translate('MediaManagerItem',
+ '&Add to selected Service Item'),
self.onAddEditClick))
QtCore.QObject.connect(
self.ListView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
@@ -352,7 +352,7 @@
"""
if not self.ListView.selectedIndexes():
QtGui.QMessageBox.information(self,
- translate(u'MediaManagerItem', u'No Items Selected'), message)
+ translate('MediaManagerItem', 'No Items Selected'), message)
return False
return True
@@ -422,9 +422,9 @@
def onPreviewClick(self):
if not self.ListView.selectedIndexes() and not self.remoteTriggered:
QtGui.QMessageBox.information(self,
- translate(u'MediaManagerItem', u'No Items Selected'),
- translate(u'MediaManagerItem',
- u'You must select one or more items to preview.'))
+ translate('MediaManagerItem', 'No Items Selected'),
+ translate('MediaManagerItem',
+ 'You must select one or more items to preview.'))
else:
log.debug(self.PluginNameShort + u' Preview requested')
service_item = self.buildServiceItem()
@@ -435,9 +435,9 @@
def onLiveClick(self):
if not self.ListView.selectedIndexes():
QtGui.QMessageBox.information(self,
- translate(u'MediaManagerItem', u'No Items Selected'),
- translate(u'MediaManagerItem',
- u'You must select one or more items to send live.'))
+ translate('MediaManagerItem', 'No Items Selected'),
+ translate('MediaManagerItem',
+ 'You must select one or more items to send live.'))
else:
log.debug(self.PluginNameShort + u' Live requested')
service_item = self.buildServiceItem()
@@ -448,9 +448,9 @@
def onAddClick(self):
if not self.ListView.selectedIndexes() and not self.remoteTriggered:
QtGui.QMessageBox.information(self,
- translate(u'MediaManagerItem', u'No Items Selected'),
- translate(u'MediaManagerItem',
- u'You must select one or more items.'))
+ translate('MediaManagerItem', 'No Items Selected'),
+ translate('MediaManagerItem',
+ 'You must select one or more items.'))
else:
#Is it posssible to process multiple list items to generate multiple
#service items?
@@ -472,17 +472,17 @@
def onAddEditClick(self):
if not self.ListView.selectedIndexes() and not self.remoteTriggered:
QtGui.QMessageBox.information(self,
- translate(u'MediaManagerItem', u'No items selected'),
- translate(u'MediaManagerItem',
- u'You must select one or more items'))
+ translate('MediaManagerItem', 'No items selected'),
+ translate('MediaManagerItem',
+ 'You must select one or more items'))
else:
log.debug(self.PluginNameShort + u' Add requested')
service_item = self.parent.service_manager.getServiceItem()
if not service_item:
QtGui.QMessageBox.information(self,
- translate(u'MediaManagerItem', u'No Service Item Selected'),
- translate(u'MediaManagerItem',
- u'You must select an existing service item to add to.'))
+ translate('MediaManagerItem', 'No Service Item Selected'),
+ translate('MediaManagerItem',
+ 'You must select an existing service item to add to.'))
elif self.title.lower() == service_item.name.lower():
self.generateSlideData(service_item)
self.parent.service_manager.addServiceItem(service_item,
@@ -490,9 +490,9 @@
else:
#Turn off the remote edit update message indicator
QtGui.QMessageBox.information(self,
- translate(u'MediaManagerItem', u'Invalid Service Item'),
- translate(unicode(u'MediaManagerItem',
- u'You must select a %s service item.')) % self.title)
+ translate('MediaManagerItem', 'Invalid Service Item'),
+ translate(unicode('MediaManagerItem',
+ 'You must select a %s service item.')) % self.title)
def buildServiceItem(self, item=None):
"""
=== modified file 'openlp/core/ui/plugindialog.py'
--- openlp/core/ui/plugindialog.py 2010-06-06 22:30:11 +0000
+++ openlp/core/ui/plugindialog.py 2010-06-19 10:43:24 +0000
@@ -100,14 +100,14 @@
def retranslateUi(self, PluginViewDialog):
PluginViewDialog.setWindowTitle(
- translate(u'PluginForm', u'Plugin List'))
+ translate('PluginForm', 'Plugin List'))
self.PluginInfoGroupBox.setTitle(
- translate(u'PluginForm', u'Plugin Details'))
+ translate('PluginForm', 'Plugin Details'))
self.VersionLabel.setText(
- translate(u'PluginForm', u'Version:'))
- self.VersionNumberLabel.setText(translate(u'PluginForm', u'TextLabel'))
- self.AboutLabel.setText(translate(u'PluginForm', u'About:'))
- self.StatusLabel.setText(translate(u'PluginForm', u'Status:'))
- self.StatusComboBox.setItemText(0, translate(u'PluginForm', u'Active'))
- self.StatusComboBox.setItemText(1,
- translate(u'PluginForm', u'Inactive'))
+ translate('PluginForm', 'Version:'))
+ self.VersionNumberLabel.setText(translate('PluginForm', 'TextLabel'))
+ self.AboutLabel.setText(translate('PluginForm', 'About:'))
+ self.StatusLabel.setText(translate('PluginForm', 'Status:'))
+ self.StatusComboBox.setItemText(0, translate('PluginForm', 'Active'))
+ self.StatusComboBox.setItemText(1,
+ translate('PluginForm', 'Inactive'))
=== modified file 'openlp/core/ui/pluginform.py'
--- openlp/core/ui/pluginform.py 2010-06-17 21:07:01 +0000
+++ openlp/core/ui/pluginform.py 2010-06-19 10:43:24 +0000
@@ -63,15 +63,15 @@
# sometimes when it's loaded from the config, it isn't cast to int.
plugin.status = int(plugin.status)
# Set the little status text in brackets next to the plugin name.
- status_text = unicode(translate(u'PluginForm', u'%s (Inactive)'))
+ status_text = unicode(translate('PluginForm', '%s (Inactive)'))
if plugin.status == PluginStatus.Active:
- status_text = unicode(translate(u'PluginForm', u'%s (Active)'))
+ status_text = unicode(translate('PluginForm', '%s (Active)'))
elif plugin.status == PluginStatus.Inactive:
status_text = unicode(
- translate(u'PluginForm', u'%s (Inactive)'))
+ translate('PluginForm', '%s (Inactive)'))
elif plugin.status == PluginStatus.Disabled:
status_text = unicode(
- translate(u'PluginForm', u'%s (Disabled)'))
+ translate('PluginForm', '%s (Disabled)'))
item.setText(status_text % plugin.name)
# If the plugin has an icon, set it!
if plugin.icon:
=== modified file 'openlp/core/ui/serviceitemeditdialog.py'
--- openlp/core/ui/serviceitemeditdialog.py 2010-06-06 22:30:11 +0000
+++ openlp/core/ui/serviceitemeditdialog.py 2010-06-19 10:43:24 +0000
@@ -68,9 +68,9 @@
def retranslateUi(self, ServiceItemEditDialog):
ServiceItemEditDialog.setWindowTitle(
- translate(u'ServiceItemEditForm', u'Service Item Maintenance'))
- self.upButton.setText(translate(u'ServiceItemEditForm', u'Up'))
- self.deleteButton.setText(translate(u'ServiceItemEditForm', u'Delete'))
- self.downButton.setText(translate(u'ServiceItemEditForm', u'Down'))
+ translate('ServiceItemEditForm', 'Service Item Maintenance'))
+ self.upButton.setText(translate('ServiceItemEditForm', 'Up'))
+ self.deleteButton.setText(translate('ServiceItemEditForm', 'Delete'))
+ self.downButton.setText(translate('ServiceItemEditForm', 'Down'))
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2010-06-17 23:17:16 +0000
+++ openlp/core/ui/servicemanager.py 2010-06-19 10:43:24 +0000
@@ -116,28 +116,28 @@
# Create the top toolbar
self.Toolbar = OpenLPToolbar(self)
self.Toolbar.addToolbarButton(
- translate(u'ServiceManager', u'New Service'),
+ translate('ServiceManager', 'New Service'),
u':/general/general_new.png',
- translate(u'ServiceManager', u'Create a new service'),
+ translate('ServiceManager', 'Create a new service'),
self.onNewService)
self.Toolbar.addToolbarButton(
- translate(u'ServiceManager', u'Open Service'),
+ translate('ServiceManager', 'Open Service'),
u':/general/general_open.png',
- translate(u'ServiceManager', u'Load an existing service'),
+ translate('ServiceManager', 'Load an existing service'),
self.onLoadService)
self.Toolbar.addToolbarButton(
- translate(u'ServiceManager', u'Save Service'),
+ translate('ServiceManager', 'Save Service'),
u':/general/general_save.png',
- translate(u'ServiceManager', u'Save this service'),
+ translate('ServiceManager', 'Save this service'),
self.onSaveService)
self.Toolbar.addSeparator()
- self.ThemeLabel = QtGui.QLabel(translate(u'ServiceManager', u'Theme:'),
+ self.ThemeLabel = QtGui.QLabel(translate('ServiceManager', 'Theme:'),
self)
self.ThemeLabel.setMargin(3)
self.Toolbar.addWidget(self.ThemeLabel)
self.ThemeComboBox = QtGui.QComboBox(self.Toolbar)
- self.ThemeComboBox.setToolTip(translate(u'ServiceManager',
- u'Select a theme for the service'))
+ self.ThemeComboBox.setToolTip(translate('ServiceManager',
+ 'Select a theme for the service'))
self.ThemeComboBox.setSizeAdjustPolicy(
QtGui.QComboBox.AdjustToContents)
self.ThemeWidget = QtGui.QWidgetAction(self.Toolbar)
@@ -169,28 +169,28 @@
# Add the bottom toolbar
self.OrderToolbar = OpenLPToolbar(self)
self.OrderToolbar.addToolbarButton(
- translate(u'ServiceManager', u'Move to &top'),
+ translate('ServiceManager', 'Move to &top'),
u':/services/service_top.png',
- translate(u'ServiceManager', u'Move to top'), self.onServiceTop)
+ translate('ServiceManager', 'Move to top'), self.onServiceTop)
self.OrderToolbar.addToolbarButton(
- translate(u'ServiceManager', u'Move &up'),
+ translate('ServiceManager', 'Move &up'),
u':/services/service_up.png',
- translate(u'ServiceManager', u'Move up order'), self.onServiceUp)
+ translate('ServiceManager', 'Move up order'), self.onServiceUp)
self.OrderToolbar.addToolbarButton(
- translate(u'ServiceManager', u'Move &down'),
+ translate('ServiceManager', 'Move &down'),
u':/services/service_down.png',
- translate(u'ServiceManager', u'Move down order'),
+ translate('ServiceManager', 'Move down order'),
self.onServiceDown)
self.OrderToolbar.addToolbarButton(
- translate(u'ServiceManager', u'Move to &bottom'),
+ translate('ServiceManager', 'Move to &bottom'),
u':/services/service_bottom.png',
- translate(u'ServiceManager', u'Move to end'),
+ translate('ServiceManager', 'Move to end'),
self.onServiceEnd)
self.OrderToolbar.addSeparator()
self.OrderToolbar.addToolbarButton(
- translate(u'ServiceManager', u'&Delete From Service'),
+ translate('ServiceManager', '&Delete From Service'),
u':/general/general_delete.png',
- translate(u'ServiceManager', u'Delete From Service'),
+ translate('ServiceManager', 'Delete From Service'),
self.onDeleteFromService)
self.Layout.addWidget(self.OrderToolbar)
# Connect up our signals and slots
@@ -222,37 +222,37 @@
#build the drag and drop context menu
self.dndMenu = QtGui.QMenu()
self.newAction = self.dndMenu.addAction(
- translate(u'ServiceManager', u'&Add New Item'))
+ translate('ServiceManager', '&Add New Item'))
self.newAction.setIcon(build_icon(u':/general/general_edit.png'))
self.addToAction = self.dndMenu.addAction(
- translate(u'ServiceManager', u'&Add to Selected Item'))
+ translate('ServiceManager', '&Add to Selected Item'))
self.addToAction.setIcon(build_icon(u':/general/general_edit.png'))
#build the context menu
self.menu = QtGui.QMenu()
self.editAction = self.menu.addAction(
- translate(u'ServiceManager', u'&Edit Item'))
+ translate('ServiceManager', '&Edit Item'))
self.editAction.setIcon(build_icon(u':/general/general_edit.png'))
self.maintainAction = self.menu.addAction(
- translate(u'ServiceManager', u'&Maintain Item'))
+ translate('ServiceManager', '&Maintain Item'))
self.maintainAction.setIcon(build_icon(u':/general/general_edit.png'))
self.notesAction = self.menu.addAction(
- translate(u'ServiceManager', u'&Notes'))
+ translate('ServiceManager', '&Notes'))
self.notesAction.setIcon(build_icon(u':/services/service_notes.png'))
self.deleteAction = self.menu.addAction(
- translate(u'ServiceManager', u'&Delete From Service'))
+ translate('ServiceManager', '&Delete From Service'))
self.deleteAction.setIcon(build_icon(u':/general/general_delete.png'))
self.sep1 = self.menu.addAction(u'')
self.sep1.setSeparator(True)
self.previewAction = self.menu.addAction(
- translate(u'ServiceManager', u'&Preview Verse'))
+ translate('ServiceManager', '&Preview Verse'))
self.previewAction.setIcon(build_icon(u':/general/general_preview.png'))
self.liveAction = self.menu.addAction(
- translate(u'ServiceManager', u'&Live Verse'))
+ translate('ServiceManager', '&Live Verse'))
self.liveAction.setIcon(build_icon(u':/general/general_live.png'))
self.sep2 = self.menu.addAction(u'')
self.sep2.setSeparator(True)
self.themeMenu = QtGui.QMenu(
- translate(u'ServiceManager', u'&Change Item Theme'))
+ translate('ServiceManager', '&Change Item Theme'))
self.menu.addMenu(self.themeMenu)
def supportedSuffixes(self, suffix):
@@ -484,10 +484,10 @@
self.parent.generalSettingsSection + u'/save prompt',
QtCore.QVariant(False)).toBool():
ret = QtGui.QMessageBox.question(self,
- translate(u'ServiceManager', u'Save Changes to Service?'),
- translate(u'ServiceManager',
- u'Your service is unsaved, do you want to save '
- u'those changes before creating a new one?'),
+ translate('ServiceManager', 'Save Changes to Service?'),
+ translate('ServiceManager',
+ 'Your service is unsaved, do you want to save '
+ 'those changes before creating a new one?'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Cancel |
QtGui.QMessageBox.Save),
@@ -570,9 +570,9 @@
log.debug(u'onSaveService')
if not quick or self.isNew:
filename = QtGui.QFileDialog.getSaveFileName(self,
- translate(u'ServiceManager', u'Save Service'),
+ translate('ServiceManager', 'Save Service'),
SettingsManager.get_last_dir(self.parent.serviceSettingsSection),
- translate(u'ServiceManager', u'OpenLP Service Files (*.osz)'))
+ translate('ServiceManager', 'OpenLP Service Files (*.osz)'))
else:
filename = SettingsManager.get_last_dir(
self.parent.serviceSettingsSection)
@@ -629,7 +629,7 @@
self.parent.serviceSettingsSection)
else:
filename = QtGui.QFileDialog.getOpenFileName(
- self, translate(u'ServiceManager', u'Open Service'),
+ self, translate('ServiceManager', 'Open Service'),
SettingsManager.get_last_dir(
self.parent.serviceSettingsSection), u'Services (*.osz)')
self.loadService(filename)
@@ -642,10 +642,10 @@
"""
if self.parent.serviceNotSaved:
ret = QtGui.QMessageBox.question(self,
- translate(u'ServiceManager', u'Save Changes to Service?'),
- translate(u'ServiceManager',
- u'Your current service is unsaved, do you want to '
- u'save the changes before opening a new one?'),
+ translate('ServiceManager', 'Save Changes to Service?'),
+ translate('ServiceManager',
+ 'Your current service is unsaved, do you want to '
+ 'save the changes before opening a new one?'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Discard |
QtGui.QMessageBox.Save),
@@ -673,10 +673,10 @@
ucsfile = file.decode(u'utf-8')
except UnicodeDecodeError:
QtGui.QMessageBox.critical(
- self, translate(u'ServiceManager', u'Error'),
- translate(u'ServiceManager',
- u'File is not a valid service.\n'
- u'The content encoding is not UTF-8.'))
+ self, translate('ServiceManager', 'Error'),
+ translate('ServiceManager',
+ 'File is not a valid service.\n'
+ 'The content encoding is not UTF-8.'))
log.exception(u'Filename "%s" is not valid UTF-8' % \
file.decode(u'utf-8', u'replace'))
continue
@@ -708,9 +708,9 @@
log.exception(u'Failed to remove osd file')
else:
QtGui.QMessageBox.critical(
- self, translate(u'ServiceManager', u'Error'),
- translate(u'ServiceManager',
- u'File is not a valid service.'))
+ self, translate('ServiceManager', 'Error'),
+ translate('ServiceManager',
+ 'File is not a valid service.'))
log.exception(u'File contains no service data')
except (IOError, NameError):
log.exception(u'Problem loading a service file')
@@ -825,9 +825,9 @@
self.serviceItems[item][u'service_item'], count)
else:
QtGui.QMessageBox.critical(self,
- translate(u'ServiceManager', u'Missing Display Handler'),
- translate(u'ServiceManager', u'Your item cannot be displayed '
- u'as there is no handler to display it'),
+ translate('ServiceManager', 'Missing Display Handler'),
+ translate('ServiceManager', 'Your item cannot be displayed '
+ 'as there is no handler to display it'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok)
@@ -861,9 +861,9 @@
self.serviceItems[item][u'service_item'], 0)
else:
QtGui.QMessageBox.critical(self,
- translate(u'ServiceManager', u'Missing Display Handler'),
- translate(u'ServiceManager', u'Your item cannot be displayed '
- u'as there is no handler to display it'),
+ translate('ServiceManager', 'Missing Display Handler'),
+ translate('ServiceManager', 'Your item cannot be displayed '
+ 'as there is no handler to display it'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok)
=== modified file 'openlp/core/ui/servicenotedialog.py'
--- openlp/core/ui/servicenotedialog.py 2010-06-06 22:30:11 +0000
+++ openlp/core/ui/servicenotedialog.py 2010-06-19 10:43:24 +0000
@@ -49,4 +49,4 @@
def retranslateUi(self, ServiceNoteEdit):
ServiceNoteEdit.setWindowTitle(
- translate(u'ServiceNoteForm', u'Service Item Notes'))
+ translate('ServiceNoteForm', 'Service Item Notes'))
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2010-06-18 05:59:31 +0000
+++ openlp/core/ui/slidecontroller.py 2010-06-19 10:43:24 +0000
@@ -128,11 +128,11 @@
# Type label for the top of the slide controller
self.TypeLabel = QtGui.QLabel(self.Panel)
if self.isLive:
- self.TypeLabel.setText(translate(u'SlideController', u'Live'))
+ self.TypeLabel.setText(translate('SlideController', 'Live'))
self.split = 1
self.typePrefix = u'live'
else:
- self.TypeLabel.setText(translate(u'SlideController', u'Preview'))
+ self.TypeLabel.setText(translate('SlideController', 'Preview'))
self.split = 0
self.typePrefix = u'preview'
self.TypeLabel.setStyleSheet(u'font-weight: bold; font-size: 12pt;')
@@ -179,91 +179,91 @@
if self.isLive:
self.Toolbar.addToolbarButton(
u'First Slide', u':/slides/slide_first.png',
- translate(u'SlideController', u'Move to first'),
+ translate('SlideController', 'Move to first'),
self.onSlideSelectedFirst)
self.Toolbar.addToolbarButton(
u'Previous Slide', u':/slides/slide_previous.png',
- translate(u'SlideController', u'Move to previous'),
+ translate('SlideController', 'Move to previous'),
self.onSlideSelectedPrevious)
self.Toolbar.addToolbarButton(
u'Next Slide', u':/slides/slide_next.png',
- translate(u'SlideController', u'Move to next'),
+ translate('SlideController', 'Move to next'),
self.onSlideSelectedNext)
if self.isLive:
self.Toolbar.addToolbarButton(
u'Last Slide', u':/slides/slide_last.png',
- translate(u'SlideController', u'Move to last'),
+ translate('SlideController', 'Move to last'),
self.onSlideSelectedLast)
if self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator')
self.blankButton = self.Toolbar.addToolbarButton(
u'Blank Screen', u':/slides/slide_blank.png',
- translate(u'SlideController', u'Blank Screen'),
+ translate('SlideController', 'Blank Screen'),
self.onBlankDisplay, True)
self.themeButton = self.Toolbar.addToolbarButton(
u'Display Theme', u':/slides/slide_theme.png',
- translate(u'SlideController', u'Theme Screen'),
+ translate('SlideController', 'Theme Screen'),
self.onThemeDisplay, True)
self.hideButton = self.Toolbar.addToolbarButton(
u'Hide screen', u':/slides/slide_desktop.png',
- translate(u'SlideController', u'Hide Screen'),
+ translate('SlideController', 'Hide Screen'),
self.onHideDisplay, True)
if not self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator')
self.Toolbar.addToolbarButton(
u'Go Live', u':/general/general_live.png',
- translate(u'SlideController', u'Move to live'), self.onGoLive)
+ translate('SlideController', 'Move to live'), self.onGoLive)
self.Toolbar.addToolbarSeparator(u'Close Separator')
self.Toolbar.addToolbarButton(
u'Edit Song', u':/general/general_edit.png',
- translate(u'SlideController', u'Edit and re-preview Song'),
+ translate('SlideController', 'Edit and re-preview Song'),
self.onEditSong)
if isLive:
self.Toolbar.addToolbarSeparator(u'Loop Separator')
self.Toolbar.addToolbarButton(
u'Start Loop', u':/media/media_time.png',
- translate(u'SlideController', u'Start continuous loop'),
+ translate('SlideController', 'Start continuous loop'),
self.onStartLoop)
self.Toolbar.addToolbarButton(
u'Stop Loop', u':/media/media_stop.png',
- translate(u'SlideController', u'Stop continuous loop'),
+ translate('SlideController', 'Stop continuous loop'),
self.onStopLoop)
self.DelaySpinBox = QtGui.QSpinBox()
self.DelaySpinBox.setMinimum(1)
self.DelaySpinBox.setMaximum(180)
self.Toolbar.addToolbarWidget(
u'Image SpinBox', self.DelaySpinBox)
- self.DelaySpinBox.setSuffix(translate(u'SlideController', u's'))
+ self.DelaySpinBox.setSuffix(translate('SlideController', 's'))
self.DelaySpinBox.setToolTip(
- translate(u'SlideController',
- u'Delay between slides in seconds'))
+ translate('SlideController',
+ 'Delay between slides in seconds'))
self.ControllerLayout.addWidget(self.Toolbar)
#Build a Media ToolBar
self.Mediabar = OpenLPToolbar(self)
self.Mediabar.addToolbarButton(
u'Media Start', u':/slides/media_playback_start.png',
- translate(u'SlideController', u'Start playing media'),
+ translate('SlideController', 'Start playing media'),
self.onMediaPlay)
self.Mediabar.addToolbarButton(
u'Media Pause', u':/slides/media_playback_pause.png',
- translate(u'SlideController', u'Start playing media'),
+ translate('SlideController', 'Start playing media'),
self.onMediaPause)
self.Mediabar.addToolbarButton(
u'Media Stop', u':/slides/media_playback_stop.png',
- translate(u'SlideController', u'Start playing media'),
+ translate('SlideController', 'Start playing media'),
self.onMediaStop)
if self.isLive:
self.blankButton = self.Mediabar.addToolbarButton(
u'Blank Screen', u':/slides/slide_blank.png',
- translate(u'SlideController', u'Blank Screen'),
+ translate('SlideController', 'Blank Screen'),
self.onBlankDisplay, True)
self.themeButton = self.Mediabar.addToolbarButton(
u'Display Theme', u':/slides/slide_theme.png',
- translate(u'SlideController', u'Theme Screen'),
+ translate('SlideController', 'Theme Screen'),
self.onThemeDisplay, True)
self.hideButton = self.Mediabar.addToolbarButton(
u'Hide screen', u':/slides/slide_desktop.png',
- translate(u'SlideController', u'Hide Screen'),
+ translate('SlideController', 'Hide Screen'),
self.onHideDisplay, True)
if not self.isLive:
self.seekSlider = Phonon.SeekSlider()
@@ -280,11 +280,11 @@
# Build the Song Toolbar
if isLive:
self.SongMenu = QtGui.QToolButton(self.Toolbar)
- self.SongMenu.setText(translate(u'SlideController', u'Go to Verse'))
+ self.SongMenu.setText(translate('SlideController', 'Go to Verse'))
self.SongMenu.setPopupMode(QtGui.QToolButton.InstantPopup)
self.Toolbar.addToolbarWidget(u'Song Menu', self.SongMenu)
self.SongMenu.setMenu(QtGui.QMenu(
- translate(u'SlideController', u'Go to Verse'), self.Toolbar))
+ translate('SlideController', 'Go to Verse'), self.Toolbar))
self.Toolbar.makeWidgetsInvisible([u'Song Menu'])
# Screen preview area
self.PreviewFrame = QtGui.QFrame(self.Splitter)
=== modified file 'openlp/core/utils/languagemanager.py'
--- openlp/core/utils/languagemanager.py 2010-06-09 17:09:32 +0000
+++ openlp/core/utils/languagemanager.py 2010-06-19 10:43:24 +0000
@@ -39,7 +39,7 @@
"""
__qmList__ = None
AutoLanguage = False
-
+
@staticmethod
def get_translator(language):
if LanguageManager.AutoLanguage:
@@ -62,9 +62,9 @@
@staticmethod
def language_name(qmFile):
- translator = QtCore.QTranslator()
+ translator = QtCore.QTranslator()
translator.load(qmFile)
- return translator.translate(u'MainWindow', u'English')
+ return translator.translate('MainWindow', 'English')
@staticmethod
def get_language():
@@ -89,10 +89,10 @@
QtCore.QSettings().setValue(
u'general/language', QtCore.QVariant(language))
log.info(u'Language file: \'%s\' written to conf file' % language)
- QtGui.QMessageBox.information(None,
- translate(u'LanguageManager', u'Language'),
- translate(u'LanguageManager',
- u'After restart new Language settings will be used.'))
+ QtGui.QMessageBox.information(None,
+ translate('LanguageManager', 'Language'),
+ translate('LanguageManager',
+ 'After restart new Language settings will be used.'))
@staticmethod
def init_qm_list():
@@ -103,7 +103,7 @@
if regEx.exactMatch(qmf):
langName = regEx.cap(1)
LanguageManager.__qmList__[u'%#2i %s' % (i+1,
- LanguageManager.language_name(qmf))] = langName
+ LanguageManager.language_name(qmf))] = langName
@staticmethod
def get_qm_list():
=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py 2010-06-08 15:38:09 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py 2010-06-19 10:43:24 +0000
@@ -131,7 +131,7 @@
self.horizontalLayout_2.addWidget(self.CreditEdit)
self.gridLayout.addLayout(self.horizontalLayout_2, 4, 0, 1, 1)
self.buttonBox = QtGui.QDialogButtonBox(customEditDialog)
- self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
+ self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel |
QtGui.QDialogButtonBox.Save)
self.buttonBox.setObjectName(u'buttonBox')
self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 1)
@@ -156,43 +156,43 @@
def retranslateUi(self, customEditDialog):
customEditDialog.setWindowTitle(
- translate(u'CustomPlugin.EditCustomForm', u'Edit Custom Slides'))
- self.UpButton.setToolTip(translate(u'CustomPlugin.EditCustomForm'
- u'CustomPlugin.EditCustomForm', u'Move slide Up 1'))
+ translate('CustomPlugin.EditCustomForm', 'Edit Custom Slides'))
+ self.UpButton.setToolTip(
+ translate('CustomPlugin.EditCustomForm', 'Move slide Up 1'))
self.DownButton.setToolTip(
- translate(u'CustomPlugin.EditCustomForm', u'Move slide down 1'))
+ translate('CustomPlugin.EditCustomForm', 'Move slide down 1'))
self.TitleLabel.setText(
- translate(u'CustomPlugin.EditCustomForm', u'Title:'))
+ translate('CustomPlugin.EditCustomForm', 'Title:'))
self.AddButton.setText(
- translate(u'CustomPlugin.EditCustomForm', u'Add New'))
- self.AddButton.setToolTip(translate(u'CustomPlugin.EditCustomForm',
- u'Add new slide at bottom'))
+ translate('CustomPlugin.EditCustomForm', 'Add New'))
+ self.AddButton.setToolTip(
+ translate('CustomPlugin.EditCustomForm', 'Add new slide at bottom'))
self.EditButton.setText(
- translate(u'CustomPlugin.EditCustomForm', u'Edit'))
+ translate('CustomPlugin.EditCustomForm', 'Edit'))
self.EditButton.setToolTip(
- translate(u'CustomPlugin.EditCustomForm', u'Edit selected slide'))
+ translate('CustomPlugin.EditCustomForm', 'Edit selected slide'))
self.EditAllButton.setText(
- translate(u'CustomPlugin.EditCustomForm', u'Edit All'))
+ translate('CustomPlugin.EditCustomForm', 'Edit All'))
self.EditAllButton.setToolTip(
- translate(u'CustomPlugin.EditCustomForm', u'Edit all slides'))
+ translate('CustomPlugin.EditCustomForm', 'Edit all slides'))
self.SaveButton.setText(
- translate(u'CustomPlugin.EditCustomForm', u'Save'))
+ translate('CustomPlugin.EditCustomForm', 'Save'))
self.SaveButton.setToolTip(
- translate(u'CustomPlugin.EditCustomForm', u'Replace edited slide'))
+ translate('CustomPlugin.EditCustomForm', 'Replace edited slide'))
self.DeleteButton.setText(
- translate(u'CustomPlugin.EditCustomForm', u'Delete'))
+ translate('CustomPlugin.EditCustomForm', 'Delete'))
self.DeleteButton.setToolTip(
- translate(u'CustomPlugin.EditCustomForm', u'Delete selected slide'))
+ translate('CustomPlugin.EditCustomForm', 'Delete selected slide'))
self.ClearButton.setText(
- translate(u'CustomPlugin.EditCustomForm', u'Clear'))
+ translate('CustomPlugin.EditCustomForm', 'Clear'))
self.ClearButton.setToolTip(
- translate(u'CustomPlugin.EditCustomForm', u'Clear edit area'))
+ translate('CustomPlugin.EditCustomForm', 'Clear edit area'))
self.SplitButton.setText(
- translate(u'CustomPlugin.EditCustomForm', u'Split Slide'))
+ translate('CustomPlugin.EditCustomForm', 'Split Slide'))
self.SplitButton.setToolTip(
- translate(u'CustomPlugin.EditCustomForm', u'Add slide split'))
+ translate('CustomPlugin.EditCustomForm', 'Add slide split'))
self.ThemeLabel.setText(
- translate(u'CustomPlugin.EditCustomForm', u'Theme:'))
+ translate('CustomPlugin.EditCustomForm', 'Theme:'))
self.CreditLabel.setText(
- translate(u'CustomPlugin.EditCustomForm', u'Credits:'))
+ translate('CustomPlugin.EditCustomForm', 'Credits:'))
=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py 2010-06-08 15:38:09 +0000
+++ openlp/plugins/custom/forms/editcustomform.py 2010-06-19 10:43:24 +0000
@@ -47,8 +47,8 @@
self.setupUi(self)
# Connecting signals and slots
self.previewButton = QtGui.QPushButton()
- self.previewButton.setText(translate(u'CustomPlugin.EditCustomForm',
- u'Save && Preview'))
+ self.previewButton.setText(
+ translate('CustomPlugin.EditCustomForm', 'Save && Preview'))
self.buttonBox.addButton(
self.previewButton, QtGui.QDialogButtonBox.ActionRole)
QtCore.QObject.connect(self.buttonBox,
@@ -85,8 +85,8 @@
def onPreview(self, button):
log.debug(u'onPreview')
- if button.text() == unicode(translate(u'CustomPlugin.EditCustomForm',
- u'Save && Preview')) \
+ if button.text() == \
+ unicode(translate('CustomPlugin.EditCustomForm', 'Save && Preview')) \
and self.saveCustom():
Receiver.send_message(u'custom_preview')
@@ -149,8 +149,8 @@
def saveCustom(self):
valid, message = self._validate()
if not valid:
- QtGui.QMessageBox.critical(self,
- translate(u'CustomPlugin.EditCustomForm', u'Error'), message,
+ QtGui.QMessageBox.critical(self,
+ translate('CustomPlugin.EditCustomForm', 'Error'), message,
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return False
sxml = SongXMLBuilder()
@@ -269,15 +269,15 @@
def _validate(self):
if len(self.TitleEdit.displayText()) == 0:
self.TitleEdit.setFocus()
- return False, translate(u'CustomPlugin.EditCustomForm',
- u'You need to enter a title')
+ return False, translate('CustomPlugin.EditCustomForm',
+ 'You need to enter a title')
# must have 1 slide
if self.VerseListView.count() == 0:
self.VerseTextEdit.setFocus()
- return False, translate(u'CustomPlugin.EditCustomForm',
- u'You need to enter a slide')
+ return False, translate('CustomPlugin.EditCustomForm',
+ 'You need to enter a slide')
if self.VerseTextEdit.toPlainText():
self.VerseTextEdit.setFocus()
- return False, translate(u'CustomPlugin.editCustomForm',
- u'You have unsaved data, please save or clear')
+ return False, translate('CustomPlugin.editCustomForm',
+ 'You have unsaved data, please save or clear')
return True, u''
=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py 2010-06-17 12:02:18 +0000
+++ openlp/plugins/images/imageplugin.py 2010-06-19 10:43:24 +0000
@@ -56,12 +56,12 @@
return ImageMediaItem(self, self.icon, self.name)
def about(self):
- about_text = translate(u'ImagePlugin', u'<b>Image Plugin'
- u'</b><br>Allows images of all types to be displayed. If a number '
- u'of images are selected together and presented on the live '
- u'controller it is possible to turn them into a timed loop.<br<br>'
- u'From the plugin if the <i>Override background</i> is chosen and '
- u'an image is selected any songs which are rendered will use the '
- u'selected image from the background instead of the one provied by '
- u'the theme.<br>')
+ about_text = translate('ImagePlugin', '<b>Image Plugin'
+ '</b><br>Allows images of all types to be displayed. If a number '
+ 'of images are selected together and presented on the live '
+ 'controller it is possible to turn them into a timed loop.<br<br>'
+ 'From the plugin if the <i>Override background</i> is chosen and '
+ 'an image is selected any songs which are rendered will use the '
+ 'selected image from the background instead of the one provied by '
+ 'the theme.<br>')
return about_text
=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py 2010-06-08 15:38:09 +0000
+++ openlp/plugins/images/lib/imagetab.py 2010-06-19 10:43:24 +0000
@@ -36,7 +36,7 @@
def setupUi(self):
self.setObjectName(u'ImageTab')
- self.tabTitleVisible = translate(u'ImagePlugin.ImageTab', u'Images')
+ self.tabTitleVisible = translate('ImagePlugin.ImageTab', 'Images')
self.ImageLayout = QtGui.QFormLayout(self)
self.ImageLayout.setObjectName(u'ImageLayout')
self.ImageSettingsGroupBox = QtGui.QGroupBox(self)
@@ -64,11 +64,11 @@
def retranslateUi(self):
self.ImageSettingsGroupBox.setTitle(
- translate(u'ImagePlugin.ImageTab', u'Image Settings'))
+ translate('ImagePlugin.ImageTab', 'Image Settings'))
self.TimeoutLabel.setText(
- translate(u'ImagePlugin.ImageTab', u'Slide Loop Delay:'))
+ translate('ImagePlugin.ImageTab', 'Slide Loop Delay:'))
self.TimeoutSpinBox.setSuffix(
- translate(u'ImagePlugin.ImageTab', u'sec'))
+ translate('ImagePlugin.ImageTab', 'sec'))
def onTimeoutSpinBoxChanged(self):
self.loop_delay = self.TimeoutSpinBox.value()
@@ -82,9 +82,9 @@
def save(self):
QtCore.QSettings().setValue(self.settingsSection + u'/loop delay',
QtCore.QVariant(self.loop_delay))
- Receiver.send_message(u'slidecontroller_live_spin_delay',
+ Receiver.send_message(u'slidecontroller_live_spin_delay',
self.loop_delay)
def postSetUp(self):
- Receiver.send_message(u'slidecontroller_live_spin_delay',
+ Receiver.send_message(u'slidecontroller_live_spin_delay',
self.loop_delay)
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2010-06-17 01:56:05 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2010-06-19 10:43:24 +0000
@@ -56,17 +56,17 @@
MediaManagerItem.__init__(self, parent, icon, title)
def initPluginNameVisible(self):
- self.PluginNameVisible = translate(u'ImagePlugin.MediaItem', u'Image')
+ self.PluginNameVisible = translate('ImagePlugin.MediaItem', 'Image')
def retranslateUi(self):
- self.OnNewPrompt = translate(u'ImagePlugin.MediaItem',
- u'Select Image(s)')
+ self.OnNewPrompt = translate('ImagePlugin.MediaItem',
+ 'Select Image(s)')
file_formats = u''
for file_format in QtGui.QImageReader.supportedImageFormats():
file_formats += u'*.%s ' % file_format
self.OnNewFileMasks = unicode(
- translate(u'ImagePlugin.MediaItem',
- u'Images (%s);; All files (*)')) % file_formats
+ translate('ImagePlugin.MediaItem',
+ 'Images (%s);; All files (*)')) % file_formats
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
@@ -95,7 +95,7 @@
self.ListView.addAction(
context_menu_action(
self.ListView, u':/slides/slide_blank.png',
- translate(u'ImagePlugin.MediaItem', u'Replace Live Background'),
+ translate('ImagePlugin.MediaItem', 'Replace Live Background'),
self.onReplaceClick))
def addEndHeaderBar(self):
@@ -110,7 +110,7 @@
self.ImageWidget.setObjectName(u'ImageWidget')
self.blankButton = self.Toolbar.addToolbarButton(
u'Replace Background', u':/slides/slide_blank.png',
- translate(u'ImagePlugin.MediaItem', u'Replace Live Background'),
+ translate('ImagePlugin.MediaItem', 'Replace Live Background'),
self.onReplaceClick, False)
# Add the song widget to the page layout
self.PageLayout.addWidget(self.ImageWidget)
@@ -119,8 +119,8 @@
"""
Remove an image item from the list
"""
- if self.checkItemSelected(translate(u'ImagePlugin.MediaItem',
- u'You must select an item to delete.')):
+ if self.checkItemSelected(translate('ImagePlugin.MediaItem',
+ 'You must select an item to delete.')):
items = self.ListView.selectedIndexes()
for item in items:
text = self.ListView.item(item.row())
@@ -155,7 +155,7 @@
items = self.ListView.selectedIndexes()
if items:
service_item.title = unicode(
- translate(u'ImagePlugin.MediaItem', u'Image(s)'))
+ translate('ImagePlugin.MediaItem', 'Image(s)'))
service_item.add_capability(ItemCapabilities.AllowsMaintain)
service_item.add_capability(ItemCapabilities.AllowsPreview)
service_item.add_capability(ItemCapabilities.AllowsLoop)
@@ -173,9 +173,9 @@
def onReplaceClick(self):
if not self.ListView.selectedIndexes():
QtGui.QMessageBox.information(self,
- translate(u'ImagePlugin.MediaItem', u'No item selected'),
- translate(u'ImagePlugin.MediaItem',
- u'You must select one item'))
+ translate('ImagePlugin.MediaItem', 'No item selected'),
+ translate('ImagePlugin.MediaItem',
+ 'You must select one item'))
items = self.ListView.selectedIndexes()
for item in items:
bitem = self.ListView.item(item.row())
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2010-06-16 01:23:57 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2010-06-19 10:43:24 +0000
@@ -58,11 +58,11 @@
self.ServiceItemIconName = u':/media/media_video.png'
def initPluginNameVisible(self):
- self.PluginNameVisible = translate(u'MediaPlugin.MediaItem', u'Media')
+ self.PluginNameVisible = translate('MediaPlugin.MediaItem', 'Media')
def retranslateUi(self):
- self.OnNewPrompt = translate(u'MediaPlugin.MediaItem', u'Select Media')
- self.OnNewFileMasks = translate(u'MediaPlugin.MediaItem',
+ self.OnNewPrompt = translate('MediaPlugin.MediaItem', 'Select Media')
+ self.OnNewFileMasks = translate('MediaPlugin.MediaItem',
u'Videos (%s);;'
u'Audio (%s);;'
u'All files (*)' % (self.parent.video_list, self.parent.audio_list))
@@ -73,13 +73,13 @@
self.hasNewIcon = False
self.hasEditIcon = False
- def addListViewToToolBar(self):
- MediaManagerItem.addListViewToToolBar(self)
- self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
- self.ListView.addAction(
- context_menu_action(self.ListView, u':/slides/slide_blank.png',
- translate(u'MediaPlugin.MediaItem', u'Replace Live Background'),
- self.onReplaceClick))
+# def addListViewToToolBar(self):
+# MediaManagerItem.addListViewToToolBar(self)
+# self.ListView.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
+# self.ListView.addAction(
+# context_menu_action(self.ListView, u':/slides/slide_blank.png',
+# translate('MediaPlugin.MediaItem', 'Replace Live Background'),
+# self.onReplaceClick))
def addEndHeaderBar(self):
self.ImageWidget = QtGui.QWidget(self)
@@ -91,29 +91,30 @@
self.ImageWidget.sizePolicy().hasHeightForWidth())
self.ImageWidget.setSizePolicy(sizePolicy)
self.ImageWidget.setObjectName(u'ImageWidget')
- self.blankButton = self.Toolbar.addToolbarButton(
- u'Replace Background', u':/slides/slide_blank.png',
- translate(u'MediaPlugin.MediaItem', u'Replace Live Background'),
- self.onReplaceClick, False)
+ #Replace backgrounds do not work at present so remove functionality.
+# self.blankButton = self.Toolbar.addToolbarButton(
+# u'Replace Background', u':/slides/slide_blank.png',
+# translate('MediaPlugin.MediaItem', 'Replace Live Background'),
+# self.onReplaceClick, False)
# Add the song widget to the page layout
self.PageLayout.addWidget(self.ImageWidget)
- def onReplaceClick(self):
- if self.background:
- self.background = False
- Receiver.send_message(u'videodisplay_stop')
- else:
- self.background = True
- if not self.ListView.selectedIndexes():
- QtGui.QMessageBox.information(self,
- translate(u'MediaPlugin.MediaItem', u'No item selected'),
- translate(u'MediaPlugin.MediaItem',
- u'You must select one item'))
- items = self.ListView.selectedIndexes()
- for item in items:
- bitem = self.ListView.item(item.row())
- filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
- Receiver.send_message(u'videodisplay_background', filename)
+# def onReplaceClick(self):
+# if self.background:
+# self.background = False
+# Receiver.send_message(u'videodisplay_stop')
+# else:
+# self.background = True
+# if not self.ListView.selectedIndexes():
+# QtGui.QMessageBox.information(self,
+# translate('MediaPlugin.MediaItem', 'No item selected'),
+# translate('MediaPlugin.MediaItem',
+# 'You must select one item'))
+# items = self.ListView.selectedIndexes()
+# for item in items:
+# bitem = self.ListView.item(item.row())
+# filename = unicode(bitem.data(QtCore.Qt.UserRole).toString())
+# Receiver.send_message(u'videodisplay_background', filename)
def generateSlideData(self, service_item, item=None):
if item is None:
@@ -122,7 +123,7 @@
return False
filename = unicode(item.data(QtCore.Qt.UserRole).toString())
service_item.title = unicode(
- translate(u'MediaPlugin.MediaItem', u'Media'))
+ translate('MediaPlugin.MediaItem', 'Media'))
service_item.add_capability(ItemCapabilities.RequiresMedia)
frame = u':/media/image_clapperboard.png'
(path, name) = os.path.split(filename)
@@ -140,8 +141,8 @@
"""
Remove a media item from the list
"""
- if self.checkItemSelected(translate(u'MediaPlugin.MediaItem',
- u'You must select an item to delete.')):
+ if self.checkItemSelected(translate('MediaPlugin.MediaItem',
+ 'You must select an item to delete.')):
item = self.ListView.currentItem()
row = self.ListView.row(item)
self.ListView.takeItem(row)
=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py 2010-06-17 12:02:18 +0000
+++ openlp/plugins/media/mediaplugin.py 2010-06-19 10:43:24 +0000
@@ -81,8 +81,8 @@
return MediaMediaItem(self, self.icon, self.name)
def about(self):
- about_text = translate(u'MediaPlugin',
- u'<b>Media Plugin</b><br>This plugin '
- u'allows the playing of audio and video media')
+ about_text = translate('MediaPlugin',
+ '<b>Media Plugin</b><br>This plugin '
+ 'allows the playing of audio and video media')
return about_text
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2010-06-18 19:55:45 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2010-06-19 10:43:24 +0000
@@ -460,8 +460,6 @@
self.VerseListWidget.setItem(row, 0, item)
self.VerseListWidget.resizeRowsToContents()
self.VerseListWidget.repaint()
- self.VerseEditButton.setEnabled(False)
- self.VerseDeleteButton.setEnabled(False)
self.tagRows()
def onVerseEditAllButtonClicked(self):
Follow ups
