TUI: code cleanup + show story info

[fanfix.git] / src / be / nikiroo / fanfix / reader / tui / TuiReaderMainWindow.java

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
index 0fccfafaaab717fc33726be4c49aaaba41bf3210..a2313775a2411299d44611a88da0877ea6c6daa7 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
@@ -5,9 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import jexer.TAction;
-import jexer.TCommand;
 import jexer.TFileOpenBox.Type;
-import jexer.TKeypress;
 import jexer.TList;
 import jexer.TWindow;
 import jexer.event.TMenuEvent;
@@ -39,8 +37,7 @@ 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;
 
@@ -59,8 +56,7 @@ class TuiReaderMainWindow extends TWindow {
                });
 
                // TODO: add the current "source/type" or filter
-               statusBar = newStatusBar("Library");
-               statusBar.addShortcutKeypress(TKeypress.kbF10, TCommand.cmExit, "Exit");
+               reader.setStatusBar(this, "Library");
 
                // TODO: remove when not used anymore
 
@@ -87,6 +83,12 @@ class TuiReaderMainWindow extends TWindow {
                // root.addChild("child 2").addChild("sub child");
        }
 
+       @Override
+       public void onClose() {
+               setVisible(false);
+               super.onClose();
+       }
+
        /**
         * Change the source filter and display all stories matching this source.
         *