git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tui: improve mode selection
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
tui
/
TuiReaderApplication.java
diff --git
a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
b/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
index b85bb8612768a30480942ccf760d6cb5baf9d449..52bc531ad803202904f9e78076d5da5df837b7c2 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
+++ b/
src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
@@
-13,6
+13,7
@@
import jexer.TMessageBox;
import jexer.TStatusBar;
import jexer.TWidget;
import jexer.TWindow;
import jexer.TStatusBar;
import jexer.TWidget;
import jexer.TWindow;
+import jexer.event.TCommandEvent;
import jexer.event.TMenuEvent;
import jexer.menu.TMenu;
import be.nikiroo.fanfix.Instance;
import jexer.event.TMenuEvent;
import jexer.menu.TMenu;
import be.nikiroo.fanfix.Instance;
@@
-21,6
+22,7
@@
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.library.BasicLibrary;
import be.nikiroo.fanfix.reader.BasicReader;
import be.nikiroo.fanfix.reader.Reader;
import be.nikiroo.fanfix.library.BasicLibrary;
import be.nikiroo.fanfix.reader.BasicReader;
import be.nikiroo.fanfix.reader.Reader;
+import be.nikiroo.fanfix.reader.tui.TuiReaderMainWindow.Mode;
import be.nikiroo.utils.Progress;
/**
import be.nikiroo.utils.Progress;
/**
@@
-44,7
+46,6
@@
class TuiReaderApplication extends TApplication implements Reader {
private Reader reader;
private TuiReaderMainWindow main;
private Reader reader;
private TuiReaderMainWindow main;
- private String source;
// start reading if meta present
public TuiReaderApplication(Reader reader, BackendType backend)
// start reading if meta present
public TuiReaderApplication(Reader reader, BackendType backend)
@@
-64,7
+65,7
@@
class TuiReaderApplication extends TApplication implements Reader {
init(reader);
showMain();
init(reader);
showMain();
-
setSource(
source);
+
main.setMode(Mode.SOURCE,
source);
}
@Override
}
@Override
@@
-173,12
+174,6
@@
class TuiReaderApplication extends TApplication implements Reader {
}
}
}
}
- private void setSource(String source) {
- this.source = source;
- showMain();
- main.setSource(source);
- }
-
private void init(Reader reader) {
this.reader = reader;
private void init(Reader reader) {
this.reader = reader;
@@
-210,6
+205,15
@@
class TuiReaderApplication extends TApplication implements Reader {
getBackend().setTitle("Fanfix");
}
getBackend().setTitle("Fanfix");
}
+ @Override
+ protected boolean onCommand(TCommandEvent command) {
+ if (command.getCmd().equals(TuiReaderMainWindow.CMD_SEARCH)) {
+ messageBox("title", "caption");
+ return true;
+ }
+ return super.onCommand(command);
+ }
+
@Override
protected boolean onMenu(TMenuEvent menu) {
// TODO: i18n
@Override
protected boolean onMenu(TMenuEvent menu) {
// TODO: i18n
@@
-276,7
+280,6
@@
class TuiReaderApplication extends TApplication implements Reader {
return true;
case MENU_LIBRARY:
showMain();
return true;
case MENU_LIBRARY:
showMain();
- setSource(source);
return true;
}
return true;
}