From b5257347029c1fd06b208c834f111c75d943ec92 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 13 Mar 2009 16:00:14 +0000 Subject: [PATCH] Fix Unicode error on database write Try to add TextItemData again bzr-revno: 414 --- openlp/plugins/custom/forms/editcustomform.py | 6 +++--- openlp/plugins/custom/lib/mediaitem.py | 5 +++-- openlp/plugins/custom/lib/textlistdata.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py index f16685957..57e5c27c1 100644 --- a/openlp/plugins/custom/forms/editcustomform.py +++ b/openlp/plugins/custom/forms/editcustomform.py @@ -67,9 +67,9 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog): count += 1 sxml.dump_xml() customSlide = CustomSlide() - customSlide.title = str(self.TitleEdit.displayText()) - customSlide.text = str(sxml.extract_xml()) - customSlide.credits = str(self.CreditEdit.displayText()) + customSlide.title = unicode(self.TitleEdit.displayText()) + customSlide.text = unicode(sxml.extract_xml()) + customSlide.credits = unicode(self.CreditEdit.displayText()) self.custommanager.save_slide(customSlide) self.close() diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 77a18c7f3..800b62555 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -24,7 +24,8 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import MediaManagerItem from openlp.core.resources import * -#from openlp.plugins.custom.lib import TextListData +#from openlp.plugins.custom.lib import TextItemData + class CustomMediaItem(MediaManagerItem): """ @@ -129,7 +130,7 @@ class CustomMediaItem(MediaManagerItem): for CustomSlide in list: print CustomSlide.title # for CustomSlide in list: - # self.TextListData.addRow(CustomSlide.id,CustomSlide.title) +# self.CustomListData.addRow(CustomSlide.id,CustomSlide.title) def onClearTextButtonClick(self): """ diff --git a/openlp/plugins/custom/lib/textlistdata.py b/openlp/plugins/custom/lib/textlistdata.py index 0cb165a6a..094a9e981 100644 --- a/openlp/plugins/custom/lib/textlistdata.py +++ b/openlp/plugins/custom/lib/textlistdata.py @@ -9,7 +9,7 @@ class TextListData(QAbstractListModel): An abstract list of strings """ global log - log=logging.getLogger("ListData") + log=logging.getLogger("TextListData") log.info("started") def __init__(self):