From 158f0e81022aeec3c7c7b533f7f87207bd156cb4 Mon Sep 17 00:00:00 2001 From: Phatcat Date: Thu, 17 Dec 2015 19:17:14 +0100 Subject: [PATCH] Android: Added categories to input controls - Seperates input configurations into categories - Reworked input configurations to reuse more strings --- .../app/src/main/res/values-ja/strings.xml | 12 +- .../app/src/main/res/values/strings.xml | 192 +- .../app/src/main/res/xml/preferences.xml | 7044 ++++++++++------- .../Core/DolphinWX/Android/ButtonManager.cpp | 40 +- 4 files changed, 4076 insertions(+), 3212 deletions(-) diff --git a/Source/Android/app/src/main/res/values-ja/strings.xml b/Source/Android/app/src/main/res/values-ja/strings.xml index 10efaf6a2e..6fc9a8f7ea 100644 --- a/Source/Android/app/src/main/res/values-ja/strings.xml +++ b/Source/Android/app/src/main/res/values-ja/strings.xml @@ -1,4 +1,4 @@ - + @@ -73,17 +73,15 @@ 入力オーバーレイレイアウト 入力オーバーレイのためのボタンのレイアウト。 コントロールのサイズを調整し - ゲームキューブコントローラの入力バインディング コントローラ1 コントローラ2 コントローラ3 コントローラ4 コントローラを有効 - Wiiリモコンの入力バインディング - Wiiリモコン1 - Wiiリモコン2 - Wiiリモコン3 - Wiiリモコン4 + Wiiリモコン1 + Wiiリモコン2 + Wiiリモコン3 + Wiiリモコン4 Wiiリモコンを有効 入力バインディング %1$sにバインドするための入力を移動または押してください。 diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 250bc0462a..9714743b3d 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -75,27 +75,39 @@ Input Overlay Layout Button layout for the input overlay. Adjust the control size - GameCube Controller Bindings - Controller 1 - Controller 2 - Controller 3 - Controller 4 + Controller Bindings + GameCube Controllers + Wii Controllers (Wiimotes) + GameCube Controller 1 + GameCube Controller 2 + GameCube Controller 3 + GameCube Controller 4 Enable controller - Wiimote Bindings - Wiimote 1 - Wiimote 2 - Wiimote 3 - Wiimote 4 + Buttons + Directional Keys + Main Stick Navigation + C-Stick Navigation + Analog Triggers + Wiimote 1 + Wiimote 2 + Wiimote 3 + Wiimote 4 Enable Wiimote + IR Motion Controls + Swing Navigation + Tilt Navigation + Shake Controls + Analog Stick Navigation Wiimote Extension - Choose which Wii Extension you want to use with the Wiimote - Show Nunchuk Extension configurations - Show Classic Extension configurations - Show Guitar Extension configurations - Show Drums Extension configurations - Show Turntable Extension configurations + Choose which Extension you want to use with the Wiimote + Nunchuk + Classic Controller + Guitar + Drums + Turntable Input Binding Press or move an input to bind it to %1$s. + Button A Button B @@ -117,12 +129,17 @@ C Stick Right Trigger L Trigger R + Button 1 Button 2 Button + Button - Button Home + Stick Up + Stick Down + Stick Left + Stick Right IR Up IR Down IR Left @@ -143,100 +160,64 @@ Shake X Shake Y Shake Z + - Nunchuk Button C - Nunchuk Button Z - Nunchuk Stick Up - Nunchuk Stick Down - Nunchuk Stick Left - Nunchuk Stick Right - Nunchuk Swing Up - Nunchuk Swing Down - Nunchuk Swing Left - Nunchuk Swing Right - Nunchuk Swing Forward - Nunchuk Swing Backward - Nunchuk Tilt Forward - Nunchuk Tilt Backward - Nunchuk Tilt Left - Nunchuk Tilt Right - Nunchuk Shake X - Nunchuk Shake Y - Nunchuk Shake Z + Button C + - Classic Controller Button A - Classic Controller Button B - Classic Controller Button X - Classic Controller Button Y - Classic Controller Button - - Classic Controller Button + - Classic Controller Button Home - Classic Controller Button ZL - Classic Controller Button ZR - Classic Controller D-Pad Up - Classic Controller D-Pad Down - Classic Controller D-Pad Left - Classic Controller D-Pad Right - Classic Controller Left Stick Up - Classic Controller Left Stick Down - Classic Controller Left Stick Left - Classic Controller Left Stick Right - Classic Controller Right Stick Up - Classic Controller Right Stick Down - Classic Controller Right Stick Left - Classic Controller Right Stick Right - Classic Controller Left Trigger - Classic Controller Right Trigger + Button ZL + Button ZR + Left Analog Stick Navigation + Left Stick Up + Left Stick Down + Left Stick Left + Left Stick Right + Right Analog Stick Navigation + Right Stick Up + Right Stick Down + Right Stick Left + Right Stick Right + - Guitar Button - - Guitar Button + - Guitar Fret Red - Guitar Fret Red - Guitar Fret Yellow - Guitar Fret Blue - Guitar Fret Orange - Guitar Strum Up - Guitar Strum Down - Guitar Stick Up - Guitar Stick Down - Guitar Stick Left - Guitar Stick Right - Guitar Whammy Bar + Guitar Frets + Red Fret + Red Fret + Yellow Fret + Blue Fret + Orange Fret + Strum Up + Strum Down + Guitar Whammy + Whammy Bar + - Drums Button - - Drums Button + - Drums Pad Red - Drums Pad Yellow - Drums Pad Blue - Drums Pad Green - Drums Pad Orange - Drums Pad Bass - Drums Stick Up - Drums Stick Down - Drums Stick Left - Drums Stick Right + Drum Pads + Red Pad + Yellow Pad + Blue Pad + Green Pad + Orange Pad + Bass Pad + - Turntable Button Green Left - Turntable Button Red Left - Turntable Button Blue Left - Turntable Button Green Right - Turntable Button Red Right - Turntable Button Blue Right - Turntable Button - - Turntable Button + - Turntable Button Home - Turntable Button Euphoria - Turntable Left Table Left - Turntable Left Table Right - Turntable Right Table Left - Turntable Right Table Right - Turntable Stick Up - Turntable Stick Down - Turntable Stick Left - Turntable Stick Right - Turntable Effekt Dial - Turntable Crossfade Left - Turntable Crossfade Right + Green Left + Red Left + Blue Left + Green Right + Red Right + Blue Right + Euphoria + Left Turntable + Left Table Left + Left Table Right + Right Turntable + Right Table Left + Right Table Right + Effects + Effect Dial + Crossfade + Crossfade Left + Crossfade Right Interpreter @@ -346,6 +327,7 @@ CPU Settings Input Settings + Extension Bindings Video Settings Emulation Activity diff --git a/Source/Android/app/src/main/res/xml/preferences.xml b/Source/Android/app/src/main/res/xml/preferences.xml index 8fb40a7c06..183ad6cf21 100644 --- a/Source/Android/app/src/main/res/xml/preferences.xml +++ b/Source/Android/app/src/main/res/xml/preferences.xml @@ -64,3265 +64,4150 @@ - + - - + android:key="controller_bindings" + android:title="@string/controller_bindings"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + android:key="gamecube_bindings_control_0" + android:title="@string/controller_0"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + android:key="gamecube_bindings_control_1" + android:title="@string/controller_1"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + - + + android:key="gamecube_bindings_control_2" + android:title="@string/controller_2"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + android:key="gamecube_bindings_control_3" + android:title="@string/controller_3"> - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + android:key="wiimote_bindings_4" + android:title="@string/wiimote_0"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + android:key="wiimote_bindings_5" + android:title="@string/wiimote_1"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:key="wiimote_bindings_6" + android:title="@string/wiimote_2"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:key="wiimote_bindings_7" + android:title="@string/wiimote_3"> - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3332,7 +4217,6 @@ android:key="preferences_video" android:title="@string/preferences_video"> -