Head

copyright.txt

@@ -1,19 +1,23 @@
 # -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-"""
-OpenLP - Open Source Lyrics Projection
-Copyright (c) 2008 Raoul Snyman
-Portions copyright (c) 2008 Martin Thompson, Tim Bentley, Carsten Tinggaard
 
-This program is free software; you can redistribute it and/or modify it under
+###############################################################################
-the terms of the GNU General Public License as published by the Free Software
+# OpenLP - Open Source Lyrics Projection                                      #
-Foundation; version 2 of the License.
+# --------------------------------------------------------------------------- #
-
+# Copyright (c) 2008 Raoul Snyman                                             #
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley, Carsten      #
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# Tinggaard, Jon Tibble, Jonathan Corwin, Maikel Stuivenberg, Scott Guerrieri #
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# --------------------------------------------------------------------------- #
-
+# This program is free software; you can redistribute it and/or modify it     #
-You should have received a copy of the GNU General Public License along with
+# under the terms of the GNU General Public License as published by the Free  #
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Software Foundation; version 2 of the License.                              #
-Place, Suite 330, Boston, MA 02111-1307 USA
+#                                                                             #
-"""
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################

openlp.pyw

@@ -1,25 +1,26 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-"""
-OpenLP - Open Source Lyrics Projection
 
-Copyright (c) 2008 Raoul Snyman
+###############################################################################
-
+# OpenLP - Open Source Lyrics Projection                                      #
-Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley,
+# --------------------------------------------------------------------------- #
-
+# Copyright (c) 2008 Raoul Snyman                                             #
-This program is free software; you can redistribute it and/or modify it under
+# Portions copyright (c) 2008-2009 Martin Thompson, Tim Bentley,              #
-the terms of the GNU General Public License as published by the Free Software
+# --------------------------------------------------------------------------- #
-Foundation; version 2 of the License.
+# This program is free software; you can redistribute it and/or modify it     #
-
+# under the terms of the GNU General Public License as published by the Free  #
-This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# Software Foundation; version 2 of the License.                              #
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+#                                                                             #
-PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but WITHOUT #
-
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-You should have received a copy of the GNU General Public License along with
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# more details.                                                               #
-Place, Suite 330, Boston, MA 02111-1307 USA
+#                                                                             #
-"""
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
 
 import sys
 import logging, logging.handlers

openlp/plugins/songs/forms/editsongform.py

@@ -73,8 +73,16 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             QtCore.SIGNAL(u'activated(int)'), self.onThemeComboChanged)
         QtCore.QObject.connect(self.MaintenanceButton,
             QtCore.SIGNAL(u'clicked()'), self.onMaintenanceButtonClicked)
+        QtCore.QObject.connect(self.TitleEditItem,
+            QtCore.SIGNAL(u'lostFocus()'), self.onTitleEditItemLostFocus)
+        QtCore.QObject.connect(self.CCLNumberEdit,
+            QtCore.SIGNAL(u'lostFocus()'), self.onCCLNumberEditLostFocus)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'update_themes'), self.loadThemes)
+        QtCore.QObject.connect(self.CommentsEdit,
+            QtCore.SIGNAL(u'lostFocus()'), self.onCommentsEditLostFocus)
+        QtCore.QObject.connect(self.VerseOrderEdit,
+            QtCore.SIGNAL(u'lostFocus()'), self.onVerseOrderEditLostFocus)
         # Create other objects and forms
         self.songmanager = songmanager
         self.parent = parent
@@ -333,35 +341,41 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         message = u''
         if len(self.TitleEditItem.displayText()) == 0:
             valid = False
-            self.TitleEditItem.setStyleSheet(u'background-color: red; color: white')
+            ##self.TitleEditItem.setStyleSheet(u'background-color: red; color: white')
-            message = translate(u'SongFormDialog', u'You need to enter a song title \n')
+            self.SongTabWidget.setCurrentIndex(0)
-        else:
+            self.TitleEditItem.setFocus()
-            self.TitleEditItem.setStyleSheet(u'')
+            return False, translate(u'SongFormDialog', u'You need to enter a song title.')
+            #else:
+            #self.TitleEditItem.setStyleSheet(u'')
         if self.VerseListWidget.count() == 0:
             valid = False
-            self.VerseListWidget.setStyleSheet(u'background-color: red; color: white')
+            #self.VerseListWidget.setStyleSheet(u'background-color: red; color: white')
-            message = message + translate(u'SongFormDialog', u'You need to enter some verse text \n')
+            self.SongTabWidget.setCurrentIndex(0)
-        else:
+            self.VerseListWidget.setFocus()
-            self.VerseListWidget.setStyleSheet(u'')
+            return False, translate(u'SongFormDialog', u'You need to enter some verses.')
+            #else:
+            #self.VerseListWidget.setStyleSheet(u'')
         if self.AuthorsListView.count() == 0:
             valid = False
-            self.AuthorsListView.setStyleSheet(u'background-color: red; color: white')
+            #self.AuthorsListView.setStyleSheet(u'background-color: red; color: white')
-            message = message + translate(u'SongFormDialog', u'You need to provide an author')
+            self.SongTabWidget.setCurrentIndex(2)
-        else:
+            self.AuthorsListView.setFocus()
-            self.AuthorsListView.setStyleSheet(u'')
+            return False, translate(u'SongFormDialog', u'You need to provide at least one author.')
+            #else:
+            #self.AuthorsListView.setStyleSheet(u'')
         return valid, message
 
-    def on_TitleEditItem_lostFocus(self):
+    def onTitleEditItemLostFocus(self):
         self.song.title = self.TitleEditItem.text()
         self.title_change = True
 
-    def on_VerseOrderEdit_lostFocus(self):
+    def onVerseOrderEditLostFocus(self):
         self.song.verse_order = self.VerseOrderEdit.text()
 
-    def on_CommentsEdit_lostFocus(self):
+    def onCommentsEditLostFocus(self):
         self.song.comments = self.CommentsEdit.text()
 
-    def on_CCLNumberEdit_lostFocus(self):
+    def onCCLNumberEditLostFocus(self):
         self.song.ccli_number = self.CCLNumberEdit.text()
 
     def onCopyrightInsertButtonTriggered(self):

openlp/plugins/songs/forms/songmaintenancedialog.py

@@ -47,7 +47,7 @@ class Ui_SongMaintenanceDialog(object):
         self.TypeListWidget.setIconSize(QtCore.QSize(112, 100));
         self.TypeListWidget.setMovement(QtGui.QListView.Static);
         self.TypeListWidget.setMaximumWidth(118);
-        self.TypeListWidget.setSpacing(3);
+        self.TypeListWidget.setSpacing(0);
         self.TypeListWidget.setSortingEnabled(False)
         self.TypeListWidget.setUniformItemSizes(True)
         self.TypeListWidget.setObjectName(u'TypeListWidget')