X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=a02cc84f558892bfa4f055db720cda8db8c21097;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=f97ffddd48a08cf8317d5adbdca682d754796d72;hpb=32ba91e9d2443ac9d17d3db66eef4c570d02cdf1;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 f97ffdd..a02cc84 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -17,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;
@@ -58,7 +63,7 @@ class GuiReader extends BasicReader {
nativeLookLoaded = true;
}
- cacheDir = Instance.getReaderDir();
+ cacheDir = Instance.getInstance().getReaderDir();
cacheDir.mkdirs();
if (!cacheDir.exists()) {
throw new IOException(
@@ -74,7 +79,7 @@ class GuiReader extends BasicReader {
if (lib instanceof CacheLibrary) {
cacheLib = (CacheLibrary) lib;
} else {
- cacheLib = new CacheLibrary(cacheDir, lib);
+ cacheLib = new CacheLibrary(cacheDir, lib, Instance.getInstance().getUiConfig());
}
}
@@ -115,11 +120,14 @@ class GuiReader extends BasicReader {
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 @@ -266,23 +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.getInstance().getUiConfig() + .getBoolean(UiConfig.NON_IMAGES_DOCUMENT_USE_INTERNAL_READER, true); + boolean imageInternal = Instance.getInstance().getUiConfig() + .getBoolean(UiConfig.IMAGES_DOCUMENT_USE_INTERNAL_READER, true); - GuiReaderViewer viewer = new GuiReaderViewer(cacheLib, - cacheLib.getStory(luid, null)); + boolean useInternalViewer = true; + if (meta.isImageDocument() && !imageInternal) { + useInternalViewer = false; + } + if (!meta.isImageDocument() && !textInternal) { + useInternalViewer = false; + } - // TODO: testing internal story viewer: - if (false) { + if (useInternalViewer) { + GuiReaderViewer viewer = new GuiReaderViewer(cacheLib, + cacheLib.getStory(luid, null)); if (sync) { sync(viewer); } else { viewer.setVisible(true); } } else { - openExternal(getLibrary().getInfo(luid), file, sync); + 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). @@ -300,7 +395,7 @@ class GuiReader extends BasicReader { try { cacheLib.changeSource(luid, newSource, null); } catch (IOException e) { - Instance.getTraceHandler().error(e); + Instance.getInstance().getTraceHandler().error(e); } } @@ -316,7 +411,7 @@ class GuiReader extends BasicReader { try { cacheLib.changeTitle(luid, newTitle, null); } catch (IOException e) { - Instance.getTraceHandler().error(e); + Instance.getInstance().getTraceHandler().error(e); } } @@ -334,10 +429,22 @@ class GuiReader extends BasicReader { try { cacheLib.changeAuthor(luid, newAuthor, null); } catch (IOException e) { - Instance.getTraceHandler().error(e); + Instance.getInstance().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.getInstance().getTransGui().getString(id, params); + } + /** * Start a frame and wait until it is closed before returning. * @@ -377,7 +484,7 @@ class GuiReader extends BasicReader { EventQueue.invokeLater(run); } } catch (Exception e) { - Instance.getTraceHandler().error(e); + Instance.getInstance().getTraceHandler().error(e); done[0] = true; }