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

Returns now done right. Commented out dialog part, which needs more work

Browse Source
This commit is contained in:
Mattias Põldaru 2011-03-09 20:02:21 +02:00
parent c7a435951d
commit f710746a55
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,6 +413,7 @@ class ServiceManager(QtGui.QWidget):
""" """
Save the current Service file. Save the current Service file.
""" """
success = True
if not self.fileName(): if not self.fileName():
return self.saveFileAs() return self.saveFileAs()
path_file_name = unicode(self.fileName()) path_file_name = unicode(self.fileName())
@ -440,21 +441,21 @@ class ServiceManager(QtGui.QWidget):
continue continue
file_size = os.path.getsize(path_from) file_size = os.path.getsize(path_from)
size_limit = 52428800 # 50MiB size_limit = 52428800 # 50MiB
if file_size > size_limit: #if file_size > size_limit:
# File exeeds size_limit bytes, ask user # # File exeeds size_limit bytes, ask user
message = unicode(translate('OpenLP.ServiceManager', # message = unicode(translate('OpenLP.ServiceManager',
'Do you want to include \n%.1f MB file "%s"\n' # 'Do you want to include \n%.1f MB file "%s"\n'
'into the service file?\nThis may take some time.\n\n' # 'into the service file?\nThis may take some time.\n\n'
'Please note that you need to\ntake care of that file ' # 'Please note that you need to\ntake care of that file'
'yourself,\nif you leave it out.')) % \ # ' yourself,\nif you leave it out.')) % \
(file_size/1048576, os.path.split(path_from)[1]) # (file_size/1048576, os.path.split(path_from)[1])
ans = QtGui.QMessageBox.question(self.mainwindow, # ans = QtGui.QMessageBox.question(self.mainwindow,
translate('OpenLP.ServiceManager', 'Including Large ' # translate('OpenLP.ServiceManager', 'Including Large '
'File'), message, QtGui.QMessageBox.StandardButtons( # 'File'), message, QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok|QtGui.QMessageBox.Cancel), # QtGui.QMessageBox.Ok|QtGui.QMessageBox.Cancel),
QtGui.QMessageBox.Ok) # QtGui.QMessageBox.Ok)
if ans == QtGui.QMessageBox.Cancel: # if ans == QtGui.QMessageBox.Cancel:
continue # continue
write_list.append(path_from) write_list.append(path_from)
total_size += file_size total_size += file_size
log.debug(u'ServiceManager.saveFile - ZIP contents size is %i bytes' % log.debug(u'ServiceManager.saveFile - ZIP contents size is %i bytes' %
@ -477,12 +478,12 @@ class ServiceManager(QtGui.QWidget):
zip.write(path_from, path_from.encode(u'utf-8')) zip.write(path_from, path_from.encode(u'utf-8'))
except IOError: except IOError:
log.exception(u'Failed to save service to disk') log.exception(u'Failed to save service to disk')
success = False
finally: finally:
zip.close() zip.close()
self.mainwindow.addRecentFile(path_file_name) self.mainwindow.addRecentFile(path_file_name)
self.setModified(False) self.setModified(False)
return True return success
return False
def saveFileAs(self): def saveFileAs(self):
""" """