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=b1e980215953a0b4f3cddbea3e88d4cd50b874af;hb=91b82a5cbd8a9c90798d1bd49bfa9a061e652a6a;hpb=47b1710c92c1a14188a00c433879b94c7c3e7ea1

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index b1e9802..2ca6191 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -17,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;
@@ -115,11 +118,14 @@ class GuiReader extends BasicReader {
 
 		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)) {
@@ -158,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();
@@ -211,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>
@@ -266,21 +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);
 
-		GuiReaderTextViewer viewer = new GuiReaderTextViewer(cacheLib,
-				cacheLib.getStory(luid, null));
+		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: testing text viewer:
-		if (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);
 		}
-
-		openExternal(getLibrary().getInfo(luid), file, sync);
 	}
 
 	/**
@@ -338,6 +369,18 @@ class GuiReader extends BasicReader {
 		}
 	}
 
+	/**
+	 * 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.
 	 *