diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 18cf1fb9a..f591591f3 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -85,9 +85,15 @@ class SlideController(QtGui.QWidget): u'Media Stop', u'Media Pause' ] - self.song_list = [ + self.song_edit_list = [ u'Edit Song', ] + self.song_list = [ + u'First Slide', + u'Previous Slide', + u'Next Slide', + u'Last Slide', + ] self.timer_id = 0 self.commandItem = None self.songEdit = False @@ -195,16 +201,16 @@ class SlideController(QtGui.QWidget): if isLive: self.Songbar = OpenLPToolbar(self) self.Songbar.addToolbarButton( - u'Bridge', u':/slides/slide_close.png', + u'Bridge', u':/pages/page_bridge.png', self.trUtf8(u'Bridge'), self.onSongBarHandler) self.Songbar.addToolbarButton( - u'Chorus', u':/slides/slide_close.png', + u'Chorus', u':/pages/page_chorus.png', self.trUtf8(u'Chorus'), self.onSongBarHandler) - for verse in range(1, 20): + for verse in range(1, 12): self.Songbar.addToolbarButton( - unicode(verse), u':/slides/slide_close.png', + unicode(verse), u':/pages/page_%s.png' % verse, unicode(self.trUtf8(u'Verse %s'))%verse, self.onSongBarHandler) self.ControllerLayout.addWidget(self.Songbar) @@ -252,7 +258,7 @@ class SlideController(QtGui.QWidget): self.Toolbar.makeWidgetsInvisible(self.image_list) self.Toolbar.makeWidgetsInvisible(self.media_list) else: - self.Toolbar.makeWidgetsInvisible(self.song_list) + self.Toolbar.makeWidgetsInvisible(self.song_edit_list) if isLive: prefix = u'live_slidecontroller' else: @@ -303,6 +309,7 @@ class SlideController(QtGui.QWidget): self.Songbar.setVisible(False) self.Toolbar.makeWidgetsInvisible(self.image_list) self.Toolbar.makeWidgetsInvisible(self.media_list) + self.Toolbar.makeWidgetsVisible(self.song_list) if item.service_item_type == ServiceItemType.Text: self.Toolbar.makeWidgetsInvisible(self.image_list) if item.name == u'Songs' and \ @@ -312,6 +319,8 @@ class SlideController(QtGui.QWidget): if item.verse_order: verses = item.verse_order.split(u' ') for verse in verses: + if int(verse) > 12: + break try: self.Songbar.actions[verse].setVisible(True) except: @@ -324,6 +333,7 @@ class SlideController(QtGui.QWidget): self.Toolbar.makeWidgetsVisible(self.image_list) elif item.service_item_type == ServiceItemType.Command and \ item.name == u'Media': + self.Toolbar.makeWidgetsInvisible(self.song_list) self.Toolbar.makeWidgetsVisible(self.media_list) def enablePreviewToolBar(self, item): @@ -331,9 +341,9 @@ class SlideController(QtGui.QWidget): Allows the Preview toolbar to be customised """ if (item.name == u'Songs' or item.name == u'Custom') and item.fromPlugin: - self.Toolbar.makeWidgetsVisible(self.song_list) + self.Toolbar.makeWidgetsVisible(self.song_edit_list) else: - self.Toolbar.makeWidgetsInvisible(self.song_list) + self.Toolbar.makeWidgetsInvisible(self.song_edit_list) def addServiceItem(self, item): """ @@ -393,6 +403,8 @@ class SlideController(QtGui.QWidget): Display the slide number passed """ log.debug(u'displayServiceManagerItems Start') + #Set pointing cursor when we have somthing to point at + self.PreviewListWidget.setCursor(QtCore.Qt.PointingHandCursor) before = time.time() self.serviceitem = serviceitem self.PreviewListWidget.clear() @@ -499,7 +511,7 @@ class SlideController(QtGui.QWidget): else: label = self.PreviewListWidget.cellWidget(self.PreviewListWidget.currentRow(), 0) self.SlidePreview.setPixmap(label.pixmap()) - + def grabMainDisplay(self): rm = self.parent.RenderManager winid = QtGui.QApplication.desktop().winId() diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index f7e6f095f..dba2fcd54 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -126,4 +126,20 @@ theme_export.png theme_import.png + + page_chorus.png + page_bridge.png + page_1.png + page_2.png + page_3.png + page_4.png + page_5.png + page_6.png + page_7.png + page_8.png + page_9.png + page_10.png + page_11.png + page_12.png + diff --git a/resources/images/page_1.png b/resources/images/page_1.png new file mode 100644 index 000000000..091ab47f0 Binary files /dev/null and b/resources/images/page_1.png differ diff --git a/resources/images/page_10.png b/resources/images/page_10.png new file mode 100644 index 000000000..a4b2f7491 Binary files /dev/null and b/resources/images/page_10.png differ diff --git a/resources/images/page_11.png b/resources/images/page_11.png new file mode 100644 index 000000000..a4b2f7491 Binary files /dev/null and b/resources/images/page_11.png differ diff --git a/resources/images/page_12.png b/resources/images/page_12.png new file mode 100644 index 000000000..a4b2f7491 Binary files /dev/null and b/resources/images/page_12.png differ diff --git a/resources/images/page_2.png b/resources/images/page_2.png new file mode 100644 index 000000000..c4661947f Binary files /dev/null and b/resources/images/page_2.png differ diff --git a/resources/images/page_3.png b/resources/images/page_3.png new file mode 100644 index 000000000..30f65b2d9 Binary files /dev/null and b/resources/images/page_3.png differ diff --git a/resources/images/page_4.png b/resources/images/page_4.png new file mode 100644 index 000000000..7749bc3c3 Binary files /dev/null and b/resources/images/page_4.png differ diff --git a/resources/images/page_5.png b/resources/images/page_5.png new file mode 100644 index 000000000..065dfa293 Binary files /dev/null and b/resources/images/page_5.png differ diff --git a/resources/images/page_6.png b/resources/images/page_6.png new file mode 100644 index 000000000..a4b2f7491 Binary files /dev/null and b/resources/images/page_6.png differ diff --git a/resources/images/page_7.png b/resources/images/page_7.png new file mode 100644 index 000000000..a4b2f7491 Binary files /dev/null and b/resources/images/page_7.png differ diff --git a/resources/images/page_8.png b/resources/images/page_8.png new file mode 100644 index 000000000..a4b2f7491 Binary files /dev/null and b/resources/images/page_8.png differ diff --git a/resources/images/page_9.png b/resources/images/page_9.png new file mode 100644 index 000000000..a4b2f7491 Binary files /dev/null and b/resources/images/page_9.png differ diff --git a/resources/images/page_bridge.png b/resources/images/page_bridge.png new file mode 100644 index 000000000..7d81a4a71 Binary files /dev/null and b/resources/images/page_bridge.png differ diff --git a/resources/images/page_chorus.png b/resources/images/page_chorus.png new file mode 100644 index 000000000..80c3a6d53 Binary files /dev/null and b/resources/images/page_chorus.png differ diff --git a/version.txt b/version.txt index 8544e3d2f..fce790b57 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.9.0-662 +1.9.0-663