Version 1.4.2

[fanfix.git] / src / be / nikiroo / fanfix / reader / LocalReaderFrame.java

diff --git a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
index 58c75963d2940e72c856b5a93e34bd83d1a05e01..bb77655b7734c48c05ecf6eb4458662bbcdeb1fd 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
+++ b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java
@@ -116,13 +116,23 @@ class LocalReaderFrame extends JFrame {
                        }
                });
 
-               setJMenuBar(createMenu());
-
                booksByType = new HashMap<LocalReaderGroup, String>();
                booksByAuthor = new HashMap<LocalReaderGroup, String>();
 
-               addBookPane(type, true);
-               refreshBooks();
+               pane.setVisible(false);
+               final Progress pg = new Progress();
+               final String typeF = type;
+               outOfUi(pg, new Runnable() {
+                       public void run() {
+                               Instance.getLibrary().refresh(pg);
+                               invalidate();
+                               setJMenuBar(createMenu());
+                               addBookPane(typeF, true);
+                               refreshBooks();
+                               validate();
+                               pane.setVisible(true);
+                       }
+               });
 
                setVisible(true);
        }
@@ -638,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();
@@ -735,7 +745,7 @@ class LocalReaderFrame extends JFrame {
                                                onSuccess.run();
                                        }
                                }
-                               pgOnSuccess.setProgress(100);
+                               pgOnSuccess.done();
                        }
                });
        }
@@ -753,7 +763,10 @@ class LocalReaderFrame extends JFrame {
         */
        @Override
        public void setEnabled(boolean b) {
-               bar.setEnabled(b);
+               if (bar != null) {
+                       bar.setEnabled(b);
+               }
+
                for (LocalReaderGroup group : booksByType.keySet()) {
                        group.setEnabled(b);
                }