Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added GPIO14 button and UI config buttons

Browse source
This commit is contained in:
RicBent 2018-12-28 17:13:37 -06:00
parent 7c007eac24
commit 6ad609a539
8 changed files with 48 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/citra_qt/configuration/config.cpp
View file

@ -27,8 +27,9 @@ Config::~Config() {
}
const std::array<int, Settings::NativeButton::NumButtons> Config::default_buttons = {
Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H,
Qt::Key_Q, Qt::Key_W, Qt::Key_M, Qt::Key_N, Qt::Key_P, Qt::Key_1, Qt::Key_2, Qt::Key_B,
Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_T, Qt::Key_G,
Qt::Key_F, Qt::Key_H, Qt::Key_Q, Qt::Key_W, Qt::Key_M, Qt::Key_N,
Qt::Key_O, Qt::Key_P, Qt::Key_1, Qt::Key_2, Qt::Key_B,
};
const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{

3
src/citra_qt/configuration/configure_input.cpp
View file

@ -103,7 +103,8 @@ ConfigureInput::ConfigureInput(QWidget* parent)
ui->buttonA, ui->buttonB, ui->buttonX, ui->buttonY,
ui->buttonDpadUp, ui->buttonDpadDown, ui->buttonDpadLeft, ui->buttonDpadRight,
ui->buttonL, ui->buttonR, ui->buttonStart, ui->buttonSelect,
nullptr, ui->buttonZL, ui->buttonZR, ui->buttonHome,
ui->buttonDebug, ui->buttonGpio14, ui->buttonZL, ui->buttonZR,
ui->buttonHome,
};
analog_map_buttons = {{

38
src/citra_qt/configuration/configure_input.ui
View file

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>370</width>
<height>534</height>
<height>595</height>
</rect>
</property>
<property name="windowTitle">
@ -549,6 +549,42 @@
</item>
</layout>
</item>
<item row="2" column="1">
<layout class="QVBoxLayout" name="verticalLayout_33">
<item>
<widget class="QLabel" name="label_41">
<property name="text">
<string>GPIO14:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonGpio14">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<layout class="QVBoxLayout" name="verticalLayout_32">
<item>
<widget class="QLabel" name="label_40">
<property name="text">
<string>Debug:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonDebug">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>