openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bugfixes into lp:openlp.

Requested reviews:
    openlp.org Core (openlp-core)

Small obvious changes
-- 
https://code.launchpad.net/~trb143/openlp/bugfixes/+merge/9865
Your team openlp.org Core is subscribed to branch lp:openlp.

=== 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 @@
         self.verticalLayout.addWidget(self.ButtonBox)
 
         self.retranslateUi(EditSongDialog)
-        self.SongTabWidget.setCurrentIndex(0)
         QtCore.QObject.connect(self.ButtonBox,
             QtCore.SIGNAL(u'rejected()'), EditSongDialog.close)
         QtCore.QObject.connect(self.ButtonBox,
-            QtCore.SIGNAL(u'accepted()'), EditSongDialog.close)
+            QtCore.SIGNAL(u'accepted()'), EditSongDialog.accept)
         QtCore.QMetaObject.connectSlotsByName(EditSongDialog)
         EditSongDialog.setTabOrder(self.SongTabWidget, self.TitleEditItem)
         EditSongDialog.setTabOrder(self.TitleEditItem, self.AlternativeEdit)

=== 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 @@
 
     def newSong(self):
         log.debug(u'New Song')
+        self.SongTabWidget.setCurrentIndex(0)
         self.song = Song()
         self.TitleEditItem.setText(u'')
         self.AlternativeEdit.setText(u'')
@@ -140,6 +141,7 @@
 
     def loadSong(self, id):
         log.debug(u'Load Song')
+        self.SongTabWidget.setCurrentIndex(0)
         self.loadAuthors()
         self.loadTopics()
         self.loadBooks()
@@ -341,8 +343,8 @@
         self.loadBooks()
         self.loadTopics()
 
-    def onAccept(self):
-        log.debug(u'OnAccept')
+    def accept(self):
+        log.debug(u'accept')
         if not self._validate_song():
             return
         self.song.title = unicode(self.TitleEditItem.displayText())