forked from openlp/openlp
HEAD
This commit is contained in:
commit
2f8ad08d1a
@ -425,7 +425,7 @@ var Display = {
|
|||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Set image slides
|
* Set image slides
|
||||||
* @param {Object[]} slides - A list of images to add as JS objects [{"filename": "url/to/file"}]
|
* @param {Object[]} slides - A list of images to add as JS objects [{"path": "url/to/file"}]
|
||||||
*/
|
*/
|
||||||
setImageSlides: function (slides) {
|
setImageSlides: function (slides) {
|
||||||
Display.clearSlides();
|
Display.clearSlides();
|
||||||
@ -435,7 +435,7 @@ var Display = {
|
|||||||
section.setAttribute("id", index);
|
section.setAttribute("id", index);
|
||||||
section.setAttribute("data-background", "#000");
|
section.setAttribute("data-background", "#000");
|
||||||
var img = document.createElement('img');
|
var img = document.createElement('img');
|
||||||
img.src = slide["filename"];
|
img.src = slide["path"];
|
||||||
img.setAttribute("style", "height: 100%; width: 100%;");
|
img.setAttribute("style", "height: 100%; width: 100%;");
|
||||||
section.appendChild(img);
|
section.appendChild(img);
|
||||||
slidesDiv.appendChild(section);
|
slidesDiv.appendChild(section);
|
||||||
@ -445,14 +445,14 @@ var Display = {
|
|||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Set a video
|
* Set a video
|
||||||
* @param {Object} video - The video to show as a JS object: {"filename": "url/to/file"}
|
* @param {Object} video - The video to show as a JS object: {"path": "url/to/file"}
|
||||||
*/
|
*/
|
||||||
setVideo: function (video) {
|
setVideo: function (video) {
|
||||||
this.clearSlides();
|
this.clearSlides();
|
||||||
var section = document.createElement("section");
|
var section = document.createElement("section");
|
||||||
section.setAttribute("data-background", "#000");
|
section.setAttribute("data-background", "#000");
|
||||||
var videoElement = document.createElement("video");
|
var videoElement = document.createElement("video");
|
||||||
videoElement.src = video["filename"];
|
videoElement.src = video["path"];
|
||||||
videoElement.preload = "auto";
|
videoElement.preload = "auto";
|
||||||
videoElement.setAttribute("id", "video");
|
videoElement.setAttribute("id", "video");
|
||||||
videoElement.setAttribute("style", "height: 100%; width: 100%;");
|
videoElement.setAttribute("style", "height: 100%; width: 100%;");
|
||||||
|
@ -250,8 +250,8 @@ class DisplayWindow(QtWidgets.QWidget):
|
|||||||
Set images in the display
|
Set images in the display
|
||||||
"""
|
"""
|
||||||
for image in images:
|
for image in images:
|
||||||
if not image['filename'].startswith('file://'):
|
if not image['path'].startswith('file://'):
|
||||||
image['filename'] = 'file://' + image['filename']
|
image['path'] = 'file://' + image['path']
|
||||||
json_images = json.dumps(images)
|
json_images = json.dumps(images)
|
||||||
self.run_javascript('Display.setImageSlides({images});'.format(images=json_images))
|
self.run_javascript('Display.setImageSlides({images});'.format(images=json_images))
|
||||||
|
|
||||||
@ -259,8 +259,8 @@ class DisplayWindow(QtWidgets.QWidget):
|
|||||||
"""
|
"""
|
||||||
Load video in the display
|
Load video in the display
|
||||||
"""
|
"""
|
||||||
if not video['filename'].startswith('file://'):
|
if not video['path'].startswith('file://'):
|
||||||
video['filename'] = 'file://' + video['filename']
|
video['path'] = 'file://' + video['path']
|
||||||
json_video = json.dumps(video)
|
json_video = json.dumps(video)
|
||||||
self.run_javascript('Display.setVideo({video});'.format(video=json_video))
|
self.run_javascript('Display.setVideo({video});'.format(video=json_video))
|
||||||
|
|
||||||
|
@ -1259,7 +1259,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
|
|||||||
"""
|
"""
|
||||||
The theme may have changed in the settings dialog so make sure the theme combo box is in the correct state.
|
The theme may have changed in the settings dialog so make sure the theme combo box is in the correct state.
|
||||||
"""
|
"""
|
||||||
visible = self.renderer.theme_level != ThemeLevel.Global
|
visible = True # self.renderer.theme_level != ThemeLevel.Global
|
||||||
self.toolbar.actions['theme_combo_box'].setVisible(visible)
|
self.toolbar.actions['theme_combo_box'].setVisible(visible)
|
||||||
self.toolbar.actions['theme_label'].setVisible(visible)
|
self.toolbar.actions['theme_label'].setVisible(visible)
|
||||||
self.regenerate_service_items()
|
self.regenerate_service_items()
|
||||||
|
@ -213,11 +213,15 @@ class ListPreviewWidget(QtWidgets.QTableWidget, RegistryProperties):
|
|||||||
layout.addWidget(label)
|
layout.addWidget(label)
|
||||||
container.setLayout(layout)
|
container.setLayout(layout)
|
||||||
slide_height = width // self.screen_ratio
|
slide_height = width // self.screen_ratio
|
||||||
max_slide_height = Settings().value('advanced/slide max height')
|
max_img_row_height = Settings().value('advanced/slide max height')
|
||||||
if slide_height < 0:
|
if isinstance(max_img_row_height, int):
|
||||||
slide_height = max_slide_height
|
if max_img_row_height > 0 and slide_height > max_img_row_height:
|
||||||
else:
|
slide_height = max_img_row_height
|
||||||
slide_height = min(slide_height, max_slide_height)
|
elif max_img_row_height < 0:
|
||||||
|
# If auto setting, show that number of slides, or if the resulting slides too small, 100px.
|
||||||
|
# E.g. If setting is -4, 4 slides will be visible, unless those slides are < 100px high.
|
||||||
|
self.auto_row_height = max(self.viewport().height() / (-1 * max_img_row_height), 100)
|
||||||
|
slide_height = min(slide_height, self.auto_row_height)
|
||||||
self.setCellWidget(slide_index, 0, container)
|
self.setCellWidget(slide_index, 0, container)
|
||||||
row += 1
|
row += 1
|
||||||
text.append(str(row))
|
text.append(str(row))
|
||||||
|
Loading…
Reference in New Issue
Block a user