X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderMainWindow.java;h=126cee58071c5105c0bdda3959338d2cf114ac47;hb=ce424b1920a2362ac77687372837880833356343;hp=0fccfafaaab717fc33726be4c49aaaba41bf3210;hpb=16a81ef7656c5c692fb831927e75edde25dd77a0;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java index 0fccfaf..126cee5 100644 --- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java +++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java @@ -5,12 +5,19 @@ 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; @@ -24,11 +31,20 @@ 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) { + }; + private TList list; private List listKeys; private List listItems; private Reader reader; private String source; + private String filter = ""; + private List sizeConstraints = new ArrayList(); + + // TODO: because no way to find out the current index!! + private TComboBox select; /** * Create a new {@link TuiReaderMainWindow} without any stories in the list. @@ -39,28 +55,21 @@ class TuiReaderMainWindow extends TWindow { public TuiReaderMainWindow(TuiReaderApplication reader) { // Construct a demo window. X and Y don't matter because it will be // centred on screen. - super(reader, "Library", 0, 0, 60, 18, CENTERED | RESIZABLE - | UNCLOSABLE); + super(reader, "Library", 0, 0, 60, 18, CENTERED | RESIZABLE); 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"); + addSearch(); + addList(); + addSelect(); // TODO: last so it can draw over the rest + + TStatusBar statusBar = reader.setStatusBar(this, "Library"); + statusBar.addShortcutKeypress(TKeypress.kbCtrlF, CMD_SEARCH, "Search"); + + TSizeConstraint.resize(sizeConstraints); // TODO: remove when not used anymore @@ -87,39 +96,135 @@ class TuiReaderMainWindow extends TWindow { // root.addChild("child 2").addChild("sub child"); } - /** - * Change the source filter and display all stories matching this source. - * - * @param source - * the new source or NULL for all sources - */ - public void setSource(String source) { - this.source = source; - refreshStories(); + 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: make a full list + final List options = new ArrayList(); + options.add("(all opt)"); + options.add("Sources"); + options.add("Author"); + + // TODO + final List sources = new ArrayList(); + sources.add("(show all)"); + for (String source : reader.getLibrary().getSources()) { + sources.add(source); + } + + TLabel lblSelect = addLabel("Select: ", 0, 0); + + // TODO: why must be last so to be able to draw over the rest + // TODO: make it so we cannot add manual entries + // TODO: how to select the item via keyboard? why double-click via + // mouse? + // TODO: how to change the values size on resize? + // TODO: setWidth() does not impact the display width, only the control + // and the down arrow on the right + // TODO: width 1 +resize + click on down arrow = bad format exception + select = addComboBox(0, 0, 10, sources, 0, + Math.min(sources.size() + 1, getHeight() - 1 - 1), + new TAction() { + @Override + public void DO() { + // TODO: wut? + if (select.getText().equals("(show all)")) { + setSource(null); + } else { + setSource(select.getText()); + } + refreshStories(); + } + }); + + final TComboBox option = addComboBox(0, 0, 10, options, 0, + Math.min(sources.size() + 1, getHeight() - 1 - 1), + new TAction() { + @Override + public void DO() { + // TODO Not working: + sources.clear(); + sources.add("(show all)"); + for (String source : reader.getLibrary().getSources()) { + sources.add(source); + } + } + }); + + TSizeConstraint.setSize(sizeConstraints, lblSelect, 5, 3, null, null); + TSizeConstraint.setSize(sizeConstraints, option, 15, 3, -5, null); + TSizeConstraint.setSize(sizeConstraints, select, 15, 4, -5, null); + } + + @Override + public void onResize(TResizeEvent resize) { + super.onResize(resize); + TSizeConstraint.resize(sizeConstraints); + } + + @Override + public void onClose() { + setVisible(false); + super.onClose(); + } + + /** + * Refresh the list of stories displayed in this library. + *

+ * Will take the current settings into account (filter, source...). + */ public void refreshStories() { List metas = reader.getLibrary().getListBySource(source); setMetas(metas); } /** - * Update the list of stories displayed in this {@link TWindow}. + * Change the source filter and display all stories matching this source. * - * @param meta - * the new (unique) story to display + * @param source + * the new source or NULL for all sources */ - public void setMeta(MetaData meta) { - List metas = new ArrayList(); - if (meta != null) { - metas.add(meta); - } - - setMetas(metas); + public void setSource(String source) { + this.source = source; + 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 @@ -130,8 +235,12 @@ 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); + } } } @@ -160,6 +269,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(); @@ -183,6 +302,7 @@ class TuiReaderMainWindow extends TWindow { } return; + case -1: try { reader.getLibrary().delete(meta.getLuid());