diff --git a/openlp.pyw b/openlp.pyw index ebd449bf8..4c0eb9b14 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -105,6 +105,7 @@ class OpenLP(QtGui.QApplication): if show_splash: # now kill the splashscreen self.splash.finish(self.mainWindow) + self.mainWindow.versionCheck() return self.exec_() def main(): diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 8f4aabbe7..779b0aa7e 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -58,18 +58,13 @@ class MediaManagerItem(QtGui.QWidget): When creating a descendant class from this class for your plugin, the following member variables should be set. - ``self.TranslationContext`` - This sets the translation context of all the text in the - Media Manager item. - ``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)``. + translation function. ``self.ConfigSection`` The section in the configuration where the items in the media @@ -117,6 +112,7 @@ class MediaManagerItem(QtGui.QWidget): if title is not None: self.title = title self.Toolbar = None + self.ServiceItemIconName = None self.PageLayout = QtGui.QVBoxLayout(self) self.PageLayout.setSpacing(0) self.PageLayout.setContentsMargins(4, 0, 4, 0) @@ -228,7 +224,8 @@ class MediaManagerItem(QtGui.QWidget): if self.hasEditIcon: self.addToolbarButton( u'Edit %s' % self.PluginNameShort, - u'%s %s' % (self.trUtf8(u'Edit the selected'), self.PluginNameVisible), + u'%s %s' % (self.trUtf8(u'Edit the selected'), + self.PluginNameVisible), u':%s_edit.png' % self.IconPath, self.onEditClick, u'%sEditItem' % self.PluginNameShort) ## Delete Button ## @@ -319,7 +316,8 @@ class MediaManagerItem(QtGui.QWidget): pass def onFileClick(self): - files = QtGui.QFileDialog.getOpenFileNames(self, self.OnNewPrompt, + files = QtGui.QFileDialog.getOpenFileNames( + self, self.OnNewPrompt, self.parent.config.get_last_dir(), self.OnNewFileMasks) log.info(u'New files(s)%s', unicode(files)) if len(files) > 0: @@ -381,7 +379,7 @@ class MediaManagerItem(QtGui.QWidget): Common method for generating a service item """ service_item = ServiceItem(self.parent) - if self.ServiceItemIconName: + if self.ServiceItemIconName is not None: service_item.addIcon(self.ServiceItemIconName) else: service_item.addIcon( diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index 0dd8b5230..f7aba44b9 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -35,7 +35,7 @@ class PluginStatus(object): Inactive = 1 Disabled = 2 -class Plugin(object): +class Plugin(QtCore.QObject): """ Base class for openlp plugins to inherit from. @@ -91,7 +91,7 @@ class Plugin(object): log = logging.getLogger(u'Plugin') log.info(u'loaded') - def __init__(self, name=None, version=None, plugin_helpers=None): + def __init__(self, name, version=None, plugin_helpers=None): """ This is the constructor for the plugin object. This provides an easy way for descendent plugins to populate common data. This method *must* @@ -110,10 +110,8 @@ class Plugin(object): ``plugin_helpers`` Defaults to *None*. A list of helper objects. """ - if name is not None: - self.name = name - else: - self.name = u'Plugin' + QtCore.QObject.__init__(self) + self.name = name if version is not None: self.version = version self.icon = None @@ -129,7 +127,7 @@ class Plugin(object): self.settings = plugin_helpers[u'settings'] self.mediadock = plugin_helpers[u'toolbox'] QtCore.QObject.connect(Receiver.get_receiver(), - QtCore.SIGNAL(u'%s_add_service_item'% self.name), + QtCore.SIGNAL(u'%s_add_service_item' % self.name), self.process_add_service_event) def check_pre_conditions(self): diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py index b06ca2330..8a9fb216a 100644 --- a/openlp/core/lib/pluginmanager.py +++ b/openlp/core/lib/pluginmanager.py @@ -93,7 +93,6 @@ class PluginManager(object): log.exception(u'Failed to import module %s on path %s for reason %s', modulename, path, e.args[0]) plugin_classes = Plugin.__subclasses__() - self.plugins = [] plugin_objects = [] for p in plugin_classes: try: @@ -137,10 +136,6 @@ class PluginManager(object): for plugin in self.plugins: if plugin.status is not PluginStatus.Disabled: plugin.media_item = plugin.get_media_manager_item() - if plugin.media_item is not None: - log.debug(u'Inserting media manager item from %s' % \ - plugin.name) - mediadock.add_dock(plugin.media_item, plugin.icon, plugin.weight) def hook_settings_tabs(self, settingsform=None): """ diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 79c58f6af..dc4a3c44b 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -72,9 +72,11 @@ class Renderer(object): self._theme = theme self.bg_frame = None self.bg_image = None + self._bg_image_filename = None self.theme_name = theme.theme_name self._set_theme_font() if theme.background_type == u'image': + print theme.background_filename if theme.background_filename is not None: self.set_bg_image(theme.background_filename) @@ -110,8 +112,8 @@ class Renderer(object): painter.begin(self.bg_image) self.background_offsetx = (width - realwidth) / 2 self.background_offsety = (height - realheight) / 2 - painter.drawImage(self.background_offsetx, self.background_offsety, - preview) + painter.drawImage(self.background_offsetx, + self.background_offsety, preview) painter.end() def set_frame_dest(self, frame_width, frame_height, preview=False): diff --git a/openlp/core/lib/settingstab.py b/openlp/core/lib/settingstab.py index f9eb60964..aa278600a 100644 --- a/openlp/core/lib/settingstab.py +++ b/openlp/core/lib/settingstab.py @@ -31,7 +31,7 @@ class SettingsTab(QtGui.QWidget): SettingsTab is a helper widget for plugins to define Tabs for the settings dialog. """ - def __init__(self, title=None, section=None): + def __init__(self, title, section=None): """ Constructor to create the Settings tab item. diff --git a/openlp/core/lib/songxmlhandler.py b/openlp/core/lib/songxmlhandler.py index 394af1166..4543464bb 100644 --- a/openlp/core/lib/songxmlhandler.py +++ b/openlp/core/lib/songxmlhandler.py @@ -41,6 +41,10 @@ class SongXMLBuilder(object): """ + global log + log = logging.getLogger(u'SongXMLBuilder') + log.info(u'SongXMLBuilder Loaded') + def __init__(self): """ Set up the song builder. @@ -81,6 +85,7 @@ class SongXMLBuilder(object): ``content`` The actual text of the verse to be stored. """ + #log.debug(u'add_verse_to_lyrics %s, %s\n%s' % (type, number, content)) verse = self.song_xml.createElement(u'verse') verse.setAttribute(u'type', type) verse.setAttribute(u'label', number) diff --git a/openlp/core/ui/alertstab.py b/openlp/core/ui/alertstab.py index e2b8892fa..6123ff3c5 100644 --- a/openlp/core/ui/alertstab.py +++ b/openlp/core/ui/alertstab.py @@ -31,7 +31,7 @@ class AlertsTab(SettingsTab): AlertsTab is the alerts settings tab in the settings dialog. """ def __init__(self): - SettingsTab.__init__(self, u'Alerts', u'Alerts') + SettingsTab.__init__(self, u'Alerts') self.font_color = '#ffffff' self.bg_color = '#660000' diff --git a/openlp/core/ui/amendthemeform.py b/openlp/core/ui/amendthemeform.py index b95a88ca2..0652ccd62 100644 --- a/openlp/core/ui/amendthemeform.py +++ b/openlp/core/ui/amendthemeform.py @@ -431,7 +431,6 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): QtGui.QColor(self.theme.background_endColor), self).name() self.Color2PushButton.setStyleSheet( u'background-color: %s' % unicode(self.theme.background_endColor)) - self.previewTheme(self.theme) # #Other Tab @@ -481,25 +480,28 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): def paintUi(self, theme): self.stateChanging(theme) self.ThemeNameEdit.setText(self.theme.theme_name) + # Background Tab if self.theme.background_mode == u'opaque': self.BackgroundComboBox.setCurrentIndex(0) else: self.BackgroundComboBox.setCurrentIndex(1) - + self.ImageLineEdit.setText(u'') if theme.background_type == u'solid': self.BackgroundTypeComboBox.setCurrentIndex(0) elif theme.background_type == u'gradient': self.BackgroundTypeComboBox.setCurrentIndex(1) else: self.BackgroundTypeComboBox.setCurrentIndex(2) - + self.ImageLineEdit.setText(self.theme.background_filename) if self.theme.background_direction == u'horizontal': self.GradientComboBox.setCurrentIndex(0) elif self.theme.background_direction == u'vertical': self.GradientComboBox.setCurrentIndex(1) else: self.GradientComboBox.setCurrentIndex(2) - + # Font Main Tab + self.FontMainComboBox.setCurrentFont( + QtGui.QFont(self.theme.font_main_name)) self.FontMainSizeSpinBox.setValue(int(self.theme.font_main_proportion)) if not self.theme.font_main_italics and \ self.theme.font_main_weight == u'Normal': @@ -517,6 +519,9 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): self.FontMainYSpinBox.setValue(int(self.theme.font_main_y)) self.FontMainWidthSpinBox.setValue(int(self.theme.font_main_width)) self.FontMainHeightSpinBox.setValue(int(self.theme.font_main_height)) + # Font Footer Tab + self.FontFooterComboBox.setCurrentFont( + QtGui.QFont(self.theme.font_footer_name)) self.FontFooterSizeSpinBox.setValue( int(self.theme.font_footer_proportion)) if not self.theme.font_footer_italics and \ diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 54031ec1a..4af3faeb7 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -32,7 +32,7 @@ class GeneralTab(SettingsTab): """ def __init__(self, screen_list): self.screen_list = screen_list - SettingsTab.__init__(self, u'General', u'General') + SettingsTab.__init__(self, u'General') def setupUi(self): self.setObjectName(u'GeneralTab') @@ -76,6 +76,16 @@ class GeneralTab(SettingsTab): self.ShowSplashCheckBox.setObjectName(u'ShowSplashCheckBox') self.StartupLayout.addWidget(self.ShowSplashCheckBox) self.GeneralLeftLayout.addWidget(self.StartupGroupBox) + self.SettingsGroupBox = QtGui.QGroupBox(self.GeneralLeftWidget) + self.SettingsGroupBox.setObjectName(u'SettingsGroupBox') + self.SettingsLayout = QtGui.QVBoxLayout(self.SettingsGroupBox) + self.SettingsLayout.setSpacing(8) + self.SettingsLayout.setMargin(8) + self.SettingsLayout.setObjectName(u'SettingsLayout') + self.SaveCheckServiceCheckBox = QtGui.QCheckBox(self.SettingsGroupBox) + self.SaveCheckServiceCheckBox.setObjectName(u'SaveCheckServiceCheckBox') + self.SettingsLayout.addWidget(self.SaveCheckServiceCheckBox) + self.GeneralLeftLayout.addWidget(self.SettingsGroupBox) self.GeneralLeftSpacer = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) self.GeneralLeftLayout.addItem(self.GeneralLeftSpacer) @@ -124,6 +134,8 @@ class GeneralTab(SettingsTab): QtCore.SIGNAL(u'stateChanged(int)'), self.onAutoOpenCheckBoxChanged) QtCore.QObject.connect(self.ShowSplashCheckBox, QtCore.SIGNAL(u'stateChanged(int)'), self.onShowSplashCheckBoxChanged) + QtCore.QObject.connect(self.SaveCheckServiceCheckBox, + QtCore.SIGNAL(u'stateChanged(int)'), self.onSaveCheckServiceCheckBox) QtCore.QObject.connect(self.NumberEdit, QtCore.SIGNAL(u'editingFinished()'), self.onNumberEditLostFocus) QtCore.QObject.connect(self.UsernameEdit, @@ -138,6 +150,8 @@ class GeneralTab(SettingsTab): self.WarningCheckBox.setText(self.trUtf8(u'Show blank screen warning')) self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service')) self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen')) + self.SettingsGroupBox.setTitle(self.trUtf8(u'Application Settings')) + self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Sevice before starting New')) self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details')) self.NumberLabel.setText(self.trUtf8(u'CCLI Number:')) self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:')) @@ -155,6 +169,9 @@ class GeneralTab(SettingsTab): def onWarningCheckBoxChanged(self, value): self.Warning = (value == QtCore.Qt.Checked) + def onSaveCheckServiceCheckBox(self, value): + self.PromptSaveService = (value == QtCore.Qt.Checked) + def onNumberEditLostFocus(self): self.CCLNumber = self.NumberEdit.displayText() @@ -175,9 +192,11 @@ class GeneralTab(SettingsTab): self.Warning = str_to_bool(self.config.get_config(u'Blank Warning', u'False')) self.AutoOpen = str_to_bool(self.config.get_config(u'Auto Open', u'False')) self.ShowSplash = str_to_bool(self.config.get_config(u'show splash', u'True')) + self.PromptSaveService = str_to_bool(self.config.get_config(u'prompt save service', u'False')) self.CCLNumber = unicode(self.config.get_config(u'CCL Number', u'XXX')) self.Username = unicode(self.config.get_config(u'User Name', u'')) self.Password = unicode(self.config.get_config(u'Password', u'')) + self.SaveCheckServiceCheckBox.setChecked(self.PromptSaveService) # Set a few things up self.MonitorComboBox.setCurrentIndex(self.MonitorNumber) self.WarningCheckBox.setChecked(self.Warning) @@ -192,6 +211,7 @@ class GeneralTab(SettingsTab): self.config.set_config(u'Blank Warning', self.Warning) self.config.set_config(u'Auto Open', self.AutoOpen) self.config.set_config(u'show splash', self.ShowSplash) + self.config.set_config(u'prompt save service', self.PromptSaveService) self.config.set_config(u'CCL Number', self.CCLNumber) self.config.set_config(u'User Name', self.Username) self.config.set_config(u'Password', self.Password) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 2998bd0e9..51789e225 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -525,7 +525,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.settingsForm.postSetUp() def versionCheck(self): - applicationVersion = self.generalConfig.get_config(u'Application version', u'1.9.0-595') + applicationVersion = self.generalConfig.get_config(u'Application version', u'1.9.0-640') version = check_latest_version(self.generalConfig, applicationVersion) if applicationVersion != version: version_text = unicode(self.trUtf8(u'OpenLP version %s has been updated ' @@ -562,7 +562,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): screen_number = self.getMonitorNumber() self.mainDisplay.setup(screen_number) self.setFocus() - self.versionCheck() if str_to_bool(self.generalConfig.get_config(u'Auto Open', False)): self.ServiceManagerContents.onLoadService(True) if str_to_bool(self.generalConfig.get_config(u'Screen Blank', False)) \ diff --git a/openlp/core/ui/mediadockmanager.py b/openlp/core/ui/mediadockmanager.py index 4b1d64178..abb534435 100644 --- a/openlp/core/ui/mediadockmanager.py +++ b/openlp/core/ui/mediadockmanager.py @@ -33,8 +33,7 @@ class MediaDockManager(object): def add_dock(self, media_item, icon, weight): log.info(u'Adding %s dock' % media_item.title) - id = self.media_dock.addItem( - media_item, icon, media_item.title) + self.media_dock.addItem(media_item, icon, media_item.title) def insert_dock(self, media_item, icon, weight): """ @@ -56,6 +55,6 @@ class MediaDockManager(object): log.debug(u'remove %s dock' % name) for dock_index in range(0, self.media_dock.count()): if self.media_dock.widget(dock_index) is not None: - if self.media_dock.widget(dock_index).ConfigSection == name.lower(): + if self.media_dock.widget(dock_index).ConfigSection == name: self.media_dock.widget(dock_index).hide() self.media_dock.removeItem(dock_index) diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py index a02e02966..b41565691 100644 --- a/openlp/core/ui/pluginform.py +++ b/openlp/core/ui/pluginform.py @@ -37,6 +37,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog): QtGui.QDialog.__init__(self, parent) self.parent = parent self.activePlugin = None + self.programaticChange = False self.setupUi(self) self.load() self._clearDetails() @@ -84,6 +85,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog): self.VersionNumberLabel.setText(self.activePlugin.version) self.AboutTextBrowser.setHtml(self.activePlugin.about()) if self.activePlugin.can_be_disabled(): + self.programaticChange = True self.StatusComboBox.setCurrentIndex(int(self.activePlugin.status)) self.StatusComboBox.setEnabled(True) else: @@ -105,6 +107,9 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog): self._clearDetails() def onStatusComboBoxChanged(self, status): + if self.programaticChange is True: + self.programaticChange = False + return self.activePlugin.toggle_status(status) if status == PluginStatus.Active: self.activePlugin.initialise() @@ -119,4 +124,3 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog): status_text = 'Disabled' self.PluginListWidget.currentItem().setText( u'%s (%s)' % (self.activePlugin.name, status_text)) - diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index da30c9f49..63e268c22 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -27,11 +27,12 @@ import string import logging import cPickle import zipfile +import uuid from PyQt4 import QtCore, QtGui from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \ ServiceItemType, contextMenuAction, contextMenuSeparator, contextMenu, \ - Receiver + Receiver, contextMenu, str_to_bool class ServiceManagerList(QtGui.QTreeWidget): @@ -129,8 +130,12 @@ class ServiceManager(QtGui.QWidget): self.parent = parent self.serviceItems = [] self.serviceName = u'' + #is a new service and has not been saved self.isNew = True + #Indicates if remoteTriggering is active. If it is the next addServiceItem call + #will replace the currently selected one. self.remoteEditTriggered = False + #start with the layout self.Layout = QtGui.QVBoxLayout(self) self.Layout.setSpacing(0) self.Layout.setMargin(0) @@ -355,6 +360,19 @@ class ServiceManager(QtGui.QWidget): """ Clear the list to create a new service """ + if self.parent.serviceNotSaved and \ + str_to_bool(PluginConfig(u'General'). + get_config(u'prompt save service', u'False')): + ret = QtGui.QMessageBox.question(None, + self.trUtf8(u'Save Changes to Service?'), + self.trUtf8(u'Your service is unsaved, do you want to save those ' + u'changes before creating a new one ?'), + QtGui.QMessageBox.StandardButtons( + QtGui.QMessageBox.Cancel | + QtGui.QMessageBox.Save), + QtGui.QMessageBox.Save) + if ret == QtGui.QMessageBox.Save: + self.onSaveService() self.ServiceManagerList.clear() self.serviceItems = [] self.serviceName = u'' @@ -539,17 +557,22 @@ class ServiceManager(QtGui.QWidget): sitem, count = self.findServiceItem() item.render() if self.remoteEditTriggered: + item.uuid = self.serviceItems[sitem][u'data'].uuid self.serviceItems[sitem][u'data'] = item self.remoteEditTriggered = False self.repaintServiceList(sitem + 1, 0) + self.parent.LiveController.replaceServiceManagerItem(item) else: + item.uuid = unicode(uuid.uuid1()) if sitem == -1: self.serviceItems.append({u'data': item, - u'order': len(self.serviceItems) + 1, u'expanded':True}) + u'order': len(self.serviceItems) + 1, + u'expanded':True}) self.repaintServiceList(len(self.serviceItems) + 1, 0) else: self.serviceItems.insert(sitem + 1, {u'data': item, - u'order': len(self.serviceItems)+1, u'expanded':True}) + u'order': len(self.serviceItems)+1, + u'expanded':True}) self.repaintServiceList(sitem + 1, 0) self.parent.serviceChanged(False, self.serviceName) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 99f5359ed..1c7511c70 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -177,16 +177,16 @@ class SlideController(QtGui.QWidget): if isLive: self.Songbar = OpenLPToolbar(self) self.Songbar.addToolbarButton( - u'Bridge', u':/media/media_time.png', + u'Bridge', u':/slides/slide_close.png', self.trUtf8(u'Bridge'), self.onSongBarHandler) self.Songbar.addToolbarButton( - u'Chorus', u':/media/media_time.png', + u'Chorus', u':/slides/slide_close.png', self.trUtf8(u'Chorus'), self.onSongBarHandler) - for verse in range(1, 9): + for verse in range(1, 20): self.Songbar.addToolbarButton( - unicode(verse), u':/media/media_time.png', + unicode(verse), u':/slides/slide_close.png', unicode(self.trUtf8(u'Verse %s'))%verse, self.onSongBarHandler) self.ControllerLayout.addWidget(self.Songbar) @@ -283,6 +283,15 @@ class SlideController(QtGui.QWidget): self.Toolbar.makeWidgetsInvisible(self.image_list) if item.name == u'Songs' and \ str_to_bool(self.songsconfig.get_config(u'display songbar', True)): + for action in self.Songbar.actions: + self.Songbar.actions[action].setVisible(False) + verses = item.verse_order.split(u' ') + for verse in verses: + try: + self.Songbar.actions[verse].setVisible(True) + except: + #More than 20 verses hard luck + pass self.Songbar.setVisible(True) elif item.service_item_type == ServiceItemType.Image: #Not sensible to allow loops with 1 frame @@ -324,6 +333,13 @@ class SlideController(QtGui.QWidget): self.songEdit = False self.displayServiceManagerItems(item, slideno) + def replaceServiceManagerItem(self, item): + """ + Replacement item following a remote edit + """ + if self.commandItem is not None and \ + item.uuid == self.commandItem.uuid: + self.addServiceManagerItem(item, self.PreviewListWidget.currentRow()) def addServiceManagerItem(self, item, slideno): """ diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py index d53ebb7d9..2afbf297c 100644 --- a/openlp/core/ui/themestab.py +++ b/openlp/core/ui/themestab.py @@ -32,7 +32,7 @@ class ThemesTab(SettingsTab): """ def __init__(self, parent): self.parent = parent - SettingsTab.__init__(self, u'Themes', u'Themes') + SettingsTab.__init__(self, u'Themes') def setupUi(self): self.setObjectName(u'ThemesTab') diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index eb1018bf2..d797b44cc 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -35,10 +35,8 @@ class BiblePlugin(Plugin): log.info(u'Bible Plugin loaded') def __init__(self, plugin_helpers): - # Call the parent constructor Plugin.__init__(self, u'Bibles', u'1.9.0', plugin_helpers) self.weight = -9 - # Create the plugin icon self.icon = buildIcon(u':/media/media_bible.png') #Register the bible Manager self.biblemanager = None @@ -63,11 +61,11 @@ class BiblePlugin(Plugin): self.ExportBibleItem.setVisible(False) def get_settings_tab(self): - return BiblesTab() + return BiblesTab(self.name) def get_media_manager_item(self): # Create the BibleManagerItem object - return BibleMediaItem(self, self.icon, u'Bibles') + return BibleMediaItem(self, self.icon, self.name) def add_import_menu_item(self, import_menu): self.ImportBibleItem = QtGui.QAction(import_menu) @@ -91,8 +89,7 @@ class BiblePlugin(Plugin): self.media_item.onNewClick() def about(self): - about_text = u'Bible Plugin
This plugin allows '\ - u'bible verse from different sources to be displayed on the '\ - u'screen during the service.

This is a core '\ - u'plugin and cannot be made inactive' + about_text = self.trUtf8(u'Bible Plugin
This ' + u'plugin allows bible verses from different sources to be ' + u'displayed on the screen during the service.') return about_text diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py index 91e051169..0e9d9fb0b 100644 --- a/openlp/plugins/bibles/lib/biblestab.py +++ b/openlp/plugins/bibles/lib/biblestab.py @@ -37,11 +37,11 @@ class BiblesTab(SettingsTab): log = logging.getLogger(u'BibleTab') log.info(u'Bible Tab loaded') - def __init__(self): + def __init__(self, title, section=None): self.paragraph_style = True self.show_new_chapters = False self.display_style = 0 - SettingsTab.__init__(self, u'Bibles', u'Bibles') + SettingsTab.__init__(self, title, section) def setupUi(self): self.setObjectName(u'BiblesTab') diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index eaaf147b6..b18c8b4d8 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -283,7 +283,8 @@ class BibleManager(object): count = self.bible_db_cache[bible].get_max_bible_book_verses( book, chapter) if count == 0: - text = self.get_verse_text(bible, book, chapter, chapter, 1, 1) + # Make sure the first chapter has been downloaded + self.get_verse_text(bible, book, chapter, chapter, 1, 1) count = self.bible_db_cache[bible].get_max_bible_book_verses( book, chapter) return count diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index a305400a5..d44f18a6f 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -46,12 +46,10 @@ class BibleMediaItem(MediaManagerItem): log.info(u'Bible Media Item loaded') def __init__(self, parent, icon, title): - self.TranslationContext = u'BiblePlugin' self.PluginNameShort = u'Bible' - self.ConfigSection = u'bibles' + self.ConfigSection = title 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) # place to store the search results @@ -60,7 +58,7 @@ class BibleMediaItem(MediaManagerItem): QtCore.SIGNAL(u'openlpreloadbibles'), self.reloadBibles) def initPluginNameVisible(self): - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.PluginNameVisible = self.trUtf8(u'Bible') def requiredIcons(self): MediaManagerItem.requiredIcons(self) @@ -89,14 +87,16 @@ class BibleMediaItem(MediaManagerItem): self.QuickVersionLabel.setObjectName(u'QuickVersionLabel') self.QuickLayout.addWidget(self.QuickVersionLabel, 0, 0, 1, 1) self.QuickVersionComboBox = QtGui.QComboBox(self.QuickTab) - self.QuickVersionComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) + self.QuickVersionComboBox.setSizeAdjustPolicy( + QtGui.QComboBox.AdjustToMinimumContentsLength) self.QuickVersionComboBox.setObjectName(u'VersionComboBox') self.QuickLayout.addWidget(self.QuickVersionComboBox, 0, 1, 1, 2) self.QuickSecondVersionLabel = QtGui.QLabel(self.QuickTab) self.QuickSecondVersionLabel.setObjectName(u'QuickSecondVersionLabel') self.QuickLayout.addWidget(self.QuickSecondVersionLabel, 1, 0, 1, 1) self.QuickSecondBibleComboBox = QtGui.QComboBox(self.QuickTab) - self.QuickSecondBibleComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) + self.QuickSecondBibleComboBox.setSizeAdjustPolicy( + QtGui.QComboBox.AdjustToMinimumContentsLength) self.QuickSecondBibleComboBox.setObjectName(u'SecondBible') self.QuickLayout.addWidget(self.QuickSecondBibleComboBox, 1, 1, 1, 2) self.QuickSearchLabel = QtGui.QLabel(self.QuickTab) @@ -147,16 +147,20 @@ class BibleMediaItem(MediaManagerItem): self.AdvancedVersionLabel.setObjectName(u'AdvancedVersionLabel') self.AdvancedLayout.addWidget(self.AdvancedVersionLabel, 0, 0, 1, 1) self.AdvancedVersionComboBox = QtGui.QComboBox(self.AdvancedTab) - self.AdvancedVersionComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) + self.AdvancedVersionComboBox.setSizeAdjustPolicy( + QtGui.QComboBox.AdjustToMinimumContentsLength) self.AdvancedVersionComboBox.setObjectName(u'AdvancedVersionComboBox') self.AdvancedLayout.addWidget(self.AdvancedVersionComboBox, 0, 1, 1, 2) self.AdvancedSecondBibleLabel = QtGui.QLabel(self.AdvancedTab) self.AdvancedSecondBibleLabel.setObjectName(u'AdvancedSecondBibleLabel') self.AdvancedLayout.addWidget(self.AdvancedSecondBibleLabel, 1, 0, 1, 1) self.AdvancedSecondBibleComboBox = QtGui.QComboBox(self.AdvancedTab) - self.AdvancedSecondBibleComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToMinimumContentsLength) - self.AdvancedSecondBibleComboBox.setObjectName(u'AdvancedSecondBibleComboBox') - self.AdvancedLayout.addWidget(self.AdvancedSecondBibleComboBox, 1, 1, 1, 2) + self.AdvancedSecondBibleComboBox.setSizeAdjustPolicy( + QtGui.QComboBox.AdjustToMinimumContentsLength) + self.AdvancedSecondBibleComboBox.setObjectName( + u'AdvancedSecondBibleComboBox') + self.AdvancedLayout.addWidget( + self.AdvancedSecondBibleComboBox, 1, 1, 1, 2) self.AdvancedBookLabel = QtGui.QLabel(self.AdvancedTab) self.AdvancedBookLabel.setObjectName(u'AdvancedBookLabel') self.AdvancedLayout.addWidget(self.AdvancedBookLabel, 2, 0, 1, 1) @@ -198,14 +202,16 @@ class BibleMediaItem(MediaManagerItem): self.AdvancedSearchButtonLayout = QtGui.QHBoxLayout() self.AdvancedSearchButtonLayout.setMargin(0) self.AdvancedSearchButtonLayout.setSpacing(0) - self.AdvancedSearchButtonLayout.setObjectName(u'AdvancedSearchButtonLayout') + self.AdvancedSearchButtonLayout.setObjectName( + u'AdvancedSearchButtonLayout') self.AdvancedSearchButtonSpacer = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) self.AdvancedSearchButtonLayout.addItem(self.AdvancedSearchButtonSpacer) self.AdvancedSearchButton = QtGui.QPushButton(self.AdvancedTab) self.AdvancedSearchButton.setObjectName(u'AdvancedSearchButton') self.AdvancedSearchButtonLayout.addWidget(self.AdvancedSearchButton) - self.AdvancedLayout.addLayout(self.AdvancedSearchButtonLayout, 7, 0, 1, 3) + self.AdvancedLayout.addLayout( + self.AdvancedSearchButtonLayout, 7, 0, 1, 3) self.AdvancedMessage = QtGui.QLabel(self.AdvancedTab) self.AdvancedMessage.setObjectName(u'AdvancedMessage') self.AdvancedLayout.addWidget(self.AdvancedMessage, 8, 0, 1, 3) @@ -475,10 +481,12 @@ class BibleMediaItem(MediaManagerItem): for book in book_data: row = self.AdvancedBookComboBox.count() self.AdvancedBookComboBox.addItem(book[u'book']) - self.AdvancedBookComboBox.setItemData(row, QtCore.QVariant(book[u'total'])) + self.AdvancedBookComboBox.setItemData( + row, QtCore.QVariant(book[u'total'])) if first: first = False - self.initialiseChapterVerse(bible, book[u'book'], book[u'total']) + self.initialiseChapterVerse( + bible, book[u'book'], book[u'total']) def initialiseChapterVerse(self, bible, book, chapters): log.debug(u'initialiseChapterVerse %s, %s', bible, book) diff --git a/openlp/plugins/bibles/lib/models.py b/openlp/plugins/bibles/lib/models.py index a6d5624b1..459dbf212 100644 --- a/openlp/plugins/bibles/lib/models.py +++ b/openlp/plugins/bibles/lib/models.py @@ -1,24 +1,26 @@ # -*- coding: utf-8 -*- # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 -""" -OpenLP - Open Source Lyrics Projection -Copyright (c) 2008 Raoul Snyman - -Portions copyright (c) 2008 - 2009 Martin Thompson, Tim Bentley - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -""" +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### from sqlalchemy import Column, Table, MetaData, ForeignKey, types, \ create_engine diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index 9d209d1ec..bcd61f5bc 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -44,17 +44,15 @@ class CustomPlugin(Plugin): log.info(u'Custom Plugin loaded') def __init__(self, plugin_helpers): - # Call the parent constructor Plugin.__init__(self, u'Custom', u'1.9.0', plugin_helpers) self.weight = -5 self.custommanager = CustomManager(self.config) self.edit_custom_form = EditCustomForm(self.custommanager) - # Create the plugin icon self.icon = buildIcon(u':/media/media_custom.png') def get_media_manager_item(self): # Create the CustomManagerItem object - return CustomMediaItem(self, self.icon, u'Custom') + return CustomMediaItem(self, self.icon, self.name) def can_be_disabled(self): return True @@ -69,4 +67,8 @@ class CustomPlugin(Plugin): self.remove_toolbox_item() def about(self): - return u'Custom Plugin
This plugin allows slides to be displayed on the screen in the same way songs are. The difference between this plugin and songs is this plugin provides greater freedom.
' + about_text = self.trUtf8(u'Custom Plugin
This plugin ' + u'allows slides to be displayed on the screen in the same way ' + u'songs are. This plugin provides greater freedom over the ' + u'songs plugin.
') + return about_text diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index d5859cc92..93f1bfb95 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -42,17 +42,14 @@ class CustomMediaItem(MediaManagerItem): log.info(u'Custom Media Item loaded') def __init__(self, parent, icon, title): - self.TranslationContext = u'CustomPlugin' self.PluginNameShort = u'Custom' - self.ConfigSection = u'custom' + self.ConfigSection = title self.IconPath = u'custom/custom' # this next is a class, not an instance of a class - it will # be instanced by the base MediaManagerItem self.ListViewWithDnD_class = CustomListView - self.ServiceItemIconName = u':/custom/custom_image.png' self.servicePath = None MediaManagerItem.__init__(self, parent, icon, title) - self.parent = parent self.fromServiceManager = -1 def addEndHeaderBar(self): @@ -64,7 +61,7 @@ class CustomMediaItem(MediaManagerItem): QtCore.SIGNAL(u'load_custom_list'), self.initialise) def initPluginNameVisible(self): - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.PluginNameVisible = self.trUtf8(u'Custom') def requiredIcons(self): MediaManagerItem.requiredIcons(self) diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py index e7c665aa6..229b57f95 100644 --- a/openlp/plugins/images/imageplugin.py +++ b/openlp/plugins/images/imageplugin.py @@ -33,10 +33,8 @@ class ImagePlugin(Plugin): log.info(u'Image Plugin loaded') def __init__(self, plugin_helpers): - # Call the parent constructor Plugin.__init__(self, u'Images', u'1.9.0', plugin_helpers) self.weight = -7 - # Create the plugin icon self.icon = buildIcon(u':/media/media_image.png') def can_be_disabled(self): @@ -52,11 +50,18 @@ class ImagePlugin(Plugin): self.remove_toolbox_item() def get_settings_tab(self): - return ImageTab() + return ImageTab(self.name) def get_media_manager_item(self): # Create the MediaManagerItem object - return ImageMediaItem(self, self.icon, u'Images') + return ImageMediaItem(self, self.icon, self.name) def about(self): - return u'Image Plugin
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.
From the plugin if the Override background is chosen and an image is selected any somgs which are rendered will use the selected image from the background instead of the one provied by the theme.
' + about_text = self.trUtf8(u'Image Plugin
Allows images of ' + u'all types to be displayed. If a number of images are selected ' + u'together and presented on the live controller it is possible ' + u'to turn them into a timed loop.
From the plugin if the ' + u'Override background is chosen and an image is selected ' + u'any somgs which are rendered will use the selected image from ' + u'the background instead of the one provied by the theme.
') + return about_text diff --git a/openlp/plugins/images/lib/imagetab.py b/openlp/plugins/images/lib/imagetab.py index 893d156a5..84da616d0 100644 --- a/openlp/plugins/images/lib/imagetab.py +++ b/openlp/plugins/images/lib/imagetab.py @@ -30,8 +30,8 @@ class ImageTab(SettingsTab): """ ImageTab is the Image settings tab in the settings dialog. """ - def __init__(self): - SettingsTab.__init__(self, u'Images', u'Images') + def __init__(self, title, section=None): + SettingsTab.__init__(self, title, section) def setupUi(self): self.setObjectName(u'ImageTab') @@ -42,7 +42,7 @@ class ImageTab(SettingsTab): self.ImageSettingsGroupBox.setObjectName(u'ImageSettingsGroupBox') self.TimeoutLayout = QtGui.QHBoxLayout(self.ImageSettingsGroupBox) self.TimeoutLayout.setSpacing(8) - self.TimeoutLayout.setMargin(0) + self.TimeoutLayout.setMargin(8) self.TimeoutLayout.setObjectName(u'TimeoutLayout') self.TimeoutLabel = QtGui.QLabel(self.ImageSettingsGroupBox) self.TimeoutLabel.setObjectName(u'TimeoutLabel') diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index afd3606c8..7cfe2eec0 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -44,20 +44,18 @@ class ImageMediaItem(MediaManagerItem): log.info(u'Image Media Item loaded') def __init__(self, parent, icon, title): - self.TranslationContext = u'ImagePlugin' self.PluginNameShort = u'Image' - self.ConfigSection = u'images' + self.ConfigSection = title self.IconPath = u'images/image' # this next is a class, not an instance of a class - it will # be instanced by the base MediaManagerItem self.ListViewWithDnD_class = ImageListView - self.ServiceItemIconName = u':/media/media_image.png' self.servicePath = None MediaManagerItem.__init__(self, parent, icon, title) self.overrideActive = False def initPluginNameVisible(self): - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.PluginNameVisible = self.trUtf8(u'Image') def retranslateUi(self): self.OnNewPrompt = self.trUtf8(u'Select Image(s)') diff --git a/openlp/plugins/media/lib/filelistdata.py b/openlp/plugins/media/lib/filelistdata.py index 4120f7b36..ecb01be0a 100644 --- a/openlp/plugins/media/lib/filelistdata.py +++ b/openlp/plugins/media/lib/filelistdata.py @@ -22,70 +22,70 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### -import os -import logging -from PyQt4.QtCore import * -from PyQt4.QtGui import * - -class FileListData(QAbstractListModel): - """ - An abstract list of strings and the preview icon to go with them - """ - global log - log=logging.getLogger(u'FileListData') - log.info(u'started') - - def __init__(self): - QAbstractListModel.__init__(self) - self.items = [] # will be a list of (full filename shortname) tuples - - def rowCount(self, parent): - return len(self.items) - - def insertRow(self, row, filename): - self.beginInsertRows(QModelIndex(),row,row) - log.info(u'insert row %d:%s'%(row,filename)) - # get short filename to display next to image - (prefix, shortfilename) = os.path.split(unicode(filename)) - log.info(u'shortfilename=%s'%(shortfilename)) - # create a preview image - self.items.insert(row, (filename, shortfilename)) - self.endInsertRows() - - def removeRow(self, row): - self.beginRemoveRows(QModelIndex(), row,row) - self.items.pop(row) - self.endRemoveRows() - - def addRow(self, filename): - self.insertRow(len(self.items), filename) - - def data(self, index, role): - row = index.row() - if row > len(self.items): # if the last row is selected and deleted, we then get called with an empty row! - return QVariant() - if role == Qt.DisplayRole: - retval= self.items[row][1] -# elif role == Qt.DecorationRole: +#import os +#import logging +#from PyQt4.QtCore import * +#from PyQt4.QtGui import * +# +#class FileListData(QAbstractListModel): +# """ +# An abstract list of strings and the preview icon to go with them +# """ +# global log +# log=logging.getLogger(u'FileListData') +# log.info(u'started') +# +# def __init__(self): +# QAbstractListModel.__init__(self) +# self.items = [] # will be a list of (full filename shortname) tuples +# +# def rowCount(self, parent): +# return len(self.items) +# +# def insertRow(self, row, filename): +# self.beginInsertRows(QModelIndex(),row,row) +# log.info(u'insert row %d:%s'%(row,filename)) +# # get short filename to display next to image +# (prefix, shortfilename) = os.path.split(unicode(filename)) +# log.info(u'shortfilename=%s'%(shortfilename)) +# # create a preview image +# self.items.insert(row, (filename, shortfilename)) +# self.endInsertRows() +# +# def removeRow(self, row): +# self.beginRemoveRows(QModelIndex(), row,row) +# self.items.pop(row) +# self.endRemoveRows() +# +# def addRow(self, filename): +# self.insertRow(len(self.items), filename) +# +# def data(self, index, role): +# row = index.row() +# if row > len(self.items): # if the last row is selected and deleted, we then get called with an empty row! +# return QVariant() +# if role == Qt.DisplayRole: # retval= self.items[row][1] - elif role == Qt.ToolTipRole: - retval= self.items[row][0] - else: - retval= QVariant() -# log.info(u'Returning"+ unicode(retval)) - if type(retval) is not type(QVariant): - return QVariant(retval) - else: - return retval - - def getFileList(self): - filelist = [item[0] for item in self.items]; - return filelist - - def getFilename(self, index): - row = index.row() - return self.items[row][0] - - def getValue(self, index): - row = index.row() - return self.items[row][0] +## elif role == Qt.DecorationRole: +## retval= self.items[row][1] +# elif role == Qt.ToolTipRole: +# retval= self.items[row][0] +# else: +# retval= QVariant() +## log.info(u'Returning"+ unicode(retval)) +# if type(retval) is not type(QVariant): +# return QVariant(retval) +# else: +# return retval +# +# def getFileList(self): +# filelist = [item[0] for item in self.items]; +# return filelist +# +# def getFilename(self, index): +# row = index.row() +# return self.items[row][0] +# +# def getValue(self, index): +# row = index.row() +# return self.items[row][0] diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 7532c938a..06da94efb 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -43,10 +43,10 @@ class MediaMediaItem(MediaManagerItem): log.info(u'Media Media Item loaded') def __init__(self, parent, icon, title): - self.TranslationContext = u'MediaPlugin' self.PluginNameShort = u'Media' self.IconPath = u'images/image' self.ConfigSection = u'media' + self.ConfigSection = title # this next is a class, not an instance of a class - it will # be instanced by the base MediaManagerItem self.ListViewWithDnD_class = MediaListView @@ -56,7 +56,10 @@ class MediaMediaItem(MediaManagerItem): self.MainDisplay = self.parent.live_controller.parent.mainDisplay def initPluginNameVisible(self): - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.PluginNameVisible = self.trUtf8(u'Media') + + def retranslateUi(self): + self.OnNewPrompt = self.trUtf8(u'Select Media') def reTranslateUI(self): self.OnNewPrompt = self.trUtf8(u'Select Media') @@ -70,13 +73,10 @@ class MediaMediaItem(MediaManagerItem): self.hasEditIcon = False def video_get_preview(self): - # # For now cross platform is an icon. Phonon does not support # individual frame access (yet?) and GStreamer is not available # on Windows - # - image = QtGui.QPixmap(u':/media/media_video.png').toImage() - return image + return QtGui.QPixmap(u':/media/media_video.png').toImage() def generateSlideData(self, service_item): items = self.ListView.selectedIndexes() diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index 398aa7ca6..2937f0133 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -30,8 +30,8 @@ class MediaTab(SettingsTab): """ mediaTab is the media settings tab in the settings dialog. """ - def __init__(self): - SettingsTab.__init__(self, u'Media', u'Media') + def __init__(self, title, section=None): + SettingsTab.__init__(self, title, section) def setupUi(self): self.setObjectName(u'MediaTab') diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index ae757cc36..acfd170d6 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -33,16 +33,14 @@ class MediaPlugin(Plugin): log.info(u'Media Plugin loaded') def __init__(self, plugin_helpers): - # Call the parent constructor Plugin.__init__(self, u'Media', u'1.9.0', plugin_helpers) self.weight = -6 - # Create the plugin icon self.icon = buildIcon(u':/media/media_video.png') # passed with drag and drop messages self.dnd_id = u'Media' def get_settings_tab(self): - return MediaTab() + return MediaTab(self.name) def can_be_disabled(self): return True @@ -58,7 +56,9 @@ class MediaPlugin(Plugin): def get_media_manager_item(self): # Create the MediaManagerItem object - return MediaMediaItem(self, self.icon, u'Media') + return MediaMediaItem(self, self.icon, self.name) def about(self): - return u'Media Plugin
One day this may provide access to video and audio clips' + about_text = self.trUtf8(u'Media Plugin
This plugin ' + u'allows the playing of audio and video media') + return about_text diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index a971f8342..0d1daef9c 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -1,22 +1,27 @@ # -*- coding: utf-8 -*- # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 -""" -OpenLP - Open Source Lyrics Projection -Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; version 2 of the License. +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -""" # OOo API documentation: # http://api.openoffice.org/docs/common/ref/com/sun/star/presentation/XSlideShowController.html # http://docs.go-oo.org/sd/html/classsd_1_1SlideShow.html diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 3d881099e..b49b37627 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -48,9 +48,8 @@ class PresentationMediaItem(MediaManagerItem): def __init__(self, parent, icon, title, controllers): self.controllers = controllers - self.TranslationContext = u'PresentationPlugin' self.PluginNameShort = u'Presentation' - self.ConfigSection = u'presentations' + self.ConfigSection = title self.IconPath = u'presentations/presentation' # this next is a class, not an instance of a class - it will # be instanced by the base MediaManagerItem @@ -59,7 +58,10 @@ class PresentationMediaItem(MediaManagerItem): self.message_listener = MessageListener(controllers) def initPluginNameVisible(self): - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.PluginNameVisible = self.trUtf8(u'Presentation') + + def retranslateUi(self): + self.OnNewPrompt = self.trUtf8(u'Select Presentation(s)') def reTranslateUI(self): self.OnNewPrompt = self.trUtf8(u'Select Presentation(s)') @@ -112,8 +114,8 @@ class PresentationMediaItem(MediaManagerItem): (path, filename) = os.path.split(unicode(file)) if titles.count(filename) > 0: QtGui.QMessageBox.critical( - self, self.trUtf8(u'File exists'), - self.trUtf8(u'A presentation with that filename already exists.'), + self, self.trUtf8(u'File exists'), self.trUtf8( + u'A presentation with that filename already exists.'), QtGui.QMessageBox.Ok) else: item_name = QtGui.QListWidgetItem(filename) diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index ca30b5564..feb3d33a4 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -1,22 +1,27 @@ # -*- coding: utf-8 -*- # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 -""" -OpenLP - Open Source Lyrics Projection -Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; version 2 of the License. +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -""" import logging import os diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py index bb26da442..00f6f8495 100644 --- a/openlp/plugins/presentations/lib/presentationcontroller.py +++ b/openlp/plugins/presentations/lib/presentationcontroller.py @@ -1,22 +1,26 @@ # -*- coding: utf-8 -*- # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 -""" -OpenLP - Open Source Lyrics Projection -Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -""" +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### import logging import os diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 83921f234..f5da1c5bd 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -30,9 +30,9 @@ class PresentationTab(SettingsTab): """ PresentationsTab is the Presentations settings tab in the settings dialog. """ - def __init__(self, controllers): + def __init__(self, title, controllers, section=None): self.controllers = controllers - SettingsTab.__init__(self, u'Presentations', u'Presentations') + SettingsTab.__init__(self, title, section) def setupUi(self): self.setObjectName(u'PresentationTab') diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index 0fcfa1e20..e54220e08 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -25,9 +25,7 @@ import os import logging -from PyQt4 import QtGui - -from openlp.core.lib import Plugin +from openlp.core.lib import Plugin, buildIcon from openlp.plugins.presentations.lib import * class PresentationPlugin(Plugin): @@ -36,21 +34,17 @@ class PresentationPlugin(Plugin): log = logging.getLogger(u'PresentationPlugin') def __init__(self, plugin_helpers): - # Call the parent constructor log.debug(u'Initialised') self.controllers = {} Plugin.__init__(self, u'Presentations', u'1.9.0', plugin_helpers) self.weight = -8 - # Create the plugin icon - self.icon = QtGui.QIcon() - self.icon.addPixmap(QtGui.QPixmap(u':/media/media_presentation.png'), - QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.icon = buildIcon(u':/media/media_presentation.png') def get_settings_tab(self): """ Create the settings Tab """ - return PresentationTab(self.controllers) + return PresentationTab(self.name, self.controllers) def can_be_disabled(self): return True @@ -74,7 +68,7 @@ class PresentationPlugin(Plugin): Create the Media Manager List """ return PresentationMediaItem( - self, self.icon, u'Presentations', self.controllers) + self, self.icon, self.name, self.controllers) def registerControllers(self, controller): self.controllers[controller.name] = controller @@ -110,4 +104,8 @@ class PresentationPlugin(Plugin): return False 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.' + about_text = self.trUtf8(u'Presentation Plugin
Delivers ' + u'the ability to show presentations using a number of different ' + u'programs. The choice of available presentation programs is ' + u'available to the user in a drop down box.') + return about_text diff --git a/openlp/plugins/remotes/lib/__init__.py b/openlp/plugins/remotes/lib/__init__.py index a35185ad9..ec5598600 100644 --- a/openlp/plugins/remotes/lib/__init__.py +++ b/openlp/plugins/remotes/lib/__init__.py @@ -1,21 +1,25 @@ # -*- coding: utf-8 -*- # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 -""" -OpenLP - Open Source Lyrics Projection -Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -""" +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### from remotetab import RemoteTab diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py index 26b5eea30..5c39ab0ad 100644 --- a/openlp/plugins/remotes/lib/remotetab.py +++ b/openlp/plugins/remotes/lib/remotetab.py @@ -1,22 +1,26 @@ # -*- coding: utf-8 -*- # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 -""" -OpenLP - Open Source Lyrics Projection -Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -""" +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### from PyQt4 import QtGui @@ -26,8 +30,8 @@ class RemoteTab(SettingsTab): """ RemoteTab is the Remotes settings tab in the settings dialog. """ - def __init__(self): - SettingsTab.__init__(self, u'Remotes', u'Remotes') + def __init__(self, title, section=None): + SettingsTab.__init__(self, title, section) def setupUi(self): self.setObjectName(u'RemoteTab') diff --git a/openlp/plugins/remotes/remoteclient-cli.py b/openlp/plugins/remotes/remoteclient-cli.py index 8432edd70..2bffa1136 100755 --- a/openlp/plugins/remotes/remoteclient-cli.py +++ b/openlp/plugins/remotes/remoteclient-cli.py @@ -1,23 +1,28 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 -""" -OpenLP - Open Source Lyrics Projection -Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; version 2 of the License. +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -""" import socket import sys from optparse import OptionParser diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py index 2cd95a877..9fa37b46e 100644 --- a/openlp/plugins/remotes/remoteplugin.py +++ b/openlp/plugins/remotes/remoteplugin.py @@ -1,22 +1,27 @@ # -*- coding: utf-8 -*- # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 -""" -OpenLP - Open Source Lyrics Projection -Copyright (c) 2008 Raoul Snyman -Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; version 2 of the License. +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # +# Copyright (c) 2008-2009 Raoul Snyman # +# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten # +# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # +# Software Foundation; version 2 of the License. # +# # +# This program is distributed in the hope that it will be useful, but WITHOUT # +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # +# more details. # +# # +# You should have received a copy of the GNU General Public License along # +# with this program; if not, write to the Free Software Foundation, Inc., 59 # +# Temple Place, Suite 330, Boston, MA 02111-1307 USA # +############################################################################### -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA -""" import logging from PyQt4 import QtNetwork, QtCore @@ -31,7 +36,6 @@ class RemotesPlugin(Plugin): log.info(u'Remote Plugin loaded') def __init__(self, plugin_helpers): - # Call the parent constructor Plugin.__init__(self, u'Remotes', u'1.9.0', plugin_helpers) self.weight = -1 self.server = None @@ -54,14 +58,11 @@ class RemotesPlugin(Plugin): if self.server is not None: self.server.close() - def about(self): - return u'Remote Plugin
This plugin provides the ability to send messages to a running version of openlp on a different computer.
The Primary use for this would be to send alerts from a creche' - def get_settings_tab(self): """ Create the settings Tab """ - return RemoteTab() + return RemoteTab(self.name) def readData(self): log.info(u'Remoted data has arrived') @@ -78,3 +79,10 @@ class RemotesPlugin(Plugin): Receiver().send_message(u'alert_text', unicode(datagram[pos + 1:])) if event == u'next_slide': Receiver().send_message(u'live_slide_next') + + def about(self): + about_text = self.trUtf8(u'Remote Plugin
This plugin ' + u'provides the ability to send messages to a running version of ' + u'openlp on a different computer.
The Primary use for this ' + u'would be to send alerts from a creche') + return about_text diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 97b9eacb3..434e9902e 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -95,9 +95,10 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): QtCore.SIGNAL(u'lostFocus()'), self.onCommentsEditLostFocus) QtCore.QObject.connect(self.VerseOrderEdit, QtCore.SIGNAL(u'lostFocus()'), self.onVerseOrderEditLostFocus) - previewButton = QtGui.QPushButton() - previewButton.setText(self.trUtf8(u'Save && Preview')) - self.ButtonBox.addButton(previewButton, QtGui.QDialogButtonBox.ActionRole) + self.previewButton = QtGui.QPushButton() + self.previewButton.setText(self.trUtf8(u'Save && Preview')) + self.ButtonBox.addButton( + self.previewButton, QtGui.QDialogButtonBox.ActionRole) QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'clicked(QAbstractButton*)'), self.onPreview) # Create other objects and forms @@ -114,7 +115,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.VerseDeleteButton.setEnabled(False) self.AuthorRemoveButton.setEnabled(False) self.TopicRemoveButton.setEnabled(False) - self.title_change = False def loadAuthors(self): authors = self.songmanager.get_authors() @@ -161,13 +161,12 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.VerseListWidget.clear() self.AuthorsListView.clear() self.TopicsListView.clear() - self.title_change = False self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason) self.loadAuthors() self.loadTopics() self.loadBooks() - def loadSong(self, id): + def loadSong(self, id, preview): log.debug(u'Load Song') self.SongTabWidget.setCurrentIndex(0) self.loadAuthors() @@ -234,8 +233,11 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): topic_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(topic.id)) self.TopicsListView.addItem(topic_name) self._validate_song() - self.title_change = False self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason) + #if not preview hide the preview button + self.previewButton.setVisible(False) + if preview: + self.previewButton.setVisible(True) def onAuthorAddButtonClicked(self): item = int(self.AuthorsSelectionComboItem.currentIndex()) @@ -373,7 +375,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): def onTitleEditItemLostFocus(self): self.song.title = self.TitleEditItem.text() - self.title_change = True def onVerseOrderEditLostFocus(self): self.song.verse_order = self.VerseOrderEdit.text() @@ -426,6 +427,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.song.search_title = unicode(self.TitleEditItem.displayText()) + \ u'@'+ unicode(self.AlternativeEdit.displayText()) self.song.comments = unicode(self.CommentsEdit.toPlainText()) + self.song.verse_order = unicode(self.VerseOrderEdit.text()) self.song.ccli_number = unicode(self.CCLNumberEdit.displayText()) self.processLyrics() self.processTitle() @@ -434,31 +436,34 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): def processLyrics(self): log.debug(u'processLyrics') - sxml = SongXMLBuilder() - sxml.new_document() - sxml.add_lyrics_to_song() - count = 1 - text = u' ' - verse_order = u'' - for i in range (0, self.VerseListWidget.count()): - sxml.add_verse_to_lyrics(u'Verse', unicode(count), - unicode(self.VerseListWidget.item(i).text())) - text = text + unicode(self.VerseListWidget.item(i).text()) + u' ' - verse_order = verse_order + unicode(count) + u' ' - count += 1 - if self.song.verse_order is None: - self.song.verse_order = verse_order - text = text.replace(u'\'', u'') - text = text.replace(u',', u'') - text = text.replace(u';', u'') - text = text.replace(u':', u'') - text = text.replace(u'(', u'') - text = text.replace(u')', u'') - text = text.replace(u'{', u'') - text = text.replace(u'}', u'') - text = text.replace(u'?', u'') - self.song.search_lyrics = unicode(text) - self.song.lyrics = unicode(sxml.extract_xml()) + try: + sxml = SongXMLBuilder() + sxml.new_document() + sxml.add_lyrics_to_song() + count = 1 + text = u' ' + verse_order = u'' + for i in range (0, self.VerseListWidget.count()): + sxml.add_verse_to_lyrics(u'Verse', unicode(count), + unicode(self.VerseListWidget.item(i).text())) + text = text + unicode(self.VerseListWidget.item(i).text()) + u' ' + verse_order = verse_order + unicode(count) + u' ' + count += 1 + if self.song.verse_order is None: + self.song.verse_order = verse_order + text = text.replace(u'\'', u'') + text = text.replace(u',', u'') + text = text.replace(u';', u'') + text = text.replace(u':', u'') + text = text.replace(u'(', u'') + text = text.replace(u')', u'') + text = text.replace(u'{', u'') + text = text.replace(u'}', u'') + text = text.replace(u'?', u'') + self.song.search_lyrics = unicode(text) + self.song.lyrics = unicode(sxml.extract_xml()) + except: + log.exception(u'Problem processing song Lyrics \n%s', sxml.dump_xml()) def processTitle(self): log.debug(u'processTitle') diff --git a/openlp/plugins/songs/lib/manager.py b/openlp/plugins/songs/lib/manager.py index d793785ac..cf0947148 100644 --- a/openlp/plugins/songs/lib/manager.py +++ b/openlp/plugins/songs/lib/manager.py @@ -106,8 +106,8 @@ class SongManager(): self.session.commit() return True except: - self.session.rollback() log.exception(u'Could not save song to song database') + self.session.rollback() return False def delete_song(self, songid): diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 11ccb0763..08005b326 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -44,22 +44,24 @@ class SongMediaItem(MediaManagerItem): log.info(u'Song Media Item loaded') def __init__(self, parent, icon, title): - self.TranslationContext = u'SongPlugin' self.PluginNameShort = u'Song' - self.ConfigSection = u'songs' + self.ConfigSection = title 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.edit_song_form = EditSongForm(self.parent.songmanager, self) self.song_maintenance_form = SongMaintenanceForm( self.parent.songmanager, self) + #fromPreview holds the id of the item if the song editor needs to trigger a preview + #without closing. It is set to -1 if this function is inactive self.fromPreview = -1 + #fromServiceManager holds the id of the item if the song editor needs to trigger posting + #to the servicemanager without closing. It is set to -1 if this function is inactive self.fromServiceManager = -1 def initPluginNameVisible(self): - self.PluginNameVisible = self.trUtf8(self.PluginNameShort) + self.PluginNameVisible = self.trUtf8(u'Song') def requiredIcons(self): MediaManagerItem.requiredIcons(self) @@ -244,7 +246,7 @@ class SongMediaItem(MediaManagerItem): valid = self.parent.songmanager.get_song(songid) if valid is not None: self.fromServiceManager = songid - self.edit_song_form.loadSong(songid) + self.edit_song_form.loadSong(songid, False) self.edit_song_form.exec_() def onEditClick(self, preview=False): @@ -254,7 +256,7 @@ class SongMediaItem(MediaManagerItem): self.fromPreview = -1 if preview: self.fromPreview = item_id - self.edit_song_form.loadSong(item_id) + self.edit_song_form.loadSong(item_id, preview) self.edit_song_form.exec_() def onEventEditSong (self): @@ -288,6 +290,7 @@ class SongMediaItem(MediaManagerItem): service_item.theme = song.theme_name service_item.editEnabled = True service_item.editId = item_id + service_item.verse_order = song.verse_order if song.lyrics.startswith(u'Song Plugin
This plugin allows Songs to be managed and displayed.
' + about_text = self.trUtf8(u'Song Plugin
This plugin allows ' + u'Songs to be managed and displayed.
') + return about_text diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index a0f7e2f35..2e7282a98 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -38,10 +38,8 @@ class SongUsagePlugin(Plugin): log.info(u'SongUsage Plugin loaded') def __init__(self, plugin_helpers): - # Call the parent constructor Plugin.__init__(self, u'SongUsage', u'1.9.0', plugin_helpers) self.weight = -4 - # Create the plugin icon self.icon = buildIcon(u':/media/media_image.png') self.songusagemanager = None self.songusageActive = False @@ -63,17 +61,19 @@ class SongUsagePlugin(Plugin): self.SongUsageMenu = QtGui.QMenu(tools_menu) self.SongUsageMenu.setObjectName(u'SongUsageMenu') self.SongUsageMenu.setTitle(tools_menu.trUtf8(u'&Song Usage')) - #SongUsage Delete + #SongUsage Delete self.SongUsageDelete = QtGui.QAction(tools_menu) - self.SongUsageDelete.setText(tools_menu.trUtf8(u'&Delete recorded data')) + self.SongUsageDelete.setText( + tools_menu.trUtf8(u'&Delete recorded data')) self.SongUsageDelete.setStatusTip( - tools_menu.trUtf8(u'Delete sing usage to sepecified date')) + tools_menu.trUtf8(u'Delete song usage to specified date')) self.SongUsageDelete.setObjectName(u'SongUsageDelete') #SongUsage Report self.SongUsageReport = QtGui.QAction(tools_menu) - self.SongUsageReport.setText(tools_menu.trUtf8(u'&Extract recoreded data')) + self.SongUsageReport.setText( + tools_menu.trUtf8(u'&Extract recorded data')) self.SongUsageReport.setStatusTip( - tools_menu.trUtf8(u'Generate Extracts on Song Usage')) + tools_menu.trUtf8(u'Generate report on Song Usage')) self.SongUsageReport.setObjectName(u'SongUsageReport') #SongUsage activation SongUsageIcon = buildIcon(u':/tools/tools_alert.png') @@ -153,6 +153,7 @@ class SongUsagePlugin(Plugin): self.SongUsagedetailform.exec_() def about(self): - about_text = u'SongUsage Plugin
This plugin records the use '\ - u'of songs and when they have been used during a live service' + about_text = self.trUtf8(u'SongUsage Plugin
This plugin ' + u'records the use of songs and when they have been used during ' + u'a live service') return about_text