Add scrollbars to docked widgets (#405)

Author: DanicaSTFC

CHANGES.md

@@ -6,10 +6,10 @@ Enhancements:
 * Update default values in "Run DVC" tab #402
 
 Bug fixes:
+* Add scrollbar to docked widgets #405
 * Remove GPU size and GPU checkbox for volume render in settings #403
 * Add 3D viewer docking option in the settings #398
 
-
 ## v24.1.1
 Bug fixes:
 * Fix abscissa order in graphs #372

src/idvc/dvc_interface.py

@@ -190,7 +190,7 @@ def __init__(self):
         self.CreateWorkingTempFolder()
 
         #Load Settings:
-        self.settings = QSettings("CCPi", "DVC Interface v24.0.1")
+        self.settings = QSettings("CCPi", "DVC Interface v24.1.1")
 
         if self.settings.value("copy_files"):
             self.copy_files = True
@@ -415,7 +415,7 @@ def CreateViewerSettingsPanel(self):
         formLayout.setWidget(widgetno, QFormLayout.FieldRole, vs_widgets['coords_warning_label'])
 
         self.visualisation_setting_widgets = vs_widgets
-        
+
     def updateCoordinates(self):
         viewers_2D = [self.vis_widget_2D.frame.viewer]
         vs_widgets = self.visualisation_setting_widgets
@@ -451,7 +451,7 @@ def CreateHelpPanel(self):
         
         Saves the help text for all tabs.
         Adds a QLabel in the form of scrollable text."""
-        help_panel = generateUIDockParameters(self, "Help")
+        help_panel = generateUIDockParameters(self, "Help", scrollable = False)
         dockWidget = help_panel[0]
         dockWidget.setObjectName("HelpPanel")
         groupBox = help_panel[5]

src/idvc/utilities.py

@@ -5,6 +5,7 @@
 from PySide2.QtGui import *
 import numpy as np
 import os
+from eqt.ui.NoBorderScrollArea import NoBorderScrollArea
 
 
 
@@ -66,19 +67,21 @@ def __str__(self):
         n = "subvol_points {}".format(self.subvol_points)
         return "RunResults:\n{}\n{}".format(a , n)
 
-def generateUIDockParameters(self, title): #copied from dvc_configurator.py
+
+
+def generateUIDockParameters(self, title, scrollable = True): #copied from dvc_configurator.py
     '''creates a dockable widget with a form layout group to add things to
 
     basically you can add widget to the returned groupBoxFormLayout and paramsGroupBox
     The returned dockWidget must be added with
     self.addDockWidget(QtCore.Qt.RightDockWidgetArea, dockWidget)
+    A scoll area can be added to the widget by setting the flag to True.
     '''
     dockWidget = QDockWidget(self)
     dockWidget.setFeatures(QDockWidget.NoDockWidgetFeatures)
     dockWidget.setWindowTitle(title)
     dockWidgetContents = QWidget()
 
-
     # Add vertical layout to dock contents
     dockContentsVerticalLayout = QVBoxLayout(dockWidgetContents)
     dockContentsVerticalLayout.setContentsMargins(0, 0, 0, 0)
@@ -101,7 +104,12 @@ def generateUIDockParameters(self, title): #copied from dvc_configurator.py
     # Add elements to layout
     internalWidgetVerticalLayout.addWidget(paramsGroupBox)
     dockContentsVerticalLayout.addWidget(internalDockWidget)
-    dockWidget.setWidget(dockWidgetContents)
+
+    if scrollable == True:
+        scrollArea = NoBorderScrollArea(dockWidgetContents)
+        dockWidget.setWidget(scrollArea)
+    else:
+        dockWidget.setWidget(dockWidgetContents)
 
     #        self.graphWidgetVL.addWidget(self.graphParamsGroupBox)
     #        self.graphDockVL.addWidget(self.dockWidget)