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
Implement a text story viewer
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
ui
/
GuiReaderFrame.java
diff --git
a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
index 947900077113b1693c1f731f3bd406a25ccc08de..045bb46374d6d0546f9efd77e34d7b4bbb5af197 100644
(file)
--- 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());
setSize(800, 600);
setLayout(new BorderLayout());
- add(mainPanel);
+ add(mainPanel
, BorderLayout.CENTER
);
}
@Override
}
@Override
@@
-117,6
+117,8
@@
class GuiReaderFrame extends JFrame implements FrameHelper {
@Override
public void createMenu(boolean libOk) {
@Override
public void createMenu(boolean libOk) {
+ invalidate();
+
JMenuBar bar = new JMenuBar();
JMenu file = new JMenu("File");
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() {
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
*/
*
* @return the item
*/
@@
-761,8
+764,8
@@
class GuiReaderFrame extends JFrame implements FrameHelper {
if (selectedBook != null) {
if (selectedBook.getInfo().getMeta() == null) {
mainPanel.removeBookPanes();
if (selectedBook != null) {
if (selectedBook.getInfo().getMeta() == null) {
mainPanel.removeBookPanes();
- mainPanel.addBookPane(selectedBook.getInfo()
.getMainInfo(),
- mainPanel.getCurrentType());
+ mainPanel.addBookPane(selectedBook.getInfo()
+
.getMainInfo(),
mainPanel.getCurrentType());
mainPanel.refreshBooks();
} else {
mainPanel.openBook(selectedBook);
mainPanel.refreshBooks();
} else {
mainPanel.openBook(selectedBook);