X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FLocalReaderFrame.java;h=bb77655b7734c48c05ecf6eb4458662bbcdeb1fd;hp=a90360eed234bde1c99349844d687b02832bf70a;hb=5ce869b82f28c4d288b266d7dee03aa4898fff21;hpb=793f1071fae48daed3b545a03a286c85e527d244 diff --git a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java index a90360e..bb77655 100644 --- a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java +++ b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java @@ -34,6 +34,7 @@ import javax.swing.filechooser.FileNameExtensionFilter; 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; @@ -41,6 +42,7 @@ import be.nikiroo.fanfix.output.BasicOutput.OutputType; 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; /** @@ -97,13 +99,40 @@ class LocalReaderFrame extends JFrame { 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(); booksByAuthor = new HashMap(); - 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); } @@ -185,8 +214,6 @@ class LocalReaderFrame extends JFrame { /** * 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()) { @@ -325,9 +352,65 @@ class LocalReaderFrame extends JFrame { 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 ed = new ConfigEditor( + 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 ed = new ConfigEditor( + 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. * @@ -427,7 +510,8 @@ class LocalReaderFrame extends JFrame { 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() { @@ -453,12 +537,13 @@ class LocalReaderFrame extends JFrame { 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"); } } }); @@ -480,11 +565,6 @@ class LocalReaderFrame extends JFrame { public void run() { reader.delete(selectedBook.getMeta().getLuid()); selectedBook = null; - SwingUtilities.invokeLater(new Runnable() { - public void run() { - refreshBooks(); - } - }); } }); } @@ -549,31 +629,32 @@ class LocalReaderFrame extends JFrame { * @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(); } /** @@ -612,7 +693,7 @@ class LocalReaderFrame extends JFrame { } if (url != null && !url.toString().isEmpty()) { - imprt(url.toString(), null); + imprt(url.toString(), null, null); } } @@ -626,13 +707,20 @@ class LocalReaderFrame extends JFrame { * @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; } @@ -640,25 +728,24 @@ class LocalReaderFrame extends JFrame { 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(); } }); } @@ -676,7 +763,10 @@ class LocalReaderFrame extends JFrame { */ @Override public void setEnabled(boolean b) { - bar.setEnabled(b); + if (bar != null) { + bar.setEnabled(b); + } + for (LocalReaderGroup group : booksByType.keySet()) { group.setEnabled(b); }