From 7fa0e34a5e7671cb38d968746583e96ea7fb47aa Mon Sep 17 00:00:00 2001 From: Michael Sheets Date: Tue, 5 Feb 2013 14:41:05 -0600 Subject: [PATCH] Restyle and add graphics to file browser action bar --- .../gfx/Header Icons/Computer Pressed.png | Bin 178 -> 0 bytes .../gfx/Header Icons/Computer Pressed@2x.png | Bin 279 -> 0 bytes .../gfx/Header Icons/Computer.png | Bin 235 -> 0 bytes .../gfx/Header Icons/Computer@2x.png | Bin 492 -> 0 bytes .../gfx/Header Icons/Divider.png | Bin 0 -> 102 bytes .../gfx/Header Icons/Divider@2x.png | Bin 0 -> 156 bytes .../gfx/Header Icons/Favorites Pressed.png | Bin 298 -> 0 bytes .../gfx/Header Icons/Favorites Pressed@2x.png | Bin 525 -> 0 bytes .../gfx/Header Icons/Favorites.png | Bin 354 -> 215 bytes .../gfx/Header Icons/Favorites@2x.png | Bin 700 -> 338 bytes .../gfx/Header Icons/Home Pressed.png | Bin 179 -> 0 bytes .../gfx/Header Icons/Home Pressed@2x.png | Bin 215 -> 0 bytes .../OakFileBrowser/gfx/Header Icons/Home.png | Bin 240 -> 0 bytes .../gfx/Header Icons/Home@2x.png | Bin 409 -> 0 bytes .../OakFileBrowser/gfx/Header Icons/Mount.png | Bin 162 -> 0 bytes .../gfx/Header Icons/Mount@2x.png | Bin 227 -> 0 bytes .../OakFileBrowser/gfx/Header Icons/SCM.png | Bin 0 -> 190 bytes .../gfx/Header Icons/SCM@2x.png | Bin 0 -> 267 bytes .../gfx/Header Icons/Search.png | Bin 0 -> 213 bytes .../gfx/Header Icons/Search@2x.png | Bin 0 -> 367 bytes .../gfx/Header Icons/SmartFolder Pressed.png | Bin 601 -> 0 bytes .../Header Icons/SmartFolder Pressed@2x.png | Bin 1282 -> 0 bytes .../gfx/Header Icons/SmartFolder.png | Bin 601 -> 0 bytes .../gfx/Header Icons/SmartFolder@2x.png | Bin 1282 -> 0 bytes .../OakFileBrowser/src/ui/OFBActionsView.mm | 43 ++++++++++-------- 25 files changed, 25 insertions(+), 18 deletions(-) delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed@2x.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Computer.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Computer@2x.png create mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Divider.png create mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Divider@2x.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed@2x.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Home Pressed.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Home Pressed@2x.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Home.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Home@2x.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Mount.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Mount@2x.png create mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/SCM.png create mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/SCM@2x.png create mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Search.png create mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/Search@2x.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder Pressed.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder Pressed@2x.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder.png delete mode 100644 Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder@2x.png diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed.png deleted file mode 100644 index dd874722f8adff9355749a36c637144598db13b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~q!3HGX7W?Z1sY*{5$B>F!XD1tS9Z(Qp`K-*n zHIQZg0(}Ab?Cei-CnQZ4?lyTQbg9B%!wIXacbOiDPv%@QwpJyn!o=Oe8t1M z_K5N315w@LJ*<}L--^95H59adO$ic6cHvm~^mfi0B~HaD*M1osYgpiuA8$7Cl=ZJK dYo6_C753pQ+NdJV-~n_5gQu&X%Q~loCIFXkLSX;^ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Computer Pressed@2x.png deleted file mode 100644 index 556471c5d4d4e871babab1c70fb113d34842ac1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmV+y0qFjTP)D1iAS-lLV^q$_%BKG=hITi1prP} z0!RS6$)YH3s1XHB8p$&npsK2g8aYLt(Ev&*XxkRLu455-k!Li(W;ho_JODKaC;=pZ zKLV)h8U!Q&&`1L`r~iSI03LnMKHL}+58%C@uz_v3wHDCxdt@QGqdu?`^E`udZaai> zYb_9O@?_bF@I606UrII6l`P9Lo##1}Ww{-`=BP$z!~nF`FQruQuBmp#Gm=Z`0Ka2M dYk2}Vq6OlXT>_Ra;Ku*}002ovPDHLkV1lMvYw`d9 diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Computer.png deleted file mode 100644 index 4ca412351943d48af042bea09093246c1ae8e972..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmV5r00028NklR>WkYe)pGf0{xgfuQZW>(f$=>@=FoJ`O(&6dFz z?xA292Bef=Bpnzm<6ZMjC@}LQhc8(2bQ$+TEGWm8VG`~mM(&|t^dl#gB*r|51*(FA zILc&KA`%PMb%jtMqU`FODOi>z5)?LY_I<}Z-!M&6=^yim1*ER)s%_g>*LCRo9@pIc l*)LzBA3woiug>`|yaDJFp-YF&)dK(k002ovPDHLkV1oSbUq}D| diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Computer@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Computer@2x.png deleted file mode 100644 index 583680291e8f352a72e1b6af48b81cf11e66b522..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 492 zcmVqLoOf)j-mz zGVHZ|$or$hGaA5$a1k2NlmP%^px8dnZS4T#Lh%5dTcL`DpvN$SU>L&*#oq}4qCx-| z(9~uTXZHRGAOg{dXU=@v^X!MS??a>kz`zSkPzBXOED*gm48op;n>@rlNdmAin3zGR zc3T4!R7eO15!_&~8xH`}XjPGWDF9_z>X=;VLUpL@p}O8K=B}Mli2#nF&cP7ExfhJN z)v<8L8V}$sz`_ZGvq3-%CaCQ}=vj>hz%pc}gdq?@7)l60aR%XcB0y8ucoDJy7`70E zVSt^7JLXZ>bv(f3a=GD!-mSYgo>V!2Ynn!b=XWds^b+)?BhUSQ*VE|~AQ*-a^e~%v zKH)jb7t!Hxc%QmGW)J-&%d*$idcD^Dem@9D53?-GRu2Qn^ZcWDD<=Q{q9_zQ^8-+4 i{rx#FpXCccihcmPMMPT)Z?mod0000F9*qwKQo5cljv*YftOpnJG8k|$Y*5=# z$@hTajZD+u`YTZkEbU7&^bUWj&^f$RbCNT|kK{>AXZKo5qyRNCc)I$ztaD0e0sy-{ B9QXhL literal 0 HcmV?d00001 diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Divider@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Divider@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..37fbe84aec2c9816c4bf8a023127f738a9bb144b GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^Oh9bF!3HF)Syndzsbo(V$B>F!OD`yLH8_a4UgVb2 z3EncpCwNN)3#;Rizwa~uoVeQ{#kc3%{ohl9Y}A{Gmwujiav;#SFUzSEm_v#FbcBcDh|z`0M8fY3Zi8vwN)_{D9Umc)I$ztaD0e F0szvvH_iY6 literal 0 HcmV?d00001 diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed.png deleted file mode 100644 index b179b74cb1fdfea08382d3df26f32ebc203878eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmV+_0oDGAP)5r0002-Nkln5h0q|-@}jD zo&Dy6-I*N$z*qdNJa29LHUFo(GD!w~=)tXFW9_cS({8S(ZUj6rd;w z!i{=P6vcwHEd$H4w7aku(vY@g5Qd?qs_LKtX-NC*4VWMZO1uX2;ro6`+O95aJkRSa zc3l^$s@nFpG0*eBahz7MZQFonJJgJa25FLI+1@nGM=`C_G(FJStCKiQlH_O@2I#sD waU7p8H+y%K=TQ`$kr>yDPyfP_`0Ho70-DTbkQQ+-+W-In07*qoM6N<$f?p?rn*aa+ diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites Pressed@2x.png deleted file mode 100644 index 51938bec4844e06de531b2c7c3a0133cfd884cdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 525 zcmV+o0`mQdP)``$7;^VSF<{|eiHZNN0Z?RGl=XMih& zF?Lvsn}nG-=ka(Xc$0A$b3ARFB?FiU1UeG=d_Lm$`w=)Ek{fI12(!3ZCZ>LNj^k9X z*GmF{00{5r0003gNklb5y7ATPlUgEGbJ_Pp++E8hu4S_(#<*s0E z2F#Igp5GR~%*X!czs1gOA>yz2djnn92gDJ_&ApEP@UdZsY6261Y>_4thH zlXnf+ePr8n0ENnNP$|IS*^r@JH2`7Tqd9BW3|!aMKwY$ANA+R{0HAy2YHJ2bl4#@0 zG2cP}f&)Cvk?4A?VQt@l8BF8pLQ08(kShdA(baJrFIcGgeh~7lz@=L=uAXAPA7o?n$%#*&^+fW%=OyemhLuP+k diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Favorites@2x.png index ca88b582163671e93437f1a41343266ba480916e..12361acfb8cb8deeece58939c3ecc81c95c7835a 100644 GIT binary patch literal 338 zcmV-Y0j>UtP)4m8gx0-thC(}eBd*Qnl38$W7yqnxjX% z3rb99dBR!5;LHWP5rbV9Y+@N9wnTIH^0y-d+u`SJbi&w3`+!eQ5SxUZFgmO;Hq<&{ zG{e`iA-~PkfD*mIn?1&ct)*3sCK#YRAXNIZi6NneTPPrk0xe~JbhLpURuFIH?=_TJ kE#VYXFSYLfe}rrI1MFALfZGPYF8}}l07*qoM6N<$g2D)u@Bjb+ literal 700 zcmV;t0z>_YP))Fk~{BB#_Faf>3bLSj|`*Yg~DzKLwWd*MB^xCu~E&uMtfg5#n!+Ut2j#suNwgt4B;q&@vyn=?WaC^o{Me( z)M~X?mSsuPG#R0y02~=%3Y|0bqSov6my>)6FIV1GhNjR>(OisjAoQ3-^}0}VY)mM2 zc0T+>uS*ksihbWtmrAA3358IY075#_7^pE&CLV8YO8jp9&!5rpe!u_rK|T*re&otT zkSjrDC@}SKZA}gagXh!uJ3iIvbUwQo_xB?YFj<_zIGepMd%fOA>^(WH`@qF!qp`bk zZzX(UM1V0Ha$Q$8o6Yaob9UMnk}IuNt3d)HbZQpQWHYkeZttRY;h=6r3nY-s<+Lyx z$>TlgcDr=)`GdZa&Ev)VQYaJx@%4>$df`4{?ZRQ*3C|3N!}sNKSrW)Am^*#gm(mm9 i5!j%7b}gS7n3P}Ehh%rvU#^b;0000F!XD4suWKa}f*)RO| zfCF=&!0-G=%-lQo^M+V_;Bl!)Oqh6+m04cN>e0J~@Anwa2A(!N#%6JQ>hfvcnk>IK zoG*o*-Wq1$Heu<0P5)nWYtC_;vlMp9&{RETso!{b-BjiS2Kp+z7CkaE-mvZZ{+RLB e9PRpt9sH`iS?c^eX`w(@FnGH9xvXF!Z?7409X8-`dw9>I z`D4PIgXWhnPR-cl?R)hDQ*26wx57_*j>bJ_-mF(uV0`f`sH=*D;rLl)4wHLPpX~&= z&p0ti$|qOkckE`c+UKfs-I+n=zOsda-2XNP1|z$}40d+h_JMYC%r<*j1qAnQidy~k zUf@3-!H*_vXTF@`XVXz5r0002DNklEr0tg_XUWvkv6r*) qPprXH(#&H4LLJ5e9;`>+!YzKdE0wndenzMO00000j#r diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Home@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Home@2x.png deleted file mode 100644 index 92c4c179caed4d7df92f068d3610134c9e39321c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 409 zcmV;K0cQS*P)gvL)oeiea%zg-liN!DV&;F%EpQ7oJ?xw- znkIopIBQxYn&3VJ4wAjZMvOZP03N*OoD%1pM8ZSjg93nuz$vFC*{a`cLVH;vwVwdi z?g38{gS~8`N@@BCj1}%D!1K(rNz9TelOU-5b^*XA?`5b#Es%JE=Ct&!&aE2&d~_pE zVS2(uz(Dnk9yYPN@7!4aBp~486z(S-_BQFwJ(;5^mju3tp$x;okH>>!j7*YfAts5P zNnazRp?bzMKQcq+vCJ!1Hc)uEDvU_Mq!mIHsJ$vj^dhpkt_UCoH5fz;uC)TOflW1$ z_FsVk*TJ-cX%&;YB+?e%O~4=kRT%)S;vRJt*niHnJs%SxsA(67%La~6eBsc?`(n2Z z01OdixAH^!2pkhnd+}2OSowKk4*_nx?!V=?z*&9)#Y%N>an>Hj00000NkvXXu0mjf DP(iOH diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Mount.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Mount.png deleted file mode 100644 index 662a44d2b7bb22f7e8784038283fd88d849478d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`nVv3=Ar_~TfBgS%&#WqOP=Wcv z9R^i}dn`x2mPj1nJo44y5APDTuKkWjEjT3~Fdr$OV6y13b%5y>?q)8VZHEi2eR&t$ z;NIs@Bi{eEd|?)cTQc*sj2s0usfmq70{Lx8PZ>Q=Es=E4V`Dg7z{_;$df`i;r3{{~ KelF{r5}E)Tx;Iq- diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Mount@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Mount@2x.png deleted file mode 100644 index 45281281e5c2710fffb2d2beecdba9f1954e9590..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJRh}-6Ar-gYPT$DeV8FwYxtVPZ z^Y06e$L%)ot#QoWSMYs-LqW%coR_mq=KK@(4p9mc5ie-Ge7GlBE1)@Y<$e*41O{t? z)a#okL@!{~p1>V;;TC7Xog(hFM;#g-_Z{A^hahKg9y*Y6eeNKbLh*2~7a(kyeZV diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/SCM.png b/Frameworks/OakFileBrowser/gfx/Header Icons/SCM.png new file mode 100644 index 0000000000000000000000000000000000000000..2592ca4e22e39bde2bb30d0c512d440e7b582d09 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0y_R!!s$ztiWfao(U8<_Ja$Q3eg o`_9O5=g^PmJss=ZW$He$dp`NO@I}v8kP8_+UHx3vIVCg!0LLLnhX4Qo literal 0 HcmV?d00001 diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/SCM@2x.png b/Frameworks/OakFileBrowser/gfx/Header Icons/SCM@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..470599a8999611d0a55f48f076934176807a219a GIT binary patch literal 267 zcmV+m0rdWfP)5MK)K|c zJMOnI39FEmRhaZU!jdHwwIo9dg|)IM1SOVAK_aFwE1?++WgI2Kg?=J9QnWz6X}GXT zdtsINiEMtP_R8Cpf<%B2BtnJ${G%$ojutLo^LH-nd-f3C!v3Rw3lb{NasfCbAt0fR zeH2Crqa(w@s6CwR2)XcORdIxH1|o2I|HYdI0G=4<71l^M;}3qWO*8zd{{bm)AqMJc RHB0~i002ovPDHLkV1j~WXL0}l literal 0 HcmV?d00001 diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/Search.png b/Frameworks/OakFileBrowser/gfx/Header Icons/Search.png new file mode 100644 index 0000000000000000000000000000000000000000..5346b54a0b710e3ad2f1f932c715279c0eb0c6a6 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0y_Ii4<#Ar-f#UfjsrlpxTS81*ue zXZnT$j*Bin5yui1a_?x|==6O-!(-ijGqnFP?|E`kUT=@0!?*J@ZuZaT)hc;W8g{Ea zu}|IYPQgXXjQQ>l122lzdA;Qiys^+VE2?JE26x$(^e@@-U*uOj=zcQCV9}R_>v(;& zKE;gP`UWS!AtcyB9d`k;rb;@5JhncQouo|fOPI6B?yki5fD(t5)E}Y1Er4;B%p&HSrkCCd_}()fi%|lT8#84 z?D_jFv$Jl55MIjvPt6r2`~p8<3$A3#Yu|MWJ75ih2YWiP!cS0?h%5y&x{yzMGK*co z6r`X{QZVPeKu*j`!UW`Ikt6tU{@*@(0?9$52nQy7;eut=V{ae>MVOi3M3{n!$z_Ug zXM(99Oiga52<;|l3c`20$rNExQP{33+|=+&_lj_7f-^xlH@T%E96gLh&$BSseHe=& z@X8(hgEx!3cX%3nzoetBMV^i}vJ!;O;jOVKk-DF!yiCBJUqR}AfD>+ljNAPN&ft&N zhU|Hx#F4r}y(B4wRZyk%3t5RHjTY+Cc%d$h6zbAAp)MWA2t_Gms5^ydeC#SJCU*b; N002ovPDHLkV1o9go3{V} literal 0 HcmV?d00001 diff --git a/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder Pressed.png b/Frameworks/OakFileBrowser/gfx/Header Icons/SmartFolder Pressed.png deleted file mode 100644 index 79146c982a2dcd9b0d93de132808e60e780571dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 601 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 #import -static NSButton* OakCreateImageButton (NSImage* image, NSSize imageSize = NSMakeSize(16, 16)) +static NSButton* OakCreateImageButton (NSImage* image) { NSButton* res = [NSButton new]; - // [[res cell] setBackgroundStyle:NSBackgroundStyleRaised]; + [[res cell] setBackgroundStyle:NSBackgroundStyleRaised]; [res setButtonType:NSMomentaryChangeButton]; - [res setBezelStyle:NSSmallSquareBezelStyle]; + [res setBezelStyle:NSRecessedBezelStyle]; [res setBordered:NO]; - // image = [image copy]; - // [image setSize:imageSize]; + image = [image copy]; + [image setTemplate:YES]; [res setImage:image]; [res setImagePosition:NSImageOnly]; @@ -27,11 +27,12 @@ static NSPopUpButton* OakCreatePopUpButton () NSPopUpButton* res = [NSPopUpButton new]; res.bordered = NO; res.pullsDown = YES; + [[res cell] setBackgroundStyle:NSBackgroundStyleRaised]; NSMenuItem* item = [NSMenuItem new]; item.title = @""; item.image = [NSImage imageNamed:NSImageNameActionTemplate]; - [item.image setSize:NSMakeSize(12, 12)]; + [item.image setSize:NSMakeSize(14, 14)]; [[res cell] setUsesItemFromMenu:NO]; [[res cell] setMenuItem:item]; @@ -39,6 +40,13 @@ static NSPopUpButton* OakCreatePopUpButton () return res; } +static NSImageView* OakCreateImageView (NSImage* image) +{ + NSImageView* res = [[NSImageView alloc] initWithFrame:NSZeroRect]; + [res setImage:image]; + return res; +} + @implementation OFBActionsView - (id)initWithFrame:(NSRect)aRect { @@ -47,15 +55,15 @@ static NSPopUpButton* OakCreatePopUpButton () self.createButton = OakCreateImageButton([NSImage imageNamed:NSImageNameAddTemplate]); self.actionsPopUpButton = OakCreatePopUpButton(); self.reloadButton = OakCreateImageButton([NSImage imageNamed:NSImageNameRefreshTemplate]); - self.searchButton = OakCreateImageButton([NSImage imageNamed:NSImageNameRevealFreestandingTemplate]); + self.searchButton = OakCreateImageButton([NSImage imageNamed:@"Search" inSameBundleAsClass:[self class]]); self.favoritesButton = OakCreateImageButton([NSImage imageNamed:@"Favorites" inSameBundleAsClass:[self class]]); - self.scmButton = OakCreateImageButton([NSImage imageNamed:@"SmartFolder" inSameBundleAsClass:[self class]]); - - self.createButton.toolTip = @"Create new file"; - self.reloadButton.toolTip = @"Reload "; - self.searchButton.toolTip = @""; - self.favoritesButton.toolTip = @"Show favorites"; - self.scmButton.toolTip = @"Show source control management status"; + self.scmButton = OakCreateImageButton([NSImage imageNamed:@"SCM" inSameBundleAsClass:[self class]]); + + self.createButton.toolTip = @"Create new file"; + self.reloadButton.toolTip = @"Reload file browser"; + self.searchButton.toolTip = @"Search current folder"; + self.favoritesButton.toolTip = @"Show favorites"; + self.scmButton.toolTip = @"Show source control management status"; NSMenu* menu = [NSMenu new]; [menu addItemWithTitle:@"Unused" action:@selector(nop:) keyEquivalent:@""]; @@ -70,8 +78,7 @@ static NSPopUpButton* OakCreatePopUpButton () NSDictionary* views = @{ @"create" : self.createButton, - @"leftDivider" : OakCreateVerticalLine([NSColor colorWithCalibratedWhite:0.551 alpha:1], [NSColor colorWithCalibratedWhite:0.801 alpha:1]), - @"leftShading" : OakCreateVerticalLine([NSColor colorWithCalibratedWhite:0.869 alpha:1], [NSColor colorWithCalibratedWhite:0.869 alpha:0]), + @"divider" : OakCreateImageView([NSImage imageNamed:@"Divider" inSameBundleAsClass:[self class]]), @"actions" : wrappedActionsPopUpButton, @"reload" : self.reloadButton, @"search" : self.searchButton, @@ -85,8 +92,8 @@ static NSPopUpButton* OakCreatePopUpButton () [self addSubview:view]; } - [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(24)-[create(==22)][leftDivider][leftShading][actions(==30)]-(>=8)-[reload(==22,==search,==favorites,==scm)][search][favorites][scm]-(24)-|" options:0 metrics:nil views:views]]; - [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[create(==leftDivider,==leftShading,==actions,==reload,==search,==favorites,==scm)]|" options:0 metrics:nil views:views]]; + [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-9-[create(==22)]-1-[divider]-5-[actions(==30)]-(>=8)-[reload(==22,==search,==favorites,==scm)][search]-1-[favorites]-2-[scm]-(12)-|" options:0 metrics:nil views:views]]; + [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[create(==divider,==actions,==reload,==search,==favorites,==scm)]|" options:0 metrics:nil views:views]]; } return self; }