From 9dc12ac52234ac314e44016c7e20b5c1c3dd800f Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 24 Jun 2010 21:40:41 +0200 Subject: [PATCH 1/2] Try to fix the song plugin's dependence on OOo. --- openlp/plugins/songs/songsplugin.py | 85 ++++++++++++++++------------- 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 57c0ee844..0d629fe42 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -29,8 +29,13 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import Plugin, build_icon, PluginStatus, Receiver, \ translate -from openlp.plugins.songs.lib import SongManager, SongMediaItem, SongsTab, \ - SofImport, OooImport +from openlp.plugins.songs.lib import SongManager, SongMediaItem, SongsTab + +try: + from openlp.plugins.songs.lib import SofImport, OooImport + OOo_available = True +except ImportError: + OOo_available = False log = logging.getLogger(__name__) @@ -95,46 +100,48 @@ class SongsPlugin(Plugin): self.SongImportItem.setToolTip(translate('SongsPlugin', 'Import songs using the import wizard.')) import_menu.addAction(self.SongImportItem) - # Songs of Fellowship import menu item - will be removed and the - # functionality will be contained within the import wizard - self.ImportSofItem = QtGui.QAction(import_menu) - self.ImportSofItem.setObjectName(u'ImportSofItem') - self.ImportSofItem.setText( - translate('SongsPlugin', - 'Songs of Fellowship (temp menu item)')) - self.ImportSofItem.setToolTip( - translate('SongsPlugin', - 'Import songs from the VOLS1_2.RTF, sof3words' \ - + '.rtf and sof4words.rtf supplied with the music books')) - self.ImportSofItem.setStatusTip( - translate('SongsPlugin', - 'Import songs from the VOLS1_2.RTF, sof3words' \ - + '.rtf and sof4words.rtf supplied with the music books')) - import_menu.addAction(self.ImportSofItem) - # OpenOffice.org import menu item - will be removed and the - # functionality will be contained within the import wizard - self.ImportOooItem = QtGui.QAction(import_menu) - self.ImportOooItem.setObjectName(u'ImportOooItem') - self.ImportOooItem.setText( - translate('SongsPlugin', - 'Generic Document/Presentation Import ' - '(temp menu item)')) - self.ImportOooItem.setToolTip( - translate('SongsPlugin', - 'Import songs from ' - 'Word/Writer/Powerpoint/Impress')) - self.ImportOooItem.setStatusTip( - translate('SongsPlugin', - 'Import songs from ' - 'Word/Writer/Powerpoint/Impress')) - import_menu.addAction(self.ImportOooItem) # Signals and slots QtCore.QObject.connect(self.SongImportItem, QtCore.SIGNAL(u'triggered()'), self.onSongImportItemClicked) - QtCore.QObject.connect(self.ImportSofItem, - QtCore.SIGNAL(u'triggered()'), self.onImportSofItemClick) - QtCore.QObject.connect(self.ImportOooItem, - QtCore.SIGNAL(u'triggered()'), self.onImportOooItemClick) + if OOo_available: + # Songs of Fellowship import menu item - will be removed and the + # functionality will be contained within the import wizard + self.ImportSofItem = QtGui.QAction(import_menu) + self.ImportSofItem.setObjectName(u'ImportSofItem') + self.ImportSofItem.setText( + translate('SongsPlugin', + 'Songs of Fellowship (temp menu item)')) + self.ImportSofItem.setToolTip( + translate('SongsPlugin', + 'Import songs from the VOLS1_2.RTF, sof3words' \ + + '.rtf and sof4words.rtf supplied with the music books')) + self.ImportSofItem.setStatusTip( + translate('SongsPlugin', + 'Import songs from the VOLS1_2.RTF, sof3words' \ + + '.rtf and sof4words.rtf supplied with the music books')) + import_menu.addAction(self.ImportSofItem) + # OpenOffice.org import menu item - will be removed and the + # functionality will be contained within the import wizard + self.ImportOooItem = QtGui.QAction(import_menu) + self.ImportOooItem.setObjectName(u'ImportOooItem') + self.ImportOooItem.setText( + translate('SongsPlugin', + 'Generic Document/Presentation Import ' + '(temp menu item)')) + self.ImportOooItem.setToolTip( + translate('SongsPlugin', + 'Import songs from ' + 'Word/Writer/Powerpoint/Impress')) + self.ImportOooItem.setStatusTip( + translate('SongsPlugin', + 'Import songs from ' + 'Word/Writer/Powerpoint/Impress')) + import_menu.addAction(self.ImportOooItem) + # Signals and slots + QtCore.QObject.connect(self.ImportSofItem, + QtCore.SIGNAL(u'triggered()'), self.onImportSofItemClick) + QtCore.QObject.connect(self.ImportOooItem, + QtCore.SIGNAL(u'triggered()'), self.onImportOooItemClick) def add_export_menu_item(self, export_menu): """ From ae17e3b6b3b26469df83967a371bb7dd72537d0f Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 24 Jun 2010 22:48:38 +0200 Subject: [PATCH 2/2] Some more OOo related fixes. --- openlp/plugins/songs/lib/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py index 15303ccf7..dddb23b4e 100644 --- a/openlp/plugins/songs/lib/__init__.py +++ b/openlp/plugins/songs/lib/__init__.py @@ -94,6 +94,10 @@ class VerseType(object): from manager import SongManager from songstab import SongsTab from mediaitem import SongMediaItem -from sofimport import SofImport -from oooimport import OooImport -from songimport import SongImport \ No newline at end of file +from songimport import SongImport +try: + from sofimport import SofImport + from oooimport import OooImport +except ImportError: + pass +