From 344e0def89d871d8d04e1da47bc57ba2436254a5 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Tue, 7 Oct 2014 02:29:37 -0300 Subject: [PATCH 01/18] addded a travis CI integration --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..4443366 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: java +jdk: + - openjdk7 + - openjdk8 From de8999ae65bc98deba79514e300d801f6b1bfd8d Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Tue, 7 Oct 2014 02:37:27 -0300 Subject: [PATCH 02/18] Updated travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4443366..276b0d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: java jdk: - openjdk7 - - openjdk8 + - oraclejdk8 From f2f98cfc46539e9c99e816065122bbbea60d4c6d Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Fri, 10 Oct 2014 00:24:55 -0300 Subject: [PATCH 03/18] Removed old icons to place new GTK icons --- org/thehecklers/dialogfx/Dialog-accept.jpg | Bin 4351 -> 0 bytes org/thehecklers/dialogfx/Dialog-accept.svg | 551 ------------------ org/thehecklers/dialogfx/Dialog-error.jpg | Bin 4627 -> 0 bytes org/thehecklers/dialogfx/Dialog-error.svg | 558 ------------------- org/thehecklers/dialogfx/Dialog-info.jpg | Bin 4490 -> 0 bytes org/thehecklers/dialogfx/Dialog-info.svg | 20 - org/thehecklers/dialogfx/Dialog-question.jpg | Bin 4569 -> 0 bytes org/thehecklers/dialogfx/Dialog-question.svg | 30 - 8 files changed, 1159 deletions(-) delete mode 100644 org/thehecklers/dialogfx/Dialog-accept.jpg delete mode 100644 org/thehecklers/dialogfx/Dialog-accept.svg delete mode 100644 org/thehecklers/dialogfx/Dialog-error.jpg delete mode 100644 org/thehecklers/dialogfx/Dialog-error.svg delete mode 100644 org/thehecklers/dialogfx/Dialog-info.jpg delete mode 100644 org/thehecklers/dialogfx/Dialog-info.svg delete mode 100644 org/thehecklers/dialogfx/Dialog-question.jpg delete mode 100644 org/thehecklers/dialogfx/Dialog-question.svg diff --git a/org/thehecklers/dialogfx/Dialog-accept.jpg b/org/thehecklers/dialogfx/Dialog-accept.jpg deleted file mode 100644 index f93f019bd62c62ddc770bae6c07697a1fcaaec5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4351 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 diff --git a/org/thehecklers/dialogfx/Dialog-accept.svg b/org/thehecklers/dialogfx/Dialog-accept.svg deleted file mode 100644 index 8858f64..0000000 --- a/org/thehecklers/dialogfx/Dialog-accept.svg +++ /dev/null @@ -1,551 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Rodney Dawes - - - - - Jakub Steiner, Garrett LeSage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org/thehecklers/dialogfx/Dialog-error.jpg b/org/thehecklers/dialogfx/Dialog-error.jpg deleted file mode 100644 index b812c030acd485ba25b8b762781525358808290d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4627 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 diff --git a/org/thehecklers/dialogfx/Dialog-error.svg b/org/thehecklers/dialogfx/Dialog-error.svg deleted file mode 100644 index 7421773..0000000 --- a/org/thehecklers/dialogfx/Dialog-error.svg +++ /dev/null @@ -1,558 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Rodney Dawes - - - - - Jakub Steiner, Garrett LeSage - - - - Dialog Error - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org/thehecklers/dialogfx/Dialog-info.jpg b/org/thehecklers/dialogfx/Dialog-info.jpg deleted file mode 100644 index d735d7d97c76c6a267b019461c1361a387925e41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4490 zcmbW32{=_>yTI4p`^*E5bIj8*&tsV*9P^MdQxeWOaSX>il}eI|N`#Uo5}{OtXqHm{ zq=*JoBuS$Nnv`#!fA?13eV*^T_kQnwp7s3pJFNBYcfEV>HGhA86o|Mwx;O#|f!(Y5;)Z?9SuI!y*90@l%p~oa~r^LBULXFMt6N;D8|j;q2rD z4_`+=fQpL)i;F$gV<#k~004QR-U~R~WH!pVD95I! zBnb4=C^I5r1Po&YoP;KbvZR0`f3nWsK0nz;z??Wf2lWx;oWP0W2)GO7&1tDzlo5B7 z^U`?Sbd(2BR*6lGO(NrlGmH8Pl1Y9?MNh(e(;v$Al+wn5_7?gm8W)06(8u5Cud9 zwPm73HZe3eG0`>BL(Bh5{;lzs*S`nB-v0FX;QjZWLE=5Xb-!bO>*A{bFq=VZv*Wie zq8xy>jQ~gv{nn`*1VA_!fYw`oJde1bU!qb{5-jxf)6>)ScwDxgprF6xe|7lf`LE%R z_4EYm{i+?)p1U$UH8zDQC@MQXHa<0pnVb;L<}!8vXA}R&fq$g+M;|6$l4ISBA)U!y>;{s9;(^nl1M20&i-01TZBkdXbT z1^Tsb?nHkec=G}jCV%!l%BcPC@t+2`5WR(yd67(kn&soiWTz&j2^f7R1Opb3fG}VH zDIgD&fd13@4Zut5}v14$qqWP$Y{4-|kMpcL!@2S7Eb1C5{w zw1KnW61WO(fZJdY41-ZH0bYV>Fblq+A2K{dh3JqJqyVWx+K>@s23bQ6kUQi91wmm@ zB*ceOp)6y5>bP+Rzg?J*t$Vwy$S&QT& zWk?m$h;$&`$Q@)9d4+tz;4pLy6Qhf<#5iM?V%V5O%v#J=%pS}UOe>}fa|bhqna2FU zQn9jFZL9^>1sjNs#HM5Ouw~d9Yzy`Zb`U#(oyFmB;y87jDb5)egp0`x59hk!|^HjJbXF+DEIvrw z{e(%vH=+npm1sfqByxzE#6n^r_yg)~C?Kqixw z$mV2kGLM{1-c3G1zD6D+f1!v{v?we}2ql%Wol;A=NO?f{K&4XEs5aDKY6^8bwT^n3 z`iS~jh%TfjS@<$&qeW~YN8IJ9MN3SL!y^O$LR=Nna-lK=^NXPa%>Z{Zn)JHU^8jCd&HL5fQ zG;x|{nlYODG;eFcTE<#YS`}Kiv|()%ZJzc%?LHl>j=2tBr%LCZE=AW?H%+%ecT7)Q z&s{G^uTAfbzKVXZevy8+{tp9VgII%VgJDBaLs!Eb!w$puMp{N}qY9&e1=IzO3)U?- zz2MzK?SyQq56xRsJsxK*Xqs5R3%%=)19=wiji;ft#l zKe17^;n>vJOxkMNM%x~>ePd@}mt@ys_lae}TEn_%kJvle=iB!>h&n8F*yHfXQOPmV zvB7cL$=GSN(?w^jvzv2~^F0?i7q&~C%e1Sh>l)WCH;S9D+a9+k?pp3i?j0VmhpWd< zkC7#+OZZFLJb|Z+=T6UuUg}ht)B3vT&MohC=>|N}a92-svXNqgZ zE#^+Hv|3rb@_D3HGV`^jOV*_H3#}VSf;@bJ5 z{1|>$ynK8{d|!fgLSDjXqD5k9;&hT*QcW_Hygd1I3Ijb%^`vT~ZcH6Zvrel>`<(8d z-kd?p;Aiw?YGrQ8oLuF&>hNmJYWC{REXAz#Sz~K#*Ho^B)<&%DT&KJ)cilv`Q}&Vd zr1dfDZ{`@}6z6>05U`;mS1va@cYLGM#)dqhyrjH)n=CgS*o@iC+uXZl!IttZKk_;G ze-#)MloiZvWpDj!o8h+I+vc~g+}>MgQn-HyZU=wI-J-=sM~Z31tBS{WdhBd1VV2~V zd@Nm2dcAC6*@0c8U8%c9cf0RCU9M8TqkL{p)Skf#yNcs`W%q8``)MC%U;loa{f!6Y z4ip^tdXRVUex*}oYn576*&*Dav_sFT{j0kVn;ovJk*+DI`CiMf9X;Z6q^r)fuC89T zzOVsqNNt!p8glgZG5ceu8+98ikBc8KH~~(io_KLG?Bv}hx2Dc!v*yNAs;Bn0&|C6b zq1MdS>9(l0(bGYv``TUGJ3A~pTF&U5sXeQBw&I-Fxx(|L^SS5eFRZ#Sb1~uKt4ooW z#yeMZ4qpzuJkaIc)qBP5%C)PGS1)(lc3-$=b?xkRi|g%wnf=vv!{kP5k8w}SP2-y_ zy(Yb_w@h!HzHNTHqi<2)`ToWIm+si#xjNu7aAR=EVBg)PckkZ|xi@;BbN~5+*az>1 z(uTebXOCb<@*j#kEPEvTsOquihqB=W?#C$27I0TmOh7{+x=bhd&dvAA0zW|^Yin=fCaD!27^Jc z=zzsyad-*={YT-2$z&phCM+sS6Q7gW#|*Li}lkU<8B3(EwhQKvy)h4Oj9`TwiHa#86EV6K5wkHD4Z^M&rcM z^Tl`F|SvQ9?54;tv z4@pYR_|zLk4~hwW-LrvZr^Y`eBgTBkvYs8tx>__aw(9AW7SSzS_tg5st#>XeD({f& z3!06{KpIIqv#(K?v`l%#z)Nm5Y;E0OV`y<;GWe2qGpTjuJB71@7* z>am=`pl-58x*ye(F5;Et^}(e7E5pgI0b9u4cGu^gDADLp`Q8hkxmJfgE}YTAkRPf$ zt0bSte!w;Cx>NKQxO@ zvUrugWgaZ7y=Cg{mkb-X(=9W%t97S6&~Tn5NKzeK3GcAAlbFme`e{p-`iZ!?NUOcb z_e^_?w2?u4Sbv-$ODE5XT>rLw;;7y%V(0sKjlzyUqd)&f%I%CkFcc)-DlFWBS)|ednIX zPbHJ~9W9NW-di}vS{E)U6m)W2sKvJvC-!~qSgm-Ld7FmWmT%dg>rbf24KLC8WFi?8 zn`oJtI&xRxIbZeI`(k18#_DxNf&2IQYb-C|yfwEftSAx5E@`5+zwq+@hWp`2YZ;Df zmsn%%VA=KFE%=$t%xB}*)VNxs7izV|Qgfv_ul}Ot46rmLd|z!i5}4{E)+KbX=&7OP zg|pnw;e&@+mEAR`eV^4h^ba2D?NMB;vB%7{Y~1XPOC@BqL1vG^wbu$ z%b6H#tmSGBK5E|5m9;rEw$!wiC(Vzedk^}}Ai%P8gxA~Qrv8uGIPa`%O7+uSB% zaBApq(wFUA`+;KKNL7sf_PCP6UWqp?PU%u}cT}qeZ@RO3Xe9HoOkHnJ%h3fdL<(&k zTGo*&vfh8x6#sJ7!?Ib-i6*ksG(SSB;T=&m`dg6lBvJ8!culGKTCJmwBTd~JC0jP0 zP<>OVKWk=ZU0&oKZGKsFD#fzU?0u(=^E^2J9ZxT~rE;V!>V=OyRZ(>~Ix%cb3^Q8! z1W-wn9M?6f-(NMBy>SzHjoppZH0^+xk8;^a@8_^=0Laj_Fzx6Eb3+U7sR&KJU^E|n Pf9Y)U&DY-x=O6q7br$(? diff --git a/org/thehecklers/dialogfx/Dialog-info.svg b/org/thehecklers/dialogfx/Dialog-info.svg deleted file mode 100644 index 9111ce2..0000000 --- a/org/thehecklers/dialogfx/Dialog-info.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/org/thehecklers/dialogfx/Dialog-question.jpg b/org/thehecklers/dialogfx/Dialog-question.jpg deleted file mode 100644 index d3af50035732a04180f4cacc9611345c2c5dcca6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4569 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 diff --git a/org/thehecklers/dialogfx/Dialog-question.svg b/org/thehecklers/dialogfx/Dialog-question.svg deleted file mode 100644 index 9f64761..0000000 --- a/org/thehecklers/dialogfx/Dialog-question.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 3e7f34f36f743cbb981d2e2a3ff51c3415fc2b42 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Fri, 10 Oct 2014 00:25:48 -0300 Subject: [PATCH 04/18] Placed GTK icons --- org/thehecklers/dialogfx/dialog-ok.png | Bin 0 -> 1503 bytes org/thehecklers/dialogfx/dialog-warning.png | Bin 0 -> 1831 bytes org/thehecklers/dialogfx/help-contents.png | Bin 0 -> 2100 bytes org/thehecklers/dialogfx/help-info.png | Bin 0 -> 2053 bytes org/thehecklers/dialogfx/process-stop.png | Bin 0 -> 2106 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 org/thehecklers/dialogfx/dialog-ok.png create mode 100644 org/thehecklers/dialogfx/dialog-warning.png create mode 100644 org/thehecklers/dialogfx/help-contents.png create mode 100644 org/thehecklers/dialogfx/help-info.png create mode 100644 org/thehecklers/dialogfx/process-stop.png diff --git a/org/thehecklers/dialogfx/dialog-ok.png b/org/thehecklers/dialogfx/dialog-ok.png new file mode 100644 index 0000000000000000000000000000000000000000..b9b2ccf526e6f1770b552fb41e12645689bdfc40 GIT binary patch literal 1503 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 Vdj<^%#6kc7002ovPDHLkV1jjnWpV%j literal 0 HcmV?d00001 diff --git a/org/thehecklers/dialogfx/help-contents.png b/org/thehecklers/dialogfx/help-contents.png new file mode 100644 index 0000000000000000000000000000000000000000..952d85fbf6f27d7f886a779cb9498937c6c98fdf GIT binary patch literal 2100 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 literal 0 HcmV?d00001 diff --git a/org/thehecklers/dialogfx/process-stop.png b/org/thehecklers/dialogfx/process-stop.png new file mode 100644 index 0000000000000000000000000000000000000000..21c8371942871ce44bfcd34e73879509858dd50a GIT binary patch literal 2106 zcmV-A2*vk_P)+gHt=Xt*CIX1xm`D6HZ6SV`ty4p5%d%7GWzCF!TzFp0W zp03S20%Py)<|)t42Y>QWds7$Y{?807wAoG5osMT_?r!GThWg8vuYBon)#09&niB(c z>xX_^fxx)Br>Dj8=$Ctp^&8&8-099OC$aXwGH|Eev7cwG3#P4GpI+bFS5fng$16J`(tMIPSm$rIJNEs@1~k%syUp>u;l8yOYrpxe z>dKBzljNI*)c7cfo@tQ%0Z_sbQ27J}#@L2^n1i{MojXjmPdsH~t(C8Su-$P^`xq@l zG4aV($7Q3v{@XSC9y2NadystpJ&>1|K~2d75-0>}l6>o+F}6|2G#6{s;4;+g|C*`P zZa+BLy5-GcCRQ~}e8F+HbY0y}Tlb!F@zx|6jW;bU=)hPPRg)6Lwt%q!#U8dx%DUbpIoh(f*C30ePw}uMHnYSUeui4B46tF#fVu8dW>y7|?%oBB6lSnQHk#1n zfSM-`f+xg-m^Tv{V4FA0lbl14YT8U|@;RiXB_hT^`T7Pk8!qoJF!0)e1FX!bM=Ki} z&BFX#ZsZ7A1wQft~+=H>f3kF9L%+D?@bA?{3l4IQdDr`o`+%M?!7d| zw(ymAAVPAql&JG4X^uQj)Id>5RqL|`B!#I06e1#8kr_xs!9)nX_yR1wHwKaCwfO@g8bJEVtedk2WDOXV?rLR)cp;G}$>8B*q=Es4VOHE} z40w6mnDQ#)E0;kLMAU@5C164#xw$m544F+s3$v#|A>sI1ZX~W8tOVa=(OV} zGB!qmA8fOezLwL2;1fk!Q!x4r9~rqwW?R#=h1?#{4Da%BV#~m09p_Ku62Z1}&qKqm zUD=U`{_r;V`j1m!oSBLGo!zkQxpTB;)lv{{)QH3cNz~w-oB>I@4Or)! zZX`q%;*tg$!>(8Y6@r(3Lw2t~1%hO>?!IICkxfrC#_rx@5PJKMGzW8ouf1M)3h3yK zL_-18s+?=OnKkej{F)p>=F}XQ;#HFck0mH%n=1NpaAViN{rzL$|J|G59ym!yt*)42 zY;z4f1Hs=DgWo$!Yp6Ng^@NLZmQ}zUC-5Zv5o#7Z4a*qI2$v93Vc7uEnsP{~EC@P8 zQsE!H1~dIX09jDTx!1^1MuTZ!Oxwswa`v78|JCcXCR2}G$jOnXP$VuU%fNbJ)#Lcd z*-`Qu0f&8|Xk08YgUFUaO34wVVa&z?=}YOLaj_gV-H%*?(G1=YPgYqygjz-4i24>M zUQdeZ1#dXUE9F*FXv&cmi2MsEIU~q{Twadnlae~pw>0@iu{R>T)=CM?gZCze!b#yK zx>YNyKql)}K&%))LAcN;)*=UTMU%n}!aa-{x)zf$V9*=zb}5aJ<2<-L@#Jzm_AA%D z<+woHvo#NZTx!mneq&BdHznj5Q^y}8e}3M8rDEcE1|#`+n6dF%~7juun^{w?zzRVJI)^` zTxXK>!Y%&406RpykMwT@9(v)G@SWej5}n!Z3;8e1xZMfY!eX4$G*!L73Q8L4p?p&l zMM;Al6x&(|ljl0-VD4-<@Y2itblcCvcizbGdlEDAth0v`t zX9FL8dL|Zl+_$uN(dF{EoX!vVTa%M2!s&GKZnxJpySVsES1j;#%sn6aU>IwWV+ChI z*U~=jubHB|jT1!i=EbW&0SW&_&UyK{(8S@P;CRbmaJ+Uf_`W5L@mg#<%T4tBf^)uw kxmcsuMs+Sh=PvmC6GI%@_s3+^QUCw|07*qoM6N<$f&mf-SO5S3 literal 0 HcmV?d00001 From bf4f65ae48e268586afcf91e83afc9eca52cd985 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Fri, 10 Oct 2014 00:26:48 -0300 Subject: [PATCH 05/18] Placed the new popup. --- org/thehecklers/dialogfx/DialogFX.fxml | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 org/thehecklers/dialogfx/DialogFX.fxml diff --git a/org/thehecklers/dialogfx/DialogFX.fxml b/org/thehecklers/dialogfx/DialogFX.fxml new file mode 100755 index 0000000..a54c104 --- /dev/null +++ b/org/thehecklers/dialogfx/DialogFX.fxml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + From 0b1f773a5a19e766458c5bc1b9864c4211e2d61b Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Fri, 10 Oct 2014 00:28:07 -0300 Subject: [PATCH 06/18] Modified DialogFX's classes to adapt the new GUI and added a WARNING type to the popup. --- org/thehecklers/dialogfx/DialogFX.java | 131 +++++++++++------- org/thehecklers/dialogfx/DialogFXBuilder.java | 4 +- 2 files changed, 85 insertions(+), 50 deletions(-) mode change 100644 => 100755 org/thehecklers/dialogfx/DialogFX.java mode change 100644 => 100755 org/thehecklers/dialogfx/DialogFXBuilder.java diff --git a/org/thehecklers/dialogfx/DialogFX.java b/org/thehecklers/dialogfx/DialogFX.java old mode 100644 new mode 100755 index 74619b8..59aa885 --- a/org/thehecklers/dialogfx/DialogFX.java +++ b/org/thehecklers/dialogfx/DialogFX.java @@ -1,51 +1,58 @@ package org.thehecklers.dialogfx; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.event.EventHandler; -import javafx.geometry.Insets; -import javafx.geometry.Pos; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.image.Image; import javafx.scene.image.ImageView; -import javafx.scene.layout.BorderPane; +import javafx.scene.layout.AnchorPane; import javafx.scene.layout.HBox; import javafx.stage.Modality; -import javafx.stage.Screen; import javafx.stage.Stage; /** * * @author Mark Heckler (mark.heckler@gmail.com, @HecklerMark) + * + * Updated by Rafael Nunes (rafaelnunes737@hotmail.com, @rafaellnunees) */ public final class DialogFX extends Stage { /** * Type of dialog box is one of the following, each with a distinct icon: *

- * ACCEPT = check mark icon + * ACCEPT = check mark icon + *

*

- * ERROR = red 'X' icon + * ERROR = red 'X' icon + *

*

- * INFO = blue 'i' (information) icon + * WARNING = yellow 'triangle' (warning) icon + *

*

- * QUESTION = blue question mark icon + * INFO = blue 'i' (information) icon + *

*

+ * QUESTION = blue question mark icon + *

* If no type is specified in the constructor, the default is INFO. */ - public enum Type { ACCEPT, ERROR, INFO, QUESTION }; - + public enum Type { ACCEPT, ERROR, WARNING, INFO, QUESTION }; + private Type type; + private AnchorPane popUp; private Stage stage; private Scene scene; - private BorderPane pane = new BorderPane(); - private ImageView icon = new ImageView(); - private Label message = new Label(); - private HBox buttonBox = new HBox(10); - private List buttonLabels; + + private DialogFXController controller = new DialogFXController(); + private int buttonCancel = -1; private int buttonCount = 0; private int buttonSelected = -1; @@ -57,7 +64,16 @@ public enum Type { ACCEPT, ERROR, INFO, QUESTION }; * @see Type */ public DialogFX() { - initDialog(Type.INFO); + try { + initDialog(Type.INFO); + }catch(IOException ex) { + System.err.println("Unable to initialize the DialogFX"); + System.err.println("Error: " + ex.getMessage()); + } + + controller.setMessage(new Label("")); + controller.setIcon(new ImageView()); + controller.setButtonHBox(new HBox(10)); } /** @@ -68,7 +84,16 @@ public DialogFX() { * @see Type */ public DialogFX(Type t) { - initDialog(t); + try { + initDialog(t); + }catch(IOException ex) { + System.err.println("Unable to initialize the DialogFX"); + System.err.println("Error: " + ex.getMessage()); + } + + controller.setMessage(new Label("")); + controller.setIcon(new ImageView()); + controller.setButtonHBox(new HBox(10)); } /** @@ -80,6 +105,7 @@ public DialogFX(Type t) { public void addButtons(List labels) { addButtons(labels, -1, -1); } + /** * Public method used to add custom buttons to a DialogFX dialog. @@ -94,9 +120,9 @@ public void addButtons(List labels) { * designate as the cancel button. */ public void addButtons(List labels, int defaultBtn, int cancelBtn) { - buttonLabels = labels; + List buttonLabels = labels; - for (int i=0; i) properties.get(key)).get()); - } else if ("message".equals(key)) { + } else if ("setMessage".equals(key)) { CONTROL.setMessage(((StringProperty) properties.get(key)).get()); } else if ("modal".equals(key)) { CONTROL.setModal(((BooleanProperty) properties.get(key)).get()); From 8ec709e15ee7f6515085ea35a1a9ad0dac6936f8 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Fri, 10 Oct 2014 00:29:14 -0300 Subject: [PATCH 07/18] Added a controller for the DialogFX .fxml file, though it's not working one hundred per cent. --- .../dialogfx/DialogFXController.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100755 org/thehecklers/dialogfx/DialogFXController.java diff --git a/org/thehecklers/dialogfx/DialogFXController.java b/org/thehecklers/dialogfx/DialogFXController.java new file mode 100755 index 0000000..df128a4 --- /dev/null +++ b/org/thehecklers/dialogfx/DialogFXController.java @@ -0,0 +1,54 @@ +package org.thehecklers.dialogfx; + +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.control.Label; +import javafx.scene.image.ImageView; +import javafx.scene.layout.HBox; + +import java.net.URL; +import java.util.ResourceBundle; + +/** + * Created by Rafael Nunes on 06/10/14. + * + */ +public class DialogFXController implements Initializable { + + @FXML + private ImageView icon; + @FXML + private Label message; + @FXML + private HBox buttonHBox; + + @Override + public void initialize(URL location, ResourceBundle resources) + {} + + /* Getters and Setters */ + + public HBox getButtonHBox() { + return buttonHBox; + } + + public void setButtonHBox(HBox buttonHBox) { + this.buttonHBox = buttonHBox; + } + + public ImageView getIcon() { + return icon; + } + + public void setIcon(ImageView icon) { + this.icon = icon; + } + + public Label getMessage() { + return message; + } + + public void setMessage(Label message) { + this.message = message; + } +} From 1f811f14efbb64d5a1f61eea311f53ec193eb64b Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Fri, 10 Oct 2014 00:35:35 -0300 Subject: [PATCH 08/18] deleted to place the new renamed icons --- org/thehecklers/dialogfx/help-contents.png | Bin 2100 -> 0 bytes org/thehecklers/dialogfx/help-info.png | Bin 2053 -> 0 bytes org/thehecklers/dialogfx/process-stop.png | Bin 2106 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 org/thehecklers/dialogfx/help-contents.png delete mode 100644 org/thehecklers/dialogfx/help-info.png delete mode 100644 org/thehecklers/dialogfx/process-stop.png diff --git a/org/thehecklers/dialogfx/help-contents.png b/org/thehecklers/dialogfx/help-contents.png deleted file mode 100644 index 952d85fbf6f27d7f886a779cb9498937c6c98fdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2100 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 diff --git a/org/thehecklers/dialogfx/process-stop.png b/org/thehecklers/dialogfx/process-stop.png deleted file mode 100644 index 21c8371942871ce44bfcd34e73879509858dd50a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2106 zcmV-A2*vk_P)+gHt=Xt*CIX1xm`D6HZ6SV`ty4p5%d%7GWzCF!TzFp0W zp03S20%Py)<|)t42Y>QWds7$Y{?807wAoG5osMT_?r!GThWg8vuYBon)#09&niB(c z>xX_^fxx)Br>Dj8=$Ctp^&8&8-099OC$aXwGH|Eev7cwG3#P4GpI+bFS5fng$16J`(tMIPSm$rIJNEs@1~k%syUp>u;l8yOYrpxe z>dKBzljNI*)c7cfo@tQ%0Z_sbQ27J}#@L2^n1i{MojXjmPdsH~t(C8Su-$P^`xq@l zG4aV($7Q3v{@XSC9y2NadystpJ&>1|K~2d75-0>}l6>o+F}6|2G#6{s;4;+g|C*`P zZa+BLy5-GcCRQ~}e8F+HbY0y}Tlb!F@zx|6jW;bU=)hPPRg)6Lwt%q!#U8dx%DUbpIoh(f*C30ePw}uMHnYSUeui4B46tF#fVu8dW>y7|?%oBB6lSnQHk#1n zfSM-`f+xg-m^Tv{V4FA0lbl14YT8U|@;RiXB_hT^`T7Pk8!qoJF!0)e1FX!bM=Ki} z&BFX#ZsZ7A1wQft~+=H>f3kF9L%+D?@bA?{3l4IQdDr`o`+%M?!7d| zw(ymAAVPAql&JG4X^uQj)Id>5RqL|`B!#I06e1#8kr_xs!9)nX_yR1wHwKaCwfO@g8bJEVtedk2WDOXV?rLR)cp;G}$>8B*q=Es4VOHE} z40w6mnDQ#)E0;kLMAU@5C164#xw$m544F+s3$v#|A>sI1ZX~W8tOVa=(OV} zGB!qmA8fOezLwL2;1fk!Q!x4r9~rqwW?R#=h1?#{4Da%BV#~m09p_Ku62Z1}&qKqm zUD=U`{_r;V`j1m!oSBLGo!zkQxpTB;)lv{{)QH3cNz~w-oB>I@4Or)! zZX`q%;*tg$!>(8Y6@r(3Lw2t~1%hO>?!IICkxfrC#_rx@5PJKMGzW8ouf1M)3h3yK zL_-18s+?=OnKkej{F)p>=F}XQ;#HFck0mH%n=1NpaAViN{rzL$|J|G59ym!yt*)42 zY;z4f1Hs=DgWo$!Yp6Ng^@NLZmQ}zUC-5Zv5o#7Z4a*qI2$v93Vc7uEnsP{~EC@P8 zQsE!H1~dIX09jDTx!1^1MuTZ!Oxwswa`v78|JCcXCR2}G$jOnXP$VuU%fNbJ)#Lcd z*-`Qu0f&8|Xk08YgUFUaO34wVVa&z?=}YOLaj_gV-H%*?(G1=YPgYqygjz-4i24>M zUQdeZ1#dXUE9F*FXv&cmi2MsEIU~q{Twadnlae~pw>0@iu{R>T)=CM?gZCze!b#yK zx>YNyKql)}K&%))LAcN;)*=UTMU%n}!aa-{x)zf$V9*=zb}5aJ<2<-L@#Jzm_AA%D z<+woHvo#NZTx!mneq&BdHznj5Q^y}8e}3M8rDEcE1|#`+n6dF%~7juun^{w?zzRVJI)^` zTxXK>!Y%&406RpykMwT@9(v)G@SWej5}n!Z3;8e1xZMfY!eX4$G*!L73Q8L4p?p&l zMM;Al6x&(|ljl0-VD4-<@Y2itblcCvcizbGdlEDAth0v`t zX9FL8dL|Zl+_$uN(dF{EoX!vVTa%M2!s&GKZnxJpySVsES1j;#%sn6aU>IwWV+ChI z*U~=jubHB|jT1!i=EbW&0SW&_&UyK{(8S@P;CRbmaJ+Uf_`W5L@mg#<%T4tBf^)uw kxmcsuMs+Sh=PvmC6GI%@_s3+^QUCw|07*qoM6N<$f&mf-SO5S3 From f967b103b616a92337ccc544815d7d72deeddd16 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Fri, 10 Oct 2014 00:36:01 -0300 Subject: [PATCH 09/18] icons renamed --- org/thehecklers/dialogfx/dialog-error.png | Bin 0 -> 2106 bytes org/thehecklers/dialogfx/dialog-info.png | Bin 0 -> 2053 bytes org/thehecklers/dialogfx/dialog-question.png | Bin 0 -> 2100 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 org/thehecklers/dialogfx/dialog-error.png create mode 100644 org/thehecklers/dialogfx/dialog-info.png create mode 100644 org/thehecklers/dialogfx/dialog-question.png diff --git a/org/thehecklers/dialogfx/dialog-error.png b/org/thehecklers/dialogfx/dialog-error.png new file mode 100644 index 0000000000000000000000000000000000000000..21c8371942871ce44bfcd34e73879509858dd50a GIT binary patch literal 2106 zcmV-A2*vk_P)+gHt=Xt*CIX1xm`D6HZ6SV`ty4p5%d%7GWzCF!TzFp0W zp03S20%Py)<|)t42Y>QWds7$Y{?807wAoG5osMT_?r!GThWg8vuYBon)#09&niB(c z>xX_^fxx)Br>Dj8=$Ctp^&8&8-099OC$aXwGH|Eev7cwG3#P4GpI+bFS5fng$16J`(tMIPSm$rIJNEs@1~k%syUp>u;l8yOYrpxe z>dKBzljNI*)c7cfo@tQ%0Z_sbQ27J}#@L2^n1i{MojXjmPdsH~t(C8Su-$P^`xq@l zG4aV($7Q3v{@XSC9y2NadystpJ&>1|K~2d75-0>}l6>o+F}6|2G#6{s;4;+g|C*`P zZa+BLy5-GcCRQ~}e8F+HbY0y}Tlb!F@zx|6jW;bU=)hPPRg)6Lwt%q!#U8dx%DUbpIoh(f*C30ePw}uMHnYSUeui4B46tF#fVu8dW>y7|?%oBB6lSnQHk#1n zfSM-`f+xg-m^Tv{V4FA0lbl14YT8U|@;RiXB_hT^`T7Pk8!qoJF!0)e1FX!bM=Ki} z&BFX#ZsZ7A1wQft~+=H>f3kF9L%+D?@bA?{3l4IQdDr`o`+%M?!7d| zw(ymAAVPAql&JG4X^uQj)Id>5RqL|`B!#I06e1#8kr_xs!9)nX_yR1wHwKaCwfO@g8bJEVtedk2WDOXV?rLR)cp;G}$>8B*q=Es4VOHE} z40w6mnDQ#)E0;kLMAU@5C164#xw$m544F+s3$v#|A>sI1ZX~W8tOVa=(OV} zGB!qmA8fOezLwL2;1fk!Q!x4r9~rqwW?R#=h1?#{4Da%BV#~m09p_Ku62Z1}&qKqm zUD=U`{_r;V`j1m!oSBLGo!zkQxpTB;)lv{{)QH3cNz~w-oB>I@4Or)! zZX`q%;*tg$!>(8Y6@r(3Lw2t~1%hO>?!IICkxfrC#_rx@5PJKMGzW8ouf1M)3h3yK zL_-18s+?=OnKkej{F)p>=F}XQ;#HFck0mH%n=1NpaAViN{rzL$|J|G59ym!yt*)42 zY;z4f1Hs=DgWo$!Yp6Ng^@NLZmQ}zUC-5Zv5o#7Z4a*qI2$v93Vc7uEnsP{~EC@P8 zQsE!H1~dIX09jDTx!1^1MuTZ!Oxwswa`v78|JCcXCR2}G$jOnXP$VuU%fNbJ)#Lcd z*-`Qu0f&8|Xk08YgUFUaO34wVVa&z?=}YOLaj_gV-H%*?(G1=YPgYqygjz-4i24>M zUQdeZ1#dXUE9F*FXv&cmi2MsEIU~q{Twadnlae~pw>0@iu{R>T)=CM?gZCze!b#yK zx>YNyKql)}K&%))LAcN;)*=UTMU%n}!aa-{x)zf$V9*=zb}5aJ<2<-L@#Jzm_AA%D z<+woHvo#NZTx!mneq&BdHznj5Q^y}8e}3M8rDEcE1|#`+n6dF%~7juun^{w?zzRVJI)^` zTxXK>!Y%&406RpykMwT@9(v)G@SWej5}n!Z3;8e1xZMfY!eX4$G*!L73Q8L4p?p&l zMM;Al6x&(|ljl0-VD4-<@Y2itblcCvcizbGdlEDAth0v`t zX9FL8dL|Zl+_$uN(dF{EoX!vVTa%M2!s&GKZnxJpySVsES1j;#%sn6aU>IwWV+ChI z*U~=jubHB|jT1!i=EbW&0SW&_&UyK{(8S@P;CRbmaJ+Uf_`W5L@mg#<%T4tBf^)uw kxmcsuMs+Sh=PvmC6GI%@_s3+^QUCw|07*qoM6N<$f&mf-SO5S3 literal 0 HcmV?d00001 diff --git a/org/thehecklers/dialogfx/dialog-info.png b/org/thehecklers/dialogfx/dialog-info.png new file mode 100644 index 0000000000000000000000000000000000000000..44bc3adbd380126473437ae4a54f656f14e93531 GIT binary patch literal 2053 zcmV+g2>SPlP)0)Tm#sk{CbuNDK<55ix#|X(V6>BtAl_mZTv;`l3*9S}06s+L^ic_CC)! zd++6kbMBoxGeyOic#@U9PtIOz{r6h`we~*ne}2?|x^VaOwC6V`cWLGC5v_M=+_)1} z2GC0CD7EOU{MA^dW!>q6`}gdz{}TYafBaHGty5nEzBw^cV)Lfa;)ch%zyqM0 zSXz-`uG)5|->bD3YAuxT1J{rr@Biv;o&OrZ?tKS8C+Np7zjUm4!<8Efe$HbdcGP2w z6TxKbd_XJ3NX}zCr!leR=v(uhw`Z4HO5EP*2Y3GN0|BU1M8CS}(2s^g|DliU*j(_# z95bziM&j@kcp5yltSo>Pur3{k1I^Y_KoZ5ge0ZkQY$uQ3c=pzZD;4GbEr3cz^sDO+ zJ~uu#{L!1PzoK-i>zM0UJPm&4*i)b~0L~Z|PM*PbBZe;9NHA8$xD?FBg2xqk%`3-F zwH9m512@g>{LE?)-f93t_uTozv5}$OQ`d1bJici2qX?_kx+|;?UUoVTCFuX_0t3Ql=8XnPfcA}JX*EX zVwZ(Ut#mvfca1CVxOxKY$sCQgnVLAMg%?HG!W4u(OIddA*P5R$f>!neETE~)zPZ);!FZo+{^*La)cW-HA zqPWyb(e`pa=*Srv5J(y=8pn^ZEuP~`Hw;l~)mE+<)a`M?LA5Oml_v@!>fSyFoRwWc zuHe-ohqGzUbyjntRF?ZxoD$-NvwYZ9`Qlxdv2Ah!Yc22DCNG>{nFeubZqkZK-!F6> z(95ZTP?Xg6!dXR!2EmXw&~va;<4H*cOmYmIZl;dwPs zuG!kb(zVk6?gQ;+H4$U}vPBsB+{FXL4m6X&hLr7M`+Bc`03Du_S%VE_I-7VExOU3k5b*KWD>uI_9Zkn1nWqqRnB%_}ntG|wI7 zW0yJddZp8z^jdRXJF4eTHk@_erBZP#j^k#v{j+AP-nHE-p-OPpAl9uhXreARZ=Fa< zsuVjW^E~m;?R@;kD-q|d0i4<}get*wtF+p+POI8}Y|VY(^pg*CZEW_Qn>*eLq>C>x zVxmlXfGlIhkd325NJjZj-n^M-j#?_uw`g`8Vr{zCBz=8fVgl)MZti%?MfRc7Pd?DS z=#6OU<)=@K-1Ozhm;E*PrcmWJI|cw#B67P`WESz zjU`Z)qHmd>Kha2{&d=X`?EXhDb}3ar0Qi*4;gQ^Z=KwDRjHk5+6kZ(ih-su zs4Xl{q<5YO#Q=(dw(FMy`a=`$xj;9_G$-+lsPEZIeRP}ZhkdGrB4oVaFa?9R_Ws7vE}hYAH5FOL>RO6znk z7Z3&k08wm+;)r^?;TG%FPP5Zd(pq|K@z1~97cIQe%tCGkLf=op#r}-E0RUcKiW9;3 zC%$k?P@cS72f3XneTj&a0F+WK#LYPq{ViFX{r%#BeTQf-B!C@|9sv76|BidC)2l|c jiiZ7PhgGBeE93tJ5{j&lCEA#500000NkvXXu0mjf%+>P> literal 0 HcmV?d00001 diff --git a/org/thehecklers/dialogfx/dialog-question.png b/org/thehecklers/dialogfx/dialog-question.png new file mode 100644 index 0000000000000000000000000000000000000000..952d85fbf6f27d7f886a779cb9498937c6c98fdf GIT binary patch literal 2100 zcmV-42+Q}0P)!TqqGtE5khf= zO@E|nfTTf4MWs>654RPy(^eq01)3U#heK6@)Ph1(DQbiQH8v(`%*zHp)(?!=UhjH$ zJ)YT}$Gx}rjAvh7Q>AL9j&wA4?ws?T@0@$iy)$O`KVRn0tGMmG_bl7rxw@(8ME8-# zQ=i<}ajJW~@#J*@1;;y1U%%0KqWkv^$GhuM_kTuU+o7wjhU1-Ynr6$RMFpOV>uSq( zf4iWj|nt4GxLjW zU5A|x$LadIn&MSe%U!ob3YUX2+>5C&EmMf93`9e4jB|JSJJdm4wAol!Q{r&h+qb-Z z^$=oyE&{07v!vrOJcI zgWHU8+q$pRxQe{)ou4i1cz-bxITN4wuKc>NAn)lfuCB=IiD)p&)2kT3QdETC%>mE` zhhb$R3g2+6@D!KFi2!V97^d$Gfix@Wx@a@PZ4qP5>dHK?C-0e0ORv23ZwYMv?Z+>< zownVzwH2|0*~ zrJ(@Gu{qraZ4m>pR)3+w<*-^`d;WKqUR;#G)6JKhl+w3XRj+gpM)?{is1A|@T4NI6 zN1Mu_x~veQjzTy(Zh-@L3H-)Sp-*)~X=y2}uXz*>JX;B?65$ka6vXn!cwN-2bb|(M z=qrbSqk!!%_7%AmlN~1K2sdOLggd98-?y(_0^WjrusK|CuxFM>r9wa?(92VN=(Ygw z56^+wY=)9zA2h5f2CA`?En)>YCNVjnxTwhO$R|I}B7hqQp=4j_(q-=ZF)i(wrlTly z+rVbyVlmBwBSDR&#vk^FKomu=SS(Pv#0yj<^Vy?mBKKniO3TXJd~RQJbF(=`ATpG{ z(PeX*RAz%1Uo%D_EBz=PVH2pT3bVZBRBGmq=RtMh<6>prIbM?41q>`%%Yc~CI02Pe z!QpV2FFT*ykRqU&EnD*nOWZRe(-mnl{RTMRPv6sEf2RaHKbiqaX6bia8o1?-bDm`fNc)8TX+o zGOq#Ccsc__`&gQbYF1c~x{Rn4+Vf?ictb^fUhDL$gl9xrlURPK+f;A_5K* zuTr9MLz)YyXNSTsURVM9Hh&4;+_Db#ZYo{mfJ&yF>R5=WacohF#>I$qEax~LIr(ye zZ>zh5lXpZLOMsOryqIJ|l7#pP$DIQQexkYzJRXlOYgR0sk5r?&j;_mXlJQx&~v5>Yy!RAXZ$6bq$=^(~3R}U#27hvoT@Q@3ENG-~Pjwh493g;nAC-(=5Ug zHwC+17a0yRBThZbx(=>4+Mq3BM8o6l{&!#dK4NG2;=ULEF^R|NSo@xXk%_)H?hW0J z2Brq%K8FI26qumUNp%Mn#&=Hc3yITx4!2e z^`Gt;=pE?py(L`k`IMq`_uUk34E7E9$A(UY{I_?Y?!?*st!RrF3os?a7kk*R88O)6 zX*J6w%7uT2g{H$7TQ5$Yd42c9$(?H_PW)hL;N&a$C^*Ks$#?g>8va|$2dJyt%-hZy eSh9hgb^Qyb7uok77RTKH0000 Date: Fri, 10 Oct 2014 00:39:13 -0300 Subject: [PATCH 10/18] Modified the strings in the case statement to correct icons^Cames --- org/thehecklers/dialogfx/DialogFX.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org/thehecklers/dialogfx/DialogFX.java b/org/thehecklers/dialogfx/DialogFX.java index 59aa885..63d0f37 100755 --- a/org/thehecklers/dialogfx/DialogFX.java +++ b/org/thehecklers/dialogfx/DialogFX.java @@ -270,11 +270,11 @@ private void populateStage() { addOKButton(); break; case INFO: - iconFile = "Dialog-info.jpg"; + iconFile = "dialog-info.png"; addOKButton(); break; case QUESTION: - iconFile = "Dialog-question.jpg"; + iconFile = "dialog-question.png"; break; default: iconFile = "Dialog-info.jpg"; From b5a662a8bad32936b0b97789547fc235e97c09f0 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Fri, 10 Oct 2014 00:41:35 -0300 Subject: [PATCH 11/18] I Forgot to change the default case, but it is already fixed. :) --- org/thehecklers/dialogfx/DialogFX.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org/thehecklers/dialogfx/DialogFX.java b/org/thehecklers/dialogfx/DialogFX.java index 63d0f37..3bf40c7 100755 --- a/org/thehecklers/dialogfx/DialogFX.java +++ b/org/thehecklers/dialogfx/DialogFX.java @@ -277,7 +277,7 @@ private void populateStage() { iconFile = "dialog-question.png"; break; default: - iconFile = "Dialog-info.jpg"; + iconFile = "dialog-info.png"; break; } From ed82cfc314f787867b43f58eca63def668c97f47 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Wed, 15 Oct 2014 20:34:08 -0300 Subject: [PATCH 12/18] Now everything is working as expected, have fun. :) --- org/thehecklers/dialogfx/DialogFX.java | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/org/thehecklers/dialogfx/DialogFX.java b/org/thehecklers/dialogfx/DialogFX.java index 3bf40c7..7539e27 100755 --- a/org/thehecklers/dialogfx/DialogFX.java +++ b/org/thehecklers/dialogfx/DialogFX.java @@ -7,6 +7,7 @@ import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.fxml.FXMLLoader; +import javafx.scene.Group; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.Button; @@ -15,6 +16,7 @@ import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.HBox; +import javafx.scene.layout.Pane; import javafx.stage.Modality; import javafx.stage.Stage; @@ -47,11 +49,14 @@ public final class DialogFX extends Stage { public enum Type { ACCEPT, ERROR, WARNING, INFO, QUESTION }; private Type type; - private AnchorPane popUp; + private Pane popUp; private Stage stage; private Scene scene; - private DialogFXController controller = new DialogFXController(); + // FXMLLoader to load the popup GUI. + private FXMLLoader fxmlLoader = new FXMLLoader(); + // Instance of the second controller. + private DialogFXController controller; private int buttonCancel = -1; private int buttonCount = 0; @@ -70,10 +75,6 @@ public DialogFX() { System.err.println("Unable to initialize the DialogFX"); System.err.println("Error: " + ex.getMessage()); } - - controller.setMessage(new Label("")); - controller.setIcon(new ImageView()); - controller.setButtonHBox(new HBox(10)); } /** @@ -90,10 +91,6 @@ public DialogFX(Type t) { System.err.println("Unable to initialize the DialogFX"); System.err.println("Error: " + ex.getMessage()); } - - controller.setMessage(new Label("")); - controller.setIcon(new ImageView()); - controller.setButtonHBox(new HBox(10)); } /** @@ -198,15 +195,20 @@ public void addStylesheet(String stylesheet) { private void initDialog(Type t) throws IOException { stage = new Stage(); - popUp = FXMLLoader.load(getClass().getResource("DialogFX.fxml")); - + fxmlLoader.setLocation(getClass().getResource("DialogFX.fxml")); + popUp = fxmlLoader.load(); + controller = fxmlLoader.getController(); setType(t); stage.initModality(Modality.APPLICATION_MODAL); /*stage.setMaxWidth(Screen.getPrimary().getVisualBounds().getWidth() / 2);*/ } + /** + * Load an icon for the pop up. + * @param fileName a string containing the file name of the icon. + */ private void loadIconFromResource(String fileName) { Image imgIcon = new Image(getClass().getResourceAsStream(fileName)); controller.getIcon().setPreserveRatio(true); From d05b0fc3c4d9a28f65ded66c0432d04771957c35 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Wed, 15 Oct 2014 20:39:26 -0300 Subject: [PATCH 13/18] README updated. Added a paragraph of the contributors. --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8e2f27c..fe60c81 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,10 @@ That's the beauty of GitHub! Looking forward to ideas, discussions, etc. Share to learn! -All the best, -Mark Heckler -mark.heckler@gmail.com -@MkHeck +__Contributors__ + + * Rafael Campos Nunes (@rafaellnunees) + * Mark Heckler (@MkHeck) + * Gerrit Grunwald (also known as HanSolo) + +All te best for you guys! From 128905b2562527d3b2a58d6a78e8188d98324366 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Thu, 16 Oct 2014 14:47:53 -0300 Subject: [PATCH 14/18] README updated. Fixed grammar spelling. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe60c81..3af9188 100644 --- a/README.md +++ b/README.md @@ -33,4 +33,4 @@ __Contributors__ * Mark Heckler (@MkHeck) * Gerrit Grunwald (also known as HanSolo) -All te best for you guys! +All the best for you guys! From 8acac4584e8d620b23a967c9a0eecc4f7ad31ae3 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Thu, 16 Oct 2014 14:57:45 -0300 Subject: [PATCH 15/18] I Got rid of somethings. --- org/thehecklers/dialogfx/DialogFX.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/org/thehecklers/dialogfx/DialogFX.java b/org/thehecklers/dialogfx/DialogFX.java index 7539e27..70cc708 100755 --- a/org/thehecklers/dialogfx/DialogFX.java +++ b/org/thehecklers/dialogfx/DialogFX.java @@ -145,11 +145,6 @@ public void handle(ActionEvent evt) { }); controller.getButtonHBox().getChildren().add(btn); } - - /*BorderPane.setAlignment(buttonBox, Pos.CENTER); - BorderPane.setMargin(buttonBox, new Insets(10,5,10,5)); - pane.setBottom(buttonBox); - buttonCount = labels.size(); */ } private void addOKButton() { @@ -202,7 +197,6 @@ private void initDialog(Type t) throws IOException { setType(t); stage.initModality(Modality.APPLICATION_MODAL); - /*stage.setMaxWidth(Screen.getPrimary().getVisualBounds().getWidth() / 2);*/ } /** @@ -289,24 +283,15 @@ private void populateStage() { System.err.println("Exception trying to load icon file: " + ex.getMessage()); } - //TODO: Clean this. - /*BorderPane.setAlignment(icon, Pos.CENTER); - BorderPane.setMargin(icon, new Insets(15, 5, 5, 5)); - pane.setLeft(icon); - - BorderPane.setAlignment(setMessage, Pos.CENTER); - BorderPane.setMargin(setMessage, new Insets(5,5,5,5)); - pane.setCenter(setMessage);*/ - // Disabled this feature by now. - /*for (int i=0;i Date: Fri, 17 Oct 2014 16:54:31 -0300 Subject: [PATCH 16/18] Added a version to the dialog, simplified some functions and added some TODO's to further work. --- org/thehecklers/dialogfx/DialogFX.java | 37 +++++++++++++++----------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/org/thehecklers/dialogfx/DialogFX.java b/org/thehecklers/dialogfx/DialogFX.java index 70cc708..b6f8d99 100755 --- a/org/thehecklers/dialogfx/DialogFX.java +++ b/org/thehecklers/dialogfx/DialogFX.java @@ -22,11 +22,14 @@ /** * - * @author Mark Heckler (mark.heckler@gmail.com, @HecklerMark) - * - * Updated by Rafael Nunes (rafaelnunes737@hotmail.com, @rafaellnunees) + * @author Mark Heckler (mark.heckler@gmail.com, @HecklerMark), + * Rafael Nunes (rafaelnunes737@hotmail.com, @rafaellnunees) */ public final class DialogFX extends Stage { + + private final static String MAJOR_VERSION = "1"; + private final static String MINOR_VERSION = "2"; + /** * Type of dialog box is one of the following, each with a distinct icon: *

@@ -62,9 +65,14 @@ public enum Type { ACCEPT, ERROR, WARNING, INFO, QUESTION }; private int buttonCount = 0; private int buttonSelected = -1; private List stylesheets = new ArrayList<>(); + + /* Getters */ + + public final static String getDialogFXVersion() { return MAJOR_VERSION + "." + MINOR_VERSION; } /** - * Default constructor for a DialogFX dialog box. Creates an INFO box. + * Default constructor for a DialogFX dialog box. Creates an INFO box + * by default. * * @see Type */ @@ -94,6 +102,7 @@ public DialogFX(Type t) { } /** + * TODO: Only this method should be used to add buttons on the dialog. * Public method used to add custom buttons to a DialogFX dialog. * * @param labels A list of String variables. While technically unlimited, @@ -144,16 +153,17 @@ public void handle(ActionEvent evt) { } }); controller.getButtonHBox().getChildren().add(btn); + controller.getButtonHBox().setSpacing(5); } } - + + //TODO: This method should be removed. Why? Redundancy private void addOKButton() { - List labels = new ArrayList<>(1); - labels.add("OK"); - - addButtons(labels, 0, 0); + // Yes, double brace initialization. + addButtons(new ArrayList(1) {{ add("Ok"); }}, 0, 0); } - + + //TODO: This method should be removed. Why? Redundancy private void addYesNoButtons() { /* * No default or cancel buttons designated, by design. @@ -162,11 +172,7 @@ private void addYesNoButtons() { * assign default/cancel Yes/No buttons using the full addButtons() * method if required. You have the power! */ - List labels = new ArrayList<>(2); - labels.add("Yes"); - labels.add("No"); - - addButtons(labels); + addButtons(new ArrayList(2) {{ add("Yes"); add("No"); }}); } /** @@ -177,7 +183,6 @@ private void addYesNoButtons() { * of the stylesheet to add to the dialog's scene and contained controls. */ public void addStylesheet(String stylesheet) { - //stylesheet = stylesheet; try { String newStyle = this.getClass().getResource(stylesheet).toExternalForm(); stylesheets.add(newStyle); From 61dbb906c3c995528babf40c802b08a963687322 Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Fri, 17 Oct 2014 20:24:58 -0300 Subject: [PATCH 17/18] Simplified DialogFX, I took out the redundancy of the class. --- org/thehecklers/dialogfx/DialogFX.java | 36 ++++++-------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/org/thehecklers/dialogfx/DialogFX.java b/org/thehecklers/dialogfx/DialogFX.java index b6f8d99..ccf86d1 100755 --- a/org/thehecklers/dialogfx/DialogFX.java +++ b/org/thehecklers/dialogfx/DialogFX.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javafx.application.Platform; import javafx.event.ActionEvent; @@ -28,7 +29,7 @@ public final class DialogFX extends Stage { private final static String MAJOR_VERSION = "1"; - private final static String MINOR_VERSION = "2"; + private final static String MINOR_VERSION = "3"; /** * Type of dialog box is one of the following, each with a distinct icon: @@ -156,24 +157,6 @@ public void handle(ActionEvent evt) { controller.getButtonHBox().setSpacing(5); } } - - //TODO: This method should be removed. Why? Redundancy - private void addOKButton() { - // Yes, double brace initialization. - addButtons(new ArrayList(1) {{ add("Ok"); }}, 0, 0); - } - - //TODO: This method should be removed. Why? Redundancy - private void addYesNoButtons() { - /* - * No default or cancel buttons designated, by design. - * Some cases would require the Yes button to be default & No to cancel, - * while others would require the opposite. You as the developer can - * assign default/cancel Yes/No buttons using the full addButtons() - * method if required. You have the power! - */ - addButtons(new ArrayList(2) {{ add("Yes"); add("No"); }}); - } /** * Allows developer to add stylesheet for DialogFX dialog, supplementing or @@ -260,25 +243,27 @@ private void populateStage() { switch ( type ) { case ACCEPT: iconFile = "dialog-accept.png"; - addOKButton(); + addButtons(Arrays.asList("Ok"), 0, 0); break; case ERROR: iconFile = "dialog-error.png"; - addOKButton(); + addButtons(Arrays.asList("Ok"), 0, 0); break; case WARNING: iconFile = "dialog-warning.png"; - addOKButton(); + addButtons(Arrays.asList("Ok"), 0, 0); break; case INFO: iconFile = "dialog-info.png"; - addOKButton(); + addButtons(Arrays.asList("Ok"), 0, 0); break; case QUESTION: iconFile = "dialog-question.png"; + addButtons(Arrays.asList("Yes", "No"), 0, 0); break; default: iconFile = "dialog-info.png"; + addButtons(Arrays.asList("Ok"), 0, 0); break; } @@ -309,11 +294,6 @@ private void populateStage() { */ public int showDialog() { populateStage(); - if ( type == Type.QUESTION ) { - if ( buttonCount == 0 ) { - addYesNoButtons(); - } - } stage.setResizable(false); stage.sizeToScene(); From eb4ee8d93c3aff3ba705c87510dfed37c02c19ca Mon Sep 17 00:00:00 2001 From: "Rafael C. Nunes" Date: Sat, 18 Oct 2014 16:18:17 -0300 Subject: [PATCH 18/18] If you have an instance of Stage in your class, you do not need to extend Stage, it's useless. --- org/thehecklers/dialogfx/DialogFX.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org/thehecklers/dialogfx/DialogFX.java b/org/thehecklers/dialogfx/DialogFX.java index ccf86d1..693c748 100755 --- a/org/thehecklers/dialogfx/DialogFX.java +++ b/org/thehecklers/dialogfx/DialogFX.java @@ -26,7 +26,7 @@ * @author Mark Heckler (mark.heckler@gmail.com, @HecklerMark), * Rafael Nunes (rafaelnunes737@hotmail.com, @rafaellnunees) */ -public final class DialogFX extends Stage { +public final class DialogFX { private final static String MAJOR_VERSION = "1"; private final static String MINOR_VERSION = "3"; @@ -274,7 +274,7 @@ private void populateStage() { } - for (int i=0;i