ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Added categories to input controls 

- Seperates input configurations into categories
- Reworked input configurations to reuse more strings
This commit is contained in:
Phatcat 2015-12-17 19:17:14 +01:00
parent cfe8400cdd
commit 158f0e8102
4 changed files with 4076 additions and 3212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Android/app/src/main/res/values-ja/strings.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- Title of the app --> <!-- Title of the app -->
@ -73,17 +73,15 @@
<string name="input_overlay_layout">入力オーバーレイレイアウト</string> <string name="input_overlay_layout">入力オーバーレイレイアウト</string>
<string name="input_overlay_layout_desc">入力オーバーレイのためのボタンのレイアウト。</string> <string name="input_overlay_layout_desc">入力オーバーレイのためのボタンのレイアウト。</string>
<string name="controls_size">コントロールのサイズを調整し</string> <string name="controls_size">コントロールのサイズを調整し</string>
<string name="gamecube_bindings">ゲームキューブコントローラの入力バインディング</string>
<string name="controller_0">コントローラ1</string> <string name="controller_0">コントローラ1</string>
<string name="controller_1">コントローラ2</string> <string name="controller_1">コントローラ2</string>
<string name="controller_2">コントローラ3</string> <string name="controller_2">コントローラ3</string>
<string name="controller_3">コントローラ4</string> <string name="controller_3">コントローラ4</string>
<string name="enable_controller">コントローラを有効</string> <string name="enable_controller">コントローラを有効</string>
<string name="wiimote_bindings">Wiiリモコンの入力バインディング</string> <string name="wiimote_0">Wiiリモコン1</string>
<string name="wiimote_1">Wiiリモコン1</string> <string name="wiimote_1">Wiiリモコン2</string>
<string name="wiimote_2">Wiiリモコン2</string> <string name="wiimote_2">Wiiリモコン3</string>
<string name="wiimote_3">Wiiリモコン3</string> <string name="wiimote_3">Wiiリモコン4</string>
<string name="wiimote_4">Wiiリモコン4</string>
<string name="enable_wiimote">Wiiリモコンを有効</string> <string name="enable_wiimote">Wiiリモコンを有効</string>
<string name="input_binding">入力バインディング</string> <string name="input_binding">入力バインディング</string>
<string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string> <string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string>

192
Source/Android/app/src/main/res/values/strings.xml
View File

@ -75,27 +75,39 @@
<string name="input_overlay_layout">Input Overlay Layout</string> <string name="input_overlay_layout">Input Overlay Layout</string>
<string name="input_overlay_layout_desc">Button layout for the input overlay.</string> <string name="input_overlay_layout_desc">Button layout for the input overlay.</string>
<string name="controls_size">Adjust the control size</string> <string name="controls_size">Adjust the control size</string>
<string name="gamecube_bindings">GameCube Controller Bindings</string> <string name="controller_bindings">Controller Bindings</string>
<string name="controller_0">Controller 1</string> <string name="controller_gc">GameCube Controllers</string>
<string name="controller_1">Controller 2</string> <string name="controller_wii">Wii Controllers (Wiimotes)</string>
<string name="controller_2">Controller 3</string> <string name="controller_0">GameCube Controller 1</string>
<string name="controller_3">Controller 4</string> <string name="controller_1">GameCube Controller 2</string>
<string name="controller_2">GameCube Controller 3</string>
<string name="controller_3">GameCube Controller 4</string>
<string name="enable_controller">Enable controller</string> <string name="enable_controller">Enable controller</string>
<string name="wiimote_bindings">Wiimote Bindings</string> <string name="controller_buttons">Buttons</string>
<string name="wiimote_1">Wiimote 1</string> <string name="controller_dpad">Directional Keys</string>
<string name="wiimote_2">Wiimote 2</string> <string name="controller_main">Main Stick Navigation</string>
<string name="wiimote_3">Wiimote 3</string> <string name="controller_c">C-Stick Navigation</string>
<string name="wiimote_4">Wiimote 4</string> <string name="controller_trig">Analog Triggers</string>
<string name="wiimote_0">Wiimote 1</string>
<string name="wiimote_1">Wiimote 2</string>
<string name="wiimote_2">Wiimote 3</string>
<string name="wiimote_3">Wiimote 4</string>
<string name="enable_wiimote">Enable Wiimote</string> <string name="enable_wiimote">Enable Wiimote</string>
<string name="wiimote_ir">IR Motion Controls</string>
<string name="wiimote_swing">Swing Navigation</string>
<string name="wiimote_tilt">Tilt Navigation</string>
<string name="wiimote_shake">Shake Controls</string>
<string name="wiimote_stick">Analog Stick Navigation</string>
<string name="wiimote_extensions">Wiimote Extension</string> <string name="wiimote_extensions">Wiimote Extension</string>
<string name="wiimote_extensions_descrip">Choose which Wii Extension you want to use with the Wiimote</string> <string name="wiimote_extensions_descrip">Choose which Extension you want to use with the Wiimote</string>
<string name="show_nunchuk">Show Nunchuk Extension configurations</string> <string name="show_nunchuk">Nunchuk</string>
<string name="show_classic">Show Classic Extension configurations</string> <string name="show_classic">Classic Controller</string>
<string name="show_guitar">Show Guitar Extension configurations</string> <string name="show_guitar">Guitar</string>
<string name="show_drums">Show Drums Extension configurations</string> <string name="show_drums">Drums</string>
<string name="show_turntable">Show Turntable Extension configurations</string> <string name="show_turntable">Turntable</string>
<string name="input_binding">Input Binding</string> <string name="input_binding">Input Binding</string>
<string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string> <string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string>
<!-- GameCube buttons (May be shared with Wiimote stuff too) --> <!-- GameCube buttons (May be shared with Wiimote stuff too) -->
<string name="button_a">Button A</string> <string name="button_a">Button A</string>
<string name="button_b">Button B</string> <string name="button_b">Button B</string>
@ -117,12 +129,17 @@
<string name="c_stick_right">C Stick Right</string> <string name="c_stick_right">C Stick Right</string>
<string name="trigger_left">Trigger L</string> <string name="trigger_left">Trigger L</string>
<string name="trigger_right">Trigger R</string> <string name="trigger_right">Trigger R</string>
<!-- Wiimote (+ extension) only buttons --> <!-- Wiimote (+ extension) only buttons -->
<string name="button_one">Button 1</string> <string name="button_one">Button 1</string>
<string name="button_two">Button 2</string> <string name="button_two">Button 2</string>
<string name="button_plus">Button +</string> <string name="button_plus">Button +</string>
<string name="button_minus">Button -</string> <string name="button_minus">Button -</string>
<string name="button_home">Button Home</string> <string name="button_home">Button Home</string>
<string name="stick_up">Stick Up</string>
<string name="stick_down">Stick Down</string>
<string name="stick_left">Stick Left</string>
<string name="stick_right">Stick Right</string>
<string name="ir_up">IR Up</string> <string name="ir_up">IR Up</string>
<string name="ir_down">IR Down</string> <string name="ir_down">IR Down</string>
<string name="ir_left">IR Left</string> <string name="ir_left">IR Left</string>
@ -143,100 +160,64 @@
<string name="shake_x">Shake X</string> <string name="shake_x">Shake X</string>
<string name="shake_y">Shake Y</string> <string name="shake_y">Shake Y</string>
<string name="shake_z">Shake Z</string> <string name="shake_z">Shake Z</string>
<!-- Nunchuk only buttons --> <!-- Nunchuk only buttons -->
<string name="nunchuk_button_c">Nunchuk Button C</string> <string name="nunchuk_button_c">Button C</string>
<string name="nunchuk_button_z">Nunchuk Button Z</string>
<string name="nunchuk_stick_up">Nunchuk Stick Up</string>
<string name="nunchuk_stick_down">Nunchuk Stick Down</string>
<string name="nunchuk_stick_left">Nunchuk Stick Left</string>
<string name="nunchuk_stick_right">Nunchuk Stick Right</string>
<string name="nunchuk_swing_up">Nunchuk Swing Up</string>
<string name="nunchuk_swing_down">Nunchuk Swing Down</string>
<string name="nunchuk_swing_left">Nunchuk Swing Left</string>
<string name="nunchuk_swing_right">Nunchuk Swing Right</string>
<string name="nunchuk_swing_forward">Nunchuk Swing Forward</string>
<string name="nunchuk_swing_backward">Nunchuk Swing Backward</string>
<string name="nunchuk_tilt_forward">Nunchuk Tilt Forward</string>
<string name="nunchuk_tilt_backward">Nunchuk Tilt Backward</string>
<string name="nunchuk_tilt_left">Nunchuk Tilt Left</string>
<string name="nunchuk_tilt_right">Nunchuk Tilt Right</string>
<string name="nunchuk_shake_x">Nunchuk Shake X</string>
<string name="nunchuk_shake_y">Nunchuk Shake Y</string>
<string name="nunchuk_shake_z">Nunchuk Shake Z</string>
<!-- Classic only buttons --> <!-- Classic only buttons -->
<string name="classic_button_a">Classic Controller Button A</string> <string name="classic_button_zl">Button ZL</string>
<string name="classic_button_b">Classic Controller Button B</string> <string name="classic_button_zr">Button ZR</string>
<string name="classic_button_x">Classic Controller Button X</string> <string name="classic_leftstick">Left Analog Stick Navigation</string>
<string name="classic_button_y">Classic Controller Button Y</string> <string name="classic_stick_left_up">Left Stick Up</string>
<string name="classic_button_minus">Classic Controller Button -</string> <string name="classic_stick_left_down">Left Stick Down</string>
<string name="classic_button_plus">Classic Controller Button +</string> <string name="classic_stick_left_left">Left Stick Left</string>
<string name="classic_button_home">Classic Controller Button Home</string> <string name="classic_stick_left_right">Left Stick Right</string>
<string name="classic_button_zl">Classic Controller Button ZL</string> <string name="classic_rightstick">Right Analog Stick Navigation</string>
<string name="classic_button_zr">Classic Controller Button ZR</string> <string name="classic_stick_right_up">Right Stick Up</string>
<string name="classic_dpad_up">Classic Controller D-Pad Up</string> <string name="classic_stick_right_down">Right Stick Down</string>
<string name="classic_dpad_down">Classic Controller D-Pad Down</string> <string name="classic_stick_right_left">Right Stick Left</string>
<string name="classic_dpad_left">Classic Controller D-Pad Left</string> <string name="classic_stick_right_right">Right Stick Right</string>
<string name="classic_dpad_right">Classic Controller D-Pad Right</string>
<string name="classic_stick_left_up">Classic Controller Left Stick Up</string>
<string name="classic_stick_left_down">Classic Controller Left Stick Down</string>
<string name="classic_stick_left_left">Classic Controller Left Stick Left</string>
<string name="classic_stick_left_right">Classic Controller Left Stick Right</string>
<string name="classic_stick_right_up">Classic Controller Right Stick Up</string>
<string name="classic_stick_right_down">Classic Controller Right Stick Down</string>
<string name="classic_stick_right_left">Classic Controller Right Stick Left</string>
<string name="classic_stick_right_right">Classic Controller Right Stick Right</string>
<string name="classic_trigger_l">Classic Controller Left Trigger</string>
<string name="classic_trigger_r">Classic Controller Right Trigger</string>
<!-- Guitar only buttons --> <!-- Guitar only buttons -->
<string name="guitar_button_minus">Guitar Button -</string> <string name="guitar_frets">Guitar Frets</string>
<string name="guitar_button_plus">Guitar Button +</string> <string name="guitar_fret_green">Red Fret</string>
<string name="guitar_fret_green">Guitar Fret Red</string> <string name="guitar_fret_red">Red Fret</string>
<string name="guitar_fret_red">Guitar Fret Red</string> <string name="guitar_fret_yellow">Yellow Fret</string>
<string name="guitar_fret_yellow">Guitar Fret Yellow</string> <string name="guitar_fret_blue">Blue Fret</string>
<string name="guitar_fret_blue">Guitar Fret Blue</string> <string name="guitar_fret_orange">Orange Fret</string>
<string name="guitar_fret_orange">Guitar Fret Orange</string> <string name="guitar_strum_up">Strum Up</string>
<string name="guitar_strum_up">Guitar Strum Up</string> <string name="guitar_strum_down">Strum Down</string>
<string name="guitar_strum_down">Guitar Strum Down</string> <string name="guitar_whammy">Guitar Whammy</string>
<string name="guitar_stick_up">Guitar Stick Up</string> <string name="guitar_whammy_bar">Whammy Bar</string>
<string name="guitar_stick_down">Guitar Stick Down</string>
<string name="guitar_stick_left">Guitar Stick Left</string>
<string name="guitar_stick_right">Guitar Stick Right</string>
<string name="guitar_whammy_bar">Guitar Whammy Bar</string>
<!-- Drums only buttons --> <!-- Drums only buttons -->
<string name="drums_button_minus">Drums Button -</string> <string name="drums_pads">Drum Pads</string>
<string name="drums_button_plus">Drums Button +</string> <string name="drums_pad_red">Red Pad</string>
<string name="drums_pad_red">Drums Pad Red</string> <string name="drums_pad_yellow">Yellow Pad</string>
<string name="drums_pad_yellow">Drums Pad Yellow</string> <string name="drums_pad_blue">Blue Pad</string>
<string name="drums_pad_blue">Drums Pad Blue</string> <string name="drums_pad_green">Green Pad</string>
<string name="drums_pad_green">Drums Pad Green</string> <string name="drums_pad_orange">Orange Pad</string>
<string name="drums_pad_orange">Drums Pad Orange</string> <string name="drums_pad_bass">Bass Pad</string>
<string name="drums_pad_bass">Drums Pad Bass</string>
<string name="drums_stick_up">Drums Stick Up</string>
<string name="drums_stick_down">Drums Stick Down</string>
<string name="drums_stick_left">Drums Stick Left</string>
<string name="drums_stick_right">Drums Stick Right</string>
<!-- Turntable only buttons --> <!-- Turntable only buttons -->
<string name="turntable_button_green_left">Turntable Button Green Left</string> <string name="turntable_button_green_left">Green Left</string>
<string name="turntable_button_red_left">Turntable Button Red Left</string> <string name="turntable_button_red_left">Red Left</string>
<string name="turntable_button_blue_left">Turntable Button Blue Left</string> <string name="turntable_button_blue_left">Blue Left</string>
<string name="turntable_button_green_right">Turntable Button Green Right</string> <string name="turntable_button_green_right">Green Right</string>
<string name="turntable_button_red_right">Turntable Button Red Right</string> <string name="turntable_button_red_right">Red Right</string>
<string name="turntable_button_blue_right">Turntable Button Blue Right</string> <string name="turntable_button_blue_right">Blue Right</string>
<string name="turntable_button_minus">Turntable Button -</string> <string name="turntable_button_euphoria">Euphoria</string>
<string name="turntable_button_plus">Turntable Button +</string> <string name="turntable_table_left">Left Turntable</string>
<string name="turntable_button_home">Turntable Button Home</string> <string name="turntable_table_left_left">Left Table Left</string>
<string name="turntable_button_euphoria">Turntable Button Euphoria</string> <string name="turntable_table_left_right">Left Table Right</string>
<string name="turntable_table_left_left">Turntable Left Table Left</string> <string name="turntable_table_right">Right Turntable</string>
<string name="turntable_table_left_right">Turntable Left Table Right</string> <string name="turntable_table_right_left">Right Table Left</string>
<string name="turntable_table_right_left">Turntable Right Table Left</string> <string name="turntable_table_right_right">Right Table Right</string>
<string name="turntable_table_right_right">Turntable Right Table Right</string> <string name="turntable_effect"> Effects</string>
<string name="turntable_stick_up">Turntable Stick Up</string> <string name="turntable_effect_dial">Effect Dial</string>
<string name="turntable_stick_down">Turntable Stick Down</string> <string name="turntable_crossfade">Crossfade</string>
<string name="turntable_stick_left">Turntable Stick Left</string> <string name="turntable_crossfade_left">Crossfade Left</string>
<string name="turntable_stick_right">Turntable Stick Right</string> <string name="turntable_crossfade_right">Crossfade Right</string>
<string name="turntable_effect_dial">Turntable Effekt Dial</string>
<string name="turntable_crossfade_left">Turntable Crossfade Left</string>
<string name="turntable_crossfade_right">Turntable Crossfade Right</string>
<!-- CPU Preference Fragment --> <!-- CPU Preference Fragment -->
<string name="interpreter">Interpreter</string> <string name="interpreter">Interpreter</string>
@ -346,6 +327,7 @@
<!-- Preferences Screen --> <!-- Preferences Screen -->
<string name="preferences_cpu">CPU Settings</string> <string name="preferences_cpu">CPU Settings</string>
<string name="preferences_input">Input Settings</string> <string name="preferences_input">Input Settings</string>
<string name="preferences_extensions">Extension Bindings</string>
<string name="preferences_video">Video Settings</string> <string name="preferences_video">Video Settings</string>
<string name="emulation_title">Emulation Activity</string> <string name="emulation_title">Emulation Activity</string>

1488
Source/Android/app/src/main/res/xml/preferences.xml
View File

File diff suppressed because it is too large Load Diff

40
Source/Core/DolphinWX/Android/ButtonManager.cpp
View File

@ -47,26 +47,26 @@ namespace ButtonManager
"WiimoteDown", "WiimoteDown",
"WiimoteLeft", "WiimoteLeft",
"WiimoteRight", "WiimoteRight",
"WiimoteIRUp", "IRUp",
"WiimoteIRDown", "IRDown",
"WiimoteIRLeft", "IRLeft",
"WiimoteIRRight", "IRRight",
"WiimoteIRForward", "IRForward",
"WiimoteIRBackward", "IRBackward",
"WiimoteIRHide", "IRHide",
"WiimoteSwingUp", "SwingUp",
"WiimoteSwingDown", "SwingDown",
"WiimoteSwingLeft", "SwingLeft",
"WiimoteSwingRight", "SwingRight",
"WiimoteSwingForward", "SwingForward",
"WiimoteSwingBackward", "SwingBackward",
"WiimoteTiltForward", "TiltForward",
"WiimoteTiltBackward", "TiltBackward",
"WiimoteTiltLeft", "TiltLeft",
"WiimoteTiltRight", "TiltRight",
"WiimoteShakeX", "ShakeX",
"WiimoteShakeY", "ShakeY",
"WiimoteShakeZ", "ShakeZ",
// Nunchuk // Nunchuk
"NunchukC", "NunchukC",
"NunchukZ", "NunchukZ",