OpenLP

Merge lp:~trb143/openlp/bugfixes into lp:openlp

  1. bugfixes
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trb143/openlp/bugfixes
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~trb143/openlp/bugfixes
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Review via email: mp+9865@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Small obvious changes

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
lp:~trb143/openlp/bugfixes updated
504. By Tim Bentley

Lets save songs now

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2009-08-06 21:30:14 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py 2009-08-08 06:19:09 +0000
@@ -380,11 +380,10 @@
380 self.verticalLayout.addWidget(self.ButtonBox)380 self.verticalLayout.addWidget(self.ButtonBox)
381381
382 self.retranslateUi(EditSongDialog)382 self.retranslateUi(EditSongDialog)
383 self.SongTabWidget.setCurrentIndex(0)
384 QtCore.QObject.connect(self.ButtonBox,383 QtCore.QObject.connect(self.ButtonBox,
385 QtCore.SIGNAL(u'rejected()'), EditSongDialog.close)384 QtCore.SIGNAL(u'rejected()'), EditSongDialog.close)
386 QtCore.QObject.connect(self.ButtonBox,385 QtCore.QObject.connect(self.ButtonBox,
387 QtCore.SIGNAL(u'accepted()'), EditSongDialog.close)386 QtCore.SIGNAL(u'accepted()'), EditSongDialog.accept)
388 QtCore.QMetaObject.connectSlotsByName(EditSongDialog)387 QtCore.QMetaObject.connectSlotsByName(EditSongDialog)
389 EditSongDialog.setTabOrder(self.SongTabWidget, self.TitleEditItem)388 EditSongDialog.setTabOrder(self.SongTabWidget, self.TitleEditItem)
390 EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit)389 EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit)
391390
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2009-08-06 21:30:14 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2009-08-08 06:19:09 +0000
@@ -122,6 +122,7 @@
122122
123 def newSong(self):123 def newSong(self):
124 log.debug(u'New Song')124 log.debug(u'New Song')
125 self.SongTabWidget.setCurrentIndex(0)
125 self.song = Song()126 self.song = Song()
126 self.TitleEditItem.setText(u'')127 self.TitleEditItem.setText(u'')
127 self.AlternativeEdit.setText(u'')128 self.AlternativeEdit.setText(u'')
@@ -140,6 +141,7 @@
140141
141 def loadSong(self, id):142 def loadSong(self, id):
142 log.debug(u'Load Song')143 log.debug(u'Load Song')
144 self.SongTabWidget.setCurrentIndex(0)
143 self.loadAuthors()145 self.loadAuthors()
144 self.loadTopics()146 self.loadTopics()
145 self.loadBooks()147 self.loadBooks()
@@ -341,8 +343,8 @@
341 self.loadBooks()343 self.loadBooks()
342 self.loadTopics()344 self.loadTopics()
343345
344 def onAccept(self):346 def accept(self):
345 log.debug(u'OnAccept')347 log.debug(u'accept')
346 if not self._validate_song():348 if not self._validate_song():
347 return349 return
348 self.song.title = unicode(self.TitleEditItem.displayText())350 self.song.title = unicode(self.TitleEditItem.displayText())