From 68287b960405904c886aaba4656a4a5ef309a388 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 11 Mar 2010 19:28:49 +0000 Subject: [PATCH 1/4] String fixes --- openlp/plugins/songusage/forms/songusagedeletedialog.py | 2 +- openlp/plugins/songusage/forms/songusagedetaildialog.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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')) From 2607d23c002ff761849a9ca698ec87888693c7fc Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 11 Mar 2010 21:01:19 +0000 Subject: [PATCH 2/4] String more strings and song edit error --- openlp/plugins/songs/forms/editverseform.py | 2 +- .../songs/forms/songmaintenanceform.py | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) 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..713cd55a8 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!')) From cd873b919697178bd3b7bf8a853937bf39b8f92e Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 12 Mar 2010 07:31:59 +0000 Subject: [PATCH 3/4] add full stops --- openlp/plugins/images/imageplugin.py | 2 +- .../plugins/songs/forms/songmaintenanceform.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) 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/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py index 713cd55a8..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'), + 'assigned to at least one song.'), self.trUtf8('No book selected!')) From c7c1a9c06ad8dfeb9cfeb3ccca254ba1e9736ed6 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 12 Mar 2010 17:38:56 +0200 Subject: [PATCH 4/4] Added icons for: - Blank Screen - Show Desktop - Show Theme Background --- openlp/core/ui/slidecontroller.py | 2 +- resources/images/openlp-2.qrc | 37 ++++++++++++++++------------- resources/images/slide_blank.png | Bin 0 -> 717 bytes resources/images/slide_desktop.png | Bin 0 -> 696 bytes resources/images/slide_theme.png | Bin 0 -> 815 bytes 5 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 resources/images/slide_blank.png create mode 100644 resources/images/slide_desktop.png create mode 100644 resources/images/slide_theme.png 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/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 0000000000000000000000000000000000000000..a878468c6b63629e12c7414cc82db6414f62b65b GIT binary patch literal 717 zcmV;;0y6!HP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2igM+ z4;~9T$nom{00K=(L_t(I%YBl|P82~DhQF>$PtPEknE(=&7>CHtnBdASZ$Q{0dlPvB zgHM2o>`8D%*pv7KM2xK1O)$iTGtx{qGE85prrHJeaMhDk>MZJf|DRL8x3{;qGBGi+ zQLR=RLI^z18=bO>q8Q!IIf|knP1E@F^mNVJ-`|fuZErVv7Xy6XM^`jj`Di5(LIB{L z!`dO%T5@B^^PJ|R8mp_XV^yow8l6sur>zzb)fGfSMPseST1B_}o8uonYPDKJl?qW5 zjTD6tqh88uCs~%!>2z?;;fw)56-9xymR_%SYq;Ep5CZ2MaU7E*2}&un)(q_pKtVwm zhPRZ35J)Mxyu2iiV*s?)1VMn5675&60YMOOeEj_$Ac`WgEE}o%zK<~mr4-GH3Pn*| z0eZb2-EJ2tB>=`4&d<+LN+G4h_kAjr3R#wsrYS)X5L9bd4gjnj5{BWu9~cgYBVeBA zD5XX&>WwCz=UoAe$@yOyV=%@brNkIRnx;(8{9R&_B=PL*lSVu+C?(KRqm@J{i4+nK z59=(}4l%z?8_j03aWlGQWXpx#jd#C)5g#0UUGx6oT5N7^ zzNy#iAM!ls^6y?Als~aa6h>7lH00000NkvXXu0mjflOHv( literal 0 HcmV?d00001 diff --git a/resources/images/slide_desktop.png b/resources/images/slide_desktop.png new file mode 100644 index 0000000000000000000000000000000000000000..e5655f5236ebc2750fb6ffaf3be21b8183e332c6 GIT binary patch literal 696 zcmV;p0!RIcP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00VXa00VXbebs`@00007bV*G`2iOQ1 z2_gW8yBe7Q00KBkL_t(|+LcpHiyA=?t)3abRt0rTApal-@unwXbBMXe+ujy(O@u%$ zf|osKAz<q2*ARjr1W)2s0uuJ%?(FD}x_*q)dDSzc$wCfkEW2yE-mBNu)uP+& zo|&fkF_lW0grR8~2_ck)LrNLW$~@1b^?Gehr_(p0-|ydaIvvxpEJ`F26pO_u8jVsU z5+PmJ8K(fQ>(Xwwqs?Z+V9I8*RIAl2BbiK^i9tQqJ&}cNCR;$(bkbR0Hr04TFOXj2S+gRXjd>;;n7xjAmM~E^0BtXVz>2&%< zE|-h)6=gCRzHbH-{1hJCb13?P&;x;Zs0iT4l}hEbR4P3wm&+Ms7lXlI*6a1IzG2K} evuni35bzuGg&>iM2rO~{0000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00VXa00VXbebs`@00007bV*G`2igM+ z4<92IW@u0V00OT`L_t(I%axK%Ya~?^hM!v>UDaLP+Fex{qhTPp5Me@g$tpN5j5{~M z&HM)q2yOz|I9mlF&L4>XATZg91PKI(EF=WPk%kzIOuAD^ch^VXs=8IzMd-u3!8z$?H@VVFRbK#{>TheSeB!lc3&jHw=009XK3 zRUwQqxC%ZQLOX@C3H)#gWS}MFIZ%VD5W1kM=5GNrQ;P5vmraehm@@b99YjZhz5-&f zCM3;->pTIWkZuF5-?|65uFLnsGrYth`DKEkU!sdC=_uynCMAkf(j>-E1q}m|e1g9u z?g2M9H~e_K+P4YtEW*J)RTMx>zD5W?*KmT@n zd;81VAiS>E09#vI@2{_~e{C4XW7l;%ZnujN0^7FHTDPMp`ba7D9C-1s9{|Gl{ReAnYmZk}R^DD+UF|xK tBaV-cM~8=pe;phg9E?VzA)sdqe*@Z{U&e+k@d5w<002ovPDHLkV1g~WY25$- literal 0 HcmV?d00001