From 5bed1bc6cc49c8529390f20ddb36076d6789ceef Mon Sep 17 00:00:00 2001 From: t52ta6ek <24543390+t52ta6ek@users.noreply.github.com> Date: Sun, 30 Jul 2023 08:52:49 +0200 Subject: [PATCH] Control panel width increased a few pixels to allow Markers -> "reference" checkbox to be capitalized like the other checkboxes and radio buttons. Now able to be displayed as "Reference" without cutting off the text of the "Enable Delta Marker" checkbox. (#665) Added icon_48x48.ico so that pyinstaller/auto-py-to-exe can create a Windows executable with the actual NanoVNA-Saver project icon instead of a generic Python icon. The .ico was created by converting the icon_48x48.png image. "Files" button in control panel changed to "Files ..." to be consistent with other "..." actions where a user will take additional action after pressing the button. Minor corrections in the Calibration page "Are you sure?" and "Calibration assistant" pop-ups where text was being run together. e.g. "doso" instead of "do so" etc. Fix issue: #663 --- icon_48x48.ico | Bin 0 -> 111849 bytes src/NanoVNASaver/Controls/Control.py | 2 +- src/NanoVNASaver/Controls/MarkerControl.py | 2 +- src/NanoVNASaver/NanoVNASaver.py | 7 +---- .../Windows/CalibrationSettings.py | 28 +++++++++--------- 5 files changed, 17 insertions(+), 22 deletions(-) create mode 100644 icon_48x48.ico diff --git a/icon_48x48.ico b/icon_48x48.ico new file mode 100644 index 0000000000000000000000000000000000000000..d761214d0180395b860ece78d89ddfef95cf1a21 GIT binary patch literal 111849 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 PU#SDz30`54UnBK@dfC7g literal 0 HcmV?d00001 diff --git a/src/NanoVNASaver/Controls/Control.py b/src/NanoVNASaver/Controls/Control.py index 6ab4e85..43275e8 100644 --- a/src/NanoVNASaver/Controls/Control.py +++ b/src/NanoVNASaver/Controls/Control.py @@ -29,6 +29,6 @@ class Control(QtWidgets.QGroupBox): def __init__(self, app: QtWidgets.QWidget, title: str = ""): super().__init__() self.app = app - self.setMaximumWidth(240) + self.setMaximumWidth(250) self.setTitle(title) self.layout = QtWidgets.QFormLayout(self) diff --git a/src/NanoVNASaver/Controls/MarkerControl.py b/src/NanoVNASaver/Controls/MarkerControl.py index 1282e02..6cb6b21 100644 --- a/src/NanoVNASaver/Controls/MarkerControl.py +++ b/src/NanoVNASaver/Controls/MarkerControl.py @@ -55,7 +55,7 @@ class MarkerControl(Control): self.check_delta = QCheckBox("Enable Delta Marker") self.check_delta.toggled.connect(self.toggle_delta) - self.check_delta_reference = QCheckBox("reference") + self.check_delta_reference = QCheckBox("Reference") self.check_delta_reference.toggled.connect(self.toggle_delta_reference) layout2 = QtWidgets.QHBoxLayout() diff --git a/src/NanoVNASaver/NanoVNASaver.py b/src/NanoVNASaver/NanoVNASaver.py index 993c829..a3d3a6e 100644 --- a/src/NanoVNASaver/NanoVNASaver.py +++ b/src/NanoVNASaver/NanoVNASaver.py @@ -373,7 +373,6 @@ class NanoVNASaver(QWidget): tdr_control_box.setTitle("TDR") tdr_control_layout = QtWidgets.QFormLayout() tdr_control_box.setLayout(tdr_control_layout) - tdr_control_box.setMaximumWidth(240) self.tdr_result_label = QtWidgets.QLabel() self.tdr_result_label.setMinimumHeight(20) @@ -407,7 +406,6 @@ class NanoVNASaver(QWidget): ############################################################### reference_control_box = QtWidgets.QGroupBox() - reference_control_box.setMaximumWidth(240) reference_control_box.setTitle("Reference sweep") reference_control_layout = QtWidgets.QFormLayout(reference_control_box) @@ -447,18 +445,15 @@ class NanoVNASaver(QWidget): btn_display_setup = QtWidgets.QPushButton("Display setup ...") btn_display_setup.setMinimumHeight(20) - btn_display_setup.setMaximumWidth(240) btn_display_setup.clicked.connect(lambda: self.display_window("setup")) btn_about = QtWidgets.QPushButton("About ...") btn_about.setMinimumHeight(20) - btn_about.setMaximumWidth(240) btn_about.clicked.connect(lambda: self.display_window("about")) - btn_open_file_window = QtWidgets.QPushButton("Files") + btn_open_file_window = QtWidgets.QPushButton("Files ...") btn_open_file_window.setMinimumHeight(20) - btn_open_file_window.setMaximumWidth(240) btn_open_file_window.clicked.connect( lambda: self.display_window("file") diff --git a/src/NanoVNASaver/Windows/CalibrationSettings.py b/src/NanoVNASaver/Windows/CalibrationSettings.py index 95e0cd2..9f66a7b 100644 --- a/src/NanoVNASaver/Windows/CalibrationSettings.py +++ b/src/NanoVNASaver/Windows/CalibrationSettings.py @@ -271,14 +271,14 @@ class CalibrationWindow(QtWidgets.QWidget): self, "Are you sure?", ( - "Use of the manual calibration buttons is non-intuitive," + "Use of the manual calibration buttons is non-intuitive" " and primarily suited for users with very specialized" - " needs. The buttons do not sweep for you, nor do" + " needs. The buttons do not sweep for you nor do" " they interact with the NanoVNA calibration.\n\n" "If you are trying to do a calibration of the NanoVNA, do" - "so on the device itself instead. If you are trying to do" - "a calibration with NanoVNA-Saver, use the Calibration" - "Assistant if possible.\n\n" + " so on the device itself instead. If you are trying to do" + ' a calibration with NanoVNA-Saver, use the "Calibration' + ' assistant" if possible.\n\n' "If you are certain you know what you are doing, click" " Yes." ), @@ -580,7 +580,7 @@ class CalibrationWindow(QtWidgets.QWidget): cal_element.open_c3 = ( getFloatValue(self.open_c3_input.text()) / 1.0e45 ) - cal_element.openLength = ( + cal_element.open_length = ( getFloatValue(self.open_length.text()) / 1.0e12 ) @@ -711,16 +711,16 @@ class CalibrationWindow(QtWidgets.QWidget): "Calibration assistant", ( "This calibration assistant will help you create a calibration" - " in the NanoVNASaver application. It will sweep the" - "standards for you, and guide you through the process.

" + " in the NanoVNASaver application. It will sweep the" + " standards for you and guide you through the process.

" "Before starting, ensure you have Open, Short and Load" - " standards available, and the cables you wish to have" - " calibrated with the device connected.

" + " standards available and the cables you wish to have" + " calibrated connected to the device.

" 'If you want a 2-port calibration, also have a "through"' - " connector to hand.

" + " connector on hand.

" "The best results are achieved by having the NanoVNA" - " calibrated on-device for the full span of interest and saved" - " to save slot 0 before starting.

" + " calibrated on-device for the full span of interest and stored" + " in save slot 0 before starting.

" "Once you are ready to proceed, press Ok." ), QtWidgets.QMessageBox.StandardButton.Ok | QtWidgets.QMessageBox.StandardButton.Cancel, @@ -932,7 +932,7 @@ class CalibrationWindow(QtWidgets.QWidget): QtWidgets.QMessageBox.Icon.Information, "Calibrate complete", ( - "The calibration process is now complete. Press" + "The calibration process is now complete. Press" ' "Apply" to apply the calibration parameters.' ), QtWidgets.QMessageBox.StandardButton.Apply | QtWidgets.QMessageBox.StandardButton.Cancel,