screenshots

diff --git a/README-fr.md b/README-fr.md
index b366a9edff1743a1b2442c99b49d2d737d7a7d76..4d1cd53becc3aabd460fd51ef3e5f2f59ca2b2d9 100644 (file)
--- a/README-fr.md
+++ b/README-fr.md
@@ -7,12 +7,13 @@ Fanfix-swing est un programme qui offre une interface graphique (en java Swing)
 ## Synopsis
 
 - ```fanfix-swing```
+- ```fanfix-swing [...]``` (options [Fanfix](https://github.com/nikiroo/fanfix))
 
 ## Description
 
 (Si vous voulez juste voir les derniers changements, vous pouvez regarder le [Changelog](changelog-fr.md) -- remarquez que le programme affiche le changelog si une version plus récente est détectée depuis la version x.x.x.)
 
-![Main GUI](screenshots/fanfix-x.x.x.png?raw=true "Main GUI")
+![Main GUI](screenshots/fanfix-swing.png?raw=true "Fenêtre principale")
 
 Une gallerie de screenshots est disponible [ici](screenshots/README-fr.md).
 

diff --git a/README.md b/README.md
index 4ecac6e48c442efee1cd862042925073bd885c93..a0f12f1b0cdf0d903497f0e2748b4d3584eb3d7c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -7,12 +7,13 @@ Fanfix-swing is a program that offer you a graphical nterface (in java Swing) ar
 ## Synopsis
 
 - ```fanfix-swing```
+- ```fanfix-swing [...]``` ([Fanfix](https://github.com/nikiroo/fanfix) options)
 
 ## Description
 
 (If you are interested in the recent changes, please check the [Changelog](changelog.md) -- note that starting from version x.x.x, the changelog is checked at startup.)
 
-![Main GUI](screenshots/fanfix-x.x.x.png?raw=true "Main GUI")
+![Main GUI](screenshots/fanfix-swing.png?raw=true "Main window")
 
 A screenshots gallery can be found [here](screenshots/README.md).
 

diff --git a/screenshots/README-fr.md b/screenshots/README-fr.md
index 61a4fb015bdb8f62c0381f60c2789dc6cfbc413d..9d8f0fcd511be9cf9c24618cc8066bd41398aac0 100644 (file)
--- a/screenshots/README-fr.md
+++ b/screenshots/README-fr.md
@@ -4,17 +4,39 @@
 
 Cette gallerie reprend des screenshots de plusieurs versions de Fanfix, mais les versions les plus récentes sont affichées en premier.
 
-TODO: update with screenshots from fanfix-swing!!
+### Version 1.1.0
 
-### Version 2.0.0
+![Fenêtre principale](fanfix-swing-1.1.0.png)
 
-![Fenêtre principale](fanfix-swing-2.0.0-gui-library.png)
+La fenêtre principale du programme.
 
-![Propriétés d'une histoire](fanfix-swing-2.0.0-gui-properties.png)
+![Popup](fanfix-swing-1.1.0-popup.png)
 
-![Menu](fanfix-swing-2.0.0-gui-menu.png)
+Un nouveau système de popups affiche les informations relatives à l'histoire sous le curseur de la souris.
 
-### Version 1.3.2
+![Nombre de mots](fanfix-swing-1.1.0-wordcount.png)
 
-![Fenêtre principale](fanfix-swing-1.3.2.png)
+Il est maintenant possible d'afficher le nombre de mots (ou d'images) d'une histoire à la place de son auteur.
+
+### Version 1.0.0
+
+![Fenêtre principale](fanfix-swing-1.0.0.png)
+
+La fenêtre principale du programme.
+
+![Menu contextuel](fanfix-swing-1.0.0-menu.png)
+
+Le menu contextuel qui apparaît avec le bouton droit de la souris.
+
+![Mode liste](fanfix-swing-1.0.0-list-mode.png)
+
+Il est possible d'afficher les livres sous forme de liste au lieu d'afficher des vignettes, ce qui est plus facile à lire quand il y a beaucoup de livres.
+
+![Propriétés d'un livre](fanfix-swing-1.0.0-properties-page.png)
+
+La fenêtre de propriétés d'un live.
+
+![Filtre](fanfix-swing-1.0.0-filter.png)
+
+On peut filtrer les livres affichés ou les sources/auteurs/tags affichés en temps réél.
 

diff --git a/screenshots/README.md b/screenshots/README.md
index 8085247c5ccc4153304c463b944913cf62cbdc56..e9a955905242724bec7a958f0fdffab5366594ca 100644 (file)
--- a/screenshots/README.md
+++ b/screenshots/README.md
@@ -4,17 +4,39 @@
 
 This screenshots gallery shows screenshots of different versions of Fanfix, but shows the more recent ones on top.
 
-TODO: update with screenshots from fanfix-swing!!
+### Version 1.1.0
 
-### Version 2.0.0
+![Main window](fanfix-swing-1.1.0.png)
 
-![Main window](fanfix-swing-2.0.0-gui-library.png)
+The main window of the program.
 
-![Properties page](fanfix-swing-2.0.0-gui-properties.png)
+![Popup](fanfix-swing-1.1.0-popup.png)
 
-![Menu](fanfix-swing-2.0.0-gui-menu.png)
+A new popup system displays the metadata related to the book under the mouse.
 
-### Version 1.3.2
+![Word count](fanfix-swing-1.1.0-wordcount.png)
 
-![Main window](fanfix-swing-1.3.2.png)
+It is now possible to show the numbe of words (or images) of a book instead of its author.
+
+### Version 1.0.0
+
+![Main window](fanfix-swing-1.0.0.png)
+
+The main window of the program.
+
+![Contextual menu](fanfix-swing-1.0.0-menu.png)
+
+The contextual menu that appears on right-click.
+
+![List mode](fanfix-swing-1.0.0-list-mode.png)
+
+It is possible to display the books as a list instead of thumbnails, so it is easier to browse when there are many books.
+
+![Properties page](fanfix-swing-1.0.0-properties-page.png)
+
+The properties page of a book.
+
+![Filter](fanfix-swing-1.0.0-filter.png)
+
+It is possible to filter the books or the sources/authors/tags in real time.
 

diff --git a/screenshots/fanfix-swing-1.0.0-filter.png b/screenshots/fanfix-swing-1.0.0-filter.png
new file mode 100644 (file)
index 0000000..15686a5
Binary files /dev/null and b/screenshots/fanfix-swing-1.0.0-filter.png differ

diff --git a/screenshots/fanfix-swing-1.0.0-list-mode.png b/screenshots/fanfix-swing-1.0.0-list-mode.png
new file mode 100644 (file)
index 0000000..402b818
Binary files /dev/null and b/screenshots/fanfix-swing-1.0.0-list-mode.png differ

diff --git a/screenshots/fanfix-swing-1.0.0-menu.png b/screenshots/fanfix-swing-1.0.0-menu.png
new file mode 100644 (file)
index 0000000..29f033d
Binary files /dev/null and b/screenshots/fanfix-swing-1.0.0-menu.png differ

diff --git a/screenshots/fanfix-swing-1.0.0-propeties-page.png b/screenshots/fanfix-swing-1.0.0-propeties-page.png
new file mode 100644 (file)
index 0000000..08bb91a
Binary files /dev/null and b/screenshots/fanfix-swing-1.0.0-propeties-page.png differ

diff --git a/screenshots/fanfix-swing-1.0.0.png b/screenshots/fanfix-swing-1.0.0.png
new file mode 100644 (file)
index 0000000..a76d4ad
Binary files /dev/null and b/screenshots/fanfix-swing-1.0.0.png differ

diff --git a/screenshots/fanfix-swing-1.1.0-popup.png b/screenshots/fanfix-swing-1.1.0-popup.png
new file mode 100644 (file)
index 0000000..291ba60
Binary files /dev/null and b/screenshots/fanfix-swing-1.1.0-popup.png differ

diff --git a/screenshots/fanfix-swing-1.1.0-propeties-page.png b/screenshots/fanfix-swing-1.1.0-propeties-page.png
new file mode 100644 (file)
index 0000000..acaf5c2
Binary files /dev/null and b/screenshots/fanfix-swing-1.1.0-propeties-page.png differ

diff --git a/screenshots/fanfix-swing-1.1.0-wordcount.png b/screenshots/fanfix-swing-1.1.0-wordcount.png
new file mode 100644 (file)
index 0000000..0d077a1
Binary files /dev/null and b/screenshots/fanfix-swing-1.1.0-wordcount.png differ

diff --git a/screenshots/fanfix-swing-1.1.0.png b/screenshots/fanfix-swing-1.1.0.png
new file mode 100644 (file)
index 0000000..f642940
Binary files /dev/null and b/screenshots/fanfix-swing-1.1.0.png differ

diff --git a/screenshots/fanfix-swing.png b/screenshots/fanfix-swing.png
new file mode 100644 (file)
index 0000000..f642940
Binary files /dev/null and b/screenshots/fanfix-swing.png differ