From 863c9b0935c5cfbe3617f45ed2b48d88935ecd5f Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 26 Jul 2025 01:48:36 +0500 Subject: [PATCH 1/8] Qt: Fix enums in .ui files Should stop Qt Designer from complaining --- src/qt/qt_keybind.ui | 8 ++++---- src/qt/qt_openglshaderconfig.ui | 10 +++++----- src/qt/qt_openglshadermanagerdialog.ui | 22 +++++++++++----------- src/qt/qt_progsettings.ui | 12 ++++++------ src/qt/qt_settingsinput.ui | 4 ++-- src/qt/qt_settingsmachine.ui | 8 ++++---- src/qt/qt_vmmanager_mainwindow.ui | 10 +++++----- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/qt/qt_keybind.ui b/src/qt/qt_keybind.ui index 835e12020..7bd8a8a62 100644 --- a/src/qt/qt_keybind.ui +++ b/src/qt/qt_keybind.ui @@ -22,7 +22,7 @@ Enter key combo: - Qt::AlignmentFlag::AlignCenter + Qt::AlignCenter @@ -31,17 +31,17 @@ - Qt::Orientation::Horizontal + Qt::Horizontal - Qt::Orientation::Horizontal + Qt::Horizontal - QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok + QDialogButtonBox::Cancel|QDialogButtonBox::Ok diff --git a/src/qt/qt_openglshaderconfig.ui b/src/qt/qt_openglshaderconfig.ui index 1aebdb6f6..dc743f57e 100644 --- a/src/qt/qt_openglshaderconfig.ui +++ b/src/qt/qt_openglshaderconfig.ui @@ -15,7 +15,7 @@ - QLayout::SizeConstraint::SetMinAndMaxSize + QLayout::SetMinAndMaxSize @@ -33,10 +33,10 @@ - QLayout::SizeConstraint::SetMaximumSize + QLayout::SetMaximumSize - QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow + QFormLayout::AllNonFixedFieldsGrow @@ -45,10 +45,10 @@ - Qt::Orientation::Horizontal + Qt::Horizontal - QDialogButtonBox::StandardButton::Apply|QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok|QDialogButtonBox::StandardButton::Reset + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset diff --git a/src/qt/qt_openglshadermanagerdialog.ui b/src/qt/qt_openglshadermanagerdialog.ui index 2a72c69ed..e28dcc7e9 100644 --- a/src/qt/qt_openglshadermanagerdialog.ui +++ b/src/qt/qt_openglshadermanagerdialog.ui @@ -15,7 +15,7 @@ - QLayout::SizeConstraint::SetFixedSize + QLayout::SetFixedSize @@ -24,22 +24,22 @@ - QLayout::SizeConstraint::SetFixedSize + QLayout::SetFixedSize - QAbstractItemView::DragDropMode::InternalMove + QAbstractItemView::InternalMove - QAbstractItemView::SelectionBehavior::SelectItems + QAbstractItemView::SelectItems - QLayout::SizeConstraint::SetFixedSize + QLayout::SetFixedSize @@ -58,7 +58,7 @@ - Qt::Orientation::Vertical + Qt::Vertical @@ -95,7 +95,7 @@ - Qt::Orientation::Vertical + Qt::Vertical @@ -108,10 +108,10 @@ - Qt::Orientation::Vertical + Qt::Vertical - QDialogButtonBox::StandardButton::Apply|QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok false @@ -130,7 +130,7 @@ - QLayout::SizeConstraint::SetDefaultConstraint + QLayout::SetDefaultConstraint @@ -151,7 +151,7 @@ 60 - Qt::Orientation::Horizontal + Qt::Horizontal false diff --git a/src/qt/qt_progsettings.ui b/src/qt/qt_progsettings.ui index 6020efd77..39c757407 100644 --- a/src/qt/qt_progsettings.ui +++ b/src/qt/qt_progsettings.ui @@ -27,7 +27,7 @@ - QLayout::SizeConstraint::SetFixedSize + QLayout::SetFixedSize @@ -39,7 +39,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -74,7 +74,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -109,7 +109,7 @@ 100 - Qt::Orientation::Horizontal + Qt::Horizontal @@ -130,10 +130,10 @@ - Qt::Orientation::Horizontal + Qt::Horizontal - QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok + QDialogButtonBox::Cancel|QDialogButtonBox::Ok diff --git a/src/qt/qt_settingsinput.ui b/src/qt/qt_settingsinput.ui index 07351f4d2..8436c3a9d 100644 --- a/src/qt/qt_settingsinput.ui +++ b/src/qt/qt_settingsinput.ui @@ -141,7 +141,7 @@ - QAbstractItemView::EditTrigger::NoEditTriggers + QAbstractItemView::NoEditTriggers false @@ -153,7 +153,7 @@ true - QAbstractItemView::SelectionBehavior::SelectRows + QAbstractItemView::SelectRows diff --git a/src/qt/qt_settingsmachine.ui b/src/qt/qt_settingsmachine.ui index f677ea178..f4bbdcd04 100644 --- a/src/qt/qt_settingsmachine.ui +++ b/src/qt/qt_settingsmachine.ui @@ -127,7 +127,7 @@ Frequency: - Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -302,7 +302,7 @@ - Qt::Orientation::Horizontal + Qt::Horizontal @@ -362,7 +362,7 @@ CPU frame size - Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -385,7 +385,7 @@ - Qt::Orientation::Vertical + Qt::Vertical diff --git a/src/qt/qt_vmmanager_mainwindow.ui b/src/qt/qt_vmmanager_mainwindow.ui index 0c8dac8bc..1067c1e49 100644 --- a/src/qt/qt_vmmanager_mainwindow.ui +++ b/src/qt/qt_vmmanager_mainwindow.ui @@ -56,7 +56,7 @@ - Qt::ToolButtonStyle::ToolButtonIconOnly + Qt::ToolButtonIconOnly TopToolBarArea @@ -157,7 +157,7 @@ &Settings... - QAction::MenuRole::NoRole + QAction::NoRole false @@ -183,7 +183,7 @@ Preferences - QAction::MenuRole::PreferencesRole + QAction::PreferencesRole @@ -208,13 +208,13 @@ - + &Exit - QAction::MenuRole::QuitRole + QAction::QuitRole From 4a2f3815795cacdb9efc0e124494fdc9cec3bb8d Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 26 Jul 2025 03:04:14 +0500 Subject: [PATCH 2/8] Add "Printer" to the name of generic ESC/P printer Fixes broken translations --- src/printer/prt_escp.c | 2 +- src/qt/languages/tr-TR.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c index 1855df380..96afcd4a5 100644 --- a/src/printer/prt_escp.c +++ b/src/printer/prt_escp.c @@ -2097,7 +2097,7 @@ escp_close(void *priv) } const lpt_device_t lpt_prt_escp_device = { - .name = "Generic ESC/P Dot-Matrix", + .name = "Generic ESC/P Dot-Matrix Printer", .internal_name = "dot_matrix", .init = escp_init, .close = escp_close, diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po index bcba2cd73..f6250c347 100644 --- a/src/qt/languages/tr-TR.po +++ b/src/qt/languages/tr-TR.po @@ -2245,7 +2245,7 @@ msgid "Generic Text Printer" msgstr "Genel Metin Yazıcı" msgid "Generic ESC/P Dot-Matrix Printer" -msgstr "Genel ESC/P Dot-Matrix" +msgstr "Genel ESC/P Dot-Matrix Yazıcı" msgid "Generic PostScript Printer" msgstr "Genel PostScript Yazıcı" From fd82e00294d56568c45e5640d83cd8a8d474796b Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Thu, 31 Jul 2025 01:58:47 +0500 Subject: [PATCH 3/8] Qt: Fix keyboard/mouse configure buttons not being enabled under certain circumstances --- src/qt/qt_settingsinput.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qt/qt_settingsinput.cpp b/src/qt/qt_settingsinput.cpp index 3b5bab51a..11aaf811e 100644 --- a/src/qt/qt_settingsinput.cpp +++ b/src/qt/qt_settingsinput.cpp @@ -140,6 +140,7 @@ SettingsInput::onCurrentMachineChanged(int machineId) c++; } keyboardModel->removeRows(0, removeRows); + ui->comboBoxKeyboard->setCurrentIndex(-1); ui->comboBoxKeyboard->setCurrentIndex(selectedRow); if ((c == 1) || has_int_kbd) @@ -171,6 +172,7 @@ SettingsInput::onCurrentMachineChanged(int machineId) selectedRow = row - removeRows; } mouseModel->removeRows(0, removeRows); + ui->comboBoxMouse->setCurrentIndex(-1); ui->comboBoxMouse->setCurrentIndex(selectedRow); int i = 0; @@ -287,6 +289,8 @@ SettingsInput::on_pushButtonClearBind_clicked() void SettingsInput::on_comboBoxKeyboard_currentIndexChanged(int index) { + if (index < 0) + return; int keyboardId = ui->comboBoxKeyboard->currentData().toInt(); ui->pushButtonConfigureKeyboard->setEnabled(keyboard_has_config(keyboardId) > 0); } @@ -294,6 +298,8 @@ SettingsInput::on_comboBoxKeyboard_currentIndexChanged(int index) void SettingsInput::on_comboBoxMouse_currentIndexChanged(int index) { + if (index < 0) + return; int mouseId = ui->comboBoxMouse->currentData().toInt(); ui->pushButtonConfigureMouse->setEnabled(mouse_has_config(mouseId) > 0); } From 47a63e9545f3408e495e06f2dc0c79641a4a0a3f Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 27 Jul 2025 04:11:28 +0500 Subject: [PATCH 4/8] Qt: Fix removable disk type not being on its own row --- src/qt/qt_settingsotherremovable.ui | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qt/qt_settingsotherremovable.ui b/src/qt/qt_settingsotherremovable.ui index 6a5d509a9..0cb5a1056 100644 --- a/src/qt/qt_settingsotherremovable.ui +++ b/src/qt/qt_settingsotherremovable.ui @@ -152,29 +152,29 @@ - - + + Bus: - + 30 - + Channel: - + 30 From 1ead412ff554b7955051fea10a44d4a101df37fb Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 26 Jul 2025 13:22:19 +0500 Subject: [PATCH 5/8] qt_deviceconfig.cpp: Use `QString::split` with Qt >= 5.14 --- src/qt/qt_deviceconfig.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/qt/qt_deviceconfig.cpp b/src/qt/qt_deviceconfig.cpp index 255b3c39f..33572c99c 100644 --- a/src/qt/qt_deviceconfig.cpp +++ b/src/qt/qt_deviceconfig.cpp @@ -282,20 +282,30 @@ DeviceConfig::ProcessConfig(void *dc, const void *c, const bool is_dep) fileField->setObjectName(config->name); fileField->setFileName(selected); /* Get the actually used part of the filter */ +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) QString filter = QString(config->file_filter).left(static_cast(strcspn(config->file_filter, "|"))); +#else + QString filter = QString(config->file_filter).split("|").at(0); +#endif /* Extract the description and the extension list */ QRegularExpressionMatch match = QRegularExpression("(.+) \\((.+)\\)$").match(filter); QString description = match.captured(1); QString extensions = match.captured(2); - QStringList extensionList; /* Split the extension list up and strip the filename globs */ QRegularExpression re("\\*\\.(.*)"); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + QStringList extensionList; int i = 0; while (extensions.section(' ', i, i) != "") { QString extension = re.match(extensions.section(' ', i, i)).captured(1); extensionList.append(extension); i++; } +#else + QStringList extensionList = extensions.split(" "); + for (int i = 0; i < extensionList.count(); i++) + extensionList[i] = re.match(extensionList[i]).captured(1); +#endif fileField->setFilter(tr(description.toUtf8().constData()) % util::DlgFilter(extensionList) % tr("All files") % util::DlgFilter({ "*" }, true)); this->ui->formLayout->addRow(tr(config->description), fileField); break; From 8d089b13cbf5d2b3c60fe03abc08c1e12db6c27b Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 26 Jul 2025 03:10:01 +0500 Subject: [PATCH 6/8] Qt: fix a benign logic error --- src/qt/qt_progsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qt_progsettings.cpp b/src/qt/qt_progsettings.cpp index 825689e78..5dfae866e 100644 --- a/src/qt/qt_progsettings.cpp +++ b/src/qt/qt_progsettings.cpp @@ -173,7 +173,7 @@ ProgSettings::languageCodeToId(QString langCode) QString ProgSettings::languageIdToCode(int id) { - if ((id == 0) || (id >= languages.length())) { + if ((id <= 0) || (id >= languages.length())) { return "system"; } return languages[id].first; From ad59092ffe7ce65b34ba3ca16ba23c6997693a0c Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 26 Jul 2025 14:42:32 +0500 Subject: [PATCH 7/8] qt_mainwindow.{cpp,ui}: Minor cleanup --- src/qt/qt_mainwindow.cpp | 2 -- src/qt/qt_mainwindow.ui | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 03bff88c3..b727dd5ef 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -304,8 +304,6 @@ MainWindow::MainWindow(QWidget *parent) } } #endif - ui->actionPause->setChecked(false); - ui->actionPause->setCheckable(false); }); connect(this, &MainWindow::getTitleForNonQtThread, this, &MainWindow::getTitle_, Qt::BlockingQueuedConnection); diff --git a/src/qt/qt_mainwindow.ui b/src/qt/qt_mainwindow.ui index 63bc0b01b..992a9a0d4 100644 --- a/src/qt/qt_mainwindow.ui +++ b/src/qt/qt_mainwindow.ui @@ -341,9 +341,6 @@ - - true - :/menuicons/qt/icons/pause.ico:/menuicons/qt/icons/pause.ico From 867c9d8544811195410c5a2712a95882b8568c63 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sat, 26 Jul 2025 14:41:20 +0500 Subject: [PATCH 8/8] Qt: .ui cleanup and tab order fixes ALso fixes the uneven groupbox size on the machine settings page --- src/qt/qt_harddiskdialog.ui | 303 +++++++++++---------- src/qt/qt_openglshadermanagerdialog.ui | 148 +++++------ src/qt/qt_progsettings.ui | 106 ++++---- src/qt/qt_settingsfloppycdrom.ui | 11 + src/qt/qt_settingsmachine.ui | 334 ++++++++++++++---------- src/qt/qt_settingsotherperipherals.ui | 26 ++ src/qt/qt_settingsotherremovable.ui | 10 + src/qt/qt_settingsstoragecontrollers.ui | 23 ++ 8 files changed, 534 insertions(+), 427 deletions(-) diff --git a/src/qt/qt_harddiskdialog.ui b/src/qt/qt_harddiskdialog.ui index cba835134..e2dea0220 100644 --- a/src/qt/qt_harddiskdialog.ui +++ b/src/qt/qt_harddiskdialog.ui @@ -32,87 +32,24 @@ Dialog - - - - false - - - 0 - - - true - - - - - + + - Sectors: - - - - - - - Image Format: - - - - - - - 30 - - - - - - - Bus: + File name: - - + + - Type: + Cylinders: - - - - - 0 - 0 - - - - - 64 - 16777215 - - - - 32767 - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - + @@ -128,58 +65,14 @@ - + Heads: - - - - - 0 - 0 - - - - - 64 - 16777215 - - - - - - - - 30 - - - - - - - Cylinders: - - - - - - - File name: - - - - - - - Size (MB): - - - - + @@ -198,28 +91,153 @@ - - + + - Channel: + Sectors: - + + + + + 0 + 0 + + + + + 64 + 16777215 + + + + 32767 + + + + + + + Size (MB): + + + + + + + + 0 + 0 + + + + + 64 + 16777215 + + + + + + + + Type: + + + + 30 - + + + + Bus: + + + + + + + 30 + + + + + + + Channel: + + + + + + + 30 + + + + + + + Model: + + + + + + + 30 + + + + + + + Image Format: + + + + + + + 30 + + + + Block Size: - + + + + 30 + + + + + + + false + + + 0 + + + true + + + + Qt::Vertical @@ -232,31 +250,13 @@ - - - - Model: + + + + Qt::Horizontal - - - - - - 30 - - - - - - - 30 - - - - - - - 30 + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -270,17 +270,6 @@ 1 - - lineEditCylinders - lineEditHeads - lineEditSectors - lineEditSize - comboBoxType - comboBoxBus - comboBoxChannel - comboBoxFormat - comboBoxBlockSize - diff --git a/src/qt/qt_openglshadermanagerdialog.ui b/src/qt/qt_openglshadermanagerdialog.ui index e28dcc7e9..82006c713 100644 --- a/src/qt/qt_openglshadermanagerdialog.ui +++ b/src/qt/qt_openglshadermanagerdialog.ui @@ -17,6 +17,80 @@ QLayout::SetFixedSize + + + + Render behavior + + + + QLayout::SetDefaultConstraint + + + + + Synchronize with video + + + true + + + + + + + Use target framerate: + + + + + + + 15 + + + 240 + + + 60 + + + Qt::Horizontal + + + false + + + false + + + + + + + fps + + + 15 + + + 240 + + + 60 + + + + + + + VSync + + + + + + @@ -123,80 +197,6 @@ - - - - Render behavior - - - - QLayout::SetDefaultConstraint - - - - - Use target framerate: - - - - - - - 15 - - - 240 - - - 60 - - - Qt::Horizontal - - - false - - - false - - - - - - - Synchronize with video - - - true - - - - - - - VSync - - - - - - - fps - - - 15 - - - 240 - - - 60 - - - - - - diff --git a/src/qt/qt_progsettings.ui b/src/qt/qt_progsettings.ui index 39c757407..abaee5019 100644 --- a/src/qt/qt_progsettings.ui +++ b/src/qt/qt_progsettings.ui @@ -29,26 +29,13 @@ QLayout::SetFixedSize - - + + - Default + Language: - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -61,16 +48,6 @@ - - - - <html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html> - - - Select media images from program working directory - - - @@ -84,13 +61,20 @@ - - + + Default + + + + Mouse sensitivity: + + + @@ -113,27 +97,33 @@ - - - - Language: - - - - - - - Ask for confirmation before saving settings - - - - - + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + 40 + 20 + + + + + + + + Default + + + + + + + <html><head/><body><p>When selecting media images (CD-ROM, floppy, etc.) the open dialog will start in the same directory as the 86Box configuration file. This setting will likely only make a difference on macOS.</p></body></html> + + + Select media images from program working directory @@ -144,10 +134,17 @@ - - + + - Mouse sensitivity: + Ask for confirmation before saving settings + + + + + + + Ask for confirmation before quitting @@ -158,10 +155,13 @@ - - - - Ask for confirmation before quitting + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok diff --git a/src/qt/qt_settingsfloppycdrom.ui b/src/qt/qt_settingsfloppycdrom.ui index 7dde46631..6b1036b5c 100644 --- a/src/qt/qt_settingsfloppycdrom.ui +++ b/src/qt/qt_settingsfloppycdrom.ui @@ -200,6 +200,17 @@ + + tableViewFloppy + comboBoxFloppyType + checkBoxTurboTimings + checkBoxCheckBPB + tableViewCDROM + comboBoxBus + comboBoxChannel + comboBoxSpeed + comboBoxCDROMType + diff --git a/src/qt/qt_settingsmachine.ui b/src/qt/qt_settingsmachine.ui index f4bbdcd04..7ed70a5cf 100644 --- a/src/qt/qt_settingsmachine.ui +++ b/src/qt/qt_settingsmachine.ui @@ -41,6 +41,13 @@ 0 + + + + Machine type: + + + @@ -48,42 +55,49 @@ - - + + - FPU: + Machine: - - - - Memory: - - - - - - - 30 - - - - - - - - 0 - 0 - - - - - - - - Machine type: - + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 30 + + + + + + + + 0 + 0 + + + + Configure + + + + @@ -147,6 +161,20 @@ + + + + FPU: + + + + + + + 30 + + + @@ -154,51 +182,6 @@ - - - - Machine: - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 30 - - - - - - - - 0 - 0 - - - - Configure - - - - - - @@ -250,6 +233,23 @@ + + + + Memory: + + + + + + + + 0 + 0 + + + + @@ -315,72 +315,102 @@ - - - - 0 - 0 - - - - Time synchronization - - - - - - Disabled - - - - - - - Enabled (UTC) - - - - - - - Enabled (local time) - - - - - - - - - - - 0 - 0 - - - - CPU frame size - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - Larger frames (less smooth) - - - - - - - Smaller frames (smoother) - - - - - + + + + + + 0 + 0 + + + + CPU frame size + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + Larger frames (less smooth) + + + + + + + Smaller frames (smoother) + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Time synchronization + + + + + + Disabled + + + + + + + Enabled (local time) + + + + + + + Enabled (UTC) + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -397,6 +427,24 @@ + + comboBoxMachineType + comboBoxMachine + pushButtonConfigure + comboBoxCPU + comboBoxSpeed + comboBoxFPU + comboBoxWaitStates + comboBoxPitMode + spinBoxRAM + checkBoxDynamicRecompiler + checkBoxFPUSoftfloat + radioButtonDisabled + radioButtonLocalTime + radioButtonUTC + radioButtonLargerFrames + radioButtonSmallerFrames + diff --git a/src/qt/qt_settingsotherperipherals.ui b/src/qt/qt_settingsotherperipherals.ui index 5c6b8fbf0..0a366b833 100644 --- a/src/qt/qt_settingsotherperipherals.ui +++ b/src/qt/qt_settingsotherperipherals.ui @@ -382,6 +382,32 @@ + + comboBoxRTC + pushButtonConfigureRTC + comboBoxIsaMemCard1 + pushButtonConfigureIsaMemCard1 + comboBoxIsaMemCard2 + pushButtonConfigureIsaMemCard2 + comboBoxIsaMemCard3 + pushButtonConfigureIsaMemCard3 + comboBoxIsaMemCard4 + pushButtonConfigureIsaMemCard4 + comboBoxIsaRomCard1 + pushButtonConfigureIsaRomCard1 + comboBoxIsaRomCard2 + pushButtonConfigureIsaRomCard2 + comboBoxIsaRomCard3 + pushButtonConfigureIsaRomCard3 + comboBoxIsaRomCard4 + pushButtonConfigureIsaRomCard4 + checkBoxISABugger + checkBoxPOSTCard + checkBoxUnitTester + pushButtonConfigureUT + checkBoxKeyCard + pushButtonConfigureKeyCard + diff --git a/src/qt/qt_settingsotherremovable.ui b/src/qt/qt_settingsotherremovable.ui index 0cb5a1056..8224d67f6 100644 --- a/src/qt/qt_settingsotherremovable.ui +++ b/src/qt/qt_settingsotherremovable.ui @@ -200,6 +200,16 @@ + + tableViewMO + comboBoxMOBus + comboBoxMOChannel + comboBoxMOType + tableViewRDisk + comboBoxRDiskBus + comboBoxRDiskChannel + comboBoxRDiskType + diff --git a/src/qt/qt_settingsstoragecontrollers.ui b/src/qt/qt_settingsstoragecontrollers.ui index 32798a97b..2d6fa9d32 100644 --- a/src/qt/qt_settingsstoragecontrollers.ui +++ b/src/qt/qt_settingsstoragecontrollers.ui @@ -328,6 +328,29 @@ + + comboBoxFD + pushButtonFD + comboBoxCDInterface + pushButtonCDInterface + comboBoxHD1 + pushButtonHD1 + comboBoxHD2 + pushButtonHD2 + comboBoxHD3 + pushButtonHD3 + comboBoxHD4 + pushButtonHD4 + comboBoxSCSI1 + pushButtonSCSI1 + comboBoxSCSI2 + pushButtonSCSI2 + comboBoxSCSI3 + pushButtonSCSI3 + comboBoxSCSI4 + pushButtonSCSI4 + checkBoxCassette +