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
1=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
2--- openlp/plugins/songs/forms/editsongdialog.py 2009-08-06 21:30:14 +0000
3+++ openlp/plugins/songs/forms/editsongdialog.py 2009-08-08 06:19:09 +0000
4@@ -380,11 +380,10 @@
5 self.verticalLayout.addWidget(self.ButtonBox)
6
7 self.retranslateUi(EditSongDialog)
8- self.SongTabWidget.setCurrentIndex(0)
9 QtCore.QObject.connect(self.ButtonBox,
10 QtCore.SIGNAL(u'rejected()'), EditSongDialog.close)
11 QtCore.QObject.connect(self.ButtonBox,
12- QtCore.SIGNAL(u'accepted()'), EditSongDialog.close)
13+ QtCore.SIGNAL(u'accepted()'), EditSongDialog.accept)
14 QtCore.QMetaObject.connectSlotsByName(EditSongDialog)
15 EditSongDialog.setTabOrder(self.SongTabWidget, self.TitleEditItem)
16 EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit)
17
18=== modified file 'openlp/plugins/songs/forms/editsongform.py'
19--- openlp/plugins/songs/forms/editsongform.py 2009-08-06 21:30:14 +0000
20+++ openlp/plugins/songs/forms/editsongform.py 2009-08-08 06:19:09 +0000
21@@ -122,6 +122,7 @@
22
23 def newSong(self):
24 log.debug(u'New Song')
25+ self.SongTabWidget.setCurrentIndex(0)
26 self.song = Song()
27 self.TitleEditItem.setText(u'')
28 self.AlternativeEdit.setText(u'')
29@@ -140,6 +141,7 @@
30
31 def loadSong(self, id):
32 log.debug(u'Load Song')
33+ self.SongTabWidget.setCurrentIndex(0)
34 self.loadAuthors()
35 self.loadTopics()
36 self.loadBooks()
37@@ -341,8 +343,8 @@
38 self.loadBooks()
39 self.loadTopics()
40
41- def onAccept(self):
42- log.debug(u'OnAccept')
43+ def accept(self):
44+ log.debug(u'accept')
45 if not self._validate_song():
46 return
47 self.song.title = unicode(self.TitleEditItem.displayText())