From d436b8567ed22422860d2123702fc9de0ce60cf7 Mon Sep 17 00:00:00 2001 From: Peter Osterlund Date: Mon, 21 Dec 2015 20:51:51 +0100 Subject: [PATCH] DroidFish: Removed the obsolete "go to move" item in the options menu. --- DroidFish/res/layout/select_move_number.xml | 21 --------- DroidFish/res/menu/options_menu.xml | 21 ++++----- DroidFish/res/values-de/strings.xml | 1 - DroidFish/res/values-es/strings.xml | 1 - DroidFish/res/values-fr/strings.xml | 1 - DroidFish/res/values-it/strings.xml | 1 - DroidFish/res/values-nl/strings.xml | 1 - DroidFish/res/values-pl/strings.xml | 1 - DroidFish/res/values-pt/strings.xml | 1 - DroidFish/res/values-ru/strings.xml | 1 - DroidFish/res/values/strings.xml | 1 - .../src/org/petero/droidfish/DroidFish.java | 46 ------------------- 12 files changed, 8 insertions(+), 89 deletions(-) delete mode 100644 DroidFish/res/layout/select_move_number.xml diff --git a/DroidFish/res/layout/select_move_number.xml b/DroidFish/res/layout/select_move_number.xml deleted file mode 100644 index db52b15..0000000 --- a/DroidFish/res/layout/select_move_number.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/DroidFish/res/menu/options_menu.xml b/DroidFish/res/menu/options_menu.xml index 701de27..e9ea3a5 100644 --- a/DroidFish/res/menu/options_menu.xml +++ b/DroidFish/res/menu/options_menu.xml @@ -6,16 +6,6 @@ android:title="@string/option_new_game" android:icon="@android:drawable/ic_menu_add"> - - - - + android:id="@+id/item_file_menu" + android:title="@string/option_file" + android:icon="@android:drawable/ic_menu_save"> + + Partie aufgeben Stellung bearbeiten Einstellungen - Gehe zu Zug Computerzug erzwingen Remis anbieten/annehmen Eröffnungsbuch auswählen diff --git a/DroidFish/res/values-es/strings.xml b/DroidFish/res/values-es/strings.xml index abd89df..7e1a7d6 100644 --- a/DroidFish/res/values-es/strings.xml +++ b/DroidFish/res/values-es/strings.xml @@ -242,7 +242,6 @@ Si está usted utilizando la batería, se recomienda que cambie los ajustes para Rendir partida Editar Posición Ajustes/Opciones - Ir a la jugada Obligar a jugar al Programa Ofrecer / Aceptar Tablas Seleccionar Libro diff --git a/DroidFish/res/values-fr/strings.xml b/DroidFish/res/values-fr/strings.xml index a53629f..ff8635d 100644 --- a/DroidFish/res/values-fr/strings.xml +++ b/DroidFish/res/values-fr/strings.xml @@ -241,7 +241,6 @@ préserver la batterie, ou de quitter DroidFish en utilisant la touche re Abandonner Rentrer une position Paramètres - Aller au coup Forcer le coup de l\'ordinateur Proposer/Accepter la Nulle Sélectionner le livre d\'ouverture diff --git a/DroidFish/res/values-it/strings.xml b/DroidFish/res/values-it/strings.xml index 1cc8cb5..569f5f6 100644 --- a/DroidFish/res/values-it/strings.xml +++ b/DroidFish/res/values-it/strings.xml @@ -235,7 +235,6 @@ Abbandona la partita Modifica la scacchiera Impostazioni - Vai alla mossa Forza mossa del Computer Chiedi/Offri/Accetta la patta Seleziona Libro delle Aperture diff --git a/DroidFish/res/values-nl/strings.xml b/DroidFish/res/values-nl/strings.xml index d54348f..a36c82e 100644 --- a/DroidFish/res/values-nl/strings.xml +++ b/DroidFish/res/values-nl/strings.xml @@ -242,7 +242,6 @@ daadwerkelijk af te sluiten (gebruik hiervoor de return toets op uw telefoon).\< Opgeven Bord bewerken Instellingen - Ga naar zet Forceer computer zet Remise aanbieden/accepteren Selecteer openingsboek diff --git a/DroidFish/res/values-pl/strings.xml b/DroidFish/res/values-pl/strings.xml index 479ec5e..ed5ddc2 100644 --- a/DroidFish/res/values-pl/strings.xml +++ b/DroidFish/res/values-pl/strings.xml @@ -243,7 +243,6 @@ nie korzystasz aktywnie z programu.\ Poddaj partię Edytuj pozycję Ustawienia - Idź do posunięcia Wymuś ruch komputera Zaproponuj/przyjmij remis Wybierz książkę otwarć diff --git a/DroidFish/res/values-pt/strings.xml b/DroidFish/res/values-pt/strings.xml index f2a7df0..ecba0c5 100644 --- a/DroidFish/res/values-pt/strings.xml +++ b/DroidFish/res/values-pt/strings.xml @@ -243,7 +243,6 @@ não estiver usando o programa diretamente.\ Abandonar partida Editar tabuleiro Configurações - Ir para o lance Forçar lance do software Pedir/Aceitar empate Livro de aberturas diff --git a/DroidFish/res/values-ru/strings.xml b/DroidFish/res/values-ru/strings.xml index 11286de..5f46d39 100644 --- a/DroidFish/res/values-ru/strings.xml +++ b/DroidFish/res/values-ru/strings.xml @@ -234,7 +234,6 @@ Сдаться Редактировать доску Настройки - Перейти на ход Форсировать ход компьютера Заявить/Предложить/Принять ничью Выбрать открываемую книгу diff --git a/DroidFish/res/values/strings.xml b/DroidFish/res/values/strings.xml index c635540..c67b913 100644 --- a/DroidFish/res/values/strings.xml +++ b/DroidFish/res/values/strings.xml @@ -243,7 +243,6 @@ you are not actively using the program.\ Resign game Edit Board Settings - Goto Move Force Computer Move Claim/Offer/Accept Draw Select Opening Book diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java index 04c4d41..72b0a4e 100644 --- a/DroidFish/src/org/petero/droidfish/DroidFish.java +++ b/DroidFish/src/org/petero/droidfish/DroidFish.java @@ -1339,10 +1339,6 @@ public class DroidFish extends Activity implements GUIInterface { showDialog(dialog); return true; } - case R.id.item_goto_move: { - showDialog(SELECT_MOVE_DIALOG); - return true; - } case R.id.item_force_move: { ctrl.stopSearch(); return true; @@ -1779,7 +1775,6 @@ public class DroidFish extends Activity implements GUIInterface { static private final int PROMOTE_DIALOG = 0; static private final int BOARD_MENU_DIALOG = 1; static private final int ABOUT_DIALOG = 2; - static private final int SELECT_MOVE_DIALOG = 3; static private final int SELECT_BOOK_DIALOG = 4; static private final int SELECT_ENGINE_DIALOG = 5; static private final int SELECT_ENGINE_DIALOG_NOMANAGE = 6; @@ -1813,7 +1808,6 @@ public class DroidFish extends Activity implements GUIInterface { case BOARD_MENU_DIALOG: return boardMenuDialog(); case FILE_MENU_DIALOG: return fileMenuDialog(); case ABOUT_DIALOG: return aboutDialog(); - case SELECT_MOVE_DIALOG: return selectMoveDialog(); case SELECT_BOOK_DIALOG: return selectBookDialog(); case SELECT_ENGINE_DIALOG: return selectEngineDialog(false); case SELECT_ENGINE_DIALOG_NOMANAGE: return selectEngineDialog(true); @@ -2103,46 +2097,6 @@ public class DroidFish extends Activity implements GUIInterface { return alert; } - private final Dialog selectMoveDialog() { - setAutoMode(AutoMode.OFF); - View content = View.inflate(this, R.layout.select_move_number, null); - final AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setView(content); - builder.setTitle(R.string.goto_move); - final EditText moveNrView = (EditText)content.findViewById(R.id.selmove_number); - moveNrView.setText("1"); - final Runnable gotoMove = new Runnable() { - public void run() { - try { - int moveNr = Integer.parseInt(moveNrView.getText().toString()); - ctrl.gotoMove(moveNr); - } catch (NumberFormatException nfe) { - Toast.makeText(getApplicationContext(), R.string.invalid_number_format, Toast.LENGTH_SHORT).show(); - } - } - }; - builder.setPositiveButton(android.R.string.ok, new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - gotoMove.run(); - } - }); - builder.setNegativeButton(R.string.cancel, null); - - final AlertDialog dialog = builder.create(); - - moveNrView.setOnKeyListener(new OnKeyListener() { - public boolean onKey(View v, int keyCode, KeyEvent event) { - if ((event.getAction() == KeyEvent.ACTION_DOWN) && (keyCode == KeyEvent.KEYCODE_ENTER)) { - gotoMove.run(); - dialog.cancel(); - return true; - } - return false; - } - }); - return dialog; - } - private final Dialog selectBookDialog() { String[] fileNames = findFilesInDirectory(bookDir, new FileNameFilter() { @Override