raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Merged in some changes for the song maintenance form.

Browse Source 
bzr-revno: 498
This commit is contained in:
Raoul Snyman 2009-08-03 21:59:19 +02:00
commit dc352c28d3
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/plugins/songs/forms/authorsform.py
View File

@ -18,7 +18,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
""" """
from PyQt4 import QtGui, QtCore from PyQt4 import QtGui, QtCore
from openlp.core.lib import translate from openlp.core.lib import translate
from authorsdialog import Ui_AuthorsDialog from openlp.plugins.songs.forms.authorsdialog import Ui_AuthorsDialog
class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog): class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
""" """
@ -67,21 +67,21 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
self.autoDisplayName = on self.autoDisplayName = on
def accept(self): def accept(self):
if self.FirstNameEdit.text() == u'': if not self.FirstNameEdit.text():
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
translate(u'AuthorsDialog', u'Error'), translate(u'AuthorsDialog', u'Error'),
translate(u'AuthorsDialog', u'You need to type in the first name of the author.'), translate(u'AuthorsDialog', u'You need to type in the first name of the author.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.FirstNameEdit.setFocus() self.FirstNameEdit.setFocus()
return False return False
elif self.LastNameEdit.text() == u'': elif not self.LastNameEdit.text():
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
translate(u'AuthorsDialog', u'Error'), translate(u'AuthorsDialog', u'Error'),
translate(u'AuthorsDialog', u'You need to type in the last name of the author.'), translate(u'AuthorsDialog', u'You need to type in the last name of the author.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.LastNameEdit.setFocus() self.LastNameEdit.setFocus()
return False return False
elif self.DisplayEdit.text() == u'': elif not self.DisplayEdit.text():
if QtGui.QMessageBox.critical(self, if QtGui.QMessageBox.critical(self,
translate(u'AuthorsDialog', u'Error'), translate(u'AuthorsDialog', u'Error'),
translate(u'AuthorsDialog', u'You haven\'t set a display name for the author, would you like me to combine the first and last names for you?'), translate(u'AuthorsDialog', u'You haven\'t set a display name for the author, would you like me to combine the first and last names for you?'),

4
openlp/plugins/songs/forms/songbookform.py
View File

@ -19,7 +19,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
from PyQt4 import QtGui, QtCore from PyQt4 import QtGui, QtCore
from openlp.core.lib import translate from openlp.core.lib import translate
from songbookdialog import Ui_SongBookDialog from openlp.plugins.songs.forms.songbookdialog import Ui_SongBookDialog
class SongBookForm(QtGui.QDialog, Ui_SongBookDialog): class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
""" """
@ -40,7 +40,7 @@ class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
return QtGui.QDialog.exec_(self) return QtGui.QDialog.exec_(self)
def accept(self): def accept(self):
if self.NameEdit.text() == u'': if not self.NameEdit.text():
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
translate(u'SongBookDialog', u'Error'), translate(u'SongBookDialog', u'Error'),
translate(u'SongBookDialog', u'You need to type in a book name!'), translate(u'SongBookDialog', u'You need to type in a book name!'),

2
openlp/plugins/songs/forms/songmaintenanceform.py
View File

@ -79,10 +79,10 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
item_id = self._getCurrentItemId(list_widget) item_id = self._getCurrentItemId(list_widget)
if item_id != -1: if item_id != -1:
item = get_func(item_id) item = get_func(item_id)
if item is not None and len(item.songs) == 0:
if QtGui.QMessageBox.warning(self, dlg_title, del_text, if QtGui.QMessageBox.warning(self, dlg_title, del_text,
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | QtGui.QMessageBox.Yes) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)
) == QtGui.QMessageBox.Yes: ) == QtGui.QMessageBox.Yes:
if item is not None and len(item.songs) == 0:
del_func(item.id) del_func(item.id)
reset_func() reset_func()
else: else:

4
openlp/plugins/songs/forms/topicsform.py
View File

@ -18,7 +18,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
""" """
from PyQt4 import QtGui, QtCore from PyQt4 import QtGui, QtCore
from openlp.core.lib import translate from openlp.core.lib import translate
from topicsdialog import Ui_TopicsDialog from openlp.plugins.songs.forms.topicsdialog import Ui_TopicsDialog
class TopicsForm(QtGui.QDialog, Ui_TopicsDialog): class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
""" """
@ -38,7 +38,7 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
return QtGui.QDialog.exec_(self) return QtGui.QDialog.exec_(self)
def accept(self): def accept(self):
if self.NameEdit.text() == u'': if not self.NameEdit.text():
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
translate(u'SongBookDialog', u'Error'), translate(u'SongBookDialog', u'Error'),
translate(u'SongBookDialog', u'You need to type in a topic name!'), translate(u'SongBookDialog', u'You need to type in a topic name!'),