forked from openlp/openlp
Fix Song dialog for new songs
Fix Auto Service Opening bzr-revno: 1184 Fixes: https://launchpad.net/bugs/696313, https://launchpad.net/bugs/696362
This commit is contained in:
commit
3b6d8d0847
@ -701,7 +701,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
if QtCore.QSettings().value(
|
if QtCore.QSettings().value(
|
||||||
self.generalSettingsSection + u'/auto open',
|
self.generalSettingsSection + u'/auto open',
|
||||||
QtCore.QVariant(False)).toBool():
|
QtCore.QVariant(False)).toBool():
|
||||||
#self.ServiceManagerContents.onLoadService(True)
|
|
||||||
self.ServiceManagerContents.loadLastFile()
|
self.ServiceManagerContents.loadLastFile()
|
||||||
view_mode = QtCore.QSettings().value(u'%s/view mode' % \
|
view_mode = QtCore.QSettings().value(u'%s/view mode' % \
|
||||||
self.generalSettingsSection, u'default')
|
self.generalSettingsSection, u'default')
|
||||||
|
@ -109,12 +109,12 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.suffixes = []
|
self.suffixes = []
|
||||||
self.dropPosition = 0
|
self.dropPosition = 0
|
||||||
self.expandTabs = False
|
self.expandTabs = False
|
||||||
#is a new service and has not been saved
|
# is a new service and has not been saved
|
||||||
self._modified = False
|
self._modified = False
|
||||||
self._fileName = u''
|
self._fileName = u''
|
||||||
self.serviceNoteForm = ServiceNoteForm(self.parent)
|
self.serviceNoteForm = ServiceNoteForm(self.parent)
|
||||||
self.serviceItemEditForm = ServiceItemEditForm(self.parent)
|
self.serviceItemEditForm = ServiceItemEditForm(self.parent)
|
||||||
#start with the layout
|
# start with the layout
|
||||||
self.layout = QtGui.QVBoxLayout(self)
|
self.layout = QtGui.QVBoxLayout(self)
|
||||||
self.layout.setSpacing(0)
|
self.layout.setSpacing(0)
|
||||||
self.layout.setMargin(0)
|
self.layout.setMargin(0)
|
||||||
@ -305,6 +305,8 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
"""
|
"""
|
||||||
self._fileName = unicode(fileName)
|
self._fileName = unicode(fileName)
|
||||||
self.parent.setServiceModified(self.isModified, self.shortFileName())
|
self.parent.setServiceModified(self.isModified, self.shortFileName())
|
||||||
|
QtCore.QSettings(). \
|
||||||
|
setValue(u'service/last file',QtCore.QVariant(fileName))
|
||||||
|
|
||||||
def fileName(self):
|
def fileName(self):
|
||||||
"""
|
"""
|
||||||
@ -390,6 +392,8 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.serviceItems = []
|
self.serviceItems = []
|
||||||
self.setFileName(u'')
|
self.setFileName(u'')
|
||||||
self.setModified(False)
|
self.setModified(False)
|
||||||
|
QtCore.QSettings(). \
|
||||||
|
setValue(u'service/last file',QtCore.QVariant(u''))
|
||||||
|
|
||||||
def saveFile(self):
|
def saveFile(self):
|
||||||
"""
|
"""
|
||||||
@ -530,13 +534,21 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
self.setFileName(fileName)
|
self.setFileName(fileName)
|
||||||
self.parent.addRecentFile(fileName)
|
self.parent.addRecentFile(fileName)
|
||||||
self.setModified(False)
|
self.setModified(False)
|
||||||
|
QtCore.QSettings(). \
|
||||||
|
setValue(u'service/last file',QtCore.QVariant(fileName))
|
||||||
# Refresh Plugin lists
|
# Refresh Plugin lists
|
||||||
Receiver.send_message(u'plugin_list_refresh')
|
Receiver.send_message(u'plugin_list_refresh')
|
||||||
|
|
||||||
def loadLastFile(self):
|
def loadLastFile(self):
|
||||||
if not self.parent.recentFiles:
|
"""
|
||||||
return
|
Load the last service item from the service manager when the
|
||||||
self.loadFile(self.parent.recentFiles[0])
|
service was last closed. Can be blank if there was no service
|
||||||
|
present.
|
||||||
|
"""
|
||||||
|
fileName = QtCore.QSettings(). \
|
||||||
|
value(u'service/last file',QtCore.QVariant(u'')).toString()
|
||||||
|
if fileName:
|
||||||
|
self.loadFile(fileName)
|
||||||
|
|
||||||
def contextMenu(self, point):
|
def contextMenu(self, point):
|
||||||
item = self.serviceManagerList.itemAt(point)
|
item = self.serviceManagerList.itemAt(point)
|
||||||
|
@ -186,9 +186,11 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
self.AuthorsListView.clear()
|
self.AuthorsListView.clear()
|
||||||
self.TopicsListView.clear()
|
self.TopicsListView.clear()
|
||||||
self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason)
|
self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason)
|
||||||
|
self.songBookNumberEdit.setText(u'')
|
||||||
self.loadAuthors()
|
self.loadAuthors()
|
||||||
self.loadTopics()
|
self.loadTopics()
|
||||||
self.loadBooks()
|
self.loadBooks()
|
||||||
|
self.ThemeSelectionComboItem.setCurrentIndex(0)
|
||||||
# it's a new song to preview is not possible
|
# it's a new song to preview is not possible
|
||||||
self.previewButton.setVisible(False)
|
self.previewButton.setVisible(False)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user