Implement Gamecube Input setting screen

This commit is contained in:
sigmabeta committed 2016-01-29 23:33:06 -05:00
1 parent f1ca95eec7
commit 6115d39a7a
26 files changed
+210 -16

No files matched your search

Binary file not shown.

After

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 157 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 364 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 506 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 506 B

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<org.dolphinemu.dolphinemu.ui.settings.SettingsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:background="@android:color/white"
android:elevation="@dimen/elevation_high"
android:orientation="vertical">
<include
android:id="@+id/list_item_controller_one"
layout="@layout/list_item_setting"
/>
<include
android:id="@+id/list_item_controller_two"
layout="@layout/list_item_setting"
/>
<include
android:id="@+id/list_item_controller_two"
layout="@layout/list_item_setting"
/>
<include
android:id="@+id/list_item_controller_two"
layout="@layout/list_item_setting"
/>
</LinearLayout>
</org.dolphinemu.dolphinemu.ui.settings.SettingsFrameLayout>
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_refresh"
android:title="@string/grid_menu_refresh"
android:icon="@drawable/ic_refresh"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/menu_settings_core"
android:title="@string/grid_menu_core_settings"
@@ -16,5 +11,15 @@
android:title="@string/grid_menu_video_settings"
android:icon="@drawable/ic_settings_graphics"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/menu_settings_gcpad"
android:title="@string/grid_menu_gcpad_settings"
android:icon="@drawable/ic_settings_gcpad"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/menu_refresh"
android:title="@string/grid_menu_refresh"
android:icon="@drawable/ic_refresh"
app:showAsAction="ifRoom"/>
</menu>
@@ -147,4 +147,16 @@
<item>Taiwan</item>
<item>Unknown</item>
</string-array>
<string-array name="gcpadTypeEntries">
<item>Disabled</item>
<item>Emulated</item>
<item>Gamecube Adapter</item>
</string-array>
<integer-array name="gcpadTypeValues">
<item>0</item>
<item>6</item>
<item>12</item>
</integer-array>
</resources>
@@ -78,10 +78,14 @@
<string name="controller_bindings">Controller Bindings</string>
<string name="controller_gc">GameCube Controllers</string>
<string name="controller_wii">Wii Controllers (Wiimotes)</string>
<!-- WARNING Do not move these controller entries AT ALL COSTS! -->
<string name="controller_0">GameCube Controller 1</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>
<!-- END WARNING -->
<string name="enable_controller">Enable controller</string>
<string name="controller_buttons">Buttons</string>
<string name="controller_dpad">Directional Keys</string>
@@ -317,8 +321,9 @@
<!-- Game Grid Screen-->
<string name="grid_menu_core_settings">Settings</string>
<string name="grid_menu_core_settings">CPU Settings</string>
<string name="grid_menu_video_settings">Video Settings</string>
<string name="grid_menu_gcpad_settings">Gamecube Input</string>
<string name="grid_menu_refresh">Refresh Library</string>
<!-- Add Directory Screen-->
@@ -340,7 +345,13 @@
<string name="emulation_toggle_input">Toggle Touch Controls</string>
<string name="emulation_quicksave">Quick Save</string>
<string name="emulation_quickload">Quick Load</string>
<!-- GC Adapter Menu-->
<string name="gc_adapter_rumble">Enable Vibration</string>
<string name="gc_adapter_rumble_description">Enable the vibration function for this Gamecube controller.</string>
<string name="gc_adapter_bongos">Bongo Controller</string>
<string name="gc_adapter_bongos_description">Enable this if you are using bongos on this port.</string>
<!-- Package Names-->
<string name="application_id">org.dolphinemu.dolphinemu</string>
</resources>