X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderStoryWindow.java;h=af9c472693cb6a689d0c27339e2a9ea564d68025;hp=d28dff5d4244213e753fade45f03fa1dc9b7fb58;hb=e0fb1417b679a2f3cb0fef4937e79b211f1ce3c4;hpb=e8796963aa396e8063bbfa1976f22706182fe637

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
index d28dff5..af9c472 100644
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
@@ -13,6 +13,7 @@ import jexer.TLabel;
 import jexer.TTable;
 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;
@@ -20,7 +21,6 @@ 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.utils.StringUtils;
 
 /**
@@ -30,8 +30,6 @@ import be.nikiroo.utils.StringUtils;
  * @author niki
  */
 class TuiReaderStoryWindow extends TWindow {
-	private BasicLibrary lib;
-	private MetaData meta;
 	private Story story;
 	private TLabel titleField;
 	private TText textField;
@@ -41,14 +39,13 @@ class TuiReaderStoryWindow extends TWindow {
 	private TLabel currentChapter;
 
 	// 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()));
 
 		// last = use window background
 		titleField = new TLabel(this, "    Title", 0, 1, "tlabel", false);
@@ -273,10 +270,6 @@ class TuiReaderStoryWindow extends TWindow {
 	}
 
 	private Story getStory() {
-		if (story == null) {
-			// TODO: progress bar?
-			story = lib.getStory(meta.getLuid(), null);
-		}
 		return story;
 	}
 
@@ -346,4 +339,14 @@ class TuiReaderStoryWindow extends TWindow {
 	private static String desc(MetaData meta) {
 		return String.format("%s: %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);
+		}
+	}
 }