forked from openlp/openlp
Custom editing fix part 1
This commit is contained in:
parent
05761ef442
commit
cb1d5c2abb
|
@ -20,7 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
from PyQt4 import Qt, QtCore, QtGui
|
from PyQt4 import Qt, QtCore, QtGui
|
||||||
|
|
||||||
from editcustomdialog import Ui_customEditDialog
|
from editcustomdialog import Ui_customEditDialog
|
||||||
from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver
|
from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
|
||||||
from openlp.plugins.custom.lib.models import CustomSlide
|
from openlp.plugins.custom.lib.models import CustomSlide
|
||||||
|
|
||||||
class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
|
class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
|
||||||
|
@ -44,7 +44,6 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
|
||||||
QtCore.QObject.connect(self.ClearButton, QtCore.SIGNAL(u'pressed()'), self.onClearButtonPressed)
|
QtCore.QObject.connect(self.ClearButton, QtCore.SIGNAL(u'pressed()'), self.onClearButtonPressed)
|
||||||
QtCore.QObject.connect(self.UpButton, QtCore.SIGNAL(u'pressed()'), self.onUpButtonPressed)
|
QtCore.QObject.connect(self.UpButton, QtCore.SIGNAL(u'pressed()'), self.onUpButtonPressed)
|
||||||
QtCore.QObject.connect(self.DownButton, QtCore.SIGNAL(u'pressed()'), self.onDownButtonPressed)
|
QtCore.QObject.connect(self.DownButton, QtCore.SIGNAL(u'pressed()'), self.onDownButtonPressed)
|
||||||
QtCore.QObject.connect(self.TitleEdit, QtCore.SIGNAL(u'lostFocus()'), self.validate)
|
|
||||||
|
|
||||||
QtCore.QObject.connect(self.VerseListView,
|
QtCore.QObject.connect(self.VerseListView,
|
||||||
QtCore.SIGNAL(u'itemDoubleClicked(QListWidgetItem*)'), self.onVerseListViewSelected)
|
QtCore.SIGNAL(u'itemDoubleClicked(QListWidgetItem*)'), self.onVerseListViewSelected)
|
||||||
|
@ -92,25 +91,29 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
|
||||||
if id == -1:
|
if id == -1:
|
||||||
id = 0 # Not Found
|
id = 0 # Not Found
|
||||||
self.ThemecomboBox.setCurrentIndex(id)
|
self.ThemecomboBox.setCurrentIndex(id)
|
||||||
self.validate()
|
|
||||||
else:
|
else:
|
||||||
self.ThemecomboBox.setCurrentIndex(0)
|
self.ThemecomboBox.setCurrentIndex(0)
|
||||||
|
|
||||||
def accept(self):
|
def accept(self):
|
||||||
if self.validate():
|
valid , message = self._validate()
|
||||||
sxml=SongXMLBuilder()
|
if not valid:
|
||||||
sxml.new_document()
|
QtGui.QMessageBox.critical(self,
|
||||||
sxml.add_lyrics_to_song()
|
translate(u'customEditDialog', u'Error'), message,
|
||||||
count = 1
|
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
|
||||||
for i in range (0, self.VerseListView.count()):
|
return
|
||||||
sxml.add_verse_to_lyrics(u'custom', unicode(count), unicode(self.VerseListView.item(i).text()))
|
sxml=SongXMLBuilder()
|
||||||
count += 1
|
sxml.new_document()
|
||||||
self.customSlide.title = unicode(self.TitleEdit.displayText())
|
sxml.add_lyrics_to_song()
|
||||||
self.customSlide.text = unicode(sxml.extract_xml())
|
count = 1
|
||||||
self.customSlide.credits = unicode(self.CreditEdit.displayText())
|
for i in range (0, self.VerseListView.count()):
|
||||||
self.customSlide.theme_name = unicode(self.ThemecomboBox.currentText())
|
sxml.add_verse_to_lyrics(u'custom', unicode(count), unicode(self.VerseListView.item(i).text()))
|
||||||
self.custommanager.save_slide(self.customSlide)
|
count += 1
|
||||||
self.close()
|
self.customSlide.title = unicode(self.TitleEdit.displayText())
|
||||||
|
self.customSlide.text = unicode(sxml.extract_xml())
|
||||||
|
self.customSlide.credits = unicode(self.CreditEdit.displayText())
|
||||||
|
self.customSlide.theme_name = unicode(self.ThemecomboBox.currentText())
|
||||||
|
self.custommanager.save_slide(self.customSlide)
|
||||||
|
self.close()
|
||||||
|
|
||||||
def rejected(self):
|
def rejected(self):
|
||||||
self.close()
|
self.close()
|
||||||
|
@ -147,7 +150,6 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
|
||||||
self.VerseListView.addItem(self.VerseTextEdit.toPlainText())
|
self.VerseListView.addItem(self.VerseTextEdit.toPlainText())
|
||||||
self.DeleteButton.setEnabled(False)
|
self.DeleteButton.setEnabled(False)
|
||||||
self.VerseTextEdit.clear()
|
self.VerseTextEdit.clear()
|
||||||
self.validate()
|
|
||||||
|
|
||||||
def onEditButtonPressed(self):
|
def onEditButtonPressed(self):
|
||||||
self.VerseTextEdit.setPlainText(self.VerseListView.currentItem().text())
|
self.VerseTextEdit.setPlainText(self.VerseListView.currentItem().text())
|
||||||
|
@ -164,17 +166,14 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
|
||||||
self.VerseListView.takeItem(self.VerseListView.currentRow())
|
self.VerseListView.takeItem(self.VerseListView.currentRow())
|
||||||
self.EditButton.setEnabled(False)
|
self.EditButton.setEnabled(False)
|
||||||
|
|
||||||
def validate(self):
|
def _validate(self):
|
||||||
valid = True
|
valid = True
|
||||||
|
message = u''
|
||||||
if len(self.TitleEdit.displayText()) == 0:
|
if len(self.TitleEdit.displayText()) == 0:
|
||||||
valid = False
|
valid = False
|
||||||
self.TitleEdit.setStyleSheet(u'background-color: red; color: white')
|
message = translate(u'customEditDialog', u'You need to enter a title \n')
|
||||||
else:
|
|
||||||
self.TitleEdit.setStyleSheet(u'')
|
|
||||||
# must have 1 slide
|
# must have 1 slide
|
||||||
if self.VerseListView.count() == 0:
|
if self.VerseListView.count() == 0:
|
||||||
valid = False
|
valid = False
|
||||||
self.VerseListView.setStyleSheet(u'background-color: red; color: white')
|
message += translate(u'customEditDialog', u'You need to enter a slide \n')
|
||||||
else:
|
return valid, message
|
||||||
self.VerseListView.setStyleSheet(u'')
|
|
||||||
return valid
|
|
||||||
|
|
Loading…
Reference in New Issue