X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=0205e11489ba783b85102781c93d7932207489eb;hb=9892fdaafb368227aa9630ab3abe6ed10bb1d001;hp=576ac9cc80191c492e2e50572568ec0eaa79d9b7;hpb=16a81ef7656c5c692fb831927e75edde25dd77a0;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 576ac9c..0205e11 100644 --- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java +++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java @@ -2,11 +2,14 @@ package be.nikiroo.fanfix.reader.ui; import java.awt.Desktop; import java.awt.EventQueue; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.File; 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; @@ -14,15 +17,32 @@ 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; +/** + * This class implements a graphical {@link Reader} using the Swing library from + * Java. + *
+ * It can thus be themed to look native-like, or metal-like, or use any other + * theme you may want to try. + *
+ * We actually try to enable native look-alike mode on start.
+ *
+ * @author niki
+ */
class GuiReader extends BasicReader {
static private boolean nativeLookLoaded;
@@ -30,7 +50,14 @@ class GuiReader extends BasicReader {
private File cacheDir;
+ /**
+ * Create a new graphical {@link Reader}.
+ *
+ * @throws IOException
+ * in case of I/O errors
+ */
public GuiReader() throws IOException {
+ // TODO: allow different themes?
if (!nativeLookLoaded) {
UIUtils.setLookAndFeel();
nativeLookLoaded = true;
@@ -60,14 +87,14 @@ class GuiReader extends BasicReader {
}
@Override
- public void read() throws IOException {
+ public void read(boolean sync) throws IOException {
MetaData meta = getMeta();
if (meta == null) {
throw new IOException("No story to read");
}
- read(meta.getLuid(), null);
+ read(meta.getLuid(), sync, null);
}
/**
@@ -85,17 +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 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("
+ * The next time we try to retrieve the {@link Story}, it may be required to + * cache it again. + * + * @param luid + * the luid of the {@link Story} + */ void clearLocalReaderCache(String luid) { try { cacheLib.clearFromCache(luid); @@ -170,7 +297,15 @@ class GuiReader extends BasicReader { } } - // delete from main library + /** + * Forward the delete operation to the main library. + *
+ * The {@link Story} will be deleted from the main library as well as the + * cache if present. + * + * @param luid + * the {@link Story} to delete + */ void delete(String luid) { try { cacheLib.delete(luid); @@ -179,19 +314,186 @@ class GuiReader extends BasicReader { } } - // open the given book - void read(String luid, Progress pg) throws IOException { - File file = cacheLib.getFile(luid, pg); + /** + * "Open" the given {@link Story}. It usually involves starting an external + * program adapted to the given file type. + * + * @param luid + * the luid of the {@link Story} to open + * @param sync + * execute the process synchronously (wait until it is terminated + * before returning) + * @param pg + * the optional progress (we may need to prepare the + * {@link Story} for reading + * + * @throws IOException + * in case of I/O errors + */ + void read(String luid, boolean sync, Progress pg) throws IOException { + MetaData meta = cacheLib.getInfo(luid); - // TODO: show a special page for the chapter? - openExternal(getLibrary().getInfo(luid), file); + 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); + + 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); + } } - void changeType(String luid, String newSource) { + + /** + * "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). + *
+ * In other words, move the {@link Story} into other source. + *
+ * The source can be a new one, it needs not exist before hand. + * + * @param luid + * the luid of the {@link Story} to move + * @param newSource + * the new source + */ + void changeSource(String luid, String newSource) { try { cacheLib.changeSource(luid, newSource, null); } catch (IOException e) { 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) { + } + } + } }