Version 1.4.2

- New Options menu in UI to configure the program (minimalist for now)
- Improve progress reporting (smoother updates, more details)
- Better cover support for local files

diff --git a/README.md b/README.md
index 14e4347e185f7649478463d6aea0d00686c65801..d9c47e36f95a205a9349ca04ff00da0f0db59a3b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ Currently missing, but either in progress or planned:
   - [ ] [Two Kinds](http://twokinds.keenspot.com/)
   - [ ] [Slightly damned](http://www.sdamned.com/)
   - [ ] Others? Any ideas?
   - [ ] [Two Kinds](http://twokinds.keenspot.com/)
   - [ ] [Slightly damned](http://www.sdamned.com/)
   - [ ] Others? Any ideas?

-- [ ] A GUI (work in progress)
+- [x] A GUI (work in progress)

   - [x] Make one
   - [x] Make it run when no args passed
   - [x] Fix the UI, it is ugly
   - [x] Make one
   - [x] Make it run when no args passed
   - [x] Fix the UI, it is ugly


@@ -108,7 +108,7 @@ Currently missing, but either in progress or planned:
   - [x] Show a list of types
     - [x] ..in the menu
     - [x] ..as a screen view
   - [x] Show a list of types
     - [x] ..in the menu
     - [x] ..as a screen view

-  - [ ] options screen
+  - [x] options screen

 - [ ] A TUI reader
 - [ ] Check if it can work on Android
   - [x] First checks: it should work, but with changes
 - [ ] A TUI reader
 - [ ] Check if it can work on Android
   - [x] First checks: it should work, but with changes

diff --git a/VERSION b/VERSION
index 347f5833ee6db7495cce808040501bf2c96269a9..9df886c42a1e2082f1471383d986fea4d531f8ac 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.1
+1.4.2

diff --git a/changelog.md b/changelog.md
index 1aa90a1ec713777f9c364fa1c19a0f9dcaa6a8aa..598fbcd4dc4407bbe5a18e54f74084f21b8c563c 100644 (file)
--- a/changelog.md
+++ b/changelog.md
@@ -1,8 +1,10 @@
 # Fanfix
 
 # Fanfix
 

-## Version (wip)
+## Version 1.4.2

 
 - New Options menu in UI to configure the program (minimalist for now)
 
 - New Options menu in UI to configure the program (minimalist for now)

+- Improve progress reporting (smoother updates, more details)
+- Better cover support for local files

 
 ## Version 1.4.1
 
 
 ## Version 1.4.1
 

diff --git a/libs/nikiroo-utils-1.4.0-sources.jar b/libs/nikiroo-utils-1.4.1-sources.jar
similarity index 87%
rename from libs/nikiroo-utils-1.4.0-sources.jar
rename to libs/nikiroo-utils-1.4.1-sources.jar
index afb2819a856244fcc6d3e1799fe0c0503dc0593b..721f7931413d53bac2dd29f125d5f6708f6bc1b5 100644 (file)
Binary files a/libs/nikiroo-utils-1.4.0-sources.jar and b/libs/nikiroo-utils-1.4.1-sources.jar differ

diff --git a/src/be/nikiroo/fanfix/Library.java b/src/be/nikiroo/fanfix/Library.java
index 69b497fd84f1730feda48aae6fab96b02a76d74c..bc9a4da4532d5787ac4b29a82dcf7a07cf0edbac 100644 (file)
--- a/src/be/nikiroo/fanfix/Library.java
+++ b/src/be/nikiroo/fanfix/Library.java
@@ -527,12 +527,7 @@ public class Library {
                                                                "Cannot load file from library: "
                                                                                + file.getPath(), e));
                                        } finally {
                                                                "Cannot load file from library: "
                                                                                + file.getPath(), e));
                                        } finally {

-                                               pgFiles.setProgress(pgFiles.getProgress() + 1);
-
-                                               System.out.println("files: " + pgFiles.getProgress()
-                                                               + "/" + pgFiles.getMax());
-                                               System.out.println("dirs : " + pgDirs.getProgress()
-                                                               + "/" + pgDirs.getMax());
+                                               pgFiles.add(1);

                                        }
                                }
 
                                        }
                                }
 

diff --git a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
index ca49470476c50581d44242d87a4cb2cdd46fa4b9..bb77655b7734c48c05ecf6eb4458662bbcdeb1fd 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
+++ b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
@@ -648,10 +648,10 @@ class LocalReaderFrame extends JFrame {
                        public void run() {
                                run.run();
                                refreshBooks();
                        public void run() {
                                run.run();
                                refreshBooks();

-                               reload.setProgress(100);
+                               reload.done();

                                if (!pg.isDone()) {
                                        // will trigger pgBar ActionListener:
                                if (!pg.isDone()) {
                                        // will trigger pgBar ActionListener:

-                                       pg.setProgress(pg.getMax());
+                                       pg.done();

                                }
                        }
                }, "outOfUi thread").start();
                                }
                        }
                }, "outOfUi thread").start();


@@ -745,7 +745,7 @@ class LocalReaderFrame extends JFrame {
                                                onSuccess.run();
                                        }
                                }
                                                onSuccess.run();
                                        }
                                }

-                               pgOnSuccess.setProgress(100);
+                               pgOnSuccess.done();

                        }
                });
        }
                        }
                });
        }