X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=c07579093d188b127179248c8bf6ad7304a25223;hb=741e846789c07ef6ddbfb0e9de1c7f4664d41ad5;hp=519a507ea7d0fc1d080d3c04f602736a26afb45a;hpb=c3b229a10b147a2ca104a13ad0b43e49549b4ed9;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 519a507..c075790 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -2,11 +2,14 @@ package be.nikiroo.fanfix.reader.ui;
 
 import java.awt.Desktop;
 import java.awt.EventQueue;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 
 import javax.swing.JEditorPane;
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.event.HyperlinkEvent;
@@ -14,12 +17,17 @@ import javax.swing.event.HyperlinkListener;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.VersionCheck;
+import be.nikiroo.fanfix.bundles.StringIdGui;
+import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.library.BasicLibrary;
 import be.nikiroo.fanfix.library.CacheLibrary;
 import be.nikiroo.fanfix.reader.BasicReader;
 import be.nikiroo.fanfix.reader.Reader;
+import be.nikiroo.fanfix.searchable.BasicSearchable;
+import be.nikiroo.fanfix.searchable.SearchableTag;
+import be.nikiroo.fanfix.supported.SupportType;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.Version;
 import be.nikiroo.utils.ui.UIUtils;
@@ -79,14 +87,14 @@ class GuiReader extends BasicReader {
 	}
 
 	@Override
-	public void read() throws IOException {
+	public void read(boolean sync) throws IOException {
 		MetaData meta = getMeta();
 
 		if (meta == null) {
 			throw new IOException("No story to read");
 		}
 
-		read(meta.getLuid(), null);
+		read(meta.getLuid(), sync, null);
 	}
 
 	/**
@@ -104,17 +112,22 @@ class GuiReader extends BasicReader {
 
 	@Override
 	public void browse(String type) {
+		final Boolean[] done = new Boolean[] { false };
+
 		// TODO: improve presentation of update message
 		final VersionCheck updates = VersionCheck.check();
 		StringBuilder builder = new StringBuilder();
 
 		final JEditorPane updateMessage = new JEditorPane("text/html", "");
 		if (updates.isNewVersionAvailable()) {
-			builder.append("A new version of the program is available at <span style='color: blue;'>https://github.com/nikiroo/fanfix/releases</span>");
+			builder.append(trans(StringIdGui.NEW_VERSION_AVAILABLE,
+					"<span style='color: blue;'>https://github.com/nikiroo/fanfix/releases</span>"));
 			builder.append("<br>");
 			builder.append("<br>");
 			for (Version v : updates.getNewer()) {
-				builder.append("\t<b>Version " + v + "</b>");
+				builder.append("\t<b>"
+						+ trans(StringIdGui.NEW_VERSION_VERSION, v.toString())
+						+ "</b>");
 				builder.append("<br>");
 				builder.append("<ul>");
 				for (String item : updates.getChanges().get(v)) {
@@ -153,7 +166,8 @@ class GuiReader extends BasicReader {
 			public void run() {
 				if (updates.isNewVersionAvailable()) {
 					int rep = JOptionPane.showConfirmDialog(null,
-							updateMessage, "Updates available",
+							updateMessage,
+							trans(StringIdGui.NEW_VERSION_TITLE),
 							JOptionPane.OK_CANCEL_OPTION);
 					if (rep == JOptionPane.OK_OPTION) {
 						updates.ok();
@@ -162,21 +176,108 @@ class GuiReader extends BasicReader {
 					}
 				}
 
-				new GuiReaderFrame(GuiReader.this, typeFinal).setVisible(true);
+				new Thread(new Runnable() {
+					@Override
+					public void run() {
+						try {
+							GuiReaderFrame gui = new GuiReaderFrame(
+									GuiReader.this, typeFinal);
+							sync(gui);
+						} catch (Exception e) {
+							Instance.getTraceHandler().error(e);
+						} finally {
+							done[0] = true;
+						}
+
+					}
+				}).start();
 			}
 		});
+
+		// This action must be synchronous, so wait until the frame is closed
+		while (!done[0]) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+			}
+		}
 	}
 
 	@Override
-	public void start(File target, String program) throws IOException {
-		if (program == null) {
+	public void start(File target, String program, boolean sync)
+			throws IOException {
+
+		boolean handled = false;
+		if (program == null && !sync) {
 			try {
 				Desktop.getDesktop().browse(target.toURI());
+				handled = true;
 			} catch (UnsupportedOperationException e) {
-				super.start(target, program);
 			}
+		}
+
+		if (!handled) {
+			super.start(target, program, sync);
+		}
+	}
+
+	@Override
+	public void search(boolean sync) throws IOException {
+		GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
+		if (sync) {
+			sync(search);
+		} else {
+			search.setVisible(true);
+		}
+	}
+
+	@Override
+	public void search(SupportType searchOn, String keywords, int page,
+			int item, boolean sync) {
+		GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
+		search.search(searchOn, keywords, page, item);
+		if (sync) {
+			sync(search);
 		} else {
-			super.start(target, program);
+			search.setVisible(true);
+		}
+	}
+
+	@Override
+	public void searchTag(final SupportType searchOn, final int page,
+			final int item, final boolean sync, final Integer... tags) {
+
+		final GuiReaderSearchFrame search = new GuiReaderSearchFrame(GuiReader.this);
+		final BasicSearchable searchable = BasicSearchable
+				.getSearchable(searchOn);
+
+		Runnable action = new Runnable() {
+			@Override
+			public void run() {
+				SearchableTag tag = null;
+				try {
+					tag = searchable.getTag(tags);
+					if (tag != null) {
+						searchable.fillTag(tag);
+					}
+				} catch (IOException e) {
+					Instance.getTraceHandler().error(e);
+				}
+
+				search.searchTag(searchOn, page, item, tag);
+
+				if (sync) {
+					sync(search);
+				} else {
+					search.setVisible(true);
+				}
+			}
+		};
+
+		if (sync) {
+			action.run();
+		} else {
+			new Thread(action).start();
 		}
 	}
 
@@ -218,9 +319,14 @@ class GuiReader extends BasicReader {
 	/**
 	 * "Open" the given {@link Story}. It usually involves starting an external
 	 * program adapted to the given file type.
+	 * <p>
+	 * Asynchronous method.
 	 * 
 	 * @param luid
 	 *            the luid of the {@link Story} to open
+	 * @param sync
+	 *            execute the process synchronously (wait until it is terminated
+	 *            before returning)
 	 * @param pg
 	 *            the optional progress (we may need to prepare the
 	 *            {@link Story} for reading
@@ -228,13 +334,34 @@ class GuiReader extends BasicReader {
 	 * @throws IOException
 	 *             in case of I/O errors
 	 */
-	void read(String luid, Progress pg) throws IOException {
-		File file = cacheLib.getFile(luid, pg);
+	void read(String luid, boolean sync, Progress pg) throws IOException {
+		MetaData meta = cacheLib.getInfo(luid);
+
+		boolean textInternal = Instance.getUiConfig().getBoolean(
+				UiConfig.NON_IMAGES_DOCUMENT_USE_INTERNAL_READER, true);
+		boolean imageInternal = Instance.getUiConfig().getBoolean(
+				UiConfig.IMAGES_DOCUMENT_USE_INTERNAL_READER, true);
+
+		boolean useInternalViewer = true;
+		if (meta.isImageDocument() && !imageInternal) {
+			useInternalViewer = false;
+		}
+		if (!meta.isImageDocument() && !textInternal) {
+			useInternalViewer = false;
+		}
 
-		// TODO: show a special page for the chapter?
-		// We could also implement an internal viewer, both for image and
-		// non-image documents
-		openExternal(getLibrary().getInfo(luid), file);
+		if (useInternalViewer) {
+			GuiReaderViewer viewer = new GuiReaderViewer(cacheLib,
+					cacheLib.getStory(luid, null));
+			if (sync) {
+				sync(viewer);
+			} else {
+				viewer.setVisible(true);
+			}
+		} else {
+			File file = cacheLib.getFile(luid, pg);
+			openExternal(meta, file, sync);
+		}
 	}
 
 	/**
@@ -257,4 +384,102 @@ class GuiReader extends BasicReader {
 			Instance.getTraceHandler().error(e);
 		}
 	}
+
+	/**
+	 * Change the title of the given {@link Story}.
+	 * 
+	 * @param luid
+	 *            the luid of the {@link Story} to change
+	 * @param newTitle
+	 *            the new title
+	 */
+	void changeTitle(String luid, String newTitle) {
+		try {
+			cacheLib.changeTitle(luid, newTitle, null);
+		} catch (IOException e) {
+			Instance.getTraceHandler().error(e);
+		}
+	}
+
+	/**
+	 * Change the author of the given {@link Story}.
+	 * <p>
+	 * The author can be a new one, it needs not exist before hand.
+	 * 
+	 * @param luid
+	 *            the luid of the {@link Story} to change
+	 * @param newAuthor
+	 *            the new author
+	 */
+	void changeAuthor(String luid, String newAuthor) {
+		try {
+			cacheLib.changeAuthor(luid, newAuthor, null);
+		} catch (IOException e) {
+			Instance.getTraceHandler().error(e);
+		}
+	}
+
+	/**
+	 * Simple shortcut method to call {link Instance#getTransGui()#getString()}.
+	 * 
+	 * @param id
+	 *            the ID to translate
+	 * 
+	 * @return the translated result
+	 */
+	static String trans(StringIdGui id, Object... params) {
+		return Instance.getTransGui().getString(id, params);
+	}
+
+	/**
+	 * Start a frame and wait until it is closed before returning.
+	 * 
+	 * @param frame
+	 *            the frame to start
+	 */
+	static private void sync(final JFrame frame) {
+		if (EventQueue.isDispatchThread()) {
+			throw new IllegalStateException(
+					"Cannot call a sync method in the dispatch thread");
+		}
+
+		final Boolean[] done = new Boolean[] { false };
+		try {
+			Runnable run = new Runnable() {
+				@Override
+				public void run() {
+					try {
+						frame.addWindowListener(new WindowAdapter() {
+							@Override
+							public void windowClosing(WindowEvent e) {
+								super.windowClosing(e);
+								done[0] = true;
+							}
+						});
+
+						frame.setVisible(true);
+					} catch (Exception e) {
+						done[0] = true;
+					}
+				}
+			};
+
+			if (EventQueue.isDispatchThread()) {
+				run.run();
+			} else {
+				EventQueue.invokeLater(run);
+			}
+		} catch (Exception e) {
+			Instance.getTraceHandler().error(e);
+			done[0] = true;
+		}
+
+		// This action must be synchronous, so wait until the frame is closed
+		while (!done[0]) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+			}
+		}
+	}
 }