← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~raoul-snyman/openlp/bug-795068 into lp:openlp

 

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-795068 into lp:openlp.

Requested reviews:
  Jonathan Corwin (j-corwin)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-795068/+merge/65667

Half of bug #795068 fixed. Just figured I might as well get this in before the release.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-795068/+merge/65667
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py	2011-06-23 13:33:07 +0000
@@ -68,6 +68,8 @@
             QtCore.Qt.AlignTop)
         self.verseListWidget = QtGui.QTableWidget(self.lyricsTab)
         self.verseListWidget.horizontalHeader().setVisible(False)
+        self.verseListWidget.horizontalHeader().setStretchLastSection(True)
+        self.verseListWidget.horizontalHeader().setMinimumSectionSize(16)
         self.verseListWidget.setAlternatingRowColors(True)
         self.verseListWidget.setColumnCount(1)
         self.verseListWidget.setSelectionBehavior(

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2011-06-23 13:33:07 +0000
@@ -233,7 +233,6 @@
         # lazy xml migration for now
         self.verseListWidget.clear()
         self.verseListWidget.setRowCount(0)
-        self.verseListWidget.setColumnWidth(0, self.width)
         # This is just because occasionally the lyrics come back as a "buffer"
         if isinstance(self.song.lyrics, buffer):
             self.song.lyrics = unicode(self.song.lyrics)


Follow ups