summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/yuzu/configuration/config.cpp10
-rw-r--r--src/yuzu/configuration/configure_input.cpp18
-rw-r--r--src/yuzu/configuration/configure_input.ui283
3 files changed, 221 insertions, 90 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 4c713fcbc..9ce851d17 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -19,16 +19,18 @@ Config::Config() {
19} 19}
20 20
21const std::array<int, Settings::NativeButton::NumButtons> Config::default_buttons = { 21const std::array<int, Settings::NativeButton::NumButtons> Config::default_buttons = {
22 Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H, 22 Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_3, Qt::Key_4, Qt::Key_Q, Qt::Key_W,
23 Qt::Key_Q, Qt::Key_W, Qt::Key_M, Qt::Key_N, Qt::Key_1, Qt::Key_2, Qt::Key_B, 23 Qt::Key_1, Qt::Key_2, Qt::Key_N, Qt::Key_M, Qt::Key_F, Qt::Key_T, Qt::Key_H, Qt::Key_G,
24 Qt::Key_Left, Qt::Key_Up, Qt::Key_Right, Qt::Key_Down, Qt::Key_J, Qt::Key_I, Qt::Key_L,
25 Qt::Key_K, Qt::Key_D, Qt::Key_C, Qt::Key_B, Qt::Key_V,
24}; 26};
25 27
26const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{ 28const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{
27 { 29 {
28 Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_D, 30 Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_E,
29 }, 31 },
30 { 32 {
31 Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_D, 33 Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_R,
32 }, 34 },
33}}; 35}};
34 36
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index 4c2a3e738..d92a1fed9 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -54,19 +54,23 @@ ConfigureInput::ConfigureInput(QWidget* parent)
54 setFocusPolicy(Qt::ClickFocus); 54 setFocusPolicy(Qt::ClickFocus);
55 55
56 button_map = { 56 button_map = {
57 ui->buttonA, ui->buttonB, ui->buttonX, ui->buttonY, ui->buttonDpadUp, 57 ui->buttonA, ui->buttonB, ui->buttonX, ui->buttonY,
58 ui->buttonDpadDown, ui->buttonDpadLeft, ui->buttonDpadRight, ui->buttonL, ui->buttonR, 58 ui->buttonLStick, ui->buttonRStick, ui->buttonL, ui->buttonR,
59 ui->buttonStart, ui->buttonSelect, ui->buttonZL, ui->buttonZR, ui->buttonHome, 59 ui->buttonZL, ui->buttonZR, ui->buttonPlus, ui->buttonMinus,
60 ui->buttonDpadLeft, ui->buttonDpadUp, ui->buttonDpadRight, ui->buttonDpadDown,
61 ui->buttonLStickLeft, ui->buttonLStickUp, ui->buttonLStickRight, ui->buttonLStickDown,
62 ui->buttonRStickLeft, ui->buttonRStickUp, ui->buttonRStickRight, ui->buttonRStickDown,
63 ui->buttonSL, ui->buttonSR, ui->buttonHome, ui->buttonScreenshot,
60 }; 64 };
61 65
62 analog_map = {{ 66 analog_map = {{
63 { 67 {
64 ui->buttonCircleUp, ui->buttonCircleDown, ui->buttonCircleLeft, ui->buttonCircleRight, 68 ui->buttonLStickUp, ui->buttonLStickDown, ui->buttonLStickLeft, ui->buttonLStickRight,
65 ui->buttonCircleMod, 69 ui->buttonLStickMod,
66 }, 70 },
67 { 71 {
68 ui->buttonCStickUp, ui->buttonCStickDown, ui->buttonCStickLeft, ui->buttonCStickRight, 72 ui->buttonRStickUp, ui->buttonRStickDown, ui->buttonRStickLeft, ui->buttonRStickRight,
69 nullptr, 73 ui->buttonRStickMod,
70 }, 74 },
71 }}; 75 }};
72 76
diff --git a/src/yuzu/configuration/configure_input.ui b/src/yuzu/configuration/configure_input.ui
index 2760787e5..5143c9d72 100644
--- a/src/yuzu/configuration/configure_input.ui
+++ b/src/yuzu/configuration/configure_input.ui
@@ -6,8 +6,8 @@
6 <rect> 6 <rect>
7 <x>0</x> 7 <x>0</x>
8 <y>0</y> 8 <y>0</y>
9 <width>370</width> 9 <width>343</width>
10 <height>534</height> 10 <height>665</height>
11 </rect> 11 </rect>
12 </property> 12 </property>
13 <property name="windowTitle"> 13 <property name="windowTitle">
@@ -190,7 +190,108 @@
190 </layout> 190 </layout>
191 </widget> 191 </widget>
192 </item> 192 </item>
193 <item row="1" column="0"> 193 <item row="3" column="1">
194 <widget class="QGroupBox" name="faceButtons_6">
195 <property name="title">
196 <string>Misc.</string>
197 </property>
198 <property name="flat">
199 <bool>false</bool>
200 </property>
201 <property name="checkable">
202 <bool>false</bool>
203 </property>
204 <layout class="QGridLayout" name="gridLayout_6">
205 <item row="0" column="0">
206 <layout class="QVBoxLayout" name="verticalLayout_25">
207 <item>
208 <widget class="QLabel" name="label_29">
209 <property name="text">
210 <string>Plus:</string>
211 </property>
212 </widget>
213 </item>
214 <item>
215 <widget class="QPushButton" name="buttonPlus">
216 <property name="text">
217 <string/>
218 </property>
219 </widget>
220 </item>
221 </layout>
222 </item>
223 <item row="0" column="1">
224 <layout class="QVBoxLayout" name="verticalLayout_26">
225 <item>
226 <widget class="QLabel" name="label_30">
227 <property name="text">
228 <string>Minus:</string>
229 </property>
230 </widget>
231 </item>
232 <item>
233 <widget class="QPushButton" name="buttonMinus">
234 <property name="text">
235 <string/>
236 </property>
237 </widget>
238 </item>
239 </layout>
240 </item>
241 <item row="1" column="0">
242 <layout class="QVBoxLayout" name="verticalLayout_27">
243 <item>
244 <widget class="QLabel" name="label_31">
245 <property name="text">
246 <string>Home:</string>
247 </property>
248 </widget>
249 </item>
250 <item>
251 <widget class="QPushButton" name="buttonHome">
252 <property name="text">
253 <string/>
254 </property>
255 </widget>
256 </item>
257 </layout>
258 </item>
259 <item row="1" column="1">
260 <layout class="QVBoxLayout" name="verticalLayout_28">
261 <item>
262 <widget class="QLabel" name="label_11">
263 <property name="text">
264 <string>Screen
265Capture:</string>
266 </property>
267 </widget>
268 </item>
269 <item>
270 <widget class="QPushButton" name="buttonScreenshot">
271 <property name="text">
272 <string/>
273 </property>
274 </widget>
275 </item>
276 </layout>
277 </item>
278 <item row="2" column="1">
279 <spacer name="verticalSpacer">
280 <property name="orientation">
281 <enum>Qt::Vertical</enum>
282 </property>
283 <property name="sizeHint" stdset="0">
284 <size>
285 <width>20</width>
286 <height>40</height>
287 </size>
288 </property>
289 </spacer>
290 </item>
291 </layout>
292 </widget>
293 </item>
294 <item row="3" column="0">
194 <widget class="QGroupBox" name="faceButtons_3"> 295 <widget class="QGroupBox" name="faceButtons_3">
195 <property name="title"> 296 <property name="title">
196 <string>Shoulder Buttons</string> 297 <string>Shoulder Buttons</string>
@@ -274,13 +375,49 @@
274 </item> 375 </item>
275 </layout> 376 </layout>
276 </item> 377 </item>
378 <item row="2" column="0">
379 <layout class="QVBoxLayout" name="verticalLayout_8">
380 <item>
381 <widget class="QLabel" name="label_7">
382 <property name="text">
383 <string>SL:</string>
384 </property>
385 </widget>
386 </item>
387 <item>
388 <widget class="QPushButton" name="buttonSL">
389 <property name="text">
390 <string/>
391 </property>
392 </widget>
393 </item>
394 </layout>
395 </item>
396 <item row="2" column="1">
397 <layout class="QVBoxLayout" name="verticalLayout_29">
398 <item>
399 <widget class="QLabel" name="label_8">
400 <property name="text">
401 <string>SR:</string>
402 </property>
403 </widget>
404 </item>
405 <item>
406 <widget class="QPushButton" name="buttonSR">
407 <property name="text">
408 <string/>
409 </property>
410 </widget>
411 </item>
412 </layout>
413 </item>
277 </layout> 414 </layout>
278 </widget> 415 </widget>
279 </item> 416 </item>
280 <item row="1" column="1"> 417 <item row="1" column="0">
281 <widget class="QGroupBox" name="faceButtons_4"> 418 <widget class="QGroupBox" name="faceButtons_4">
282 <property name="title"> 419 <property name="title">
283 <string>Circle Pad</string> 420 <string>Left Stick</string>
284 </property> 421 </property>
285 <property name="flat"> 422 <property name="flat">
286 <bool>false</bool> 423 <bool>false</bool>
@@ -299,7 +436,7 @@
299 </widget> 436 </widget>
300 </item> 437 </item>
301 <item> 438 <item>
302 <widget class="QPushButton" name="buttonCircleLeft"> 439 <widget class="QPushButton" name="buttonLStickLeft">
303 <property name="text"> 440 <property name="text">
304 <string/> 441 <string/>
305 </property> 442 </property>
@@ -317,7 +454,7 @@
317 </widget> 454 </widget>
318 </item> 455 </item>
319 <item> 456 <item>
320 <widget class="QPushButton" name="buttonCircleRight"> 457 <widget class="QPushButton" name="buttonLStickRight">
321 <property name="text"> 458 <property name="text">
322 <string/> 459 <string/>
323 </property> 460 </property>
@@ -335,7 +472,7 @@
335 </widget> 472 </widget>
336 </item> 473 </item>
337 <item> 474 <item>
338 <widget class="QPushButton" name="buttonCircleUp"> 475 <widget class="QPushButton" name="buttonLStickUp">
339 <property name="text"> 476 <property name="text">
340 <string/> 477 <string/>
341 </property> 478 </property>
@@ -353,7 +490,7 @@
353 </widget> 490 </widget>
354 </item> 491 </item>
355 <item> 492 <item>
356 <widget class="QPushButton" name="buttonCircleDown"> 493 <widget class="QPushButton" name="buttonLStickDown">
357 <property name="text"> 494 <property name="text">
358 <string/> 495 <string/>
359 </property> 496 </property>
@@ -361,32 +498,17 @@
361 </item> 498 </item>
362 </layout> 499 </layout>
363 </item> 500 </item>
364 </layout> 501 <item row="2" column="0">
365 </widget> 502 <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,0">
366 </item>
367 <item row="2" column="0">
368 <widget class="QGroupBox" name="faceButtons_5">
369 <property name="title">
370 <string>C-Stick</string>
371 </property>
372 <property name="flat">
373 <bool>false</bool>
374 </property>
375 <property name="checkable">
376 <bool>false</bool>
377 </property>
378 <layout class="QGridLayout" name="gridLayout_5">
379 <item row="0" column="0">
380 <layout class="QVBoxLayout" name="verticalLayout_21">
381 <item> 503 <item>
382 <widget class="QLabel" name="label_25"> 504 <widget class="QLabel" name="label_6">
383 <property name="text"> 505 <property name="text">
384 <string>Left:</string> 506 <string>Pressed:</string>
385 </property> 507 </property>
386 </widget> 508 </widget>
387 </item> 509 </item>
388 <item> 510 <item>
389 <widget class="QPushButton" name="buttonCStickLeft"> 511 <widget class="QPushButton" name="buttonLStick">
390 <property name="text"> 512 <property name="text">
391 <string/> 513 <string/>
392 </property> 514 </property>
@@ -394,17 +516,17 @@
394 </item> 516 </item>
395 </layout> 517 </layout>
396 </item> 518 </item>
397 <item row="0" column="1"> 519 <item row="2" column="1">
398 <layout class="QVBoxLayout" name="verticalLayout_22"> 520 <layout class="QVBoxLayout" name="verticalLayout_31">
399 <item> 521 <item>
400 <widget class="QLabel" name="label_27"> 522 <widget class="QLabel" name="label_9">
401 <property name="text"> 523 <property name="text">
402 <string>Right:</string> 524 <string>Modifier:</string>
403 </property> 525 </property>
404 </widget> 526 </widget>
405 </item> 527 </item>
406 <item> 528 <item>
407 <widget class="QPushButton" name="buttonCStickRight"> 529 <widget class="QPushButton" name="buttonLStickMod">
408 <property name="text"> 530 <property name="text">
409 <string/> 531 <string/>
410 </property> 532 </property>
@@ -412,17 +534,35 @@
412 </item> 534 </item>
413 </layout> 535 </layout>
414 </item> 536 </item>
415 <item row="1" column="0"> 537 </layout>
416 <layout class="QVBoxLayout" name="verticalLayout_23"> 538 </widget>
539 </item>
540 <item row="1" column="1">
541 <widget class="QGroupBox" name="faceButtons_5">
542 <property name="title">
543 <string>Right Stick</string>
544 </property>
545 <property name="alignment">
546 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
547 </property>
548 <property name="flat">
549 <bool>false</bool>
550 </property>
551 <property name="checkable">
552 <bool>false</bool>
553 </property>
554 <layout class="QGridLayout" name="gridLayout_5">
555 <item row="1" column="1">
556 <layout class="QVBoxLayout" name="verticalLayout_24">
417 <item> 557 <item>
418 <widget class="QLabel" name="label_28"> 558 <widget class="QLabel" name="label_26">
419 <property name="text"> 559 <property name="text">
420 <string>Up:</string> 560 <string>Down:</string>
421 </property> 561 </property>
422 </widget> 562 </widget>
423 </item> 563 </item>
424 <item> 564 <item>
425 <widget class="QPushButton" name="buttonCStickUp"> 565 <widget class="QPushButton" name="buttonRStickDown">
426 <property name="text"> 566 <property name="text">
427 <string/> 567 <string/>
428 </property> 568 </property>
@@ -430,17 +570,17 @@
430 </item> 570 </item>
431 </layout> 571 </layout>
432 </item> 572 </item>
433 <item row="1" column="1"> 573 <item row="0" column="1">
434 <layout class="QVBoxLayout" name="verticalLayout_24"> 574 <layout class="QVBoxLayout" name="verticalLayout_22">
435 <item> 575 <item>
436 <widget class="QLabel" name="label_26"> 576 <widget class="QLabel" name="label_27">
437 <property name="text"> 577 <property name="text">
438 <string>Down:</string> 578 <string>Right:</string>
439 </property> 579 </property>
440 </widget> 580 </widget>
441 </item> 581 </item>
442 <item> 582 <item>
443 <widget class="QPushButton" name="buttonCStickDown"> 583 <widget class="QPushButton" name="buttonRStickRight">
444 <property name="text"> 584 <property name="text">
445 <string/> 585 <string/>
446 </property> 586 </property>
@@ -448,32 +588,17 @@
448 </item> 588 </item>
449 </layout> 589 </layout>
450 </item> 590 </item>
451 </layout> 591 <item row="1" column="0">
452 </widget> 592 <layout class="QVBoxLayout" name="verticalLayout_23">
453 </item>
454 <item row="2" column="1">
455 <widget class="QGroupBox" name="faceButtons_6">
456 <property name="title">
457 <string>Misc.</string>
458 </property>
459 <property name="flat">
460 <bool>false</bool>
461 </property>
462 <property name="checkable">
463 <bool>false</bool>
464 </property>
465 <layout class="QGridLayout" name="gridLayout_6">
466 <item row="0" column="0">
467 <layout class="QVBoxLayout" name="verticalLayout_25">
468 <item> 593 <item>
469 <widget class="QLabel" name="label_29"> 594 <widget class="QLabel" name="label_28">
470 <property name="text"> 595 <property name="text">
471 <string>Start:</string> 596 <string>Up:</string>
472 </property> 597 </property>
473 </widget> 598 </widget>
474 </item> 599 </item>
475 <item> 600 <item>
476 <widget class="QPushButton" name="buttonStart"> 601 <widget class="QPushButton" name="buttonRStickUp">
477 <property name="text"> 602 <property name="text">
478 <string/> 603 <string/>
479 </property> 604 </property>
@@ -481,17 +606,17 @@
481 </item> 606 </item>
482 </layout> 607 </layout>
483 </item> 608 </item>
484 <item row="0" column="1"> 609 <item row="0" column="0">
485 <layout class="QVBoxLayout" name="verticalLayout_26"> 610 <layout class="QVBoxLayout" name="verticalLayout_21">
486 <item> 611 <item>
487 <widget class="QLabel" name="label_30"> 612 <widget class="QLabel" name="label_25">
488 <property name="text"> 613 <property name="text">
489 <string>Select:</string> 614 <string>Left:</string>
490 </property> 615 </property>
491 </widget> 616 </widget>
492 </item> 617 </item>
493 <item> 618 <item>
494 <widget class="QPushButton" name="buttonSelect"> 619 <widget class="QPushButton" name="buttonRStickLeft">
495 <property name="text"> 620 <property name="text">
496 <string/> 621 <string/>
497 </property> 622 </property>
@@ -499,17 +624,17 @@
499 </item> 624 </item>
500 </layout> 625 </layout>
501 </item> 626 </item>
502 <item row="1" column="0"> 627 <item row="2" column="1">
503 <layout class="QVBoxLayout" name="verticalLayout_27"> 628 <layout class="QVBoxLayout" name="verticalLayout_32">
504 <item> 629 <item>
505 <widget class="QLabel" name="label_31"> 630 <widget class="QLabel" name="label_10">
506 <property name="text"> 631 <property name="text">
507 <string>Home:</string> 632 <string>Modifier:</string>
508 </property> 633 </property>
509 </widget> 634 </widget>
510 </item> 635 </item>
511 <item> 636 <item>
512 <widget class="QPushButton" name="buttonHome"> 637 <widget class="QPushButton" name="buttonRStickMod">
513 <property name="text"> 638 <property name="text">
514 <string/> 639 <string/>
515 </property> 640 </property>
@@ -517,17 +642,17 @@
517 </item> 642 </item>
518 </layout> 643 </layout>
519 </item> 644 </item>
520 <item row="1" column="1"> 645 <item row="2" column="0">
521 <layout class="QVBoxLayout" name="verticalLayout_28"> 646 <layout class="QVBoxLayout" name="verticalLayout_6">
522 <item> 647 <item>
523 <widget class="QLabel" name="label_36"> 648 <widget class="QLabel" name="label_5">
524 <property name="text"> 649 <property name="text">
525 <string>Circle Mod:</string> 650 <string>Pressed:</string>
526 </property> 651 </property>
527 </widget> 652 </widget>
528 </item> 653 </item>
529 <item> 654 <item>
530 <widget class="QPushButton" name="buttonCircleMod"> 655 <widget class="QPushButton" name="buttonRStick">
531 <property name="text"> 656 <property name="text">
532 <string/> 657 <string/>
533 </property> 658 </property>
HIC SVNT DRACONES