diff --git a/assets/default/keymap.xml b/assets/default/keymap.xml index f3a3b3814..ab032ebf2 100644 --- a/assets/default/keymap.xml +++ b/assets/default/keymap.xml @@ -2,7 +2,7 @@ - + diff --git a/src/org/geometerplus/android/fbreader/FBReader.java b/src/org/geometerplus/android/fbreader/FBReader.java index e3b86637d..9f53b486a 100644 --- a/src/org/geometerplus/android/fbreader/FBReader.java +++ b/src/org/geometerplus/android/fbreader/FBReader.java @@ -101,7 +101,7 @@ public final class FBReader extends ZLAndroidActivity { fbReader.addAction(ActionCode.PROCESS_HYPERLINK, new ProcessHyperlinkAction(this, fbReader)); - fbReader.addAction(ActionCode.CANCEL, new CancelAction(this, fbReader)); + fbReader.addAction(ActionCode.SHOW_CANCEL_MENU, new ShowCancelMenuAction(this, fbReader)); } @Override diff --git a/src/org/geometerplus/android/fbreader/CancelAction.java b/src/org/geometerplus/android/fbreader/ShowCancelMenuAction.java similarity index 94% rename from src/org/geometerplus/android/fbreader/CancelAction.java rename to src/org/geometerplus/android/fbreader/ShowCancelMenuAction.java index b0b3a3bf9..4dd39172f 100644 --- a/src/org/geometerplus/android/fbreader/CancelAction.java +++ b/src/org/geometerplus/android/fbreader/ShowCancelMenuAction.java @@ -26,10 +26,10 @@ import android.content.Intent; import org.geometerplus.fbreader.fbreader.FBAction; import org.geometerplus.fbreader.fbreader.FBReaderApp; -class CancelAction extends FBAction { +class ShowCancelMenuAction extends FBAction { private final FBReader myBaseActivity; - CancelAction(FBReader baseActivity, FBReaderApp fbreader) { + ShowCancelMenuAction(FBReader baseActivity, FBReaderApp fbreader) { super(fbreader); myBaseActivity = baseActivity; } diff --git a/src/org/geometerplus/fbreader/fbreader/ActionCode.java b/src/org/geometerplus/fbreader/fbreader/ActionCode.java index e26e683fb..071ef2341 100644 --- a/src/org/geometerplus/fbreader/fbreader/ActionCode.java +++ b/src/org/geometerplus/fbreader/fbreader/ActionCode.java @@ -45,7 +45,10 @@ public interface ActionCode { String VOLUME_KEY_SCROLL_BACK = "volumeKeyScrollBackward"; String SHOW_MENU = "menu"; String SHOW_NAVIGATION = "navigate"; - String CANCEL = "cancel"; + + String EXIT = "exit"; + String SHOW_CANCEL_MENU = "cancelMenu"; + String ROTATE = "rotate"; String INCREASE_FONT = "increaseFont"; String DECREASE_FONT = "decreaseFont"; diff --git a/src/org/geometerplus/fbreader/fbreader/ExitAction.java b/src/org/geometerplus/fbreader/fbreader/ExitAction.java new file mode 100644 index 000000000..8457c2bfa --- /dev/null +++ b/src/org/geometerplus/fbreader/fbreader/ExitAction.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2007-2011 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +package org.geometerplus.fbreader.fbreader; + +class ExitAction extends FBAction { + ExitAction(FBReaderApp fbreader) { + super(fbreader); + } + + public void run() { + if (Reader.getCurrentView() != Reader.BookTextView) { + Reader.showBookTextView(); + } else { + Reader.closeWindow(); + } + } +} diff --git a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java index f1a7f8f5d..c10934d02 100644 --- a/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java +++ b/src/org/geometerplus/fbreader/fbreader/FBReaderApp.java @@ -127,6 +127,8 @@ public final class FBReaderApp extends ZLApplication { addAction(ActionCode.SWITCH_TO_DAY_PROFILE, new SwitchProfileAction(this, ColorProfile.DAY)); addAction(ActionCode.SWITCH_TO_NIGHT_PROFILE, new SwitchProfileAction(this, ColorProfile.NIGHT)); + addAction(ActionCode.EXIT, new ExitAction(this)); + BookTextView = new FBView(this); FootnoteView = new FBView(this);