From b1766d7ee47b9c39fc44094e071f426a2a9ebabf Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 14 Nov 2009 09:41:11 +0000 Subject: [PATCH] ServiceItem cleanup - sort out name format errors --- openlp/core/lib/serviceitem.py | 16 +++++----- openlp/core/ui/servicemanager.py | 8 ++--- openlp/core/ui/slidecontroller.py | 42 +++++++++++++------------- openlp/plugins/custom/lib/mediaitem.py | 4 +-- openlp/plugins/songs/lib/mediaitem.py | 3 +- 5 files changed, 36 insertions(+), 37 deletions(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 4896f365c..92a24d173 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -67,7 +67,7 @@ class ServiceItem(object): self.theme = None self.service_item_path = None self.service_item_type = None - self.editEnabled = False + self.edit_enabled = False self._raw_frames = [] self._display_frames = [] self._uuid = unicode(uuid.uuid1()) @@ -262,22 +262,22 @@ class ServiceItem(object): """ return self._uuid != other._uuid - def isSong(self): + def is_song(self): return self.name == u'Songs' - def isMedia(self): + def is_media(self): return self.name.lower() == u'media' - def isCommand(self): + def is_command(self): return self.service_item_type == ServiceItemType.Command - def isImage(self): + def is_image(self): return self.service_item_type == ServiceItemType.Image - def isText(self): + def is_text(self): return self.service_item_type == ServiceItemType.Text - def getFrames(self): + def get_frames(self): if self.service_item_type == ServiceItemType.Text: return self._display_frames else: @@ -297,4 +297,4 @@ class ServiceItem(object): """ Returns the title of the raw frame """ - return self._raw_frames[row][u'title'] + return self._raw_frames[row][u'title'] \ No newline at end of file diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index c1c260a56..3e438d918 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -48,7 +48,7 @@ class ServiceManagerList(QtGui.QTreeWidget): # else: # pos = parentitem.data(0, QtCore.Qt.UserRole).toInt()[0] # serviceItem = self.parent.serviceItems[pos - 1] -# if serviceItem[u'data'].editEnabled: +# if serviceItem[u'data'].edit_enabled: # self.parent.editAction.setVisible(True) # else: # self.parent.editAction.setVisible(False) @@ -395,7 +395,7 @@ class ServiceManager(QtGui.QWidget): treewidgetitem.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(item[u'order'])) treewidgetitem.setExpanded(item[u'expanded']) - for count, frame in enumerate(serviceitem.getFrames()): + for count, frame in enumerate(serviceitem.get_frames()): treewidgetitem1 = QtGui.QTreeWidgetItem(treewidgetitem) text = frame[u'title'] treewidgetitem1.setText(0,text[:40]) @@ -597,7 +597,7 @@ class ServiceManager(QtGui.QWidget): Posts a remote edit message to a plugin to allow item to be edited. """ item, count = self.findServiceItem() - if self.serviceItems[item][u'service_item'].editEnabled: + if self.serviceItems[item][u'service_item'].edit_enabled: self.remoteEditTriggered = True Receiver().send_message(u'%s_edit' % self.serviceItems[item][u'service_item'].name, u'L:%s' % self.serviceItems[item][u'service_item'].editId ) @@ -699,4 +699,4 @@ class ServiceManager(QtGui.QWidget): theme = unicode(self.sender().text()) item, count = self.findServiceItem() self.serviceItems[item][u'service_item'].theme = theme - self.regenerateServiceItems() + self.regenerateServiceItems() \ No newline at end of file diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 138cdaae8..396f0fa7b 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -345,9 +345,9 @@ class SlideController(QtGui.QWidget): self.Songbar.setVisible(False) self.Mediabar.setVisible(False) self.Toolbar.makeWidgetsInvisible(self.image_list) - if item.isText(): + if item.is_text(): self.Toolbar.makeWidgetsInvisible(self.image_list) - if item.isSong() and \ + if item.is_song() and \ str_to_bool(self.songsconfig.get_config(u'display songbar', True)): for action in self.Songbar.actions: self.Songbar.actions[action].setVisible(False) @@ -362,11 +362,11 @@ class SlideController(QtGui.QWidget): #More than 20 verses hard luck pass self.Songbar.setVisible(True) - elif item.isImage(): + elif item.is_image(): #Not sensible to allow loops with 1 frame - if len(item.getFrames()) > 1: + if len(item.get_frames()) > 1: self.Toolbar.makeWidgetsVisible(self.image_list) - elif item.isMedia(): + elif item.is_media(): self.Toolbar.setVisible(False) self.Mediabar.setVisible(True) self.volumeSlider.setAudioOutput(self.parent.mainDisplay.audio) @@ -378,9 +378,9 @@ class SlideController(QtGui.QWidget): self.Toolbar.setVisible(True) self.Mediabar.setVisible(False) self.Toolbar.makeWidgetsInvisible(self.song_edit_list) - if item.editEnabled and item.fromPlugin: + if item.edit_enabled and item.fromPlugin: self.Toolbar.makeWidgetsVisible(self.song_edit_list) - elif item.isMedia(): + elif item.is_media(): self.Toolbar.setVisible(False) self.Mediabar.setVisible(True) self.volumeSlider.setAudioOutput(self.audio) @@ -400,14 +400,14 @@ class SlideController(QtGui.QWidget): item.render() log.log(15, u'Rendering took %4s' % (time.time() - before)) self.enableToolBar(item) - if item.isCommand(): + if item.is_command(): self.wasCommandItem = True if self.isLive: Receiver().send_message(u'%s_start' % item.name.lower(), \ [item.shortname, item.service_item_path, item.service_frames[0][u'title'], self.isLive]) else: - if item.isMedia(): + if item.is_media(): self.onMediaStart(item) slideno = 0 if self.songEdit: @@ -434,14 +434,14 @@ class SlideController(QtGui.QWidget): self.onMediaStop() self.wasCommandItem = False self.enableToolBar(item) - if item.isCommand(): + if item.is_command(): self.wasCommandItem = False if self.isLive: Receiver().send_message(u'%s_start' % item.name.lower(), \ [item.shortname, item.service_item_path, item.service_frames[0][u'title'], slideno, self.isLive]) else: - if item.isMedia(): + if item.is_media(): self.onMediaStart(item) self.displayServiceManagerItems(item, slideno) @@ -459,13 +459,13 @@ class SlideController(QtGui.QWidget): self.PreviewListWidget.clear() self.PreviewListWidget.setRowCount(0) self.PreviewListWidget.setColumnWidth(0, width) - for framenumber, frame in enumerate(self.serviceItem.getFrames()): + for framenumber, frame in enumerate(self.serviceItem.get_frames()): self.PreviewListWidget.setRowCount( self.PreviewListWidget.rowCount() + 1) item = QtGui.QTableWidgetItem() slide_height = 0 #It is a Image - if not self.serviceItem.isText(): + if not self.serviceItem.is_text(): label = QtGui.QLabel() label.setMargin(4) pixmap = self.parent.RenderManager.resize_image(frame[u'image']) @@ -478,7 +478,7 @@ class SlideController(QtGui.QWidget): self.PreviewListWidget.setItem(framenumber, 0, item) if slide_height != 0: self.PreviewListWidget.setRowHeight(framenumber, slide_height) - if self.serviceItem.isText(): + if self.serviceItem.is_text(): self.PreviewListWidget.resizeRowsToContents() self.PreviewListWidget.setColumnWidth( 0, self.PreviewListWidget.viewport().size().width()) @@ -498,7 +498,7 @@ class SlideController(QtGui.QWidget): """ Go to the first slide. """ - if self.serviceItem.isCommand(): + if self.serviceItem.is_command(): Receiver().send_message(u'%s_first'% self.serviceItem.name.lower()) self.updatePreview() else: @@ -509,7 +509,7 @@ class SlideController(QtGui.QWidget): """ Blank the screen. """ - if self.serviceItem.isCommand(): + if self.serviceItem.is_command(): if blanked: Receiver().send_message(u'%s_blank'% self.serviceItem.name.lower()) else: @@ -525,7 +525,7 @@ class SlideController(QtGui.QWidget): row = self.PreviewListWidget.currentRow() self.row = 0 if row > -1 and row < self.PreviewListWidget.rowCount(): - if self.serviceItem.isCommand(): + if self.serviceItem.is_command(): Receiver().send_message(u'%s_slide'% self.serviceItem.name.lower(), [row]) if self.isLive: self.updatePreview() @@ -568,7 +568,7 @@ class SlideController(QtGui.QWidget): """ Go to the next slide. """ - if self.serviceItem.isCommand(): + if self.serviceItem.is_command(): Receiver().send_message(u'%s_next'% self.serviceItem.name.lower()) self.updatePreview() else: @@ -582,7 +582,7 @@ class SlideController(QtGui.QWidget): """ Go to the previous slide. """ - if self.serviceItem.isCommand(): + if self.serviceItem.is_command(): Receiver().send_message( u'%s_previous'% self.serviceItem.name.lower()) self.updatePreview() @@ -597,7 +597,7 @@ class SlideController(QtGui.QWidget): """ Go to the last slide. """ - if self.serviceItem.isCommand(): + if self.serviceItem.is_command(): Receiver().send_message(u'%s_last'% self.serviceItem.name.lower()) self.updatePreview() else: @@ -667,4 +667,4 @@ class SlideController(QtGui.QWidget): self.mediaObject.stop() self.video.hide() self.SlidePreview.clear() - self.SlidePreview.show() + self.SlidePreview.show() \ No newline at end of file diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 8b86ab290..dbd7db643 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -145,7 +145,7 @@ class CustomMediaItem(MediaManagerItem): customSlide = self.parent.custommanager.get_custom(item_id) title = customSlide.title credit = customSlide.credits - service_item.editEnabled = True + service_item.edit_enabled = True service_item.editId = item_id theme = customSlide.theme_name if len(theme) is not 0 : @@ -159,4 +159,4 @@ class CustomMediaItem(MediaManagerItem): for slide in raw_slides: service_item.add_from_text(slide[:30], slide) service_item.raw_footer = raw_footer - return True + return True \ No newline at end of file diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index f69faed8b..000f752af 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -287,7 +287,7 @@ class SongMediaItem(MediaManagerItem): item_id = self.remoteSong song = self.parent.songmanager.get_song(item_id) service_item.theme = song.theme_name - service_item.editEnabled = True + service_item.edit_enabled = True service_item.editId = item_id service_item.verse_order = song.verse_order if song.lyrics.startswith(u'