From 3b2b638f7e1395702f843b5b19d7959327f604b2 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sun, 19 Feb 2017 01:46:02 +0100 Subject: [PATCH] Add progress reporting on GUI --- ...es.jar => nikiroo-utils-1.1.1-sources.jar} | Bin 45056 -> 46014 bytes src/be/nikiroo/fanfix/Library.java | 2 +- src/be/nikiroo/fanfix/Main.java | 37 +---- src/be/nikiroo/fanfix/output/BasicOutput.java | 2 +- src/be/nikiroo/fanfix/reader/BasicReader.java | 32 ++++- src/be/nikiroo/fanfix/reader/LocalReader.java | 2 +- .../fanfix/reader/LocalReaderBook.java | 27 ++-- .../fanfix/reader/LocalReaderFrame.java | 127 +++++++++++++----- .../fanfix/supported/BasicSupport.java | 5 +- src/be/nikiroo/fanfix/supported/Cbz.java | 2 +- src/be/nikiroo/fanfix/supported/E621.java | 2 +- 11 files changed, 153 insertions(+), 85 deletions(-) rename libs/{nikiroo-utils-1.1.0-sources.jar => nikiroo-utils-1.1.1-sources.jar} (74%) diff --git a/libs/nikiroo-utils-1.1.0-sources.jar b/libs/nikiroo-utils-1.1.1-sources.jar similarity index 74% rename from libs/nikiroo-utils-1.1.0-sources.jar rename to libs/nikiroo-utils-1.1.1-sources.jar index f716a6cb2d90b1b9993b8c7a36f8852f8b3a2155..2a6164af1ee44985975a4a5432173c01e82ec388 100644 GIT binary patch delta 7011 zcmZ8mbzGE9*It&E?yjX93F+=`knRwWmK2xnUZqp11?eu4mhJ`t>5>i!`EY%|?|q(c z??0}Yv)4IuesiChd(N4_HQ<*WAclrAJOVxd1qB7LhpwH3Aq4*il!D65)@m)($BG9@aQTMSTWq zJm49@!RV)`jF7@o90-KK2z&#tEES%mtdL81P7`o(C!&N!W3lA&lVz8W=A9um4>Jub*GS|#hQt0$E zP2Q>p0lpZ@w+^R-2|Jf~zTc-~^)M)u{nUPsvTxAp6eJ`+s+G91Glfb611ZTALDCRwR0sZ4LLe}6P+N>X!2vIWv-isM*A zv#If>UACNV%IX77R)KyE}~eUi1S;5&pY6E%DqVU7;(Vx(~I5{ zP#^ccKD!@Z!M8>D1D~Tha2?p_PPK`YXMK?J0l(C9qdK`INy)l^|{ zM<`KeM-Q53lLa+(9!&9Ql14aJ75jPCF}@AIit=;tUGRv%WvcPjhPO|;7ze?GRE;k5WJAYbOivRI ze2xY{c+3QgZ;cNr5O(U0`)#3LCV(gMfn>94f7FC&JxR%i(gxgr~J7POl zNuQWeMH^T6NaudCUIG%ZHY3?M<-cfHLy|YIq5ExY;zPh??K?ou>Q*|Yt7dN{B>gBT zNlkPid;{syX`Z1r%TCqXjyg-bDLUBzH$|XKc;l?&7+?1b-_zVUGr@h2Gz4YTZ*t38 zIOmgEF5@Gc#OQJOg`%bS_76da)D>p zk;$M&T&Z6183y2{cF}At*<#H40gF^O&CscY!dXV_o~EX?(l$7mwc*3M{f65$-wACc zj-$kVoQ}Ew7%Fa~v%s&_mas&(qBHH**rFdA%O37;602{UlMQ^`Gl=Apz)B3WIu6_f z9lu$^uVdbJ?SCglTqtqpwxI?)O0;S9SP!?3x{zzO(_4?t+yR8+6Y|EwCjMzC5 z+==mRs}l?D1v9G29V3i-;t_a&r|x?_>su8YvNZv9J{ma3OliarnrA^wfrVl2`7H3k zd*QB7td=_ZH!QpgB}0BU&T+#-Du#j)Qxm|7J%1N_7oFd~N5EyMo-)H|G$FmHWPS=F zGR%$zOfn7>x6V~5UV`}It`zVMB!sx;{1%7x$|2I}=FjG2qbAQbc+&D`dtpgnfLqU%KjR|(f$gN*mF;Av~bmJdd0 zXmMFfB5jTF=D_$kVJ@%CiJ$Y;c>E@vlIQhB?!B33Vf%zC!z&Vcu>Oc;Ki%0KLkE9a zTxTTrW!10fa}P;cXxRi#Xh2#BK{BFD6V()go#EU$!cU&`bM9EZz#jrdU#~22PKk@; zeq}An^{vyUjuIg{0-#x6Ii*JQ-AM2xg$fo^8=CKQ9w-D zWPQU z9Yh80t8}yAq_<9VCdlVr5P1i*-YYDd5S7@`@#N&zl$er=VDv&Gbwd;~b)yRHx}18# z>=aLby!r}zaWNq`Zmd4WTrqwF4P0G~g`yT?J9m#%Ewo!=XALE;UX}}h=Zf-`N0-cG zd~Y>E7%=b$0$nXyGc)2GjYuH`sD#6U4^^Qk(R$kd6Z7Ozu4O3PF{0i09k8a{--JEe zFVR6B&?E2vk;8@V^`sN+}rhhpA{CR@xqJK zE$f_vO~&mfH&d@>GI-jhT{;48ZiCXsj|$&(<~%oMN0%BD{1oHCz#vBNgk{y5oWGIU zpF=BvUv&{7KrAHE)deBq%=LwyRAUu*HDB@p*NJX2+BwLnY|D=9b@S>KnJ;!vuH3^R5!wM=W>ttmbiH+H|4QPfp^ zS=CUwInmN;lDk4jMxogsPYiwI(z0doVS1(Q;AhA$Y<&Of=+5Sxhr5RXtJw0)YegF! zu=A?6Rt|QlY>;|%_2@#=&Zo4V3Q1b*<{0b{HF*ZE-#t6iq(q(Ug(C=9g8S^!`CA)XCEAf z==pEY_E>ABW~=;;pi%&H>d%eiN|El_DXY+o$ z=*_&H42OQ_;AlMUcgvK(cjMwnBo!Vy%LLZ}$p;tl$7kNh!Q}jthNkiHWFdBy6*zmy zw?!$o{a@F+?Z_I^C|%;oveb-CS9OYBsFT*z6|2J@{D%)W+Mk@UV=f7 zI2dOF?{$zuWE<88E!3ob#++-L3a;1g?#(ww6!Z9zY(_VAxx^T^5Cw+^G^7JUU7$Do zs^l1i*bVpZHjS>4pnasv1~?;Lb#ND93o>yoAPs-l$yhJpbIwOUA}CCd4T8yRc`{oM#nYGkEV$KY8Ci7QTmaqWQs8Bf zpd_!ajg9*isiFE@D&Ge-)uu#;gWzHLOfTa(j-=e0fPNPlxhdOiSq72yr9*T@ukFLf z5T&J?guF3++3h~tjq0Myq6k;cCKOT&l3e?x?FDZ%jk~p4f!E)v=82+fO~D!D9*mZV z5yPAMI9~TRLdzPGA`haNFUS{mM+*s9xdW@!a?O&?PoXvsaS<~H9@G4%VM75(LY`!W zwKKP(svWBrtLXD?RProAYQXl3ulX^17TD!(sgz%=H|WE_>|fgfv|n@$*I8R=28*3f zHw4JO2}OKAVX`uztehnjYz4njUUqHcFZ;fpWo?-*b)dkBG@}w^x7>^9{X(IU_Ptnq z?Zz;>gno1A#F)Gu3wPUabOE949+RJIZpl7VQ~}&OYE`~!?(Hb6?%(9Wv+4ekh1?1S zZOiM>YkLPtPRZ`ctt;?T{(y|)&YQwCfd&BhvHvrlfF%UPp?E-8gCiW{Z~812Ed<1Q z$~BY#|M*ctsDb#9!gLdGR$RYjdy-N&V}nh2iZM&CSEUTp?xDVnos+lxG`Q^RE!Ah^ zcH7LagMnX9Yzr9l!}NqjRxdWK(HT$F1`2=Jphi#GYO>`ouM5sTcd|B!&U}lEC@+;V z?se6XvUyUoN5-n+(n5mD09<^ATpwEOyOT>kuig(hxADGJ1ZKv?T!s5<_ z-`cX1yggN;)0?wU6*!FMW8`d(NXZ$oF4xaa zXhMpLl1gWO-DCdDI{Yy+M_tAAlzz%`$Vh1+K!dpzi;2QDUE0AIz7FqZo@26$W-K70 z{~g=Sqi+X)9x1rn6&rUW-q)m-ZGg`0nPSGEwv(xHwF?sqHta zi{obv+(y$KCUaKyg}jof4OkXGg$^Et)Q>EBfZz69G3~%9fs%S>qcT@Y%+QaFe9lLj zNckUrpBTGSW>FD#&f(L?#~rv79d@KCF_eg-b4L2# zU0~N8?WUvM2$<{=+D-S~OQ@zJd=z;}i78K_zBCBNBefPs6J%Sl-FIRH`4j$B{pW$`fwe!I(M;deZtH0{66Fdb}9K;St>|AK&6Dk82$6eeIpQ0=xeLCH9I-8N-N{j3&PL)k$G-q2%_2i75lYem6n?ZeqaA0PUT$f|<6f^0{xH>J~t*Ukh9a`Y` zw{I_5D6^bGE2}=NMMFL7Lxh8bw^GW4>35%3GK#0|JF{r)_z7S8aYlJvHEMrJ?{8{K ze0GoBn~>w~^Cj1z$%x~c8CHS+Z%bGe9q8f91uDAr6Ce)HKl%tJ|ui+2(VSc4 z`BR_`Ob69w$L7Hbtq_S+PFOLDI1~hlszd`zS-5jJSa?|k=nOe8abb%LnMrQa!NX0M z9u!GTBG{wNVVt#8me&tvFd!ytk>mfq=AiOhgko{`X0K#ZVCr_-BGcFKxzl@f*^f9f z7HrkO9JaMId$lo7WgpmGw!y!MZ=Z5fWf?MfdJu8eLwCj6Oo4Rj5);z8E2LqAub;qT+K%f8i(f9ItY6av z>s%T}V=O6DrC^Y9iHr}2*(71#2@kQ*lDdBT3@^`YlrO;z)g53Xg*!uxqp#2DSgm2b za#QSWeNXeI;p*Z}V?21EM4|Dh_f8}Q{D=m5Wg~s`?X8Aju73u}3?uNFnf&W>LESN_ z%on6W#Sabc(QkHyw$|1|8+Si8yC+b#u;<>ywFGsi=T0a!l16Y8g%q_$MdwqwUk|9-l+V3;v&1I z`~@4;QkjRq-E?L^+7!tLX@xdL9YW;tVQ2qD45!zdei8u0;667HF&X)xbioSrufncg(3f72|TCG`EJ4;sv<(-g|pi zlV+U?KIMGt_|2?s{UD_4mQF|JDT0I@et>mQ#&!SJZr}M#Wkj)yCM_0Crl1PI>{w6T z8%q)7$4f0M+4G~Z-yAXcrR;3~g7}}frjXXBNq8!>?mxx$zYDGIsc3)CMaX%^$bYUU zAhyKg=u4zkpYv8AT&Tch zOl0^Z>b8Td+flK=0r3HU?^piVQ-+_h&w~R1YT*F@#(&wn|3jyEsu>eg{~-nuI4k~q znvTh*=@9xC@$?mp$mT$WrJ?*U>k#wLWI*}Xu)i}tlfyh|eiA);!9+sdIBfq+0pal_`;LpbpImegu;mV<;iodmS zstPh-Pc&?j%%jO6juq%Iv;W=A007E=nT3mkkz*@KU}pWE^g|#pQFbggM7iv**?}jq zLJlM-l@N0OACvzKq!3i9+~MrvsUDd}FMyFuwj8WB)ZI)r!e z``+h$oVoToXJ-HRxzEnrJLf;Y)=d=u6%;&G1qdoB2on<%gdV9LhbIiVYhZy8B};|4 zk$aG0Q^mN0hmeLh>ToJB2V@@E%7M8dCHYElUoad(Xs!--&t-(ulVTynP?%96pGuSv zmgu1n$dRu);t&f98?yIC9r2q)9}Fo7Q->d7F~dpAiQsTDeLygG8YAf~u26CzUsFUO zfuEEh2LFv34`>N13W9$zL^WUn1mU)F*0ANg8D zhK~;sGr?`Cu>$#dA{N39YvF^VGq2H!B=xup>jMqg{eB%Vwqg6J2vT1%$w-ZIb|y(t zy@oo2z~)<#fQ?jz9N+G44>?sXIH_)Gp%x1d`Y6{KWYQI{k6+;NG(YfRRm9|v)Q?Um z4IqBw{-Q)eT@ACfV_O+UhuMdDFT!#HcKeESk5@Dz>pVp(KJ*{uTh!QW>5RL)w)BJu zzxQ*u%!#m3oREx)BMR7$DA?qYnqL@oNlf~f&d)Wn3_O}c?clMCg$R1Opa_**eZ}-P zz}91vXj*gBJ{^o*9ATkokhFFM8?nG!XjaK{dpG#VV?)RWR8DHC+t(ynlkz{3RDU`XkSAORL*ramJbA5A`@V~gF~#whbMkGl0R6d) zllCcz-4e;yAz>$*emw4(?_?vWb?JmmPs7vpXKwc@7Taju02*gcmKd^H#WBvUwsD%% zbsvHCEkiru6Vj8}B;lp>(M7~^6u>eNxws~xs(^v{vf2K69|Z(DB?f{1_ZNYss3I~b zZzLhg$WEsIBV34jni71}QUHQ@rHCwUMmW?48?IP^i;%Et1VbnxN{Ab44G5&TPzj-F z{|O7?T`7jZ_3!{g@QRe+A)dm3%cRUN#BX+VH8j0u%sqWRT@MgFHoL!zJB? z#idHc#lIH~T9y)eBaAkJ6ljir#m&PwfqZh`pz<$6j_(3r{B! z>E_b)xHRUH>Fh;kv_3{6l9icB;-RDTN)2kg4q`j-#(o*+Q?NVzLQ@_4Uib{VK{#Ks z7L#V&ppw?+I2%Kc~a4Z+s2f4)zn+Z9M; z)i5+KL)}1*!7O{uevV+5u8FlXV7(U9m_}$#w_g+cUvI1)2Q30hE&Xmk@;WG<3KIPY z(vp4=PSTF<8r|*KBtoO1SBYLf#f{QcUHKI+jDMElydp-5VWv6zk!rO;K*Xm7e;#*L z8WE=;)5p5RKsHwkHf43ANpzy%1Vu5l1}h``_B}Kf=aTMP{?(68o7f62HugwOFGXLC zb7!7sZ?~?(4lv7st97v(!fOc@@KTrvW17b|p69RjvZ#p{NJ9;ynq|82TTngN%;{h+ zQ*qq0P>(Om^ah3N4(-sLv;#zq*!0r_>zSs`aI47*&=pGc5TUc+d!GEH2i}rgPD}E^ z+m$V7eM+C@+acf)G@TOy$4oI2Z`O$M2y?6%Qf|M+XJ#*eVClA?T)M%h7LiO+6RF8h zzdk;S;W(%}M-?=)7LiFS`(TnWB(1i2frq1_87p**kw{dnV6W}kO>;jtYKd3#fk{)m z(})eeEm1J~QtDzD@q)aJkoz=(?Ai4bmObY2g@p={xLC%;@rL=pn60R0CUn<>I%bm) z($LU6y~9so0OMhpRMTeVgIZriz>YHqyL2W*cJ-dK9{CH&!t~Ur8oa*UKw7GxL6;6-jY!b?)QR?#J!r;y(5T@6}9N ze)~ztbvgSCXIFlEf0TM1u&Iu8hG#sXX&0u+e6oj@UJ;7F6SNDS=6m362sER4eHf5aZ+2k zc5Z9tAh*E6w?iit7Z*J{#l@f6h$5f<_Q{i!qMzyfZWX2LWc`%b-`aYoHL{{D<09ki zrbo;r0t?=9Cw0*7vPmq&*k3!T5-gB;_;jwzYyuK31C`4XwQ#(%YU)eg8fx<4j_+Yl zmu=*7Ci}r#jisgiCk=t8yumOv65`lH6m^1ma+J6Y^N+6uk{}&+3iXp1R{iX3+(i(( zAKd2-?>N}30ya>T`xFZIeJ4=eirALgyvQV2KQ|Nd=tSwXFdPzow2L)?W~Dh6p1-Rp z;Rbrvg}u|LD2R=pWKYZ{b~p%AemIWH0rLA<`&PceSgZj2&UQ^FPpx!L_l4)2l)7!X=7~@SA4^{yX3h+V zZuy9}tfJM=sUNB3gNvl;cwKW>kg9{fuujE$@tWYu;Md-U+cuO z&q8Z5S3I~x)0Dmh4sl&?+3{NXeE{4*FYWT|ukSU*VQ5Bdpc63m)V9u<2Ckyqw}0WQ z_O{>*^9_!#C+3Elv7{Xok5|PeoU;M>N<`l|-804~G+JiPuKH5DdFWVm<~sCz z(eu~iEqXo{PFuTYF-GFVM2m)c0L2bf*GVTd?>+CO;3nfQ)>j_1Uq9hyG>ab6c4Yg1 z99c8oIY7lxF>3bR``FnhY4&DI7kXN*^z!+dfpe4j*sHyc`qG77+BQc8ij+&%eg0az zVQK3Ge16;SLB|1~WPjWIS^;xKH?;!L$E&mNfi`oSm#J?jEWGu&2UxT`qyTg2p0xB_ zcj19Fdg_ylhe-y>17hrn$1SoXU2^@>1N>F7?8EH1F3E3BT@UA&&YmS`PQ695Er4Z~ zHZ`5h*;kKYx$T69>z&o=-_w?#=xWRqu-eIPcc|O&wAgIt19u2@KtEs*Lg^|nCVWL=q;C5X)gwWGV!_C$pwVx4C;!}qJB7`l zfUY?4R^@oz|Eu#T=*EGclKi*OkK`(zzI3?OmW^tbvK5LK3yblIF0=3h>*8WOHjB{E{kPz^xC!oiO>fd0~ znfvO}E%JqUbmTG_+I12gakb|7bl}9h&!eZwLn1oeinHQjs9nc%-kC65$QykHgz3t` zY9yZi7yl=Hc*@M>4i0P+Da?4fjT4E(b`KTn9pog}lZ7^ya|R$CL+Ek0o=lOvwJaWR? z>(JI$M=cWhRp=fsq!4uWpf}dF&Og&JC+Xhv8F&FV8_S;=$l4pC(Z6SY$V%ve|IWs3 z%YA?gI7L48ykI>|!*};oMh7}Hci6=n4pIC~*BuFZ6f3EYcTj=#w~w1IusWkrTmr3r z4Gtb(^VejSKeA=lO><(H8b(Wv;o8kBGB6Q0zlvMdjkMhT5~(P-_I2l-y!+nHZO~xj zc}(`m6Z5@Zi;1fIqcFqzCnTuvDx*|t4320U(F)%jGeiiO=^!6!7f>bT29m14=N7+8 zC`J5yW2{S|nZJnu44N1_*UiBQeyVoOf{}fJi}T5G8gw7@}hL8CR%5Gh){;Tz%xyR$JfDN^c!aJK#iIr@?zjARrMOusS5CRE}Nd?%BFM zFhHrik`b@a^O=~mU?@jNvZ2eR)O5DLn)Jy9K6dn5j_lpzqd+ZhCbHPEb1&f~%_j|V z3`10dhbZDPvJMiYX(eb14MwGa5}IEOfFRbxhfWh^IPyulC09DXlq7GrHZ{@S*{7h% zpPhHC?(R)CbUwdkr06Nrz6JgIPNKqJ&W)!qJ}@dtD2&b*1&)y7=e$7EKg!w(R{a2^eTTvub=oqq}wMI#o6lSHNq;!=OQU({2>AX6B;_&Dbi2GKBP3S zDdhJg)g@G4WvRQ?z~;$>C5@>V(InV(Brzw-~Ixj`30)I5&=R4i`pV1f=m` zNqJR@(nj-S)+XLQt5lMZs`qy61j*+NV!@l~p zZBEQ94l`CETJ@q>)B89ySVE&5P);~n_LEh4yS!}L?9UEX&iBcM^|E%hw5>wZexA`+ zl%jsK5;>L`e9!A^mH0@_l+rG5-RMgbqPsQwV1(OivKCpcmUX@D-nOs(ZO-F7<%> z6hi)13I`xd)}4+q=Dh4sPLB#YnElLT1Ao^H(=OEsnGX^DR(2T`5Yb;+4X#B z2~{_Dsl7|jyq$(JZ!W&Jdx32wI&uRB=m*osMnc=W_=0s-8Hn7`a@Kzp9G=LrDP7|X z)BYlID4j%O(Xh<(nn)quMGp@RBu)F)Flf&CwGMbatUf{3mHg<_hHQ;l@>NG^`kVaH zEJNd-TD}3Nc(acRafiKg5=0y{baSrQj(Oil$}A7A_6NF4 zmF9*BlNlD^!TROy=eiMz(y{NH+gFL--=Fx1qQ2rOl692R<32iWCrl)vi^s~JQ(Hk-eJim%`h%NNFn%&JE!#aNl z{4(H^57bT<%fLzsen*%0r6Y>hcEh1@%@XSOZQO+3%A;^9?U@;#pmoMnF#xSsv}g@J zbC}f>p2z40FKE6GJ=DHiW4a9m9tfg?Kt$?P|6XLuk;{a8?n{h2hzg%77W~r^mWbcc zRJeKx*BwrU2bBo?;i=6fqJMbmRf)tOo+@6d{fDQfmMY(2RQQil)jNs`7b{c0gQ)QM zG8i6`p~C(_Q}FFFIeH|Lf|bwGrqoG-K$;q05beL#I1nfvu3FB1N2}m||7|#L{}B^bkwKC60A>`vYEq08jv{@9;Qy4!9z)1KVt;!axP8^VI~xIy zuA)KVj`;IcYZVI=X((W;IlOM}*dS05G8@BRV>m?p5t>)iLXk$}FPlR8mykCZo?XrO zNA%b!)T" + "" @@ -102,7 +102,7 @@ class LocalReaderBook extends JPanel { this.setLayout(new BorderLayout(10, 10)); this.add(icon, BorderLayout.CENTER); - this.add(tt, BorderLayout.SOUTH); + this.add(title, BorderLayout.SOUTH); setupListeners(); setSelected(false); @@ -151,14 +151,16 @@ class LocalReaderBook extends JPanel { } public void mouseClicked(MouseEvent e) { - Date now = new Date(); - if (lastClick != null - && now.getTime() - lastClick.getTime() < doubleClickDelay) { - click(true); - } else { - click(false); + if (isEnabled()) { + Date now = new Date(); + if (lastClick != null + && now.getTime() - lastClick.getTime() < doubleClickDelay) { + click(true); + } else { + click(false); + } + lastClick = now; } - lastClick = now; } }); } @@ -199,7 +201,8 @@ class LocalReaderBook extends JPanel { g.fillPolygon(new Polygon(xs, ys, xs.length)); Color color = new Color(255, 255, 255, 0); - if (selected && !hovered) { + if (!isEnabled()) { + } else if (selected && !hovered) { color = new Color(80, 80, 100, 40); } else if (!selected && hovered) { color = new Color(230, 230, 255, 100); diff --git a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java index 670ab67..966869f 100644 --- a/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java +++ b/src/be/nikiroo/fanfix/reader/LocalReaderFrame.java @@ -19,12 +19,14 @@ import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.SwingUtilities; import be.nikiroo.fanfix.Instance; -import be.nikiroo.fanfix.Main; import be.nikiroo.fanfix.bundles.UiConfig; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.reader.LocalReaderBook.BookActionListener; +import be.nikiroo.utils.Progress; +import be.nikiroo.utils.ui.ProgressBar; import be.nikiroo.utils.ui.WrapLayout; class LocalReaderFrame extends JFrame { @@ -35,6 +37,8 @@ class LocalReaderFrame extends JFrame { private JPanel bookPane; private String type; private Color color; + private ProgressBar pgBar; + private JMenuBar bar; public LocalReaderFrame(LocalReader reader, String type) { super("Fanfix Library"); @@ -48,18 +52,7 @@ class LocalReaderFrame extends JFrame { books = new ArrayList(); bookPane = new JPanel(new WrapLayout(WrapLayout.LEADING, 5, 5)); - color = null; - String bg = Instance.getUiConfig().getString(UiConfig.BACKGROUND_COLOR); - if (bg.startsWith("#") && bg.length() == 7) { - try { - color = new Color(Integer.parseInt(bg.substring(1, 3), 16), - Integer.parseInt(bg.substring(3, 5), 16), - Integer.parseInt(bg.substring(5, 7), 16)); - } catch (NumberFormatException e) { - color = null; // no changes - e.printStackTrace(); - } - } + color = Instance.getUiConfig().getColor(UiConfig.BACKGROUND_COLOR); if (color != null) { setBackground(color); @@ -70,6 +63,9 @@ class LocalReaderFrame extends JFrame { scroll.getVerticalScrollBar().setUnitIncrement(16); add(scroll, BorderLayout.CENTER); + pgBar = new ProgressBar(); + add(pgBar, BorderLayout.SOUTH); + refreshBooks(type); setJMenuBar(createMenu()); @@ -97,13 +93,18 @@ class LocalReaderFrame extends JFrame { } public void action(LocalReaderBook book) { - try { - File target = LocalReaderFrame.this.reader.getTarget( - luid, null); - Desktop.getDesktop().browse(target.toURI()); - } catch (IOException e) { - Instance.syserr(e); - } + final Progress pg = new Progress(); + outOfUi(pg, new Runnable() { + public void run() { + try { + File target = LocalReaderFrame.this.reader + .getTarget(luid, pg); + Desktop.getDesktop().browse(target.toURI()); + } catch (IOException e) { + Instance.syserr(e); + } + } + }); } }); @@ -115,26 +116,48 @@ class LocalReaderFrame extends JFrame { } private JMenuBar createMenu() { - JMenuBar bar = new JMenuBar(); + bar = new JMenuBar(); JMenu file = new JMenu("File"); JMenuItem imprt = new JMenuItem("Import", KeyEvent.VK_I); imprt.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - String url = JOptionPane.showInputDialog(LocalReaderFrame.this, - "url of the story to import?\n" + "\n" - + "Note: it will currently make the UI \n" - + "unresponsive until it is downloaded...", + final String url = JOptionPane.showInputDialog( + LocalReaderFrame.this, "url of the story to import?", "Importing from URL", JOptionPane.QUESTION_MESSAGE); if (url != null && !url.isEmpty()) { - if (Main.imprt(url, null) != 0) { - JOptionPane.showMessageDialog(LocalReaderFrame.this, - "Cannot import: " + url, "Imort error", - JOptionPane.ERROR_MESSAGE); - } else { - refreshBooks(type); - } + final Progress pg = new Progress("Importing " + url); + outOfUi(pg, new Runnable() { + public void run() { + Exception ex = null; + try { + Instance.getLibrary().imprt( + BasicReader.getUrl(url), pg); + } catch (IOException e) { + ex = e; + } + + final Exception e = ex; + + final boolean ok = (e == null); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + if (!ok) { + JOptionPane.showMessageDialog( + LocalReaderFrame.this, + "Cannot import: " + url, + e.getMessage(), + JOptionPane.ERROR_MESSAGE); + + setAllEnabled(true); + } else { + refreshBooks(type); + } + } + }); + } + }); } } }); @@ -167,4 +190,44 @@ class LocalReaderFrame extends JFrame { return bar; } + + private void outOfUi(final Progress pg, final Runnable run) { + pgBar.setProgress(pg); + + SwingUtilities.invokeLater(new Runnable() { + public void run() { + setAllEnabled(false); + pgBar.addActioListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + pgBar.setProgress(null); + setAllEnabled(true); + } + }); + } + }); + + new Thread(new Runnable() { + public void run() { + run.run(); + if (!pg.isDone()) { + pg.setProgress(pg.getMax()); + } + } + }).start(); + } + + public void setAllEnabled(boolean enabled) { + for (LocalReaderBook book : books) { + book.setEnabled(enabled); + book.validate(); + book.repaint(); + } + bar.setEnabled(enabled); + bookPane.setEnabled(enabled); + bookPane.validate(); + bookPane.repaint(); + setEnabled(enabled); + validate(); + repaint(); + } } diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java index c47d05e..be19841 100644 --- a/src/be/nikiroo/fanfix/supported/BasicSupport.java +++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java @@ -23,8 +23,8 @@ import be.nikiroo.fanfix.data.Paragraph; import be.nikiroo.fanfix.data.Paragraph.ParagraphType; import be.nikiroo.fanfix.data.Story; import be.nikiroo.utils.IOUtils; +import be.nikiroo.utils.Progress; import be.nikiroo.utils.StringUtils; -import be.nikiroo.utils.ui.Progress; /** * This class is the base class used by the other support classes. It can be @@ -377,8 +377,7 @@ public abstract class BasicSupport { chapIn.close(); } - pgChaps.setProgress(i); - i++; + pgChaps.setProgress(i++); } } else { pg.setProgress(100); diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java index 295dc15..b63ec5d 100644 --- a/src/be/nikiroo/fanfix/supported/Cbz.java +++ b/src/be/nikiroo/fanfix/supported/Cbz.java @@ -14,7 +14,7 @@ import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.Chapter; import be.nikiroo.fanfix.data.Paragraph; import be.nikiroo.fanfix.data.Story; -import be.nikiroo.utils.ui.Progress; +import be.nikiroo.utils.Progress; /** * Support class for CBZ files (works better with CBZ created with this program, diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java index 5ebd6b3..cde7f0a 100644 --- a/src/be/nikiroo/fanfix/supported/E621.java +++ b/src/be/nikiroo/fanfix/supported/E621.java @@ -13,8 +13,8 @@ import be.nikiroo.fanfix.Instance; import be.nikiroo.fanfix.data.Chapter; import be.nikiroo.fanfix.data.MetaData; import be.nikiroo.fanfix.data.Story; +import be.nikiroo.utils.Progress; import be.nikiroo.utils.StringUtils; -import be.nikiroo.utils.ui.Progress; /** * Support class for e621.net and