X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderMainPanel.java;h=8593fe6471c816812220defeedf5775fe1757642;hb=a3550a0a2d1ee45b4853c789440a4a3226fc00c7;hp=5192278992ee03e5cfae845dc4891ff5621fd3ad;hpb=484a31aadf54746222f9f35fb607a2ebee4e5e58;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
index 5192278..8593fe6 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
@@ -9,6 +9,8 @@ import java.awt.Toolkit;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -83,10 +85,10 @@ class GuiReaderMainPanel extends JPanel {
 		 * <p>
 		 * Will invalidate the layout.
 		 * 
-		 * @param libOk
-		 *            the library can be queried
+		 * @param status
+		 *            the library status, <b>must not</b> be NULL
 		 */
-		public void createMenu(boolean libOk);
+		public void createMenu(Status status);
 
 		/**
 		 * Create a popup menu for a {@link GuiReaderBook} that represents a
@@ -136,6 +138,7 @@ class GuiReaderMainPanel extends JPanel {
 
 		pane = new JPanel();
 		pane.setLayout(new BoxLayout(pane, BoxLayout.PAGE_AXIS));
+		JScrollPane scroll = new JScrollPane(pane);
 
 		Integer icolor = Instance.getUiConfig().getColor(
 				UiConfig.BACKGROUND_COLOR);
@@ -143,9 +146,9 @@ class GuiReaderMainPanel extends JPanel {
 			color = new Color(icolor);
 			setBackground(color);
 			pane.setBackground(color);
+			scroll.setBackground(color);
 		}
 
-		JScrollPane scroll = new JScrollPane(pane);
 		scroll.getVerticalScrollBar().setUnitIncrement(16);
 		add(scroll, BorderLayout.CENTER);
 
@@ -179,6 +182,13 @@ class GuiReaderMainPanel extends JPanel {
 
 		books = new TreeMap<String, GuiReaderGroup>();
 
+		addFocusListener(new FocusAdapter() {
+			@Override
+			public void focusGained(FocusEvent e) {
+				focus();
+			}
+		});
+
 		pane.setVisible(false);
 		final Progress pg = new Progress();
 		final String typeF = type;
@@ -188,23 +198,28 @@ class GuiReaderMainPanel extends JPanel {
 				final BasicLibrary lib = helper.getReader().getLibrary();
 				final Status status = lib.getStatus();
 
-				if (status == Status.READY) {
+				if (status == Status.READ_WRITE) {
 					lib.refresh(pg);
 				}
 
 				inUi(new Runnable() {
 					@Override
 					public void run() {
-						if (status == Status.READY) {
-							helper.createMenu(true);
+						if (status.isReady()) {
+							helper.createMenu(status);
+							pane.setVisible(true);
 							if (typeF == null) {
-								addBookPane(true, false);
+								try {
+									addBookPane(true, false);
+								} catch (IOException e) {
+									error(e.getLocalizedMessage(),
+											"IOException", e);
+								}
 							} else {
 								addBookPane(typeF, true);
 							}
-							pane.setVisible(true);
 						} else {
-							helper.createMenu(false);
+							helper.createMenu(status);
 							validate();
 
 							String desc = Instance.getTransGui().getStringX(
@@ -246,8 +261,11 @@ class GuiReaderMainPanel extends JPanel {
 	 * @param listMode
 	 *            TRUE to get a listing of all the sources or authors, FALSE to
 	 *            get one icon per source or author
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
 	 */
-	public void addBookPane(boolean type, boolean listMode) {
+	public void addBookPane(boolean type, boolean listMode) throws IOException {
 		this.currentType = type;
 		BasicLibrary lib = helper.getReader().getLibrary();
 		if (type) {
@@ -316,6 +334,8 @@ class GuiReaderMainPanel extends JPanel {
 				openBook(book);
 			}
 		});
+
+		focus();
 	}
 
 	/**
@@ -341,11 +361,17 @@ class GuiReaderMainPanel extends JPanel {
 			List<GuiReaderBookInfo> infos = new ArrayList<GuiReaderBookInfo>();
 
 			List<MetaData> metas;
-			if (currentType) {
-				metas = lib.getListBySource(value);
-			} else {
-				metas = lib.getListByAuthor(value);
+			try {
+				if (currentType) {
+					metas = lib.getListBySource(value);
+				} else {
+					metas = lib.getListByAuthor(value);
+				}
+			} catch (IOException e) {
+				error(e.getLocalizedMessage(), "IOException", e);
+				metas = new ArrayList<MetaData>();
 			}
+
 			for (MetaData meta : metas) {
 				infos.add(GuiReaderBookInfo.fromMeta(meta));
 			}
@@ -649,6 +675,27 @@ class GuiReaderMainPanel extends JPanel {
 				refreshBooks();
 			}
 		});
+
+		focus();
+	}
+
+	/**
+	 * Focus the first {@link GuiReaderGroup} we find.
+	 */
+	private void focus() {
+		GuiReaderGroup group = null;
+		Map<String, GuiReaderGroup> books = this.books;
+		if (books.size() > 0) {
+			group = books.values().iterator().next();
+		}
+
+		if (group == null) {
+			group = bookPane;
+		}
+
+		if (group != null) {
+			group.requestFocusInWindow();
+		}
 	}
 
 	/**