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

Song theme fix and remove unused variables

Browse Source
This commit is contained in:
Jon Tibble 2009-10-09 23:46:35 +01:00
parent fcaf9e912a
commit 75af51b460
8 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/lib/serviceitem.py
View File

@ -180,7 +180,7 @@ class ServiceItem(object):
self.service_item_type = ServiceType.Command self.service_item_type = ServiceType.Command
self.service_item_path = path self.service_item_path = path
self.service_frames.append( self.service_frames.append(
{u'title': frame_title, u'command': None}) {u'title': frame_title, u'command': None})
def get_service_repr(self): def get_service_repr(self):
""" """

2
openlp/plugins/bibles/forms/bibleimportform.py
View File

@ -180,7 +180,7 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
self.ProgressBar.setValue(self.barmax) self.ProgressBar.setValue(self.barmax)
# tell bibleplugin to reload the bibles # tell bibleplugin to reload the bibles
Receiver().send_message(u'pre_load_bibles') Receiver().send_message(u'pre_load_bibles')
reply = QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate(u'BibleMediaItem', u'Information'), translate(u'BibleMediaItem', u'Information'),
translate(u'BibleMediaItem', message)) translate(u'BibleMediaItem', message))

2
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -517,6 +517,6 @@ class BibleMediaItem(MediaManagerItem):
self.version = unicode(self.parent.biblemanager.get_meta_data( self.version = unicode(self.parent.biblemanager.get_meta_data(
bible, u'Version').value) bible, u'Version').value)
else: else:
reply = QtGui.QMessageBox.information(self, QtGui.QMessageBox.information(self,
translate(u'BibleMediaItem', u'Information'), translate(u'BibleMediaItem', u'Information'),
translate(u'BibleMediaItem', message)) translate(u'BibleMediaItem', message))

1
openlp/plugins/images/lib/mediaitem.py
View File

@ -115,7 +115,6 @@ class ImageMediaItem(MediaManagerItem):
except: except:
#if not present do not worry #if not present do not worry
pass pass
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
row = self.ListView.row(item) row = self.ListView.row(item)
self.ListView.takeItem(row) self.ListView.takeItem(row)
self.parent.config.set_list(self.ConfigSection, self.getFileList()) self.parent.config.set_list(self.ConfigSection, self.getFileList())

1
openlp/plugins/media/lib/mediaitem.py
View File

@ -104,7 +104,6 @@ class MediaMediaItem(MediaManagerItem):
def onDeleteClick(self): def onDeleteClick(self):
item = self.ListView.currentItem() item = self.ListView.currentItem()
if item is not None: if item is not None:
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
row = self.ListView.row(item) row = self.ListView.row(item)
self.ListView.takeItem(row) self.ListView.takeItem(row)
self.parent.config.set_list( self.parent.config.set_list(

1
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -118,7 +118,6 @@ class PresentationMediaItem(MediaManagerItem):
def onDeleteClick(self): def onDeleteClick(self):
item = self.ListView.currentItem() item = self.ListView.currentItem()
if item is not None: if item is not None:
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
row = self.ListView.row(item) row = self.ListView.row(item)
self.ListView.takeItem(row) self.ListView.takeItem(row)
self.parent.config.set_list( self.parent.config.set_list(

2
openlp/plugins/remotes/remoteplugin.py
View File

@ -21,7 +21,7 @@ import logging
from PyQt4 import QtNetwork, QtCore from PyQt4 import QtNetwork, QtCore
from openlp.core.lib import Plugin, Receiver, translate from openlp.core.lib import Plugin, Receiver
from openlp.plugins.remotes.lib import RemoteTab from openlp.plugins.remotes.lib import RemoteTab
class RemotesPlugin(Plugin): class RemotesPlugin(Plugin):

5
openlp/plugins/songs/forms/editsongform.py
View File

@ -286,7 +286,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
def onThemeComboChanged(self, item): def onThemeComboChanged(self, item):
if item == 0: if item == 0:
#None means no Theme #None means no Theme
self.song.song_theme = None self.song.theme_name = None
else: else:
them_name = unicode(self.ThemeSelectionComboItem.itemText(item)) them_name = unicode(self.ThemeSelectionComboItem.itemText(item))
self.song.theme_name = them_name self.song.theme_name = them_name
@ -339,8 +339,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
self.VerseListWidget.repaint() self.VerseListWidget.repaint()
def onVerseDeleteButtonClicked(self): def onVerseDeleteButtonClicked(self):
item = self.VerseListWidget.takeItem(self.VerseListWidget.currentRow()) self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())
item = None
self.VerseEditButton.setEnabled(False) self.VerseEditButton.setEnabled(False)
self.VerseDeleteButton.setEnabled(False) self.VerseDeleteButton.setEnabled(False)