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

fixed branch

This commit is contained in:
Andreas Preikschat 2012-12-05 21:33:39 +01:00
parent fc38f62a17
commit 6c1e303dbd
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,7 +373,7 @@ def create_action(parent, name, **kwargs):
True in case the action will be considered a separator.
``data``
Data which is set as QVariant type.
The actions data.
``shortcuts``
A QList<QKeySequence> (or a list of strings) which are set as shortcuts.

12
openlp/core/ui/servicemanager.py
View File

@ -480,7 +480,6 @@ class ServiceManager(QtGui.QWidget):
path)
service = []
write_list = []
print 1
missing_list = []
audio_files = []
total_size = 0
@ -501,12 +500,12 @@ class ServiceManager(QtGui.QWidget):
write_list.append(path_from)
if missing_list:
Receiver.send_message(u'cursor_normal')
title = unicode(translate('OpenLP.ServiceManager',
'Service File(s) Missing'))
message = unicode(translate('OpenLP.ServiceManager',
title = translate('OpenLP.ServiceManager',
'Service File(s) Missing')
message = translate('OpenLP.ServiceManager',
'The following file(s) in the service are missing:\n\t%s\n\n'
'These files will be removed if you continue to save.')
) % "\n\t".join(missing_list)
'These files will be removed if you continue to save.') % \
"\n\t".join(missing_list)
answer = QtGui.QMessageBox.critical(self, title,
message,
QtGui.QMessageBox.StandardButtons(
@ -591,7 +590,6 @@ class ServiceManager(QtGui.QWidget):
self.mainwindow.addRecentFile(path_file_name)
self.setModified(False)
delete_file(temp_file_name)
print 2
return success
def saveFileAs(self):

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

@ -305,7 +305,7 @@ class MediaMediaItem(MediaManagerItem):
filename = os.path.split(unicode(track))[1]
item_name = QtGui.QListWidgetItem(filename)
item_name.setIcon(build_icon(ERROR))
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(track))
item_name.setData(QtCore.Qt.UserRole, track)
elif track_info.isFile():
filename = os.path.split(unicode(track))[1]
item_name = QtGui.QListWidgetItem(filename)

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

@ -184,7 +184,7 @@ class PresentationMediaItem(MediaManagerItem):
if not os.path.exists(file):
item_name = QtGui.QListWidgetItem(filename)
item_name.setIcon(build_icon(ERROR))
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
item_name.setData(QtCore.Qt.UserRole, file)
item_name.setToolTip(file)
self.listView.addItem(item_name)
else: