← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~trb143/openlp/bugs into lp:openlp

 

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #693150 Custom Slide Display footer option
  https://bugs.launchpad.net/bugs/693150
  #693202 delete theme
  https://bugs.launchpad.net/bugs/693202
  #696362 Songbook number left from previously opened song edit dialog
  https://bugs.launchpad.net/bugs/696362

For more details, see:
https://code.launchpad.net/~trb143/openlp/bugs/+merge/44992

Two fields needed to be cleaned on New Song
-- 
https://code.launchpad.net/~trb143/openlp/bugs/+merge/44992
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bugs into lp:openlp.
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2010-12-26 11:04:47 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2011-01-02 08:09:57 +0000
@@ -186,9 +186,11 @@
         self.AuthorsListView.clear()
         self.TopicsListView.clear()
         self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason)
+        self.songBookNumberEdit.setText(u'')
         self.loadAuthors()
         self.loadTopics()
         self.loadBooks()
+        self.ThemeSelectionComboItem.setCurrentIndex(0)
         # it's a new song to preview is not possible
         self.previewButton.setVisible(False)
 
@@ -753,4 +755,4 @@
     def processTitle(self):
         log.debug(u'processTitle')
         self.song.search_title = re.sub(r'[\'"`,;:(){}?]+', u'',
-            unicode(self.song.search_title)).lower()
\ No newline at end of file
+            unicode(self.song.search_title)).lower()