← Back to team overview

openlp-core team mailing list archive

Re: [Merge] lp:~thelinuxguy/openlp/make-methods-static into lp:openlp

 

Review: Needs Fixing

See below.

Diff comments:

> 
> === modified file 'openlp/core/lib/screen.py'
> --- openlp/core/lib/screen.py	2015-12-31 22:46:06 +0000
> +++ openlp/core/lib/screen.py	2016-01-09 22:36:52 +0000
> @@ -224,7 +224,7 @@
>          y = window.y() + (window.height() // 2)
>          for screen in self.screen_list:
>              size = screen['size']
> -            if x >= size.x() and x <= (size.x() + size.width()) and y >= size.y() and y <= (size.y() + size.height()):

Leave along o123hello trued this before and it broke.

> +            if size.x() <= x <= (size.x() + size.width()) and size.y() <= y <= (size.y() + size.height()):
>                  return screen['number']
>  
>      def load_screen_settings(self):
> 
> === modified file 'openlp/plugins/remotes/html/index.html'
> --- openlp/plugins/remotes/html/index.html	2015-12-31 22:46:06 +0000
> +++ openlp/plugins/remotes/html/index.html	2016-01-09 22:36:52 +0000
> @@ -167,7 +167,7 @@
>      <h1>${options}</h1>
>    </div>
>    <div data-role="content">
> -    <input type="hidden" id="selected-item" value="" />

Why?

> +    <input id="selected-item" value="" />
>      <a href="#" id="go-live" data-role="button">${go_live}</a>
>      <a href="#" id="add-to-service" data-role="button">${add_to_service}</a>
>      <a href="#" id="add-and-go-to-service" data-role="button">${add_and_go_to_service}</a>


-- 
https://code.launchpad.net/~thelinuxguy/openlp/make-methods-static/+merge/282107
Your team OpenLP Core is subscribed to branch lp:openlp.


References