X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderMainWindow.java;fp=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderMainWindow.java;h=126cee58071c5105c0bdda3959338d2cf114ac47;hp=f2167a6d3a1371026d96002640c99f90db0acdc5;hb=ce424b1920a2362ac77687372837880833356343;hpb=f00daa5ee4c1e5de819f06b17282a87e8d328fd4

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
index f2167a6..126cee5 100644
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
@@ -2,20 +2,22 @@ package be.nikiroo.fanfix.reader.tui;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 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;
@@ -39,6 +41,10 @@ class TuiReaderMainWindow extends TWindow {
 	private Reader reader;
 	private String source;
 	private String filter = "";
+	private List<TSizeConstraint> sizeConstraints = new ArrayList<TSizeConstraint>();
+
+	// TODO: because no way to find out the current index!!
+	private TComboBox select;
 
 	/**
 	 * Create a new {@link TuiReaderMainWindow} without any stories in the list.
@@ -56,47 +62,15 @@ class TuiReaderMainWindow extends TWindow {
 		listKeys = new ArrayList<MetaData>();
 		listItems = new ArrayList<String>();
 
-		// TODO size + onResize
-
-		addLabel("Search: ", 5, 3);
-		@SuppressWarnings("unused")
-		TField field = new TField(this, 15, 3, 5, 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();
-				}
-			}
-		};
-
-		addLabel("Sort by: ", 5, 1);
-		// -1 = no default index (0 means first,...) 1=height when visible, null
-		// = action
-		List<String> data = Arrays.asList("(show all)", "Source", "Name",
-				"Author");
-		// 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?
-		addComboBox(15, 1, 12, data, 0,
-				Math.min(data.size() + 1, getHeight() - 1 - 1), null);
-
-		list = addList(listItems, 0, 7, getWidth(), getHeight(), new TAction() {
-			@Override
-			public void DO() {
-				MetaData meta = getSelectedMeta();
-				if (meta != null) {
-					readStory(meta);
-				}
-			}
-		});
+		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
 
 		// addLabel("Label (1,1)", 1, 1);
@@ -122,6 +96,103 @@ 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: make a full list
+		final List<String> options = new ArrayList<String>();
+		options.add("(all opt)");
+		options.add("Sources");
+		options.add("Author");
+
+		// TODO
+		final List<String> sources = new ArrayList<String>();
+		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);