From e8d8f4a0a3a472604c8ae18789d7d06c0d3668b4 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 21 Nov 2016 02:57:57 -0500 Subject: [PATCH] Use spinner instead of items pane message for search Fixes #1116, and is generally more pleasant --- chrome/content/zotero/zoteroPane.js | 8 ++++++-- chrome/content/zotero/zoteroPane.xul | 1 + chrome/skin/default/zotero/spinner-14px@2x.png | Bin 0 -> 29493 bytes chrome/skin/default/zotero/zotero.css | 7 +++++++ 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 chrome/skin/default/zotero/spinner-14px@2x.png diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js index b766c953d..24156703b 100644 --- a/chrome/content/zotero/zoteroPane.js +++ b/chrome/content/zotero/zoteroPane.js @@ -2165,10 +2165,14 @@ var ZoteroPane = new function() if (!runAdvanced && search.value.indexOf('"') != -1) { return; } - this.setItemsPaneMessage(Zotero.getString('searchInProgress')); + var spinner = document.getElementById('zotero-tb-search-spinner'); + spinner.style.visibility = 'visible'; var searchVal = search.value; yield this.itemsView.setFilter('search', searchVal); - this.clearItemsPaneMessage(); + spinner.style.visibility = 'hidden'; + if (runAdvanced) { + this.clearItemsPaneMessage(); + } }); diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul index d9a83520c..7e6ceba47 100644 --- a/chrome/content/zotero/zoteroPane.xul +++ b/chrome/content/zotero/zoteroPane.xul @@ -197,6 +197,7 @@ + 6&)OX$6K>4YwVAV}{WDTX2-EunY5^bR6b6p-GV^bR3(1VN;UK!VbR zL=b|s#ozkdarSj*|9Rh?+1=ckn{(&n-jh4edFITy_k0qktF1zWPlu0%g+-*Ms-%Bi zGW^p%@a#p z5GW`reUHV)+s)49x@8_wK@mY=7F%~$@bwusF7~`+@`gLtjo^Z84K=Sz!s{JNvs-}l zx}bad-|K!={p;3$9sFy1bZZL>D?Pw$6$|TTnVOPP!W)xNmanv#QB7J#)mUqQDHiR<%bX$4wdiA67Z99Z6~kKas#KNSG$jr70we@^9D>p`{Lj66ZW<64iI`HC~7+Slv^sbXE@DLGO?_g>V@mQ%5rbA{ec@6(0;pgxJ=KW zcFE#XEfB}OH;;BW)q_)Hz*p9fjk&} z+X1PS>>4duJ=gcPeC}!7l#J$jmu{};tT3m~iDEgAdp=PSiFMY(xuBr~dv;R`^xpJR z(}*N_#yblajnVVRQsIH`v4ho-_};MKv`+iH7Cm-kjwY{T!lWDnlp8I4 z$CHTq#i4_u$i~v%nevrUq*S^@NXfT*Njhl;mPghtXpR*%&%;6?dbBvHv4Jk1Q;6Z~ z8NZ*_0Q0j@;<6~=tC(@AS5zb6qs9A*Yym>2mtiq%z8@v>qy0`)72LG?#TpqWOI1VO z8l&(ER=Ak7ymt?+sHN%2+pW~sYnmGEAw|m$MhZD?3sEjS-!5;2WTyD1mhtWyZKr&6Y)&cZ2ogi`qgQ=KX7d|1I{7>*K$O zO@h}*a4mNEQ#%F2>oabu#tqKBOEB`L!9h-0xX;5ShzcWMMjTsF;~Z=s_&F5KW9d1m z)pzFvc61y`XFHTtt9;_Z9aUdZe2&Bq!;53*c{s!(k|aUMmiD=nYRVJkwUOuf8vopF z|93!N8KkX1Z4=C~>*+=?a+C zBplx-V^SsKNclY4x}kZ@$uhbMO~@Fu@P>fdmOu^~f&E#%Nr}04xJP!^JRi<~*+=5v z|Hw2BZIQj;Cy^IY0fU5Vt_*_^28|L{H#nh{ni=iz%q71d#pI{L zlMl4un-V2R!Toh_y^hxU$Uy%?X$H~=2r)2w*#7m<24Rr=h3oLR-;LgN?&?0%?G|!B z>KLV$b?f6^JvhF|@;9rbeDC|YZ5({#b?|82(-!mdOHNReg zyqP2yst5SxsH;Cj=F!yeKZ;17zN{mTrx_?Cl95MLl^vbrglhZIMsOYbaiOg>Iw}-a zsGYy-KKEb@SYVZE^N^`>>t)12Rj!Sw9}B%f>mdkN!DHKUz&@<#jDKabcn^`$q%XB=kL2Zl@{;@h>weIA zTmqt|+jIo+MCN|JeUA30&eN_MK>C|r);jIdpgSosv{uwYQ&lz(;umt?(r?#ysgG~F zXvkQP9x6O-;dr`M5RPKeFeRQFw9@Nwu54iW+2jd}GFA?yW#zXu79MUEtA6XxA-Wx) zxW=wW4OZ9vcuNHLp?XrkSTId z5s;5Av`n|?zZ^0nnF8*oKsF>BAHJuKez|(qHFbE=Gj%3Ab#5v%1jbg0K^pNkxIz^) z`Sm9F>>=a0`TZ0tRyX0Dh%d~95B{*`8J%y@Hyc~ zBvDA852UPHILa4HJ3Mx?1y2QKe3!p4YT)#ODf1+@LEaTd>1q5z_HG6n+_)=x3i%A* zaor&(X|%~3LA2LrB4uJ~9W@0ZJ@ZIO6}yaow_~J|Ew|4?ehPS1GE%z=CkY`%=89b-wi?+UHE^HwkNX!!aaf#-g)zuSDa7&1E1Q zUz}x^A#R_f2}4JOTsOgTIypH*ii+Cg1B;W5ii$Am-rzYbv{3<;<{*g zi1E>CF5watYqbU~*LyI(mMoS5U3-UUTNFy0+P|4p{Bz{T`N`>qOiv$&b0Yx9E5g9&>v;F!M9J z>@SZc>t_Bi{m$P_Cov++zBaw~x9QlbaoyLZ8+lV)o9>?XFji9{I{RHY$1D$JB%I6H zK&exr5f`#qXpBww&7xUD$-D(J{pfi(m20|7DqC&1`b0Q~9nCWa?|_{*AB0<^Hch5> zJ5Rd(m8{#Ahc9wHdp55Q8Uhj#9LYolRUg5}vc#azclYi`&*$t(kh%?OcQxZfofwAi z4FE!t{JWC1Zaq(0$D%@h6pqwDE6%zEU_noWqjjcfqX9hwI(~SabYFbnuIJ%GuL!B2 z5-YHuW2g9XQzu?yKi;B3@`Bk!KO{Mz6ySFwg%FesFssy|@au_(+H{yvS6CK`NYE#k zd00g%VSv|`gXF63n^*@hKiQEEEx<@O9CZ|corQ$Rpjj^`R8JDjdvZErX0~yh@2+G@ zFGVz?DIJja^7{Gry+>2xNgdafc9=+k%cQ(=(=`U1{C@hgN7Cm}?uQi*H6~V@%1?M1 zv{aa(sy`mukjg(*(t(TCN&@8i(nrQR(S*KqU+AaZz3`VJMr!+ejUUXNbO;N6F!SoPn`89{-;b<|j z@W%_O(_Z=qsPhn$iCz6X`P8Ww%MwvwGNITTJ>ds~ZUU2gBPSn^fuZlzGW$ImSn8mQgJr<83xu zP7HLiEsS}1(&2sfZb9kAB$pE-l`_XJ3{j^{4$>1G`dJ{=tbEZXPL>(^jMMT$cV=Y{ zU|+*+P~Y$M8KMJTaprRi=8U@y9}`}68P6M{N(xJMGW`qJP1X~+Qfu*d5@ zV+$t3c4NpKY?Fre{YzIPpDNs8B$p5IgEpKP6kH#-cid~=?Y>ClEjPF;r0ny1*cqBLcP~D?UQl0h$!7)H>KFEzcYbteMfMfxOWt(> z2A(#2C>Iw>t=4{^7cMhrTX_pk?9xveWWD6R#xnVYc_j=kdrlr|%Q!T+8BvHSmo-E)+r@`Xs}zg5)ml=HR{Z zbwJNh8vd#J(cRpeKSJzc>Z@WVESI;^juLkQa(Cy?=HpFrW~^=!>9Hlr;gY~#_USkf(;0@<7|J3E!QX>KH$aWAof4vKs zi*GkM8Vgk-U>Lk;GFg)oqzddFD~$b_JQ&fO$gL)Kx3-M05|`jB)KrKpv#U}yrsMy@V94(eUHz zmHgr$%DAd^RzlGv_f1kccL_}=1nHuH`2?{Oe_~|V#%HW3ceOR2Egsq07<9_*dq`j~ zM<(zd>NK(TiQ?q8Jlqg}CZRr|ge{o7FeEhAaK4}~Bq(n;A7zVg@y|3Jju3=CrAtfW zo8GWpkqKe%Qg3Rn9{d9jYQyhqwTu3C+2l<6^ zZ(RQ*AUTdJpQ?M&`HRs-5P#{U2m_hPW9ufRX$OPtrnVcgw!K|%dj;ICBHCA?8`0Dz z%Cq+esR~COUTl#Qe2~gJ{?YC$6O{zlnfAV3Vf`=A{*j-A%=wRP|lR`1AQ6gIYwSJrd- z;}?I(eEq2Sw}(gs7dz})<`=(ZCj2GylryEt^#nwR>tQUJBCbNA>Xou;g|#-|NIrC2jjRtJ&Q5=39&;;unEiZq9Aq5e z>*fAjnRjVG{3ek931A*&Z688bmXIR5vfff;+Mlm*bJujpPACxnceoQxy_(4;mu#S4R)^SCoOqz@Y85ZWr`$?w zX4(q0Z*QXX2%?_O>-VZ|zbig{Xrqu(-v?F#a+UZPse3buz8;)LUox4vI5@^Y-Tb0U zSoXH2H^KxeUWE>tpu78fxN};x7i*_|ud zHik(xmB;>~1UC*B=%>ifX%4wdoVPtVWA$E>D74yK5SKB2*2xl`lmxnZ(26&skrMQojpIkZ z(2TOI)n?OnDDSr1@(##kO+-+Y@d89}R%_FdE9_1BqGdGvco@WY#O4AchzSUwtWKW( zbCN;ycZW&#^m?uxF8J**@h^wF6O0_L2jqMQq4B~;)Mj%ef*c$+tZWIf@lo+_GF0OM ziuegf;n}@?Gh!>`waE+J>*c*(F0$hfL ziX^9EcUJak`Nahium&ZJHaU?zXrmoy%PT(QiX^@qDpz$E$`^sGFrF_pf%N=a3_y%& zr!JDX%bCvd*?~j03r0QZlx>O>!%|EMhkT6rn`eG9S7x7(2G#uo@lps)-zNmoVCEEc zs5WQ3kDF{<#rdU_az-R0M7w4gOgBH%0vK#0V20xfrrS_`oNc+AN`*M*0*;lOR+m-- zuE*kci9U5S_(EXLD9tQlZzvf%?Y1M?d7j>}V%Wt(_CYIH`py(oH-)HFc`45p?{Y?W z$IpR_uT06g>sh_KQtw>F(vN0KJ1(MbVS6NNFfJecTs~3dWrU5cUX6lFAf;BEUJzHb zpTTrrmefD16O6>ccq&RdHB^<>Yx&r3Z{8aOEU*Wh=9Pbc1kK#)O-b{@CqYuI+DeCz zx#}*3Ce@&cePMUH%m}g6&P!iGA)3V~?9@rJvzhH6eCeR8tvP93$_ijGpxQ1h;;@9n@WLXC(QWa;pKbe32ct;8mU?lam5n86Kc$^^gb8nHH z+%M_V)2iCCCK$d2jI)uzjVgytHhXt9e&`@3xqQUFuyQjA6ttpj*b1!vxwnNl?0v7a zKz(onC>JUHsoRYBk71eQ?@A*A!cDG~e)C&tz%Qk>VvX&uhvj_V=xzJEBDB%{(YWNJ zG!%AVxT4Zy3MHi`9!FMOK?`cNrc?km8$waZ0x!JdIhDYevXVg2l07RaOx;kaY{9kzT zM;(mbD)L9&?8RSfwS!om^Vo%$V$b4Lc}#3LGM8AG1fVk)lD$tu@KzndG=z<>QvG;j zj>4WFlyZMRhVD$9WYBz+4?YhpT%DmEbH5{TjA}2MTB=+N776XHmvX!wlDP=EOhjU> z>q>c1T$2fc-3!Af-d$1hkj|P)t_e6n5La@J_xAFM^6uaVnuZ%V<(zZkK)#URtajA+ywPyY=sXN)V;~hCOzW#SV#Nfy(*oBe zV+I87kcppgOuGiLXrDb3SzUX(5PJ_zS2oi_nZKU4#KL8ex~|q`XD%aEek#+TA_fhM zch3OGY0dbLi$qA$T}s-RkDR4(6LiFZYaHus118MkLUuPEHiR+Hg>aq|Q6s}0(^GLb zl};|gKLq1PG$Nz|b;iAmlfb@9C(i8@Mqr#xSbMuI)|GuW;QMUCvz&ov6PeN3SMPnQ z_7UUoXS0L8uEZ%fRyM+RX5NwW{9*L3C7HjxttJi>SGhL2^|#Svzl_$2{b=;BHyzPg z$SAPXZ^qA7ZQAq8EvNS#mv2^UT@$ z^<58B=WFsY*iVwfj*$vPx%kJ|>Az4d5lp00UXB11m@Oq-iHe&`6 zETZ&br%`##%qlK3M3rOdQtIhqblbFAD`CP5p~fo5&jYsj5~^7I#V5x0UN3ij$2jrO z;QkfaBF}q@n*o9mFZ*)~EM5-;SCefAs^dNtoIl`PB;Rfmo!_^yyhL_LbzzEe6&_^t#PueX9HDP+q;=GLOXfKaf@B*zV^@qzVGB&brR?$)jW zNKkS_p}@sIDPXEIWz^L&NIvl!?Ha8fu};Fusru6Ldp-0W5cvUIxCQTPNW748yww1= zY1jdZmJ33Aux_sx`a$}n)zMw3^s}Yj_!Skb6GAQzsv8zs=F*1SJX(Q`5@JiN;jpVD@EK*v*M5{-5ggt}u z3!JmE!thRMCjGj@srVV1{yDnig!dHNyf{Y2PTbKA1qoBO*xkqn!=QOsm!I|#EHuqL zMV1;r_397N$^S0;`nQeRYtjGx%7fz9nxlrJ(e;|++En&X_7FfxO!YY#GbOjo^R)*s zH6TyHU2~cDVNr_Q;lQdjSivn)1=vfV#^6hqLS>i&DIXhxp5V?yy;QcAA)fi+CpEUU zk|&V;!BCG$xxjB1br*Hb^D>RiDT38QEP38<+eoqNZ+>>&mt5clS-&7|R%io^e_xb< z8+45hc5{w&d}znN{1%C12#k#1j!o*7S-;?mv14vG3L6_%=x17Zm12EXLgN9@$9vAW!{_Vrz)3S{)jaotxG= z)A?f|@xb#O>i{J>x`8{|1EaVcP?fpN+FlTV=}!zepIfd^aIY{yt2jFT5tp8KFD`K-S~BV_6EozJLRGf(^fN`X zqvRhiSipohPv|oi7qBv>HcmH{T0LI)WHdP2*Wc&`+2TRPY37R!-nY#Q47gR3XZfq) zK`%MZh)EzsSMzl5Drrd&+%A-hr#Q)9usfBMI}F#6j!RZ#Cbqfd>h56n`Jg=}WvAVK zD!o1x6fO?f!Yfg454P-uaNwu*^)l#L?I&NJN+XK9SuZv$gzSlhOC58fKrX{yD-F(h zI{Mx3$=PCXG6CCOwNe z4aPTl5p+A{<>U-6L(M~pSZ4iX1G@FD@=n{QTnJAKA?%vkL1Na?y7qcfri5w>j(FdP zV(bk4l8Qr~0u1bLk4oAai3t3FP*hOf`!8kX_-Sm@8#((0!1sIHCp5K{GrhNK@wS=0 z6irFZ=7{gI@zEo0Wt&8zmN-3-e>hF~cc+QD(`T=puKPWBQ~h#U$C1(K*E;$O6a@NhKzXDvvWe291UDo6-u77Tlh17*YBVInGZhQ?)}dPb6l|QCGnx8| z(_%GC>T1oQisUnfmdijdQUAl0uIKJR;7Oim&%v_iLHmc2U@rvGk*yQoqF=RhKSOl0=Gdce=fA9zHvFw z%o5f)K?on`1SWzeH= zNB))0DgY(q!H&d%aXsS;3H<}(*ze^PZTv>>!?vj;8qtL|T^&iU%3^=G8uaAyd`q}v zNVfXXCWIj$!F;{~JvQ1KvaQaf&8T4RkC_Rx%5v7yde82i+ggk*w;J14g!~+H0uhE; zKqXCKkmbIp*THj6qMveSrng86dTnl8Q30#fTKgMVF4$u?Y%aaK7{de+xS6P;S+f9k zBw0vifaCp<7zkr1sw+B8iq-OA8Isa%6Bb0F&`Vrcf$Zk_{Ho}BX;tmr6)1K;w%VFl zgwHHmUXAD^uwr*pg!LnsE1Y7t2e8hbs>S6cAlk`z8G0DRR|o%uZ5J%XV0Q6_!BanX zh#uEG^O=y2Y4k}ky^RdRcs<9rF-D22U6%(yD5#4)xA#yWGIgi@+2Lo?mteL$2ct7y z^Ni$2DM_LJ^zW-(bBBy7kVYax0v9$f6&eZWA?-wOC(6s)J zYD()q^|clAb2RgE(3O<(5W3F3IM{m%{c7^RY!klTB*n$CfFi;`VPPPau&B6*h?p?e zulnB`mIzQ-L`+=t`g;+q>mx}q5iAz*|FS#!qhW7PFOUZd3l`YJ-o+hcXYb)D=w|Qr z#|gg=|99X2$1DD?sQKOho?s6ruj_yl*v;WT|F(biv4oh||DyjzMZ_e8|EK0;0lV HQo{cYf5m(= literal 0 HcmV?d00001 diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css index d17494e96..ceb6647df 100644 --- a/chrome/skin/default/zotero/zotero.css +++ b/chrome/skin/default/zotero/zotero.css @@ -454,6 +454,13 @@ label.zotero-text-link { -moz-box-pack: end; } +.zotero-spinner { + list-style-image: url(chrome://zotero/skin/spinner-14px@2x.png); + height: 14px; + width: 14px; + margin-right: 2px; +} + /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */ @media (min-resolution: 1.5dppx) { #zotero-toolbar-save-button,#zotero-toolbar-save-button-single { list-style-image: url("chrome://zotero/skin/treeitem-webpage@2x.png"); }