raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Split auto-scroll & height cap features to new branch

Browse Source
This commit is contained in:
Ian Knight 2016-02-29 15:31:05 +10:30
parent ec5a362ea5
commit 1e94cd92e9
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openlp/core/ui/listpreviewwidget.py
View File

@ -48,6 +48,9 @@ class ListPreviewWidget(QtWidgets.QTableWidget, RegistryProperties):
super(QtWidgets.QTableWidget, self).__init__(parent) super(QtWidgets.QTableWidget, self).__init__(parent)
self._setup(screen_ratio) self._setup(screen_ratio)
# max row height for non-text slides in pixels. If <= 0, will disable max row height.
self.max_img_row_height = 200
def _setup(self, screen_ratio): def _setup(self, screen_ratio):
""" """
Set up the widget Set up the widget
@ -82,8 +85,10 @@ class ListPreviewWidget(QtWidgets.QTableWidget, RegistryProperties):
self.resizeRowsToContents() self.resizeRowsToContents()
else: else:
# Sort out image heights. # Sort out image heights.
height = self.viewport().width() // self.screen_ratio ### Moved out of loop as only needs to run once
if self.max_img_row_height > 0 and height > self.max_img_row_height: ### Apply row height cap.
height = self.max_img_row_height
for frame_number in range(len(self.service_item.get_frames())): for frame_number in range(len(self.service_item.get_frames())):
height = self.viewport().width() // self.screen_ratio
self.setRowHeight(frame_number, height) self.setRowHeight(frame_number, height)
def screen_size_changed(self, screen_ratio): def screen_size_changed(self, screen_ratio):
@ -139,7 +144,20 @@ class ListPreviewWidget(QtWidgets.QTableWidget, RegistryProperties):
pixmap = QtGui.QPixmap.fromImage(image) pixmap = QtGui.QPixmap.fromImage(image)
pixmap.setDevicePixelRatio(label.devicePixelRatio()) pixmap.setDevicePixelRatio(label.devicePixelRatio())
label.setPixmap(pixmap) label.setPixmap(pixmap)
self.setCellWidget(frame_number, 0, label) ### begin added/modified content
if self.max_img_row_height > 0:
label.setMaximumWidth(self.max_img_row_height * self.screen_ratio) ### set max width based on max height
label.resize(self.max_img_row_height * self.screen_ratio,self.max_img_row_height) ### resize to max width and max height; may be adjusted when setRowHeight called.
container = QtWidgets.QWidget() ### container widget
hbox = QtWidgets.QHBoxLayout() ### hbox to allow for horizonal stretch padding
hbox.setContentsMargins(0, 0, 0, 0) ### 0 contents margins to avoid extra padding
hbox.addWidget(label,stretch=1) ### add slide, stretch allows growing to max-width
hbox.addStretch(0) ### add strech padding with lowest priority; will only grow when slide has hit max-width
container.setLayout(hbox) ### populate container widget
self.setCellWidget(frame_number, 0, container) ### populate cell with container
else:
self.setCellWidget(frame_number, 0, label) ### populate cell with slide
### end added/modified content
slide_height = width // self.screen_ratio slide_height = width // self.screen_ratio
row += 1 row += 1
text.append(str(row)) text.append(str(row))