From a437029fcd511670235c8c0fc9ce1778dcbc0b6a Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 1 Feb 2023 08:28:23 +0100 Subject: [PATCH] Proposal for #485 - make all windows scrollable (#591) Signed-off-by: Martin --- NanoVNASaver/Windows/About.py | 12 +++++++++++- NanoVNASaver/Windows/AnalysisWindow.py | 11 ++++++++++- NanoVNASaver/Windows/CalibrationSettings.py | 12 +++++++++++- NanoVNASaver/Windows/DeviceSettings.py | 11 ++++++++++- NanoVNASaver/Windows/DisplaySettings.py | 11 ++++++++++- NanoVNASaver/Windows/Files.py | 11 ++++++++++- NanoVNASaver/Windows/SweepSettings.py | 11 ++++++++++- NanoVNASaver/Windows/TDR.py | 11 ++++++++++- 8 files changed, 82 insertions(+), 8 deletions(-) diff --git a/NanoVNASaver/Windows/About.py b/NanoVNASaver/Windows/About.py index 9e125d4..eafcc9d 100644 --- a/NanoVNASaver/Windows/About.py +++ b/NanoVNASaver/Windows/About.py @@ -37,7 +37,17 @@ class AboutWindow(QtWidgets.QWidget): self.setWindowTitle("About NanoVNASaver") self.setWindowIcon(self.app.icon) top_layout = QtWidgets.QHBoxLayout() - self.setLayout(top_layout) + + scrollarea = QtWidgets.QScrollArea() + scrollarea.setWidgetResizable(True) + outer = QtWidgets.QVBoxLayout() + outer.addWidget(scrollarea) + widget = QtWidgets.QWidget() + widget.setLayout(top_layout) + scrollarea.setWidget(widget) + self.setLayout(outer) + self.resize( scrollarea.size() ) + QtWidgets.QShortcut(QtCore.Qt.Key_Escape, self, self.hide) icon_layout = QtWidgets.QVBoxLayout() diff --git a/NanoVNASaver/Windows/AnalysisWindow.py b/NanoVNASaver/Windows/AnalysisWindow.py index fc601b0..f61b179 100644 --- a/NanoVNASaver/Windows/AnalysisWindow.py +++ b/NanoVNASaver/Windows/AnalysisWindow.py @@ -49,7 +49,16 @@ class AnalysisWindow(QtWidgets.QWidget): QtWidgets.QShortcut(QtCore.Qt.Key_Escape, self, self.hide) layout = QtWidgets.QVBoxLayout() - self.setLayout(layout) + + scrollarea = QtWidgets.QScrollArea() + scrollarea.setWidgetResizable(True) + outer = QtWidgets.QVBoxLayout() + outer.addWidget(scrollarea) + widget = QtWidgets.QWidget() + widget.setLayout(layout) + scrollarea.setWidget(widget) + self.setLayout(outer) + self.resize( scrollarea.size() ) select_analysis_box = QtWidgets.QGroupBox("Select analysis") select_analysis_layout = QtWidgets.QFormLayout(select_analysis_box) diff --git a/NanoVNASaver/Windows/CalibrationSettings.py b/NanoVNASaver/Windows/CalibrationSettings.py index a2a8568..b52209e 100644 --- a/NanoVNASaver/Windows/CalibrationSettings.py +++ b/NanoVNASaver/Windows/CalibrationSettings.py @@ -59,7 +59,17 @@ class CalibrationWindow(QtWidgets.QWidget): right_layout = QtWidgets.QVBoxLayout() top_layout.addLayout(left_layout) top_layout.addLayout(right_layout) - self.setLayout(top_layout) + + scrollarea = QtWidgets.QScrollArea() + scrollarea.setWidgetResizable(True) + outer = QtWidgets.QVBoxLayout() + outer.addWidget(scrollarea) + widget = QtWidgets.QWidget() + widget.setLayout(top_layout) + scrollarea.setWidget(widget) + self.setLayout(outer) + self.resize( scrollarea.size() ) + calibration_status_group = QtWidgets.QGroupBox("Active calibration") calibration_status_layout = QtWidgets.QFormLayout() diff --git a/NanoVNASaver/Windows/DeviceSettings.py b/NanoVNASaver/Windows/DeviceSettings.py index cc3aad2..1d2d2fc 100644 --- a/NanoVNASaver/Windows/DeviceSettings.py +++ b/NanoVNASaver/Windows/DeviceSettings.py @@ -46,7 +46,16 @@ class DeviceSettingsWindow(QtWidgets.QWidget): right_layout = QtWidgets.QVBoxLayout() top_layout.addLayout(left_layout) top_layout.addLayout(right_layout) - self.setLayout(top_layout) + + scrollarea = QtWidgets.QScrollArea() + scrollarea.setWidgetResizable(True) + outer = QtWidgets.QVBoxLayout() + outer.addWidget(scrollarea) + widget = QtWidgets.QWidget() + widget.setLayout(top_layout) + scrollarea.setWidget(widget) + self.setLayout(outer) + self.resize( scrollarea.size() ) status_box = QtWidgets.QGroupBox("Status") status_layout = QtWidgets.QFormLayout(status_box) diff --git a/NanoVNASaver/Windows/DisplaySettings.py b/NanoVNASaver/Windows/DisplaySettings.py index 0bb77d9..55e0d34 100644 --- a/NanoVNASaver/Windows/DisplaySettings.py +++ b/NanoVNASaver/Windows/DisplaySettings.py @@ -44,7 +44,16 @@ class DisplaySettingsWindow(QtWidgets.QWidget): QtWidgets.QShortcut(QtCore.Qt.Key_Escape, self, self.hide) layout = QtWidgets.QHBoxLayout() - self.setLayout(layout) + + scrollarea = QtWidgets.QScrollArea() + scrollarea.setWidgetResizable(True) + outer = QtWidgets.QVBoxLayout() + outer.addWidget(scrollarea) + widget = QtWidgets.QWidget() + widget.setLayout(layout) + scrollarea.setWidget(widget) + self.setLayout(outer) + self.resize( scrollarea.size() ) left_layout = QtWidgets.QVBoxLayout() layout.addLayout(left_layout) diff --git a/NanoVNASaver/Windows/Files.py b/NanoVNASaver/Windows/Files.py index 1e4b673..de4e379 100644 --- a/NanoVNASaver/Windows/Files.py +++ b/NanoVNASaver/Windows/Files.py @@ -35,7 +35,16 @@ class FilesWindow(QtWidgets.QWidget): self.setMinimumWidth(200) QtWidgets.QShortcut(QtCore.Qt.Key_Escape, self, self.hide) file_window_layout = QtWidgets.QVBoxLayout() - self.setLayout(file_window_layout) + + scrollarea = QtWidgets.QScrollArea() + scrollarea.setWidgetResizable(True) + outer = QtWidgets.QVBoxLayout() + outer.addWidget(scrollarea) + widget = QtWidgets.QWidget() + widget.setLayout(file_window_layout) + scrollarea.setWidget(widget) + self.setLayout(outer) + self.resize( scrollarea.size() ) load_file_control_box = QtWidgets.QGroupBox("Import file") load_file_control_box.setMaximumWidth(300) diff --git a/NanoVNASaver/Windows/SweepSettings.py b/NanoVNASaver/Windows/SweepSettings.py index 633af16..54e73ca 100644 --- a/NanoVNASaver/Windows/SweepSettings.py +++ b/NanoVNASaver/Windows/SweepSettings.py @@ -40,7 +40,16 @@ class SweepSettingsWindow(QtWidgets.QWidget): QtWidgets.QShortcut(QtCore.Qt.Key_Escape, self, self.hide) layout = QtWidgets.QVBoxLayout() - self.setLayout(layout) + + scrollarea = QtWidgets.QScrollArea() + scrollarea.setWidgetResizable(True) + outer = QtWidgets.QVBoxLayout() + outer.addWidget(scrollarea) + widget = QtWidgets.QWidget() + widget.setLayout(layout) + scrollarea.setWidget(widget) + self.setLayout(outer) + self.resize( scrollarea.size() ) layout.addWidget(self.title_box()) layout.addWidget(self.settings_box()) diff --git a/NanoVNASaver/Windows/TDR.py b/NanoVNASaver/Windows/TDR.py index 74bbb53..578eefc 100644 --- a/NanoVNASaver/Windows/TDR.py +++ b/NanoVNASaver/Windows/TDR.py @@ -84,7 +84,16 @@ class TDRWindow(QtWidgets.QWidget): QtWidgets.QShortcut(QtCore.Qt.Key_Escape, self, self.hide) layout = QtWidgets.QFormLayout() - self.setLayout(layout) + + scrollarea = QtWidgets.QScrollArea() + scrollarea.setWidgetResizable(True) + outer = QtWidgets.QVBoxLayout() + outer.addWidget(scrollarea) + widget = QtWidgets.QWidget() + widget.setLayout(layout) + scrollarea.setWidget(widget) + self.setLayout(outer) + self.resize( scrollarea.size() ) self.tdr_velocity_dropdown = QtWidgets.QComboBox() for cable_name, velocity in CABLE_PARAMETERS: