raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

More corrections following revert

Browse Source
This commit is contained in:
Tim Bentley 2009-03-24 06:07:03 +00:00
parent ddde031adb
commit e2715e0358
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/pluginmanager.py
View File

@ -103,8 +103,6 @@ class PluginManager(object):
if media_manager_item is not None: if media_manager_item is not None:
log.debug('Inserting media manager item from %s' % plugin.name) log.debug('Inserting media manager item from %s' % plugin.name)
mediatoolbox.addItem(media_manager_item, plugin.icon, media_manager_item.title) mediatoolbox.addItem(media_manager_item, plugin.icon, media_manager_item.title)
# TODO: These shouldn't be called here...
#plugin.initialise()
def hook_settings_tabs(self, settingsform=None): def hook_settings_tabs(self, settingsform=None):
""" """

2
openlp/plugins/custom/customplugin.py
View File

@ -37,7 +37,7 @@ class CustomPlugin(Plugin):
Plugin.__init__(self, u'Custom', u'1.9.0', plugin_helpers) Plugin.__init__(self, u'Custom', u'1.9.0', plugin_helpers)
self.weight = -5 self.weight = -5
self.custommanager = CustomManager(self.config) self.custommanager = CustomManager(self.config)
self.edit_custom_form = EditCustomForm(self.custommanager) self.edit_custom_form = EditCustomForm(self.custommanager, self)
# Create the plugin icon # Create the plugin icon
self.icon = QtGui.QIcon() self.icon = QtGui.QIcon()
self.icon.addPixmap(QtGui.QPixmap(':/media/media_custom.png'), self.icon.addPixmap(QtGui.QPixmap(':/media/media_custom.png'),

4
openlp/plugins/custom/forms/editcustomform.py
View File

@ -32,6 +32,7 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
Constructor Constructor
""" """
QtGui.QDialog.__init__(self, parent) QtGui.QDialog.__init__(self, parent)
#self.parent = parent
self.setupUi(self) self.setupUi(self)
# Connecting signals and slots # Connecting signals and slots
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), self.rejected) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), self.rejected)
@ -53,7 +54,6 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
self.custommanager = custommanager self.custommanager = custommanager
self.initialise() self.initialise()
self.VerseListView.setAlternatingRowColors(True) self.VerseListView.setAlternatingRowColors(True)
#self.savebutton = self.ButtonBox.button(QtGui.QDialogButtonBox.Save)
def initialise(self): def initialise(self):
self.valid = True self.valid = True
@ -66,6 +66,8 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
self.VerseListView.clear() self.VerseListView.clear()
#make sure we have a new item #make sure we have a new item
self.customSlide = CustomSlide() self.customSlide = CustomSlide()
self.ThemecomboBox.addItem(u'')
#self.theme_manager.getThemes()
def loadCustom(self, id): def loadCustom(self, id):
self.customSlide = CustomSlide() self.customSlide = CustomSlide()

2
openlp/plugins/images/lib/__init__.py
View File

@ -17,6 +17,6 @@ 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 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA Place, Suite 330, Boston, MA 02111-1307 USA
""" """
from imageserviceitem import ImageServiceItem
from listwithpreviews import ListWithPreviews from listwithpreviews import ListWithPreviews
from imageserviceitem import ImageServiceItem
from mediaitem import ImageMediaItem from mediaitem import ImageMediaItem