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

add menuitems for back/commit for trade mode parallel to the buttons

Browse source 
at bottom (which should go when you have an action bar)
This commit is contained in:
Eric House 2013-11-11 05:23:25 -08:00
parent 37aa4a9adf
commit 35721975db
4 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/android/XWords4/img_src/back.svg Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120"
height="120" xml:space="preserve">
<g
id="g12"
transform="matrix(1.25,0,0,-1.25,0,120)">
<g transform='translate(46.03,16.24)' id='g1584'>
<path style='fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none' d='M 0,0 5.5,5.502 -16.87,27.87 35.7,27.87 35.7,35.65 -16.87,35.65 5.5,58.02 0,63.52 -31.76,31.76 0,0 z' id='path1586'/>
</g></g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 609 B

13
xwords4/android/XWords4/img_src/save.svg Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120"
height="120" xml:space="preserve">
<g
id="g12"
transform="matrix(1.25,0,0,-1.25,0,120)">
<g id='g1298'>
<g id='g1300'>
<path style='fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none' d='M 70.84,50.41 25.16,50.41 25.16,19.32 70.84,19.32 70.84,50.41 z M 80.88,67.78 80.88,16.74 C 80.88,15.66 80,14.78 78.92,14.78 L 17.08,14.78 C 16,14.78 15.12,15.66 15.12,16.74 L 15.12,79.26 C 15.12,80.34 16,81.22 17.08,81.22 L 25.16,81.22 25.16,57.47 60.8,57.47 60.8,81.22 67.45,81.22 80.88,67.78 z M 64.84,30.94 29.86,30.94 29.86,27.02 64.84,27.02 64.84,30.94 z M 64.84,41.95 29.86,41.95 29.86,38.02 64.84,38.02 64.84,41.95 z M 55.13,61.11 41.52,61.11 41.52,78.59 55.13,78.59 55.13,61.11 z' id='path1306'/>
</g>
</g></g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 988 B

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

@ -15,6 +15,18 @@
/>
</group>
<item android:id="@+id/board_menu_trade_commit"
android:title="@string/button_trade_cancel"
android:showAsAction="ifRoom"
android:icon="@drawable/save__gen"
/>
<item android:id="@+id/board_menu_trade_cancel"
android:title="@string/button_trade_commit"
android:showAsAction="ifRoom"
android:icon="@drawable/back__gen"
/>
<item android:id="@+id/board_menu_undo_last"
android:title="@string/board_menu_undo_last"
android:alphabeticShortcut="U"

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

@ -747,6 +747,9 @@ public class BoardActivity extends XWActivity
Utils.setItemVisible( menu, R.id.board_menu_undo_last, !inTrade );
Utils.setItemVisible( menu, R.id.board_menu_tray, !inTrade );
Utils.setItemVisible( menu, R.id.board_menu_trade_cancel, inTrade );
Utils.setItemVisible( menu, R.id.board_menu_trade_commit,
inTrade && m_gsi.tradeTilesSelected );
if ( !inTrade ) {
boolean enabled = null == m_gsi || m_gsi.curTurnSelected;
item = menu.findItem( R.id.board_menu_done );