X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderSearch.java;h=c421ba6b006a43425aa735f6f1a0a4cc38ee95eb;hb=e96619eaf672b7779c7db9bb4db82afa51bd2856;hp=59d4f21786724a90a5a0d39c5ea40abdb30f5593;hpb=81acd363d9b0af424d462e9d2e6a07b160e7af3b;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java index 59d4f21..c421ba6 100644 --- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java +++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java @@ -1,6 +1,7 @@ package be.nikiroo.fanfix.reader.ui; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Component; import java.awt.EventQueue; import java.awt.event.ActionEvent; @@ -10,13 +11,17 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; +import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.JTextField; +import javax.swing.ListCellRenderer; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.MetaData; @@ -42,15 +47,18 @@ public class GuiReaderSearch extends JFrame { private int page; private int maxPage; - private JComboBox comboSupportTypes; + private JPanel tagBars; + private List combos; + + private JComboBox comboSupportTypes; private JTabbedPane searchTabs; private JTextField keywordsField; + private JButton submitKeywords; private boolean seeWordcount; private GuiReaderGroup books; public GuiReaderSearch(final GuiReader reader) { - // TODO: i18n super("Browse stories"); setLayout(new BorderLayout()); setSize(800, 600); @@ -68,8 +76,7 @@ public class GuiReaderSearch extends JFrame { } supportType = supportTypes.isEmpty() ? null : supportTypes.get(0); - JPanel top = new JPanel(new BorderLayout()); - comboSupportTypes = new JComboBox( + comboSupportTypes = new JComboBox( supportTypes.toArray(new SupportType[] {})); comboSupportTypes.addActionListener(new ActionListener() { @Override @@ -78,13 +85,16 @@ public class GuiReaderSearch extends JFrame { .getSelectedItem()); } }); - top.add(comboSupportTypes, BorderLayout.NORTH); + JPanel searchSites = new JPanel(new BorderLayout()); + searchSites.add(comboSupportTypes, BorderLayout.CENTER); + searchSites.add(new JLabel(" " + "Website : "), BorderLayout.WEST); - // TODO: i18n searchTabs = new JTabbedPane(); searchTabs.addTab("By name", createByNameSearchPanel()); searchTabs.addTab("By tags", createByTagSearchPanel()); + JPanel top = new JPanel(new BorderLayout()); + top.add(searchSites, BorderLayout.NORTH); top.add(searchTabs, BorderLayout.CENTER); add(top, BorderLayout.NORTH); @@ -109,6 +119,8 @@ public class GuiReaderSearch extends JFrame { JScrollPane scroll = new JScrollPane(books); scroll.getVerticalScrollBar().setUnitIncrement(16); add(scroll, BorderLayout.CENTER); + + updateTags(null); } private JPanel createByNameSearchPanel() { @@ -117,13 +129,12 @@ public class GuiReaderSearch extends JFrame { keywordsField = new JTextField(); byName.add(keywordsField, BorderLayout.CENTER); - // TODO: i18n - JButton submit = new JButton("Search"); - byName.add(submit, BorderLayout.EAST); + submitKeywords = new JButton("Search"); + byName.add(submitKeywords, BorderLayout.EAST); // TODO: ENTER -> search - submit.addActionListener(new ActionListener() { + submitKeywords.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { search(supportType, keywordsField.getText(), page, 0); @@ -134,9 +145,12 @@ public class GuiReaderSearch extends JFrame { } private JPanel createByTagSearchPanel() { + combos = new ArrayList(); + JPanel byTag = new JPanel(); - JPanel searchBars = new JPanel(); - add(searchBars, BorderLayout.NORTH); + tagBars = new JPanel(); + tagBars.setLayout(new BoxLayout(tagBars, BoxLayout.Y_AXIS)); + byTag.add(tagBars, BorderLayout.NORTH); return byTag; } @@ -145,7 +159,8 @@ public class GuiReaderSearch extends JFrame { if (supportType != this.supportType) { this.supportType = supportType; comboSupportTypes.setSelectedItem(supportType); - // TODO: reset all + books.clear(); + updateTags(null); } } @@ -177,39 +192,190 @@ public class GuiReaderSearch extends JFrame { }); } + // cannot be NULL private void updateKeywords(final String keywords) { - inUi(new Runnable() { - @Override - public void run() { - GuiReaderSearch.this.keywords = keywords; - keywordsField.setText(keywords); - } - }); + if (!keywords.equals(this.keywords)) { + inUi(new Runnable() { + @Override + public void run() { + GuiReaderSearch.this.keywords = keywords; + keywordsField.setText(keywords); + } + }); + } } - // can be NULL + // update and reset the tagsbar + // can be NULL, for base tags private void updateTags(final SearchableTag tag) { + final List parents = new ArrayList(); + SearchableTag parent = (tag == null) ? null : tag; + while (parent != null) { + parents.add(parent); + parent = parent.getParent(); + } + inUi(new Runnable() { @Override public void run() { - // TODO + tagBars.invalidate(); + tagBars.removeAll(); + + // TODO: Slow UI + // TODO: select the right one + try { + SearchableTag selectedChild = parents.isEmpty() ? null + : parents.get(parents.size() - 1); + addTagBar(BasicSearchable.getSearchable(supportType) + .getTags(), selectedChild); + } catch (IOException e) { + error(e); + } + + for (int i = parents.size() - 1; i >= 0; i--) { + SearchableTag selectedChild = null; + if (i > 0) { + selectedChild = parents.get(i - 1); + } + SearchableTag parent = parents.get(i); + addTagBar(parent.getChildren(), selectedChild); + } + + tagBars.validate(); } }); } private void updateBooks(final List infos) { + setWaitingScreen(true); inUi(new Runnable() { @Override public void run() { books.refreshBooks(infos, seeWordcount); + setWaitingScreen(false); } }); } + // not 1.6 compatible + @SuppressWarnings({ "unchecked", "rawtypes" }) + private void addTagBar(List tags, + final SearchableTag selected) { + tags.add(0, null); + + final int comboIndex = combos.size(); + + final JComboBox combo = new JComboBox( + tags.toArray(new SearchableTag[] {})); + combo.setSelectedItem(selected); + + final ListCellRenderer basic = combo.getRenderer(); + + combo.setRenderer(new ListCellRenderer() { + @Override + public Component getListCellRendererComponent(JList list, + Object value, int index, boolean isSelected, + boolean cellHasFocus) { + + Object displayValue = value; + if (value instanceof SearchableTag) { + displayValue = ((SearchableTag) value).getName(); + } else { + displayValue = "Select a tag..."; + cellHasFocus = false; + isSelected = false; + } + + Component rep = basic.getListCellRendererComponent(list, + displayValue, index, isSelected, cellHasFocus); + + if (value == null) { + rep.setForeground(Color.GRAY); + } + + return rep; + } + }); + + combo.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + final SearchableTag tag = (SearchableTag) combo + .getSelectedItem(); + if (tag != null) { + while (comboIndex + 1 < combos.size()) { + JComboBox combo = combos.remove(comboIndex + 1); + tagBars.remove(combo); + } + + addTagBar(tag, new Runnable() { + @Override + public void run() { + // TODO: stories if needed + setWaitingScreen(false); + } + }); + } + } + }); + + tagBars.add(combo); + } + + // async, add children of tag, NULL = base tags + private void addTagBar(final SearchableTag tag, final Runnable inUi) { + new Thread(new Runnable() { + @Override + public void run() { + BasicSearchable searchable = BasicSearchable + .getSearchable(supportType); + + List children = new ArrayList(); + if (tag == null) { + try { + List baseTags = searchable.getTags(); + children = baseTags; + } catch (IOException e) { + error(e); + } + } else { + try { + searchable.fillTag(tag); + } catch (IOException e) { + error(e); + } + + if (!tag.isLeaf()) { + children = tag.getChildren(); + } else { + children = null; + // TODO: stories + } + } + + final List fchildren = children; + inUi(new Runnable() { + @Override + public void run() { + if (fchildren != null) { + addTagBar(fchildren, tag); + } + + if (inUi != null) { + inUi.run(); + } + } + }); + } + }).start(); + } + // item 0 = no selection, else = default selection public void search(final SupportType searchOn, final String keywords, final int page, final int item) { + setWaitingScreen(true); + updateSupportType(searchOn); updateSearchBy(false); updateKeywords(keywords); @@ -221,86 +387,117 @@ public class GuiReaderSearch extends JFrame { BasicSearchable search = BasicSearchable .getSearchable(searchOn); + int maxPage = -1; + try { + maxPage = search.searchPages(keywords); + } catch (IOException e) { + error(e); + } + if (page <= 0) { - int maxPage = -1; - try { - maxPage = search.searchPages(keywords); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } updateBooks(new ArrayList()); updatePages(0, maxPage); } else { - List infos = new ArrayList(); + List results; try { - for (MetaData meta : search.search(keywords, page)) { - infos.add(GuiReaderBookInfo.fromMeta(meta)); - } + results = search.search(keywords, page); } catch (IOException e) { - Instance.getTraceHandler().error(e); + error(e); + results = new ArrayList(); } - updateBooks(infos); - updatePages(page, maxPage); + search(results, page, maxPage, item); // ! 1-based index ! if (item > 0 && item <= books.getBooksCount()) { // TODO: "click" on item ITEM } } + + setWaitingScreen(false); } }).start(); } - public void searchTag(SupportType searchOn, int page, int item, - SearchableTag tag) { + // tag: must be filled (or NULL for base tags) + public void searchTag(final SupportType searchOn, final int page, + final int item, final SearchableTag tag) { + + setWaitingScreen(true); updateSupportType(searchOn); updateSearchBy(true); updateTags(tag); updatePages(page, maxPage); - BasicSearchable search = BasicSearchable.getSearchable(searchOn); - - if (tag != null) { - int maxPage = 0; - try { - maxPage = search.searchPages(tag); - } catch (IOException e) { - Instance.getTraceHandler().error(e); - } - - updatePages(page, maxPage); - - if (page > 0) { - List metas = null; - List subtags = null; - int count; + new Thread(new Runnable() { + @Override + public void run() { + BasicSearchable search = BasicSearchable + .getSearchable(searchOn); - if (tag.isLeaf()) { + if (tag != null) { + int maxPage = 0; try { - metas = search.search(tag, page); + maxPage = search.searchPages(tag); } catch (IOException e) { - metas = new ArrayList(); - Instance.getTraceHandler().error(e); + error(e); } - count = metas.size(); - } else { - subtags = tag.getChildren(); - count = subtags.size(); - } - if (item > 0) { - if (item <= count) { - if (metas != null) { - MetaData meta = metas.get(item - 1); - // TODO: select story + updatePages(page, maxPage); + + if (page > 0) { + List metas = new ArrayList(); + + if (tag.isLeaf()) { + try { + metas = search.search(tag, page); + } catch (IOException e) { + error(e); + } } else { - SearchableTag subtag = subtags.get(item - 1); - // TODO: search on tag + List subtags = tag.getChildren(); + if (item > 0 && item <= subtags.size()) { + SearchableTag subtag = subtags.get(item - 1); + try { + metas = search.search(subtag, page); + maxPage = subtag.getPages(); + } catch (IOException e) { + error(e); + } + } } + + updatePages(page, maxPage); + search(metas, page, maxPage, item); } } + + setWaitingScreen(false); + } + }).start(); + } + + // item 0 = no selection, else = default selection + public void search(final List results, final int page, + final int maxPage, final int item) { + + updatePages(page, maxPage); + + if (page <= 0) { + updateBooks(new ArrayList()); + updatePages(0, maxPage); + } else { + List infos = new ArrayList(); + for (MetaData meta : results) { + infos.add(GuiReaderBookInfo.fromMeta(meta)); + } + + updateBooks(infos); + + // ! 1-based index ! + if (item > 0 && item <= books.getBooksCount()) { + // TODO: "click" on item ITEM } } } @@ -316,17 +513,32 @@ public class GuiReaderSearch extends JFrame { * @param run * the action to run */ - public void inUi(final Runnable run) { + private void inUi(final Runnable run) { if (EventQueue.isDispatchThread()) { run.run(); } else { try { EventQueue.invokeAndWait(run); } catch (InterruptedException e) { - Instance.getTraceHandler().error(e); + error(e); } catch (InvocationTargetException e) { - Instance.getTraceHandler().error(e); + error(e); } } } + + private void error(Exception e) { + Instance.getTraceHandler().error(e); + } + + private void setWaitingScreen(final boolean waiting) { + inUi(new Runnable() { + @Override + public void run() { + GuiReaderSearch.this.setEnabled(!waiting); + books.setEnabled(!waiting); + submitKeywords.setEnabled(!waiting); + } + }); + } }