From 5ce869b82f28c4d288b266d7dee03aa4898fff21 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sun, 12 Mar 2017 19:54:33 +0100 Subject: [PATCH] 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 --- README.md | 4 ++-- VERSION | 2 +- changelog.md | 4 +++- ...es.jar => nikiroo-utils-1.4.1-sources.jar} | Bin 55389 -> 56418 bytes src/be/nikiroo/fanfix/Library.java | 7 +------ .../fanfix/reader/LocalReaderFrame.java | 6 +++--- 6 files changed, 10 insertions(+), 13 deletions(-) rename libs/{nikiroo-utils-1.4.0-sources.jar => nikiroo-utils-1.4.1-sources.jar} (87%) diff --git a/README.md b/README.md index 14e4347e..d9c47e36 100644 --- 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? -- [ ] 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 @@ -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 - - [ ] options screen + - [x] options screen - [ ] 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 347f5833..9df886c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.1 +1.4.2 diff --git a/changelog.md b/changelog.md index 1aa90a1e..598fbcd4 100644 --- a/changelog.md +++ b/changelog.md @@ -1,8 +1,10 @@ # Fanfix -## Version (wip) +## 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 ## 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 GIT binary patch delta 4233 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 bP)*N&XHEfYRCN${-wEnZi=7H0{#p1Rexv)g diff --git a/src/be/nikiroo/fanfix/Library.java b/src/be/nikiroo/fanfix/Library.java index 69b497fd..bc9a4da4 100644 --- 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 { - 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 ca494704..bb77655b 100644 --- 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(); - reload.setProgress(100); + reload.done(); if (!pg.isDone()) { // will trigger pgBar ActionListener: - pg.setProgress(pg.getMax()); + pg.done(); } } }, "outOfUi thread").start(); @@ -745,7 +745,7 @@ class LocalReaderFrame extends JFrame { onSuccess.run(); } } - pgOnSuccess.setProgress(100); + pgOnSuccess.done(); } }); } -- 2.27.0