Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-06 20:45:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

make board menu localizable -- but submenus don't work yet

Browse source
This commit is contained in:
Eric House 2014-04-03 22:37:13 -07:00
parent a6954a71dc
commit 0e7676b301
3 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
xwords4/android/XWords4/res/menu/board_menu.xml
View file

@ -5,7 +5,7 @@
<group android:id="@+id/group_done"> <group android:id="@+id/group_done">
<!-- title set in BoardActivity --> <!-- title set in BoardActivity -->
<item android:id="@+id/board_menu_invite" <item android:id="@+id/board_menu_invite"
android:title="@string/board_menu_invite" android:title="loc:board_menu_invite"
android:showAsAction="ifRoom" android:showAsAction="ifRoom"
android:icon="@drawable/send__gen" android:icon="@drawable/send__gen"
/> />
@ -17,65 +17,65 @@
/> />
<item android:id="@+id/board_menu_trade" <item android:id="@+id/board_menu_trade"
android:title="@string/board_menu_trade" android:title="loc:board_menu_trade"
android:alphabeticShortcut="T" android:alphabeticShortcut="T"
android:showAsAction="ifRoom" android:showAsAction="ifRoom"
/> />
</group> </group>
<item android:id="@+id/board_menu_trade_cancel" <item android:id="@+id/board_menu_trade_cancel"
android:title="@string/button_trade_cancel" android:title="loc:button_trade_cancel"
android:showAsAction="ifRoom" android:showAsAction="ifRoom"
android:icon="@drawable/back__gen" android:icon="@drawable/back__gen"
/> />
<item android:id="@+id/board_menu_trade_commit" <item android:id="@+id/board_menu_trade_commit"
android:title="@string/button_trade_commit" android:title="loc:button_trade_commit"
android:showAsAction="ifRoom" android:showAsAction="ifRoom"
android:icon="@drawable/save__gen" android:icon="@drawable/save__gen"
/> />
<item android:id="@+id/board_menu_undo_last" <item android:id="@+id/board_menu_undo_last"
android:title="@string/board_menu_undo_last" android:title="loc:board_menu_undo_last"
android:alphabeticShortcut="U" android:alphabeticShortcut="U"
/> />
<item android:id="@+id/board_menu_tray" <item android:id="@+id/board_menu_tray"
/> />
<item android:title="@string/board_submenu_game"> <item android:title="loc:board_submenu_game">
<menu> <menu>
<item android:id="@+id/board_menu_game_counts" <item android:id="@+id/board_menu_game_counts"
android:title="@string/board_menu_game_counts" /> android:title="loc:board_menu_game_counts" />
<item android:id="@+id/board_menu_game_left" <item android:id="@+id/board_menu_game_left"
android:title="@string/board_menu_game_left" /> android:title="loc:board_menu_game_left" />
<item android:id="@+id/board_menu_game_history" <item android:id="@+id/board_menu_game_history"
android:title="@string/board_menu_game_history" /> android:title="loc:board_menu_game_history" />
<item android:id="@+id/board_menu_game_resign" <item android:id="@+id/board_menu_game_resign"
android:title="@string/board_menu_game_resign" /> android:title="loc:board_menu_game_resign" />
<item android:id="@+id/board_menu_game_resend" <item android:id="@+id/board_menu_game_resend"
android:title="@string/board_menu_game_resend" /> android:title="loc:board_menu_game_resend" />
</menu> </menu>
</item> </item>
<item android:id="@+id/games_menu_study" <item android:id="@+id/games_menu_study"
android:title="@string/gamel_menu_study" android:title="loc:gamel_menu_study"
/> />
<item android:id="@+id/gamel_menu_checkmoves" <item android:id="@+id/gamel_menu_checkmoves"
android:title="@string/gamel_menu_checkmoves" android:title="loc:gamel_menu_checkmoves"
/> />
<item android:id="@+id/board_menu_file_prefs" <item android:id="@+id/board_menu_file_prefs"
android:title="@string/menu_prefs" android:title="loc:menu_prefs"
android:alphabeticShortcut="P" android:alphabeticShortcut="P"
/> />
<item android:id="@+id/board_menu_file_about" <item android:id="@+id/board_menu_file_about"
android:title="@string/board_menu_file_about" android:title="loc:board_menu_file_about"
android:alphabeticShortcut="A" android:alphabeticShortcut="A"
/> />
<item android:id="@+id/board_menu_game_netstats" <item android:id="@+id/board_menu_game_netstats"
android:title="@string/board_menu_game_netstats" /> android:title="loc:board_menu_game_netstats" />
</menu> </menu>

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -159,10 +159,7 @@ public class BoardActivity extends Activity {
@Override @Override
public boolean onCreateOptionsMenu( Menu menu ) public boolean onCreateOptionsMenu( Menu menu )
{ {
MenuInflater inflater = getMenuInflater(); return m_dlgt.onCreateOptionsMenu( menu );
inflater.inflate( R.menu.board_menu, menu );
return true;
} }
@Override @Override

11
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -62,7 +62,7 @@ import org.eehouse.android.xw4.jni.*;
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType; import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole; import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole;
import org.eehouse.android.xw4.jni.JNIThread.*; import org.eehouse.android.xw4.jni.JNIThread.*;
import org.eehouse.android.xw4.loc.LocUtils;
public class BoardDelegate extends DelegateBase public class BoardDelegate extends DelegateBase
implements TransportProcs.TPMsgHandler, View.OnClickListener, implements TransportProcs.TPMsgHandler, View.OnClickListener,
@ -675,6 +675,15 @@ public class BoardDelegate extends DelegateBase
return handled; return handled;
} }
protected boolean onCreateOptionsMenu( Menu menu )
{
MenuInflater inflater = m_activity.getMenuInflater();
inflater.inflate( R.menu.board_menu, menu );
LocUtils.xlateMenu( m_activity, menu );
return true;
}
protected boolean onPrepareOptionsMenu( Menu menu ) protected boolean onPrepareOptionsMenu( Menu menu )
{ {
boolean inTrade = false; boolean inTrade = false;