Move TSizeConstraint into new package

[fanfix.git] / src / be / nikiroo / fanfix / reader / tui / TuiReaderStoryWindow.java

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
index dc0afc245c9a8a1fb42401a5651830fe15dba42b..6ab92347420ddd7ee9d80fa934e8ceed8f88b1b2 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
@@ -19,6 +19,7 @@ import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.jexer.TSizeConstraint;
 import be.nikiroo.jexer.TTable;
 import be.nikiroo.utils.StringUtils;
 
@@ -50,33 +51,32 @@ class TuiReaderStoryWindow extends TWindow {
                // last = use window background
                titleField = new TLabel(this, "    Title", 0, 1, "tlabel", false);
                textField = new TText(this, "", 0, 0, 1, 1);
-               table = new TTable(this, 0, 0, 1, 1, null, null, Arrays.asList("Key", "Value"), true);
+               table = new TTable(this, 0, 0, 1, 1, null, null, Arrays.asList("Key",
+                               "Value"), true);
 
                titleField.setEnabled(false);
 
                navigationButtons = new ArrayList<TButton>(5);
 
-               // for bg colour when << button is pressed
-               navigationButtons.add(addButton(" ", 0, 0, null));
-               navigationButtons.add(addButton("<<  ", 0, 0, new TAction() {
+               navigationButtons.add(addButton("<<", 0, 0, new TAction() {
                        @Override
                        public void DO() {
                                setChapter(-1);
                        }
                }));
-               navigationButtons.add(addButton("<  ", 4, 0, new TAction() {
+               navigationButtons.add(addButton("< ", 4, 0, new TAction() {
                        @Override
                        public void DO() {
                                setChapter(TuiReaderStoryWindow.this.chapter - 1);
                        }
                }));
-               navigationButtons.add(addButton(">  ", 7, 0, new TAction() {
+               navigationButtons.add(addButton("> ", 7, 0, new TAction() {
                        @Override
                        public void DO() {
                                setChapter(TuiReaderStoryWindow.this.chapter + 1);
                        }
                }));
-               navigationButtons.add(addButton(">>  ", 10, 0, new TAction() {
+               navigationButtons.add(addButton(">>", 10, 0, new TAction() {
                        @Override
                        public void DO() {
                                setChapter(getStory().getChapters().size());
@@ -85,16 +85,17 @@ class TuiReaderStoryWindow extends TWindow {
 
                navigationButtons.get(0).setEnabled(false);
                navigationButtons.get(1).setEnabled(false);
-               navigationButtons.get(2).setEnabled(false);
 
                currentChapter = addLabel("", 0, 0);
 
-               TSizeConstraint.setSize(sizeConstraints, textField, 1, 3, -1, 0);
-               TSizeConstraint.setSize(sizeConstraints, table, 0, 3, 0, 0);
+               TSizeConstraint.setSize(sizeConstraints, textField, 1, 3, -1, -1);
+               TSizeConstraint.setSize(sizeConstraints, table, 0, 3, 0, -1);
                TSizeConstraint.setSize(sizeConstraints, currentChapter, 14, -3, -1,
                                null);
 
                for (TButton navigationButton : navigationButtons) {
+                       navigationButton.setShadowColor(null);
+                       // navigationButton.setEmptyBorders(false);
                        TSizeConstraint.setSize(sizeConstraints, navigationButton, null,
                                        -3, null, null);
                }
@@ -115,8 +116,11 @@ class TuiReaderStoryWindow extends TWindow {
 
                TSizeConstraint.resize(sizeConstraints);
 
-               textField.getVerticalScroller().setX(
-                               textField.getVerticalScroller().getX() + 1);
+               // Improve the disposition of the scrollbars
+               textField.getVerticalScroller().setX(textField.getWidth());
+               textField.getVerticalScroller().setHeight(textField.getHeight());
+               textField.getHorizontalScroller().setX(-1);
+               textField.getHorizontalScroller().setWidth(textField.getWidth() + 1);
 
                setCurrentChapterText();
        }
@@ -140,9 +144,8 @@ class TuiReaderStoryWindow extends TWindow {
                        int max = getStory().getChapters().size();
                        navigationButtons.get(0).setEnabled(chapter > -1);
                        navigationButtons.get(1).setEnabled(chapter > -1);
-                       navigationButtons.get(2).setEnabled(chapter > -1);
+                       navigationButtons.get(2).setEnabled(chapter < max);
                        navigationButtons.get(3).setEnabled(chapter < max);
-                       navigationButtons.get(4).setEnabled(chapter < max);
 
                        if (chapter < 0) {
                                displayInfoPage();
@@ -170,11 +173,24 @@ class TuiReaderStoryWindow extends TWindow {
 
                setCurrentTitle(meta.getTitle());
 
+               StringBuilder tags = new StringBuilder();
+               for (String tag : meta.getTags()) {
+                       if (tags.length() > 0) {
+                               tags.append(", ");
+                       }
+                       tags.append(tag);
+               }
+
                table.setRowData(new String[][] { //
                                new String[] { " Author", meta.getAuthor() }, //
                                new String[] { " Publication date", formatDate(meta.getDate()) },
+                               new String[] { " Published on", meta.getPublisher() },
+                               new String[] { " URL", meta.getUrl() },
                                new String[] { " Word count", format(meta.getWords()) },
-                               new String[] { " Source", meta.getSource() } //
+                               new String[] { " Source", meta.getSource() },
+                               new String[] { " Subject", meta.getSubject() },
+                               new String[] { " Language", meta.getLang() },
+                               new String[] { " Tags", tags.toString() } //
                });
                table.setHeaders(Arrays.asList("key", "value"), false);
                table.toTop();