diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index e26df7a18..71b12d95d 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -170,7 +170,7 @@ class SlideController(QtGui.QWidget):
if self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator')
self.blankButton = self.Toolbar.addToolbarButton(
- u'Blank Screen', u':/slides/slide_close.png',
+ u'Blank Screen', u':/slides/slide_blank.png',
self.trUtf8('Blank Screen'), self.onBlankDisplay, True)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'live_slide_blank'), self.blankScreen)
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index 40e9c1e1d..37219b5db 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -61,6 +61,6 @@ class ImagePlugin(Plugin):
'together and presented on the live controller it is possible '
'to turn them into a timed loop.
From the plugin if the '
'Override background is chosen and an image is selected '
- 'any somgs which are rendered will use the selected image from '
+ 'any songs which are rendered will use the selected image from '
'the background instead of the one provied by the theme.
')
return about_text
diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py
index cee84aae5..99dfd6d69 100644
--- a/openlp/plugins/songs/forms/editverseform.py
+++ b/openlp/plugins/songs/forms/editverseform.py
@@ -77,7 +77,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
def setVerse(self, text, verseCount=0, single=False, tag=u'Verse:1'):
posVerse = 0
posSub = 0
- if len(text) == 0:
+ if len(text) == 0 and not single:
text = u'---[Verse:1]---\n'
if single:
id = tag.split(u':')
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index 4d1d39cce..d8d6bb5b2 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -139,7 +139,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
else:
QtGui.QMessageBox.critical(
self, self.trUtf8('Error'),
- self.trUtf8('Couldn\'t add your author!'),
+ self.trUtf8('Couldn\'t add your author.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onTopicAddButtonClick(self):
@@ -150,7 +150,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
else:
QtGui.QMessageBox.critical(
self, self.trUtf8('Error'),
- self.trUtf8('Couldn\'t add your topic!'),
+ self.trUtf8('Couldn\'t add your topic.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onBookAddButtonClick(self):
@@ -162,7 +162,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
else:
QtGui.QMessageBox.critical(
self, self.trUtf8('Error'),
- self.trUtf8('Couldn\'t add your book!'),
+ self.trUtf8('Couldn\'t add your book.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onAuthorEditButtonClick(self):
@@ -182,7 +182,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
else:
QtGui.QMessageBox.critical(
self, self.trUtf8('Error'),
- self.trUtf8('Couldn\'t save your author!'),
+ self.trUtf8('Couldn\'t save your author.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onTopicEditButtonClick(self):
@@ -197,7 +197,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
else:
QtGui.QMessageBox.critical(
self, self.trUtf8('Error'),
- self.trUtf8('Couldn\'t save your topic!'),
+ self.trUtf8('Couldn\'t save your topic.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onBookEditButtonClick(self):
@@ -214,7 +214,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
else:
QtGui.QMessageBox.critical(
self, self.trUtf8('Error'),
- self.trUtf8('Couldn\'t save your book!'),
+ self.trUtf8('Couldn\'t save your book.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onAuthorDeleteButtonClick(self):
@@ -227,7 +227,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
self.trUtf8('Delete Author'),
self.trUtf8('Are you sure you want to delete the selected author?'),
self.trUtf8('This author can\'t be deleted, they are currently '
- 'assigned to at least one song!'),
+ 'assigned to at least one song.'),
self.trUtf8('No author selected!'))
def onTopicDeleteButtonClick(self):
@@ -240,7 +240,7 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
self.trUtf8('Delete Topic'),
self.trUtf8('Are you sure you want to delete the selected topic?'),
self.trUtf8('This topic can\'t be deleted, it is currently '
- 'assigned to at least one song!'),
+ 'assigned to at least one song.'),
self.trUtf8('No topic selected!'))
def onBookDeleteButtonClick(self):
@@ -253,5 +253,5 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
self.trUtf8('Delete Book'),
self.trUtf8('Are you sure you want to delete the selected book?'),
self.trUtf8('This book can\'t be deleted, it is currently '
- 'assigned to at least one song!'),
- self.trUtf8('No book selected!'))
\ No newline at end of file
+ 'assigned to at least one song.'),
+ self.trUtf8('No book selected!'))
diff --git a/openlp/plugins/songusage/forms/songusagedeletedialog.py b/openlp/plugins/songusage/forms/songusagedeletedialog.py
index 03c9f63ec..e9a9a8603 100644
--- a/openlp/plugins/songusage/forms/songusagedeletedialog.py
+++ b/openlp/plugins/songusage/forms/songusagedeletedialog.py
@@ -57,4 +57,4 @@ class Ui_SongUsageDeleteDialog(object):
QtCore.QMetaObject.connectSlotsByName(AuditDeleteDialog)
def retranslateUi(self, AuditDeleteDialog):
- AuditDeleteDialog.setWindowTitle(self.trUtf8('Audit Delete'))
+ AuditDeleteDialog.setWindowTitle(self.trUtf8('Song Usage Delete'))
diff --git a/openlp/plugins/songusage/forms/songusagedetaildialog.py b/openlp/plugins/songusage/forms/songusagedetaildialog.py
index d6ba2ecfb..411187086 100644
--- a/openlp/plugins/songusage/forms/songusagedetaildialog.py
+++ b/openlp/plugins/songusage/forms/songusagedetaildialog.py
@@ -85,7 +85,7 @@ class Ui_SongUsageDetailDialog(object):
QtCore.QMetaObject.connectSlotsByName(AuditDetailDialog)
def retranslateUi(self, AuditDetailDialog):
- AuditDetailDialog.setWindowTitle(self.trUtf8('Audit Detail Extraction'))
- self.DateRangeGroupBox.setTitle(self.trUtf8('ASelect Date Range'))
+ AuditDetailDialog.setWindowTitle(self.trUtf8('Song Usage Extraction'))
+ self.DateRangeGroupBox.setTitle(self.trUtf8('Select Date Range'))
self.ToLabel.setText(self.trUtf8('to'))
self.FileGroupBox.setTitle(self.trUtf8('Report Location'))
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 28af4c31a..3f2a6e843 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -1,5 +1,5 @@
-
+
topic_edit.png
author_add.png
author_delete.png
@@ -21,17 +21,20 @@
song_topic_edit.png
song_book_edit.png
-
+
slide_close.png
slide_first.png
slide_last.png
slide_next.png
+ slide_blank.png
+ slide_desktop.png
+ slide_theme.png
slide_previous.png
media_playback_start.png
media_playback_stop.png
media_playback_pause.png
-
+
openlp-logo-16x16.png
openlp-logo-32x32.png
openlp-logo-48x48.png
@@ -39,43 +42,43 @@
openlp-logo-128x128.png
openlp-logo-256x256.png
-
+
openlp-about-logo.png
openlp-splash-screen.png
-
+
import_selectall.png
import_move_to_list.png
import_remove.png
import_load.png
-
+
export_selectall.png
export_remove.png
export_load.png
export_move_to_list.png
-
+
custom_new.png
custom_edit.png
custom_delete.png
-
+
wizard_importbible.bmp
-
+
presentation_delete.png
presentation_load.png
-
+
video_delete.png
video_load.png
-
+
image_delete.png
image_load.png
-
+
service_edit.png
service_notes.png
service_item_notes.png
@@ -88,7 +91,7 @@
service_open.png
service_save.png
-
+
system_close.png
system_about.png
system_help_contents.png
@@ -102,7 +105,7 @@
system_exit.png
system_settings.png
-
+
media_custom.png
media_presentation.png
media_image.png
@@ -113,16 +116,16 @@
media_stop.png
image_clapperboard.png
-
+
messagebox_critical.png
messagebox_info.png
messagebox_warning.png
-
+
tools_add.png
tools_alert.png
-
+
theme_delete.png
theme_new.png
theme_edit.png
diff --git a/resources/images/slide_blank.png b/resources/images/slide_blank.png
new file mode 100644
index 000000000..a878468c6
Binary files /dev/null and b/resources/images/slide_blank.png differ
diff --git a/resources/images/slide_desktop.png b/resources/images/slide_desktop.png
new file mode 100644
index 000000000..e5655f523
Binary files /dev/null and b/resources/images/slide_desktop.png differ
diff --git a/resources/images/slide_theme.png b/resources/images/slide_theme.png
new file mode 100644
index 000000000..d196792bb
Binary files /dev/null and b/resources/images/slide_theme.png differ