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

Last set of fixes

This commit is contained in:
Tim Bentley 2011-08-02 19:17:07 +01:00
parent 644706a62a
commit 0b46165429
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/core/lib/mediamanageritem.py
View File

@ -386,11 +386,12 @@ class MediaManagerItem(QtGui.QWidget):
duplicatesFound = True duplicatesFound = True
else: else:
newFiles.append(file) newFiles.append(file)
self.loadList(newFiles) if newFiles:
lastDir = os.path.split(unicode(files[0]))[0] self.loadList(newFiles)
SettingsManager.set_last_dir(self.settingsSection, lastDir) lastDir = os.path.split(unicode(files[0]))[0]
SettingsManager.set_list(self.settingsSection, SettingsManager.set_last_dir(self.settingsSection, lastDir)
self.settingsSection, self.getFileList()) SettingsManager.set_list(self.settingsSection,
self.settingsSection, self.getFileList())
if duplicatesFound: if duplicatesFound:
critical_error_message_box( critical_error_message_box(
UiStrings().Duplicate, UiStrings().Duplicate,

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

@ -408,20 +408,33 @@ class ServiceManager(QtGui.QWidget):
return False return False
self.newFile() self.newFile()
def onLoadServiceClicked(self): def onLoadServiceClicked(self, loadFile=None):
"""
Loads the service file and saves the existing one it there is one
unchanged
``loadFile``
The service file to the loaded. Will be None is from menu so
selection will be required.
"""
if self.isModified(): if self.isModified():
result = self.saveModifiedService() result = self.saveModifiedService()
if result == QtGui.QMessageBox.Cancel: if result == QtGui.QMessageBox.Cancel:
return False return False
elif result == QtGui.QMessageBox.Save: elif result == QtGui.QMessageBox.Save:
self.saveFile() self.saveFile()
fileName = unicode(QtGui.QFileDialog.getOpenFileName(self.mainwindow, if not loadFile:
translate('OpenLP.ServiceManager', 'Open File'), fileName = unicode(QtGui.QFileDialog.getOpenFileName(
SettingsManager.get_last_dir( self.mainwindow,
self.mainwindow.serviceSettingsSection), translate('OpenLP.ServiceManager', 'Open File'),
translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz)'))) SettingsManager.get_last_dir(
if not fileName: self.mainwindow.serviceSettingsSection),
return False translate('OpenLP.ServiceManager',
'OpenLP Service Files (*.osz)')))
if not fileName:
return False
else:
fileName = loadFile
SettingsManager.set_last_dir(self.mainwindow.serviceSettingsSection, SettingsManager.set_last_dir(self.mainwindow.serviceSettingsSection,
split_filename(fileName)[0]) split_filename(fileName)[0])
self.loadFile(fileName) self.loadFile(fileName)
@ -1245,7 +1258,7 @@ class ServiceManager(QtGui.QWidget):
for url in event.mimeData().urls(): for url in event.mimeData().urls():
filename = unicode(url.toLocalFile()) filename = unicode(url.toLocalFile())
if filename.endswith(u'.osz'): if filename.endswith(u'.osz'):
self.loadFile(filename) self.onLoadServiceClicked(filename)
elif event.mimeData().hasText(): elif event.mimeData().hasText():
plugin = unicode(event.mimeData().text()) plugin = unicode(event.mimeData().text())
item = self.serviceManagerList.itemAt(event.pos()) item = self.serviceManagerList.itemAt(event.pos())

2
openlp/plugins/songusage/songusageplugin.py
View File

@ -91,8 +91,8 @@ class SongUsagePlugin(Plugin):
self.toolsMenu.addAction(self.songUsageMenu.menuAction()) self.toolsMenu.addAction(self.songUsageMenu.menuAction())
self.songUsageMenu.addAction(self.songUsageStatus) self.songUsageMenu.addAction(self.songUsageStatus)
self.songUsageMenu.addSeparator() self.songUsageMenu.addSeparator()
self.songUsageMenu.addAction(self.songUsageDelete)
self.songUsageMenu.addAction(self.songUsageReport) self.songUsageMenu.addAction(self.songUsageReport)
self.songUsageMenu.addAction(self.songUsageDelete)
self.songUsageActiveButton = QtGui.QToolButton( self.songUsageActiveButton = QtGui.QToolButton(
self.formparent.statusBar) self.formparent.statusBar)
self.songUsageActiveButton.setCheckable(True) self.songUsageActiveButton.setCheckable(True)