From: Niki Roo <niki@nikiroo.be>
Date: Sun, 19 May 2019 13:37:53 +0000 (+0200)
Subject: GUI: improve config + changelog
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=f59eafefdd1484e2b0940713cd46205154ad3a0c;p=nikiroo-utils.git

GUI: improve config + changelog
---

diff --git a/changelog-fr.md b/changelog-fr.md
index 8980fad..0a80ab9 100644
--- a/changelog-fr.md
+++ b/changelog-fr.md
@@ -2,16 +2,24 @@
 
 # Version WIP
 
-- new: recherche d'histoires (Fanfiction.net)
+- new: maintenant compatible Android (voir [companion project](https://gitlab.com/Rayman22/fanfix-android))
+- new: recherche d'histoires (pas encore toutes les sources)
 - new: support d'un proxy
 - fix: support des CBZ contenant du texte
 - fix: correction de DEBUG=0
 - gui: correction pour le focus 
+- gui: fix pour la couleur d'arrière plan
+- gui: fix pour la navigation au clavier (haut et bas)
+- gui: configuration beaucoup plus facile
 - MangaLEL: site web changé
 - search: supporte MangaLEL
+- search: supporte Fanfiction.net
+- FimFictionAPI: correction d'une NPE
 - remote: changement du chiffrement because Google
 - remote: incompatible avec 2.x
-- remote: perfs et utilisation de la mémoire améliorées
+- remote: moins bonnes perfs mais meilleure utilisation de la mémoire
+- remote: le log inclus maintenant la date des évènements
+- remote: le mot de passe se configure maintenant dans le fichier de configuration
 
 # Version 2.0.2
 
diff --git a/changelog.md b/changelog.md
index a82e8b3..99380f7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,7 +2,7 @@
 
 # Version WIP
 
-- new: now android-compatible (see [companion project](https://gitlab.com/Rayman22/fanfix-android))
+- new: now Android-compatible (see [companion project](https://gitlab.com/Rayman22/fanfix-android))
 - new: story search (not all sources yet)
 - new: proxy support
 - fix: support hybrid CBZ (with text)
@@ -10,6 +10,7 @@
 - gui: focus fix
 - gui: bg colour fix
 - gui: fix keyboard navigation support (up and down)
+- gui: configuration is now much easier
 - MangaLEL: website has changed
 - search: Fanfiction.net support
 - search: MangaLEL support
diff --git a/libs/nikiroo-utils-4.7.2-dev-sources.jar b/libs/nikiroo-utils-4.7.2-dev-sources.jar
index 74f4387..cd1504c 100644
Binary files a/libs/nikiroo-utils-4.7.2-dev-sources.jar and b/libs/nikiroo-utils-4.7.2-dev-sources.jar differ
diff --git a/src/be/nikiroo/fanfix/bundles/Config.java b/src/be/nikiroo/fanfix/bundles/Config.java
index 35f63d6..70bf322 100644
--- a/src/be/nikiroo/fanfix/bundles/Config.java
+++ b/src/be/nikiroo/fanfix/bundles/Config.java
@@ -75,7 +75,10 @@ public enum Config {
 	@Meta(description = "If the last update check was done at least that many days, check for updates at startup (-1 for 'no checks' -- default is 1 day)", format = Format.INT)
 	UPDATE_INTERVAL, //
 	@Meta(def = "", description = "", info = "Format is ((user(:pass)@)proxy:port), with ':' being system proxy and an empty String being no proxy")
-	USE_PROXY, @Meta(description = "An API key required to create a token from FimFiction", format = Format.STRING)
+	USE_PROXY, //
+	@Meta(group = true, description = "FimFiction APIKEY credentials\nFimFiction can be queried via an API, but requires an API key to do that. One has been created for this program, but if you have another API key you can set it here. You can also set a login and password instead, in that case, a new API key will be generated (and stored) if you still haven't set one.")
+	LOGIN_FIMFICTION_APIKEY, //
+	@Meta(description = "An API key required to create a token from FimFiction", format = Format.STRING)
 	LOGIN_FIMFICTION_APIKEY_CLIENT_ID, //
 	@Meta(description = "An API key required to create a token from FimFiction", format = Format.PASSWORD)
 	LOGIN_FIMFICTION_APIKEY_CLIENT_SECRET, //
diff --git a/src/be/nikiroo/fanfix/bundles/config.properties b/src/be/nikiroo/fanfix/bundles/config.properties
index 63b7642..d03fc61 100644
--- a/src/be/nikiroo/fanfix/bundles/config.properties
+++ b/src/be/nikiroo/fanfix/bundles/config.properties
@@ -94,6 +94,9 @@ LOGIN_YIFFSTAR_PASS =
 UPDATE_INTERVAL = 
 #  (FORMAT: STRING) Format is ((user(:pass)@)proxy:port), with ':' being system proxy and an empty String being no proxy
 USE_PROXY = 
+# FimFiction APIKEY credentials
+#This item is used as a group, its content is not expected to be used.
+LOGIN_FIMFICTION_APIKEY = 
 # An API key required to create a token from FimFiction
 # (FORMAT: STRING) 
 LOGIN_FIMFICTION_APIKEY_CLIENT_ID = 
diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderNavBar.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderNavBar.java
index 099b3c8..fb726bb 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderNavBar.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderNavBar.java
@@ -57,6 +57,10 @@ public class GuiReaderNavBar extends JPanel {
 		LayoutManager layout = new BoxLayout(this, BoxLayout.X_AXIS);
 		setLayout(layout);
 
+		// TODO:
+		// JButton up = new BasicArrowButton(BasicArrowButton.NORTH);
+		// JButton down = new BasicArrowButton(BasicArrowButton.SOUTH);
+
 		navButtons = new JButton[4];
 
 		navButtons[0] = createNavButton("<<", new ActionListener() {
diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java
index 724f552..11f1d38 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderViewerPanel.java
@@ -16,6 +16,7 @@ import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 import javax.swing.JScrollPane;
 import javax.swing.SwingConstants;
+import javax.swing.plaf.basic.BasicArrowButton;
 
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.StringIdGui;
@@ -83,6 +84,10 @@ public class GuiReaderViewerPanel extends JPanel {
 				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 		scroll.getVerticalScrollBar().setUnitIncrement(16);
 
+		// TODO:
+		// JButton up = new BasicArrowButton(BasicArrowButton.NORTH);
+		// JButton down = new BasicArrowButton(BasicArrowButton.SOUTH);
+
 		if (!imageDocument) {
 			add(scroll, BorderLayout.CENTER);
 		} else {