From d5a4cbd900fe23fa8f5e52030e8304dafd06b004 Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Fri, 9 Nov 2012 22:44:25 +0400 Subject: [PATCH 01/12] Autoplay slides ffuture --- openlp/core/lib/serviceitem.py | 10 +++ openlp/core/ui/servicemanager.py | 101 ++++++++++++++++++++++++++++++ openlp/core/ui/slidecontroller.py | 18 ++++-- 3 files changed, 125 insertions(+), 4 deletions(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 080e74d49..5f8e1aef2 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -123,6 +123,10 @@ class ServiceItem(object): self.background_audio = [] self.theme_overwritten = False self.temporary_edit = False + self.AutoPlaySlidesOnce = False + self.AutoPlaySlidesLoop = False + self.TimedSlideInterval = 0 + self._new_item() def _new_item(self): @@ -276,6 +280,9 @@ class ServiceItem(object): u'search': self.search_string, u'data': self.data_string, u'xml_version': self.xml_version, + u'AutoPlaySlidesOnce': self.AutoPlaySlidesOnce, + u'AutoPlaySlidesLoop': self.AutoPlaySlidesLoop, + u'TimedSlideInterval': self.TimedSlideInterval, u'start_time': self.start_time, u'end_time': self.end_time, u'media_length': self.media_length, @@ -342,6 +349,9 @@ class ServiceItem(object): filename = os.path.join(path, text_image[u'title']) self.add_from_command( path, text_image[u'title'], text_image[u'image']) + self.AutoPlaySlidesOnce = header.get(u'AutoPlaySlidesOnce', False) + self.AutoPlaySlidesLoop = header.get(u'AutoPlaySlidesLoop', False) + self.TimedSlideInterval = header.get(u'TimedSlideInterval', 0) self._new_item() def get_display_title(self): diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 50f38ade2..8bfadf3b1 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -309,6 +309,25 @@ class ServiceManager(QtGui.QWidget): icon=u':/media/media_time.png', triggers=self.onStartTimeForm) # Add already existing delete action to the menu. self.menu.addAction(self.serviceManagerList.delete) + self.menu.addSeparator() + # Add AutoPlay menu actions + self.AutoPlaySlidesGroup = QtGui.QMenu( + translate('OpenLP.ServiceManager', '&Auto play slides')) + self.menu.addMenu(self.AutoPlaySlidesGroup) + self.AutoPlaySlidesLoop = create_widget_action(self.AutoPlaySlidesGroup, + text=translate('OpenLP.ServiceManager', '&Auto play slides Loop'), + checked=False, + triggers=self.toggleAutoPlaySlidesLoop) + self.AutoPlaySlidesOnce = create_widget_action(self.AutoPlaySlidesGroup, + text=translate('OpenLP.ServiceManager', '&Auto play slides once'), + checked=False, + triggers=self.toggleAutoPlaySlidesOnce) + self.AutoPlaySlidesGroup.addSeparator() + self.TimedSlideInterval = create_widget_action(self.AutoPlaySlidesGroup, + text=translate('OpenLP.ServiceManager', '&Delay between slides'), + checked=False, + triggers=self.onTimedSlideInterval) + self.menu.addSeparator() self.previewAction = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', 'Show &Preview'), @@ -765,6 +784,29 @@ class ServiceManager(QtGui.QWidget): self.maintainAction.setVisible(True) if item.parent() is None: self.notesAction.setVisible(True) + if serviceItem[u'service_item'].is_capable(ItemCapabilities.CanLoop) and \ + len(serviceItem[u'service_item'].get_frames()) > 1: + self.AutoPlaySlidesGroup.menuAction().setVisible(True) + self.AutoPlaySlidesOnce\ + .setChecked(serviceItem[u'service_item'].AutoPlaySlidesOnce) + self.AutoPlaySlidesLoop\ + .setChecked(serviceItem[u'service_item'].AutoPlaySlidesLoop) + self.TimedSlideInterval\ + .setChecked(serviceItem[u'service_item'].TimedSlideInterval > 0) + if serviceItem[u'service_item'].TimedSlideInterval > 0: + DelaySuffix = u' ' + DelaySuffix += str(serviceItem[u'service_item'].TimedSlideInterval) + DelaySuffix += u' s' + else: + DelaySuffix = u' ...' + self.TimedSlideInterval.setText(translate('OpenLP.ServiceManager', + '&Delay between slides')+DelaySuffix) + #self.AutoPlaySlidesGroup.setChecked( + # serviceItem[u'service_item'].TimedSlideInterval > 0 and + # (serviceItem[u'service_item'].AutoPlaySlidesOnce or + # serviceItem[u'service_item'].AutoPlaySlidesLoop)) + else: + self.AutoPlaySlidesGroup.menuAction().setVisible(False) if serviceItem[u'service_item']\ .is_capable(ItemCapabilities.HasVariableStartTime): self.timeAction.setVisible(True) @@ -802,6 +844,62 @@ class ServiceManager(QtGui.QWidget): if self.startTimeForm.exec_(): self.repaintServiceList(item, -1) + def toggleAutoPlaySlidesOnce(self): + """ + Toggle Auto play slide once. + """ + item = self.findServiceItem()[0] + service_item = self.serviceItems[item][u'service_item'] + service_item.AutoPlaySlidesOnce = not service_item.AutoPlaySlidesOnce + if service_item.AutoPlaySlidesOnce: + service_item.AutoPlaySlidesLoop = False + self.AutoPlaySlidesLoop.setChecked(False) + if service_item.AutoPlaySlidesOnce and service_item.TimedSlideInterval == 0: + service_item.TimedSlideInterval = Settings().value(u'loop delay', + QtCore.QVariant(5)).toInt()[0] + self.setModified() + + def toggleAutoPlaySlidesLoop(self): + """ + Toggle Auto play slide loop. + """ + item = self.findServiceItem()[0] + service_item = self.serviceItems[item][u'service_item'] + service_item.AutoPlaySlidesLoop = not service_item.AutoPlaySlidesLoop + if service_item.AutoPlaySlidesLoop: + service_item.AutoPlaySlidesOnce = False + self.AutoPlaySlidesOnce.setChecked(False) + if service_item.AutoPlaySlidesLoop and service_item.TimedSlideInterval == 0: + service_item.TimedSlideInterval = Settings().value(u'loop delay', + QtCore.QVariant(5)).toInt()[0] + self.setModified() + + def onTimedSlideInterval(self): + """ + on set times slide interval. + """ + item = self.findServiceItem()[0] + service_item = self.serviceItems[item][u'service_item'] + if service_item.TimedSlideInterval == 0: + TimedSlideInterval = Settings().value(u'loop delay', + QtCore.QVariant(5)).toInt()[0] + else: + TimedSlideInterval = service_item.TimedSlideInterval + TimedSlideInterval, ok = QtGui.QInputDialog.getInteger(self, + self.tr(translate('OpenLP.ServiceManager', 'Inpunt delay')), + self.tr(translate('OpenLP.ServiceManager', + 'Delay between slides in seconds.')), TimedSlideInterval, 0, 180, 1) + if ok: + service_item.TimedSlideInterval = TimedSlideInterval + if service_item.TimedSlideInterval <> 0\ + and not service_item.AutoPlaySlidesLoop\ + and not service_item.AutoPlaySlidesOnce: + service_item.AutoPlaySlidesLoop = True + elif service_item.TimedSlideInterval == 0: + service_item.AutoPlaySlidesLoop = False + service_item.AutoPlaySlidesOnce = False + self.setModified() + def onServiceItemEditForm(self): """ Opens a dialog to edit the service item and update the service @@ -1305,7 +1403,10 @@ class ServiceManager(QtGui.QWidget): ItemCapabilities.CanPreview): self.mainwindow.previewController.addServiceManagerItem( self.serviceItems[item][u'service_item'], 0) + NextItem = self.serviceManagerList.topLevelItem(item) + self.serviceManagerList.setCurrentItem(NextItem) self.mainwindow.liveController.previewListWidget.setFocus() + self.mainwindow.liveController.onToggleLoop() else: critical_error_message_box( translate('OpenLP.ServiceManager', 'Missing Display Handler'), diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 996fd8af2..7330e427f 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -778,6 +778,16 @@ class SlideController(Controller): self.slideSelected() else: self._processItem(item, slidenum) + if self.isLive and item.AutoPlaySlidesLoop\ + and item.TimedSlideInterval > 0: + self.playSlidesLoop.setChecked(item.AutoPlaySlidesLoop) + self.delaySpinBox.setValue(int(item.TimedSlideInterval)) + self.onPlaySlidesLoop() + elif self.isLive and item.AutoPlaySlidesOnce\ + and item.TimedSlideInterval > 0: + self.playSlidesOnce.setChecked(item.AutoPlaySlidesOnce) + self.delaySpinBox.setValue(int(item.TimedSlideInterval)) + self.onPlaySlidesOnce() def _processItem(self, serviceItem, slideno): """ @@ -1255,11 +1265,11 @@ class SlideController(Controller): self.playSlidesLoop.setText(UiStrings().StopPlaySlidesInLoop) self.playSlidesOnce.setIcon(build_icon(u':/media/media_time.png')) self.playSlidesOnce.setText(UiStrings().PlaySlidesToEnd) + self.playSlidesMenu.setDefaultAction(self.playSlidesLoop) + self.playSlidesOnce.setChecked(False) else: self.playSlidesLoop.setIcon(build_icon(u':/media/media_time.png')) self.playSlidesLoop.setText(UiStrings().PlaySlidesInLoop) - self.playSlidesMenu.setDefaultAction(self.playSlidesLoop) - self.playSlidesOnce.setChecked(False) self.onToggleLoop() def onPlaySlidesOnce(self, checked=None): @@ -1276,11 +1286,11 @@ class SlideController(Controller): self.playSlidesOnce.setText(UiStrings().StopPlaySlidesToEnd) self.playSlidesLoop.setIcon(build_icon(u':/media/media_time.png')) self.playSlidesLoop.setText(UiStrings().PlaySlidesInLoop) + self.playSlidesMenu.setDefaultAction(self.playSlidesOnce) + self.playSlidesLoop.setChecked(False) else: self.playSlidesOnce.setIcon(build_icon(u':/media/media_time')) self.playSlidesOnce.setText(UiStrings().PlaySlidesToEnd) - self.playSlidesMenu.setDefaultAction(self.playSlidesOnce) - self.playSlidesLoop.setChecked(False) self.onToggleLoop() def setAudioItemsVisibility(self, visible): From 4af902e74d0e37b921b368c4780448673f042306 Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Tue, 13 Nov 2012 12:11:49 +0400 Subject: [PATCH 02/12] Some fixes for autoplay --- openlp/core/ui/servicemanager.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 8bfadf3b1..118f65b92 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -315,11 +315,11 @@ class ServiceManager(QtGui.QWidget): translate('OpenLP.ServiceManager', '&Auto play slides')) self.menu.addMenu(self.AutoPlaySlidesGroup) self.AutoPlaySlidesLoop = create_widget_action(self.AutoPlaySlidesGroup, - text=translate('OpenLP.ServiceManager', '&Auto play slides Loop'), + text=translate('OpenLP.ServiceManager', 'Auto play slides &Loop'), checked=False, triggers=self.toggleAutoPlaySlidesLoop) self.AutoPlaySlidesOnce = create_widget_action(self.AutoPlaySlidesGroup, - text=translate('OpenLP.ServiceManager', '&Auto play slides once'), + text=translate('OpenLP.ServiceManager', 'Auto play slides &Once'), checked=False, triggers=self.toggleAutoPlaySlidesOnce) self.AutoPlaySlidesGroup.addSeparator() @@ -795,12 +795,12 @@ class ServiceManager(QtGui.QWidget): .setChecked(serviceItem[u'service_item'].TimedSlideInterval > 0) if serviceItem[u'service_item'].TimedSlideInterval > 0: DelaySuffix = u' ' - DelaySuffix += str(serviceItem[u'service_item'].TimedSlideInterval) + DelaySuffix += unicode(serviceItem[u'service_item'].TimedSlideInterval) DelaySuffix += u' s' else: DelaySuffix = u' ...' self.TimedSlideInterval.setText(translate('OpenLP.ServiceManager', - '&Delay between slides')+DelaySuffix) + '&Delay between slides') + DelaySuffix) #self.AutoPlaySlidesGroup.setChecked( # serviceItem[u'service_item'].TimedSlideInterval > 0 and # (serviceItem[u'service_item'].AutoPlaySlidesOnce or @@ -886,9 +886,9 @@ class ServiceManager(QtGui.QWidget): else: TimedSlideInterval = service_item.TimedSlideInterval TimedSlideInterval, ok = QtGui.QInputDialog.getInteger(self, - self.tr(translate('OpenLP.ServiceManager', 'Inpunt delay')), - self.tr(translate('OpenLP.ServiceManager', - 'Delay between slides in seconds.')), TimedSlideInterval, 0, 180, 1) + translate('OpenLP.ServiceManager', 'Input delay'), + translate('OpenLP.ServiceManager', + 'Delay between slides in seconds.'), TimedSlideInterval, 0, 180, 1) if ok: service_item.TimedSlideInterval = TimedSlideInterval if service_item.TimedSlideInterval <> 0\ @@ -1406,7 +1406,6 @@ class ServiceManager(QtGui.QWidget): NextItem = self.serviceManagerList.topLevelItem(item) self.serviceManagerList.setCurrentItem(NextItem) self.mainwindow.liveController.previewListWidget.setFocus() - self.mainwindow.liveController.onToggleLoop() else: critical_error_message_box( translate('OpenLP.ServiceManager', 'Missing Display Handler'), From 77807518077ba5714f7f147a79cf33ca4002309f Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Tue, 13 Nov 2012 12:32:09 +0400 Subject: [PATCH 03/12] all methods renamed by standard. --- openlp/core/ui/servicemanager.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 118f65b92..2ed9a7d9e 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -317,16 +317,16 @@ class ServiceManager(QtGui.QWidget): self.AutoPlaySlidesLoop = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', 'Auto play slides &Loop'), checked=False, - triggers=self.toggleAutoPlaySlidesLoop) + triggers=self.toggle_auto_play_slides_loop) self.AutoPlaySlidesOnce = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', 'Auto play slides &Once'), checked=False, - triggers=self.toggleAutoPlaySlidesOnce) + triggers=self.toggle_auto_play_slides_once) self.AutoPlaySlidesGroup.addSeparator() self.TimedSlideInterval = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', '&Delay between slides'), checked=False, - triggers=self.onTimedSlideInterval) + triggers=self.on_timed_slide_interval) self.menu.addSeparator() self.previewAction = create_widget_action(self.menu, @@ -844,9 +844,10 @@ class ServiceManager(QtGui.QWidget): if self.startTimeForm.exec_(): self.repaintServiceList(item, -1) - def toggleAutoPlaySlidesOnce(self): + def toggle_auto_play_slides_once(self): """ Toggle Auto play slide once. + Inverts auto play once option for the item """ item = self.findServiceItem()[0] service_item = self.serviceItems[item][u'service_item'] @@ -859,7 +860,7 @@ class ServiceManager(QtGui.QWidget): QtCore.QVariant(5)).toInt()[0] self.setModified() - def toggleAutoPlaySlidesLoop(self): + def toggle_auto_play_slides_loop(self): """ Toggle Auto play slide loop. """ @@ -874,9 +875,10 @@ class ServiceManager(QtGui.QWidget): QtCore.QVariant(5)).toInt()[0] self.setModified() - def onTimedSlideInterval(self): + def on_timed_slide_interval(self): """ on set times slide interval. + Shows input dialog for enter interval in seconds for delay """ item = self.findServiceItem()[0] service_item = self.serviceItems[item][u'service_item'] From 2f34b5ddf2232fb5e0c68521cb5e3e49b7c0d3b8 Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Wed, 14 Nov 2012 15:47:15 +0400 Subject: [PATCH 04/12] Renamed all variables by standard. --- openlp/core/lib/serviceitem.py | 19 ++++--- openlp/core/ui/servicemanager.py | 84 +++++++++++++++---------------- openlp/core/ui/slidecontroller.py | 16 +++--- 3 files changed, 59 insertions(+), 60 deletions(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 5f8e1aef2..ffeec3383 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -123,10 +123,9 @@ class ServiceItem(object): self.background_audio = [] self.theme_overwritten = False self.temporary_edit = False - self.AutoPlaySlidesOnce = False - self.AutoPlaySlidesLoop = False - self.TimedSlideInterval = 0 - + self.auto_play_slides_once = False + self.auto_play_slides_loop = False + self.timed_slide_interval = 0 self._new_item() def _new_item(self): @@ -280,9 +279,9 @@ class ServiceItem(object): u'search': self.search_string, u'data': self.data_string, u'xml_version': self.xml_version, - u'AutoPlaySlidesOnce': self.AutoPlaySlidesOnce, - u'AutoPlaySlidesLoop': self.AutoPlaySlidesLoop, - u'TimedSlideInterval': self.TimedSlideInterval, + u'auto_play_slides_once': self.auto_play_slides_once, + u'auto_play_slides_loop': self.auto_play_slides_loop, + u'timed_slide_interval': self.timed_slide_interval, u'start_time': self.start_time, u'end_time': self.end_time, u'media_length': self.media_length, @@ -349,9 +348,9 @@ class ServiceItem(object): filename = os.path.join(path, text_image[u'title']) self.add_from_command( path, text_image[u'title'], text_image[u'image']) - self.AutoPlaySlidesOnce = header.get(u'AutoPlaySlidesOnce', False) - self.AutoPlaySlidesLoop = header.get(u'AutoPlaySlidesLoop', False) - self.TimedSlideInterval = header.get(u'TimedSlideInterval', 0) + self.auto_play_slides_once = header.get(u'auto_play_slides_once', False) + self.auto_play_slides_loop = header.get(u'auto_play_slides_loop', False) + self.timed_slide_interval = header.get(u'timed_slide_interval', 0) self._new_item() def get_display_title(self): diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 2ed9a7d9e..185041994 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -314,16 +314,16 @@ class ServiceManager(QtGui.QWidget): self.AutoPlaySlidesGroup = QtGui.QMenu( translate('OpenLP.ServiceManager', '&Auto play slides')) self.menu.addMenu(self.AutoPlaySlidesGroup) - self.AutoPlaySlidesLoop = create_widget_action(self.AutoPlaySlidesGroup, + self.auto_play_slides_loop = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', 'Auto play slides &Loop'), checked=False, triggers=self.toggle_auto_play_slides_loop) - self.AutoPlaySlidesOnce = create_widget_action(self.AutoPlaySlidesGroup, + self.auto_play_slides_once = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', 'Auto play slides &Once'), checked=False, triggers=self.toggle_auto_play_slides_once) self.AutoPlaySlidesGroup.addSeparator() - self.TimedSlideInterval = create_widget_action(self.AutoPlaySlidesGroup, + self.timed_slide_interval = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', '&Delay between slides'), checked=False, triggers=self.on_timed_slide_interval) @@ -787,24 +787,24 @@ class ServiceManager(QtGui.QWidget): if serviceItem[u'service_item'].is_capable(ItemCapabilities.CanLoop) and \ len(serviceItem[u'service_item'].get_frames()) > 1: self.AutoPlaySlidesGroup.menuAction().setVisible(True) - self.AutoPlaySlidesOnce\ - .setChecked(serviceItem[u'service_item'].AutoPlaySlidesOnce) - self.AutoPlaySlidesLoop\ - .setChecked(serviceItem[u'service_item'].AutoPlaySlidesLoop) - self.TimedSlideInterval\ - .setChecked(serviceItem[u'service_item'].TimedSlideInterval > 0) - if serviceItem[u'service_item'].TimedSlideInterval > 0: + self.auto_play_slides_once\ + .setChecked(serviceItem[u'service_item'].auto_play_slides_once) + self.auto_play_slides_loop\ + .setChecked(serviceItem[u'service_item'].auto_play_slides_loop) + self.timed_slide_interval\ + .setChecked(serviceItem[u'service_item'].timed_slide_interval > 0) + if serviceItem[u'service_item'].timed_slide_interval > 0: DelaySuffix = u' ' - DelaySuffix += unicode(serviceItem[u'service_item'].TimedSlideInterval) + DelaySuffix += unicode(serviceItem[u'service_item'].timed_slide_interval) DelaySuffix += u' s' else: DelaySuffix = u' ...' - self.TimedSlideInterval.setText(translate('OpenLP.ServiceManager', + self.timed_slide_interval.setText(translate('OpenLP.ServiceManager', '&Delay between slides') + DelaySuffix) #self.AutoPlaySlidesGroup.setChecked( - # serviceItem[u'service_item'].TimedSlideInterval > 0 and - # (serviceItem[u'service_item'].AutoPlaySlidesOnce or - # serviceItem[u'service_item'].AutoPlaySlidesLoop)) + # serviceItem[u'service_item'].timed_slide_interval > 0 and + # (serviceItem[u'service_item'].auto_play_slides_once or + # serviceItem[u'service_item'].auto_play_slides_loop)) else: self.AutoPlaySlidesGroup.menuAction().setVisible(False) if serviceItem[u'service_item']\ @@ -851,12 +851,12 @@ class ServiceManager(QtGui.QWidget): """ item = self.findServiceItem()[0] service_item = self.serviceItems[item][u'service_item'] - service_item.AutoPlaySlidesOnce = not service_item.AutoPlaySlidesOnce - if service_item.AutoPlaySlidesOnce: - service_item.AutoPlaySlidesLoop = False - self.AutoPlaySlidesLoop.setChecked(False) - if service_item.AutoPlaySlidesOnce and service_item.TimedSlideInterval == 0: - service_item.TimedSlideInterval = Settings().value(u'loop delay', + service_item.auto_play_slides_once = not service_item.auto_play_slides_once + if service_item.auto_play_slides_once: + service_item.auto_play_slides_loop = False + self.auto_play_slides_loop.setChecked(False) + if service_item.auto_play_slides_once and service_item.timed_slide_interval == 0: + service_item.timed_slide_interval = Settings().value(u'loop delay', QtCore.QVariant(5)).toInt()[0] self.setModified() @@ -866,12 +866,12 @@ class ServiceManager(QtGui.QWidget): """ item = self.findServiceItem()[0] service_item = self.serviceItems[item][u'service_item'] - service_item.AutoPlaySlidesLoop = not service_item.AutoPlaySlidesLoop - if service_item.AutoPlaySlidesLoop: - service_item.AutoPlaySlidesOnce = False - self.AutoPlaySlidesOnce.setChecked(False) - if service_item.AutoPlaySlidesLoop and service_item.TimedSlideInterval == 0: - service_item.TimedSlideInterval = Settings().value(u'loop delay', + service_item.auto_play_slides_loop = not service_item.auto_play_slides_loop + if service_item.auto_play_slides_loop: + service_item.auto_play_slides_once = False + self.auto_play_slides_once.setChecked(False) + if service_item.auto_play_slides_loop and service_item.timed_slide_interval == 0: + service_item.timed_slide_interval = Settings().value(u'loop delay', QtCore.QVariant(5)).toInt()[0] self.setModified() @@ -882,24 +882,24 @@ class ServiceManager(QtGui.QWidget): """ item = self.findServiceItem()[0] service_item = self.serviceItems[item][u'service_item'] - if service_item.TimedSlideInterval == 0: - TimedSlideInterval = Settings().value(u'loop delay', + if service_item.timed_slide_interval == 0: + timed_slide_interval = Settings().value(u'loop delay', QtCore.QVariant(5)).toInt()[0] else: - TimedSlideInterval = service_item.TimedSlideInterval - TimedSlideInterval, ok = QtGui.QInputDialog.getInteger(self, + timed_slide_interval = service_item.timed_slide_interval + timed_slide_interval, ok = QtGui.QInputDialog.getInteger(self, translate('OpenLP.ServiceManager', 'Input delay'), translate('OpenLP.ServiceManager', - 'Delay between slides in seconds.'), TimedSlideInterval, 0, 180, 1) + 'Delay between slides in seconds.'), timed_slide_interval, 0, 180, 1) if ok: - service_item.TimedSlideInterval = TimedSlideInterval - if service_item.TimedSlideInterval <> 0\ - and not service_item.AutoPlaySlidesLoop\ - and not service_item.AutoPlaySlidesOnce: - service_item.AutoPlaySlidesLoop = True - elif service_item.TimedSlideInterval == 0: - service_item.AutoPlaySlidesLoop = False - service_item.AutoPlaySlidesOnce = False + service_item.timed_slide_interval = timed_slide_interval + if service_item.timed_slide_interval <> 0\ + and not service_item.auto_play_slides_loop\ + and not service_item.auto_play_slides_once: + service_item.auto_play_slides_loop = True + elif service_item.timed_slide_interval == 0: + service_item.auto_play_slides_loop = False + service_item.auto_play_slides_once = False self.setModified() def onServiceItemEditForm(self): @@ -1405,8 +1405,8 @@ class ServiceManager(QtGui.QWidget): ItemCapabilities.CanPreview): self.mainwindow.previewController.addServiceManagerItem( self.serviceItems[item][u'service_item'], 0) - NextItem = self.serviceManagerList.topLevelItem(item) - self.serviceManagerList.setCurrentItem(NextItem) + next_item = self.serviceManagerList.topLevelItem(item) + self.serviceManagerList.setCurrentItem(next_item) self.mainwindow.liveController.previewListWidget.setFocus() else: critical_error_message_box( diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 7330e427f..b79bd9f59 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -778,15 +778,15 @@ class SlideController(Controller): self.slideSelected() else: self._processItem(item, slidenum) - if self.isLive and item.AutoPlaySlidesLoop\ - and item.TimedSlideInterval > 0: - self.playSlidesLoop.setChecked(item.AutoPlaySlidesLoop) - self.delaySpinBox.setValue(int(item.TimedSlideInterval)) + if self.isLive and item.auto_play_slides_loop\ + and item.timed_slide_interval > 0: + self.playSlidesLoop.setChecked(item.auto_play_slides_loop) + self.delaySpinBox.setValue(int(item.timed_slide_interval)) self.onPlaySlidesLoop() - elif self.isLive and item.AutoPlaySlidesOnce\ - and item.TimedSlideInterval > 0: - self.playSlidesOnce.setChecked(item.AutoPlaySlidesOnce) - self.delaySpinBox.setValue(int(item.TimedSlideInterval)) + elif self.isLive and item.auto_play_slides_once\ + and item.timed_slide_interval > 0: + self.playSlidesOnce.setChecked(item.auto_play_slides_once) + self.delaySpinBox.setValue(int(item.timed_slide_interval)) self.onPlaySlidesOnce() def _processItem(self, serviceItem, slideno): From 9bb9c6a629e6305fd6882bcaf193c122def6da9e Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Fri, 16 Nov 2012 21:06:52 +0400 Subject: [PATCH 05/12] Renamed varaibles by standard. --- openlp/core/ui/servicemanager.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 185041994..da5c15cee 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -311,19 +311,19 @@ class ServiceManager(QtGui.QWidget): self.menu.addAction(self.serviceManagerList.delete) self.menu.addSeparator() # Add AutoPlay menu actions - self.AutoPlaySlidesGroup = QtGui.QMenu( + self.auto_play_slides_group = QtGui.QMenu( translate('OpenLP.ServiceManager', '&Auto play slides')) - self.menu.addMenu(self.AutoPlaySlidesGroup) - self.auto_play_slides_loop = create_widget_action(self.AutoPlaySlidesGroup, + self.menu.addMenu(self.auto_play_slides_group) + self.auto_play_slides_loop = create_widget_action(self.auto_play_slides_group, text=translate('OpenLP.ServiceManager', 'Auto play slides &Loop'), checked=False, triggers=self.toggle_auto_play_slides_loop) - self.auto_play_slides_once = create_widget_action(self.AutoPlaySlidesGroup, + self.auto_play_slides_once = create_widget_action(self.auto_play_slides_group, text=translate('OpenLP.ServiceManager', 'Auto play slides &Once'), checked=False, triggers=self.toggle_auto_play_slides_once) - self.AutoPlaySlidesGroup.addSeparator() - self.timed_slide_interval = create_widget_action(self.AutoPlaySlidesGroup, + self.auto_play_slides_group.addSeparator() + self.timed_slide_interval = create_widget_action(self.auto_play_slides_group, text=translate('OpenLP.ServiceManager', '&Delay between slides'), checked=False, triggers=self.on_timed_slide_interval) @@ -786,7 +786,7 @@ class ServiceManager(QtGui.QWidget): self.notesAction.setVisible(True) if serviceItem[u'service_item'].is_capable(ItemCapabilities.CanLoop) and \ len(serviceItem[u'service_item'].get_frames()) > 1: - self.AutoPlaySlidesGroup.menuAction().setVisible(True) + self.auto_play_slides_group.menuAction().setVisible(True) self.auto_play_slides_once\ .setChecked(serviceItem[u'service_item'].auto_play_slides_once) self.auto_play_slides_loop\ @@ -801,12 +801,12 @@ class ServiceManager(QtGui.QWidget): DelaySuffix = u' ...' self.timed_slide_interval.setText(translate('OpenLP.ServiceManager', '&Delay between slides') + DelaySuffix) - #self.AutoPlaySlidesGroup.setChecked( + #self.auto_play_slides_group.setChecked( # serviceItem[u'service_item'].timed_slide_interval > 0 and # (serviceItem[u'service_item'].auto_play_slides_once or # serviceItem[u'service_item'].auto_play_slides_loop)) else: - self.AutoPlaySlidesGroup.menuAction().setVisible(False) + self.auto_play_slides_group.menuAction().setVisible(False) if serviceItem[u'service_item']\ .is_capable(ItemCapabilities.HasVariableStartTime): self.timeAction.setVisible(True) From 2093d9829fc79105ee9625ecdd2323d7fefd9a2e Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Fri, 16 Nov 2012 22:48:49 +0400 Subject: [PATCH 06/12] Renamed varaibles by standard --- openlp/core/ui/servicemanager.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index da5c15cee..a15e8186e 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -794,13 +794,13 @@ class ServiceManager(QtGui.QWidget): self.timed_slide_interval\ .setChecked(serviceItem[u'service_item'].timed_slide_interval > 0) if serviceItem[u'service_item'].timed_slide_interval > 0: - DelaySuffix = u' ' - DelaySuffix += unicode(serviceItem[u'service_item'].timed_slide_interval) - DelaySuffix += u' s' + delay_suffix = u' ' + delay_suffix += unicode(serviceItem[u'service_item'].timed_slide_interval) + delay_suffix += u' s' else: - DelaySuffix = u' ...' + delay_suffix = u' ...' self.timed_slide_interval.setText(translate('OpenLP.ServiceManager', - '&Delay between slides') + DelaySuffix) + '&Delay between slides') + delay_suffix) #self.auto_play_slides_group.setChecked( # serviceItem[u'service_item'].timed_slide_interval > 0 and # (serviceItem[u'service_item'].auto_play_slides_once or From 3e3911c1337adf7931622ff9803bafac9896cae7 Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Sun, 16 Dec 2012 20:45:38 +0400 Subject: [PATCH 07/12] Renamed varaibles by standard. --- openlp/core/ui/servicemanager.py | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index a15e8186e..0ec159d57 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -311,23 +311,22 @@ class ServiceManager(QtGui.QWidget): self.menu.addAction(self.serviceManagerList.delete) self.menu.addSeparator() # Add AutoPlay menu actions - self.auto_play_slides_group = QtGui.QMenu( + self.AutoPlaySlidesGroup = QtGui.QMenu( translate('OpenLP.ServiceManager', '&Auto play slides')) - self.menu.addMenu(self.auto_play_slides_group) - self.auto_play_slides_loop = create_widget_action(self.auto_play_slides_group, + self.menu.addMenu(self.AutoPlaySlidesGroup) + self.AutoPlaySlidesLoop = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', 'Auto play slides &Loop'), checked=False, - triggers=self.toggle_auto_play_slides_loop) - self.auto_play_slides_once = create_widget_action(self.auto_play_slides_group, + triggers=self.toggleAutoPlaySlidesLoop) + self.AutoPlaySlidesOnce = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', 'Auto play slides &Once'), checked=False, - triggers=self.toggle_auto_play_slides_once) - self.auto_play_slides_group.addSeparator() - self.timed_slide_interval = create_widget_action(self.auto_play_slides_group, + triggers=self.toggleAutoPlaySlidesOnce) + self.AutoPlaySlidesGroup.addSeparator() + self.TimedSlideInterval = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', '&Delay between slides'), checked=False, - triggers=self.on_timed_slide_interval) - + triggers=self.onTimedSlideInterval) self.menu.addSeparator() self.previewAction = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', 'Show &Preview'), @@ -786,12 +785,12 @@ class ServiceManager(QtGui.QWidget): self.notesAction.setVisible(True) if serviceItem[u'service_item'].is_capable(ItemCapabilities.CanLoop) and \ len(serviceItem[u'service_item'].get_frames()) > 1: - self.auto_play_slides_group.menuAction().setVisible(True) - self.auto_play_slides_once\ + self.AutoPlaySlidesGroup.menuAction().setVisible(True) + self.AutoPlaySlidesOnce\ .setChecked(serviceItem[u'service_item'].auto_play_slides_once) - self.auto_play_slides_loop\ + self.AutoPlaySlidesLoop\ .setChecked(serviceItem[u'service_item'].auto_play_slides_loop) - self.timed_slide_interval\ + self.TimedSlideInterval\ .setChecked(serviceItem[u'service_item'].timed_slide_interval > 0) if serviceItem[u'service_item'].timed_slide_interval > 0: delay_suffix = u' ' @@ -799,14 +798,15 @@ class ServiceManager(QtGui.QWidget): delay_suffix += u' s' else: delay_suffix = u' ...' - self.timed_slide_interval.setText(translate('OpenLP.ServiceManager', + self.TimedSlideInterval.setText(translate('OpenLP.ServiceManager', '&Delay between slides') + delay_suffix) - #self.auto_play_slides_group.setChecked( + # For future: make group explain itself more visual + #self.AutoPlaySlidesGroup.setChecked( # serviceItem[u'service_item'].timed_slide_interval > 0 and # (serviceItem[u'service_item'].auto_play_slides_once or # serviceItem[u'service_item'].auto_play_slides_loop)) else: - self.auto_play_slides_group.menuAction().setVisible(False) + self.AutoPlaySlidesGroup.menuAction().setVisible(False) if serviceItem[u'service_item']\ .is_capable(ItemCapabilities.HasVariableStartTime): self.timeAction.setVisible(True) @@ -844,7 +844,7 @@ class ServiceManager(QtGui.QWidget): if self.startTimeForm.exec_(): self.repaintServiceList(item, -1) - def toggle_auto_play_slides_once(self): + def toggleAutoPlaySlidesOnce(self): """ Toggle Auto play slide once. Inverts auto play once option for the item @@ -854,13 +854,13 @@ class ServiceManager(QtGui.QWidget): service_item.auto_play_slides_once = not service_item.auto_play_slides_once if service_item.auto_play_slides_once: service_item.auto_play_slides_loop = False - self.auto_play_slides_loop.setChecked(False) + self.AutoPlaySlidesLoop.setChecked(False) if service_item.auto_play_slides_once and service_item.timed_slide_interval == 0: service_item.timed_slide_interval = Settings().value(u'loop delay', QtCore.QVariant(5)).toInt()[0] self.setModified() - def toggle_auto_play_slides_loop(self): + def toggleAutoPlaySlidesLoop(self): """ Toggle Auto play slide loop. """ @@ -869,13 +869,13 @@ class ServiceManager(QtGui.QWidget): service_item.auto_play_slides_loop = not service_item.auto_play_slides_loop if service_item.auto_play_slides_loop: service_item.auto_play_slides_once = False - self.auto_play_slides_once.setChecked(False) + self.AutoPlaySlidesOnce.setChecked(False) if service_item.auto_play_slides_loop and service_item.timed_slide_interval == 0: service_item.timed_slide_interval = Settings().value(u'loop delay', QtCore.QVariant(5)).toInt()[0] self.setModified() - def on_timed_slide_interval(self): + def onTimedSlideInterval(self): """ on set times slide interval. Shows input dialog for enter interval in seconds for delay From 3f380c68d9bb036f4da1e53174bff4c192abc327 Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Wed, 19 Dec 2012 00:25:07 +0400 Subject: [PATCH 08/12] Code cleanUp lines to 120 --- openlp/core/lib/serviceitem.py | 6 +++--- openlp/core/ui/servicemanager.py | 24 +++++++++--------------- openlp/core/ui/slidecontroller.py | 6 ++---- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 8cc4a4f5b..5025b8716 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -400,6 +400,9 @@ class ServiceItem(object): self.start_time = header.get(u'start_time', 0) self.end_time = header.get(u'end_time', 0) self.media_length = header.get(u'media_length', 0) + self.auto_play_slides_once = header.get(u'auto_play_slides_once', False) + self.auto_play_slides_loop = header.get(u'auto_play_slides_loop', False) + self.timed_slide_interval = header.get(u'timed_slide_interval', 0) self.will_auto_start = header.get(u'will_auto_start', False) if u'background_audio' in header: self.background_audio = [] @@ -424,9 +427,6 @@ class ServiceItem(object): self.add_from_command(path, text_image[u'title'], text_image[u'image']) else: self.add_from_command(text_image[u'path'], text_image[u'title'], text_image[u'image']) - self.auto_play_slides_once = header.get(u'auto_play_slides_once', False) - self.auto_play_slides_loop = header.get(u'auto_play_slides_loop', False) - self.timed_slide_interval = header.get(u'timed_slide_interval', 0) self._new_item() def get_display_title(self): diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 91dd515da..7a9d22d48 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -260,22 +260,18 @@ class ServiceManager(QtGui.QWidget): self.menu.addAction(self.serviceManagerList.delete) self.menu.addSeparator() # Add AutoPlay menu actions - self.AutoPlaySlidesGroup = QtGui.QMenu( - translate('OpenLP.ServiceManager', '&Auto play slides')) + self.AutoPlaySlidesGroup = QtGui.QMenu(translate('OpenLP.ServiceManager', '&Auto play slides')) self.menu.addMenu(self.AutoPlaySlidesGroup) self.AutoPlaySlidesLoop = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', 'Auto play slides &Loop'), - checked=False, - triggers=self.toggleAutoPlaySlidesLoop) + checked=False, triggers=self.toggleAutoPlaySlidesLoop) self.AutoPlaySlidesOnce = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', 'Auto play slides &Once'), - checked=False, - triggers=self.toggleAutoPlaySlidesOnce) + checked=False, triggers=self.toggleAutoPlaySlidesOnce) self.AutoPlaySlidesGroup.addSeparator() self.TimedSlideInterval = create_widget_action(self.AutoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', '&Delay between slides'), - checked=False, - triggers=self.onTimedSlideInterval) + checked=False, triggers=self.onTimedSlideInterval) self.menu.addSeparator() self.previewAction = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', 'Show &Preview'), icon=u':/general/general_preview.png', triggers=self.makePreview) @@ -800,7 +796,7 @@ class ServiceManager(QtGui.QWidget): else: delay_suffix = u' ...' self.TimedSlideInterval.setText(translate('OpenLP.ServiceManager', '&Delay between slides') + delay_suffix) - # For future: make group explain itself more visual + # TOFO for future: make group explain itself more visually #self.AutoPlaySlidesGroup.setChecked( # serviceItem[u'service_item'].timed_slide_interval > 0 and # (serviceItem[u'service_item'].auto_play_slides_once or @@ -886,14 +882,12 @@ class ServiceManager(QtGui.QWidget): item = self.findServiceItem()[0] service_item = self.serviceItems[item][u'service_item'] if service_item.timed_slide_interval == 0: - timed_slide_interval = Settings().value(u'loop delay', - QtCore.QVariant(5)).toInt()[0] + timed_slide_interval = Settings().value(u'loop delay', QtCore.QVariant(5)).toInt()[0] else: timed_slide_interval = service_item.timed_slide_interval - timed_slide_interval, ok = QtGui.QInputDialog.getInteger(self, - translate('OpenLP.ServiceManager', 'Input delay'), - translate('OpenLP.ServiceManager', - 'Delay between slides in seconds.'), timed_slide_interval, 0, 180, 1) + timed_slide_interval, ok = QtGui.QInputDialog.getInteger(self, translate('OpenLP.ServiceManager', + 'Input delay'), translate('OpenLP.ServiceManager', 'Delay between slides in seconds.'), + timed_slide_interval, 0, 180, 1) if ok: service_item.timed_slide_interval = timed_slide_interval if service_item.timed_slide_interval <> 0\ diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index d23f13b6b..7db8fdb86 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -694,13 +694,11 @@ class SlideController(DisplayController): self.slideSelected() else: self._processItem(item, slidenum) - if self.isLive and item.auto_play_slides_loop\ - and item.timed_slide_interval > 0: + if self.isLive and item.auto_play_slides_loop and item.timed_slide_interval > 0: self.playSlidesLoop.setChecked(item.auto_play_slides_loop) self.delaySpinBox.setValue(int(item.timed_slide_interval)) self.onPlaySlidesLoop() - elif self.isLive and item.auto_play_slides_once\ - and item.timed_slide_interval > 0: + elif self.isLive and item.auto_play_slides_once and item.timed_slide_interval > 0: self.playSlidesOnce.setChecked(item.auto_play_slides_once) self.delaySpinBox.setValue(int(item.timed_slide_interval)) self.onPlaySlidesOnce() From 86d916509bbf983bde577470be647492d5b3b3c4 Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Wed, 26 Dec 2012 00:22:41 +0400 Subject: [PATCH 09/12] deleted commented code --- openlp/core/ui/servicemanager.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 7a9d22d48..f0d35b76f 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -796,11 +796,7 @@ class ServiceManager(QtGui.QWidget): else: delay_suffix = u' ...' self.TimedSlideInterval.setText(translate('OpenLP.ServiceManager', '&Delay between slides') + delay_suffix) - # TOFO for future: make group explain itself more visually - #self.AutoPlaySlidesGroup.setChecked( - # serviceItem[u'service_item'].timed_slide_interval > 0 and - # (serviceItem[u'service_item'].auto_play_slides_once or - # serviceItem[u'service_item'].auto_play_slides_loop)) + # TODO for future: make group explains itself more visually else: self.AutoPlaySlidesGroup.menuAction().setVisible(False) if serviceItem[u'service_item'].is_capable(ItemCapabilities.HasVariableStartTime): From 30ea5fce9c9a87d50c444c27ec80ad3e623b7850 Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Wed, 9 Jan 2013 14:30:32 +0400 Subject: [PATCH 10/12] Pause looping when blanking screen --- openlp/core/ui/slidecontroller.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 24a7b76ee..059c5e48a 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -889,6 +889,7 @@ class SlideController(DisplayController): Settings().remove(self.parent().generalSettingsSection + u'/screen blank') self.blankPlugin() self.updatePreview() + self.onToggleLoop() def onThemeDisplay(self, checked=None): """ @@ -907,6 +908,7 @@ class SlideController(DisplayController): Settings().remove(self.parent().generalSettingsSection + u'/screen blank') self.blankPlugin() self.updatePreview() + self.onToggleLoop() def onHideDisplay(self, checked=None): """ @@ -925,6 +927,7 @@ class SlideController(DisplayController): Settings().remove(self.parent().generalSettingsSection + u'/screen blank') self.hidePlugin(checked) self.updatePreview() + self.onToggleLoop() def blankPlugin(self): """ @@ -1102,7 +1105,8 @@ class SlideController(DisplayController): """ Toggles the loop state. """ - if self.playSlidesLoop.isChecked() or self.playSlidesOnce.isChecked(): + hide_mode = self.hideMode() + if hide_mode is None and (self.playSlidesLoop.isChecked() or self.playSlidesOnce.isChecked()): self.onStartLoop() else: self.onStopLoop() From 0c18fcad88bccec15f40f82cbad7db101b91c350 Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Wed, 16 Jan 2013 02:17:55 +0400 Subject: [PATCH 11/12] renaming varables --- openlp/core/ui/servicemanager.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 3f4d3257b..8a71189ad 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -257,16 +257,16 @@ class ServiceManager(QtGui.QWidget): icon=u':/general/general_edit.png', triggers=self.create_custom) self.menu.addSeparator() # Add AutoPlay menu actions - self.AutoPlaySlidesGroup = QtGui.QMenu(translate('OpenLP.ServiceManager', '&Auto play slides')) - self.menu.addMenu(self.AutoPlaySlidesGroup) - self.AutoPlaySlidesLoop = create_widget_action(self.AutoPlaySlidesGroup, + self.autoPlaySlidesGroup = QtGui.QMenu(translate('OpenLP.ServiceManager', '&Auto play slides')) + self.menu.addMenu(self.autoPlaySlidesGroup) + self.autoPlaySlidesLoop = create_widget_action(self.autoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', 'Auto play slides &Loop'), checked=False, triggers=self.toggleAutoPlaySlidesLoop) - self.AutoPlaySlidesOnce = create_widget_action(self.AutoPlaySlidesGroup, + self.autoPlaySlidesOnce = create_widget_action(self.autoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', 'Auto play slides &Once'), checked=False, triggers=self.toggleAutoPlaySlidesOnce) - self.AutoPlaySlidesGroup.addSeparator() - self.TimedSlideInterval = create_widget_action(self.AutoPlaySlidesGroup, + self.autoPlaySlidesGroup.addSeparator() + self.TimedSlideInterval = create_widget_action(self.autoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', '&Delay between slides'), checked=False, triggers=self.onTimedSlideInterval) self.menu.addSeparator() @@ -781,20 +781,20 @@ class ServiceManager(QtGui.QWidget): self.notesAction.setVisible(True) if serviceItem[u'service_item'].is_capable(ItemCapabilities.CanLoop) and \ len(serviceItem[u'service_item'].get_frames()) > 1: - self.AutoPlaySlidesGroup.menuAction().setVisible(True) - self.AutoPlaySlidesOnce.setChecked(serviceItem[u'service_item'].auto_play_slides_once) - self.AutoPlaySlidesLoop.setChecked(serviceItem[u'service_item'].auto_play_slides_loop) - self.TimedSlideInterval.setChecked(serviceItem[u'service_item'].timed_slide_interval > 0) + self.autoPlaySlidesGroup.menuAction().setVisible(True) + self.autoPlaySlidesOnce.setChecked(serviceItem[u'service_item'].auto_play_slides_once) + self.autoPlaySlidesLoop.setChecked(serviceItem[u'service_item'].auto_play_slides_loop) + self.timedSlideInterval.setChecked(serviceItem[u'service_item'].timed_slide_interval > 0) if serviceItem[u'service_item'].timed_slide_interval > 0: delay_suffix = u' ' delay_suffix += unicode(serviceItem[u'service_item'].timed_slide_interval) delay_suffix += u' s' else: delay_suffix = u' ...' - self.TimedSlideInterval.setText(translate('OpenLP.ServiceManager', '&Delay between slides') + delay_suffix) + self.timedSlideInterval.setText(translate('OpenLP.ServiceManager', '&Delay between slides') + delay_suffix) # TODO for future: make group explains itself more visually else: - self.AutoPlaySlidesGroup.menuAction().setVisible(False) + self.autoPlaySlidesGroup.menuAction().setVisible(False) if serviceItem[u'service_item'].is_capable(ItemCapabilities.HasVariableStartTime): self.timeAction.setVisible(True) if serviceItem[u'service_item'].is_capable(ItemCapabilities.CanAutoStartForLive): @@ -850,7 +850,7 @@ class ServiceManager(QtGui.QWidget): service_item.auto_play_slides_once = not service_item.auto_play_slides_once if service_item.auto_play_slides_once: service_item.auto_play_slides_loop = False - self.AutoPlaySlidesLoop.setChecked(False) + self.autoPlaySlidesLoop.setChecked(False) if service_item.auto_play_slides_once and service_item.timed_slide_interval == 0: service_item.timed_slide_interval = Settings().value(u'loop delay', 5) self.setModified() @@ -864,7 +864,7 @@ class ServiceManager(QtGui.QWidget): service_item.auto_play_slides_loop = not service_item.auto_play_slides_loop if service_item.auto_play_slides_loop: service_item.auto_play_slides_once = False - self.AutoPlaySlidesOnce.setChecked(False) + self.autoPlaySlidesOnce.setChecked(False) if service_item.auto_play_slides_loop and service_item.timed_slide_interval == 0: service_item.timed_slide_interval = Settings().value(u'loop delay', 5) self.setModified() From 5ce7ceafed93ce8fea953485ccec7aaa65184967 Mon Sep 17 00:00:00 2001 From: Dmitriy Marmyshev Date: Thu, 17 Jan 2013 17:09:46 +0400 Subject: [PATCH 12/12] fixed varaibles --- openlp/core/ui/servicemanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 8a71189ad..e2c51c082 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -266,7 +266,7 @@ class ServiceManager(QtGui.QWidget): text=translate('OpenLP.ServiceManager', 'Auto play slides &Once'), checked=False, triggers=self.toggleAutoPlaySlidesOnce) self.autoPlaySlidesGroup.addSeparator() - self.TimedSlideInterval = create_widget_action(self.autoPlaySlidesGroup, + self.timedSlideInterval = create_widget_action(self.autoPlaySlidesGroup, text=translate('OpenLP.ServiceManager', '&Delay between slides'), checked=False, triggers=self.onTimedSlideInterval) self.menu.addSeparator()