X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderMainWindow.java;h=18a1223bbe70ea49a2ce9b5bddc244b0fe6c1da8;hb=cf9c5ed1164709d753d9c93ae8589f09b2f90ac0;hp=1fa6d8b6e19a42b0752b8afe05c4626c89507fba;hpb=4f66bfa85209c2c1683f938df9b43fa2924b351e;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java index 1fa6d8b..18a1223 100644 --- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java +++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java @@ -5,11 +5,10 @@ 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.TCommandEvent; import jexer.event.TMenuEvent; import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.MetaData; @@ -58,8 +57,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 @@ -165,6 +163,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();