openlp-core team mailing list archive

[Azaziah <suutari.olli@xxxxxxxxx>]

I need to start working on tests...

Fixed the diff comments.

Diff comments:

> 
> === modified file 'openlp/core/ui/generaltab.py'
> --- openlp/core/ui/generaltab.py	2016-04-13 15:50:04 +0000
> +++ openlp/core/ui/generaltab.py	2016-04-17 03:59:45 +0000
> @@ -208,6 +208,9 @@
>          self.auto_unblank_check_box = QtWidgets.QCheckBox(self.settings_group_box)
>          self.auto_unblank_check_box.setObjectName('auto_unblank_check_box')
>          self.settings_layout.addRow(self.auto_unblank_check_box)
> +        self.click_live_slide_to_unblank_check_box = QtWidgets.QCheckBox(self.settings_group_box)
> +        self.click_live_slide_to_unblank_check_box.setObjectName('click_live_slide_to_unblank_')

My mistake, it used to be longer and that should had been removed as well.

> +        self.settings_layout.addRow(self.click_live_slide_to_unblank_check_box)
>          self.auto_preview_check_box = QtWidgets.QCheckBox(self.settings_group_box)
>          self.auto_preview_check_box.setObjectName('auto_preview_check_box')
>          self.settings_layout.addRow(self.auto_preview_check_box)
> 
> === modified file 'openlp/core/ui/slidecontroller.py'
> --- openlp/core/ui/slidecontroller.py	2016-04-06 05:08:44 +0000
> +++ openlp/core/ui/slidecontroller.py	2016-04-17 03:59:45 +0000
> @@ -789,11 +789,16 @@
>      def replace_service_manager_item(self, item):
>          """
>          Replacement item following a remote edit
> +        This action  also takes place when a song that is sent to live from Service Manager is edited.
> +        If display is blanked, it will get unblanked if automatic unblanking is enabled. We prevent this from happening
> +        by setting a hidden setting to "True" and then to "False" after the processing is done.
>  
>          :param item: The current service item
>          """
>          if item == self.service_item:
> -            self._process_item(item, self.preview_widget.current_slide_number())
> +                Settings().setValue('core/is live item edited and replaced', True)
> +                self._process_item(item, self.preview_widget.current_slide_number())
> +                Settings().setValue('core/is live item edited and replaced', False)
>  

Again, my mistake.
I had a nightly heureka and wanted to get this new fix out 
before anybody reviews it. Coding at 4 am rocks!

>      def add_service_manager_item(self, item, slide_no):
>          """


-- 
https://code.launchpad.net/~suutari-olli/openlp/click-slide-to-go-live-from-blank/+merge/292077
Your team OpenLP Core is subscribed to branch lp:openlp.