From 84b315dad555824ce6471a857280633fb3e01106 Mon Sep 17 00:00:00 2001 From: Rainer Koschnick Date: Tue, 15 Jul 2025 21:00:09 +0200 Subject: [PATCH] WIP --- main.py | 6 +++--- readdisk.py | 2 -- settings.json | 45 --------------------------------------------- ui/1 | 2 -- ui/designer.sh | 2 +- 5 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 settings.json delete mode 100644 ui/1 diff --git a/main.py b/main.py index 1cde450..87a7c84 100644 --- a/main.py +++ b/main.py @@ -86,9 +86,7 @@ class MainWindow(QtWidgets.QMainWindow): self.settings = self.get_defaults() self.save_settings(self.profile) self.populate_profiles() - - self.ui.combo_profile.setCurrentText(self.profile) - self.on_combo_profile_changed(self.profile) + self.ui.combo_port.setCurrentText(self.settings.get("device", "Auto")) def on_pb_delete_profile(self): """Delete the currently selected profile and load the previous one, or defaults if none remain.""" @@ -220,11 +218,13 @@ class MainWindow(QtWidgets.QMainWindow): for fname in os.listdir(config_dir): if fname.endswith('.json'): profiles.append(fname[:-5]) + self.ui.combo_profile.blockSignals(True) self.ui.combo_profile.clear() self.ui.combo_profile.addItems(sorted(profiles)) # Optionally, set current profile if self.profile in profiles: self.ui.combo_profile.setCurrentText(self.profile) + self.ui.combo_profile.blockSignals(False) if __name__ == "__main__": app = QtWidgets.QApplication(sys.argv) diff --git a/readdisk.py b/readdisk.py index a3853af..820d82f 100644 --- a/readdisk.py +++ b/readdisk.py @@ -60,12 +60,10 @@ class ReadDiskWindow(QDialog): self.ui.le_adjust_speed.textChanged.connect(self.on_update_settings) self.ui.le_suffix.textChanged.connect(self.on_update_settings) self.ui.le_fileprefix.textChanged.connect(self.on_update_settings) - self.ui.btn_file_select.clicked.connect(self.on_btn_file_select_clicked) self.ui.cb_format.toggled.connect(self.on_update_settings) self.ui.cb_inc.toggled.connect(self.on_update_settings) self.ui.btn_launch.clicked.connect(self.on_launch) self.ui.btn_back.clicked.connect(self.reject) - self.ui.btn_path_select.clicked.connect(self.on_btn_path_select_clicked) # Initialize command attribute self.command = "" diff --git a/settings.json b/settings.json deleted file mode 100644 index 52de9da..0000000 --- a/settings.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "fileprefix": "Test", - "filepath": "/home/arkay/Emulation/Disks/Test", - "double_step_enabled": true, - "double_step_value": "1", - "fake_index_enabled": true, - "fake_index_value": "300", - "fake_index_unit": "rpm", - "bitrate_enabled": true, - "bitrate_value": "250", - "revs_enabled": true, - "revs_value": "3", - "drive_select_enabled": true, - "drive_select_value": "B", - "retries_enabled": true, - "retries_value": "3", - "pllspec_enabled": true, - "pll_period": "5", - "pll_phase": "60", - "pll_lowpass": "", - "head_sets_enabled": true, - "head_sets_value": "0-1", - "head_swap_enabled": true, - "ss_legacy_enabled": true, - "cylinder_sets_enabled": true, - "cylinder_sets_value": "0-34,35-79", - "rev_track_data_enabled": true, - "hard_sectors_enabled": true, - "no_clobber_enabled": true, - "raw_enabled": true, - "pin2_enabled": true, - "pin2_high": false, - "pin2_low": true, - "flippy_enabled": true, - "flippy_panasonic": false, - "flippy_teac": true, - "\"adjust_speed_enabled": true, - "adjust_speed_value": "300", - "adjust_speed_unit": "rpm", - "suffix_value": "1", - "inc_enabled": true, - "format_enabled": false, - "format_value": "acorn.adfs.160", - "disktype_value": ".adf" -} \ No newline at end of file diff --git a/ui/1 b/ui/1 deleted file mode 100644 index 9e47290..0000000 --- a/ui/1 +++ /dev/null @@ -1,2 +0,0 @@ -qt.pysideplugin: Environment variable PYSIDE_DESIGNER_PLUGINS is not set, bailing out. -qt.pysideplugin: No instance of QPyDesignerCustomWidgetCollection was found. diff --git a/ui/designer.sh b/ui/designer.sh index 1643abe..aacf572 100755 --- a/ui/designer.sh +++ b/ui/designer.sh @@ -1,2 +1,2 @@ #!/bin/sh -pyside6-designer 2>1 >/dev/null & +pyside6-designer >/dev/null 2>&1 &