openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/46665

Fix song saving when there is a verse order.
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/46665
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-01-17 22:25:52 +0000
+++ openlp/core/ui/maindisplay.py	2011-01-18 19:37:53 +0000
@@ -437,7 +437,8 @@
             self.hideDisplay(self.hideMode)
         # Hide mouse cursor when moved over display if enabled in settings
         settings = QtCore.QSettings()
-        if settings.value(u'advanced/hide mouse', QtCore.QVariant(False)).toBool():
+        if settings.value(u'advanced/hide mouse',
+            QtCore.QVariant(False)).toBool():
             self.setCursor(QtCore.Qt.BlankCursor)
             self.frame.evaluateJavaScript('document.body.style.cursor = "none"')
         else:

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2011-01-17 00:52:00 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2011-01-18 19:37:53 +0000
@@ -553,7 +553,7 @@
             return False
         if self.verseOrderEdit.text():
             order = []
-            order_names = self.verseOrderEdit.text().split()
+            order_names = unicode(self.verseOrderEdit.text()).split()
             for item in order_names:
                 if len(item) == 1:
                     order.append(item.lower() + u'1')