From 849e48f5196d5a9ffdbf5dfd05032b2cb376f31b Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 8 Dec 2021 11:41:38 -0500 Subject: [PATCH 1/2] Add the Amiga to Qt's UI. --- OSBindings/Qt/mainwindow.cpp | 11 +++++++++++ OSBindings/Qt/mainwindow.h | 1 + OSBindings/Qt/mainwindow.ui | 18 ++++++++++++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/OSBindings/Qt/mainwindow.cpp b/OSBindings/Qt/mainwindow.cpp index 8ea77609c..4c41ea43f 100644 --- a/OSBindings/Qt/mainwindow.cpp +++ b/OSBindings/Qt/mainwindow.cpp @@ -952,6 +952,7 @@ void MainWindow::setButtonPressed(int index, bool isPressed) { // MARK: - New Machine Creation #include "../../Analyser/Static/Acorn/Target.hpp" +#include "../../Analyser/Static/Amiga/Target.hpp" #include "../../Analyser/Static/AmstradCPC/Target.hpp" #include "../../Analyser/Static/AppleII/Target.hpp" #include "../../Analyser/Static/AppleIIgs/Target.hpp" @@ -973,6 +974,7 @@ void MainWindow::startMachine() { return; \ } + TEST(amiga); TEST(appleII); TEST(appleIIgs); TEST(amstradCPC); @@ -1010,6 +1012,15 @@ void MainWindow::start_appleII() { launchTarget(std::move(target)); } +void MainWindow::start_amiga() { + using Target = Analyser::Static::Amiga::Target; + auto target = std::make_unique(); + + /* There are no options yet for an Amiga. */ + + launchTarget(std::move(target)); +} + void MainWindow::start_appleIIgs() { using Target = Analyser::Static::AppleIIgs::Target; auto target = std::make_unique(); diff --git a/OSBindings/Qt/mainwindow.h b/OSBindings/Qt/mainwindow.h index 36e35ef59..e2f434290 100644 --- a/OSBindings/Qt/mainwindow.h +++ b/OSBindings/Qt/mainwindow.h @@ -86,6 +86,7 @@ class MainWindow : public QMainWindow, public Outputs::Speaker::Speaker::Delegat void updateStatusBarText(); private: + void start_amiga(); void start_appleII(); void start_appleIIgs(); void start_amstradCPC(); diff --git a/OSBindings/Qt/mainwindow.ui b/OSBindings/Qt/mainwindow.ui index d46bb68f6..88fb31684 100644 --- a/OSBindings/Qt/mainwindow.ui +++ b/OSBindings/Qt/mainwindow.ui @@ -27,8 +27,22 @@ - 5 + 0 + + + Amiga + + + + + + At present only a 1mb Amiga 500 is supported. + + + + + Apple II @@ -1011,7 +1025,7 @@ true - Clock Signal requires you to provide images of the system ROMs for this machine. They will be stored permanently; you need do this only once. + Clock Signal requires you to provide images of the system ROMs for this machine. They will be stored permanently; you need do this only once. Please drag and drop over this window From cccde7dc89381e5826647435e7938d0763172a75 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Wed, 8 Dec 2021 11:41:50 -0500 Subject: [PATCH 2/2] Correct given memory size. --- .../MachinePicker/Base.lproj/MachinePicker.xib | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OSBindings/Mac/Clock Signal/MachinePicker/Base.lproj/MachinePicker.xib b/OSBindings/Mac/Clock Signal/MachinePicker/Base.lproj/MachinePicker.xib index 391017f05..135fb94df 100644 --- a/OSBindings/Mac/Clock Signal/MachinePicker/Base.lproj/MachinePicker.xib +++ b/OSBindings/Mac/Clock Signal/MachinePicker/Base.lproj/MachinePicker.xib @@ -1,8 +1,8 @@ - + - + @@ -18,7 +18,7 @@ - + @@ -64,12 +64,12 @@ Gw - + - - + +