X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderFrame.java;h=045bb46374d6d0546f9efd77e34d7b4bbb5af197;hp=e2ead3988a477bac15128d2cd18b095517e638f4;hb=5beb7cdca74ad803e6863af8e73dcd97106eef44;hpb=79a9950614d3bea63b0daafb7b7365f6ae3cbeb9

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
index e2ead39..045bb46 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
@@ -84,7 +84,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
 
 		setSize(800, 600);
 		setLayout(new BorderLayout());
-		add(mainPanel);
+		add(mainPanel, BorderLayout.CENTER);
 	}
 
 	@Override
@@ -109,7 +109,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
 	}
 
 	@Override
-	public JPopupMenu createSourcePopup() {
+	public JPopupMenu createSourceAuthorPopup() {
 		JPopupMenu popup = new JPopupMenu();
 		popup.add(createMenuItemOpenBook());
 		return popup;
@@ -117,6 +117,8 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
 
 	@Override
 	public void createMenu(boolean libOk) {
+		invalidate();
+
 		JMenuBar bar = new JMenuBar();
 
 		JMenu file = new JMenu("File");
@@ -736,8 +738,9 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
 					mainPanel.outOfUi(null, new Runnable() {
 						@Override
 						public void run() {
-							new GuiReaderPropertiesFrame(reader, selectedBook
-									.getInfo()).setVisible(true);
+							new GuiReaderPropertiesFrame(reader.getLibrary(),
+									selectedBook.getInfo().getMeta())
+									.setVisible(true);
 						}
 					});
 				}
@@ -748,7 +751,7 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
 	}
 
 	/**
-	 * Create the open menu item for a book or a source/type (no LUID).
+	 * Create the open menu item for a book, a source/type or an author.
 	 * 
 	 * @return the item
 	 */
@@ -759,10 +762,10 @@ class GuiReaderFrame extends JFrame implements FrameHelper {
 			public void actionPerformed(ActionEvent e) {
 				final GuiReaderBook selectedBook = mainPanel.getSelectedBook();
 				if (selectedBook != null) {
-					if (selectedBook.getInfo().getMeta().getLuid() == null) {
+					if (selectedBook.getInfo().getMeta() == null) {
 						mainPanel.removeBookPanes();
-						mainPanel.addBookPane(selectedBook.getInfo().getMeta()
-								.getSource(), true);
+						mainPanel.addBookPane(selectedBook.getInfo()
+								.getMainInfo(), mainPanel.getCurrentType());
 						mainPanel.refreshBooks();
 					} else {
 						mainPanel.openBook(selectedBook);