corrections to mediamanager.rst introduction.rst troubleshooting.rst

documentation/manual/source/introduction.rst

@@ -5,30 +5,30 @@ Introduction
 About
 -----
 
-OpenLP stands for "Open source Lyric Projection" and is presentation software
+OpenLP stands for "Open Source Lyric Projection" and is presentation software
 developed for churches to provide a single easy to use interface for the
-projection needs of a typical act of worship. First created in 2004, it has
+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.
 
-It can hold a searchable database of song lyrics and Bible verses allowing them
+OpenLP can contain a searchable database of songs and Bible verses allowing
-to be projected instantly or saved in a pre-prepared order of service file.
+them to be projected instantly or saved in a pre-prepared order of service
-Themes allow song backgrounds to be changed instantly. PowerPoint presentations,
+file. Themes allow for a veriety of presentation options and allow you to add
-videos and audio files can be run from within the program removing the need to
+attractvie visuals to enhance your presentations. PowerPoint and Open Office
-switch between different programs. Alert messages can be displayed so the
+presentations, videos, and audio files can be run from within the program
-nursery or car park stewards can notify the congregation easily. Remote
+removing the need to switch between different programs. Alert messages can be
-capability allows the worship leader to change songs, or for alert messages to
+displayed so the nursery or car park stewards can notify the congregation easily.
-be sent from anywhere on the network, even via a phone.
+Remote capability allows the worship leader to change songs, or for alert
+messages to be sent from anywhere on the network, even via a phone.
 
 Being free, this software can be installed on as many PC's as required, even on
 the home PC's of worship leaders without additional cost. Compared to the
-expensive site licenses or restrictions of commercial software we believe 
+expensive site licenses and restrictions of commercial software we believe 
-OpenLP cannot be beaten for value. Still in active development by a growing
+OpenLP cannot be beat for value. Still in active development by a growing team
-team of enthusiastic developers, features are being added all the time, meaning
+of enthusiastic developers, features are being added all the time, meaning the
-the software just improves all the time.
+software just improves all the time.
 
-OpenLP is an open source lyrics projection application developed specifically
+OpenLP is licensed under the GNU Generic Public License, which means
-for churches. It 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

documentation/manual/source/mediamanager.rst

@@ -16,8 +16,8 @@ this is what the `Media Manager` looks like with all the plugins enabled.
 .. image:: pics/mediamanager.png
 
 To enable the plugins navigate to :menuselection:`Settings --> Plugins` or
-press `Alt+F7`. You will want to click on the plugin to the left that you want
+press :kbd:`Alt+F7`. You will want to click on the plugin to the left that you
-to enable and select **active** from the drop down box to the right.
+want to enable and select **active** from the drop down box to the right.
 
 .. image:: pics/plugins.png
 

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 
+press :kbd:`Alt+F7`. You will want to click on the plugin to the left that you
-enable and select **active** from the drop down box to the right.
+want 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))