forked from openlp/openlp
Apply fixes for Jon
bzr-revno: 593
This commit is contained in:
commit
892c74a173
@ -180,7 +180,7 @@ class ServiceItem(object):
|
||||
self.service_item_type = ServiceType.Command
|
||||
self.service_item_path = path
|
||||
self.service_frames.append(
|
||||
{u'title': frame_title, u'command': None})
|
||||
{u'title': frame_title, u'command': None})
|
||||
|
||||
def get_service_repr(self):
|
||||
"""
|
||||
|
@ -180,7 +180,7 @@ class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
|
||||
self.ProgressBar.setValue(self.barmax)
|
||||
# tell bibleplugin to reload the 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', message))
|
||||
|
||||
|
@ -517,6 +517,6 @@ class BibleMediaItem(MediaManagerItem):
|
||||
self.version = unicode(self.parent.biblemanager.get_meta_data(
|
||||
bible, u'Version').value)
|
||||
else:
|
||||
reply = QtGui.QMessageBox.information(self,
|
||||
QtGui.QMessageBox.information(self,
|
||||
translate(u'BibleMediaItem', u'Information'),
|
||||
translate(u'BibleMediaItem', message))
|
||||
|
@ -115,7 +115,6 @@ class ImageMediaItem(MediaManagerItem):
|
||||
except:
|
||||
#if not present do not worry
|
||||
pass
|
||||
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
|
||||
row = self.ListView.row(item)
|
||||
self.ListView.takeItem(row)
|
||||
self.parent.config.set_list(self.ConfigSection, self.getFileList())
|
||||
|
@ -104,7 +104,6 @@ class MediaMediaItem(MediaManagerItem):
|
||||
def onDeleteClick(self):
|
||||
item = self.ListView.currentItem()
|
||||
if item is not None:
|
||||
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
|
||||
row = self.ListView.row(item)
|
||||
self.ListView.takeItem(row)
|
||||
self.parent.config.set_list(
|
||||
|
@ -118,7 +118,6 @@ class PresentationMediaItem(MediaManagerItem):
|
||||
def onDeleteClick(self):
|
||||
item = self.ListView.currentItem()
|
||||
if item is not None:
|
||||
item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
|
||||
row = self.ListView.row(item)
|
||||
self.ListView.takeItem(row)
|
||||
self.parent.config.set_list(
|
||||
|
@ -21,7 +21,7 @@ import logging
|
||||
|
||||
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
|
||||
|
||||
class RemotesPlugin(Plugin):
|
||||
|
@ -286,7 +286,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
||||
def onThemeComboChanged(self, item):
|
||||
if item == 0:
|
||||
#None means no Theme
|
||||
self.song.song_theme = None
|
||||
self.song.theme_name = None
|
||||
else:
|
||||
them_name = unicode(self.ThemeSelectionComboItem.itemText(item))
|
||||
self.song.theme_name = them_name
|
||||
@ -339,8 +339,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
||||
self.VerseListWidget.repaint()
|
||||
|
||||
def onVerseDeleteButtonClicked(self):
|
||||
item = self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())
|
||||
item = None
|
||||
self.VerseListWidget.takeItem(self.VerseListWidget.currentRow())
|
||||
self.VerseEditButton.setEnabled(False)
|
||||
self.VerseDeleteButton.setEnabled(False)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user