X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderStoryWindow.java;h=4848ef82afc12f936c1b1eaf3adbf167c926484a;hb=1387a30ab59dbf4071f2c5e5e0e08ca98c75b726;hp=d726ae959b818155f61d97268faacf55ffb0565c;hpb=5b00c122ec6a734be12b9cc9c96a69508998ccbf;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java index d726ae9..4848ef8 100644 --- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java +++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java @@ -1,71 +1,80 @@ package be.nikiroo.fanfix.reader.tui; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.Map; import jexer.TAction; import jexer.TButton; import jexer.TLabel; import jexer.TText; import jexer.TWindow; +import jexer.event.TCommandEvent; import jexer.event.TResizeEvent; -import jexer.event.TResizeEvent.Type; import be.nikiroo.fanfix.data.Chapter; 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.fanfix.library.BasicLibrary; - +import be.nikiroo.fanfix.reader.BasicReader; +import be.nikiroo.jexer.TSizeConstraint; +import be.nikiroo.jexer.TTable; + +/** + * This window will contain the {@link Story} in a readable format, with a + * chapter browser. + * + * @author niki + */ class TuiReaderStoryWindow extends TWindow { - private BasicLibrary lib; - private MetaData meta; private Story story; + private TLabel titleField; private TText textField; - private int chapter = -1; + private TTable table; + private int chapter = -99; // invalid value private List navigationButtons; private TLabel currentChapter; + private List sizeConstraints = new ArrayList(); // chapter: -1 for "none" (0 is desc) - public TuiReaderStoryWindow(TuiReaderApplication app, BasicLibrary lib, - MetaData meta, int chapter) { - super(app, desc(meta), 0, 0, 60, 18, CENTERED | RESIZABLE); + public TuiReaderStoryWindow(TuiReaderApplication app, Story story, + int chapter) { + super(app, desc(story.getMeta()), 0, 0, 60, 18, CENTERED | RESIZABLE); - this.lib = lib; - this.meta = meta; + this.story = story; - app.setStatusBar(this, desc(meta)); + app.setStatusBar(this, desc(story.getMeta())); - textField = new TText(this, "", 0, 0, getWidth() - 2, getHeight() - 2); + // 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); - navigationButtons = new ArrayList(5); + titleField.setEnabled(false); - // -3 because 0-based and 2 for borders - int row = getHeight() - 3; + navigationButtons = new ArrayList(5); - navigationButtons.add(addButton(" ", 0, row, null)); // for bg colour - // when << - // button is - // pressed - navigationButtons.add(addButton("<< ", 0, row, new TAction() { + navigationButtons.add(addButton("<<", 0, 0, new TAction() { @Override public void DO() { - setChapter(0); + setChapter(-1); } })); - navigationButtons.add(addButton("< ", 4, row, new TAction() { + navigationButtons.add(addButton("< ", 4, 0, new TAction() { @Override public void DO() { setChapter(TuiReaderStoryWindow.this.chapter - 1); } })); - navigationButtons.add(addButton("> ", 7, row, new TAction() { + navigationButtons.add(addButton("> ", 7, 0, new TAction() { @Override public void DO() { setChapter(TuiReaderStoryWindow.this.chapter + 1); } })); - navigationButtons.add(addButton(">> ", 10, row, new TAction() { + navigationButtons.add(addButton(">>", 10, 0, new TAction() { @Override public void DO() { setChapter(getStory().getChapters().size()); @@ -74,36 +83,44 @@ class TuiReaderStoryWindow extends TWindow { navigationButtons.get(0).setEnabled(false); navigationButtons.get(1).setEnabled(false); - navigationButtons.get(2).setEnabled(false); - currentChapter = addLabel("", 14, row); - currentChapter.setWidth(getWidth() - 10); + currentChapter = addLabel("", 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); + } + + onResize(null); + setChapter(chapter); } @Override public void onResize(TResizeEvent resize) { - super.onResize(resize); + if (resize != null) { + super.onResize(resize); + } - // Resize the text field TODO: why setW/setH/reflow not enough for the - // scrollbars? - textField.onResize(new TResizeEvent(Type.WIDGET, resize.getWidth() - 2, - resize.getHeight() - 2)); + // TODO: find out why TText and TTable does not behave the same way + // (offset of 2 for height and width) - // -3 because 0-based and 2 for borders - int row = getHeight() - 3; + TSizeConstraint.resize(sizeConstraints); - String name = currentChapter.getLabel(); - while (name.length() < resize.getWidth() - currentChapter.getX()) { - name += " "; - } - currentChapter.setLabel(name); - currentChapter.setWidth(resize.getWidth() - 10); - currentChapter.setY(row); + // 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); - for (TButton button : navigationButtons) { - button.setY(row); - } + setCurrentChapterText(); } /** @@ -125,19 +142,14 @@ 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); - - StringBuilder builder = new StringBuilder(); if (chapter < 0) { - appendInfoPage(builder); + displayInfoPage(); } else { - appendChapterPage(builder); + displayChapterPage(); } - - setText(builder.toString()); } setCurrentChapterText(); @@ -149,20 +161,28 @@ class TuiReaderStoryWindow extends TWindow { * @param builder * the builder to append to */ - private StringBuilder appendInfoPage(StringBuilder builder) { - MetaData meta = getStory().getMeta(); + private void displayInfoPage() { + textField.setVisible(false); + table.setVisible(true); + textField.setEnabled(false); + table.setEnabled(true); - // TODO: use a ttable? + MetaData meta = getStory().getMeta(); - appendTitle(builder, meta.getTitle(), 1).append("\n"); + setCurrentTitle(meta.getTitle()); - // 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"); + Map metaDesc = BasicReader.getMetaDesc(meta); + String[][] metaDescObj = new String[metaDesc.size()][2]; + int i = 0; + for (String key : metaDesc.keySet()) { + metaDescObj[i][0] = " " + key; + metaDescObj[i][1] = metaDesc.get(key); + i++; + } - return builder; + table.setRowData(metaDescObj); + table.setHeaders(Arrays.asList("key", "value"), false); + table.toTop(); } /** @@ -171,7 +191,14 @@ class TuiReaderStoryWindow extends TWindow { * @param builder * the builder to append to */ - private void appendChapterPage(StringBuilder builder) { + private void displayChapterPage() { + table.setVisible(false); + textField.setVisible(true); + table.setEnabled(false); + textField.setEnabled(true); + + StringBuilder builder = new StringBuilder(); + Chapter chap = null; if (chapter == 0) { chap = getStory().getMeta().getResume(); @@ -181,10 +208,7 @@ class TuiReaderStoryWindow extends TWindow { // TODO: i18n String chapName = chap == null ? "[No RESUME]" : chap.getName(); - - appendTitle(builder, - String.format("Chapter %d: %s", chapter, chapName), 1); - builder.append("\n"); + setCurrentTitle(String.format("Chapter %d: %s", chapter, chapName)); if (chap != null) { for (Paragraph para : chap) { @@ -197,13 +221,11 @@ class TuiReaderStoryWindow extends TWindow { } } } + + setText(builder.toString()); } private Story getStory() { - if (story == null) { - // TODO: progress bar? - story = lib.getStory(meta.getLuid(), null); - } return story; } @@ -241,68 +263,43 @@ class TuiReaderStoryWindow extends TWindow { } int width = getWidth() - currentChapter.getX(); - while (name.length() < width) { - name += " "; - } - + name = String.format("%-" + width + "s", 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()); } /** - * Append a title (on its own 2 lines). + * Set the current title in-window. * - * @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 + * the new title */ - 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; + private void setCurrentTitle(String title) { + String pad = ""; + if (title.length() < getWidth()) { + int padSize = (getWidth() - title.length()) / 2; + pad = String.format("%" + padSize + "s", ""); } - int fullPad = title.length() / hr.length(); - int rest = title.length() - (fullPad * hr.length()); + title = pad + title + pad; + titleField.setWidth(title.length()); + titleField.setLabel(title); + } - builder.append(title).append("\n"); - for (int i = 0; i < title.length() / hr.length(); i++) { - builder.append(hr); - } + private static String desc(MetaData meta) { + return String.format("%s: %s", meta.getLuid(), meta.getTitle()); + } - if (rest > 0) { - builder.append(hr.substring(0, rest)); + @Override + public void onCommand(TCommandEvent command) { + if (command.getCmd().equals(TuiReaderApplication.CMD_EXIT)) { + TuiReaderApplication.close(this); + } else { + // Handle our own event if needed here + super.onCommand(command); } - - builder.append("\n"); - - return builder; } }