Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/image-scaling into lp:openlp

2019-08-21 Thread Raoul Snyman 
Review: Approve


-- 
https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371610
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp

[Openlp-core] [Merge] lp:~tomasgroth/openlp/image-scaling into lp:openlp

2019-08-21 Thread Raoul Snyman 
The proposal to merge lp:~tomasgroth/openlp/image-scaling into lp:openlp has 
been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371610
-- 
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp

Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/image-scaling into lp:openlp

2019-08-21 Thread Tim Bentley 
Review: Approve


-- 
https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371610
Your team OpenLP Core is subscribed to branch lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp

[Openlp-core] Linting: Passed

2019-08-21 Thread Raoul Snyman 
Linting passed!
-- 
https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371610
Your team OpenLP Core is requested to review the proposed merge of 
lp:~tomasgroth/openlp/image-scaling into lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp

[Openlp-core] Linux Test Results: Passed

2019-08-21 Thread Raoul Snyman 
Linux tests passed!
-- 
https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371610
Your team OpenLP Core is requested to review the proposed merge of 
lp:~tomasgroth/openlp/image-scaling into lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp

[Openlp-core] [Merge] lp:~tomasgroth/openlp/image-scaling into lp:openlp

2019-08-21 Thread Tomas Groth 
Tomas Groth has proposed merging lp:~tomasgroth/openlp/image-scaling into 
lp:openlp.

Commit message:
Make image scaling in the slidecontroller and the display work correctly.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371610
-- 
Your team OpenLP Core is requested to review the proposed merge of 
lp:~tomasgroth/openlp/image-scaling into lp:openlp.
=== modified file 'openlp/core/display/html/display.js'
--- openlp/core/display/html/display.js	2019-08-06 21:46:00 +
+++ openlp/core/display/html/display.js	2019-08-21 19:47:35 +
@@ -426,9 +426,10 @@
   var section = document.createElement("section");
   section.setAttribute("id", index);
   section.setAttribute("data-background", "#000");
+  section.setAttribute("style", "height: 100%; width: 100%;");
   var img = document.createElement('img');
   img.src = slide["path"];
-  img.setAttribute("style", "height: 100%; width: 100%;");
+  img.setAttribute("style", "max-width: 100%; height: auto; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);");
   section.appendChild(img);
   slidesDiv.appendChild(section);
   Display._slides[index.toString()] = index;

=== modified file 'openlp/core/widgets/views.py'
--- openlp/core/widgets/views.py	2019-07-03 13:23:23 +
+++ openlp/core/widgets/views.py	2019-08-21 19:47:35 +
@@ -210,9 +210,13 @@
 pixmap = QtGui.QPixmap(str(slide['image']))
 else:
 pixmap = QtGui.QPixmap(str(slide['path']))
+if pixmap.height() > 0:
+pixmap_ratio = pixmap.width() / pixmap.height()
+else:
+pixmap_ratio = 1
 label.setPixmap(pixmap)
 container = QtWidgets.QWidget()
-layout = AspectRatioLayout(container, self.screen_ratio)
+layout = AspectRatioLayout(container, pixmap_ratio)
 layout.setContentsMargins(0, 0, 0, 0)
 layout.addWidget(label)
 container.setLayout(layout)

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp

[Openlp-core] [Merge] lp:~tomasgroth/openlp/image-scaling into lp:openlp

2019-08-21 Thread Tomas Groth 
The proposal to merge lp:~tomasgroth/openlp/image-scaling into lp:openlp has 
been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371606
-- 
Your team OpenLP Core is requested to review the proposed merge of 
lp:~tomasgroth/openlp/image-scaling into lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp

[Openlp-core] Linux Test Results: Failed

2019-08-21 Thread Raoul Snyman 
Linux tests failed, please see https://ci.openlp.io/job/MP-02-Linux_Tests/219/ 
for more details
-- 
https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371606
Your team OpenLP Core is requested to review the proposed merge of 
lp:~tomasgroth/openlp/image-scaling into lp:openlp.

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp

[Openlp-core] [Merge] lp:~tomasgroth/openlp/image-scaling into lp:openlp

2019-08-21 Thread Tomas Groth 
Tomas Groth has proposed merging lp:~tomasgroth/openlp/image-scaling into 
lp:openlp.

Commit message:
Make image scaling in the slidecontroller and the display work correctly.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371606
-- 
Your team OpenLP Core is requested to review the proposed merge of 
lp:~tomasgroth/openlp/image-scaling into lp:openlp.
=== modified file 'openlp/core/display/html/display.js'
--- openlp/core/display/html/display.js	2019-08-06 21:46:00 +
+++ openlp/core/display/html/display.js	2019-08-21 19:22:35 +
@@ -426,9 +426,10 @@
   var section = document.createElement("section");
   section.setAttribute("id", index);
   section.setAttribute("data-background", "#000");
+  section.setAttribute("style", "height: 100%; width: 100%;");
   var img = document.createElement('img');
   img.src = slide["path"];
-  img.setAttribute("style", "height: 100%; width: 100%;");
+  img.setAttribute("style", "max-width: 100%; height: auto; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);");
   section.appendChild(img);
   slidesDiv.appendChild(section);
   Display._slides[index.toString()] = index;

=== modified file 'openlp/core/widgets/views.py'
--- openlp/core/widgets/views.py	2019-07-03 13:23:23 +
+++ openlp/core/widgets/views.py	2019-08-21 19:22:35 +
@@ -210,9 +210,10 @@
 pixmap = QtGui.QPixmap(str(slide['image']))
 else:
 pixmap = QtGui.QPixmap(str(slide['path']))
+pixmap_ratio = pixmap.width() / pixmap.height()
 label.setPixmap(pixmap)
 container = QtWidgets.QWidget()
-layout = AspectRatioLayout(container, self.screen_ratio)
+layout = AspectRatioLayout(container, pixmap_ratio)
 layout.setContentsMargins(0, 0, 0, 0)
 layout.addWidget(label)
 container.setLayout(layout)

___
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp