X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=2ca61919cc5adb1aa714f3618e38e7b7f3f85bfb;hp=7dc373c7c54aad8037d4ebcf92a42cd30db31a2e;hb=91b82a5cbd8a9c90798d1bd49bfa9a061e652a6a;hpb=c8d48938ca540d7b619a2c19bd76623d689b72cb

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 7dc373c..2ca6191 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -9,6 +9,7 @@ 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;
@@ -16,12 +17,15 @@ 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.supported.SupportType;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.Version;
 import be.nikiroo.utils.ui.UIUtils;
@@ -106,18 +110,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 Boolean[] done = new Boolean[] { false };
 
 		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)) {
@@ -156,7 +164,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();
@@ -165,21 +174,21 @@ class GuiReader extends BasicReader {
 					}
 				}
 
-				try {
-					GuiReaderFrame gui = new GuiReaderFrame(GuiReader.this,
-							typeFinal);
-					gui.setVisible(true);
-					gui.addWindowListener(new WindowAdapter() {
-						@Override
-						public void windowClosed(WindowEvent e) {
-							super.windowClosed(e);
+				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;
 						}
-					});
-				} catch (Exception e) {
-					Instance.getTraceHandler().error(e);
-					done[0] = true;
-				}
+
+					}
+				}).start();
 			}
 		});
 
@@ -209,6 +218,18 @@ class GuiReader extends BasicReader {
 			super.start(target, program, sync);
 		}
 	}
+	
+	@Override
+	public void search(SupportType searchOn, String keywords, int page, int item) {
+		// TODO: !!!
+		throw new java.lang.IllegalStateException("Not implemented yet.");
+	}
+	
+	@Override
+	public void searchTag(SupportType searchOn, int page, int item, String... tags) {
+		// TODO: !!!
+		throw new java.lang.IllegalStateException("Not implemented yet.");
+	}
 
 	/**
 	 * Delete the {@link Story} from the cache if it is present, but <b>NOT</b>
@@ -264,12 +285,33 @@ class GuiReader extends BasicReader {
 	 *             in case of I/O errors
 	 */
 	void read(String luid, boolean sync, Progress pg) throws IOException {
-		File file = cacheLib.getFile(luid, pg);
+		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);
 
-		// 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, sync);
+		boolean useInternalViewer = true;
+		if (meta.isImageDocument() && !imageInternal) {
+			useInternalViewer = false;
+		}
+		if (!meta.isImageDocument() && !textInternal) {
+			useInternalViewer = false;
+		}
+
+		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);
+		}
 	}
 
 	/**
@@ -326,4 +368,68 @@ class GuiReader extends BasicReader {
 			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) {
+			}
+		}
+	}
 }