X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderMainWindow.java;h=cbca857d01fc79770bfb04de9b35b96f1b224878;hp=1fa6d8b6e19a42b0752b8afe05c4626c89507fba;hb=0bcb5c7ff5300deb01c5136cf0d26d65d9455100;hpb=4f66bfa85209c2c1683f938df9b43fa2924b351e diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java index 1fa6d8b..cbca857 100644 --- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java +++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java @@ -5,17 +5,25 @@ import java.util.ArrayList; import java.util.List; import jexer.TAction; +import jexer.TComboBox; import jexer.TCommand; +import jexer.TField; import jexer.TFileOpenBox.Type; import jexer.TKeypress; +import jexer.TLabel; import jexer.TList; +import jexer.TStatusBar; import jexer.TWindow; +import jexer.event.TCommandEvent; +import jexer.event.TKeypressEvent; import jexer.event.TMenuEvent; +import jexer.event.TResizeEvent; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.library.BasicLibrary; import be.nikiroo.fanfix.output.BasicOutput.OutputType; import be.nikiroo.fanfix.reader.Reader; +import be.nikiroo.jexer.TSizeConstraint; /** * The library window, that will list all the (filtered) stories available in @@ -24,11 +32,28 @@ import be.nikiroo.fanfix.reader.Reader; * @author niki */ class TuiReaderMainWindow extends TWindow { + public static final int MENU_SEARCH = 1100; + public static final TCommand CMD_SEARCH = new TCommand(MENU_SEARCH) { + }; + + public enum Mode { + SOURCE, AUTHOR, + } + private TList list; private List listKeys; private List listItems; private Reader reader; - private String source; + + private Mode mode = Mode.SOURCE; + private String target = null; + private String filter = ""; + + private List sizeConstraints = new ArrayList(); + + // The 2 comboboxes used to select by source/author + private TComboBox selectTargetBox; + private TComboBox selectBox; /** * Create a new {@link TuiReaderMainWindow} without any stories in the list. @@ -43,23 +68,17 @@ class TuiReaderMainWindow extends TWindow { this.reader = reader; - maximize(); - listKeys = new ArrayList(); listItems = new ArrayList(); - list = addList(listItems, 0, 0, getWidth(), getHeight(), new TAction() { - @Override - public void DO() { - MetaData meta = getSelectedMeta(); - if (meta != null) { - readStory(meta); - } - } - }); - // TODO: add the current "source/type" or filter - statusBar = newStatusBar("Library"); - statusBar.addShortcutKeypress(TKeypress.kbF10, TCommand.cmExit, "Exit"); + addList(); + addSearch(); + addSelect(); + + TStatusBar statusBar = reader.setStatusBar(this, "Library"); + statusBar.addShortcutKeypress(TKeypress.kbCtrlF, CMD_SEARCH, "Search"); + + TSizeConstraint.resize(sizeConstraints); // TODO: remove when not used anymore @@ -86,6 +105,120 @@ class TuiReaderMainWindow extends TWindow { // root.addChild("child 2").addChild("sub child"); } + private void addSearch() { + TLabel lblSearch = addLabel("Search: ", 0, 0); + + TField search = new TField(this, 0, 0, 1, true) { + @Override + public void onKeypress(TKeypressEvent keypress) { + super.onKeypress(keypress); + TKeypress key = keypress.getKey(); + if (key.isFnKey() && key.getKeyCode() == TKeypress.ENTER) { + TuiReaderMainWindow.this.filter = getText(); + TuiReaderMainWindow.this.refreshStories(); + } + } + }; + + TSizeConstraint.setSize(sizeConstraints, lblSearch, 5, 1, null, null); + TSizeConstraint.setSize(sizeConstraints, search, 15, 1, -5, null); + } + + private void addList() { + list = addList(listItems, 0, 0, 10, 10, new TAction() { + @Override + public void DO() { + MetaData meta = getSelectedMeta(); + if (meta != null) { + readStory(meta); + } + } + }); + + TSizeConstraint.setSize(sizeConstraints, list, 0, 7, 0, 0); + } + + private void addSelect() { + // TODO: i18n + final List selects = new ArrayList(); + selects.add("(show all)"); + selects.add("Sources"); + selects.add("Author"); + + final List selectTargets = new ArrayList(); + selectTargets.add(""); + + TLabel lblSelect = addLabel("Select: ", 0, 0); + + TAction onSelect = new TAction() { + @Override + public void DO() { + String smode = selectBox.getText(); + boolean showTarget; + if (smode == null || smode.equals("(show all)")) { + showTarget = false; + } else if (smode.equals("Sources")) { + selectTargets.clear(); + selectTargets.add("(show all)"); + for (String source : reader.getLibrary().getSources()) { + selectTargets.add(source); + } + showTarget = true; + } else { + selectTargets.clear(); + selectTargets.add("(show all)"); + for (String author : reader.getLibrary().getAuthors()) { + selectTargets.add(author); + } + + showTarget = true; + } + + selectTargetBox.setVisible(showTarget); + selectTargetBox.setEnabled(showTarget); + if (showTarget) { + selectTargetBox.reflowData(); + } + + selectTargetBox.setText(selectTargets.get(0)); + if (showTarget) { + TuiReaderMainWindow.this.activate(selectTargetBox); + } else { + TuiReaderMainWindow.this.activate(list); + } + } + }; + + selectBox = addComboBox(0, 0, 10, selects, 0, -1, onSelect); + + selectTargetBox = addComboBox(0, 0, 0, selectTargets, 0, -1, + new TAction() { + @Override + public void DO() { + if (selectTargetBox.getText().equals( + selectTargets.get(0))) { + setMode(mode, null); + } else { + setMode(mode, selectTargetBox.getText()); + } + } + }); + + // Set defaults + onSelect.DO(); + + TSizeConstraint.setSize(sizeConstraints, lblSelect, 5, 3, null, null); + TSizeConstraint.setSize(sizeConstraints, selectBox, 15, 3, -5, null); + TSizeConstraint.setSize(sizeConstraints, selectTargetBox, 15, 4, -5, + null); + } + + @Override + public void onResize(TResizeEvent resize) { + super.onResize(resize); + TSizeConstraint.resize(sizeConstraints); + } + @Override public void onClose() { setVisible(false); @@ -93,38 +226,43 @@ class TuiReaderMainWindow extends TWindow { } /** - * Change the source filter and display all stories matching this source. - * - * @param source - * the new source or NULL for all sources + * Refresh the list of stories displayed in this library. + *

+ * Will take the current settings into account (filter, source...). */ - public void setSource(String source) { - this.source = source; - refreshStories(); - } - public void refreshStories() { - List metas = reader.getLibrary().getListBySource(source); + List metas; + if (mode == Mode.SOURCE) { + metas = reader.getLibrary().getListBySource(target); + } else if (mode == Mode.AUTHOR) { + metas = reader.getLibrary().getListByAuthor(target); + } else { + metas = reader.getLibrary().getList(); + } + setMetas(metas); } /** - * Update the list of stories displayed in this {@link TWindow}. + * Change the author/source filter and display all stories matching this + * target. * - * @param meta - * the new (unique) story to display + * @param mode + * the new mode or NULL for no sorting + * @param target + * the actual target for the given mode, or NULL for all of them */ - public void setMeta(MetaData meta) { - List metas = new ArrayList(); - if (meta != null) { - metas.add(meta); - } - - setMetas(metas); + public void setMode(Mode mode, String target) { + this.mode = mode; + this.target = target; + refreshStories(); } /** * Update the list of stories displayed in this {@link TWindow}. + *

+ * If a filter is set, only the stories which pass the filter will be + * displayed. * * @param metas * the new list of stories to display @@ -135,12 +273,19 @@ class TuiReaderMainWindow extends TWindow { if (metas != null) { for (MetaData meta : metas) { - listKeys.add(meta); - listItems.add(desc(meta)); + String desc = desc(meta); + if (filter.isEmpty() + || desc.toLowerCase().contains(filter.toLowerCase())) { + listKeys.add(meta); + listItems.add(desc); + } } } list.setList(listItems); + if (listItems.size() > 0) { + list.setSelectedIndex(0); + } } public MetaData getSelectedMeta() { @@ -165,6 +310,16 @@ class TuiReaderMainWindow extends TWindow { return String.format("%5s: %s", meta.getLuid(), meta.getTitle()); } + @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); + } + } + @Override public void onMenu(TMenuEvent menu) { MetaData meta = getSelectedMeta(); @@ -188,6 +343,7 @@ class TuiReaderMainWindow extends TWindow { } return; + case -1: try { reader.getLibrary().delete(meta.getLuid());