import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.Library;
+import be.nikiroo.fanfix.bundles.Config;
import be.nikiroo.fanfix.bundles.UiConfig;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.reader.LocalReaderBook.BookActionListener;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Version;
+import be.nikiroo.utils.ui.ConfigEditor;
import be.nikiroo.utils.ui.ProgressBar;
/**
private ProgressBar pgBar;
private JMenuBar bar;
private LocalReaderBook selectedBook;
+ private boolean words; // words or authors (secondary info on books)
/**
* Create a new {@link LocalReaderFrame}.
pgBar = new ProgressBar();
add(pgBar, BorderLayout.SOUTH);
- setJMenuBar(createMenu());
+ pgBar.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ invalidate();
+ pgBar.setProgress(null);
+ validate();
+ setEnabled(true);
+ }
+ });
+
+ pgBar.addUpdateListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ invalidate();
+ validate();
+ repaint();
+ }
+ });
booksByType = new HashMap<LocalReaderGroup, String>();
booksByAuthor = new HashMap<LocalReaderGroup, String>();
- addBookPane(type, true);
- refreshBooks();
+ pane.setVisible(false);
+ final Progress pg = new Progress();
+ final String typeF = type;
+ outOfUi(pg, new Runnable() {
+ public void run() {
+ Instance.getLibrary().refresh(pg);
+ invalidate();
+ setJMenuBar(createMenu());
+ addBookPane(typeF, true);
+ refreshBooks();
+ validate();
+ pane.setVisible(true);
+ }
+ });
setVisible(true);
}
/**
* Refresh the list of {@link LocalReaderBook}s from disk.
*
- * @param type
- * the type of {@link Story} to load, or NULL for all types
*/
private void refreshBooks() {
for (LocalReaderGroup group : booksByType.keySet()) {
List<MetaData> stories = Instance.getLibrary().getListByType(
booksByType.get(group));
- group.refreshBooks(stories);
+ group.refreshBooks(stories, words);
}
for (LocalReaderGroup group : booksByAuthor.keySet()) {
List<MetaData> stories = Instance.getLibrary().getListByAuthor(
booksByAuthor.get(group));
- group.refreshBooks(stories);
+ group.refreshBooks(stories, words);
}
pane.repaint();
bar.add(edit);
+ JMenu view = new JMenu("View");
+ view.setMnemonic(KeyEvent.VK_V);
+ JMenuItem vauthors = new JMenuItem("Author");
+ vauthors.setMnemonic(KeyEvent.VK_A);
+ vauthors.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ words = false;
+ refreshBooks();
+ }
+ });
+ view.add(vauthors);
+ JMenuItem vwords = new JMenuItem("Word count");
+ vwords.setMnemonic(KeyEvent.VK_W);
+ vwords.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ words = true;
+ refreshBooks();
+ }
+ });
+ view.add(vwords);
+ bar.add(view);
+
JMenu sources = new JMenu("Sources");
sources.setMnemonic(KeyEvent.VK_S);
bar.add(authors);
+ JMenu options = new JMenu("Options");
+ options.setMnemonic(KeyEvent.VK_O);
+ options.add(createMenuItemConfig());
+ options.add(createMenuItemUiConfig());
+ bar.add(options);
+
return bar;
}
+ /**
+ * Create the Fanfix Configuration menu item.
+ *
+ * @return the item
+ */
+ private JMenuItem createMenuItemConfig() {
+ final String title = "Fanfix Configuration";
+ JMenuItem item = new JMenuItem(title);
+ item.setMnemonic(KeyEvent.VK_F);
+
+ item.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ ConfigEditor<Config> ed = new ConfigEditor<Config>(
+ Config.class, Instance.getConfig(),
+ "This is where you configure the options of the program.");
+ JFrame frame = new JFrame(title);
+ frame.add(ed);
+ frame.setSize(800, 600);
+ frame.setVisible(true);
+ }
+ });
+
+ return item;
+ }
+
+ /**
+ * Create the UI Configuration menu item.
+ *
+ * @return the item
+ */
+ private JMenuItem createMenuItemUiConfig() {
+ final String title = "UI Configuration";
+ JMenuItem item = new JMenuItem(title);
+ item.setMnemonic(KeyEvent.VK_U);
+
+ item.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ ConfigEditor<UiConfig> ed = new ConfigEditor<UiConfig>(
+ UiConfig.class, Instance.getUiConfig(),
+ "This is where you configure the graphical appearence of the program.");
+ JFrame frame = new JFrame(title);
+ frame.add(ed);
+ frame.setSize(800, 600);
+ frame.setVisible(true);
+ }
+ });
+
+ return item;
+ }
+
/**
* Create the export menu item.
*
if (selectedBook != null) {
outOfUi(null, new Runnable() {
public void run() {
- reader.refresh(selectedBook.getMeta().getLuid());
+ reader.clearLocalReaderCache(selectedBook.getMeta()
+ .getLuid());
selectedBook.setCached(false);
SwingUtilities.invokeLater(new Runnable() {
public void run() {
refresh.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if (selectedBook != null) {
- imprt(selectedBook.getMeta().getUrl(), new Runnable() {
+ final MetaData meta = selectedBook.getMeta();
+ imprt(meta.getUrl(), new Runnable() {
public void run() {
- reader.delete(selectedBook.getMeta().getLuid());
- selectedBook = null;
+ reader.delete(meta.getLuid());
+ LocalReaderFrame.this.selectedBook = null;
}
- });
+ }, "Removing old copy");
}
}
});
public void run() {
reader.delete(selectedBook.getMeta().getLuid());
selectedBook = null;
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- refreshBooks();
- }
- });
}
});
}
* @param run
* the action to run
*/
- private void outOfUi(final Progress pg, final Runnable run) {
- pgBar.setProgress(pg);
+ private void outOfUi(Progress progress, final Runnable run) {
+ final Progress pg = new Progress();
+ final Progress reload = new Progress("Reload books");
+ if (progress == null) {
+ progress = new Progress();
+ }
+
+ pg.addProgress(progress, 90);
+ pg.addProgress(reload, 10);
+ invalidate();
+ pgBar.setProgress(pg);
+ validate();
setEnabled(false);
- pgBar.addActioListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- pgBar.setProgress(null);
- setEnabled(true);
- }
- });
new Thread(new Runnable() {
public void run() {
run.run();
- if (pg == null) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- setEnabled(true);
- }
- });
- } else if (!pg.isDone()) {
- pg.setProgress(pg.getMax());
+ refreshBooks();
+ reload.done();
+ if (!pg.isDone()) {
+ // will trigger pgBar ActionListener:
+ pg.done();
}
}
- }).start();
+ }, "outOfUi thread").start();
}
/**
}
if (url != null && !url.toString().isEmpty()) {
- imprt(url.toString(), null);
+ imprt(url.toString(), null, null);
}
}
* @param onSuccess
* Action to execute on success
*/
- private void imprt(final String url, final Runnable onSuccess) {
- final Progress pg = new Progress("Importing " + url);
+ private void imprt(final String url, final Runnable onSuccess,
+ String onSuccessPgName) {
+ final Progress pg = new Progress();
+ final Progress pgImprt = new Progress();
+ final Progress pgOnSuccess = new Progress(onSuccessPgName);
+ pg.addProgress(pgImprt, 95);
+ pg.addProgress(pgOnSuccess, 5);
+
outOfUi(pg, new Runnable() {
public void run() {
Exception ex = null;
try {
- Instance.getLibrary().imprt(BasicReader.getUrl(url), pg);
+ Instance.getLibrary().imprt(BasicReader.getUrl(url),
+ pgImprt);
} catch (IOException e) {
ex = e;
}
final Exception e = ex;
final boolean ok = (e == null);
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- if (!ok) {
- Instance.syserr(e);
+
+ pgOnSuccess.setProgress(0);
+ if (!ok) {
+ Instance.syserr(e);
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
JOptionPane.showMessageDialog(
LocalReaderFrame.this, "Cannot import: "
+ url, e.getMessage(),
JOptionPane.ERROR_MESSAGE);
-
- setEnabled(true);
- } else {
- refreshBooks();
- if (onSuccess != null) {
- onSuccess.run();
- refreshBooks();
- }
}
+ });
+ } else {
+ if (onSuccess != null) {
+ onSuccess.run();
}
- });
+ }
+ pgOnSuccess.done();
}
});
}
*/
@Override
public void setEnabled(boolean b) {
- bar.setEnabled(b);
+ if (bar != null) {
+ bar.setEnabled(b);
+ }
+
for (LocalReaderGroup group : booksByType.keySet()) {
group.setEnabled(b);
}
git://git.nikiroo.be / fanfix.git / blobdiff