X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderViewerPanel.java;h=0577a0ab2f4bac5c734e5282d589f5d8004926cc;hb=1387a30ab59dbf4071f2c5e5e0e08ca98c75b726;hp=08a9c9c34e10901fcb5bce3644c9057b0eb991b4;hpb=3530eefe42ed0154d576afe44e1247757231c354;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java index 08a9c9c..0577a0a 100644 --- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java +++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java @@ -20,6 +20,7 @@ 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; @@ -51,12 +52,24 @@ 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); @@ -70,6 +83,10 @@ public class GuiReaderViewerPanel extends JPanel { JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); scroll.getVerticalScrollBar().setUnitIncrement(16); + // TODO: + // JButton up = new BasicArrowButton(BasicArrowButton.NORTH); + // JButton down = new BasicArrowButton(BasicArrowButton.SOUTH); + if (!imageDocument) { add(scroll, BorderLayout.CENTER); } else { @@ -102,7 +119,7 @@ public class GuiReaderViewerPanel extends JPanel { main.invalidate(); } - setChapter(story.getMeta().getResume()); + setChapter(meta.getResume()); } /** @@ -268,7 +285,7 @@ public class GuiReaderViewerPanel extends JPanel { } }); } catch (Exception e) { - Instance.getTraceHandler().error( + Instance.getInstance().getTraceHandler().error( new Exception("Failed to load image into label", e)); EventQueue.invokeLater(new Runnable() { @Override