git://git.nikiroo.be / fanfix-swing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6d99960)
update viewer text for fanfix/utils update
authorNiki Roo <niki@nikiroo.be>
Mon, 11 May 2020 22:11:49 +0000 (00:11 +0200)
committerNiki Roo <niki@nikiroo.be>
Mon, 11 May 2020 22:11:49 +0000 (00:11 +0200)
src/be/nikiroo/fanfix_swing/gui/viewer/ViewerNonImages.java patch | blob | blame | history
src/be/nikiroo/fanfix_swing/gui/viewer/ViewerTextOutput.java [deleted file] patch | blob | blame | history

diff --git a/src/be/nikiroo/fanfix_swing/gui/viewer/ViewerNonImages.java b/src/be/nikiroo/fanfix_swing/gui/viewer/ViewerNonImages.java
index f72524eed9048f28c1d64e9f19936ce819519653..cdbaf027dabb7171d778927d0413f946db645f42 100644 (file)
--- a/src/be/nikiroo/fanfix_swing/gui/viewer/ViewerNonImages.java
+++ b/src/be/nikiroo/fanfix_swing/gui/viewer/ViewerNonImages.java
@@ -24,6 +24,7 @@ import be.nikiroo.fanfix.bundles.StringIdGui;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.library.BasicLibrary;
+import be.nikiroo.fanfix.reader.TextOutput;
 import be.nikiroo.fanfix_swing.gui.PropertiesPanel;
 import be.nikiroo.fanfix_swing.gui.utils.UiHelper;
 import be.nikiroo.fanfix_swing.images.IconGenerator;
@@ -46,7 +47,7 @@ public class ViewerNonImages extends JFrame {
 
        private BasicLibrary lib;
        private Story story;
-       private ViewerTextOutput html;
+       private TextOutput html;
 
        /** The navigation bar. */
        protected NavBar navbar;
@@ -79,7 +80,7 @@ public class ViewerNonImages extends JFrame {
 
                this.setSize(800, 600);
 
-               html = new ViewerTextOutput();
+               html = new TextOutput(true);
                worker = new DelayWorker(100);
                worker.start();
 
diff --git a/src/be/nikiroo/fanfix_swing/gui/viewer/ViewerTextOutput.java b/src/be/nikiroo/fanfix_swing/gui/viewer/ViewerTextOutput.java
deleted file mode 100644 (file)
index 82f0a97..0000000
--- a/src/be/nikiroo/fanfix_swing/gui/viewer/ViewerTextOutput.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package be.nikiroo.fanfix_swing.gui.viewer;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-import be.nikiroo.fanfix.Instance;
-import be.nikiroo.fanfix.data.Chapter;
-import be.nikiroo.fanfix.data.Paragraph;
-import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
-import be.nikiroo.fanfix.data.Story;
-import be.nikiroo.fanfix.output.BasicOutput;
-
-/**
- * This class can export a chapter into HTML3 code ready for Java Swing support.
- * 
- * @author niki
- */
-class ViewerTextOutput {
-       private StringBuilder builder;
-       private BasicOutput output;
-       private Story fakeStory;
-       private boolean chapterName;
-
-       /**
-        * Create a new {@link ViewerTextOutput} that will convert a {@link Chapter}
-        * into HTML3 suited for Java Swing.
-        */
-       public ViewerTextOutput() {
-               builder = new StringBuilder();
-               fakeStory = new Story();
-
-               output = new BasicOutput() {
-                       private boolean paraInQuote;
-
-                       @Override
-                       protected void writeChapterHeader(Chapter chap) throws IOException {
-                               builder.append("<HTML style='line-height: 5px;'>");
-
-                               if (chapterName) {
-                                       builder.append("<H1>");
-                                       builder.append("Chapter ");
-                                       builder.append(chap.getNumber());
-                                       if (chap.getName() != null
-                                                       && !chap.getName().trim().isEmpty()) {
-                                               builder.append(": ");
-                                               builder.append(chap.getName());
-                                       }
-                                       builder.append("</H1>");
-                               }
-
-                               builder.append("<DIV align='justify'>");
-                       }
-
-                       @Override
-                       protected void writeChapterFooter(Chapter chap) throws IOException {
-                               if (paraInQuote) {
-                                       builder.append("</DIV>");
-                               }
-                               paraInQuote = false;
-
-                               builder.append("</DIV>");
-                               builder.append("</HTML>");
-                       }
-
-                       @Override
-                       protected void writeParagraph(Paragraph para) throws IOException {
-                               if ((para.getType() == ParagraphType.QUOTE) == !paraInQuote) {
-                                       paraInQuote = !paraInQuote;
-                                       if (paraInQuote) {
-                                               builder.append("<BR>");
-                                               builder.append("<DIV>");
-                                       } else {
-                                               builder.append("</DIV>");
-                                               builder.append("<BR>");
-                                       }
-                               }
-
-                               switch (para.getType()) {
-                               case NORMAL:
-                                       builder.append("&nbsp;&nbsp;&nbsp;&nbsp;");
-                                       builder.append(decorateText(para.getContent()));
-                                       builder.append("<BR>");
-                                       break;
-                               case BLANK:
-                                       builder.append("<FONT SIZE='1'><BR></FONT>");
-                                       break;
-                               case BREAK:
-                                       // Used to be 7777DD
-                                       builder.append("<P COLOR='#AAAAAA' ALIGN='CENTER'>");
-                                       builder.append("<FONT SIZE='5'>* * *</FONT>");
-                                       builder.append("</P>");
-                                       builder.append("<BR>");
-                                       break;
-                               case QUOTE:
-                                       builder.append("<DIV>");
-                                       builder.append("&nbsp;&nbsp;&nbsp;&nbsp;");
-                                       builder.append("&mdash;&nbsp;");
-                                       builder.append(decorateText(para.getContent()));
-                                       builder.append("</DIV>");
-
-                                       break;
-                               case IMAGE:
-                               }
-                       }
-
-                       @Override
-                       protected String enbold(String word) {
-                               // Used to be COLOR='#7777DD'
-                               return "<B>" + word + "</B>";
-                       }
-
-                       @Override
-                       protected String italize(String word) {
-                               return "<I COLOR='GRAY'>" + word + "</I>";
-                       }
-               };
-       }
-
-       /**
-        * Convert the chapter into HTML3 code.
-        * 
-        * @param chap
-        *            the {@link Chapter} to convert
-        * @param chapterName
-        *            display the chapter name
-        * 
-        * @return HTML3 code tested with Java Swing
-        */
-       public String convert(Chapter chap, boolean chapterName) {
-               this.chapterName = chapterName;
-               builder.setLength(0);
-               try {
-                       fakeStory.setChapters(Arrays.asList(chap));
-                       output.process(fakeStory, null, null);
-               } catch (IOException e) {
-                       Instance.getInstance().getTraceHandler().error(e);
-               }
-               return builder.toString();
-       }
-}
A graphical interface (in java Swing) around the comics/stories/mangas library Fanfix