6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-07-15 15:29:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #998 from TomHarte/QtAmiga

Browse Source 
Add the Amiga to the Qt UI.
This commit is contained in:
Thomas Harte 2021-12-08 13:45:34 -05:00 committed by GitHub
commit 090760e526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OSBindings/Mac/Clock Signal/MachinePicker/Base.lproj/MachinePicker.xib
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19455" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19455"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@ -18,7 +18,7 @@
<windowStyleMask key="styleMask" titled="YES" documentModal="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="590" height="353"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1440"/>
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
<rect key="frame" x="0.0" y="0.0" width="590" height="353"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -64,12 +64,12 @@ Gw
<tabViewItems>
<tabViewItem label="Amiga" identifier="amiga" id="JmB-OF-xcM">
<view key="view" id="5zS-Nj-Ynx">
<rect key="frame" x="10" y="7" width="400" height="223"/>
<rect key="frame" x="10" y="7" width="400" height="222"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="g7g-ZA-Uge">
<rect key="frame" x="18" y="187" width="364" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="At present only a 512k Amiga 500 is supported." id="Isk-qc-yKa">
<rect key="frame" x="18" y="186" width="364" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="At present only a 1mb Amiga 500 is supported." id="Isk-qc-yKa">
<font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

11
OSBindings/Qt/mainwindow.cpp
View File

@ -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<Target>();
/* 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<Target>();

1
OSBindings/Qt/mainwindow.h
View File

@ -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();

18
OSBindings/Qt/mainwindow.ui
View File

@ -27,8 +27,22 @@
<item>
<widget class="QTabWidget" name="machineSelectionTabs">
<property name="currentIndex">
<number>5</number>
<number>0</number>
</property>
<widget class="QWidget" name="amigaTab">
<attribute name="title">
<string>Amiga</string>
</attribute>
<layout class="QVBoxLayout" name="amigaLayout">
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="amigaLabel">
<property name="text">
<string>At present only a 1mb Amiga 500 is supported.</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="appleIITab">
<attribute name="title">
<string>Apple II</string>
@ -1011,7 +1025,7 @@
<bool>true</bool>
</property>
<property name="plainText">
<string>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.
<string>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</string>
</property>