first run wizard

documentation/manual/source/introduction.rst

@@ -5,33 +5,31 @@ Introduction
 About
 -----
 
-OpenLP is an open source lyrics projection application developed specifically
-for churches. It is licensed under the GNU Generic Public License, which means
-that it is free to use and distribute, and it stays free.
+OpenLP stands for "Open Source Lyrics Projection" and is presentation software
+developed for churches to provide a single easy to use interface for the
+projection needs of a typical worship service. First created in 2004, it has
+steadily grown in features and maturity such that is it now a mainstay in
+hundreds of churches around the world.
 
-Lyrics Projection
------------------
+OpenLP has searchable databases of songs and Bible verses allowing them to be
+projected instantly or saved in a pre-prepared order of service file. Themes
+allow for a variety of presentation options and allow you to add attractive
+visuals to enhance your presentations. PowerPoint and OpenOffice presentations,
+videos and audio files can be run from within the program removing the need to
+switch between different programs. Alert messages can be displayed so the
+nursery or car park stewards can notify the congregation easily. Remote
+capability allows the worship leader to change songs, or for alert messages to
+be sent from anywhere on the network, even via a smart phone or tablet.
 
-OpenLP's purpose is to project the lyrics of songs and Bible verses using a 
-computer and a data projector. OpenLP also has the ability to project videos, 
-images, and also play audio. OpenLP also is highly customizable providing users 
-with the ability to set up a wide variety of themes, including themes with 
-video backgrounds.
+Being free, this software can be installed on as many PCs as required, 
+including the home PCs of worship leader(s) at no additional cost. Compared to
+the expensive site licenses and restrictions of commercial software we believe 
+OpenLP is the perfect choice for quality and value. Still in active development
+by a growing team of enthusiastic developers, features are being added all the 
+time resulting in continual improvement of the software.
 
-Open Source
------------
-
-OpenLP is open source software. This means that the source code (the 
-programming instructions the developers write) is open to anyone who wants to 
-look at it. This gives you, the end user, a few freedoms.
-
-From a developer's perspective, it gives you the freedom to inspect the code 
-and make sure that it is not malicious. Also, it gives you the freedom to 
-change the code and the freedom to "fork" the project and make it your own.
-
-For end users open source software gives you the freedom to use software as 
-you wish. You are not required to pay for the software and you are free to 
-make copies and distribute it to anyone you want.
+OpenLP is licensed under the GNU Generic Public License, which means
+that it is free to use, distribute, modify, and it stays free.
 
 GNU General Public License
 --------------------------
@@ -42,5 +40,5 @@ to charge for the software, and that you have to distribute the source code as
 well.
 
 You can find a copy of the GNU General Public License from the Help menu 
-selecting about OpenLP or on-line 
-at: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+selecting about OpenLP or on-line at:
+`<http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt>`_.

documentation/manual/source/troubleshooting.rst

@@ -113,8 +113,8 @@ If you do not see all the features listed in the Media Manager, you may need
 to enable them. 
 
 To enable the plugins navigate to :menuselection:`Settings --> Plugins` or
-press `F7`. You will want to click on the plugin to the left that you want to 
-enable and select **active** from the drop down box to the right.
+press :kbd:`Alt+F7`. You will want to click on the plugin to the left that you
+would like to enable and select **active** from the drop down box to the right.
 
 .. image:: pics/plugins.png
 

openlp/core/ui/servicemanager.py

@@ -588,6 +588,21 @@ class ServiceManager(QtGui.QWidget):
                 message=translate('OpenLP.ServiceManager',
                 'File could not be opened because it is corrupt.'))
             log.exception(u'Problem loading service file %s' % fileName)
+        except zipfile.BadZipfile:
+            if os.path.getsize(fileName) == 0:
+                log.exception(u'Service file is zero sized: %s' % fileName)
+                QtGui.QMessageBox.information(self,
+                    translate('OpenLP.ServiceManager', 'Empty File'),
+                    translate('OpenLP.ServiceManager', 'This service file '
+                    'does not contain any data.'))
+            else:
+                log.exception(u'Service file is cannot be extracted as zip: '
+                    u'%s' % fileName)
+                QtGui.QMessageBox.information(self,
+                    translate('OpenLP.ServiceManager', 'Corrupt File'),
+                    translate('OpenLP.ServiceManager', 'This file is either'
+                    'corrupt or not an OpenLP 2.0 service file.'))
+            return
         finally:
             if fileTo:
                 fileTo.close()

openlp/plugins/songs/forms/editsongform.py

@@ -269,6 +269,8 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
                 if index is None:
                     index = VerseType.Other
                 verse[0][u'type'] = VerseType.Tags[index]
+                if verse[0][u'label'] == u'':
+                    verse[0][u'label'] = u'1'
                 verse_def = u'%s%s' % (verse[0][u'type'], verse[0][u'label'])
                 item = QtGui.QTableWidgetItem(verse[1])
                 item.setData(QtCore.Qt.UserRole, QtCore.QVariant(verse_def))