X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderApplication.java;h=56f0dc294338a0c6c1b8b0d2d63d440226df4e90;hb=4f9478dce91ac4771d9d9fb96ae2b09bc04511cc;hp=9e991e4c743e7f31b24f0fee0f7370fd52476d03;hpb=16a81ef7656c5c692fb831927e75edde25dd77a0;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java index 9e991e4..56f0dc2 100644 --- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java +++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java @@ -4,12 +4,14 @@ import java.awt.Toolkit; import java.awt.datatransfer.DataFlavor; import java.io.IOException; import java.net.URL; +import java.net.UnknownHostException; import jexer.TApplication; 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; @@ -34,34 +36,34 @@ class TuiReaderApplication extends TApplication implements Reader { public static final int MENU_IMPORT_URL = 1026; public static final int MENU_IMPORT_FILE = 1027; public static final int MENU_EXPORT = 1028; - public static final int MENU_EXIT = 1029; + 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; + private MetaData meta; + private String source; + private boolean useMeta; + // start reading if meta present public TuiReaderApplication(Reader reader, BackendType backend) throws Exception { super(backend); init(reader); - MetaData meta = getMeta(); - - main = new TuiReaderMainWindow(this); - main.setMeta(meta); - if (meta != null) { - read(); - } + showMain(getMeta(), null, true); } public TuiReaderApplication(Reader reader, String source, TApplication.BackendType backend) throws Exception { super(backend); - init(reader); - main = new TuiReaderMainWindow(this); - main.setSource(source); + showMain(null, source, false); } @Override @@ -74,9 +76,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()); @@ -137,6 +139,52 @@ class TuiReaderApplication extends TApplication implements Reader { reader.setChapter(chapter); } + /** + * Set the default status bar when this window appear. + *

+ * Some shortcuts are always visible, and will be put here. + *

+ * Note that shortcuts placed this way on menu won't work unless the menu + * also implement them. + * + * @param window + * the new window or menu on screen + * @param description + * the description to show on the status ba + */ + public TStatusBar setStatusBar(TWindow window, String description) { + TStatusBar statusBar = window.newStatusBar(description); + statusBar.addShortcutKeypress(TKeypress.kbF10, CMD_EXIT, "Exit"); + return statusBar; + + } + + private void showMain(MetaData meta, String source, boolean useMeta) + throws IOException { + // TODO: thread-safety + this.meta = meta; + this.source = source; + this.useMeta = useMeta; + + if (main != null && main.isVisible()) { + main.activate(); + } else { + if (main != null) { + main.close(); + } + main = new TuiReaderMainWindow(this); + if (useMeta) { + main.setMeta(meta); + if (meta != null) { + read(); + } + } else { + main.setSource(source); + } + main.maximize(); + } + } + private void init(Reader reader) { this.reader = reader; @@ -152,12 +200,12 @@ class TuiReaderApplication extends TApplication implements Reader { fileMenu.addItem(MENU_IMPORT_URL, "Import &URL..."); fileMenu.addItem(MENU_IMPORT_FILE, "Import &file..."); fileMenu.addSeparator(); + fileMenu.addItem(MENU_LIBRARY, "Lib&rary"); + fileMenu.addSeparator(); fileMenu.addItem(MENU_EXIT, "E&xit"); - TStatusBar statusBar = fileMenu.newStatusBar("File-management " + setStatusBar(fileMenu, "File-management " + "commands (Open, Save, Print, etc.)"); - // TODO: doesn't actually work: - statusBar.addShortcutKeypress(TKeypress.kbF10, TCommand.cmExit, "Exit"); // TODO: Edit: re-download, delete @@ -173,11 +221,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(false); - } - + close(this); return true; case MENU_IMPORT_URL: String clipboard = ""; @@ -196,20 +240,38 @@ class TuiReaderApplication extends TApplication implements Reader { String url = inputBox("Import story", "URL to import", clipboard) .getText(); - if (!imprt(url)) { - // TODO: bad import + try { + if (!imprt(url)) { + // TODO: i18n + error + error("URK not supported: " + url, "Import error"); + } + } catch (IOException e) { + // TODO: i18n + error + error("Fail to import URL: " + url, "Import error", e); } return true; case MENU_IMPORT_FILE: + String filename = null; try { - String filename = fileOpenBox("."); + filename = fileOpenBox("."); if (!imprt(filename)) { - // TODO: bad import + // TODO: i18n + error + error("File not supported: " + filename, "Import error"); } } catch (IOException e) { - // TODO: bad file - e.printStackTrace(); + // TODO: i18n + error + error("Fail to import file" + + (filename == null ? "" : ": " + filename), + "Import error", e); + } + return true; + case MENU_LIBRARY: + try { + showMain(meta, source, useMeta); + } catch (IOException e) { + // i18n + error("Cannot show the library", "ERROR", e); } return true; @@ -218,12 +280,24 @@ class TuiReaderApplication extends TApplication implements Reader { return super.onMenu(menu); } - private boolean imprt(String url) { + /** + * Import the given url. + *

+ * Can fail if the host is not supported. + * + * @param url + * + * @return TRUE in case of success, FALSE if the host is not supported + * + * @throws IOException + * in case of I/O error + */ + private boolean imprt(String url) throws IOException { try { reader.getLibrary().imprt(BasicReader.getUrl(url), null); main.refreshStories(); return true; - } catch (IOException e) { + } catch (UnknownHostException e) { return false; } } @@ -232,4 +306,70 @@ class TuiReaderApplication extends TApplication implements Reader { public void openExternal(BasicLibrary lib, String luid) throws IOException { reader.openExternal(lib, luid); } + + /** + * Display an error message and log it. + * + * @param message + * the message + * @param title + * the title of the error message + */ + private void error(String message, String title) { + error(message, title, null); + } + + /** + * Display an error message and log it, including the linked + * {@link Exception}. + * + * @param message + * the message + * @param title + * the title of the error message + * @param e + * the exception to log if any (can be NULL) + */ + private void error(String message, String title, Exception e) { + Instance.getTraceHandler().error(title + ": " + message); + if (e != null) { + Instance.getTraceHandler().error(e); + } + + if (e != null) { + messageBox(title, message // + + "\n" + e.getMessage()); + } else { + messageBox(title, message); + } + } + + /** + * Ask the user and, if confirmed, close the {@link TApplication} this + * {@link TWidget} is running on. + *

+ * 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}. + *

+ * 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(); + } + } }