From db7daed065e641563664cd56ceac0f5e12bb4706 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Sat, 20 Apr 2002 07:46:53 +0000 Subject: [PATCH] Initial location abr commit. NPOB. --- camino/BrowserWindow.nib/classes.nib | 1 + camino/BrowserWindow.nib/info.nib | 6 ++- camino/BrowserWindow.nib/objects.nib | Bin 17919 -> 18010 bytes camino/CHLocationBar.h | 0 camino/CHLocationBar.mm | 46 ++++++++++++++++++ camino/Chimera.pbproj/project.pbxproj | 4 +- .../BrowserWindow.nib/classes.nib | 1 + .../English.lproj/BrowserWindow.nib/info.nib | 6 ++- .../BrowserWindow.nib/objects.nib | Bin 17919 -> 18010 bytes .../projects/Chimera.pbproj/project.pbxproj | 4 +- .../BrowserWindow.nib/classes.nib | 1 + .../English.lproj/BrowserWindow.nib/info.nib | 6 ++- .../BrowserWindow.nib/objects.nib | Bin 17919 -> 18010 bytes camino/src/browser/LocationBar.h | 30 ++++++++++++ camino/src/browser/LocationBar.mm | 46 ++++++++++++++++++ chimera/BrowserWindow.nib/classes.nib | 1 + chimera/BrowserWindow.nib/info.nib | 6 ++- chimera/BrowserWindow.nib/objects.nib | Bin 17919 -> 18010 bytes chimera/CHLocationBar.h | 0 chimera/CHLocationBar.mm | 46 ++++++++++++++++++ chimera/Chimera.pbproj/project.pbxproj | 4 +- .../BrowserWindow.nib/classes.nib | 1 + .../English.lproj/BrowserWindow.nib/info.nib | 6 ++- .../BrowserWindow.nib/objects.nib | Bin 17919 -> 18010 bytes .../projects/Chimera.pbproj/project.pbxproj | 4 +- .../BrowserWindow.nib/classes.nib | 1 + .../English.lproj/BrowserWindow.nib/info.nib | 6 ++- .../BrowserWindow.nib/objects.nib | Bin 17919 -> 18010 bytes chimera/src/browser/LocationBar.h | 30 ++++++++++++ chimera/src/browser/LocationBar.mm | 46 ++++++++++++++++++ 30 files changed, 282 insertions(+), 20 deletions(-) create mode 100644 camino/CHLocationBar.h create mode 100644 camino/CHLocationBar.mm create mode 100644 camino/src/browser/LocationBar.h create mode 100644 camino/src/browser/LocationBar.mm create mode 100644 chimera/CHLocationBar.h create mode 100644 chimera/CHLocationBar.mm create mode 100644 chimera/src/browser/LocationBar.h create mode 100644 chimera/src/browser/LocationBar.mm diff --git a/camino/BrowserWindow.nib/classes.nib b/camino/BrowserWindow.nib/classes.nib index f4d575771b6..9c951ef2756 100644 --- a/camino/BrowserWindow.nib/classes.nib +++ b/camino/BrowserWindow.nib/classes.nib @@ -67,6 +67,7 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, diff --git a/camino/BrowserWindow.nib/info.nib b/camino/BrowserWindow.nib/info.nib index b627c7462d0..72cd6d16404 100644 --- a/camino/BrowserWindow.nib/info.nib +++ b/camino/BrowserWindow.nib/info.nib @@ -25,7 +25,7 @@ 463 7 444 200 252 0 0 1152 746 56 - 404 484 343 68 0 0 1152 746 + 319 496 343 68 0 0 1152 746 IBFramework Version 248.0 @@ -45,8 +45,10 @@ IBOpenObjects - 160 + 56 + 82 394 + 160 10 IBSystem Version diff --git a/camino/BrowserWindow.nib/objects.nib b/camino/BrowserWindow.nib/objects.nib index 4522c739ffc73361d43fb8d7102f7ba8f7d2d712..ccf6ce41bf98b9814b658660ab99a5f622ba60b4 100644 GIT binary patch literal 18010 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 literal 17919 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 diff --git a/camino/CHLocationBar.h b/camino/CHLocationBar.h new file mode 100644 index 00000000000..e69de29bb2d diff --git a/camino/CHLocationBar.mm b/camino/CHLocationBar.mm new file mode 100644 index 00000000000..e16d6b93da6 --- /dev/null +++ b/camino/CHLocationBar.mm @@ -0,0 +1,46 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- +* +* The contents of this file are subject to the Mozilla Public +* License Version 1.1 (the "License"); you may not use this file +* except in compliance with the License. You may obtain a copy of +* the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License. +* +* The Original Code is the Mozilla browser. +* +* The Initial Developer of the Original Code is Netscape +* Communications Corporation. Portions created by Netscape are +* Copyright (C) 2002 Netscape Communications Corporation. All +* Rights Reserved. +* +* Contributor(s): +* David Hyatt (Original Author) +*/ + +#import "CHLocationBar.h" + +@implementation CHLocationBar + +- (id)initWithFrame:(NSRect)frame { + if ( (self = [super initWithFrame:frame]) ) { + // Initialization code here. + } + return self; +} + +- (void)drawRect:(NSRect)aRect { + // Frame the border. + //NSDrawLightBezel([self bounds], aRect); + + [[NSColor colorWithCalibratedWhite: 0.98 alpha: 1.0] set]; + NSRectFill(aRect); + + [[NSColor colorWithCalibratedWhite: 0.90 alpha: 1.0] set]; + NSFrameRectWithWidth([self bounds], 2.0); +} + +@end diff --git a/camino/Chimera.pbproj/project.pbxproj b/camino/Chimera.pbproj/project.pbxproj index 21c1fa383a9..4b8f3af3e9e 100644 --- a/camino/Chimera.pbproj/project.pbxproj +++ b/camino/Chimera.pbproj/project.pbxproj @@ -2071,12 +2071,12 @@ }; F57074BD026D80DF01A80166 = { isa = PBXFileReference; - path = LocationBar.h; + path = CHLocationBar.h; refType = 4; }; F57074BE026D80DF01A80166 = { isa = PBXFileReference; - path = LocationBar.mm; + path = CHLocationBar.mm; refType = 4; }; F57074BF026D80DF01A80166 = { diff --git a/camino/English.lproj/BrowserWindow.nib/classes.nib b/camino/English.lproj/BrowserWindow.nib/classes.nib index f4d575771b6..9c951ef2756 100644 --- a/camino/English.lproj/BrowserWindow.nib/classes.nib +++ b/camino/English.lproj/BrowserWindow.nib/classes.nib @@ -67,6 +67,7 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, diff --git a/camino/English.lproj/BrowserWindow.nib/info.nib b/camino/English.lproj/BrowserWindow.nib/info.nib index b627c7462d0..72cd6d16404 100644 --- a/camino/English.lproj/BrowserWindow.nib/info.nib +++ b/camino/English.lproj/BrowserWindow.nib/info.nib @@ -25,7 +25,7 @@ 463 7 444 200 252 0 0 1152 746 56 - 404 484 343 68 0 0 1152 746 + 319 496 343 68 0 0 1152 746 IBFramework Version 248.0 @@ -45,8 +45,10 @@ IBOpenObjects - 160 + 56 + 82 394 + 160 10 IBSystem Version diff --git a/camino/English.lproj/BrowserWindow.nib/objects.nib b/camino/English.lproj/BrowserWindow.nib/objects.nib index 4522c739ffc73361d43fb8d7102f7ba8f7d2d712..ccf6ce41bf98b9814b658660ab99a5f622ba60b4 100644 GIT binary patch literal 18010 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 literal 17919 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 diff --git a/camino/projects/Chimera.pbproj/project.pbxproj b/camino/projects/Chimera.pbproj/project.pbxproj index 21c1fa383a9..4b8f3af3e9e 100644 --- a/camino/projects/Chimera.pbproj/project.pbxproj +++ b/camino/projects/Chimera.pbproj/project.pbxproj @@ -2071,12 +2071,12 @@ }; F57074BD026D80DF01A80166 = { isa = PBXFileReference; - path = LocationBar.h; + path = CHLocationBar.h; refType = 4; }; F57074BE026D80DF01A80166 = { isa = PBXFileReference; - path = LocationBar.mm; + path = CHLocationBar.mm; refType = 4; }; F57074BF026D80DF01A80166 = { diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib index f4d575771b6..9c951ef2756 100644 --- a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib +++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib @@ -67,6 +67,7 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib index b627c7462d0..72cd6d16404 100644 --- a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -25,7 +25,7 @@ 463 7 444 200 252 0 0 1152 746 56 - 404 484 343 68 0 0 1152 746 + 319 496 343 68 0 0 1152 746 IBFramework Version 248.0 @@ -45,8 +45,10 @@ IBOpenObjects - 160 + 56 + 82 394 + 160 10 IBSystem Version diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index 4522c739ffc73361d43fb8d7102f7ba8f7d2d712..ccf6ce41bf98b9814b658660ab99a5f622ba60b4 100644 GIT binary patch literal 18010 zcmbtc4|r77mA`iqLJ|`4hY&?wzp=Gesih5|D}h2n0Fwz~Qw1xDsyW+nux zC^x)$u5Ml1*)S$WDT|6I8mO$Twic~_TDn+EtzOU%#!ctDmsHbMJd^ z-kW3~aiy92-nsXlbMCq4o^$TG_qBLNa&t`UO(f%*KP-yg)p?Vy>oYriZOc1*ZqowE z75=1Ou>a8Y(hi@3uvA(#X&Fc)qhSTSY*_a+QCBqcCF8-!IzFuP&z-Y89vw_*@#}+; z-soUUG?I)*Lm@40qzs)01$!WaE@d6QZhy~pL2a;D*GoEl^mLi7&*<>2)e^C2q*sfx zVWL^l;Zrnaiyi6IDAOyN@L!+#AKHNRH3Lb1Pe^Ny$Nig`u21jqsmI|_o*p$)sT5;^ z?H8VyRi;zwA2Cy9_cwB;HShf!Qss zD>o%I$fUP(AQ=iqG(uqLdL^bO2jEhCkZMTQe@P126#r#A())6pGfN=FgnX^DoSm|~p=O7tSo!8l8Nn-fVbOfs(zD79Jc4{TT$j}An7WqU*a z{#cRj>Fe9JZ0-~LxM5&gIi`e>kU>|@vQ7AVYC!2Rh)S=#g=oejigBi-Z_bUBhhV!| z1$eGd978<}HOW%WQmo)%ARK|(my-6;V8Ci|#2?lS!FE>DQp%T7ixvu9AT_L8+mu`t z)Iz-k!sI})n*+&UG(zt+auLu|GiE&)94Z#47}JYM(LtkZc{I8q?2m6q&`_Y8t011) z!=o4L({5aFW#Fa~#@KoIJ9V0^W&A#@HCgAB`7O8nLSJ zPcI5IH8GOxfo)5lAhF`PWd9F9w`#qdYGOSn{{s-YVdy`3cBro5R143!WHK6I2MJ**A*4k&O?Vp4hx(m=o`vdhm=AP-imMK!*vk$- zJ5hn$P6IhJ^oQw3*Q+fD z0>=^^hzGRGhH0cQL2Y6GI!#*m9&>r!5{;0i7?9Z?T|@L@i1ip^y?co76d2OG7JnyS z&2e=?ar9rAKZAT(Uo-?GT9DwCpOD~tg$Pz8w3t8cPeu#VT>S}YepHC&bgeg-EI7oT ziPh$;GUbKHmGx>NEveZAX}y%sk#4_>R2}ZWD?N&}f`8H=y#L>Vy(~N%sgla{L#k3Q zfjYqpVzm^L;=|9H!Acwa6P(s`scvi4ft*bge5W_)fY`wY696Zn00zSm;Ow1m*+R_c5@WwbiJX!Ao(%*Gu`CFmYXDeBueEbUp|-;?Az6% zrXmz)Pog$nbv$N;TD31e@-R_M*-QsCU4OW6Zh@T%b7Xy-%5P}6B;bx}uwKH~2+ zCI-R(SMD$1@dyM4hY|T=T{A4x^3LRX6(}O$+BI5~UX<1w(~I>=G-zv+?xrz_mT+P# zHwA)8%{Vc{su>%)>-6c<2%MFTr)>pLx2)F!GI)c{F>BzHsAf%Ylh*4?`qAIeYi@~= zyl8YPE~N163e3MG{RR=6wt90QnsC!j zIN@|zwsx0gdpfWviXYvhkC&E_MrkGEJ;>(x1b! zO~5%U8+D>z*+njKib>navi02f?VM%H@9hdf&5P@-kg0y{_C^V6yA+3YK z?^0qhN{`5R8T+1;@lXcbf$WV`rUBwd^wFk1O3C<6XTQ_}y& z(2MAQ!ez0XZDI~=Ez#KKvtW~ksmqU@`y?8ctdJqvSz4ZjL3^;}K41$Zz0ILeL5#); zWfY5A29gCE^%s)t43dRlLrS*f2MgkGww%5y8Xxq>d(YbVEF%?6IMJTl+}rEz!luQW zjC$>qK%UBtn{Za@%%R zSrSK8vO`xqiu_qJsEzlP)=IF{qRQvrs41B?C(a~ENU@NTRH``|kxFt-XH1KDR|g{- zyupaK1M*RM(8BB^BWfX-jARssPkE%m6r|i$KQ&&--kHa1u|!gpdMEo# zP47&Svgah`#3DI)DOAhZlUnDU!f=*{qJa%cSrgt>@o3oV)8ZSEp+2+bs^L_q1u`jJ zS3TTenSVSWjoSuq4U2%(WH6*rN;J{c6NL%v#!-V|U6QMKUSF|TVi0RVsh-1wD=m?nSl*V!=g~QH(-Gy>xJ5aWt4dsj$oFFANZ(GET_edeU{#yiJ zLwi2_j%U}g7j?|c>xcLk8mwK#LdUpoUM9E?IXU{xLuN;Vn6l?m4rE8oc(4RJLzRxB zEFsPGBy-n}xi;Ow1YslxJ8xOB;jE5m()(pCiDe%PX<;pr)Lh=x4iN?WMJ`Ab?3lSV z%PCV}i{Kp%G~kYgyaDG=c2|dgV{jd1`@Dm}P{`{?;2>=e_Nrlu9yY_Ldabl)!s}0> zTJyp#N>}1d#I!)LFR1l;dk_u`&U2~F+m7iK>}k0hD---B!CoTfs8lN)!%>zaRXba- zzsJED{pPW5E=-v$soFH>F%Stdyd!^!pB5dnN zM(9X#FqjOihrKWi$nY%A`}ikx-qN+I&QmkJ%Gn*CRAi>`Pu=CKep7V$s?#TR`6kJ! zx%{a}VG1rEN3fQZDTwy2hq+_s#W zl+r4cQ^SV^-ybf{I&a~h-CzuOw zM&|~|QovbrWT-s^L1dPy_XvIo5|H#uRgMS?u3@<0RI@X|D|nsLsS5U8g|65{rwjJ% zug@6I74vFPtInq-*zD1eiUU?<5M3O=9S5EvlAuD0FX8lo=5 zsDghmjP!j_o{h`Xy8!oW68xuv-*eYcY?Dl=m6%&~j0y3B_44pYF)d-o!CjGBfQ@Ew zQ@2ELzl>`Ah-!Ib-r~av3l?842<1zhi;q^ag{bB$f^Czhb=wen=Oc1u-)CJNr7-S# zt;cIElSW6Z#Fsi^G}<89Gz9;wy(4i^7`H*XI_gB&oWC2v21)HktoZMqyJ%6~bCG7(alxm~vVvTtTrGnDsaN}r_ z)cd;8p-)+kig|>m7>7&rOI7Z*;!^RME24n`+AlSFd!rF8cZ?$V4NmPQ?+6kXncfk8 zOKuF1G+7td5{b4*FQpHnal!s=2b$hEI@Bb&K{K2OcKO!$ad&Z3%`mq54fFeM!np?i zhab*!x24#rJ8(XBM+Nm)EbG$(f!^K#+V&Ppk0dzPY6<$=wP0PNM7DY^+LhlqiQO19Q{Nc*5fh) zavTkY;C*E5u8kzgm-N!112AF3#DntSp%};TbZlVCSRN_^gSw3%`2T=9?dtHGBSC|% zZE3Z(a*6I}G}JSJ3+H9Ty9YQ`Y1<85@GE~e(^Ey4GGq(OK2L919}H`8KScu*7-*bGsmI7?0$Md2u2l$Nxxqj!_!lgCKJ4z zVly;AC0|QxVA*24W~Jl7SskU)GBoyC_Q>fTt(m+|!QP?I_RQsTQ8o&G1qv=P@|&Pk zcv}j1W=nsjbTl*ApGo!u`3Ho2?xm>o5yAS}%*;`M|3u&gb2Iw4XlCr&B!Ul;ErtMa z)rEiCDlNI5Q5kcWL$Q8nnG8C$O0DHJ>e#mHP(pE30c+d{#AuksX1vmPEfv*!nz2^CAZ zF~R4m8015#3cOSizn66BBw58aWia1YnzB=B6MIZ4RS`ArY{#U&u9&SLfS+dh&kEfQ z#Jv^(V2|ojBJuM}6j6wRl(P;&f2JL}#qN_j%$rG@kSS8M;dPH?ZYP!6rP?Evv^BGM z0RZ2m_Wh6=`wI~q+nd>lcKo94nTH5?Ot7Pwy?ZjPq_y0bsCrxYEwLgfKN$V1(OFp?+`_cdm&@5EC8v_=uxWJaOjxx4K~ zCWd!Pn&YIFZgw;@7{DSX0zLpBGVgXvYWN4haQV!J&6nLj29&P6TR7(v*7Xx~KM9zV z_Pd<)B-=>IToFZjFN~Upc-T+&zGF56-&9JRiuQv}Sh;O0aho%x2HXya$L) zl=|^`fH;TH(6E5I4(EaAODcSB9=Jh?aRJF@T%`Ymi*tp9fXEpQ7$^JKsXQ zQuo6EL14K-8ky|`qBD)pCcK@4xIS)VNIs64k^{N|uu3Zu_pR5oBn?xVJN0n`p&vq{ zGTLC81ZiB>t`^n1@tQYXf)5D35tve_t3jA%`IZ$ye<-?+Xk3mOwUXj}UtwFqb$9#Y_csPLz=e0$3)+xEl8~Y1AJA;-WvFtWGDO zpyIF-AwXP$@B@H-w-dkQoY8$}*P;YIO~G6fxD2qok?<10oNGc3`I3o%b*i_$c8$zS zfJ`v0_W|r=M;Xmal2SCn7M*%CtR1FjL>nh!k8O1JudOUTTGd z6Z<1380A*LoR&gP0BssU8FEyt}RWp~8EmF-avqY2kRzB!B01iWlfCYf*=4Wlx<4<^Z@<&Xw zd-H%&G2Q{tEgW_PATVz$s^pbd0_qZ(a($Zso?%X$Wh`mssgzWvR^f8Z7-Ay@wZ_;$ z6v*t_@)PW@c}*ad1PUjWP{p?1~CCP@OJb2t|^HPSACos&lx zsk=+_NTQsK6G=*aC`i_jpsN5av(34YxfAc>$m{_yH(b6IuM^lN@}0DNoZ-s|p>w+o zqPk>!Q{DlXTMg1WrOxS_n_Z(zC=pTD;p+(Y&{ujIu1QBCxUNQ-h@Z>b%&4(pHN)6h zZBwdNfiE?X_b?NXKqfpDs#dB4Zb9H{z@$_MvvRxYSTZQTxujbN)CEwQ_PVg;Zq2QD zUe9eb;;^Y?YP;pYKz4O{_}aCrDGi@POaV_0v5a`!{DL^itllOr+W?RJ2#zr6InQm0u8Vd@tpU(w9di&Crbflog=pVQ?Q8I%q}5!KG#iivW7MFO zJ`=&&xaJtm0O03aBCuktgk%4n8#u)z)5COYdm!P!K*3d6*h)G%D#&on2t$W0`(dKO zreQ*E5b_cH+;E}KXmhMkyi;XyZLSiVGVMfWTb0V@=QRN(@*fpp$48`A_c2tWuDmyw z!Z7KYHRGfRIC-ApFvZfcElmlhu}tg1#Yx9J70H43sXLN6I7>~?nB85V@qGlJ9+$Tj z?J3?a9cNg2PO?STaJHMlcbKB@yoysa&ahnZ?iyuj!enaP6-?R))x}+lA+sICSX~s? z0I9Amg5wUgG8`j);OuR9+a%hwQ=1wWElje5&@O5)BY{hf#7r|Tt6NjU9;2!Xs*+=O z*72@_-FQjiZcNzSNX|}->?x|M-H3w}x(L^edvKDfgP)Jj*n+H?+-}x~9oryz1ZEo) zW%JlkP&&uiN*y-kHIrK^SF>?OjAru{;_94$yq)DB?6fS@>;-C82h&rq&2hD&D*U-k zoH=-DsL82Uhr6_RA{z0BtemO2=41|Q-0C`Mu2EoABeaFdRZX?}AkMaD4tk8@-8!d` z>fMMAeb7^B*DZLSVPq{X@ zMTR8Jo4Thd=okF4EN>{uY$h@ zU|jHnSxxZW*$V~R2S7ydec9Uu?*~F8sGbMtI%JH{<1xW+!W)uD$53=5bqe4vq^9sT zs~OKi@Xwkc=dh-Kdpjq z26W3MXnVKdp9APh#PI-uNN08AIQd zH(#(HXZr;Yqs7++{{rCESK;{s!T%N2ICOm(Ma?pR_6dFqo{{1dD83^25Q<*G??#`k z7!!L$aN_Q(2#rwuo#0`F)M7{aC?0Ug>W>*S!0Iz+5{UZvb z`qpNVlYJrEj@S%^6V_oB`kslKB?iRtnyV;u68Og4l;R zEk<#_;0C+K^d;1A;MsNmaC?1o?gGz9+*iseWMp_nTeAwnMZ zAMl2=gCq)Y3baVG@>hVV(TAUl?#SLLcm$Q7>dn3<_!yqPCipM2i=Z2LKK}+ZTGEXl zC`=a$WUJc&hw_28=Zk{9njIAUHq?Ak@E3sneZh~SxEEPGG`K_Xx3akMcPiT{*rNbI zH-Ci2ORq(n9fG64$q8@5+lb)Tqxg&9Kh7fmybd)Tf?o~LE6C;J4J!ZwWX}kWi9_O+ zV=i#I$Y0GOO}r}$b$b#7nqb^eEEN3HD4>}yq3ZzF11}PMF?!qwRPrRxK0w2QFGTT8r~vv83I40>c8=;;d3H0j2Cx;-X%tW<=mbt%`0FV42>w;H zD#6gQxXw(NQb_%y-OYmQsKH#5P6Od(DBco$1i*QMgAG1c@E@SS|NF_;QTG56UfE?> z(s+JH@SmY(jo{a0TR{aN*!3gXdcmH|;t6f|6>CAI>Tgh$7JLDoXPgHpsNaic2<-_J zQ1dM)AkaHd^ayTbk)?hZeNI6W0Gb2YQ@;K=JYO8bGmexx@Ej8ys|Cq+o(AxyN`M-n v^LVZl{BKc|f`L)N-yZd3WTLw_Gj@QscGYdmTcUxee^ne8iwC3e4TkZ5_Cit; literal 17919 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 diff --git a/camino/src/browser/LocationBar.h b/camino/src/browser/LocationBar.h new file mode 100644 index 00000000000..f2700e473f6 --- /dev/null +++ b/camino/src/browser/LocationBar.h @@ -0,0 +1,30 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- +* +* The contents of this file are subject to the Mozilla Public +* License Version 1.1 (the "License"); you may not use this file +* except in compliance with the License. You may obtain a copy of +* the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License. +* +* The Original Code is the Mozilla browser. +* +* The Initial Developer of the Original Code is Netscape +* Communications Corporation. Portions created by Netscape are +* Copyright (C) 2002 Netscape Communications Corporation. All +* Rights Reserved. +* +* Contributor(s): +* David Hyatt (Original Author) +*/ + +#import + +@interface CHLocationBar : NSView { + +} + +@end diff --git a/camino/src/browser/LocationBar.mm b/camino/src/browser/LocationBar.mm new file mode 100644 index 00000000000..e16d6b93da6 --- /dev/null +++ b/camino/src/browser/LocationBar.mm @@ -0,0 +1,46 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- +* +* The contents of this file are subject to the Mozilla Public +* License Version 1.1 (the "License"); you may not use this file +* except in compliance with the License. You may obtain a copy of +* the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License. +* +* The Original Code is the Mozilla browser. +* +* The Initial Developer of the Original Code is Netscape +* Communications Corporation. Portions created by Netscape are +* Copyright (C) 2002 Netscape Communications Corporation. All +* Rights Reserved. +* +* Contributor(s): +* David Hyatt (Original Author) +*/ + +#import "CHLocationBar.h" + +@implementation CHLocationBar + +- (id)initWithFrame:(NSRect)frame { + if ( (self = [super initWithFrame:frame]) ) { + // Initialization code here. + } + return self; +} + +- (void)drawRect:(NSRect)aRect { + // Frame the border. + //NSDrawLightBezel([self bounds], aRect); + + [[NSColor colorWithCalibratedWhite: 0.98 alpha: 1.0] set]; + NSRectFill(aRect); + + [[NSColor colorWithCalibratedWhite: 0.90 alpha: 1.0] set]; + NSFrameRectWithWidth([self bounds], 2.0); +} + +@end diff --git a/chimera/BrowserWindow.nib/classes.nib b/chimera/BrowserWindow.nib/classes.nib index f4d575771b6..9c951ef2756 100644 --- a/chimera/BrowserWindow.nib/classes.nib +++ b/chimera/BrowserWindow.nib/classes.nib @@ -67,6 +67,7 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, diff --git a/chimera/BrowserWindow.nib/info.nib b/chimera/BrowserWindow.nib/info.nib index b627c7462d0..72cd6d16404 100644 --- a/chimera/BrowserWindow.nib/info.nib +++ b/chimera/BrowserWindow.nib/info.nib @@ -25,7 +25,7 @@ 463 7 444 200 252 0 0 1152 746 56 - 404 484 343 68 0 0 1152 746 + 319 496 343 68 0 0 1152 746 IBFramework Version 248.0 @@ -45,8 +45,10 @@ IBOpenObjects - 160 + 56 + 82 394 + 160 10 IBSystem Version diff --git a/chimera/BrowserWindow.nib/objects.nib b/chimera/BrowserWindow.nib/objects.nib index 4522c739ffc73361d43fb8d7102f7ba8f7d2d712..ccf6ce41bf98b9814b658660ab99a5f622ba60b4 100644 GIT binary patch literal 18010 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 literal 17919 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 diff --git a/chimera/CHLocationBar.h b/chimera/CHLocationBar.h new file mode 100644 index 00000000000..e69de29bb2d diff --git a/chimera/CHLocationBar.mm b/chimera/CHLocationBar.mm new file mode 100644 index 00000000000..e16d6b93da6 --- /dev/null +++ b/chimera/CHLocationBar.mm @@ -0,0 +1,46 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- +* +* The contents of this file are subject to the Mozilla Public +* License Version 1.1 (the "License"); you may not use this file +* except in compliance with the License. You may obtain a copy of +* the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License. +* +* The Original Code is the Mozilla browser. +* +* The Initial Developer of the Original Code is Netscape +* Communications Corporation. Portions created by Netscape are +* Copyright (C) 2002 Netscape Communications Corporation. All +* Rights Reserved. +* +* Contributor(s): +* David Hyatt (Original Author) +*/ + +#import "CHLocationBar.h" + +@implementation CHLocationBar + +- (id)initWithFrame:(NSRect)frame { + if ( (self = [super initWithFrame:frame]) ) { + // Initialization code here. + } + return self; +} + +- (void)drawRect:(NSRect)aRect { + // Frame the border. + //NSDrawLightBezel([self bounds], aRect); + + [[NSColor colorWithCalibratedWhite: 0.98 alpha: 1.0] set]; + NSRectFill(aRect); + + [[NSColor colorWithCalibratedWhite: 0.90 alpha: 1.0] set]; + NSFrameRectWithWidth([self bounds], 2.0); +} + +@end diff --git a/chimera/Chimera.pbproj/project.pbxproj b/chimera/Chimera.pbproj/project.pbxproj index 21c1fa383a9..4b8f3af3e9e 100644 --- a/chimera/Chimera.pbproj/project.pbxproj +++ b/chimera/Chimera.pbproj/project.pbxproj @@ -2071,12 +2071,12 @@ }; F57074BD026D80DF01A80166 = { isa = PBXFileReference; - path = LocationBar.h; + path = CHLocationBar.h; refType = 4; }; F57074BE026D80DF01A80166 = { isa = PBXFileReference; - path = LocationBar.mm; + path = CHLocationBar.mm; refType = 4; }; F57074BF026D80DF01A80166 = { diff --git a/chimera/English.lproj/BrowserWindow.nib/classes.nib b/chimera/English.lproj/BrowserWindow.nib/classes.nib index f4d575771b6..9c951ef2756 100644 --- a/chimera/English.lproj/BrowserWindow.nib/classes.nib +++ b/chimera/English.lproj/BrowserWindow.nib/classes.nib @@ -67,6 +67,7 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, diff --git a/chimera/English.lproj/BrowserWindow.nib/info.nib b/chimera/English.lproj/BrowserWindow.nib/info.nib index b627c7462d0..72cd6d16404 100644 --- a/chimera/English.lproj/BrowserWindow.nib/info.nib +++ b/chimera/English.lproj/BrowserWindow.nib/info.nib @@ -25,7 +25,7 @@ 463 7 444 200 252 0 0 1152 746 56 - 404 484 343 68 0 0 1152 746 + 319 496 343 68 0 0 1152 746 IBFramework Version 248.0 @@ -45,8 +45,10 @@ IBOpenObjects - 160 + 56 + 82 394 + 160 10 IBSystem Version diff --git a/chimera/English.lproj/BrowserWindow.nib/objects.nib b/chimera/English.lproj/BrowserWindow.nib/objects.nib index 4522c739ffc73361d43fb8d7102f7ba8f7d2d712..ccf6ce41bf98b9814b658660ab99a5f622ba60b4 100644 GIT binary patch literal 18010 zcmbtc4|r77mA`iqLJ|`4hY&?wzp=Gesih5|D}h2n0Fwz~Qw1xDsyW+nux zC^x)$u5Ml1*)S$WDT|6I8mO$Twic~_TDn+EtzOU%#!ctDmsHbMJd^ z-kW3~aiy92-nsXlbMCq4o^$TG_qBLNa&t`UO(f%*KP-yg)p?Vy>oYriZOc1*ZqowE z75=1Ou>a8Y(hi@3uvA(#X&Fc)qhSTSY*_a+QCBqcCF8-!IzFuP&z-Y89vw_*@#}+; z-soUUG?I)*Lm@40qzs)01$!WaE@d6QZhy~pL2a;D*GoEl^mLi7&*<>2)e^C2q*sfx zVWL^l;Zrnaiyi6IDAOyN@L!+#AKHNRH3Lb1Pe^Ny$Nig`u21jqsmI|_o*p$)sT5;^ z?H8VyRi;zwA2Cy9_cwB;HShf!Qss zD>o%I$fUP(AQ=iqG(uqLdL^bO2jEhCkZMTQe@P126#r#A())6pGfN=FgnX^DoSm|~p=O7tSo!8l8Nn-fVbOfs(zD79Jc4{TT$j}An7WqU*a z{#cRj>Fe9JZ0-~LxM5&gIi`e>kU>|@vQ7AVYC!2Rh)S=#g=oejigBi-Z_bUBhhV!| z1$eGd978<}HOW%WQmo)%ARK|(my-6;V8Ci|#2?lS!FE>DQp%T7ixvu9AT_L8+mu`t z)Iz-k!sI})n*+&UG(zt+auLu|GiE&)94Z#47}JYM(LtkZc{I8q?2m6q&`_Y8t011) z!=o4L({5aFW#Fa~#@KoIJ9V0^W&A#@HCgAB`7O8nLSJ zPcI5IH8GOxfo)5lAhF`PWd9F9w`#qdYGOSn{{s-YVdy`3cBro5R143!WHK6I2MJ**A*4k&O?Vp4hx(m=o`vdhm=AP-imMK!*vk$- zJ5hn$P6IhJ^oQw3*Q+fD z0>=^^hzGRGhH0cQL2Y6GI!#*m9&>r!5{;0i7?9Z?T|@L@i1ip^y?co76d2OG7JnyS z&2e=?ar9rAKZAT(Uo-?GT9DwCpOD~tg$Pz8w3t8cPeu#VT>S}YepHC&bgeg-EI7oT ziPh$;GUbKHmGx>NEveZAX}y%sk#4_>R2}ZWD?N&}f`8H=y#L>Vy(~N%sgla{L#k3Q zfjYqpVzm^L;=|9H!Acwa6P(s`scvi4ft*bge5W_)fY`wY696Zn00zSm;Ow1m*+R_c5@WwbiJX!Ao(%*Gu`CFmYXDeBueEbUp|-;?Az6% zrXmz)Pog$nbv$N;TD31e@-R_M*-QsCU4OW6Zh@T%b7Xy-%5P}6B;bx}uwKH~2+ zCI-R(SMD$1@dyM4hY|T=T{A4x^3LRX6(}O$+BI5~UX<1w(~I>=G-zv+?xrz_mT+P# zHwA)8%{Vc{su>%)>-6c<2%MFTr)>pLx2)F!GI)c{F>BzHsAf%Ylh*4?`qAIeYi@~= zyl8YPE~N163e3MG{RR=6wt90QnsC!j zIN@|zwsx0gdpfWviXYvhkC&E_MrkGEJ;>(x1b! zO~5%U8+D>z*+njKib>navi02f?VM%H@9hdf&5P@-kg0y{_C^V6yA+3YK z?^0qhN{`5R8T+1;@lXcbf$WV`rUBwd^wFk1O3C<6XTQ_}y& z(2MAQ!ez0XZDI~=Ez#KKvtW~ksmqU@`y?8ctdJqvSz4ZjL3^;}K41$Zz0ILeL5#); zWfY5A29gCE^%s)t43dRlLrS*f2MgkGww%5y8Xxq>d(YbVEF%?6IMJTl+}rEz!luQW zjC$>qK%UBtn{Za@%%R zSrSK8vO`xqiu_qJsEzlP)=IF{qRQvrs41B?C(a~ENU@NTRH``|kxFt-XH1KDR|g{- zyupaK1M*RM(8BB^BWfX-jARssPkE%m6r|i$KQ&&--kHa1u|!gpdMEo# zP47&Svgah`#3DI)DOAhZlUnDU!f=*{qJa%cSrgt>@o3oV)8ZSEp+2+bs^L_q1u`jJ zS3TTenSVSWjoSuq4U2%(WH6*rN;J{c6NL%v#!-V|U6QMKUSF|TVi0RVsh-1wD=m?nSl*V!=g~QH(-Gy>xJ5aWt4dsj$oFFANZ(GET_edeU{#yiJ zLwi2_j%U}g7j?|c>xcLk8mwK#LdUpoUM9E?IXU{xLuN;Vn6l?m4rE8oc(4RJLzRxB zEFsPGBy-n}xi;Ow1YslxJ8xOB;jE5m()(pCiDe%PX<;pr)Lh=x4iN?WMJ`Ab?3lSV z%PCV}i{Kp%G~kYgyaDG=c2|dgV{jd1`@Dm}P{`{?;2>=e_Nrlu9yY_Ldabl)!s}0> zTJyp#N>}1d#I!)LFR1l;dk_u`&U2~F+m7iK>}k0hD---B!CoTfs8lN)!%>zaRXba- zzsJED{pPW5E=-v$soFH>F%Stdyd!^!pB5dnN zM(9X#FqjOihrKWi$nY%A`}ikx-qN+I&QmkJ%Gn*CRAi>`Pu=CKep7V$s?#TR`6kJ! zx%{a}VG1rEN3fQZDTwy2hq+_s#W zl+r4cQ^SV^-ybf{I&a~h-CzuOw zM&|~|QovbrWT-s^L1dPy_XvIo5|H#uRgMS?u3@<0RI@X|D|nsLsS5U8g|65{rwjJ% zug@6I74vFPtInq-*zD1eiUU?<5M3O=9S5EvlAuD0FX8lo=5 zsDghmjP!j_o{h`Xy8!oW68xuv-*eYcY?Dl=m6%&~j0y3B_44pYF)d-o!CjGBfQ@Ew zQ@2ELzl>`Ah-!Ib-r~av3l?842<1zhi;q^ag{bB$f^Czhb=wen=Oc1u-)CJNr7-S# zt;cIElSW6Z#Fsi^G}<89Gz9;wy(4i^7`H*XI_gB&oWC2v21)HktoZMqyJ%6~bCG7(alxm~vVvTtTrGnDsaN}r_ z)cd;8p-)+kig|>m7>7&rOI7Z*;!^RME24n`+AlSFd!rF8cZ?$V4NmPQ?+6kXncfk8 zOKuF1G+7td5{b4*FQpHnal!s=2b$hEI@Bb&K{K2OcKO!$ad&Z3%`mq54fFeM!np?i zhab*!x24#rJ8(XBM+Nm)EbG$(f!^K#+V&Ppk0dzPY6<$=wP0PNM7DY^+LhlqiQO19Q{Nc*5fh) zavTkY;C*E5u8kzgm-N!112AF3#DntSp%};TbZlVCSRN_^gSw3%`2T=9?dtHGBSC|% zZE3Z(a*6I}G}JSJ3+H9Ty9YQ`Y1<85@GE~e(^Ey4GGq(OK2L919}H`8KScu*7-*bGsmI7?0$Md2u2l$Nxxqj!_!lgCKJ4z zVly;AC0|QxVA*24W~Jl7SskU)GBoyC_Q>fTt(m+|!QP?I_RQsTQ8o&G1qv=P@|&Pk zcv}j1W=nsjbTl*ApGo!u`3Ho2?xm>o5yAS}%*;`M|3u&gb2Iw4XlCr&B!Ul;ErtMa z)rEiCDlNI5Q5kcWL$Q8nnG8C$O0DHJ>e#mHP(pE30c+d{#AuksX1vmPEfv*!nz2^CAZ zF~R4m8015#3cOSizn66BBw58aWia1YnzB=B6MIZ4RS`ArY{#U&u9&SLfS+dh&kEfQ z#Jv^(V2|ojBJuM}6j6wRl(P;&f2JL}#qN_j%$rG@kSS8M;dPH?ZYP!6rP?Evv^BGM z0RZ2m_Wh6=`wI~q+nd>lcKo94nTH5?Ot7Pwy?ZjPq_y0bsCrxYEwLgfKN$V1(OFp?+`_cdm&@5EC8v_=uxWJaOjxx4K~ zCWd!Pn&YIFZgw;@7{DSX0zLpBGVgXvYWN4haQV!J&6nLj29&P6TR7(v*7Xx~KM9zV z_Pd<)B-=>IToFZjFN~Upc-T+&zGF56-&9JRiuQv}Sh;O0aho%x2HXya$L) zl=|^`fH;TH(6E5I4(EaAODcSB9=Jh?aRJF@T%`Ymi*tp9fXEpQ7$^JKsXQ zQuo6EL14K-8ky|`qBD)pCcK@4xIS)VNIs64k^{N|uu3Zu_pR5oBn?xVJN0n`p&vq{ zGTLC81ZiB>t`^n1@tQYXf)5D35tve_t3jA%`IZ$ye<-?+Xk3mOwUXj}UtwFqb$9#Y_csPLz=e0$3)+xEl8~Y1AJA;-WvFtWGDO zpyIF-AwXP$@B@H-w-dkQoY8$}*P;YIO~G6fxD2qok?<10oNGc3`I3o%b*i_$c8$zS zfJ`v0_W|r=M;Xmal2SCn7M*%CtR1FjL>nh!k8O1JudOUTTGd z6Z<1380A*LoR&gP0BssU8FEyt}RWp~8EmF-avqY2kRzB!B01iWlfCYf*=4Wlx<4<^Z@<&Xw zd-H%&G2Q{tEgW_PATVz$s^pbd0_qZ(a($Zso?%X$Wh`mssgzWvR^f8Z7-Ay@wZ_;$ z6v*t_@)PW@c}*ad1PUjWP{p?1~CCP@OJb2t|^HPSACos&lx zsk=+_NTQsK6G=*aC`i_jpsN5av(34YxfAc>$m{_yH(b6IuM^lN@}0DNoZ-s|p>w+o zqPk>!Q{DlXTMg1WrOxS_n_Z(zC=pTD;p+(Y&{ujIu1QBCxUNQ-h@Z>b%&4(pHN)6h zZBwdNfiE?X_b?NXKqfpDs#dB4Zb9H{z@$_MvvRxYSTZQTxujbN)CEwQ_PVg;Zq2QD zUe9eb;;^Y?YP;pYKz4O{_}aCrDGi@POaV_0v5a`!{DL^itllOr+W?RJ2#zr6InQm0u8Vd@tpU(w9di&Crbflog=pVQ?Q8I%q}5!KG#iivW7MFO zJ`=&&xaJtm0O03aBCuktgk%4n8#u)z)5COYdm!P!K*3d6*h)G%D#&on2t$W0`(dKO zreQ*E5b_cH+;E}KXmhMkyi;XyZLSiVGVMfWTb0V@=QRN(@*fpp$48`A_c2tWuDmyw z!Z7KYHRGfRIC-ApFvZfcElmlhu}tg1#Yx9J70H43sXLN6I7>~?nB85V@qGlJ9+$Tj z?J3?a9cNg2PO?STaJHMlcbKB@yoysa&ahnZ?iyuj!enaP6-?R))x}+lA+sICSX~s? z0I9Amg5wUgG8`j);OuR9+a%hwQ=1wWElje5&@O5)BY{hf#7r|Tt6NjU9;2!Xs*+=O z*72@_-FQjiZcNzSNX|}->?x|M-H3w}x(L^edvKDfgP)Jj*n+H?+-}x~9oryz1ZEo) zW%JlkP&&uiN*y-kHIrK^SF>?OjAru{;_94$yq)DB?6fS@>;-C82h&rq&2hD&D*U-k zoH=-DsL82Uhr6_RA{z0BtemO2=41|Q-0C`Mu2EoABeaFdRZX?}AkMaD4tk8@-8!d` z>fMMAeb7^B*DZLSVPq{X@ zMTR8Jo4Thd=okF4EN>{uY$h@ zU|jHnSxxZW*$V~R2S7ydec9Uu?*~F8sGbMtI%JH{<1xW+!W)uD$53=5bqe4vq^9sT zs~OKi@Xwkc=dh-Kdpjq z26W3MXnVKdp9APh#PI-uNN08AIQd zH(#(HXZr;Yqs7++{{rCESK;{s!T%N2ICOm(Ma?pR_6dFqo{{1dD83^25Q<*G??#`k z7!!L$aN_Q(2#rwuo#0`F)M7{aC?0Ug>W>*S!0Iz+5{UZvb z`qpNVlYJrEj@S%^6V_oB`kslKB?iRtnyV;u68Og4l;R zEk<#_;0C+K^d;1A;MsNmaC?1o?gGz9+*iseWMp_nTeAwnMZ zAMl2=gCq)Y3baVG@>hVV(TAUl?#SLLcm$Q7>dn3<_!yqPCipM2i=Z2LKK}+ZTGEXl zC`=a$WUJc&hw_28=Zk{9njIAUHq?Ak@E3sneZh~SxEEPGG`K_Xx3akMcPiT{*rNbI zH-Ci2ORq(n9fG64$q8@5+lb)Tqxg&9Kh7fmybd)Tf?o~LE6C;J4J!ZwWX}kWi9_O+ zV=i#I$Y0GOO}r}$b$b#7nqb^eEEN3HD4>}yq3ZzF11}PMF?!qwRPrRxK0w2QFGTT8r~vv83I40>c8=;;d3H0j2Cx;-X%tW<=mbt%`0FV42>w;H zD#6gQxXw(NQb_%y-OYmQsKH#5P6Od(DBco$1i*QMgAG1c@E@SS|NF_;QTG56UfE?> z(s+JH@SmY(jo{a0TR{aN*!3gXdcmH|;t6f|6>CAI>Tgh$7JLDoXPgHpsNaic2<-_J zQ1dM)AkaHd^ayTbk)?hZeNI6W0Gb2YQ@;K=JYO8bGmexx@Ej8ys|Cq+o(AxyN`M-n v^LVZl{BKc|f`L)N-yZd3WTLw_Gj@QscGYdmTcUxee^ne8iwC3e4TkZ5_Cit; literal 17919 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 diff --git a/chimera/projects/Chimera.pbproj/project.pbxproj b/chimera/projects/Chimera.pbproj/project.pbxproj index 21c1fa383a9..4b8f3af3e9e 100644 --- a/chimera/projects/Chimera.pbproj/project.pbxproj +++ b/chimera/projects/Chimera.pbproj/project.pbxproj @@ -2071,12 +2071,12 @@ }; F57074BD026D80DF01A80166 = { isa = PBXFileReference; - path = LocationBar.h; + path = CHLocationBar.h; refType = 4; }; F57074BE026D80DF01A80166 = { isa = PBXFileReference; - path = LocationBar.mm; + path = CHLocationBar.mm; refType = 4; }; F57074BF026D80DF01A80166 = { diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib index f4d575771b6..9c951ef2756 100644 --- a/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib +++ b/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib @@ -67,6 +67,7 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib index b627c7462d0..72cd6d16404 100644 --- a/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -25,7 +25,7 @@ 463 7 444 200 252 0 0 1152 746 56 - 404 484 343 68 0 0 1152 746 + 319 496 343 68 0 0 1152 746 IBFramework Version 248.0 @@ -45,8 +45,10 @@ IBOpenObjects - 160 + 56 + 82 394 + 160 10 IBSystem Version diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index 4522c739ffc73361d43fb8d7102f7ba8f7d2d712..ccf6ce41bf98b9814b658660ab99a5f622ba60b4 100644 GIT binary patch literal 18010 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 literal 17919 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 diff --git a/chimera/src/browser/LocationBar.h b/chimera/src/browser/LocationBar.h new file mode 100644 index 00000000000..f2700e473f6 --- /dev/null +++ b/chimera/src/browser/LocationBar.h @@ -0,0 +1,30 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- +* +* The contents of this file are subject to the Mozilla Public +* License Version 1.1 (the "License"); you may not use this file +* except in compliance with the License. You may obtain a copy of +* the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License. +* +* The Original Code is the Mozilla browser. +* +* The Initial Developer of the Original Code is Netscape +* Communications Corporation. Portions created by Netscape are +* Copyright (C) 2002 Netscape Communications Corporation. All +* Rights Reserved. +* +* Contributor(s): +* David Hyatt (Original Author) +*/ + +#import + +@interface CHLocationBar : NSView { + +} + +@end diff --git a/chimera/src/browser/LocationBar.mm b/chimera/src/browser/LocationBar.mm new file mode 100644 index 00000000000..e16d6b93da6 --- /dev/null +++ b/chimera/src/browser/LocationBar.mm @@ -0,0 +1,46 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- +* +* The contents of this file are subject to the Mozilla Public +* License Version 1.1 (the "License"); you may not use this file +* except in compliance with the License. You may obtain a copy of +* the License at http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS +* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +* implied. See the License for the specific language governing +* rights and limitations under the License. +* +* The Original Code is the Mozilla browser. +* +* The Initial Developer of the Original Code is Netscape +* Communications Corporation. Portions created by Netscape are +* Copyright (C) 2002 Netscape Communications Corporation. All +* Rights Reserved. +* +* Contributor(s): +* David Hyatt (Original Author) +*/ + +#import "CHLocationBar.h" + +@implementation CHLocationBar + +- (id)initWithFrame:(NSRect)frame { + if ( (self = [super initWithFrame:frame]) ) { + // Initialization code here. + } + return self; +} + +- (void)drawRect:(NSRect)aRect { + // Frame the border. + //NSDrawLightBezel([self bounds], aRect); + + [[NSColor colorWithCalibratedWhite: 0.98 alpha: 1.0] set]; + NSRectFill(aRect); + + [[NSColor colorWithCalibratedWhite: 0.90 alpha: 1.0] set]; + NSFrameRectWithWidth([self bounds], 2.0); +} + +@end