From 623cfee7dfbcdc5887e634de704ab3e1cba67f9c Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Wed, 27 Jan 2010 14:28:34 +0100
Subject: [PATCH]  ItEr45S09RFNavegacionOrganizacionTraballoItEr44S15: Added
 icons for toolbarbox buttons

---
 .../main/java/org/zkoss/ganttz/Planner.java   |   2 --
 .../web/ganttz/zul/plannerLayout.zul          |  27 +++++++++++-------
 .../webapp/common/img/ico_criticalpath.png    | Bin 0 -> 191 bytes
 .../src/main/webapp/common/img/ico_expand.png | Bin 0 -> 209 bytes
 .../src/main/webapp/common/img/ico_labels.png | Bin 0 -> 285 bytes
 .../src/main/webapp/common/img/ico_print.png  | Bin 0 -> 1112 bytes
 .../main/webapp/common/img/ico_refresh.png    | Bin 0 -> 1134 bytes
 .../main/webapp/common/img/ico_resources.png  | Bin 0 -> 753 bytes
 .../src/main/webapp/common/img/ico_save.png   | Bin 0 -> 1066 bytes
 9 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/ico_criticalpath.png
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/ico_expand.png
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/ico_labels.png
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/ico_print.png
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/ico_refresh.png
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/ico_resources.png
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/ico_save.png

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index 02bcea9fa..8e011a9b3 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -323,8 +323,6 @@ public class Planner extends HtmlMacroComponent  {
         this.ganttPanel = new GanttPanel(this.context,
                 commandsOnTasksContextualized, doubleClickCommand,
                 disabilityConfiguration);
-        Button button = (Button) getFellow("btnPrint");
-        button.setDisabled(!context.isPrintEnabled());
     }
 
     @SuppressWarnings("unchecked")
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index d133530e8..e7780c4a3 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -7,12 +7,28 @@ planner = self;
     <borderlayout sclass="plannerlayout" width="auto">
        <north height="30px" border="0">
        <hbox align="center" id="toolbar" sclass="toolbar-box">
+        <!--  Commands -->
+        <button id="btnPrint" onClick="planner.print()"
+            image="/common/img/ico_print.png"
+            tooltiptext="${i18n:_('Print')}" />
         <separator/>
+        <!--  Visualization modes -->
         <label>${i18n:_('Zoom level')}:</label>
         <listbox mold="select" rows="1"
             model="${planner.zoomLevels}"
             onSelect="planner.setZoomLevel(self.selectedItem.value);" >
         </listbox>
+
+        <button id="showCriticalPath" onClick="planner.showCriticalPath();"
+            image="/common/img/ico_criticalpath.png"
+            tooltiptext="${i18n:_('Show/Hide Critical path')}" />
+        <button id="showAllLabels" onClick="planner.showAllLabels();"
+            image="/common/img/ico_labels.png"
+            tooltiptext="${i18n:_('Show/Hide all labels')}" sclass="planner-command show-labels" />
+        <button id="showAllResources" onClick="planner.showAllResources();"
+            image="/common/img/ico_resources.png"
+            tooltiptext="${i18n:_('Show all resources')}" sclass="planner-command show-resources" />
+        <!--  Filtering -->
         <separator/>
         <label>${i18n:_('Filter')}:</label>
         <combobox>
@@ -29,17 +45,6 @@ planner = self;
         </combobox>
         <textbox/>
         <separator />
-        <button id="showCriticalPath" onClick="planner.showCriticalPath();"
-            label="${i18n:_('Critical path')}" />
-
-        <button id="showAllLabels" onClick="planner.showAllLabels();"
-            label="${i18n:_('Show all labels')}" sclass="planner-command show-labels" />
-
-        <button id="showAllResources" onClick="planner.showAllResources();"
-            label="${i18n:_('Show all resources')}" sclass="planner-command show-resources" />
-
-        <button id="btnPrint" onClick="planner.print()"
-            label="${i18n:_('Print')}" />
 
        </hbox>
        </north>
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_criticalpath.png b/navalplanner-webapp/src/main/webapp/common/img/ico_criticalpath.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a9ccd5911b1ebd610ae83a3b832d3c021cef8f4
GIT binary patch
literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8gy!3HEdYt9+~DVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5X0zF+ELn>}1{rUgjo>`Ycn7Q}B
z1>+g4=aN#E_$B=Rf4(Ej;KZ9(wNqx^d}Y#dc!uD-zD%)W0gV?+&K!u?Jb#J7zx$6)
nSnO$PD%^5IW)~YXiv)vgkA%vu5`_am!x=nX{an^LB{Ts5GT=p%

literal 0
HcmV?d00001

diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_expand.png b/navalplanner-webapp/src/main/webapp/common/img/ico_expand.png
new file mode 100644
index 0000000000000000000000000000000000000000..2900c7c23192e27df14022b026f0fa4880292ff9
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8gy!3HEdYt9+~DVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5Xl097<Ln>}1{rUgjo>`Ycn7NmM
zyCWebWyz||jSCN)X!4yPbNGVnaTi|ajW1IdwJp4HCP8M=%0+4RrNOS<%F1VBY`*Zc
zr3$z$`LJ-+!4D^x-Bdg$n$#Sck;cZqSI5`5nURTyVe2ckCu!RxHGtMJc)I$ztaD0e
F0stp$NL2s;

literal 0
HcmV?d00001

diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_labels.png b/navalplanner-webapp/src/main/webapp/common/img/ico_labels.png
new file mode 100644
index 0000000000000000000000000000000000000000..84a8aa3e2c86facff553c3a35f6b7a48c8178cbf
GIT binary patch
literal 285
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8gy!3HEdYt9+~DVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5X)_b}*hE&{2`t$$4J+m%@Fmo@%
zod;jOeEF~7V>;Q<apJUT-{f5uZ`M4RAbx(1<>bN>Er#57C#U{grP5mY<H+rv2wpZ<
zIh_cHwzlIclb?8PkX!N4=Zevk1c~6o0f#20M=>6pBEiGO7Eti!_roIxGQv8u6eQag
z?~q8@A$;7f?f>#yk`jL93MvzBUh&9#BGF;o<9IUl>7<=oI&BhGEx1wOR`b+Q)v~|v
hh1i!XYz&NS3}wICX1)@AY!7rggQu&X%Q~loCIG}kZ@&Nl

literal 0
HcmV?d00001

diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_print.png b/navalplanner-webapp/src/main/webapp/common/img/ico_print.png
new file mode 100644
index 0000000000000000000000000000000000000000..2505337ee6aeac24f791f172f62c64a44a186706
GIT binary patch
literal 1112
zcmV-e1gHCnP)<h;3K|Lk000e1NJLTq000#L000yS1^@s6VoP>200004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#>PbXFRCwBy
zR7-3dRTMolp7Ad@@h5d+BG-v&;;Ly<L`bUu6(OPsDHR(QAhBS9#DWDZSX77w3xq(d
zkPs`_SFk~-3lvo>A_^2Wpolh&lP2Wr#EpNkld)$!Gal}JaiTUD1aI`@=Qs1tJ@1}#
zujDumj*s=+pM@KDe?TnM1G`~~JxP+`I1M!Dd$;1o;?^9_#2?2qXP%E7Kd+$0Fibr>
zlz0L|y(52nSGVd=T`HJNaWCKMcx%u`gBdj*_-{iuYXY!lRN+y*V*O8}HK=35Y#ure
zShsXI^l(}ZQ}drdZDMK@ut<evP&y3g^%_i@fa_IQwoTLee@rulHTc|qv1Txy%uuiE
zA^->F0Qt)Oe+T_->1SslGl$jO5@uFz;H^tn#6Anc53@6EQ>4O6`yBMz?AN$o-gc5*
z14unOh|z(Il5h$i`rzt2j;2=-@9aZgbO1l5uOrc!#8amyP}WKUjC0I@RYN07d5|ft
zF(95!O<;BB9@YyhkjZwRzW$Zu8l4<0WQyy)H(z*{K$D1ebR(U)gP=bogy5ixOA(4I
zWF<vbXwMdDC|65JcJ;&OX(Og*F}r#b+0xeA%EHzij3mbdfJ>Iel>^=Y89xq{Os<nK
zJH$xS_enJUNO6;dV!yg5$Z|G~NFa)HC(mPM`6no~x`t$T3SQNRGDXjoGuR~tx7TNo
z-OZq=<;C?6ha^c&hgb;tBk&W;vD9;riO^oHg6Z@Wl)`?VC~t_w^VMX@h2@<zvU{7*
z>J`C+_YQ~CEDGDPkkhi_eKgoDa$Tt8P&2Dg3`+iYx2~cm+)Fv_Mfi~u@Tq<TJVCU3
zLa-Vpv9d}3129Ea#pJ<EceMgmb{4UbUnSwTP`7m`!M2D{)~3Vh%xzTY>fyFdF;!Ao
zRa8ijg|b|_3~pNN215W(&3=n^64gsWaw@zE-MFhghLTo9Jd(sF+2rG2zJQ<fiVzvA
zS^l#0u(_q?UY=52rEfkQzk;67N#Sv3ubk+JQMDN8BWrM#3<pBEJoFmQB}PR_a&r;Z
z;>S6tdERrY9^BiW$JG2chy{DZc_tN)^g%h_e-U4<-4Y)UCr0r8<<BrNJSo)V^5lH-
zRk@+?w3>y$>k9+V;#Bu(4EH`M2+VE%j#tLsfbv)@6&W9V(YgM|HIej*vy<rX2a%(?
zJ_KY-F&GDCK#P947w}+9e*XPOR4ieP^^fDF3$I3`2Rr}Gg=vSoeIj~_EV3`^-4+1G
zQ5pnrGYAV<*vn!1?iAj8`4g#Sms;AMFaEkXO_kz4GB_)Kz|IzH-s85%J(vF*l%kE&
e>O(^QCBOi4MOl0K6vGSv0000<MNUMnLSTZ5Km<Gh

literal 0
HcmV?d00001

diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_refresh.png b/navalplanner-webapp/src/main/webapp/common/img/ico_refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ae6f9fac9375b58896ca169fd21e4eef2dfe499
GIT binary patch
literal 1134
zcmV-!1d;oRP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$07*naRCwA<
zRa<XVWfWcCIp3Kxmrg027MNkEkr4+4Vl=ga0#Rdpzz|3zqL}z#V*CL<`{J{h7~dK-
zJ{gHG#%c^&FDNl;Bn=n2#kOg!NZXl~nKQR@o8#X5Ob5Pnx6{*auf6u#YoDqpiZJ!(
znd+HeKf+q00@E-6C~O>CCt;ZuqI;eyrJ&6OeTv}v9WchRiBov>(3?5^^@Y#tr>EY|
zMk<0qU~!U?q_7)ebZ{GXj+D`jLVnr@Oxsy(*|ZG<$wB<Pwt&yhe+Z{ttLsnCPx^e%
zP)ZV%{50ZZ`tkyoSeu}F@pCRj;4Rm|{E8z5%iH(Ko$1S8`P%8!Q5YKQ18{Gu2kwO)
zOlV@0fu$4Z5@XkQksmIiT-b}BuYQXL<yUIA@nC)r{+Rs*S{oWED?=5u;0YK7CytGj
zFkX5R2g=VNlN^8_cvx7OMIkqatwRO;{oi%enrrBgj&>p`?dxvTr4|BM%IayyBqJQ&
z^E^&I^*U0Cw6yJd9r^rdX@7rUyNmnq+l`+{>i`}RP|Bcw=&<;vsij>$tj80(4kHKy
zeEj|Ua9TBtWVfP}FJpiC={{h&xEFsd&XAr>0p$(_kXdSFB9h@4a`}@VK0rE=!D@XO
zh2b5@Z!XGE=5F6WHnj-}ZNs*b*fDxPt}k8gJ3})Yp0H>r`WXVs-fFrHNmjyIW3e)i
z#nrjkUOlb3E1SUOGu_lY&6d|fgKWT6*~E&13z<qwa+km(>Vp5SdL6MG?1F#><xz0k
zLD!F4W`<1yY<W#+0@4Dgp(QLdj5>1877V2~OMxH^;S(4~5c=YXj^CE9G=EExRu(00
z42COpyTn2T1Q;SoTD7TImTbWr6Elu_LyY$)qWgR_Tf|VNM48O_@}W0)g~YIpwu7p(
zg5PhRlbz)aAv7u&2s74=rC@M=hPzV^F_6k(cKN2TDdz6$TjT7^7t&IjbnZ~FcDd{*
z(q#0d)p^mAgH2D!ET0nN+NMp3ZA@RB!o7#J*-o3m7U3x6cjL(T2^@X=B@B|LF6A<y
z8+1U>F+-mo^0u%=E-hTZiw9m4!Fh7WCSH-?qC90j%<|lov#2=B{kB_f%wF@BaPo5f
z7KSsUxV65BAFq6aIcopvKQkDA;2<6@K0<7U1azsgfNM(^aff!;qIV+CfC2fmyav?C
z_nxgfo%P|i-x9#I#cviHA&JgI45=y`-C#SBjbxLE6%TP^R~gW!q14*zYx?-aDQj~2
zUGZMExq=!c**b+J1%ve7k~BH;tGo{l(TWGqgOe#&$PF(%cEVEp%j9>btJ9ahlmYav
z#H{)(?*2=NUq?}&9S?->9en6Hymj=Q-2Va$0H8_*fHSeDg8%>k07*qoM6N<$f|$n`
AMF0Q*

literal 0
HcmV?d00001

diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_resources.png b/navalplanner-webapp/src/main/webapp/common/img/ico_resources.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb39824e6dfb15efb976f96d56f671859936f4c5
GIT binary patch
literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!gGod|RCwB)
zR6S@EK@|RGXLk4Yayh+t{$Pj^b7&#j<RoAWNnv9lDXfABHpWUJofg_^C4!Y#h#->6
z!d}4;6@p2lSQsy$pdk<yO*HZL_GWx<cJDNpJCY16Z{PRc`{w=a3S$gfo$2y(^I-BW
zK7XG>=k^|)8@PyK;e=@BFIo}KlwX>&r2#BO8toETt^rx);Nj>bdJD(bC3RY5ckk(K
zEE8GQB{tz$$vWfBPD{f1AD@^9Fg4h8SUNGjCBj|pdtfvrXW6ustTVnP!jb+9mLwz+
zZgrTDGrlFlp`)k7t>F^(2K(SR(n{7D-|&>D-c6WS<rnz+^9#c2Dts@E4~uj7_^piY
zjso`Y>_H`5f#(L;k;&s&p&xyR2F1FB*TyfK`_p%z3F5~|+<dCTr$JX}Z7Mp(>UMt4
z7cXJ#^mTM(@}faFH9KKON<;9Kf-6$gGa3RS7$|BW_fEk23N&y*Bd?m@s6-LQN1vhZ
z;Gj_T?B*8U+f1@D4=s{_dLU{f<v;STJun$8=>;24glG`5TOf1rR2o$s+F;jdv$lw4
zSI<y^Yxb>=K?<()5a^tZ=hGl`q(aI~(=-K+>@HI29$wGSz>_XK#A_pxo`$t5db|3l
z)DW|aZ{j$q)~*d_pd6oWlIYBJp*w$oFljSj+*7e+opH9aANw;dlG~d89Bw?iVxGKx
zjKFO}q-!>FO`}z`kE_*RIC*#&SI^uO8(wU_kw?H}l0P}Rm?i6s*E8Dqm!bs~1Dlzl
zV9L)*)@5Sf6rm%G{UJC>M@&qU=sK})f{@Fi&RNL>VYFi9TKxZ`nh|abvPjc9BprpH
jymRXqXZw2Rj{pMz(w6y-!wRL700000NkvXXu0mjfvp8Fl

literal 0
HcmV?d00001

diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_save.png b/navalplanner-webapp/src/main/webapp/common/img/ico_save.png
new file mode 100644
index 0000000000000000000000000000000000000000..0227f4432055f7f1684353bbc2be086f75231890
GIT binary patch
literal 1066
zcmV+_1l9YAP)<h;3K|Lk000e1NJLTq000#L000yS1^@s6VoP>200004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#yh%hsRCwBS
zR7-CYR}?-obM3KloF=v*A%rwkB}H_Dx@k8R52;c?B0SaZx=h8spcYY8Ds1=xNC;Kz
z*j7TK8&nA-*b$O8fdC;WK@kFl7(2G-{cz8B#^btCxuem2%st=v&Uelk?b2_*(1n{9
zX`5L-Gr8}`mwov@FOFl<G>tIY?RIy)dEi?{Wwh0|tL;0_?%f#e-~Q*!^*K_yZt&Om
zz>ebZh4JC>5v4NJvYVvqde>N^jst#r_fZ^CWnin^EiTV~>IU9RK7Ov9`f+lyVK=UQ
zbKu*d7q6D6kT1}l5BHKE`u}02Z(<vRrJ-ncafbQ}AJAZNkgoo5_0H_|`9tdVv%4pL
zJ^k|#E;gBAslQC+feQJ)NADXcV>6p$XFAoJHTrmTH+?bj`2@~Y-Z0r~Opfo+&Y>|X
zZYk2t(`i!70$M7TN0(QZz0q0gnj!oBpB<#RrN1SztjdZr6|yc(t07)vUhf+DNSvg`
z27@C^%-Aa(>jaRKMA?i<51EAJw8-_{1k`H>v|(*fF7V`1wNaI<DmFxDDHzsZ4`;#{
z&Xf`|9)ndks?=g&0rlfhw2Y!ilH|CyfC><p>K%sc1Zw~$`@}&Ih7!8Rq-@VlK%;h)
zfO6<&*5nWz3fX}GZep71nqln>acGEL5C(!_c~$}%x0$Ka6df~0rV9wRAv=tqua?xT
z1_?N1L<L<H->-4z*J^8>WOp>>!e<W&?UvgT&m)zQ|Lvl*yYK+i4}4nU+U7c!%-g=5
zf|AgNCm1cPKB3v=zq(zs8N9cBF$!iuW;bwqnDT%JfPy9FvGPtbxm2Jd&U(8m1p_#0
z`&I2V6?1)}uN!$iOpzQmUURB+{@6J>``u6UaNz;H<MP_Rbq7t1eInTfAZj_{AC9yt
zufP7`E2`Qx$}5wspeKAgWKd36D{>_Jx9;7fqnD2-7x?n6bHCG2dAJ7{QpHjkh@|CP
za_)4Q@~DRv<zi&slWabEF)tr0xiYPLRa#hiEPyC-7~=t3l$FC;!X9T$Ce>vc@Fr-p
zZX6XrQCe892aRN|zolFzC)%b7O)CMQu&?7{9Q?}^d*YhJTyNDSLGmLC0-4c*N%sU@
zK!D?(6S-m+5{Djjev{{qo_$I>;z<r_R-N)@p2i2psFW|!p2}{~4F$fwvEF_0kH9P;
zgH%Ygw=(fYm>%1I^78cJ^y2O1`&YP{i_@>?A}OoEQDK8Iw=yr9rR9{)e#AZR*(lt&
kw57B%b$IG~oc|-h0CMy~=`<Bm#sB~S07*qoM6N<$f;Nc#)&Kwi

literal 0
HcmV?d00001