TUI: code cleanup + show story info

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
index 6fa969b50da925f0ffe1994fa0f25dbc76faec8f..7dc1fd5919609b64e33e88466318f668ee9ba336 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
@@ -50,9 +50,7 @@ class TuiReaderApplication extends TApplication implements Reader {
                super(backend);
                init(reader);
 
                super(backend);
                init(reader);
 

-               MetaData meta = getMeta();
-
-               showMain(meta, null, true);
+               showMain(getMeta(), null, true);

        }
 
        public TuiReaderApplication(Reader reader, String source,
        }
 
        public TuiReaderApplication(Reader reader, String source,


@@ -63,31 +61,6 @@ class TuiReaderApplication extends TApplication implements Reader {
                showMain(null, source, false);
        }
 
                showMain(null, source, false);
        }
 

-       private void showMain(MetaData meta, String source, boolean useMeta)
-                       throws IOException {
-               // TODO: thread-safety
-               this.meta = meta;
-               this.source = source;
-               this.useMeta = useMeta;
-
-               if (main != null && main.isVisible()) {
-                       main.activate();
-               } else {
-                       if (main != null) {
-                               main.close();
-                       }
-                       main = new TuiReaderMainWindow(this);
-                       if (useMeta) {
-                               main.setMeta(meta);
-                               if (meta != null) {
-                                       read();
-                               }
-                       } else {
-                               main.setSource(source);
-                       }
-               }
-       }
-

        @Override
        public void read() throws IOException {
                MetaData meta = getMeta();
        @Override
        public void read() throws IOException {
                MetaData meta = getMeta();


@@ -161,6 +134,51 @@ class TuiReaderApplication extends TApplication implements Reader {
                reader.setChapter(chapter);
        }
 
                reader.setChapter(chapter);
        }
 

+       /**
+        * Set the default status bar when this window appear.
+        * <p>
+        * Some shortcuts are always visible, and will be put here.
+        * <p>
+        * Note that shortcuts placed this way on menu won't work unless the menu
+        * also implement them.
+        * 
+        * @param window
+        *            the new window or menu on screen
+        * @param description
+        *            the description to show on the status ba
+        */
+       public TStatusBar setStatusBar(TWindow window, String description) {
+               TStatusBar statusBar = window.newStatusBar(description);
+               statusBar.addShortcutKeypress(TKeypress.kbF10, TCommand.cmExit, "Exit");
+               return statusBar;
+
+       }
+
+       private void showMain(MetaData meta, String source, boolean useMeta)
+                       throws IOException {
+               // TODO: thread-safety
+               this.meta = meta;
+               this.source = source;
+               this.useMeta = useMeta;
+
+               if (main != null && main.isVisible()) {
+                       main.activate();
+               } else {
+                       if (main != null) {
+                               main.close();
+                       }
+                       main = new TuiReaderMainWindow(this);
+                       if (useMeta) {
+                               main.setMeta(meta);
+                               if (meta != null) {
+                                       read();
+                               }
+                       } else {
+                               main.setSource(source);
+                       }
+               }
+       }
+

        private void init(Reader reader) {
                this.reader = reader;
 
        private void init(Reader reader) {
                this.reader = reader;
 


@@ -180,10 +198,8 @@ class TuiReaderApplication extends TApplication implements Reader {
                fileMenu.addSeparator();
                fileMenu.addItem(MENU_EXIT, "E&xit");
 
                fileMenu.addSeparator();
                fileMenu.addItem(MENU_EXIT, "E&xit");
 

-               TStatusBar statusBar = fileMenu.newStatusBar("File-management "
+               setStatusBar(fileMenu, "File-management "

                                + "commands (Open, Save, Print, etc.)");
                                + "commands (Open, Save, Print, etc.)");

-               // TODO: doesn't actually work:
-               statusBar.addShortcutKeypress(TKeypress.kbF10, TCommand.cmExit, "Exit");

 
                // TODO: Edit: re-download, delete
 
 
                // TODO: Edit: re-download, delete
 

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
index 1fa6d8b6e19a42b0752b8afe05c4626c89507fba..a2313775a2411299d44611a88da0877ea6c6daa7 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
@@ -5,9 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import jexer.TAction;
 import java.util.List;
 
 import jexer.TAction;

-import jexer.TCommand;

 import jexer.TFileOpenBox.Type;
 import jexer.TFileOpenBox.Type;

-import jexer.TKeypress;

 import jexer.TList;
 import jexer.TWindow;
 import jexer.event.TMenuEvent;
 import jexer.TList;
 import jexer.TWindow;
 import jexer.event.TMenuEvent;


@@ -58,8 +56,7 @@ class TuiReaderMainWindow extends TWindow {
                });
 
                // TODO: add the current "source/type" or filter
                });
 
                // TODO: add the current "source/type" or filter

-               statusBar = newStatusBar("Library");
-               statusBar.addShortcutKeypress(TKeypress.kbF10, TCommand.cmExit, "Exit");
+               reader.setStatusBar(this, "Library");

 
                // TODO: remove when not used anymore
 
 
                // TODO: remove when not used anymore
 

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
index 01db6e2d7b3309043055698779a765d2b4b74945..d726ae959b818155f61d97268faacf55ffb0565c 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
@@ -4,10 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import jexer.TAction;
 import java.util.List;
 
 import jexer.TAction;

-import jexer.TApplication;

 import jexer.TButton;
 import jexer.TButton;

-import jexer.TCommand;
-import jexer.TKeypress;

 import jexer.TLabel;
 import jexer.TText;
 import jexer.TWindow;
 import jexer.TLabel;
 import jexer.TText;
 import jexer.TWindow;


@@ -27,23 +24,20 @@ class TuiReaderStoryWindow extends TWindow {
        private TText textField;
        private int chapter = -1;
        private List<TButton> navigationButtons;
        private TText textField;
        private int chapter = -1;
        private List<TButton> navigationButtons;

-       private TLabel chapterName;
+       private TLabel currentChapter;

 
        // chapter: -1 for "none" (0 is desc)
 
        // chapter: -1 for "none" (0 is desc)

-       public TuiReaderStoryWindow(TApplication app, BasicLibrary lib,
+       public TuiReaderStoryWindow(TuiReaderApplication app, BasicLibrary lib,

                        MetaData meta, int chapter) {
                super(app, desc(meta), 0, 0, 60, 18, CENTERED | RESIZABLE);
 
                this.lib = lib;
                this.meta = meta;
 
                        MetaData meta, int chapter) {
                super(app, desc(meta), 0, 0, 60, 18, CENTERED | RESIZABLE);
 
                this.lib = lib;
                this.meta = meta;
 

-               // TODO: show all meta info before?
+               app.setStatusBar(this, desc(meta));

 
                textField = new TText(this, "", 0, 0, getWidth() - 2, getHeight() - 2);
 
 
                textField = new TText(this, "", 0, 0, getWidth() - 2, getHeight() - 2);
 

-               statusBar = newStatusBar(desc(meta));
-               statusBar.addShortcutKeypress(TKeypress.kbF10, TCommand.cmExit, "Exit");
-

                navigationButtons = new ArrayList<TButton>(5);
 
                // -3 because 0-based and 2 for borders
                navigationButtons = new ArrayList<TButton>(5);
 
                // -3 because 0-based and 2 for borders


@@ -82,8 +76,8 @@ class TuiReaderStoryWindow extends TWindow {
                navigationButtons.get(1).setEnabled(false);
                navigationButtons.get(2).setEnabled(false);
 
                navigationButtons.get(1).setEnabled(false);
                navigationButtons.get(2).setEnabled(false);
 

-               chapterName = addLabel("", 14, row);
-               chapterName.setWidth(getWidth() - 10);
+               currentChapter = addLabel("", 14, row);
+               currentChapter.setWidth(getWidth() - 10);

                setChapter(chapter);
        }
 
                setChapter(chapter);
        }
 


@@ -99,24 +93,28 @@ class TuiReaderStoryWindow extends TWindow {
                // -3 because 0-based and 2 for borders
                int row = getHeight() - 3;
 
                // -3 because 0-based and 2 for borders
                int row = getHeight() - 3;
 

-               String name = chapterName.getLabel();
-               while (name.length() < resize.getWidth() - chapterName.getX()) {
+               String name = currentChapter.getLabel();
+               while (name.length() < resize.getWidth() - currentChapter.getX()) {

                        name += " ";
                }
                        name += " ";
                }

-               chapterName.setLabel(name);
-               chapterName.setWidth(resize.getWidth() - 10);
-               chapterName.setY(row);
+               currentChapter.setLabel(name);
+               currentChapter.setWidth(resize.getWidth() - 10);
+               currentChapter.setY(row);

 
                for (TButton button : navigationButtons) {
                        button.setY(row);
                }
        }
 
 
                for (TButton button : navigationButtons) {
                        button.setY(row);
                }
        }
 

+       /**
+        * Display the current chapter in the window, or the {@link Story} info
+        * page.
+        * 
+        * @param chapter
+        *            the chapter (including "0" which is the description) or "-1"
+        *            to display the info page instead
+        */

        private void setChapter(int chapter) {
        private void setChapter(int chapter) {

-               if (chapter < 0) {
-                       chapter = 0;
-               }
-

                if (chapter > getStory().getChapters().size()) {
                        chapter = getStory().getChapters().size();
                }
                if (chapter > getStory().getChapters().size()) {
                        chapter = getStory().getChapters().size();
                }


@@ -125,55 +123,79 @@ class TuiReaderStoryWindow extends TWindow {
                        this.chapter = chapter;
 
                        int max = getStory().getChapters().size();
                        this.chapter = chapter;
 
                        int max = getStory().getChapters().size();

-                       navigationButtons.get(0).setEnabled(chapter > 0);
-                       navigationButtons.get(1).setEnabled(chapter > 0);
-                       navigationButtons.get(2).setEnabled(chapter > 0);
+                       navigationButtons.get(0).setEnabled(chapter > -1);
+                       navigationButtons.get(1).setEnabled(chapter > -1);
+                       navigationButtons.get(2).setEnabled(chapter > -1);

                        navigationButtons.get(3).setEnabled(chapter < max);
                        navigationButtons.get(4).setEnabled(chapter < max);
 
                        navigationButtons.get(3).setEnabled(chapter < max);
                        navigationButtons.get(4).setEnabled(chapter < max);
 

-                       Chapter chap;
-                       String name;
-                       if (chapter == 0) {
-                               chap = getStory().getMeta().getResume();
-                               if (chap != null)
-                                       name = String.format(" %s", chap.getName());
-                               else
-                                       name = "[No RESUME]";
+                       StringBuilder builder = new StringBuilder();
+
+                       if (chapter < 0) {
+                               appendInfoPage(builder);

                        } else {
                        } else {

-                               chap = getStory().getChapters().get(chapter - 1);
-                               name = String
-                                               .format(" %d/%d: %s", chapter, max, chap.getName());
+                               appendChapterPage(builder);

                        }
 
                        }
 

-                       while (name.length() < getWidth() - chapterName.getX()) {
-                               name += " ";
-                       }
+                       setText(builder.toString());
+               }
+
+               setCurrentChapterText();
+       }

 
 

-                       chapterName.setLabel(name);
+       /**
+        * Append the info page about the current {@link Story}.
+        * 
+        * @param builder
+        *            the builder to append to
+        */
+       private StringBuilder appendInfoPage(StringBuilder builder) {
+               MetaData meta = getStory().getMeta();

 
 

-                       StringBuilder builder = new StringBuilder();
-                       // TODO: i18n
-                       String c = String.format("Chapter %d: %s", chapter,
-                                       chap == null ? "[No RESUME]" : chap.getName());
-                       builder.append(c).append("\n");
-                       for (int i = 0; i < c.length(); i++) {
-                               builder.append("═");
-                       }
-                       builder.append("\n\n");
-                       if (chap != null) {
-                               for (Paragraph para : chap) {
-                                       if (para.getType() == ParagraphType.BREAK) {
-                                               builder.append("\n");
-                                       }
-                                       builder.append(para.getContent()).append("\n");
-                                       if (para.getType() == ParagraphType.BREAK) {
-                                               builder.append("\n");
-                                       }
+               // TODO: use a ttable?
+
+               appendTitle(builder, meta.getTitle(), 1).append("\n");
+
+               // i18n
+               builder.append("Author: ").append(meta.getAuthor()).append("\n");
+               builder.append("Publication date: ").append(meta.getDate())
+                               .append("\n");
+               builder.append("Word count: ").append(meta.getWords()).append("\n");
+
+               return builder;
+       }
+
+       /**
+        * Append the current chapter.
+        * 
+        * @param builder
+        *            the builder to append to
+        */
+       private void appendChapterPage(StringBuilder builder) {
+               Chapter chap = null;
+               if (chapter == 0) {
+                       chap = getStory().getMeta().getResume();
+               } else if (chapter > 0) {
+                       chap = getStory().getChapters().get(chapter - 1);
+               }
+
+               // TODO: i18n
+               String chapName = chap == null ? "[No RESUME]" : chap.getName();
+
+               appendTitle(builder,
+                               String.format("Chapter %d: %s", chapter, chapName), 1);
+               builder.append("\n");
+
+               if (chap != null) {
+                       for (Paragraph para : chap) {
+                               if (para.getType() == ParagraphType.BREAK) {
+                                       builder.append("\n");
+                               }
+                               builder.append(para.getContent()).append("\n");
+                               if (para.getType() == ParagraphType.BREAK) {
+                                       builder.append("\n");

                                }
                        }
                                }
                        }

-                       textField.setText(builder.toString());
-                       textField.reflowData();
-                       textField.toTop();

                }
        }
 
                }
        }
 


@@ -185,7 +207,102 @@ class TuiReaderStoryWindow extends TWindow {
                return story;
        }
 
                return story;
        }
 

+       /**
+        * Display the given text on the window.
+        * 
+        * @param text
+        *            the text to display
+        */
+       private void setText(String text) {
+               textField.setText(text);
+               textField.reflowData();
+               textField.toTop();
+       }
+
+       /**
+        * Set the current chapter area to the correct value.
+        */
+       private void setCurrentChapterText() {
+               String name;
+               if (chapter < 0) {
+                       name = " " + getStory().getMeta().getTitle();
+               } else if (chapter == 0) {
+                       Chapter resume = getStory().getMeta().getResume();
+                       if (resume != null) {
+                               name = String.format(" %s", resume.getName());
+                       } else {
+                               // TODO: i18n
+                               name = "[No RESUME]";
+                       }
+               } else {
+                       int max = getStory().getChapters().size();
+                       Chapter chap = getStory().getChapters().get(chapter - 1);
+                       name = String.format(" %d/%d: %s", chapter, max, chap.getName());
+               }
+
+               int width = getWidth() - currentChapter.getX();
+               while (name.length() < width) {
+                       name += " ";
+               }
+
+               if (name.length() > width) {
+                       name = name.substring(0, width);
+               }
+
+               currentChapter.setLabel(name);
+
+       }
+

        private static String desc(MetaData meta) {
                return String.format("%s: %s", meta.getLuid(), meta.getTitle());
        }
        private static String desc(MetaData meta) {
                return String.format("%s: %s", meta.getLuid(), meta.getTitle());
        }

+
+       /**
+        * Append a title (on its own 2 lines).
+        * 
+        * @param builder
+        *            the {@link StringBuilder} to append to
+        * @param title
+        *            the title itself
+        * @param level
+        *            the title level, 1 being the highest level, 2 second level and
+        *            so on
+        */
+       private static StringBuilder appendTitle(StringBuilder builder,
+                       String title, int level) {
+               String hr;
+               switch (level) {
+               case 1:
+                       hr = "======";
+                       break;
+               case 2:
+                       hr = "=-=-=-";
+                       break;
+               case 3:
+                       hr = "______";
+                       break;
+               case 4:
+                       hr = "------";
+                       break;
+               default:
+                       hr = "";
+                       break;
+               }
+
+               int fullPad = title.length() / hr.length();
+               int rest = title.length() - (fullPad * hr.length());
+
+               builder.append(title).append("\n");
+               for (int i = 0; i < title.length() / hr.length(); i++) {
+                       builder.append(hr);
+               }
+
+               if (rest > 0) {
+                       builder.append(hr.substring(0, rest));
+               }
+
+               builder.append("\n");
+
+               return builder;
+       }

 }
 }