X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=c6c8413632e07bff43f99cb9dd0a8b575a59a055;hb=dd81a122f978dd0f7f74348fdab122d19fadd159;hp=b1e980215953a0b4f3cddbea3e88d4cd50b874af;hpb=47b1710c92c1a14188a00c433879b94c7c3e7ea1;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index b1e9802..c6c8413 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -17,6 +17,7 @@ import javax.swing.event.HyperlinkListener;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.VersionCheck;
+import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.library.BasicLibrary;
@@ -266,21 +267,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);
 
-		// TODO: testing text viewer:
-		if (false) {
+		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);
 		}
-
-		openExternal(getLibrary().getInfo(luid), file, sync);
 	}
 
 	/**