Skip to content
Snippets Groups Projects
Commit aa4fa8bd authored by shinyquagsire23's avatar shinyquagsire23
Browse files

configure_input: update w/ Switch buttons

parent 801d6c1b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/yuzu/configuration/config.cpp
+ 6
− 4
View file @ aa4fa8bd
...@@ -19,16 +19,18 @@ Config::Config() { ...@@ -19,16 +19,18 @@ Config::Config() {
} }
const std::array<int, Settings::NativeButton::NumButtons> Config::default_buttons = { 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_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_3, Qt::Key_4, Qt::Key_Q, Qt::Key_W,
Qt::Key_Q, Qt::Key_W, Qt::Key_M, Qt::Key_N, Qt::Key_1, Qt::Key_2, Qt::Key_B, Qt::Key_1, Qt::Key_2, Qt::Key_N, Qt::Key_M, Qt::Key_F, Qt::Key_T, Qt::Key_H, Qt::Key_G,
Qt::Key_Left, Qt::Key_Up, Qt::Key_Right, Qt::Key_Down, Qt::Key_J, Qt::Key_I, Qt::Key_L,
Qt::Key_K, Qt::Key_D, Qt::Key_C, Qt::Key_B, Qt::Key_V,
}; };
const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{ const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{
{ {
Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_D, Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_E,
}, },
{ {
Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_D, Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_R,
}, },
}}; }};
......
src/yuzu/configuration/configure_input.cpp
+ 11
− 7
View file @ aa4fa8bd
...@@ -54,19 +54,23 @@ ConfigureInput::ConfigureInput(QWidget* parent) ...@@ -54,19 +54,23 @@ ConfigureInput::ConfigureInput(QWidget* parent)
setFocusPolicy(Qt::ClickFocus); setFocusPolicy(Qt::ClickFocus);
button_map = { button_map = {
ui->buttonA, ui->buttonB, ui->buttonX, ui->buttonY, ui->buttonDpadUp, ui->buttonA, ui->buttonB, ui->buttonX, ui->buttonY,
ui->buttonDpadDown, ui->buttonDpadLeft, ui->buttonDpadRight, ui->buttonL, ui->buttonR, ui->buttonLStick, ui->buttonRStick, ui->buttonL, ui->buttonR,
ui->buttonStart, ui->buttonSelect, ui->buttonZL, ui->buttonZR, ui->buttonHome, ui->buttonZL, ui->buttonZR, ui->buttonPlus, ui->buttonMinus,
ui->buttonDpadLeft, ui->buttonDpadUp, ui->buttonDpadRight, ui->buttonDpadDown,
ui->buttonLStickLeft, ui->buttonLStickUp, ui->buttonLStickRight, ui->buttonLStickDown,
ui->buttonRStickLeft, ui->buttonRStickUp, ui->buttonRStickRight, ui->buttonRStickDown,
ui->buttonSL, ui->buttonSR, ui->buttonHome, ui->buttonScreenshot,
}; };
analog_map = {{ analog_map = {{
{ {
ui->buttonCircleUp, ui->buttonCircleDown, ui->buttonCircleLeft, ui->buttonCircleRight, ui->buttonLStickUp, ui->buttonLStickDown, ui->buttonLStickLeft, ui->buttonLStickRight,
ui->buttonCircleMod, ui->buttonLStickMod,
}, },
{ {
ui->buttonCStickUp, ui->buttonCStickDown, ui->buttonCStickLeft, ui->buttonCStickRight, ui->buttonRStickUp, ui->buttonRStickDown, ui->buttonRStickLeft, ui->buttonRStickRight,
nullptr, ui->buttonRStickMod,
}, },
}}; }};
......
src/yuzu/configuration/configure_input.ui
+ 204
− 79
View file @ aa4fa8bd
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>370</width> <width>343</width>
<height>534</height> <height>665</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -190,7 +190,108 @@ ...@@ -190,7 +190,108 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="3" column="1">
<widget class="QGroupBox" name="faceButtons_6">
<property name="title">
<string>Misc.</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_25">
<item>
<widget class="QLabel" name="label_29">
<property name="text">
<string>Plus:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonPlus">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_26">
<item>
<widget class="QLabel" name="label_30">
<property name="text">
<string>Minus:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonMinus">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_27">
<item>
<widget class="QLabel" name="label_31">
<property name="text">
<string>Home:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonHome">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="1">
<layout class="QVBoxLayout" name="verticalLayout_28">
<item>
<widget class="QLabel" name="label_11">
<property name="text">
<string>Screen
Capture:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonScreenshot">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="faceButtons_3"> <widget class="QGroupBox" name="faceButtons_3">
<property name="title"> <property name="title">
<string>Shoulder Buttons</string> <string>Shoulder Buttons</string>
...@@ -274,13 +375,49 @@ ...@@ -274,13 +375,49 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0">
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>SL:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonSL">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="1">
<layout class="QVBoxLayout" name="verticalLayout_29">
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>SR:</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonSR">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="0">
<widget class="QGroupBox" name="faceButtons_4"> <widget class="QGroupBox" name="faceButtons_4">
<property name="title"> <property name="title">
<string>Circle Pad</string> <string>Left Stick</string>
</property> </property>
<property name="flat"> <property name="flat">
<bool>false</bool> <bool>false</bool>
...@@ -299,7 +436,7 @@ ...@@ -299,7 +436,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonCircleLeft"> <widget class="QPushButton" name="buttonLStickLeft">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -317,7 +454,7 @@ ...@@ -317,7 +454,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonCircleRight"> <widget class="QPushButton" name="buttonLStickRight">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -335,7 +472,7 @@ ...@@ -335,7 +472,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonCircleUp"> <widget class="QPushButton" name="buttonLStickUp">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -353,7 +490,7 @@ ...@@ -353,7 +490,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonCircleDown"> <widget class="QPushButton" name="buttonLStickDown">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -361,32 +498,17 @@ ...@@ -361,32 +498,17 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout> <item row="2" column="0">
</widget> <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,0">
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="faceButtons_5">
<property name="title">
<string>C-Stick</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_21">
<item> <item>
<widget class="QLabel" name="label_25"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Left:</string> <string>Pressed:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonCStickLeft"> <widget class="QPushButton" name="buttonLStick">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -394,17 +516,17 @@ ...@@ -394,17 +516,17 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="1"> <item row="2" column="1">
<layout class="QVBoxLayout" name="verticalLayout_22"> <layout class="QVBoxLayout" name="verticalLayout_31">
<item> <item>
<widget class="QLabel" name="label_27"> <widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>Right:</string> <string>Modifier:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonCStickRight"> <widget class="QPushButton" name="buttonLStickMod">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -412,17 +534,35 @@ ...@@ -412,17 +534,35 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> </layout>
<layout class="QVBoxLayout" name="verticalLayout_23"> </widget>
</item>
<item row="1" column="1">
<widget class="QGroupBox" name="faceButtons_5">
<property name="title">
<string>Right Stick</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="1" column="1">
<layout class="QVBoxLayout" name="verticalLayout_24">
<item> <item>
<widget class="QLabel" name="label_28"> <widget class="QLabel" name="label_26">
<property name="text"> <property name="text">
<string>Up:</string> <string>Down:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonCStickUp"> <widget class="QPushButton" name="buttonRStickDown">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -430,17 +570,17 @@ ...@@ -430,17 +570,17 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="1"> <item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_24"> <layout class="QVBoxLayout" name="verticalLayout_22">
<item> <item>
<widget class="QLabel" name="label_26"> <widget class="QLabel" name="label_27">
<property name="text"> <property name="text">
<string>Down:</string> <string>Right:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonCStickDown"> <widget class="QPushButton" name="buttonRStickRight">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -448,32 +588,17 @@ ...@@ -448,32 +588,17 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout> <item row="1" column="0">
</widget> <layout class="QVBoxLayout" name="verticalLayout_23">
</item>
<item row="2" column="1">
<widget class="QGroupBox" name="faceButtons_6">
<property name="title">
<string>Misc.</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_25">
<item> <item>
<widget class="QLabel" name="label_29"> <widget class="QLabel" name="label_28">
<property name="text"> <property name="text">
<string>Start:</string> <string>Up:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonStart"> <widget class="QPushButton" name="buttonRStickUp">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -481,17 +606,17 @@ ...@@ -481,17 +606,17 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="1"> <item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_26"> <layout class="QVBoxLayout" name="verticalLayout_21">
<item> <item>
<widget class="QLabel" name="label_30"> <widget class="QLabel" name="label_25">
<property name="text"> <property name="text">
<string>Select:</string> <string>Left:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonSelect"> <widget class="QPushButton" name="buttonRStickLeft">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -499,17 +624,17 @@ ...@@ -499,17 +624,17 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="2" column="1">
<layout class="QVBoxLayout" name="verticalLayout_27"> <layout class="QVBoxLayout" name="verticalLayout_32">
<item> <item>
<widget class="QLabel" name="label_31"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>Home:</string> <string>Modifier:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonHome"> <widget class="QPushButton" name="buttonRStickMod">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
...@@ -517,17 +642,17 @@ ...@@ -517,17 +642,17 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="1"> <item row="2" column="0">
<layout class="QVBoxLayout" name="verticalLayout_28"> <layout class="QVBoxLayout" name="verticalLayout_6">
<item> <item>
<widget class="QLabel" name="label_36"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Circle Mod:</string> <string>Pressed:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonCircleMod"> <widget class="QPushButton" name="buttonRStick">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment