X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderViewerPanel.java;h=724f552093942fdf42cb68347bdcaa4d71aa3aaf;hb=d16065ecb5ab854a71f385ed8c47012184139783;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..724f552 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java
@@ -18,7 +18,9 @@ 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.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.Image;
 import be.nikiroo.utils.ui.ImageUtilsAwt;
@@ -50,14 +52,27 @@ public class GuiReaderViewerPanel extends JPanel {
 	 * Create a new viewer.
 	 * 
 	 * @param story
-	 *            the {@link Story} to work on.
+	 *            the {@link Story} to work on
 	 */
 	public GuiReaderViewerPanel(Story story) {
+		this(story.getMeta(), story.getMeta().isImageDocument());
+	}
+
+	/**
+	 * Create a new viewer.
+	 * 
+	 * @param meta
+	 *            the {@link MetaData} of the story to show
+	 * @param isImageDocument
+	 *            TRUE if it is an image document, FALSE if not
+	 */
+	public GuiReaderViewerPanel(MetaData meta, boolean isImageDocument) {
 		super(new BorderLayout());
 
-		this.imageDocument = story.getMeta().isImageDocument();
+		this.imageDocument = isImageDocument;
 
 		this.text = new JEditorPane("text/html", "");
+		text.setEditable(false);
 		text.setAlignmentY(TOP_ALIGNMENT);
 		htmlOutput = new GuiReaderViewerTextOutput();
 
@@ -100,7 +115,7 @@ public class GuiReaderViewerPanel extends JPanel {
 			main.invalidate();
 		}
 
-		setChapter(story.getMeta().getResume());
+		setChapter(meta.getResume());
 	}
 
 	/**
@@ -194,13 +209,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() {