X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderApplication.java;h=d8c93976754c0fea984e242dc76da0955dcbb299;hb=b4a6005047bfe8c53439516ee8db702c7ee52698;hp=177c12ab867094cbd61292d88314662a569b0ecc;hpb=6be5e3bb218e1ed118ad5e693e13d1da2b49df13;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
index 177c12a..d8c9397 100644
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderApplication.java
@@ -37,15 +37,15 @@ import be.nikiroo.utils.Progress;
  * @author niki
  */
 class TuiReaderApplication extends TApplication implements Reader {
-	public static final int MENU_OPEN = 1025;
-	public static final int MENU_IMPORT_URL = 1026;
-	public static final int MENU_IMPORT_FILE = 1027;
-	public static final int MENU_EXPORT = 1028;
-	public static final int MENU_DELETE = 1029;
-	public static final int MENU_LIBRARY = 1030;
-	public static final int MENU_EXIT = 1031;
-
-	public static final TCommand CMD_EXIT = new TCommand(MENU_EXIT) {
+	public static final int MENU_FILE_OPEN = 1025;
+	public static final int MENU_FILE_IMPORT_URL = 1026;
+	public static final int MENU_FILE_IMPORT_FILE = 1027;
+	public static final int MENU_FILE_EXPORT = 1028;
+	public static final int MENU_FILE_DELETE = 1029;
+	public static final int MENU_FILE_LIBRARY = 1030;
+	public static final int MENU_FILE_EXIT = 1031;
+
+	public static final TCommand CMD_EXIT = new TCommand(MENU_FILE_EXIT) {
 	};
 
 	private Reader reader;
@@ -66,7 +66,7 @@ class TuiReaderApplication extends TApplication implements Reader {
 			TApplication.BackendType backend) throws Exception {
 		super(backend);
 		init(reader);
-
+		
 		showMain();
 		main.setMode(Mode.SOURCE, source);
 	}
@@ -82,7 +82,7 @@ class TuiReaderApplication extends TApplication implements Reader {
 	}
 
 	@Override
-	public Story getStory(Progress pg) {
+	public Story getStory(Progress pg) throws IOException {
 		return reader.getStory(pg);
 	}
 
@@ -113,7 +113,11 @@ class TuiReaderApplication extends TApplication implements Reader {
 
 	@Override
 	public void browse(String source) {
-		reader.browse(source);
+		try {
+			reader.browse(source);
+		} catch (IOException e) {
+			Instance.getTraceHandler().error(e);
+		}
 	}
 
 	@Override
@@ -125,15 +129,22 @@ class TuiReaderApplication extends TApplication implements Reader {
 	public void setChapter(int chapter) {
 		reader.setChapter(chapter);
 	}
-	
+
 	@Override
-	public void search(SupportType searchOn, String keywords, int page, int item) {
-		reader.search(searchOn, keywords, page,item);	
+	public void search(boolean sync) throws IOException {
+		reader.search(sync);
 	}
-	
+
+	@Override
+	public void search(SupportType searchOn, String keywords, int page,
+			int item, boolean sync) throws IOException {
+		reader.search(searchOn, keywords, page, item, sync);
+	}
+
 	@Override
-	public void searchTag(SupportType searchOn, int page, int item, String... tags) {
-		reader.searchTag(searchOn, page, item, tags);
+	public void searchTag(SupportType searchOn, int page, int item,
+			boolean sync, Integer... tags) throws IOException {
+		reader.searchTag(searchOn, page, item, sync, tags);
 	}
 
 	/**
@@ -208,17 +219,17 @@ class TuiReaderApplication extends TApplication implements Reader {
 
 		// Add the menus TODO: i18n
 		TMenu fileMenu = addMenu("&File");
-		fileMenu.addItem(MENU_OPEN, "&Open...");
-		fileMenu.addItem(MENU_EXPORT, "&Save as...");
-		fileMenu.addItem(MENU_DELETE, "&Delete...");
+		fileMenu.addItem(MENU_FILE_OPEN, "&Open...");
+		fileMenu.addItem(MENU_FILE_EXPORT, "&Save as...");
+		fileMenu.addItem(MENU_FILE_DELETE, "&Delete...");
 		// TODO: Move to...
 		fileMenu.addSeparator();
-		fileMenu.addItem(MENU_IMPORT_URL, "Import &URL...");
-		fileMenu.addItem(MENU_IMPORT_FILE, "Import &file...");
+		fileMenu.addItem(MENU_FILE_IMPORT_URL, "Import &URL...");
+		fileMenu.addItem(MENU_FILE_IMPORT_FILE, "Import &file...");
 		fileMenu.addSeparator();
-		fileMenu.addItem(MENU_LIBRARY, "Lib&rary");
+		fileMenu.addItem(MENU_FILE_LIBRARY, "Lib&rary");
 		fileMenu.addSeparator();
-		fileMenu.addItem(MENU_EXIT, "E&xit");
+		fileMenu.addItem(MENU_FILE_EXIT, "E&xit");
 
 		setStatusBar(fileMenu, "File-management "
 				+ "commands (Open, Save, Print, etc.)");
@@ -245,10 +256,10 @@ class TuiReaderApplication extends TApplication implements Reader {
 	protected boolean onMenu(TMenuEvent menu) {
 		// TODO: i18n
 		switch (menu.getId()) {
-		case MENU_EXIT:
+		case MENU_FILE_EXIT:
 			close(this);
 			return true;
-		case MENU_OPEN:
+		case MENU_FILE_OPEN:
 			String openfile = null;
 			try {
 				openfile = fileOpenBox(".");
@@ -262,7 +273,7 @@ class TuiReaderApplication extends TApplication implements Reader {
 			}
 
 			return true;
-		case MENU_DELETE:
+		case MENU_FILE_DELETE:
 			String luid = null;
 			String story = null;
 			MetaData meta = null;
@@ -291,7 +302,7 @@ class TuiReaderApplication extends TApplication implements Reader {
 			}
 
 			return true;
-		case MENU_IMPORT_URL:
+		case MENU_FILE_IMPORT_URL:
 			String clipboard = "";
 			try {
 				clipboard = ("" + Toolkit.getDefaultToolkit()
@@ -319,7 +330,7 @@ class TuiReaderApplication extends TApplication implements Reader {
 			}
 
 			return true;
-		case MENU_IMPORT_FILE:
+		case MENU_FILE_IMPORT_FILE:
 			String filename = null;
 			try {
 				filename = fileOpenBox(".");
@@ -334,7 +345,7 @@ class TuiReaderApplication extends TApplication implements Reader {
 						"Import error", e);
 			}
 			return true;
-		case MENU_LIBRARY:
+		case MENU_FILE_LIBRARY:
 			showMain();
 			return true;
 		}