openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Head r736

This commit is contained in:
Jon Tibble 2010-03-12 17:43:17 +00:00
parent 8124f0e8fe 835fd8a3f0
commit 9196a6b6f6
10 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/ui/slidecontroller.py
View File

@ -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)

2
openlp/plugins/images/imageplugin.py
View File

@ -61,6 +61,6 @@ class ImagePlugin(Plugin):
'together and presented on the live controller it is possible '
'to turn them into a timed loop.<br<br>From the plugin if the '
'<i>Override background</i> 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.<br>')
return about_text

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

@ -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':')

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

@ -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!'))
'assigned to at least one song.'),
self.trUtf8('No book selected!'))

2
openlp/plugins/songusage/forms/songusagedeletedialog.py
View File

@ -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'))

4
openlp/plugins/songusage/forms/songusagedetaildialog.py
View File

@ -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'))

37
resources/images/openlp-2.qrc
View File

@ -1,5 +1,5 @@
<RCC>
<qresource prefix="songs">
<qresource prefix="songs" >
<file>topic_edit.png</file>
<file>author_add.png</file>
<file>author_delete.png</file>
@ -21,17 +21,20 @@
<file>song_topic_edit.png</file>
<file>song_book_edit.png</file>
</qresource>
<qresource prefix="slides">
<qresource prefix="slides" >
<file>slide_close.png</file>
<file>slide_first.png</file>
<file>slide_last.png</file>
<file>slide_next.png</file>
<file>slide_blank.png</file>
<file>slide_desktop.png</file>
<file>slide_theme.png</file>
<file>slide_previous.png</file>
<file>media_playback_start.png</file>
<file>media_playback_stop.png</file>
<file>media_playback_pause.png</file>
</qresource>
<qresource prefix="icon">
<qresource prefix="icon" >
<file>openlp-logo-16x16.png</file>
<file>openlp-logo-32x32.png</file>
<file>openlp-logo-48x48.png</file>
@ -39,43 +42,43 @@
<file>openlp-logo-128x128.png</file>
<file>openlp-logo-256x256.png</file>
</qresource>
<qresource prefix="graphics">
<qresource prefix="graphics" >
<file>openlp-about-logo.png</file>
<file>openlp-splash-screen.png</file>
</qresource>
<qresource prefix="imports">
<qresource prefix="imports" >
<file>import_selectall.png</file>
<file>import_move_to_list.png</file>
<file>import_remove.png</file>
<file>import_load.png</file>
</qresource>
<qresource prefix="exports">
<qresource prefix="exports" >
<file>export_selectall.png</file>
<file>export_remove.png</file>
<file>export_load.png</file>
<file>export_move_to_list.png</file>
</qresource>
<qresource prefix="custom">
<qresource prefix="custom" >
<file>custom_new.png</file>
<file>custom_edit.png</file>
<file>custom_delete.png</file>
</qresource>
<qresource prefix="wizards">
<qresource prefix="wizards" >
<file>wizard_importbible.bmp</file>
</qresource>
<qresource prefix="presentations">
<qresource prefix="presentations" >
<file>presentation_delete.png</file>
<file>presentation_load.png</file>
</qresource>
<qresource prefix="videos">
<qresource prefix="videos" >
<file>video_delete.png</file>
<file>video_load.png</file>
</qresource>
<qresource prefix="images">
<qresource prefix="images" >
<file>image_delete.png</file>
<file>image_load.png</file>
</qresource>
<qresource prefix="services">
<qresource prefix="services" >
<file>service_edit.png</file>
<file>service_notes.png</file>
<file>service_item_notes.png</file>
@ -88,7 +91,7 @@
<file>service_open.png</file>
<file>service_save.png</file>
</qresource>
<qresource prefix="system">
<qresource prefix="system" >
<file>system_close.png</file>
<file>system_about.png</file>
<file>system_help_contents.png</file>
@ -102,7 +105,7 @@
<file>system_exit.png</file>
<file>system_settings.png</file>
</qresource>
<qresource prefix="media">
<qresource prefix="media" >
<file>media_custom.png</file>
<file>media_presentation.png</file>
<file>media_image.png</file>
@ -113,16 +116,16 @@
<file>media_stop.png</file>
<file>image_clapperboard.png</file>
</qresource>
<qresource prefix="messagebox">
<qresource prefix="messagebox" >
<file>messagebox_critical.png</file>
<file>messagebox_info.png</file>
<file>messagebox_warning.png</file>
</qresource>
<qresource prefix="tools">
<qresource prefix="tools" >
<file>tools_add.png</file>
<file>tools_alert.png</file>
</qresource>
<qresource prefix="themes">
<qresource prefix="themes" >
<file>theme_delete.png</file>
<file>theme_new.png</file>
<file>theme_edit.png</file>

BIN
resources/images/slide_blank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 717 B

BIN
resources/images/slide_desktop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 696 B

BIN
resources/images/slide_theme.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 815 B