6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-09 20:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Reintroduce shortcuts; eliminate bad auto-UI additions.

Browse Source
This commit is contained in:
Thomas Harte
2023-12-30 23:05:49 -05:00
parent c1778a8fee
commit a7fda83ea5
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OSBindings/Qt/mainwindow.cpp
View File

@@ -399,13 +399,17 @@ void MainWindow::launchMachine() {
QAction *const asKeyboardAction = new QAction(tr("Use Keyboard as Keyboard"), this);
asKeyboardAction->setCheckable(true);
asKeyboardAction->setChecked(true);
// asKeyboardAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_K));
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
asKeyboardAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_K));
#endif
inputMenu->addAction(asKeyboardAction);
QAction *const asJoystickAction = new QAction(tr("Use Keyboard as Joystick"), this);
asJoystickAction->setCheckable(true);
asJoystickAction->setChecked(false);
// asJoystickAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_J));
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
asJoystickAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_J));
#endif
inputMenu->addAction(asJoystickAction);
connect(asKeyboardAction, &QAction::triggered, this, [=] {

50
OSBindings/Qt/mainwindow.ui
View File

@@ -39,7 +39,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Chip RAM:</string>
</property>
@@ -65,7 +65,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Fast RAM:</string>
</property>
@@ -129,7 +129,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Model:</string>
</property>
@@ -160,7 +160,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Disk Controller:</string>
</property>
@@ -214,7 +214,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Model:</string>
</property>
@@ -240,7 +240,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Memory Size:</string>
</property>
@@ -294,7 +294,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Model:</string>
</property>
@@ -348,7 +348,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>RAM:</string>
</property>
@@ -437,7 +437,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Model:</string>
</property>
@@ -463,7 +463,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Speed:</string>
</property>
@@ -484,7 +484,7 @@
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>EXOS:</string>
</property>
@@ -510,7 +510,7 @@
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>BASIC:</string>
</property>
@@ -541,7 +541,7 @@
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>DOS:</string>
</property>
@@ -590,7 +590,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Model:</string>
</property>
@@ -649,7 +649,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Model</string>
</property>
@@ -691,7 +691,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Region</string>
</property>
@@ -772,7 +772,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Model:</string>
</property>
@@ -798,7 +798,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Disk Interface:</string>
</property>
@@ -862,7 +862,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Video Adaptor:</string>
</property>
@@ -883,7 +883,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Speed:</string>
</property>
@@ -932,7 +932,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Region:</string>
</property>
@@ -968,7 +968,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Memory Size:</string>
</property>
@@ -1042,7 +1042,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Memory Size:</string>
</property>
@@ -1111,7 +1111,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Memory Size:</string>
</property>
@@ -1160,7 +1160,7 @@
<item>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel">
<property name="text">
<string>Model:</string>
</property>