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

Merge pull request #154 from bwRavencl/gui-improvements 

Some minor GUI improvements
This commit is contained in:
Matteo Hausner 2014-01-25 12:25:04 -08:00
parent 53a4862fac 05a3e374e9
commit 29a772aac2
5 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
shell/android/res/drawable/question.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
shell/android/res/drawable/star.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

34
shell/android/res/layout/input_fragment.xml
View File

@ -65,17 +65,33 @@
android:layout_height="wrap_content" />
</LinearLayout>
</TableRow>
<TableRow android:gravity="center_vertical" >
<Button
android:id="@+id/buttonKeycodeEditor"
android:layout_width="match_parent"
<TableRow
android:layout_marginTop="25dp"
android:gravity="center_vertical" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:layout_weight="1"
android:ems="8"
android:text="@string/menu_edit_keycodes" />
android:ems="10"
android:text="@string/customize_physical_controls" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical" >
<Button
android:id="@+id/buttonKeycodeEditor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
</LinearLayout>
</TableRow>
</TableLayout>
@ -268,4 +284,4 @@
</LinearLayout>
</ScrollView>
</ScrollView>

50
shell/android/res/layout/input_mod_fragment.xml
View File

@ -119,8 +119,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_a_button"
@ -170,8 +170,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_b_button"
@ -221,8 +221,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_x_button"
@ -272,8 +272,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_y_button"
@ -323,8 +323,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_l_button"
@ -374,8 +374,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_r_button"
@ -412,8 +412,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_joystick"
@ -450,8 +450,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_dpad_up"
@ -488,8 +488,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_dpad_down"
@ -526,8 +526,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_dpad_left"
@ -564,8 +564,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_dpad_right"
@ -615,8 +615,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="8"
android:text="@string/launch_editor" />
android:ems="6"
android:text="@string/select" />
<Button
android:id="@+id/remove_start"
@ -630,4 +630,4 @@
</TableLayout>
</LinearLayout>
</ScrollView>
</ScrollView>

4
shell/android/res/values/strings.xml
View File

@ -45,7 +45,7 @@
<string name="modified_layout">Enable Custom Key Layout</string>
<string name="controller_compat">Enable Compatibility Mode</string>
<string name="menu_edit_keycodes">Custom Button Layout</string>
<string name="customize_physical_controls">Customize Physical Controls</string>
<string name="map_keycode_title">Modify Controller</string>
<string name="map_keycode_message">Press the new controller button for %1$s</string>
@ -96,7 +96,7 @@
<item>@drawable/open_folder</item>
<item>@drawable/input</item>
<item>@drawable/question</item>
<item>@drawable/profiler</item>
<item>@drawable/star</item>
</array>
<!-- Content Description -->