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
Update nikiroo-utils, remove Instance.syserr/trace
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
GuiReaderFrame.java
diff --git
a/src/be/nikiroo/fanfix/reader/GuiReaderFrame.java
b/src/be/nikiroo/fanfix/reader/GuiReaderFrame.java
index 87d7075ab0a744d13fce7faa512d4312a62de7d4..cd321ab49ad15ee7ebe5e6262074f9040bd10d25 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/GuiReaderFrame.java
+++ b/
src/be/nikiroo/fanfix/reader/GuiReaderFrame.java
@@
-22,6
+22,7
@@
import java.util.Map.Entry;
import javax.swing.BoxLayout;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
import javax.swing.BoxLayout;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
+import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
@@
-29,6
+30,7
@@
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
import javax.swing.SwingUtilities;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
@@
-112,6
+114,12
@@
class GuiReaderFrame extends JFrame {
scroll.getVerticalScrollBar().setUnitIncrement(16);
add(scroll, BorderLayout.CENTER);
scroll.getVerticalScrollBar().setUnitIncrement(16);
add(scroll, BorderLayout.CENTER);
+ String message = reader.getLibrary().getLibraryName();
+ if (!message.isEmpty()) {
+ JLabel name = new JLabel(message, SwingConstants.CENTER);
+ add(name, BorderLayout.NORTH);
+ }
+
pgBar = new ProgressBar();
add(pgBar, BorderLayout.SOUTH);
pgBar = new ProgressBar();
add(pgBar, BorderLayout.SOUTH);
@@
-548,7
+556,7
@@
class GuiReaderFrame extends JFrame {
selectedBook.getMeta().getLuid(),
type, path, pg);
} catch (IOException e) {
selectedBook.getMeta().getLuid(),
type, path, pg);
} catch (IOException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
}
}
});
}
}
});
@@
-600,6
+608,7
@@
class GuiReaderFrame extends JFrame {
reader.clearLocalReaderCache(selectedBook.getMeta()
.getLuid());
selectedBook.setCached(false);
reader.clearLocalReaderCache(selectedBook.getMeta()
.getLuid());
selectedBook.setCached(false);
+ GuiReaderBook.clearIcon(selectedBook.getMeta());
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
@@
-777,6
+786,9
@@
class GuiReaderFrame extends JFrame {
reader.getLibrary().setSourceCover(
selectedBook.getMeta().getSource(),
selectedBook.getMeta().getLuid());
reader.getLibrary().setSourceCover(
selectedBook.getMeta().getSource(),
selectedBook.getMeta().getLuid());
+ MetaData source = selectedBook.getMeta().clone();
+ source.setLuid(null);
+ GuiReaderBook.clearIcon(source);
}
}
});
}
}
});
@@
-805,7
+817,7
@@
class GuiReaderFrame extends JFrame {
});
} catch (IOException e) {
// TODO: error message?
});
} catch (IOException e) {
// TODO: error message?
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
}
}
});
}
}
});
@@
-928,7
+940,7
@@
class GuiReaderFrame extends JFrame {
pgOnSuccess.setProgress(0);
if (!ok) {
pgOnSuccess.setProgress(0);
if (!ok) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {