X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=2ca61919cc5adb1aa714f3618e38e7b7f3f85bfb;hb=cebf0288417d0d556ecc2d9bf73a500efe5b6470;hp=aed0a921e42c867dd7c879abf93626b42a19337c;hpb=7a3eb29f983ead2aa175db281a9ddab79eeabb80;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index aed0a92..2ca6191 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -17,12 +17,15 @@ 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.supported.SupportType;
import be.nikiroo.utils.Progress;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.ui.UIUtils;
@@ -115,11 +118,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("
");
for (String item : updates.getChanges().get(v)) {
@@ -158,7 +164,8 @@ class GuiReader extends BasicReader {
public void run() {
if (updates.isNewVersionAvailable()) {
int rep = JOptionPane.showConfirmDialog(null,
- updateMessage, "Updates available",
+ updateMessage,
+ trans(StringIdGui.NEW_VERSION_TITLE),
JOptionPane.OK_CANCEL_OPTION);
if (rep == JOptionPane.OK_OPTION) {
updates.ok();
@@ -211,6 +218,18 @@ class GuiReader extends BasicReader {
super.start(target, program, sync);
}
}
+
+ @Override
+ public void search(SupportType searchOn, String keywords, int page, int item) {
+ // TODO: !!!
+ throw new java.lang.IllegalStateException("Not implemented yet.");
+ }
+
+ @Override
+ public void searchTag(SupportType searchOn, int page, int item, String... tags) {
+ // TODO: !!!
+ throw new java.lang.IllegalStateException("Not implemented yet.");
+ }
/**
* Delete the {@link Story} from the cache if it is present, but NOT
@@ -266,12 +285,33 @@ 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);
+ }
}
/**
@@ -329,6 +369,18 @@ class GuiReader extends BasicReader {
}
}
+ /**
+ * 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.
*