X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderApplication.java;h=1de62a46a2a420484cf7ea8fa54efee1d83cc692;hp=7dc1fd5919609b64e33e88466318f668ee9ba336;hb=cf9c5ed1164709d753d9c93ae8589f09b2f90ac0;hpb=e8796963aa396e8063bbfa1976f22706182fe637

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
index 7dc1fd5..1de62a4 100644
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
@@ -10,6 +10,7 @@ import jexer.TCommand;
 import jexer.TKeypress;
 import jexer.TMessageBox;
 import jexer.TStatusBar;
+import jexer.TWidget;
 import jexer.TWindow;
 import jexer.event.TMenuEvent;
 import jexer.menu.TMenu;
@@ -37,6 +38,9 @@ class TuiReaderApplication extends TApplication implements Reader {
 	public static final int MENU_LIBRARY = 1029;
 	public static final int MENU_EXIT = 1030;
 
+	public static final TCommand CMD_EXIT = new TCommand(MENU_EXIT) {
+	};
+
 	private Reader reader;
 	private TuiReaderMainWindow main;
 
@@ -71,9 +75,9 @@ class TuiReaderApplication extends TApplication implements Reader {
 
 		// TODO: open in editor + external option
 		if (!meta.isImageDocument()) {
-			@SuppressWarnings("unused")
-			Object discard = new TuiReaderStoryWindow(this, getLibrary(), meta,
+			TWindow window = new TuiReaderStoryWindow(this, getLibrary(), meta,
 					getChapter());
+			window.maximize();
 		} else {
 			try {
 				openExternal(getLibrary(), meta.getLuid());
@@ -149,7 +153,7 @@ class TuiReaderApplication extends TApplication implements Reader {
 	 */
 	public TStatusBar setStatusBar(TWindow window, String description) {
 		TStatusBar statusBar = window.newStatusBar(description);
-		statusBar.addShortcutKeypress(TKeypress.kbF10, TCommand.cmExit, "Exit");
+		statusBar.addShortcutKeypress(TKeypress.kbF10, CMD_EXIT, "Exit");
 		return statusBar;
 
 	}
@@ -215,11 +219,7 @@ class TuiReaderApplication extends TApplication implements Reader {
 		// TODO: i18n
 		switch (menu.getId()) {
 		case MENU_EXIT:
-			if (messageBox("Confirmation", "(TODO: i18n) Exit application?",
-					TMessageBox.Type.YESNO).getResult() == TMessageBox.Result.YES) {
-				exit(); // TODO: exit(false) for "no confirm box"
-			}
-
+			close(this);
 			return true;
 		case MENU_IMPORT_URL:
 			String clipboard = "";
@@ -282,4 +282,33 @@ class TuiReaderApplication extends TApplication implements Reader {
 	public void openExternal(BasicLibrary lib, String luid) throws IOException {
 		reader.openExternal(lib, luid);
 	}
+
+	/**
+	 * Ask the user and, if confirmed, close the {@link TApplication} this
+	 * {@link TWidget} is running on.
+	 * <p>
+	 * This should result in the program terminating.
+	 * 
+	 * @param widget
+	 *            the {@link TWidget}
+	 */
+	static public void close(TWidget widget) {
+		close(widget.getApplication());
+	}
+
+	/**
+	 * Ask the user and, if confirmed, close the {@link TApplication}.
+	 * <p>
+	 * This should result in the program terminating.
+	 * 
+	 * @param app
+	 *            the {@link TApplication}
+	 */
+	static void close(TApplication app) {
+		// TODO: i18n
+		if (app.messageBox("Confirmation", "(TODO: i18n) Exit application?",
+				TMessageBox.Type.YESNO).getResult() == TMessageBox.Result.YES) {
+			app.exit();
+		}
+	}
 }