Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add connection separator/title; add prompt to Connection dialog

Browse source
This commit is contained in:
eehouse 2010-05-08 15:26:47 +00:00
parent 741ab275ec
commit 2992fd2d1f
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
xwords4/android/XWords4/res/layout/game_config.xml
View file

@ -37,19 +37,25 @@
android:prompt="@string/role_prompt"
/>
<TextView style="@style/config_separator"
android:id="@+id/connection_label"
android:text="@string/connection_label"
/>
<Spinner android:id="@+id/connect_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="true"
android:visibility="gone"
android:prompt="@string/connect_prompt"
/>
<Button android:id="@+id/configure_role"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/configure_role"
/>
<Button android:id="@+id/configure_role"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/configure_role"
/>
<TextView style="@style/config_separator"
android:id="@+id/players_label"

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

@ -161,6 +161,7 @@
<string name="dict_label">Dictionary</string>
<string name="role_label">Device role</string>
<string name="connection_label">Connection</string>
<string name="configure_role">Configure connection</string>
<string name="settings_label">Game settings</string>
@ -212,6 +213,8 @@
<string name="phone_label">Host phone number</string>
<string name="bluetooth_label">Bluetooth support coming soon....</string>
<string name="role_edit_title">Connection</string>
<string name="connect_prompt">How will Host and Guest devices
communicate?</string>
<string name="general_prefs">Preferences</string>
<string name="prefs_colors">Colors</string>
@ -241,8 +244,8 @@
<string name="bt_label">bt_label</string>
<string name="list_item_view">list_item_view</string>
<string name="key_player">key_player</string>
<string name="tab_relay">Connect via Internet/Relay</string>
<string name="tab_sms">Connect via SMS (broken)</string>
<string name="tab_relay">Internet/Relay</string>
<string name="tab_sms">SMS (broken)</string>
<string name="tab_bluetooth">Bluetooth (pending)</string>
<string name="msg_relay_waiting">Connected to relay. Waiting for %d player[s].</string>

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

@ -634,7 +634,8 @@ public class GameConfig extends Activity implements View.OnClickListener {
break;
}
int[] ids = { R.id.connect_spinner,
int[] ids = { R.id.connection_label,
R.id.connect_spinner,
R.id.configure_role };
for ( int id : ids ) {
findViewById( id ).setVisibility( vis );