X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=0205e11489ba783b85102781c93d7932207489eb;hb=d46b7b96f94e88a776bcd2dfd756549ffb300cc9;hp=02f153cdf82d47dc8f2486f7e3a72cff94a75903;hpb=350bc060516184774f8116e61696a8c3c45ba85d;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 02f153c..0205e11 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -9,6 +9,7 @@ import java.io.IOException;
import java.net.URISyntaxException;
import javax.swing.JEditorPane;
+import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.event.HyperlinkEvent;
@@ -16,12 +17,17 @@ import javax.swing.event.HyperlinkListener;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.VersionCheck;
+import be.nikiroo.fanfix.bundles.StringIdGui;
+import be.nikiroo.fanfix.bundles.UiConfig;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.data.Story;
import be.nikiroo.fanfix.library.BasicLibrary;
import be.nikiroo.fanfix.library.CacheLibrary;
import be.nikiroo.fanfix.reader.BasicReader;
import be.nikiroo.fanfix.reader.Reader;
+import be.nikiroo.fanfix.searchable.BasicSearchable;
+import be.nikiroo.fanfix.searchable.SearchableTag;
+import be.nikiroo.fanfix.supported.SupportType;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.ui.UIUtils;
@@ -106,18 +112,22 @@ class GuiReader extends BasicReader {
@Override
public void browse(String type) {
+ final Boolean[] done = new Boolean[] { false };
+
// TODO: improve presentation of update message
final VersionCheck updates = VersionCheck.check();
StringBuilder builder = new StringBuilder();
- final Boolean[] done = new Boolean[] { false };
final JEditorPane updateMessage = new JEditorPane("text/html", "");
if (updates.isNewVersionAvailable()) {
- builder.append("A new version of the program is available at https://github.com/nikiroo/fanfix/releases");
+ builder.append(trans(StringIdGui.NEW_VERSION_AVAILABLE,
+ "https://github.com/nikiroo/fanfix/releases"));
builder.append("
");
builder.append("
");
for (Version v : updates.getNewer()) {
- builder.append("\tVersion " + v + "");
+ builder.append("\t"
+ + trans(StringIdGui.NEW_VERSION_VERSION, v.toString())
+ + "");
builder.append("
");
builder.append("
- * Asynchronous method. * * @param luid * the luid of the {@link Story} to open @@ -264,14 +331,53 @@ class GuiReader extends BasicReader { * in case of I/O errors */ void read(String luid, boolean sync, Progress pg) throws IOException { - File file = cacheLib.getFile(luid, pg); + MetaData meta = cacheLib.getInfo(luid); + + boolean textInternal = Instance.getUiConfig().getBoolean( + UiConfig.NON_IMAGES_DOCUMENT_USE_INTERNAL_READER, true); + boolean imageInternal = Instance.getUiConfig().getBoolean( + UiConfig.IMAGES_DOCUMENT_USE_INTERNAL_READER, true); - // TODO: show a special page for the chapter? - // We could also implement an internal viewer, both for image and - // non-image documents - openExternal(getLibrary().getInfo(luid), file, sync); + boolean useInternalViewer = true; + if (meta.isImageDocument() && !imageInternal) { + useInternalViewer = false; + } + if (!meta.isImageDocument() && !textInternal) { + useInternalViewer = false; + } + + if (useInternalViewer) { + GuiReaderViewer viewer = new GuiReaderViewer(cacheLib, + cacheLib.getStory(luid, null)); + if (sync) { + sync(viewer); + } else { + viewer.setVisible(true); + } + } else { + File file = cacheLib.getFile(luid, pg); + openExternal(meta, file, sync); + } } + + /** + * "Prefetch" the given {@link Story}. + *
+ * Synchronous method. + * + * @param luid + * the luid of the {@link Story} to prefetch + * @param pg + * the optional progress (we may need to prepare the + * {@link Story} for reading + * + * @throws IOException + * in case of I/O errors + */ + void prefetch(String luid, Progress pg) throws IOException { + cacheLib.getFile(luid, pg); + } /** * Change the source of the given {@link Story} (the source is the main * information used to group the stories together). @@ -292,4 +398,102 @@ class GuiReader extends BasicReader { Instance.getTraceHandler().error(e); } } + + /** + * Change the title of the given {@link Story}. + * + * @param luid + * the luid of the {@link Story} to change + * @param newTitle + * the new title + */ + void changeTitle(String luid, String newTitle) { + try { + cacheLib.changeTitle(luid, newTitle, null); + } catch (IOException e) { + Instance.getTraceHandler().error(e); + } + } + + /** + * Change the author of the given {@link Story}. + *
+ * The author can be a new one, it needs not exist before hand. + * + * @param luid + * the luid of the {@link Story} to change + * @param newAuthor + * the new author + */ + void changeAuthor(String luid, String newAuthor) { + try { + cacheLib.changeAuthor(luid, newAuthor, null); + } catch (IOException e) { + Instance.getTraceHandler().error(e); + } + } + + /** + * Simple shortcut method to call {link Instance#getTransGui()#getString()}. + * + * @param id + * the ID to translate + * + * @return the translated result + */ + static String trans(StringIdGui id, Object... params) { + return Instance.getTransGui().getString(id, params); + } + + /** + * Start a frame and wait until it is closed before returning. + * + * @param frame + * the frame to start + */ + static private void sync(final JFrame frame) { + if (EventQueue.isDispatchThread()) { + throw new IllegalStateException( + "Cannot call a sync method in the dispatch thread"); + } + + final Boolean[] done = new Boolean[] { false }; + try { + Runnable run = new Runnable() { + @Override + public void run() { + try { + frame.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + super.windowClosing(e); + done[0] = true; + } + }); + + frame.setVisible(true); + } catch (Exception e) { + done[0] = true; + } + } + }; + + if (EventQueue.isDispatchThread()) { + run.run(); + } else { + EventQueue.invokeLater(run); + } + } catch (Exception e) { + Instance.getTraceHandler().error(e); + done[0] = true; + } + + // This action must be synchronous, so wait until the frame is closed + while (!done[0]) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + } + } + } }