Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

minor changes: rearrange menus, new strings, etc.

Browse source
This commit is contained in:
eehouse 2010-02-14 22:05:08 +00:00
parent 919c7be9d6
commit 996351cc9c
6 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/XWords4/res/layout/player_edit.xml
View file

@ -30,7 +30,8 @@
android:text="@string/remote_label"
/>
<TextView android:layout_height="wrap_content"
<TextView android:id="@+id/player_name_label"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"
@ -57,7 +58,8 @@
android:text="@string/robot_label"
/>
<TextView android:layout_height="wrap_content"
<TextView android:id="@+id/password_label"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginLeft="20dip"
android:layout_marginRight="20dip"

1
xwords4/android/XWords4/res/layout/role_edit_relay.xml
View file

@ -41,6 +41,7 @@
/>
<EditText android:id="@+id/hostname_edit"
android:hint="eehouse.org"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_marginLeft="20dip"

7
xwords4/android/XWords4/res/menu/players_list_item_menu.xml
View file

@ -4,8 +4,8 @@
<!-- <item android:id="@+id/list_item_open" -->
<!-- android:title="@string/list_item_open" -->
<!-- /> -->
<item android:id="@+id/player_list_item_edit"
android:title="@string/list_item_view"
<item android:id="@+id/player_list_item_delete"
android:title="@string/list_item_delete"
/>
<item android:id="@+id/player_list_item_up"
android:title="@string/list_item_up"
@ -13,7 +13,4 @@
<item android:id="@+id/player_list_item_down"
android:title="@string/list_item_down"
/>
<item android:id="@+id/player_list_item_delete"
android:title="@string/list_item_delete"
/>
</menu>

13
xwords4/android/XWords4/res/values/strings.xml
View file

@ -126,7 +126,7 @@
<string name="str_no_empties_in_turn">Empty squares cannot separate tiles played.</string>
<string name="str_two_tiles_first_move">Must play two or more pieces on the first move.</string>
<string name="str_tiles_must_contact">New pieces must contact others already in place (or the middle square on the first move)</string>
<string name="str_not_your_turn">You can't do that; it's not your turn!</string>
<string name="str_not_your_turn">You can\'t do that; it\'s not your turn!</string>
<string name="str_no_peek_robot_tiles">No peeking at the robot\'s tiles!</string>
<string name="str_cant_trade_mid_move">Remove played tiles before trading.</string>
<string name="str_too_few_tiles_left_to_trade">Too few tiles left to trade.</string>
@ -137,7 +137,7 @@
<string name="str_server_dict_wins">Conflict between Host and Guest dictionaries; Host wins.</string>
<string name="str_reg_server_sans_remote">At least one player must be marked \"Remote\" for a game started as Host.</string>
<string name="remote_label">Remote player (ignored)</string>
<string name="remote_label">Remote player</string>
<string name="robot_label">Robot player</string>
<string name="password_label">Password (ignored)</string>
<string name="player_edit_title">Player</string>
@ -209,9 +209,14 @@
<string name="list_item_view">list_item_view</string>
<string name="key_player">key_player</string>
<string name="tab_relay">Internet/Relay</string>
<string name="tab_sms">SMS (pending)</string>
<string name="tab_sms">SMS (untested)</string>
<string name="tab_bluetooth">Bluetooth (pending)</string>
<string name="msg_relay_waiting">Connected to relay. Waiting for %d player[s].</string>
<string name="msg_relay_all_here">All players are here.</string>
<string name="title_relay_status">Connection status.</string>
<!-- These do not require localization -->
<string name="key_color_tiles">key_color_tiles</string>
<string name="key_show_arrow">key_show_arrow</string>
@ -231,4 +236,6 @@
<string name="key_relay_host">key_relay_host</string>
<string name="key_relay_port">key_relay_port</string>
<string name="key_sms_port">key_sms_port</string>
<string name="default_host">eehouse.org</string>
</resources>

2
xwords4/android/XWords4/res/xml/xwprefs.xml
View file

@ -81,7 +81,7 @@
>
<EditTextPreference android:key="@string/key_relay_host"
android:title="@string/relay_host"
android:defaultValue="eehouse.org"
android:defaultValue="@string/default_host"
/>
<EditTextPreference android:key="@string/key_relay_port"
android:title="@string/relay_port"

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
View file

@ -79,7 +79,8 @@ public class Utils {
public static void saveGame( Context context, byte[] bytes, String path )
{
try {
FileOutputStream out = context.openFileOutput( path, Context.MODE_PRIVATE );
FileOutputStream out = context.openFileOutput( path,
Context.MODE_PRIVATE );
out.write( bytes );
out.close();
} catch ( java.io.IOException ex ) {