X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderViewerPanel.java;h=08a9c9c34e10901fcb5bce3644c9057b0eb991b4;hb=3530eefe42ed0154d576afe44e1247757231c354;hp=18f6aca577f760fddf4e163b1f4d120658f6bc2a;hpb=908bbb351f8db585068e364394a543dc10f736ae;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java
index 18f6aca..08a9c9c 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java
@@ -18,6 +18,7 @@ import javax.swing.JScrollPane;
 import javax.swing.SwingConstants;
 
 import be.nikiroo.fanfix.Instance;
+import be.nikiroo.fanfix.bundles.StringIdGui;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Image;
@@ -58,6 +59,7 @@ public class GuiReaderViewerPanel extends JPanel {
 		this.imageDocument = story.getMeta().isImageDocument();
 
 		this.text = new JEditorPane("text/html", "");
+		text.setEditable(false);
 		text.setAlignmentY(TOP_ALIGNMENT);
 		htmlOutput = new GuiReaderViewerTextOutput();
 
@@ -194,13 +196,17 @@ public class GuiReaderViewerPanel extends JPanel {
 		}
 
 		imageProgress.setValue(i);
-		imageProgress.setString(String.format("Image %d / %d", i + 1, chap
-				.getParagraphs().size()));
+		imageProgress.setString(GuiReader.trans(StringIdGui.IMAGE_PROGRESSION,
+				i + 1, chap.getParagraphs().size()));
 
 		currentImage = i;
 
 		final Image img = chap.getParagraphs().get(i).getContentImage();
 
+		// prepare the viewport to get the right sizes later on
+		image.setIcon(null);
+		scroll.setViewportView(image);
+
 		new Thread(new Runnable() {
 			@Override
 			public void run() {