diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index dd0885d29..164de353b 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -378,6 +378,10 @@ class MainWindow(object): # Connect up some signals and slots QtCore.QObject.connect(self.FileExitItem, QtCore.SIGNAL(u'triggered()'), self.mainWindow.close) + QtCore.QObject.connect(self.ImportThemeItem, + QtCore.SIGNAL(u'triggered()'), self.ThemeManagerContents.onImportTheme) + QtCore.QObject.connect(self.ExportThemeItem, + QtCore.SIGNAL(u'triggered()'), self.ThemeManagerContents.onExportTheme) QtCore.QObject.connect(self.ViewMediaManagerItem, QtCore.SIGNAL(u'triggered(bool)'), self.MediaManagerDock.setVisible) QtCore.QObject.connect(self.ViewServiceManagerItem, diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index cf9e35d9c..91ceabad7 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -200,7 +200,7 @@ class ThemeManager(QtGui.QWidget): def onImportTheme(self): files = QtGui.QFileDialog.getOpenFileNames(None, - translate(u'ThemeManager', u'Select Import File'), + translate(u'ThemeManager', u'Select Theme Import File'), self.path, u'Theme (*.theme)') log.info(u'New Themes %s', unicode(files)) if len(files) > 0: @@ -362,4 +362,4 @@ class ThemeManager(QtGui.QWidget): def getPreviewImage(self, theme): log.debug(u'getPreviewImage %s ', theme) image = os.path.join(self.path, theme + u'.png') - return image \ No newline at end of file + return image diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 99364615a..517ce1cf8 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -25,8 +25,6 @@ from PyQt4.QtCore import * from openlp.core.lib import Plugin, Event, EventType, translate from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem -from openlp.plugins.bibles.lib.tables import * -from openlp.plugins.bibles.lib.classes import * class BiblePlugin(Plugin): global log @@ -71,9 +69,7 @@ class BiblePlugin(Plugin): pass def onBibleNewClick(self): - self.bibleimportform = BibleImportForm(self.config, self.biblemanager, self) - self.bibleimportform.exec_() - pass + self.media_item.onBibleNewClick() def handle_event(self, event): """ diff --git a/openlp/plugins/bibles/forms/bibleimportdialog.py b/openlp/plugins/bibles/forms/bibleimportdialog.py index 534b40dd3..591178acd 100644 --- a/openlp/plugins/bibles/forms/bibleimportdialog.py +++ b/openlp/plugins/bibles/forms/bibleimportdialog.py @@ -8,6 +8,7 @@ # WARNING! All changes made in this file will be lost! from PyQt4 import QtCore, QtGui +from openlp.core.lib import translate class Ui_BibleImportDialog(object): def setupUi(self, BibleImportDialog): diff --git a/openlp/plugins/images/lib/listwithpreviews.py b/openlp/plugins/images/lib/listwithpreviews.py index 35c78a729..26b6121a1 100644 --- a/openlp/plugins/images/lib/listwithpreviews.py +++ b/openlp/plugins/images/lib/listwithpreviews.py @@ -5,7 +5,7 @@ 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 rediunicodeibute it and/or modify it under +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.