diff --git a/xwords4/android/XWords4/res/menu/board_menu.xml b/xwords4/android/XWords4/res/menu/board_menu.xml index 757783d4e..0aaaabcfd 100644 --- a/xwords4/android/XWords4/res/menu/board_menu.xml +++ b/xwords4/android/XWords4/res/menu/board_menu.xml @@ -49,17 +49,9 @@ - - - - - - + Desfés Desfés l\'actual Desfés l\'últim - Pista - Pista següent - Pista Mostra els valors Partida Quantitat i valors diff --git a/xwords4/android/XWords4/res/values-cs/strings.xml b/xwords4/android/XWords4/res/values-cs/strings.xml index 6eb8b7730..fccc31b03 100644 --- a/xwords4/android/XWords4/res/values-cs/strings.xml +++ b/xwords4/android/XWords4/res/values-cs/strings.xml @@ -79,9 +79,6 @@ Zpět Zpět současný Zpět minulý - Rada - Další rada - Rada Ukaž hodnoty Hra Počty a hodnoty diff --git a/xwords4/android/XWords4/res/values-sk/strings.xml b/xwords4/android/XWords4/res/values-sk/strings.xml index 00f0ffece..2f84c4241 100644 --- a/xwords4/android/XWords4/res/values-sk/strings.xml +++ b/xwords4/android/XWords4/res/values-sk/strings.xml @@ -78,10 +78,7 @@ Späť Späť súčasný Späť minulý - Pomôcka - Ďalšia pomôcka - Pomôcka - Ukáž hodnoty + Ukáž hodnoty Hra Počty a hodnoty Zostávajúce kamene diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index 27a48a6dd..8e4106731 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -84,9 +84,6 @@ Undo Undo current Undo last - Hint - Next hint - First hint Show values Game Counts and values diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java index e4dc1cff2..2083282db 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java @@ -465,12 +465,6 @@ public class BoardActivity extends XWActivity } } ); break; - case R.id.board_menu_hint: - cmd = JNIThread.JNICmd.CMD_HINT; - break; - case R.id.board_menu_hint_next: - cmd = JNIThread.JNICmd.CMD_NEXT_HINT; - break; case R.id.board_menu_values: cmd = JNIThread.JNICmd.CMD_VALUES; break; @@ -497,6 +491,10 @@ public class BoardActivity extends XWActivity m_jniThread.handle( JNIThread.JNICmd.CMD_RESEND ); break; + case R.id.gamel_menu_checkmoves: + doSyncMenuitem(); + break; + case R.id.board_menu_file_prefs: m_firingPrefs = true; startActivity( new Intent( this, PrefsActivity.class ) ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java index bd94e143d..384d0ea9a 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java @@ -133,6 +133,15 @@ public class DlgDelegate { m_activity.showDialog( CONFIRM_THEN ); } + public void doSyncMenuitem() + { + if ( null == DBUtils.getRelayIDs( m_activity, false ) ) { + showOKOnlyDialog( R.string.no_games_to_refresh ); + } else { + RelayReceiver.RestartTimer( m_activity ); + } + } + private Dialog createAboutDialog() { LayoutInflater factory = LayoutInflater.from( m_activity ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java index 13a5d6f41..5f4946b6b 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java @@ -303,15 +303,6 @@ public class GamesList extends XWListActivity return true; } - private void doSyncMenuitem() - { - if ( null == DBUtils.getRelayIDs( this, false ) ) { - showOKOnlyDialog( R.string.no_games_to_refresh ); - } else { - new RefreshMsgsTask( this, this ).execute(); - } - } - public boolean onOptionsItemSelected( MenuItem item ) { boolean handled = true; diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java index faefb17e5..9c3507f43 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java @@ -115,4 +115,9 @@ public class XWActivity extends Activity { { m_delegate.showConfirmThen( getString(msgID), action ); } + + protected void doSyncMenuitem() + { + m_delegate.doSyncMenuitem(); + } } diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java index 553587d96..e804095b4 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java @@ -123,4 +123,9 @@ public class XWListActivity extends ListActivity { showConfirmThen( getString(msgID), action ); } + protected void doSyncMenuitem() + { + m_delegate.doSyncMenuitem(); + } + }