Bug 548635 - Provide a toolbar button to open the unifinder. Initial patch from Philipp, additions by me. f=philip.chee r+a=philipp
authorRichard Marti <richard.marti@gmail.com>
Thu, 01 Mar 2012 19:30:06 +0100
changeset 10225 566537137d0ccc9c7d3aa4ecdee0bf56e8c881a6
parent 10224 503595f53b2ec0fe1c43000bee6c32d60ab536ed
child 10226 18c5e81531db0c65f7c7ebff1c3016f0cd0de413
push idunknown
push userunknown
push dateunknown
bugs548635
Bug 548635 - Provide a toolbar button to open the unifinder. Initial patch from Philipp, additions by me. f=philip.chee r+a=philipp
calendar/base/themes/winstripe/images/toolbar-aero.png
calendar/base/themes/winstripe/win-aero/lightning-toolbar.css
calendar/base/themes/winstripe/win-classic/lightning-toolbar.css
calendar/lightning/content/lightning-toolbar.xul
calendar/lightning/themes/gnomestripe/lightning-toolbar.css
calendar/lightning/themes/pinstripe/lightning-toolbar.css
index 9d701f5bdbe197e7e3fc3c20a75ca71468d491d5..a2a73e513e5e11d907607958db7ead9977ed2ef0
GIT binary patch
literal 3952
zc$@)n50CJPP)<h;3K|Lk000e1NJLTq0058x000sQ1^@s6v_4mB000j+Nkl<Zc-rln
zc~sO_md6ofM^+aWl}$DgSqq9Ps(_-3y?_F$D5`*BDK=376*OX0NQ|))rCZH(>`tc>
z&zwG;V|SA7bZf?w#LSG-GiIW5vQ3hS9fM1Y+Q=eXQII?L{_^|TWyw+)(`Wt|&iNi5
zZ@Ii*z0dF7``#-nE3===HwTxP%j*Ase()avuqIjB|MTkuOHj5bSJWz$&m3CC_MyH%
z+*%?iPN?{K<hvMq8x#1jP@m{TA^g4U{2c&Tf^tN;p<GZl7W7|=a!0K}g|hNPxl-E#
z01*)0sCWxSeQke8fZ}-q@$aqd-ND%>2weO^7+EcK25QqaZrN!9lgmQ(@>Nyvf2q%X
zAbA2HC?62kJqGXLCJ+b?xGY<CXYJa6_m3Vux*qFn=j(s|{P~pB)U-DPgMzL(Iyz1{
zIXN4Gf`YG##o{;KefM1f_E|=t%>fX3m3R-Y<-f36VhdK*s3l7u6jNsl)Q5%0b)IJ+
zn4O1)hCBub2MKEDg<gV(JW&7Os63-U^`S6N1*wHvMnTbh1|U0^6%#H#!S~|$DX0JW
zKR*>>U8uQ@xD+XnOc(W`#X^zCP%4#nY#*Dr6bX>1{5b7=SNEMQUTWrjd$Y;PD$<S{
z&)QfFJnpfvu_rvdR!k*{r4SJvH{<5+e*O6I<B{f`gzdkwv$J!*r<d1wWK6<LqDTt-
zR2d^09~sM=@$m2*Z*6Vei+z`yhc-5RG2X|<&dGTAg`dB9XLRaS)Gtvlv!e2=)MjJv
zWHj+YOJ?zeE*gzyE5YmF;4p1(Z*L3?4C*T?Dr#iC>Jp1QP<pofrP$OQ$SJD@c|{|m
zXrYt=C?GOnJV7dlkOVP!`-gu0lb22wV13ww07)QESqbdK(&)kGTCn~5_gkCxVS%xE
zoOU>X$QEah`V^GcK#{hNQ6ZK&NI9F90>r_Sn8-h|(#OvrNY8={c`2kwb76f<!gOeO
z#D~;wHpcVGC!ajH(%a9Nl93C^IA%@2x^Y)GPlJoA$FzS?=(s?V4MG(4*|mFjH+idB
z!dEasVdv}yH-{#EboK5;=e0qD{wgb`jCIsTeOQ2kO~V)qkE=u~eaF?!-MBtF9^wV5
z5SN?^RK}OUn3SCSHuiB^2p*4~=Z>n^gvU;2lvF@oxgK&<I>=MkK#WMn0JN=Z|10V8
zlI!Ap6%b^r0>iId`toWbwpp73G}l5eBy)fshaC<ef`lM50dh7upi(Rah=WHcN;~1}
zA8ZgJG+9MzW)8Ust0Y$e-mBM6QC?#*#^KVXOF3%;gC`_;3P_RVfxFiVSiaJGQ)p=D
zGJk)6_mw`Yi<htRyA{J18py`lpmh@$FJ6@3SUVOTYm^rgzP$Z^;ppxSeFJ0ruMCXq
zzqxCWUtz_RvF<9iQ6K8dLPTS&+4<PFwY7D*y15y7!gL6aiUXHruJ=$QSpJqLOoL^v
zZbr3Qy<^^-i~xz@@z3!y6(HB@L0YJu+Vj+*ll5D+p9zglVgUNf-BHmeUw++?r6~VO
zhLA-Gq>w2u{u#D~n*t;+(><gDbv3hyBr4C=#~h%?VTS`~F*%YY0CDi7NwZG)hlCl#
zS#roJ*4&3Ux3mJnHpCcOx9_-Y29U3|s`^|kUo=ggC$p%G!q$|pe^B3wfB<i<-|E$?
zJ$=^(4oLD#fck1HtItr_V*&C&#Sje6-hsvy0qddfulIVc+!^Wo`qqg43X1zpb=2m$
zCJdZc1#)4G#(HqxaAQpD?Z_A&U?>F}TieT6Ekj9{+S-1Bq4e9x*hB~k3B5(0YF>cC
z;|2XW=y7t(szKk<e)`71JsIUhWjg&iYNvizZViR~^yQO18HH+)B1B;^{L5S$xA6Ew
z$)9+!G6!fjJHx}nQd2EtXFh;LS@}R(EI=GQvfP3bA?r6zrlXh0Ezv#z4}R#ARkiwW
zW@ctuxe&&Niztyqc1K#Eq);&$5E5aaG2+aEslc%HeE|WH_aO=hjnr(2<KL6yl|Y&-
z`!6^)oNVCYM@ces>K)v@KMhYzht=URplfb_1%c`Lx_@{dYA>sOR9Ds1_KNSiC?@rA
za9#N+jU^lGeAYO-xEO^PO5NN&NATYknmlS2dY@r&W<FqoKQl5ivV2~EqLNaLrPVEv
zQBVedy7Y+}>+HG2ntpSAuihCEN#v^WVqG(A;EAWq0h;T7h_dBCnycL$pjmCOi$2%l
zo7<TWpoZ;T(1=<LKpZ^zg{3DVVtA8TMdeVWse|GQJt#1rA`ckDPnoQ1+C=bdXSd{B
zxUe=Fje^M7q-jM(J#GL*L!pte-QgP(#)>QTlsipfxi27+$3PSo7VC?D8|3&xZ%jz0
zP{<=2<V9>9T?c~WM39oJgovaxa9QpL_D;*d&dK#}a&$p017}ZP2*JKdvLf)0P6irF
zHfV>1+Te+aKfMGiR{4(DIXWu2XSKI?l6$RKH7v<125%o<`v2Z@Ces8#d}{W1S$!*{
z%gYRZ?jPcrwArGf+22dgp1+uyUZ9#$H?%>VICI8QfGQfd0_pnzq;1#=l}&AosQf4Z
zaqzY5+y^bY_CEyU0suKF)RiwrCy6F0gqGEA0!{rEW-e4tN|jAEZf@&Ccy^e=V*-!}
z6V#bf9d1te;xY6v5s`5M3ECS|*KLBFQq9!HL{VQPkLMi`EAYoY<As`9;E6JfI6j#J
zXt{qFBxAafDlY>`krpHhEyzlBkgIKgf~rj*uWW)`O+Cm|wUB}J8O0SK&M$*RX(71#
ztz!~uc228O(=+by@Of$Xhxyob7dKBOsuXvWeTkwBOsK`*s??e*6z=BrKxsLOuavc0
zAWK;V+q!z%u`YsZljSS^$ejUY6(~>TYxGdw&<@ENc>@apBu1}8s@>Yji2M6d0MfN=
zzi)@ij{;CdV=L&}b}{gfs9b?SE(8$0eII@FkzayPV%)x`2g>!Ep=#5%`}0Z7Dwy27
zt&`yCz`m=^x87{XNGvMX-6bewMP-IWvFt@=&SHs#C(azBxyjYKDV|u?7cb0sQj}eI
zFAwKas;#+=V`JG67QZGu8brCJP~FmTu0UINwPs7_2Q{s`KGQUJKy_;uRBwF(v@M;W
ztZ##&s%FT>UA3f011UMB;InRnDL}5To%+qM{QQF^vlZnaNY93Vb>Sl<%F*bvh`}5z
zNhtcCvuDq`%?D6eL+g%T<(Jojs(veiA@Bc}4?j!6`l#==@bOb=xyA2mYMWk2lb20b
zY{tpev_P(+?BYTIRW`Na2i(Dg3lf#7&QgHzAp`1K+W$meqONu4eLGYp5cONOeL!!!
zr2uieF3t}3w*>&%?(RN_(Whl%Y<wK{9qRpVK0EecGOV6#>)dk{;pv<W9ut7VySktG
z0Q012Ey9u_lTYxadCZF{$dpS`vI@p3n%ePrp>|3j&4&{7R9VHE>8_q<{}smuaR9Bw
zyeAbsN_s&#WMPPtS2TbMBSP)Az0lCv1N9x<P}8;tG@Cl0RKFGS(Hl|DD#r6Y-{447
zfGCVb?%uQa6aRJLll-(SkQJyviboOX^>7!KK0`U(`WW8Cn!u1VR#s_C=K{$3t7|uN
zvy036%8}Yq^h8M+^1D?Hn~yUdsJOyV-n0Ws^li+<YTI^0rb2Ce_1C}Mj_oVw188`7
zR60C5D&^jIDpTDe0J29V?R&QOSi`p6_dN%dd!9eq%jO2Qi_L**wsb%(%F-N&4%8a9
zZa=iWtDEux7#p8}r=CAbTlUEvUEKuF&bi<*vEg;&#?8%nD&3?SJ(#k(*@*e%q*Pw^
zvbdlmHa%Z;C_}C?XdBx=g&`5!aqhaw8#nrExm^$gP-xU(YQB>3Eb{U?$SbRXY^4tJ
zX?Kb_nH)V_wyF{`F}WvYQy9Zg$Hx%n7aTFj0mRP9jy}WFZ~xPqaz*JiJpUPs;Uy2X
z@7UF+P-*VQ@x?|uL&MYhv7oTX(^hG7K=kMS!LW1xc44brRoP#OuDNRSPDn`0Ww!98
zx+X)%)4kBX?>T7MeE{Qq3$%82z5dPZVS)KU;#`-6Tb}3!(p;B@^Mx=DqNffY{|C;_
zf!-I6P)Oj;M-~f^x#zI}AXjxw^LZI2&d>H9|MuzUeqt!8Y%uQHfAE?m@R+>u8-Dxy
zGp}WrXpNeNR>q4JS2Y^Y?!8=P)li{UKdG!~W&p}A)*4@b>-0b3m=Nw-0T+K``xE<)
zV6HSQlojHkXzk~_x(~hg*83OUIezlgg`OY({NrP<p1RQ8d*b6`zdUuJWAD@NWtVC`
z=cQ&rL~QbK+s-{l$i^(!7@nv&loF*tZ5$mP&C1MIe9lYBm?DVclGDb*HYU6@=L6z4
zJ^JG>E;s3#wtR?*-ZZ*Y2B6}qhRMzYy|AO_dDyh`DX460{S42Avd!<r=1Za(&olb4
z=dm;gVh{TGPxrp?vuA$%)58Q5f%T}nu*IGO(FZJ7S6^4^8V0(bJ@UmL-hSue&Hmee
z#QHW%;4w|a>A>=>GiP5X?^2}I8#Rp-=65pEU<!dJ<hWqE$v575`#0=MVsCN^?e)#A
zq4e8B<264z`r`A^{PfY^o%@fIZ=Cz!#BBQAd;flNeXL;Qz~Q4uXbg=d8}r<UIj}D*
z!ETNBV&Ytd>PtKwpQ0m$D4wu?-UsZvGrauP(3s-C{`<@Jz0W-N8UZAf<{4<0K`KJ`
z7$?N6JtgBE)BI;4fEN0(B#CAp&L6dQHhAU($W(L?N!xCP$yLUKr`fXuJTNdqXH(ly
zI+O?%%-+6R{51?V7ov;G*xR@Ny8B@7u}^f(Z3CI;ZOAKCH@6QQJbdiqn>TM!G9JY~
z^AZz)Y`A+cpMa1{YcMJH@C^h9XAiJ<b_a)Lo>+EgxALyc7Jrq0D0uk=UNX54vsujA
zAVg{Es=5pO^sLc%p+s-dAcV*n&wzLY$-updI#h$H`Ul4fX7fOt;_-qo5wrSaX&$6x
z(iu=8BPvrJwNW3l3rw5GX~*<}b+MXb;b}2F*sp8YT6D=cH%OFw_@EL{`KT&XB`S{%
zB`fE;K0p8*Q9-x{<+q2&8!Qp^r7<-25$0;czPO&>=j$Hxe#wmeP}9DT9;Y4iT<81P
z_<_GeWX*!<&U!Nkwr<Hh-vzQ}A@XEBiq8V_X8SsF_h66f=YIihZ_=>^yb{s?0000<
KMNUMnLSTZa48a@#
--- a/calendar/base/themes/winstripe/win-aero/lightning-toolbar.css
+++ b/calendar/base/themes/winstripe/win-aero/lightning-toolbar.css
@@ -78,27 +78,28 @@
 
 #calendar-newtask-button,
 #task-newtask-button {
   -moz-image-region: rect(0px 72px 18px 54px);
 }
 
 #calendar-edit-button,
 #task-edit-button {
-  list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.png);
-  -moz-image-region: rect(0 36px 18px 18px);
+  -moz-image-region: rect(0px 90px 18px 72px);
 }
 
 #calendar-delete-button,
 #task-delete-button {
-  list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.png);
-  -moz-image-region: rect(0 144px 18px 126px);
+  -moz-image-region: rect(0px 108px 18px 90px);
 }
 
 #calendar-goto-today-button {
   -moz-image-region: rect(0px 54px 18px 36px);
 }
 
 #calendar-print-button,
 #task-print-button {
-  list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.png);
-  -moz-image-region: rect(0px 180px 18px 162px);
+  -moz-image-region: rect(0px 126px 18px 108px);
 }
+
+#calendar-unifinder-button {
+  -moz-image-region: rect(0px 144px 18px 126px);
+}
--- a/calendar/base/themes/winstripe/win-classic/lightning-toolbar.css
+++ b/calendar/base/themes/winstripe/win-classic/lightning-toolbar.css
@@ -209,8 +209,24 @@ toolbar[iconsize="small"] #calendar-prin
 toolbar[iconsize="small"] #task-print-button {
   -moz-image-region: rect(0px 240px 16px 224px);
 }
 
 toolbar[iconsize="small"] #calendar-print-button[disabled],
 toolbar[iconsize="small"] #task-print-button[disabled] {
   -moz-image-region: rect(32px 240px 48px 224px);
 }
+
+#calendar-unifinder-button {
+  -moz-image-region: rect(0px 528px 24px 504px);
+}
+
+#calendar-unifinder-button[disabled] {
+  -moz-image-region: rect(48px 528px 72px 504px);
+}
+
+toolbar[iconsize="small"] #calendar-unifinder-button {
+  -moz-image-region: rect(0px 352px 16px 336px);
+}
+
+toolbar[iconsize="small"] #calendar-unifinder-button[disabled] {
+  -moz-image-region: rect(32px 352px 48px 336px);
+}
--- a/calendar/lightning/content/lightning-toolbar.xul
+++ b/calendar/lightning/content/lightning-toolbar.xul
@@ -138,16 +138,20 @@
       <toolbarbutton id="calendar-delete-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&calendar.taskview.delete.label;"
                      observes="calendar_delete_focused_item_command"/>
       <toolbarbutton id="calendar-print-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&calendar.print.button.label;"
                      observes="cmd_print"/>
+      <toolbarbutton id="calendar-unifinder-button"
+                     class="toolbarbutton-1 calbar-toolbarbutton-1"
+                     label="&showUnifinderCmd.label;"
+                     observes="calendar_show_unifinder_command"/>
     </toolbarpalette>
 
     <toolbar id="calendar-toolbar2" class="inline-toolbar chromeclass-toolbar"
              toolbarname="&lightning.toolbar.calendar.name;"
              accesskey="&lightning.toolbar.calendar.accesskey;"
              fullscreentoolbar="true" mode="full"
              customizable="true"
              context="calendar-toolbar-context"
--- a/calendar/lightning/themes/gnomestripe/lightning-toolbar.css
+++ b/calendar/lightning/themes/gnomestripe/lightning-toolbar.css
@@ -218,8 +218,24 @@ toolbar[iconsize="small"] #calendar-prin
 toolbar[iconsize="small"] #task-print-button {
   list-style-image: url("moz-icon://stock/gtk-print?size=menu");
 }
 
 toolbar[iconsize="small"] #calendar-print-button[disabled],
 toolbar[iconsize="small"] #task-print-button[disabled] {
   list-style-image: url("moz-icon://stock/gtk-print?size=menu&state=disabled");
 }
+
+#calendar-unifinder-button {
+  -moz-image-region: rect(0px 528px 24px 504px);
+}
+
+#calendar-unifinder-button[disabled] {
+  -moz-image-region: rect(48px 528px 72px 504px);
+}
+
+toolbar[iconsize="small"] #calendar-unifinder-button {
+  -moz-image-region: rect(0px 352px 16px 336px);
+}
+
+toolbar[iconsize="small"] #calendar-unifinder-button[disabled] {
+  -moz-image-region: rect(32px 352px 48px 336px);
+}
--- a/calendar/lightning/themes/pinstripe/lightning-toolbar.css
+++ b/calendar/lightning/themes/pinstripe/lightning-toolbar.css
@@ -75,16 +75,36 @@ toolbar[iconsize="small"] #lightning-but
 .calbar-toolbarbutton-1 {
   list-style-image: url(chrome://calendar/skin/toolbar-large.png);
 }
 
 toolbar[iconsize="small"] .calbar-toolbarbutton-1 {
   list-style-image: url(chrome://calendar/skin/toolbar-small.png);
 }
 
+.calbar-toolbarbutton-1[checked="true"] {
+  color: white !important;
+  margin-top: 2px;
+  margin-bottom: 1px;
+  padding-top: 1px;
+  padding-bottom: 2px;
+  background-color: rgba(0, 0, 0, 0.2);
+  border-color: transparent;
+  border-radius: 4px;
+  box-shadow: 0 1px rgba(0, 0, 0, 0.4) inset, 1px 0 rgba(0, 0, 0, 0.3) inset,
+              0 1px rgba(255, 255, 255, 0.5);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.4) !important;
+}
+
+.calbar-toolbarbutton-1[checked="true"]:-moz-lwtheme {
+  color: inherit !important;
+  background-color: rgba(0, 0, 0, 0.15);
+  text-shadow: inherit !important;
+}
+
 #calendar-synchronize-button,
 #task-synchronize-button {
   -moz-image-region: rect(0px 864px 32px 832px);
 }
 
 #calendar-synchronize-button:hover:active,
 #task-synchronize-button:hover:active {
   -moz-image-region: rect(32px 864px 64px 832px);
@@ -278,8 +298,32 @@ toolbar[iconsize="small"] #calendar-prin
 toolbar[iconsize="small"] #task-print-button:hover:active {
   -moz-image-region: rect(24px 360px 48px 336px);
 }
 
 toolbar[iconsize="small"] #calendar-print-button[disabled],
 toolbar[iconsize="small"] #task-print-button[disabled] {
   -moz-image-region: rect(48px 360px 72px 336px) !important;
 }
+
+#calendar-unifinder-button {
+  -moz-image-region: rect(0px 704px 32px 672px);
+}
+
+#calendar-unifinder-button:hover:active {
+  -moz-image-region: rect(32px 704px 64px 672px);
+}
+
+#calendar-unifinder-button[disabled] {
+  -moz-image-region: rect(64px 704px 96px 672px);
+}
+
+toolbar[iconsize="small"] #calendar-unifinder-button {
+  -moz-image-region: rect(0px 528px 24px 504px);
+}
+
+toolbar[iconsize="small"] #calendar-unifinder-button:hover:active {
+  -moz-image-region: rect(24px 528px 48px 504px);
+}
+
+toolbar[iconsize="small"] #calendar-unifinder-button[disabled] {
+  -moz-image-region: rect(48px 528px 72px 504px);
+}