From e151dbbaa22504eac300aff9baeaa9ee27f53480 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Mon, 25 May 2026 09:20:55 -0400
Subject: [PATCH] Add Tandy CoCo to UI; standardise space before units.

---
 OSBindings/Qt/mainwindow.cpp | 18 ++++++++++-
 OSBindings/Qt/mainwindow.h   |  1 +
 OSBindings/Qt/mainwindow.ui  | 58 ++++++++++++++++++++++++++++++++----
 3 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/OSBindings/Qt/mainwindow.cpp b/OSBindings/Qt/mainwindow.cpp
index 4c6877216..cdf99be47 100644
--- a/OSBindings/Qt/mainwindow.cpp
+++ b/OSBindings/Qt/mainwindow.cpp
@@ -14,9 +14,9 @@
 #include <cstdio>
 #include <memory>
 
+#include "../../Configurable/StandardOptions.hpp"
 #include "../../Machines/Utility/ROMLibrary.hpp"
 #include "../../Numeric/CRC.hpp"
-#include "../../Configurable/StandardOptions.hpp"
 
 namespace {
 
@@ -1024,6 +1024,7 @@ void MainWindow::setButtonPressed(const int index, const bool isPressed) {
 #include "../../Analyser/Static/MSX/Target.hpp"
 #include "../../Analyser/Static/Oric/Target.hpp"
 #include "../../Analyser/Static/PCCompatible/Target.hpp"
+#include "../../Analyser/Static/TandyCoCo/Target.hpp"
 #include "../../Analyser/Static/Thomson/Target.hpp"
 #include "../../Analyser/Static/ZX8081/Target.hpp"
 #include "../../Analyser/Static/ZXSpectrum/Target.hpp"
@@ -1283,6 +1284,17 @@ void MainWindow::start_spectrum() {
 	launchTarget(std::move(target));
 }
 
+void MainWindow::start_tandyCoCo() {
+	using Target = Analyser::Static::TandyCoCo::Target;
+	auto target = std::make_unique<Target>();
+	switch(ui->tandyCoCoMemorySizeComboBox->currentIndex()) {
+		default:	target->memory_size = Target::MemorySize::ThirtyTwoKB;		break;
+		case 1:		target->memory_size = Target::MemorySize::SixtyFourKB;		break;
+	}
+	target->has_disk_drive = ui->tandyCoCoDiskDriveCheckBox->isChecked();
+	launchTarget(std::move(target));
+}
+
 void MainWindow::start_thomson() {
 	using Target = Analyser::Static::Thomson::MOTarget;
 	auto target = std::make_unique<Target>();
@@ -1433,6 +1445,10 @@ void MainWindow::processAllSettings() {
 	applier(ui->pcSpeedComboBox, "pc.speed");
 	applier(ui->pcVideoAdaptorComboBox, "pc.videoAdaptor");
 
+	/* Tandy CoCo. */
+	applier(ui->tandyCoCoMemorySizeComboBox, "tandy.memorySize");
+	applier(ui->tandyCoCoDiskDriveCheckBox, "tandy.hasDiskDrive");
+
 	/* Thomson. */
 	applier(ui->thomsonModelComboBox, "thomson.model");
 	applier(ui->thomsonDiskDriveCheckBox, "thomson.hasDiskDrive");
diff --git a/OSBindings/Qt/mainwindow.h b/OSBindings/Qt/mainwindow.h
index 4d9fba969..e724114f9 100644
--- a/OSBindings/Qt/mainwindow.h
+++ b/OSBindings/Qt/mainwindow.h
@@ -99,6 +99,7 @@ class MainWindow : public QMainWindow, public Outputs::Speaker::Speaker::Delegat
 		void start_plus4();
 		void start_pc();
 		void start_spectrum();
+		void start_tandyCoCo();
 		void start_thomson();
 		void start_vic20();
 		void start_zx80();
diff --git a/OSBindings/Qt/mainwindow.ui b/OSBindings/Qt/mainwindow.ui
index f9eccb5a5..b50aaf4a0 100644
--- a/OSBindings/Qt/mainwindow.ui
+++ b/OSBindings/Qt/mainwindow.ui
@@ -222,17 +222,17 @@
          <widget class="QComboBox" name="appleIIgsMemorySizeComboBox">
           <item>
            <property name="text">
-            <string>256kb</string>
+            <string>256 kb</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>1mb</string>
+            <string>1 mb</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>8mb</string>
+            <string>8 mb</string>
            </property>
           </item>
          </widget>
@@ -821,6 +821,52 @@
         </item>
        </layout>
       </widget>
+      <widget class="QWidget" name="tandyCoCoTab">
+       <attribute name="title">
+        <string>Tandy CoCo</string>
+       </attribute>
+       <layout class="QVBoxLayout">
+        <item>
+         <layout class="QFormLayout">
+          <item row="1" column="0">
+           <widget class="QLabel">
+            <property name="text">
+             <string>Memory Size:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="tandyCoCoMemorySizeComboBox">
+            <item>
+             <property name="text">
+              <string>32 kb</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>64 kb</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="tandyCoCoDiskDriveCheckBox">
+          <property name="text">
+           <string>With Disk Drive</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Orientation::Vertical</enum>
+          </property>
+         </spacer>
+        </item>
+	</layout>
+      </widget>
       <widget class="QWidget" name="thomsonTab">
        <attribute name="title">
         <string>Thomson MO</string>
@@ -1049,17 +1095,17 @@
          <widget class="QComboBox" name="spectrumModelComboBox">
           <item>
            <property name="text">
-            <string>16kb</string>
+            <string>16 kb</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>48kb</string>
+            <string>48 kb</string>
            </property>
           </item>
           <item>
            <property name="text">
-            <string>128kb</string>
+            <string>128 kb</string>
            </property>
           </item>
           <item>