Merge branch 'master' into limit_user_interaction

AcademySoftwareFoundation · Aug 21, 2024 · 403b4da · 403b4da
2 parents a61b939 + 486445e
commit 403b4da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git 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):
         """

diff --git 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)