From 22dc4f2828a1a913b6644c964f0326896f5097ef Mon Sep 17 00:00:00 2001 From: Diego Tavares Date: Wed, 21 Aug 2024 08:31:54 -0700 Subject: [PATCH 1/2] [cuegui] Set a reasonable max value on the memory slider for the LocalBookings plugin (#1487) The memory sliders were created without a max value and the default was not big enough to represent regular render nodes. Co-authored-by: Roula O'Regan --- cuegui/cuegui/LocalBooking.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cuegui/cuegui/LocalBooking.py b/cuegui/cuegui/LocalBooking.py index d4233208c..b3c905a1a 100644 --- a/cuegui/cuegui/LocalBooking.py +++ b/cuegui/cuegui/LocalBooking.py @@ -95,6 +95,7 @@ def __init__(self, target, parent=None): self.__num_mem = QtWidgets.QSlider(self) self.__num_mem.setValue(4) + self.__num_mem.setMaximum(256) self.__num_mem.setOrientation(QtCore.Qt.Horizontal) self.__num_mem.setTickPosition(QtWidgets.QSlider.TicksBelow) self.__num_mem.setTickInterval(1) @@ -114,6 +115,7 @@ def __init__(self, target, parent=None): self.__run_mem = QtWidgets.QSlider(self) self.__run_mem.setValue(4) + self.__num_mem.setMaximum(256) self.__run_mem.setOrientation(QtCore.Qt.Horizontal) self.__run_mem.setTickPosition(QtWidgets.QSlider.TicksBelow) self.__run_mem.setTickInterval(1) From 486445e718d34d53874b85ff9c56ee4e12a32ba6 Mon Sep 17 00:00:00 2001 From: Diego Tavares Date: Wed, 21 Aug 2024 08:32:09 -0700 Subject: [PATCH 2/2] [cuegui] Fix LayerDialog layout scroll (#1486) Revert layout changes from #1055 that caused issues with the scroll functionality of the Layout 'dialog'. --- cuegui/cuegui/LayerDialog.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/cuegui/cuegui/LayerDialog.py b/cuegui/cuegui/LayerDialog.py index c0d1722b8..aed2f740c 100644 --- a/cuegui/cuegui/LayerDialog.py +++ b/cuegui/cuegui/LayerDialog.py @@ -76,6 +76,7 @@ def __init__(self, label, widget, stretch=True, help_widget=None, parent=None): self.__widget = widget layout = QtWidgets.QHBoxLayout(self) + layout.setContentsMargins(1, 1, 1, 1) if label: layout.addWidget(QtWidgets.QLabel(label, self)) if stretch: @@ -228,14 +229,7 @@ def __init__(self, layers, parent=None): self.__timeout.setValue(self.getTimeout()) self.__timeout_llu.setValue(self.getTimeoutLLU()) - topLayout = QtWidgets.QVBoxLayout() - topWidget = QtWidgets.QWidget() - topWidget.setLayout(topLayout) - scrollArea = QtWidgets.QScrollArea(widgetResizable=True) - scrollArea.setWidget(topWidget) - QtWidgets.QVBoxLayout(self) - self.layout().addWidget(scrollArea) layout = QtWidgets.QVBoxLayout() layout.addWidget(EnableableItem(LayerPropertiesItem("Minimum Memory:", @@ -281,10 +275,10 @@ def __init__(self, layers, parent=None): layout.addStretch() self.__group.setLayout(layout) - topLayout.addWidget(EnableableItem(self.__tags, multiSelect)) - topLayout.addWidget(EnableableItem(self.__limits, multiSelect)) - topLayout.addWidget(self.__group) - topLayout.addWidget(self.__buttons) + self.layout().addWidget(EnableableItem(self.__tags, multiSelect)) + self.layout().addWidget(EnableableItem(self.__limits, multiSelect)) + self.layout().addWidget(self.__group) + self.layout().addWidget(self.__buttons) def _cfg(self): """