From fad99266a67f8ea999eccd395ff454b87e2071f4 Mon Sep 17 00:00:00 2001 From: "ben%netscape.com" Date: Mon, 29 Apr 2002 12:39:27 +0000 Subject: [PATCH] More history sidebar panel work. git-svn-id: svn://10.0.0.236/trunk@120191 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/BrowserWindow.nib/classes.nib | 16 ++- mozilla/camino/BrowserWindow.nib/info.nib | 21 ++-- mozilla/camino/BrowserWindow.nib/objects.nib | Bin 16929 -> 18391 bytes mozilla/camino/BrowserWindowController.h | 1 + mozilla/camino/BrowserWindowController.mm | 2 + mozilla/camino/CHRDFOutlineViewDataSource.h | 14 +-- mozilla/camino/CHRDFOutlineViewDataSource.mm | 97 ++++++++++++------ mozilla/camino/Chimera.pbproj/project.pbxproj | 52 ++++++++++ .../BrowserWindow.nib/classes.nib | 16 ++- .../English.lproj/BrowserWindow.nib/info.nib | 21 ++-- .../BrowserWindow.nib/objects.nib | Bin 16929 -> 18391 bytes .../projects/Chimera.pbproj/project.pbxproj | 52 ++++++++++ .../BrowserWindow.nib/classes.nib | 16 ++- .../English.lproj/BrowserWindow.nib/info.nib | 21 ++-- .../BrowserWindow.nib/objects.nib | Bin 16929 -> 18391 bytes .../src/browser/BrowserWindowController.h | 1 + .../src/browser/BrowserWindowController.mm | 2 + .../src/extensions/RDFOutlineViewDataSource.h | 14 +-- .../extensions/RDFOutlineViewDataSource.mm | 97 ++++++++++++------ mozilla/chimera/BrowserWindow.nib/classes.nib | 16 ++- mozilla/chimera/BrowserWindow.nib/info.nib | 21 ++-- mozilla/chimera/BrowserWindow.nib/objects.nib | Bin 16929 -> 18391 bytes mozilla/chimera/BrowserWindowController.h | 1 + mozilla/chimera/BrowserWindowController.mm | 2 + mozilla/chimera/CHRDFOutlineViewDataSource.h | 14 +-- mozilla/chimera/CHRDFOutlineViewDataSource.mm | 97 ++++++++++++------ .../chimera/Chimera.pbproj/project.pbxproj | 52 ++++++++++ .../BrowserWindow.nib/classes.nib | 16 ++- .../English.lproj/BrowserWindow.nib/info.nib | 21 ++-- .../BrowserWindow.nib/objects.nib | Bin 16929 -> 18391 bytes .../projects/Chimera.pbproj/project.pbxproj | 52 ++++++++++ .../BrowserWindow.nib/classes.nib | 16 ++- .../English.lproj/BrowserWindow.nib/info.nib | 21 ++-- .../BrowserWindow.nib/objects.nib | Bin 16929 -> 18391 bytes .../src/browser/BrowserWindowController.h | 1 + .../src/browser/BrowserWindowController.mm | 2 + .../src/extensions/RDFOutlineViewDataSource.h | 14 +-- .../extensions/RDFOutlineViewDataSource.mm | 97 ++++++++++++------ 38 files changed, 648 insertions(+), 238 deletions(-) diff --git a/mozilla/camino/BrowserWindow.nib/classes.nib b/mozilla/camino/BrowserWindow.nib/classes.nib index 669269f11fb..ff1d11f6433 100644 --- a/mozilla/camino/BrowserWindow.nib/classes.nib +++ b/mozilla/camino/BrowserWindow.nib/classes.nib @@ -34,7 +34,6 @@ stop = id; toggleSidebar = id; viewOnlyThisImage = id; - viewSource = id; }; CLASS = BrowserWindowController; LANGUAGE = ObjC; @@ -44,6 +43,7 @@ mAddBookmarkSheetWindow = id; mAddBookmarkTitleField = id; mCachedBMDS = id; + mHistoryDataSource = id; mImageLinkMenu = id; mImageMenu = id; mInputMenu = id; @@ -75,7 +75,18 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + { + CLASS = CHHistoryDataSource; + LANGUAGE = ObjC; + SUPERCLASS = CHRDFOutlineViewDataSource; + }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + { + CLASS = CHRDFOutlineViewDataSource; + LANGUAGE = ObjC; + OUTLETS = {mOutlineView = id; }; + SUPERCLASS = NSObject; + }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, @@ -98,7 +109,8 @@ urlbar = id; }; SUPERCLASS = NSView; - } + }, + {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); IBVersion = 1; } \ No newline at end of file diff --git a/mozilla/camino/BrowserWindow.nib/info.nib b/mozilla/camino/BrowserWindow.nib/info.nib index 2c3eba022a1..4715c3421a5 100644 --- a/mozilla/camino/BrowserWindow.nib/info.nib +++ b/mozilla/camino/BrowserWindow.nib/info.nib @@ -3,29 +3,31 @@ IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 97 226 480 309 0 0 1280 1002 IBEditorPositions 124 431 537 170 180 0 0 1152 746 160 - 478 70 195 666 0 0 1152 746 + 572 326 195 666 0 0 1280 1002 28 - 478 279 195 457 0 0 1152 746 + 572 439 195 457 0 0 1280 1002 297 - 70 110 198 210 0 0 1152 746 + 70 110 187 210 0 0 1152 746 314 - 271 139 198 180 0 0 1152 746 + 271 139 168 180 0 0 1152 746 336 458 90 200 162 0 0 1152 746 + 343 + 499 330 200 252 0 0 1152 746 365 22 500 93 162 0 0 1152 746 463 7 444 200 252 0 0 1152 746 475 - 516 447 120 142 0 0 1152 746 + 609 597 120 142 0 0 1280 1002 56 - 404 484 343 68 0 0 1152 746 + 498 634 343 68 0 0 1280 1002 IBFramework Version 248.0 @@ -45,12 +47,9 @@ IBOpenObjects - 475 - 297 160 - 56 IBSystem Version - 5Q125 + 5L21 diff --git a/mozilla/camino/BrowserWindow.nib/objects.nib b/mozilla/camino/BrowserWindow.nib/objects.nib index a59a8c9f98fd20167662f3de23186a6278b9f45e..9fe1c12a92baf381cbab3def8c0914a2d6acbfe3 100644 GIT binary patch literal 18391 zcmbtc4U|;Hm9A=<`D0*a_*2xFUUgw5fSHjPoEV%R1ZII@WQGJ|!1Q##frkDWx_f58 zpGdW@Uqa$BYzO))D(~PCA9b#L(yQY zuQ?V?#$(~I7B|v{&O?IrXVIjhwS9>e?P*DB5yAg=D^V{|Ai-YTs(V8X4GpPHj4^%t zb}wNXs{bWDNq=WpYmCSJ8=0<`wzjLst^MU0{X3Z*`dGAVX`$u~^`QpYyvZL}XMhef zQmmS>)ZORKonvXxt8Q&q<5{L9Vm!oz!>f{8+rt9}gP4oLxVheyk8R^)yDh>-;!G zuDaddtNA2zzQ)9?S+jy&1cVo#&U=4pOi&<|GnFm*{#q zrdny@)l$<4j3;1W?z>~rpcZFR3o9+1kQhfY`j0c|{*;F_v67Uk%luE@+0QdajdVKA znBdKqs9&0X`bTO6eI^>DMb2&vqdzqr||E?386 zJ<*^ATyo$Sz$_=seEmU&N+Xljc|Gjx5Xs*IA!R;c#axW;qjZFe(%Z zF%L8LapP!KhsH@?+#L2N677BdZrHSMbEIkJ5gzY2$O*rhGfGa9=Mzt)ykIiL8i>*D+sDm|1$rV{G+FNp z#-f_>^K|+tIlXV~XZE~Q29!BDrskd-r|VWzO2+Q2%$zmNW^^DB3xOE=4{4hiT=t#v3TgmPeDJWLOIte@v%O8^(t} zPn9v|<&65xkE{Yc`UL;I;*I|v?+LH{2q8cHQ*0DxXU ze>hX>;24~;hlFRYRc1=_I-b_YKnPu3_^YoEfpCpUXQAeY>nCcL!Fb9F85k!giOAMS zqBR*WNRFdFeRM-Z0CKn7)MQiD-9GId1O<#^LKzJjGfB%uo?f+LF;hX|&Dh(>X~v_9 zAEu;X%1UaRV7pi)SgBNuU_Ok(i4SWqvz|y4ky#n7RKz2u{His{WOw~F*Q|*}v{_Lt znF#p1wON5!mW6;_TvWWYCP*!=c!ceXD4$86tTiEMtM%!RLWP!Lyjfl z;5|1olBqE+ola#MHbHUepEPP-fNL#;*TfMKh*jnc?WH+w80x-N=7go!iSL2)F~7ynBMd&rn8Kn$bsR>iSccn6iX< zmt|%b81$RRKxWoBDo3 zX0D}zPYTa9G|g0I>cAdN^@2~Pg!9abi^ZhxGjzd`$4e1Uxi2kWy` z3x<+|cGo$uP7Ep2wS#q69@N5GQnNcGGbr-kGhhPbYpC+C|0URQ;prtMr!q5BRXz(F zK%kF+j8lA92TkNn)=#>=Z<;H)4xY2E*TzwpqFTb-}kR;wd9#*$L{h$OGy3-;ZtT_KKy+H7c4) zkjoyG5o{CX90U_GJyUYihCm3J8+Rr|ueq(8#zaB1+D+5`_D)QOv-Rl38w0W8M8z8> zD)L>blLfKZ>Tp3PJdG5Pg-1KUhEVGB(t`;s=CpBx2(f)pE~!L#u2_$a+xl?@;&X4? zO4~JmJg}xdzt{-2c|ZGO&YG*yMAZ>|mq8Bq7Oc;efZXQ}sU=?zF{;WdhqeB?C*0BJ7xw7+M!1M4!jaOu)nQ(L5nT48mk^QIsCmN3|6$sN>m^`<)t*j*fRG@T!ti1 zPdJ%y$i}@8ljU6R6x|kUaV0+F@=EdM_~PaDA;I4x?WU5rmBZYkejSVKfaAb2OO5H* zY>Kg{g%T5;DRi)aC z#^X#f3#J-RENYDX^pGu6Ps0nGH$iRDAKx77-l&+fvTs9Dr!;kyOl`|S4V~GxI-ArO z46448F<(B~cDr-89EKQ;VEZV^EV+^l4I?WJjs}~%v1;y)|2=c38ehoV9UmfD4o!c? z$>0d*K{0mmfb-xo7eN40Q*94IjY=-Un_>Ih$y1Lk*|{M`+@Ru&U& zvV!Rd1X28g28zFJ_&G$DEZFl3bV?Nu&B#`Gvj=dnG+zVai2F-;5J-PEc6Wy<$&TZZ79=m_iggs6&^ZKcD(z0wf`6s5!^c>M&qdYV z0L@XGV9(M;hCK|yK9JiVD>_GfH5P}b&-Y)3w0+$ib<~7o8#-!Qh-0NN>&0&p2TlRz z|ADnT#s**Qah>c`4v(FZW`8uGg`F&Y&u7W8%Ept)~Wfh5bFBX;WJ_(_6&osL}a>tfKt}gj@*1ne`mruPnA*=JgJ2@+QgNfgecv8pGj1+YEi-K=8>~&pDb3ECMJ_ z(5kVjF8d%B44I24isw~K$fx}sF`?P`0%Ah69L{_y=0*}PD9NgJBa0)=!CYV*X|^6& z962H>j4+P0hBNZ3H@NBHl;QfV-?t}bNqs+8L_sQJT4prF`-9ENE$(n(Mr zka9ca8C*ho#mR|-legrf87Dot+*o%T0wr7_kkh#?v$nX_1ZncR)N9{nd zfK*Z3x*+BZ4OY5?M8vHsNTf{B=y!E)r?7f4LyYHqHdk`Bc*y?{HQ))klfC zS`>+&Npw@hm%rpO)D1^zjU$oL7&%xKd=87FD%oHd87kN;`PqAW@pDXVavz1; zh5KFyX``rBK7Fn#DwS(rPUeQWHLh~i#H)&H)bO4n{J3O`9Z;mj?Vx#-o-eMT^$_=jReH8V!}zeZ z6a0g%xTYMEcQ|k>372%ZXM^BBCy$cq-XQNhmzXJChzGk5>xFOkk^&lFFwJ!@QGg>F zjZ0y+0$V{0zW! zd)BdniDA7${CnZV#IDq41J4z5+ zZE+Vu-bb=}B~(5IFc;6e0V#o%wfmoKWNEk< zgw;cB9k6C79J4XCx`VK+wYz*o*dL<04rLe-91TLavuO>-+Q4UtQ)9d#08Xdu?0Zq-AiiS z3|JADbQz|ImlX;~_W}de=*PM+ksSkRVD}}o8NJC~v z0Cx4=3y?h_#D+c3vc*RmSq< zf-3dmE}}GSeuWEFS^nFA4q!@BaF$8Pl?oI}flI1m@k$Il446GFSgBPfj=Lb#^%~XC z=AB@d1Lm5V_W@GNV)iXOj(2ng`=I}*VK=JW+V&t|F7rI)LaUWR_za)}Osda?Ou~H^ zFpuhTB_5sT#@+#-&?UVFh*K?;Mehf+pgW>B6Tq>i%QP1y2=Yxp$Cyw{;I)M5&{W9{ z`v}ki<>%!J&z=~isa`i!itidgopL82dx}Upe6!g!Z%r`WbHGuiYCBz;j#~jPREmpj zMC%r_?BhLvF_;3?*bA7G897Ju2(f8NGd@dzrjgPZ*$TkiUaLhBw6#jj68* zmb?p)LgnC_0II=JrxhT~3;Dyb)kbzH;LeHW-xT~_400OaRfP+f925CS7wL_HQ{3ow zbckbstK{bt3!ejU!5m8&Tn4C9Fmmdq7xl&jK!u7(LvyjTS@3UQ5KBA(iLqD zU++Yt$dl6tIVa`)Jk;2*nym*A(WynM5?42I_2ZkT$BoJ zCr2C+flT|`?n62Ii!7P#6c6}$Vu3gMwpXM%a$;g{DZ&2tMmyt@yqQYe!PP};3;5-dVNg*9HD_Q*RA*3c}B zwF+aRI+9lRA_{RJXtLVU2-b=wBtlI2;tJG8fQvjCzyqNJOp{#`Q5Fp$S^tL%COs(X zH-RudQk*(6F)9?s0AAIsaqxmG21p|PR`)c7gr^nDY)*J?7yLL1q>dB0ek2C)92Wfk zoM3+u{64&WRq$8vhQ!$q@P?%0f8_QeX^ZEt3;ude@a2L(o!f&?xbfU9_+cQQ!h(r6 zr0!yPdt)k)zk($aAe_MTMB;A&dZ*yO z&K(u}Af9Il_8k;!1>b>UtKfe?F&+1!K?|b)B3gL`&*TmX{%-(1kF+6*mjz#ing#fR z0O-gwe;;qi0{;@lise8!?ZeM*!FQqh8-l-)JBNfsZU)j$fFDL;1MvHhWJNJGjGs=y z)2IPc%W}xSKAHOv$$7y48S@F6cPztC4^j*OHQ_0Dv0&)ZbH$hN^G||pMcWgQ8{R$% z{wT%Wh3BB)1`2#~aUyqY4sae8{IT4-V{>Z---`-lApa52eYo6%MghUE#v5{_KgQb) zf{g4q5(wt(;S|w0b2P50AT5m0Pf6jdTT@e7;iYXeFSd{1>XQXoFqJ# zgMWDfpbbbW1K|U~zlGu*!HIE9^mkFbCpd&oiRkIToOEMuydAsfP~ec^XStbzff&D~9W*k6zn#P28UVmy#i86=<+(HCP!SiL zG;hA(eJG|h<&Y)@LmtdeKX9iD{tI*=FdukZi;zBtME^cKBS{+q-j@YW;SJlg|IC4~ z4sJ6{!Z?8TrLC&=gO6_1;MO8!fP^#mqj*$sXc#4T zUqFFz)&h7;@P%kM;S&H&6Z|9!B$8+6_6yzw_!k7f8(7al&N*nz%c$OrQPL+2-@|hZ znw{Imfp}3PUeS9Uo~tgw59aD?D6r}IV{SGK1&ua?2VhMSd^Ku5Ef~y--`as6DBDXY zknVmKHNArWJJ8Pxz8!DN1ive{O7JHEdR6e-fOm!9>rvb+IJ6N-YyRcj8~6wT&oIUL zD4v0-0RhJMX}lq24~^z6f*;B4KxY6Qfq?>4D)_fid`9pSC?e1kbcnw0!CR%^r%>n> zK>rB$5%7%J`4o!FG4UuGr{L!*!J}xC68u#Z^91h&aGl^Y@wOOS_1yb{KZWP3g82Ca zm|{<3;(#+3=Qz2fVEc1V2!1^(I|TnK3PbSMP|N{o6j8x<=XwQuELR~Itb|V${8zc% zf`1Or^I%Y(ErS0p2ha9dJby`W0k8U}eoyxF@3M2Q&%l{iw=^}!0x|#mIBp>J#pwT- G=Kle_j|q4H literal 16929 zcmbtb4|r77mA`iq5)wklABaVTj#_My77fr=Q-wePNr5C~0wJbvQt4eX9rM8u7m#<3yu&wod`>l4ng4J(vf9Kx! z-n^MfAXqf-&$;KGd(OG%oO|whcSy}B*Xx}?4POIj$k zG?)qs_FG+_*cMO_mdPrVmVsm{9#z2EL%Oe-x&kebN`zy5d`RbWu2_OeBTTPq#=lz?8B5d_=y^(8z{Muj-u7L4Y}Tw)Th<2SYO2hQ{fu4`YHlVwf)%vHBXKyv{xZFU z3}$$^EHIc%X;IQp6-b)!1mnMh^7|1C9Z^ z{(Z3waZpQj+Oax{IG!ONiB#JDb3#+^KyRT5PSYb(ELF@#o*n7uWn$Bu6f!4 z)uBxn7N?~u4!X)ed5F8r*Qdbsl3-|KUm`vb>+$f9vAXjI0ef}(6o6G{I5gg{qRi!LC7J* zA{YzPPY+kNr#5H_ih)T(|K|~&eT`!7WHh(7O2=yo18;b^zAc{e->Ieit8uHfW)Z(O_aDLXq8qNJcHI!&|kUKnlhI6Rf?v zpVUt(Q^AEC|CMY8ol3&Z;q+}#+!;nLo3p>rHo@B(X=2(M^CqUy20Pkto8W2wMcx+ zT#pOB;Wgx(&D2d3>>ujD8m@V)+3`e%%GxFNi2fj$!Wxy#xwa+4iZ8w5)-QZ;@E|Qf z^-dU;;XWXjfD+8-@Gvc*Tf(W(2B;XGiipoE1b;!W7f3gBR|^lc2|CceT3tIe%pkNc z_`5@x=rFCBD#V7WeS-a7@ZYH3>He(<&8LUUR6hzR7}9w;JzPpwV~k|DUP?4DXz6{z zXYJ=l1bam=kLJ5>UL7& zSGT)LwAmK?u{+7Z($B%s zFrcr!{}PylRk^Guobq>uQxR<(*b{H3uo3Hxj{~=CsTR=?89b3CU&If=?NoayB26d_ z&Ye4V%n^)(hE#o>SAn+CkHr;tr?DuYmSm^Vq%=sHWy`jP5POQo{t+fnf7Mwle6&`K zKk!eoGbgMTc5b5o(&KWa+S>7 zaES@Deql*#iG=&9y=iB5)<~K?r&^JStE7w4eQLgKPxcck;E+->BcYP~4t;H|2PVnBs>i!ELoj=>&U}RiSH@ zVgz}!TF9xdEf4aZfoKeSuZgrpA|5k>?Vd>cxI&>Rak-inQh`kfCH51s?-+=rlAf8% z9AcD99=U(vW0Xj`;!fEh^_EK`k!k6mHMQ|Vv!umu$xZ*9L+s}-8k|E)qr~@fmqL&d=sa1>07m>`F@rc508D z%L4V)PLf3EDoH?v-^QSs>@2;cx3`Jizo@%ww_bI3Pu!u@1fTOGDOp}bZr3h&)fD3B zp(zE#UIC$P-#Gm$_BrT#Q+9!4n@3M_pBt*+t9%9@(A4z{G| zmD449huy8iwwMfT%60S!!nZ)MZ_^5ktJgcPGVBD@KmvLYOFRte>Wn!pb4(^&4Gb$S zq;ta7gjIu~cyiRJbrleieW>VmdpzEkzans2o+!EzUc=Z?(wA+c;o2pgDz)DYe_1Pt z(=N4wSm}n8yuin^Ye~T$LR0IMHYpeB99>guY)!ReU!7AxMJLJ^TB19?byQt-0=3=N zK^i8Qx9CqM`Mae2SICuTRXDbh)_hvEF0uUNx~hD^+x1dQf7j7;Ggvt|*3y=vUDp!t zAM{JwP6|~drkjbl!b}MSH*2cb;$*>m7Om_`{*Nq1o-W5h#^&V8VSQKr}aar3wYyM&F{49V1Nc_JS52eicIizR2SN~+diHxcYnoyVcVsZyr)SY%M` zUR2%Z(i1jC_EU0QR2h`=T-*w}XiKS96Cz66HI%^0v3k-!tP;G@K$Z_AlmuHM!DKS9 zCD`AuC2pX4-*rH!ZCSBwYf6KE^uQ#E2o^Wg-0YW9bar7YQee~7k%;#t zv}Ce1)c4kr48_<2#{r#&dHUQ%@}D_m#ljK?G0!32?YMo=qi1$qe|D5|?>Sph{`KU*oR zo+}q63j}|MFzN1$q?f@UQ0SDJ954p1rrJj-$FgmBGO|ka_6zwW}-uP&^HyW-$NW&<>u3%2vY|>80AZdL*l_{nMY3Ga;IMp0(|c_E(fwd z>P%O=D`ZjmA1G1Mw)vigueu2zV7A^Im!p*LfK2%gOc{g1mjdtGX&>np=pM7p<#4bT z$uiBcUo8wZ7V z$H4bU1K(3itVpFDSJ%-E+=G2Wje>s1l!4O-`3C-ov#V0H!IQnOy5(hvSxR4gAk{-P zw2Sf@dW9QhbEZ6osgHk?Usbfp2j|WXiiD8fQ3LNdQ|uiD8djP*CN*^|&pSp@0(l3f zhpx7g<>b)r2znv!*zm{qyxvhrBX2|Gs?zZ#t>`xr;cwG2yB-5Zf;P}#q zD;Wq1jQIPNd=pIefp^r^sST1^C4fJY_SrGswYJ9r06_{VL=OL5e3?c0QWByHzRX3i zt7^Oop9QYEGDkvIE!_ejFlpmlroJiUihzQ>F3W&rX=ACg?XpYble+Da@ZIX$9TmI_ z2gbVG*noi>KE%Lh#~QezSC$lW!wU9b@zAUOhN0gaYv^(fMa0~|Me=t44T^qitU)V! zWPQ;cmMpDkhlnLznFe;#?!15IZ_vSmW3f|})cS)7$}U}wU~OaV5i4ME@6o~!`B2*-r}y|bL{5*(-x5*J@oV9-woY;% zPbI!FrvZbT@1oXE3A?;xa*+vHEPcq9B|zRHzc;pAsm$*Zv1ufI17?->EIumAf{aZS z#4-&&!LP^1Il5AlqUe5JX}qu)pI6+%iQx5~8n6DaB34S|K}&!1(TkpSDCIR6sitt8 zy?fPBhJALBo1Bc|gO?NO;CuLk#iOuOWZPX&$B_``~ zq#17|&iUSU*;P+Sf=Nto8+-nwCoNO{zZM6}#+FX-rD~=Xc1g=XYHVaLS*nSS3v)t8 z5T|m+g*u*Zpn@+untl%P`QnQ@u*gCx1IT(pDgWX~WK0fZ5%8iEF(wo~gbku8csZ?U zg5N^3pmpJC6*bp!b8wq^Vg&CK6v7JC3r7NWm=n3VPOxW9i`qXy9{CKO*!!sO(8@@K z6RZRHa?{g8f8Is#ik20N2U78tIGsL8Y4R(bEFxx%9U!)bM!5%Uuw&R_08o!554Q@* z1lx;EyV<@LfY~&vUB{8tn&O%gU+-)`o)COD?H1_nWoCReC4MK-IrkUrSOotL(V;tn zN|&NVH6>d7?=bLJwB?o?7L}QDI*33_YzOvw)mc{VI)X7Rl9W4lFpV~IBhADtDdV4y zbKh3MPtXwtb&>;H66f&7s3$qjW%vn-Q1@C`FOQ&3W*_Wgbva2mJQ*k zmI%t)UGe#lZKG0!QBLmmp7}KBtVq1eJU|w)o2&(jqDv)BVK>RutUMmor8IDMpg4!y z1!ZQRCj;=$G|RZTb-so*FTCg9^W1$uoy;RTz=al>qiE&BfYv=JbY<&E`8`*FB+Xm=w6^^es-s(D#PM zMg#QE0*J2$YHJP1U3m8#bu-KX0P;UnP`BNH;>(2nu|bj}@Pl4z^9=JDykkiEfGrPi z0#v5x<+#A0Cjmn>-bFLaGek%p30#FLr(wRKdbt?$KnV$l>Zh2WF9qWDMYNE00G20| ze-xxSfI(1~F*O9$rJe8uH7_Gdt+D=rR0|=33EoAt0^uGF^?w;b0izEz5Xhxvn00{I zC;61}8|O>?KLEHo_l0f?@KQk^>TKd|c+cZo@D;_NK7h*Y^WKI@)yEve>=<52wa!Tn z!>j@XQ|I#5*a%%(0J>(dz%VO|kceA8w*WkEo)qGJfGg#9F;^>V1z%_019-j~qJZQn zS(2SF8kFr-y*;eA1LCy`?A`$>&`=@k^W;SGJAjEJdtQqrgV_kMmmyL{DPUd=%~O^Y zB2;JJ6xg6?uuDXXLSz~)UI-)#2LSZABPVi8R=40pG2Fwkrr8Ab%#KoU22h{mg6+U# z?lT{G!399_wJiAO0W0)%ek*`p+C*?WV09kXYgGRXb1NELJEBsz`+{`$y?cTfxpKbIV<7?z!sm`e z%{R<2V0nBfQ<(v^5W@IOJWdeW=E zFWwn<_@o0jHm?q)CdJbE!|xDwEl!#^$Z|ltnbg!r2ovc;0Dc>wc_fJeew8Dq6CjhG zyxCD3twQBd`VGTCGS{EcvR4sx4vx4D6zL{K;qgw=W0M&il@G*ef`24B)=%ObCa@&{ z-V}#lJ8Ze5BC|&GG^bhFeE|}!2{PrXih94*+9S|rnv+f{dvaTc!nPtkq8CNi(kSJd z68rpNBtFEpn#!rEZZpm{(W$Xc{NzP;&#C7m z+8d&tG(eu^cRf>STN!oadHjzflQ#{Z%@dve#F+A2b?cH9TBJWOgv(WymJ^)7>J0Z&`$}z)YA3QHTU67Q zw&43bT+?L!y8@j*d=DYi^*zBCq3ypG zS+5B`j3;XbpzxUk)-!_t699i*ZzWM4gA zA!`nfGg&o)|ImsH{&O^<(50it1A>3g!f)rEur>;Q67Xq)C(&sJ_V9T7g5dvQ-Hg() zRVp~?Y?k1kL^rtT6L_n?1<$BUf6p2b`~l#ju(k`gM#29c&8Ria$8EmgD{;H?dbBJP z{3!aMmi0K^pwB_HRNo9xdLo`m1pl-(DA+fwa{&vr<%fU-4ZV)rje=)z`#7qxKtx*~ zIz2CVDc;HjUt$di_K()~3Ja<{4#Ye0b2>DkxV8p}4+@R}`TITAwSxT%o=}gz3Ag{b z!)h1&QQ)I&zSC+D>=~;|@Sg$jQNgzY1FD?^0w`Yo&_eC+VLT%oLd`zl{T2v)m3Xd& zYVgc4$GD;P9tIwYl22Ld1m9;x1^ZT?1d zd{*$i)*FJ4pyhVKPgyAS-G}Es7_EgG>pnc+Cis)qbew1d{xQL8(0j7r|At!#0{c+$ zyC2W7ur&jx*{qdSYfIqM$5k68x<|Atj2_z`QCU{8a@ z7X|+vZl4zXTezVBOYB@BcnUNy(aZ66mEfCkL%DPZ*g(eru=UP5G_Uttm^Szw|Gx+> zsFW_i?T%U2Nx>fkCd!-_&<_k>XTf7%L?aCE`_>u3hwu#M8*%&Jzr*Ff7Xv>t8Q7Sz z`>ctA9|H8;oz`7~{}fPs4*`2rmhHu@Lhu&rgy31UtQP!LfM#N{@fH&NKkTeI0UyPPCxSfe}oGS ALI3~& diff --git a/mozilla/camino/BrowserWindowController.h b/mozilla/camino/BrowserWindowController.h index 351d7940625..5e843463a3c 100644 --- a/mozilla/camino/BrowserWindowController.h +++ b/mozilla/camino/BrowserWindowController.h @@ -58,6 +58,7 @@ class nsIDOMNode; IBOutlet id mSidebarBrowserView; IBOutlet id mSidebarBookmarksDataSource; + IBOutlet id mHistoryDataSource; IBOutlet CHBookmarksToolbar* mPersonalToolbar; diff --git a/mozilla/camino/BrowserWindowController.mm b/mozilla/camino/BrowserWindowController.mm index 33d61eb485d..d34c77ff679 100644 --- a/mozilla/camino/BrowserWindowController.mm +++ b/mozilla/camino/BrowserWindowController.mm @@ -203,6 +203,8 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item"; - (void)drawerWillOpen: (NSNotification*)aNotification { [mSidebarBookmarksDataSource ensureBookmarks]; + + [mHistoryDataSource ensureDataSourceLoaded]; // Force the window to shrink and move if necessary in order to accommodate the sidebar. NSRect screenFrame = [[[self window] screen] visibleFrame]; diff --git a/mozilla/camino/CHRDFOutlineViewDataSource.h b/mozilla/camino/CHRDFOutlineViewDataSource.h index b703ea3753f..5d08e5d8df6 100644 --- a/mozilla/camino/CHRDFOutlineViewDataSource.h +++ b/mozilla/camino/CHRDFOutlineViewDataSource.h @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #import -#include +#import class nsIRDFDataSource; class nsIRDFContainer; @@ -46,17 +46,17 @@ class nsIRDFResource; class nsIRDFService; @interface CHRDFOutlineViewDataSource : NSObject { - nsIRDFDataSource* mDataSource; - nsIRDFContainer* mContainer; - nsIRDFContainerUtils* mContainerUtils; - nsIRDFResource* mRootResource; - nsIRDFService* mRDFService; + nsIRDFDataSource* mDataSource; + nsIRDFContainer* mContainer; + nsIRDFContainerUtils* mContainerUtils; + nsIRDFResource* mRootResource; + nsIRDFService* mRDFService; IBOutlet id mOutlineView; } // Initialization Methods -- (id) initWithDataSource: (nsIRDFDataSource*) aDataSource rootResource: (nsIRDFResource*) aRootResource; +- (void) ensureDataSourceLoaded; - (nsIRDFDataSource*) dataSource; - (nsIRDFResource*) rootResource; diff --git a/mozilla/camino/CHRDFOutlineViewDataSource.mm b/mozilla/camino/CHRDFOutlineViewDataSource.mm index 6f37b665953..1040b84700d 100644 --- a/mozilla/camino/CHRDFOutlineViewDataSource.mm +++ b/mozilla/camino/CHRDFOutlineViewDataSource.mm @@ -44,6 +44,7 @@ #include "nsIRDFResource.h" #include "nsIRDFContainer.h" #include "nsIRDFContainerUtils.h" +#include "nsRDFCID.h" #include "nsComponentManagerUtils.h" #include "nsIServiceManagerUtils.h" @@ -51,36 +52,23 @@ #include "nsXPIDLString.h" #include "nsString.h" + + @implementation CHRDFOutlineViewDataSource -- (id) init +- (void) ensureDataSourceLoaded { - if ((self = [super init])) { - nsCOMPtr ctr(do_CreateInstance("@mozilla.org/rdf/container;1")); - NS_ADDREF(mContainer = ctr); + nsCOMPtr ctr = do_CreateInstance("@mozilla.org/rdf/container;1"); + NS_ADDREF(mContainer = ctr); - nsCOMPtr ctrUtils(do_GetService("@mozilla.org/rdf/container-utils;1")); - NS_ADDREF(mContainerUtils = ctrUtils); + nsCOMPtr ctrUtils = do_GetService("@mozilla.org/rdf/container-utils;1"); + NS_ADDREF(mContainerUtils = ctrUtils); - nsCOMPtr rdfService(do_GetService("@mozilla.org/rdf/rdf-service;1")); - NS_ADDREF(mRDFService = rdfService); + nsCOMPtr rdfService = do_GetService("@mozilla.org/rdf/rdf-service;1"); + NS_ADDREF(mRDFService = rdfService); - mDataSource = nsnull; - mRootResource = nsnull; - } - return self; -} - -- (id) initWithDataSource: (nsIRDFDataSource*) aDataSource rootResource: (nsIRDFResource*) aRootResource -{ - NS_ASSERTION(aDataSource != nsnull, "Trying to initWithDataSource without a data source!"); - if (!aDataSource) - return nil; - - NS_ADDREF(mDataSource = aDataSource); - NS_IF_ADDREF(mRootResource = aRootResource); - - return [self init]; + mDataSource = nsnull; + mRootResource = nsnull; } - (void) dealloc @@ -127,15 +115,35 @@ return NO; } -// XXX write me -- (BOOL)outlineView: (NSOutlineView*) aOutlineView isItemExpandable: (id) aItem +- (BOOL) outlineView: (NSOutlineView*) aOutlineView isItemExpandable: (id) aItem { - return NO; + NSLog(@"outlineView:%@isItemExpandable:%@", aOutlineView, aItem); + if (!mDataSource) + return NO; + + if (!aItem) + return YES; // The root is always open + + nsCOMPtr itemResource = [aItem resource]; + + PRBool isSeq = PR_FALSE; + mContainerUtils->IsSeq(mDataSource, itemResource, &isSeq); + if (isSeq) + return YES; + + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); + + nsCOMPtr childNode; + mDataSource->GetTarget(itemResource, childProperty, PR_TRUE, getter_AddRefs(childNode)); + + return childNode != nsnull; } - (id) outlineView: (NSOutlineView*) aOutlineView child: (int) aIndex ofItem: (id) aItem { + NSLog(@"outlineView:%@child:%dofItem:%@", aOutlineView, aIndex, aItem); if (!mDataSource) return nil; @@ -157,18 +165,40 @@ - (int) outlineView: (NSOutlineView*) aOutlineView numberOfChildrenOfItem: (id) aItem; { + NSLog(@"outlineView:%@numberOfChildrenOfItem:%@", aOutlineView, aItem); if (!mDataSource) return nil; nsCOMPtr resource = !aItem ? mRootResource : [aItem resource]; - nsresult rv = mContainer->Init(mDataSource, resource); - NS_ASSERTION(NS_SUCCEEDED(rv), "Not a container!"); - if (NS_FAILED(rv)) - return 0; + // XXX just assume NC:child is the only containment arc for now + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); - PRInt32 count; - mContainer->GetCount(&count); + nsCOMPtr childNodes; + mDataSource->GetTargets(resource, childProperty, PR_TRUE, getter_AddRefs(childNodes)); + + PRBool hasMore = PR_FALSE; + childNodes->HasMoreElements(&hasMore); + + PRInt32 count = 0; + + while (hasMore) { + nsCOMPtr supp; + childNodes->GetNext(getter_AddRefs(supp)); + + ++count; + + childNodes->HasMoreElements(&hasMore); + } + + if (!count) { + nsresult rv = mContainer->Init(mDataSource, resource); + if (NS_FAILED(rv)) + return 0; + + mContainer->GetCount(&count); + } return count; } @@ -176,6 +206,7 @@ - (id) outlineView: (NSOutlineView*) aOutlineView objectValueForTableColumn: (NSTableColumn*) aTableColumn byItem: (id) aItem { + NSLog(@"outlineView:%@objectValueForTableColumn:%@byItem:%@", aOutlineView, aTableColumn, aItem); if (!mDataSource || !aItem) return nil; diff --git a/mozilla/camino/Chimera.pbproj/project.pbxproj b/mozilla/camino/Chimera.pbproj/project.pbxproj index eb601662f4c..a256f3b26cb 100644 --- a/mozilla/camino/Chimera.pbproj/project.pbxproj +++ b/mozilla/camino/Chimera.pbproj/project.pbxproj @@ -24,6 +24,8 @@ F59E9F3F0237E43401A967DF, F52D5CD0027A887001A80166, F52D5CD4027A88C601A80166, + F52F87CD027D75C301A80165, + F52F87CE027D75C301A80165, ); isa = PBXGroup; name = Classes; @@ -400,6 +402,8 @@ F52D5CD1027A887001A80166, F52D5CD5027A88C601A80166, F52D5CD9027D3D5001A80166, + F52F87CF027D75C301A80165, + F52F87D0027D75C301A80165, ); isa = PBXHeadersBuildPhase; name = Headers; @@ -492,6 +496,8 @@ F52D5CD2027A887001A80166, F52D5CD6027A88C601A80166, F52D5CDA027D3D5001A80166, + F52F87D1027D75C301A80165, + F52F87D2027D75C301A80165, ); isa = PBXSourcesBuildPhase; name = Sources; @@ -896,6 +902,8 @@ F5137A1102676B9101026D05, F52D5CCF027A887001A80166, F52D5CD3027A88C601A80166, + F52F87CB027D75C301A80165, + F52F87CC027D75C301A80165, ); isa = PBXGroup; name = Headers; @@ -1482,6 +1490,50 @@ settings = { }; }; + F52F87CB027D75C301A80165 = { + isa = PBXFileReference; + path = CHHistoryDataSource.h; + refType = 4; + }; + F52F87CC027D75C301A80165 = { + isa = PBXFileReference; + path = CHRDFOutlineViewDataSource.h; + refType = 4; + }; + F52F87CD027D75C301A80165 = { + isa = PBXFileReference; + path = CHHistoryDataSource.mm; + refType = 4; + }; + F52F87CE027D75C301A80165 = { + isa = PBXFileReference; + path = CHRDFOutlineViewDataSource.mm; + refType = 4; + }; + F52F87CF027D75C301A80165 = { + fileRef = F52F87CB027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D0027D75C301A80165 = { + fileRef = F52F87CC027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D1027D75C301A80165 = { + fileRef = F52F87CD027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D2027D75C301A80165 = { + fileRef = F52F87CE027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; F538DFAE023B36A7010001CA = { children = ( F538DFAF023B3739010001CA, diff --git a/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib index 669269f11fb..ff1d11f6433 100644 --- a/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib +++ b/mozilla/camino/English.lproj/BrowserWindow.nib/classes.nib @@ -34,7 +34,6 @@ stop = id; toggleSidebar = id; viewOnlyThisImage = id; - viewSource = id; }; CLASS = BrowserWindowController; LANGUAGE = ObjC; @@ -44,6 +43,7 @@ mAddBookmarkSheetWindow = id; mAddBookmarkTitleField = id; mCachedBMDS = id; + mHistoryDataSource = id; mImageLinkMenu = id; mImageMenu = id; mInputMenu = id; @@ -75,7 +75,18 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + { + CLASS = CHHistoryDataSource; + LANGUAGE = ObjC; + SUPERCLASS = CHRDFOutlineViewDataSource; + }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + { + CLASS = CHRDFOutlineViewDataSource; + LANGUAGE = ObjC; + OUTLETS = {mOutlineView = id; }; + SUPERCLASS = NSObject; + }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, @@ -98,7 +109,8 @@ urlbar = id; }; SUPERCLASS = NSView; - } + }, + {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); IBVersion = 1; } \ No newline at end of file diff --git a/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib b/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib index 2c3eba022a1..4715c3421a5 100644 --- a/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib +++ b/mozilla/camino/English.lproj/BrowserWindow.nib/info.nib @@ -3,29 +3,31 @@ IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 97 226 480 309 0 0 1280 1002 IBEditorPositions 124 431 537 170 180 0 0 1152 746 160 - 478 70 195 666 0 0 1152 746 + 572 326 195 666 0 0 1280 1002 28 - 478 279 195 457 0 0 1152 746 + 572 439 195 457 0 0 1280 1002 297 - 70 110 198 210 0 0 1152 746 + 70 110 187 210 0 0 1152 746 314 - 271 139 198 180 0 0 1152 746 + 271 139 168 180 0 0 1152 746 336 458 90 200 162 0 0 1152 746 + 343 + 499 330 200 252 0 0 1152 746 365 22 500 93 162 0 0 1152 746 463 7 444 200 252 0 0 1152 746 475 - 516 447 120 142 0 0 1152 746 + 609 597 120 142 0 0 1280 1002 56 - 404 484 343 68 0 0 1152 746 + 498 634 343 68 0 0 1280 1002 IBFramework Version 248.0 @@ -45,12 +47,9 @@ IBOpenObjects - 475 - 297 160 - 56 IBSystem Version - 5Q125 + 5L21 diff --git a/mozilla/camino/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/camino/English.lproj/BrowserWindow.nib/objects.nib index a59a8c9f98fd20167662f3de23186a6278b9f45e..9fe1c12a92baf381cbab3def8c0914a2d6acbfe3 100644 GIT binary patch literal 18391 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 G=Kle_j|q4H literal 16929 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 ALI3~& diff --git a/mozilla/camino/projects/Chimera.pbproj/project.pbxproj b/mozilla/camino/projects/Chimera.pbproj/project.pbxproj index eb601662f4c..a256f3b26cb 100644 --- a/mozilla/camino/projects/Chimera.pbproj/project.pbxproj +++ b/mozilla/camino/projects/Chimera.pbproj/project.pbxproj @@ -24,6 +24,8 @@ F59E9F3F0237E43401A967DF, F52D5CD0027A887001A80166, F52D5CD4027A88C601A80166, + F52F87CD027D75C301A80165, + F52F87CE027D75C301A80165, ); isa = PBXGroup; name = Classes; @@ -400,6 +402,8 @@ F52D5CD1027A887001A80166, F52D5CD5027A88C601A80166, F52D5CD9027D3D5001A80166, + F52F87CF027D75C301A80165, + F52F87D0027D75C301A80165, ); isa = PBXHeadersBuildPhase; name = Headers; @@ -492,6 +496,8 @@ F52D5CD2027A887001A80166, F52D5CD6027A88C601A80166, F52D5CDA027D3D5001A80166, + F52F87D1027D75C301A80165, + F52F87D2027D75C301A80165, ); isa = PBXSourcesBuildPhase; name = Sources; @@ -896,6 +902,8 @@ F5137A1102676B9101026D05, F52D5CCF027A887001A80166, F52D5CD3027A88C601A80166, + F52F87CB027D75C301A80165, + F52F87CC027D75C301A80165, ); isa = PBXGroup; name = Headers; @@ -1482,6 +1490,50 @@ settings = { }; }; + F52F87CB027D75C301A80165 = { + isa = PBXFileReference; + path = CHHistoryDataSource.h; + refType = 4; + }; + F52F87CC027D75C301A80165 = { + isa = PBXFileReference; + path = CHRDFOutlineViewDataSource.h; + refType = 4; + }; + F52F87CD027D75C301A80165 = { + isa = PBXFileReference; + path = CHHistoryDataSource.mm; + refType = 4; + }; + F52F87CE027D75C301A80165 = { + isa = PBXFileReference; + path = CHRDFOutlineViewDataSource.mm; + refType = 4; + }; + F52F87CF027D75C301A80165 = { + fileRef = F52F87CB027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D0027D75C301A80165 = { + fileRef = F52F87CC027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D1027D75C301A80165 = { + fileRef = F52F87CD027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D2027D75C301A80165 = { + fileRef = F52F87CE027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; F538DFAE023B36A7010001CA = { children = ( F538DFAF023B3739010001CA, diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib index 669269f11fb..ff1d11f6433 100644 --- a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib +++ b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib @@ -34,7 +34,6 @@ stop = id; toggleSidebar = id; viewOnlyThisImage = id; - viewSource = id; }; CLASS = BrowserWindowController; LANGUAGE = ObjC; @@ -44,6 +43,7 @@ mAddBookmarkSheetWindow = id; mAddBookmarkTitleField = id; mCachedBMDS = id; + mHistoryDataSource = id; mImageLinkMenu = id; mImageMenu = id; mInputMenu = id; @@ -75,7 +75,18 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + { + CLASS = CHHistoryDataSource; + LANGUAGE = ObjC; + SUPERCLASS = CHRDFOutlineViewDataSource; + }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + { + CLASS = CHRDFOutlineViewDataSource; + LANGUAGE = ObjC; + OUTLETS = {mOutlineView = id; }; + SUPERCLASS = NSObject; + }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, @@ -98,7 +109,8 @@ urlbar = id; }; SUPERCLASS = NSView; - } + }, + {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); IBVersion = 1; } \ No newline at end of file diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib index 2c3eba022a1..4715c3421a5 100644 --- a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -3,29 +3,31 @@ IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 97 226 480 309 0 0 1280 1002 IBEditorPositions 124 431 537 170 180 0 0 1152 746 160 - 478 70 195 666 0 0 1152 746 + 572 326 195 666 0 0 1280 1002 28 - 478 279 195 457 0 0 1152 746 + 572 439 195 457 0 0 1280 1002 297 - 70 110 198 210 0 0 1152 746 + 70 110 187 210 0 0 1152 746 314 - 271 139 198 180 0 0 1152 746 + 271 139 168 180 0 0 1152 746 336 458 90 200 162 0 0 1152 746 + 343 + 499 330 200 252 0 0 1152 746 365 22 500 93 162 0 0 1152 746 463 7 444 200 252 0 0 1152 746 475 - 516 447 120 142 0 0 1152 746 + 609 597 120 142 0 0 1280 1002 56 - 404 484 343 68 0 0 1152 746 + 498 634 343 68 0 0 1280 1002 IBFramework Version 248.0 @@ -45,12 +47,9 @@ IBOpenObjects - 475 - 297 160 - 56 IBSystem Version - 5Q125 + 5L21 diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index a59a8c9f98fd20167662f3de23186a6278b9f45e..9fe1c12a92baf381cbab3def8c0914a2d6acbfe3 100644 GIT binary patch literal 18391 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 G=Kle_j|q4H literal 16929 zcmbtb4|r77mA`iq5)wklABaVTj#_My77fr=Q-wePNr5C~0wJbvQt4eX9rM8u7m#<3yu&wod`>l4ng4J(vf9Kx! z-n^MfAXqf-&$;KGd(OG%oO|whcSy}B*Xx}?4POIj$k zG?)qs_FG+_*cMO_mdPrVmVsm{9#z2EL%Oe-x&kebN`zy5d`RbWu2_OeBTTPq#=lz?8B5d_=y^(8z{Muj-u7L4Y}Tw)Th<2SYO2hQ{fu4`YHlVwf)%vHBXKyv{xZFU z3}$$^EHIc%X;IQp6-b)!1mnMh^7|1C9Z^ z{(Z3waZpQj+Oax{IG!ONiB#JDb3#+^KyRT5PSYb(ELF@#o*n7uWn$Bu6f!4 z)uBxn7N?~u4!X)ed5F8r*Qdbsl3-|KUm`vb>+$f9vAXjI0ef}(6o6G{I5gg{qRi!LC7J* zA{YzPPY+kNr#5H_ih)T(|K|~&eT`!7WHh(7O2=yo18;b^zAc{e->Ieit8uHfW)Z(O_aDLXq8qNJcHI!&|kUKnlhI6Rf?v zpVUt(Q^AEC|CMY8ol3&Z;q+}#+!;nLo3p>rHo@B(X=2(M^CqUy20Pkto8W2wMcx+ zT#pOB;Wgx(&D2d3>>ujD8m@V)+3`e%%GxFNi2fj$!Wxy#xwa+4iZ8w5)-QZ;@E|Qf z^-dU;;XWXjfD+8-@Gvc*Tf(W(2B;XGiipoE1b;!W7f3gBR|^lc2|CceT3tIe%pkNc z_`5@x=rFCBD#V7WeS-a7@ZYH3>He(<&8LUUR6hzR7}9w;JzPpwV~k|DUP?4DXz6{z zXYJ=l1bam=kLJ5>UL7& zSGT)LwAmK?u{+7Z($B%s zFrcr!{}PylRk^Guobq>uQxR<(*b{H3uo3Hxj{~=CsTR=?89b3CU&If=?NoayB26d_ z&Ye4V%n^)(hE#o>SAn+CkHr;tr?DuYmSm^Vq%=sHWy`jP5POQo{t+fnf7Mwle6&`K zKk!eoGbgMTc5b5o(&KWa+S>7 zaES@Deql*#iG=&9y=iB5)<~K?r&^JStE7w4eQLgKPxcck;E+->BcYP~4t;H|2PVnBs>i!ELoj=>&U}RiSH@ zVgz}!TF9xdEf4aZfoKeSuZgrpA|5k>?Vd>cxI&>Rak-inQh`kfCH51s?-+=rlAf8% z9AcD99=U(vW0Xj`;!fEh^_EK`k!k6mHMQ|Vv!umu$xZ*9L+s}-8k|E)qr~@fmqL&d=sa1>07m>`F@rc508D z%L4V)PLf3EDoH?v-^QSs>@2;cx3`Jizo@%ww_bI3Pu!u@1fTOGDOp}bZr3h&)fD3B zp(zE#UIC$P-#Gm$_BrT#Q+9!4n@3M_pBt*+t9%9@(A4z{G| zmD449huy8iwwMfT%60S!!nZ)MZ_^5ktJgcPGVBD@KmvLYOFRte>Wn!pb4(^&4Gb$S zq;ta7gjIu~cyiRJbrleieW>VmdpzEkzans2o+!EzUc=Z?(wA+c;o2pgDz)DYe_1Pt z(=N4wSm}n8yuin^Ye~T$LR0IMHYpeB99>guY)!ReU!7AxMJLJ^TB19?byQt-0=3=N zK^i8Qx9CqM`Mae2SICuTRXDbh)_hvEF0uUNx~hD^+x1dQf7j7;Ggvt|*3y=vUDp!t zAM{JwP6|~drkjbl!b}MSH*2cb;$*>m7Om_`{*Nq1o-W5h#^&V8VSQKr}aar3wYyM&F{49V1Nc_JS52eicIizR2SN~+diHxcYnoyVcVsZyr)SY%M` zUR2%Z(i1jC_EU0QR2h`=T-*w}XiKS96Cz66HI%^0v3k-!tP;G@K$Z_AlmuHM!DKS9 zCD`AuC2pX4-*rH!ZCSBwYf6KE^uQ#E2o^Wg-0YW9bar7YQee~7k%;#t zv}Ce1)c4kr48_<2#{r#&dHUQ%@}D_m#ljK?G0!32?YMo=qi1$qe|D5|?>Sph{`KU*oR zo+}q63j}|MFzN1$q?f@UQ0SDJ954p1rrJj-$FgmBGO|ka_6zwW}-uP&^HyW-$NW&<>u3%2vY|>80AZdL*l_{nMY3Ga;IMp0(|c_E(fwd z>P%O=D`ZjmA1G1Mw)vigueu2zV7A^Im!p*LfK2%gOc{g1mjdtGX&>np=pM7p<#4bT z$uiBcUo8wZ7V z$H4bU1K(3itVpFDSJ%-E+=G2Wje>s1l!4O-`3C-ov#V0H!IQnOy5(hvSxR4gAk{-P zw2Sf@dW9QhbEZ6osgHk?Usbfp2j|WXiiD8fQ3LNdQ|uiD8djP*CN*^|&pSp@0(l3f zhpx7g<>b)r2znv!*zm{qyxvhrBX2|Gs?zZ#t>`xr;cwG2yB-5Zf;P}#q zD;Wq1jQIPNd=pIefp^r^sST1^C4fJY_SrGswYJ9r06_{VL=OL5e3?c0QWByHzRX3i zt7^Oop9QYEGDkvIE!_ejFlpmlroJiUihzQ>F3W&rX=ACg?XpYble+Da@ZIX$9TmI_ z2gbVG*noi>KE%Lh#~QezSC$lW!wU9b@zAUOhN0gaYv^(fMa0~|Me=t44T^qitU)V! zWPQ;cmMpDkhlnLznFe;#?!15IZ_vSmW3f|})cS)7$}U}wU~OaV5i4ME@6o~!`B2*-r}y|bL{5*(-x5*J@oV9-woY;% zPbI!FrvZbT@1oXE3A?;xa*+vHEPcq9B|zRHzc;pAsm$*Zv1ufI17?->EIumAf{aZS z#4-&&!LP^1Il5AlqUe5JX}qu)pI6+%iQx5~8n6DaB34S|K}&!1(TkpSDCIR6sitt8 zy?fPBhJALBo1Bc|gO?NO;CuLk#iOuOWZPX&$B_``~ zq#17|&iUSU*;P+Sf=Nto8+-nwCoNO{zZM6}#+FX-rD~=Xc1g=XYHVaLS*nSS3v)t8 z5T|m+g*u*Zpn@+untl%P`QnQ@u*gCx1IT(pDgWX~WK0fZ5%8iEF(wo~gbku8csZ?U zg5N^3pmpJC6*bp!b8wq^Vg&CK6v7JC3r7NWm=n3VPOxW9i`qXy9{CKO*!!sO(8@@K z6RZRHa?{g8f8Is#ik20N2U78tIGsL8Y4R(bEFxx%9U!)bM!5%Uuw&R_08o!554Q@* z1lx;EyV<@LfY~&vUB{8tn&O%gU+-)`o)COD?H1_nWoCReC4MK-IrkUrSOotL(V;tn zN|&NVH6>d7?=bLJwB?o?7L}QDI*33_YzOvw)mc{VI)X7Rl9W4lFpV~IBhADtDdV4y zbKh3MPtXwtb&>;H66f&7s3$qjW%vn-Q1@C`FOQ&3W*_Wgbva2mJQ*k zmI%t)UGe#lZKG0!QBLmmp7}KBtVq1eJU|w)o2&(jqDv)BVK>RutUMmor8IDMpg4!y z1!ZQRCj;=$G|RZTb-so*FTCg9^W1$uoy;RTz=al>qiE&BfYv=JbY<&E`8`*FB+Xm=w6^^es-s(D#PM zMg#QE0*J2$YHJP1U3m8#bu-KX0P;UnP`BNH;>(2nu|bj}@Pl4z^9=JDykkiEfGrPi z0#v5x<+#A0Cjmn>-bFLaGek%p30#FLr(wRKdbt?$KnV$l>Zh2WF9qWDMYNE00G20| ze-xxSfI(1~F*O9$rJe8uH7_Gdt+D=rR0|=33EoAt0^uGF^?w;b0izEz5Xhxvn00{I zC;61}8|O>?KLEHo_l0f?@KQk^>TKd|c+cZo@D;_NK7h*Y^WKI@)yEve>=<52wa!Tn z!>j@XQ|I#5*a%%(0J>(dz%VO|kceA8w*WkEo)qGJfGg#9F;^>V1z%_019-j~qJZQn zS(2SF8kFr-y*;eA1LCy`?A`$>&`=@k^W;SGJAjEJdtQqrgV_kMmmyL{DPUd=%~O^Y zB2;JJ6xg6?uuDXXLSz~)UI-)#2LSZABPVi8R=40pG2Fwkrr8Ab%#KoU22h{mg6+U# z?lT{G!399_wJiAO0W0)%ek*`p+C*?WV09kXYgGRXb1NELJEBsz`+{`$y?cTfxpKbIV<7?z!sm`e z%{R<2V0nBfQ<(v^5W@IOJWdeW=E zFWwn<_@o0jHm?q)CdJbE!|xDwEl!#^$Z|ltnbg!r2ovc;0Dc>wc_fJeew8Dq6CjhG zyxCD3twQBd`VGTCGS{EcvR4sx4vx4D6zL{K;qgw=W0M&il@G*ef`24B)=%ObCa@&{ z-V}#lJ8Ze5BC|&GG^bhFeE|}!2{PrXih94*+9S|rnv+f{dvaTc!nPtkq8CNi(kSJd z68rpNBtFEpn#!rEZZpm{(W$Xc{NzP;&#C7m z+8d&tG(eu^cRf>STN!oadHjzflQ#{Z%@dve#F+A2b?cH9TBJWOgv(WymJ^)7>J0Z&`$}z)YA3QHTU67Q zw&43bT+?L!y8@j*d=DYi^*zBCq3ypG zS+5B`j3;XbpzxUk)-!_t699i*ZzWM4gA zA!`nfGg&o)|ImsH{&O^<(50it1A>3g!f)rEur>;Q67Xq)C(&sJ_V9T7g5dvQ-Hg() zRVp~?Y?k1kL^rtT6L_n?1<$BUf6p2b`~l#ju(k`gM#29c&8Ria$8EmgD{;H?dbBJP z{3!aMmi0K^pwB_HRNo9xdLo`m1pl-(DA+fwa{&vr<%fU-4ZV)rje=)z`#7qxKtx*~ zIz2CVDc;HjUt$di_K()~3Ja<{4#Ye0b2>DkxV8p}4+@R}`TITAwSxT%o=}gz3Ag{b z!)h1&QQ)I&zSC+D>=~;|@Sg$jQNgzY1FD?^0w`Yo&_eC+VLT%oLd`zl{T2v)m3Xd& zYVgc4$GD;P9tIwYl22Ld1m9;x1^ZT?1d zd{*$i)*FJ4pyhVKPgyAS-G}Es7_EgG>pnc+Cis)qbew1d{xQL8(0j7r|At!#0{c+$ zyC2W7ur&jx*{qdSYfIqM$5k68x<|Atj2_z`QCU{8a@ z7X|+vZl4zXTezVBOYB@BcnUNy(aZ66mEfCkL%DPZ*g(eru=UP5G_Uttm^Szw|Gx+> zsFW_i?T%U2Nx>fkCd!-_&<_k>XTf7%L?aCE`_>u3hwu#M8*%&Jzr*Ff7Xv>t8Q7Sz z`>ctA9|H8;oz`7~{}fPs4*`2rmhHu@Lhu&rgy31UtQP!LfM#N{@fH&NKkTeI0UyPPCxSfe}oGS ALI3~& diff --git a/mozilla/camino/src/browser/BrowserWindowController.h b/mozilla/camino/src/browser/BrowserWindowController.h index 351d7940625..5e843463a3c 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.h +++ b/mozilla/camino/src/browser/BrowserWindowController.h @@ -58,6 +58,7 @@ class nsIDOMNode; IBOutlet id mSidebarBrowserView; IBOutlet id mSidebarBookmarksDataSource; + IBOutlet id mHistoryDataSource; IBOutlet CHBookmarksToolbar* mPersonalToolbar; diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm index 33d61eb485d..d34c77ff679 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.mm +++ b/mozilla/camino/src/browser/BrowserWindowController.mm @@ -203,6 +203,8 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item"; - (void)drawerWillOpen: (NSNotification*)aNotification { [mSidebarBookmarksDataSource ensureBookmarks]; + + [mHistoryDataSource ensureDataSourceLoaded]; // Force the window to shrink and move if necessary in order to accommodate the sidebar. NSRect screenFrame = [[[self window] screen] visibleFrame]; diff --git a/mozilla/camino/src/extensions/RDFOutlineViewDataSource.h b/mozilla/camino/src/extensions/RDFOutlineViewDataSource.h index b703ea3753f..5d08e5d8df6 100644 --- a/mozilla/camino/src/extensions/RDFOutlineViewDataSource.h +++ b/mozilla/camino/src/extensions/RDFOutlineViewDataSource.h @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #import -#include +#import class nsIRDFDataSource; class nsIRDFContainer; @@ -46,17 +46,17 @@ class nsIRDFResource; class nsIRDFService; @interface CHRDFOutlineViewDataSource : NSObject { - nsIRDFDataSource* mDataSource; - nsIRDFContainer* mContainer; - nsIRDFContainerUtils* mContainerUtils; - nsIRDFResource* mRootResource; - nsIRDFService* mRDFService; + nsIRDFDataSource* mDataSource; + nsIRDFContainer* mContainer; + nsIRDFContainerUtils* mContainerUtils; + nsIRDFResource* mRootResource; + nsIRDFService* mRDFService; IBOutlet id mOutlineView; } // Initialization Methods -- (id) initWithDataSource: (nsIRDFDataSource*) aDataSource rootResource: (nsIRDFResource*) aRootResource; +- (void) ensureDataSourceLoaded; - (nsIRDFDataSource*) dataSource; - (nsIRDFResource*) rootResource; diff --git a/mozilla/camino/src/extensions/RDFOutlineViewDataSource.mm b/mozilla/camino/src/extensions/RDFOutlineViewDataSource.mm index 6f37b665953..1040b84700d 100644 --- a/mozilla/camino/src/extensions/RDFOutlineViewDataSource.mm +++ b/mozilla/camino/src/extensions/RDFOutlineViewDataSource.mm @@ -44,6 +44,7 @@ #include "nsIRDFResource.h" #include "nsIRDFContainer.h" #include "nsIRDFContainerUtils.h" +#include "nsRDFCID.h" #include "nsComponentManagerUtils.h" #include "nsIServiceManagerUtils.h" @@ -51,36 +52,23 @@ #include "nsXPIDLString.h" #include "nsString.h" + + @implementation CHRDFOutlineViewDataSource -- (id) init +- (void) ensureDataSourceLoaded { - if ((self = [super init])) { - nsCOMPtr ctr(do_CreateInstance("@mozilla.org/rdf/container;1")); - NS_ADDREF(mContainer = ctr); + nsCOMPtr ctr = do_CreateInstance("@mozilla.org/rdf/container;1"); + NS_ADDREF(mContainer = ctr); - nsCOMPtr ctrUtils(do_GetService("@mozilla.org/rdf/container-utils;1")); - NS_ADDREF(mContainerUtils = ctrUtils); + nsCOMPtr ctrUtils = do_GetService("@mozilla.org/rdf/container-utils;1"); + NS_ADDREF(mContainerUtils = ctrUtils); - nsCOMPtr rdfService(do_GetService("@mozilla.org/rdf/rdf-service;1")); - NS_ADDREF(mRDFService = rdfService); + nsCOMPtr rdfService = do_GetService("@mozilla.org/rdf/rdf-service;1"); + NS_ADDREF(mRDFService = rdfService); - mDataSource = nsnull; - mRootResource = nsnull; - } - return self; -} - -- (id) initWithDataSource: (nsIRDFDataSource*) aDataSource rootResource: (nsIRDFResource*) aRootResource -{ - NS_ASSERTION(aDataSource != nsnull, "Trying to initWithDataSource without a data source!"); - if (!aDataSource) - return nil; - - NS_ADDREF(mDataSource = aDataSource); - NS_IF_ADDREF(mRootResource = aRootResource); - - return [self init]; + mDataSource = nsnull; + mRootResource = nsnull; } - (void) dealloc @@ -127,15 +115,35 @@ return NO; } -// XXX write me -- (BOOL)outlineView: (NSOutlineView*) aOutlineView isItemExpandable: (id) aItem +- (BOOL) outlineView: (NSOutlineView*) aOutlineView isItemExpandable: (id) aItem { - return NO; + NSLog(@"outlineView:%@isItemExpandable:%@", aOutlineView, aItem); + if (!mDataSource) + return NO; + + if (!aItem) + return YES; // The root is always open + + nsCOMPtr itemResource = [aItem resource]; + + PRBool isSeq = PR_FALSE; + mContainerUtils->IsSeq(mDataSource, itemResource, &isSeq); + if (isSeq) + return YES; + + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); + + nsCOMPtr childNode; + mDataSource->GetTarget(itemResource, childProperty, PR_TRUE, getter_AddRefs(childNode)); + + return childNode != nsnull; } - (id) outlineView: (NSOutlineView*) aOutlineView child: (int) aIndex ofItem: (id) aItem { + NSLog(@"outlineView:%@child:%dofItem:%@", aOutlineView, aIndex, aItem); if (!mDataSource) return nil; @@ -157,18 +165,40 @@ - (int) outlineView: (NSOutlineView*) aOutlineView numberOfChildrenOfItem: (id) aItem; { + NSLog(@"outlineView:%@numberOfChildrenOfItem:%@", aOutlineView, aItem); if (!mDataSource) return nil; nsCOMPtr resource = !aItem ? mRootResource : [aItem resource]; - nsresult rv = mContainer->Init(mDataSource, resource); - NS_ASSERTION(NS_SUCCEEDED(rv), "Not a container!"); - if (NS_FAILED(rv)) - return 0; + // XXX just assume NC:child is the only containment arc for now + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); - PRInt32 count; - mContainer->GetCount(&count); + nsCOMPtr childNodes; + mDataSource->GetTargets(resource, childProperty, PR_TRUE, getter_AddRefs(childNodes)); + + PRBool hasMore = PR_FALSE; + childNodes->HasMoreElements(&hasMore); + + PRInt32 count = 0; + + while (hasMore) { + nsCOMPtr supp; + childNodes->GetNext(getter_AddRefs(supp)); + + ++count; + + childNodes->HasMoreElements(&hasMore); + } + + if (!count) { + nsresult rv = mContainer->Init(mDataSource, resource); + if (NS_FAILED(rv)) + return 0; + + mContainer->GetCount(&count); + } return count; } @@ -176,6 +206,7 @@ - (id) outlineView: (NSOutlineView*) aOutlineView objectValueForTableColumn: (NSTableColumn*) aTableColumn byItem: (id) aItem { + NSLog(@"outlineView:%@objectValueForTableColumn:%@byItem:%@", aOutlineView, aTableColumn, aItem); if (!mDataSource || !aItem) return nil; diff --git a/mozilla/chimera/BrowserWindow.nib/classes.nib b/mozilla/chimera/BrowserWindow.nib/classes.nib index 669269f11fb..ff1d11f6433 100644 --- a/mozilla/chimera/BrowserWindow.nib/classes.nib +++ b/mozilla/chimera/BrowserWindow.nib/classes.nib @@ -34,7 +34,6 @@ stop = id; toggleSidebar = id; viewOnlyThisImage = id; - viewSource = id; }; CLASS = BrowserWindowController; LANGUAGE = ObjC; @@ -44,6 +43,7 @@ mAddBookmarkSheetWindow = id; mAddBookmarkTitleField = id; mCachedBMDS = id; + mHistoryDataSource = id; mImageLinkMenu = id; mImageMenu = id; mInputMenu = id; @@ -75,7 +75,18 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + { + CLASS = CHHistoryDataSource; + LANGUAGE = ObjC; + SUPERCLASS = CHRDFOutlineViewDataSource; + }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + { + CLASS = CHRDFOutlineViewDataSource; + LANGUAGE = ObjC; + OUTLETS = {mOutlineView = id; }; + SUPERCLASS = NSObject; + }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, @@ -98,7 +109,8 @@ urlbar = id; }; SUPERCLASS = NSView; - } + }, + {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); IBVersion = 1; } \ No newline at end of file diff --git a/mozilla/chimera/BrowserWindow.nib/info.nib b/mozilla/chimera/BrowserWindow.nib/info.nib index 2c3eba022a1..4715c3421a5 100644 --- a/mozilla/chimera/BrowserWindow.nib/info.nib +++ b/mozilla/chimera/BrowserWindow.nib/info.nib @@ -3,29 +3,31 @@ IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 97 226 480 309 0 0 1280 1002 IBEditorPositions 124 431 537 170 180 0 0 1152 746 160 - 478 70 195 666 0 0 1152 746 + 572 326 195 666 0 0 1280 1002 28 - 478 279 195 457 0 0 1152 746 + 572 439 195 457 0 0 1280 1002 297 - 70 110 198 210 0 0 1152 746 + 70 110 187 210 0 0 1152 746 314 - 271 139 198 180 0 0 1152 746 + 271 139 168 180 0 0 1152 746 336 458 90 200 162 0 0 1152 746 + 343 + 499 330 200 252 0 0 1152 746 365 22 500 93 162 0 0 1152 746 463 7 444 200 252 0 0 1152 746 475 - 516 447 120 142 0 0 1152 746 + 609 597 120 142 0 0 1280 1002 56 - 404 484 343 68 0 0 1152 746 + 498 634 343 68 0 0 1280 1002 IBFramework Version 248.0 @@ -45,12 +47,9 @@ IBOpenObjects - 475 - 297 160 - 56 IBSystem Version - 5Q125 + 5L21 diff --git a/mozilla/chimera/BrowserWindow.nib/objects.nib b/mozilla/chimera/BrowserWindow.nib/objects.nib index a59a8c9f98fd20167662f3de23186a6278b9f45e..9fe1c12a92baf381cbab3def8c0914a2d6acbfe3 100644 GIT binary patch literal 18391 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 G=Kle_j|q4H literal 16929 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 ALI3~& diff --git a/mozilla/chimera/BrowserWindowController.h b/mozilla/chimera/BrowserWindowController.h index 351d7940625..5e843463a3c 100644 --- a/mozilla/chimera/BrowserWindowController.h +++ b/mozilla/chimera/BrowserWindowController.h @@ -58,6 +58,7 @@ class nsIDOMNode; IBOutlet id mSidebarBrowserView; IBOutlet id mSidebarBookmarksDataSource; + IBOutlet id mHistoryDataSource; IBOutlet CHBookmarksToolbar* mPersonalToolbar; diff --git a/mozilla/chimera/BrowserWindowController.mm b/mozilla/chimera/BrowserWindowController.mm index 33d61eb485d..d34c77ff679 100644 --- a/mozilla/chimera/BrowserWindowController.mm +++ b/mozilla/chimera/BrowserWindowController.mm @@ -203,6 +203,8 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item"; - (void)drawerWillOpen: (NSNotification*)aNotification { [mSidebarBookmarksDataSource ensureBookmarks]; + + [mHistoryDataSource ensureDataSourceLoaded]; // Force the window to shrink and move if necessary in order to accommodate the sidebar. NSRect screenFrame = [[[self window] screen] visibleFrame]; diff --git a/mozilla/chimera/CHRDFOutlineViewDataSource.h b/mozilla/chimera/CHRDFOutlineViewDataSource.h index b703ea3753f..5d08e5d8df6 100644 --- a/mozilla/chimera/CHRDFOutlineViewDataSource.h +++ b/mozilla/chimera/CHRDFOutlineViewDataSource.h @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #import -#include +#import class nsIRDFDataSource; class nsIRDFContainer; @@ -46,17 +46,17 @@ class nsIRDFResource; class nsIRDFService; @interface CHRDFOutlineViewDataSource : NSObject { - nsIRDFDataSource* mDataSource; - nsIRDFContainer* mContainer; - nsIRDFContainerUtils* mContainerUtils; - nsIRDFResource* mRootResource; - nsIRDFService* mRDFService; + nsIRDFDataSource* mDataSource; + nsIRDFContainer* mContainer; + nsIRDFContainerUtils* mContainerUtils; + nsIRDFResource* mRootResource; + nsIRDFService* mRDFService; IBOutlet id mOutlineView; } // Initialization Methods -- (id) initWithDataSource: (nsIRDFDataSource*) aDataSource rootResource: (nsIRDFResource*) aRootResource; +- (void) ensureDataSourceLoaded; - (nsIRDFDataSource*) dataSource; - (nsIRDFResource*) rootResource; diff --git a/mozilla/chimera/CHRDFOutlineViewDataSource.mm b/mozilla/chimera/CHRDFOutlineViewDataSource.mm index 6f37b665953..1040b84700d 100644 --- a/mozilla/chimera/CHRDFOutlineViewDataSource.mm +++ b/mozilla/chimera/CHRDFOutlineViewDataSource.mm @@ -44,6 +44,7 @@ #include "nsIRDFResource.h" #include "nsIRDFContainer.h" #include "nsIRDFContainerUtils.h" +#include "nsRDFCID.h" #include "nsComponentManagerUtils.h" #include "nsIServiceManagerUtils.h" @@ -51,36 +52,23 @@ #include "nsXPIDLString.h" #include "nsString.h" + + @implementation CHRDFOutlineViewDataSource -- (id) init +- (void) ensureDataSourceLoaded { - if ((self = [super init])) { - nsCOMPtr ctr(do_CreateInstance("@mozilla.org/rdf/container;1")); - NS_ADDREF(mContainer = ctr); + nsCOMPtr ctr = do_CreateInstance("@mozilla.org/rdf/container;1"); + NS_ADDREF(mContainer = ctr); - nsCOMPtr ctrUtils(do_GetService("@mozilla.org/rdf/container-utils;1")); - NS_ADDREF(mContainerUtils = ctrUtils); + nsCOMPtr ctrUtils = do_GetService("@mozilla.org/rdf/container-utils;1"); + NS_ADDREF(mContainerUtils = ctrUtils); - nsCOMPtr rdfService(do_GetService("@mozilla.org/rdf/rdf-service;1")); - NS_ADDREF(mRDFService = rdfService); + nsCOMPtr rdfService = do_GetService("@mozilla.org/rdf/rdf-service;1"); + NS_ADDREF(mRDFService = rdfService); - mDataSource = nsnull; - mRootResource = nsnull; - } - return self; -} - -- (id) initWithDataSource: (nsIRDFDataSource*) aDataSource rootResource: (nsIRDFResource*) aRootResource -{ - NS_ASSERTION(aDataSource != nsnull, "Trying to initWithDataSource without a data source!"); - if (!aDataSource) - return nil; - - NS_ADDREF(mDataSource = aDataSource); - NS_IF_ADDREF(mRootResource = aRootResource); - - return [self init]; + mDataSource = nsnull; + mRootResource = nsnull; } - (void) dealloc @@ -127,15 +115,35 @@ return NO; } -// XXX write me -- (BOOL)outlineView: (NSOutlineView*) aOutlineView isItemExpandable: (id) aItem +- (BOOL) outlineView: (NSOutlineView*) aOutlineView isItemExpandable: (id) aItem { - return NO; + NSLog(@"outlineView:%@isItemExpandable:%@", aOutlineView, aItem); + if (!mDataSource) + return NO; + + if (!aItem) + return YES; // The root is always open + + nsCOMPtr itemResource = [aItem resource]; + + PRBool isSeq = PR_FALSE; + mContainerUtils->IsSeq(mDataSource, itemResource, &isSeq); + if (isSeq) + return YES; + + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); + + nsCOMPtr childNode; + mDataSource->GetTarget(itemResource, childProperty, PR_TRUE, getter_AddRefs(childNode)); + + return childNode != nsnull; } - (id) outlineView: (NSOutlineView*) aOutlineView child: (int) aIndex ofItem: (id) aItem { + NSLog(@"outlineView:%@child:%dofItem:%@", aOutlineView, aIndex, aItem); if (!mDataSource) return nil; @@ -157,18 +165,40 @@ - (int) outlineView: (NSOutlineView*) aOutlineView numberOfChildrenOfItem: (id) aItem; { + NSLog(@"outlineView:%@numberOfChildrenOfItem:%@", aOutlineView, aItem); if (!mDataSource) return nil; nsCOMPtr resource = !aItem ? mRootResource : [aItem resource]; - nsresult rv = mContainer->Init(mDataSource, resource); - NS_ASSERTION(NS_SUCCEEDED(rv), "Not a container!"); - if (NS_FAILED(rv)) - return 0; + // XXX just assume NC:child is the only containment arc for now + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); - PRInt32 count; - mContainer->GetCount(&count); + nsCOMPtr childNodes; + mDataSource->GetTargets(resource, childProperty, PR_TRUE, getter_AddRefs(childNodes)); + + PRBool hasMore = PR_FALSE; + childNodes->HasMoreElements(&hasMore); + + PRInt32 count = 0; + + while (hasMore) { + nsCOMPtr supp; + childNodes->GetNext(getter_AddRefs(supp)); + + ++count; + + childNodes->HasMoreElements(&hasMore); + } + + if (!count) { + nsresult rv = mContainer->Init(mDataSource, resource); + if (NS_FAILED(rv)) + return 0; + + mContainer->GetCount(&count); + } return count; } @@ -176,6 +206,7 @@ - (id) outlineView: (NSOutlineView*) aOutlineView objectValueForTableColumn: (NSTableColumn*) aTableColumn byItem: (id) aItem { + NSLog(@"outlineView:%@objectValueForTableColumn:%@byItem:%@", aOutlineView, aTableColumn, aItem); if (!mDataSource || !aItem) return nil; diff --git a/mozilla/chimera/Chimera.pbproj/project.pbxproj b/mozilla/chimera/Chimera.pbproj/project.pbxproj index eb601662f4c..a256f3b26cb 100644 --- a/mozilla/chimera/Chimera.pbproj/project.pbxproj +++ b/mozilla/chimera/Chimera.pbproj/project.pbxproj @@ -24,6 +24,8 @@ F59E9F3F0237E43401A967DF, F52D5CD0027A887001A80166, F52D5CD4027A88C601A80166, + F52F87CD027D75C301A80165, + F52F87CE027D75C301A80165, ); isa = PBXGroup; name = Classes; @@ -400,6 +402,8 @@ F52D5CD1027A887001A80166, F52D5CD5027A88C601A80166, F52D5CD9027D3D5001A80166, + F52F87CF027D75C301A80165, + F52F87D0027D75C301A80165, ); isa = PBXHeadersBuildPhase; name = Headers; @@ -492,6 +496,8 @@ F52D5CD2027A887001A80166, F52D5CD6027A88C601A80166, F52D5CDA027D3D5001A80166, + F52F87D1027D75C301A80165, + F52F87D2027D75C301A80165, ); isa = PBXSourcesBuildPhase; name = Sources; @@ -896,6 +902,8 @@ F5137A1102676B9101026D05, F52D5CCF027A887001A80166, F52D5CD3027A88C601A80166, + F52F87CB027D75C301A80165, + F52F87CC027D75C301A80165, ); isa = PBXGroup; name = Headers; @@ -1482,6 +1490,50 @@ settings = { }; }; + F52F87CB027D75C301A80165 = { + isa = PBXFileReference; + path = CHHistoryDataSource.h; + refType = 4; + }; + F52F87CC027D75C301A80165 = { + isa = PBXFileReference; + path = CHRDFOutlineViewDataSource.h; + refType = 4; + }; + F52F87CD027D75C301A80165 = { + isa = PBXFileReference; + path = CHHistoryDataSource.mm; + refType = 4; + }; + F52F87CE027D75C301A80165 = { + isa = PBXFileReference; + path = CHRDFOutlineViewDataSource.mm; + refType = 4; + }; + F52F87CF027D75C301A80165 = { + fileRef = F52F87CB027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D0027D75C301A80165 = { + fileRef = F52F87CC027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D1027D75C301A80165 = { + fileRef = F52F87CD027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D2027D75C301A80165 = { + fileRef = F52F87CE027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; F538DFAE023B36A7010001CA = { children = ( F538DFAF023B3739010001CA, diff --git a/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib index 669269f11fb..ff1d11f6433 100644 --- a/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib +++ b/mozilla/chimera/English.lproj/BrowserWindow.nib/classes.nib @@ -34,7 +34,6 @@ stop = id; toggleSidebar = id; viewOnlyThisImage = id; - viewSource = id; }; CLASS = BrowserWindowController; LANGUAGE = ObjC; @@ -44,6 +43,7 @@ mAddBookmarkSheetWindow = id; mAddBookmarkTitleField = id; mCachedBMDS = id; + mHistoryDataSource = id; mImageLinkMenu = id; mImageMenu = id; mInputMenu = id; @@ -75,7 +75,18 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + { + CLASS = CHHistoryDataSource; + LANGUAGE = ObjC; + SUPERCLASS = CHRDFOutlineViewDataSource; + }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + { + CLASS = CHRDFOutlineViewDataSource; + LANGUAGE = ObjC; + OUTLETS = {mOutlineView = id; }; + SUPERCLASS = NSObject; + }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, @@ -98,7 +109,8 @@ urlbar = id; }; SUPERCLASS = NSView; - } + }, + {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); IBVersion = 1; } \ No newline at end of file diff --git a/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib b/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib index 2c3eba022a1..4715c3421a5 100644 --- a/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib +++ b/mozilla/chimera/English.lproj/BrowserWindow.nib/info.nib @@ -3,29 +3,31 @@ IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 97 226 480 309 0 0 1280 1002 IBEditorPositions 124 431 537 170 180 0 0 1152 746 160 - 478 70 195 666 0 0 1152 746 + 572 326 195 666 0 0 1280 1002 28 - 478 279 195 457 0 0 1152 746 + 572 439 195 457 0 0 1280 1002 297 - 70 110 198 210 0 0 1152 746 + 70 110 187 210 0 0 1152 746 314 - 271 139 198 180 0 0 1152 746 + 271 139 168 180 0 0 1152 746 336 458 90 200 162 0 0 1152 746 + 343 + 499 330 200 252 0 0 1152 746 365 22 500 93 162 0 0 1152 746 463 7 444 200 252 0 0 1152 746 475 - 516 447 120 142 0 0 1152 746 + 609 597 120 142 0 0 1280 1002 56 - 404 484 343 68 0 0 1152 746 + 498 634 343 68 0 0 1280 1002 IBFramework Version 248.0 @@ -45,12 +47,9 @@ IBOpenObjects - 475 - 297 160 - 56 IBSystem Version - 5Q125 + 5L21 diff --git a/mozilla/chimera/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/chimera/English.lproj/BrowserWindow.nib/objects.nib index a59a8c9f98fd20167662f3de23186a6278b9f45e..9fe1c12a92baf381cbab3def8c0914a2d6acbfe3 100644 GIT binary patch literal 18391 zcmbtc4U|;Hm9A=<`D0*a_*2xFUUgw5fSHjPoEV%R1ZII@WQGJ|!1Q##frkDWx_f58 zpGdW@Uqa$BYzO))D(~PCA9b#L(yQY zuQ?V?#$(~I7B|v{&O?IrXVIjhwS9>e?P*DB5yAg=D^V{|Ai-YTs(V8X4GpPHj4^%t zb}wNXs{bWDNq=WpYmCSJ8=0<`wzjLst^MU0{X3Z*`dGAVX`$u~^`QpYyvZL}XMhef zQmmS>)ZORKonvXxt8Q&q<5{L9Vm!oz!>f{8+rt9}gP4oLxVheyk8R^)yDh>-;!G zuDaddtNA2zzQ)9?S+jy&1cVo#&U=4pOi&<|GnFm*{#q zrdny@)l$<4j3;1W?z>~rpcZFR3o9+1kQhfY`j0c|{*;F_v67Uk%luE@+0QdajdVKA znBdKqs9&0X`bTO6eI^>DMb2&vqdzqr||E?386 zJ<*^ATyo$Sz$_=seEmU&N+Xljc|Gjx5Xs*IA!R;c#axW;qjZFe(%Z zF%L8LapP!KhsH@?+#L2N677BdZrHSMbEIkJ5gzY2$O*rhGfGa9=Mzt)ykIiL8i>*D+sDm|1$rV{G+FNp z#-f_>^K|+tIlXV~XZE~Q29!BDrskd-r|VWzO2+Q2%$zmNW^^DB3xOE=4{4hiT=t#v3TgmPeDJWLOIte@v%O8^(t} zPn9v|<&65xkE{Yc`UL;I;*I|v?+LH{2q8cHQ*0DxXU ze>hX>;24~;hlFRYRc1=_I-b_YKnPu3_^YoEfpCpUXQAeY>nCcL!Fb9F85k!giOAMS zqBR*WNRFdFeRM-Z0CKn7)MQiD-9GId1O<#^LKzJjGfB%uo?f+LF;hX|&Dh(>X~v_9 zAEu;X%1UaRV7pi)SgBNuU_Ok(i4SWqvz|y4ky#n7RKz2u{His{WOw~F*Q|*}v{_Lt znF#p1wON5!mW6;_TvWWYCP*!=c!ceXD4$86tTiEMtM%!RLWP!Lyjfl z;5|1olBqE+ola#MHbHUepEPP-fNL#;*TfMKh*jnc?WH+w80x-N=7go!iSL2)F~7ynBMd&rn8Kn$bsR>iSccn6iX< zmt|%b81$RRKxWoBDo3 zX0D}zPYTa9G|g0I>cAdN^@2~Pg!9abi^ZhxGjzd`$4e1Uxi2kWy` z3x<+|cGo$uP7Ep2wS#q69@N5GQnNcGGbr-kGhhPbYpC+C|0URQ;prtMr!q5BRXz(F zK%kF+j8lA92TkNn)=#>=Z<;H)4xY2E*TzwpqFTb-}kR;wd9#*$L{h$OGy3-;ZtT_KKy+H7c4) zkjoyG5o{CX90U_GJyUYihCm3J8+Rr|ueq(8#zaB1+D+5`_D)QOv-Rl38w0W8M8z8> zD)L>blLfKZ>Tp3PJdG5Pg-1KUhEVGB(t`;s=CpBx2(f)pE~!L#u2_$a+xl?@;&X4? zO4~JmJg}xdzt{-2c|ZGO&YG*yMAZ>|mq8Bq7Oc;efZXQ}sU=?zF{;WdhqeB?C*0BJ7xw7+M!1M4!jaOu)nQ(L5nT48mk^QIsCmN3|6$sN>m^`<)t*j*fRG@T!ti1 zPdJ%y$i}@8ljU6R6x|kUaV0+F@=EdM_~PaDA;I4x?WU5rmBZYkejSVKfaAb2OO5H* zY>Kg{g%T5;DRi)aC z#^X#f3#J-RENYDX^pGu6Ps0nGH$iRDAKx77-l&+fvTs9Dr!;kyOl`|S4V~GxI-ArO z46448F<(B~cDr-89EKQ;VEZV^EV+^l4I?WJjs}~%v1;y)|2=c38ehoV9UmfD4o!c? z$>0d*K{0mmfb-xo7eN40Q*94IjY=-Un_>Ih$y1Lk*|{M`+@Ru&U& zvV!Rd1X28g28zFJ_&G$DEZFl3bV?Nu&B#`Gvj=dnG+zVai2F-;5J-PEc6Wy<$&TZZ79=m_iggs6&^ZKcD(z0wf`6s5!^c>M&qdYV z0L@XGV9(M;hCK|yK9JiVD>_GfH5P}b&-Y)3w0+$ib<~7o8#-!Qh-0NN>&0&p2TlRz z|ADnT#s**Qah>c`4v(FZW`8uGg`F&Y&u7W8%Ept)~Wfh5bFBX;WJ_(_6&osL}a>tfKt}gj@*1ne`mruPnA*=JgJ2@+QgNfgecv8pGj1+YEi-K=8>~&pDb3ECMJ_ z(5kVjF8d%B44I24isw~K$fx}sF`?P`0%Ah69L{_y=0*}PD9NgJBa0)=!CYV*X|^6& z962H>j4+P0hBNZ3H@NBHl;QfV-?t}bNqs+8L_sQJT4prF`-9ENE$(n(Mr zka9ca8C*ho#mR|-legrf87Dot+*o%T0wr7_kkh#?v$nX_1ZncR)N9{nd zfK*Z3x*+BZ4OY5?M8vHsNTf{B=y!E)r?7f4LyYHqHdk`Bc*y?{HQ))klfC zS`>+&Npw@hm%rpO)D1^zjU$oL7&%xKd=87FD%oHd87kN;`PqAW@pDXVavz1; zh5KFyX``rBK7Fn#DwS(rPUeQWHLh~i#H)&H)bO4n{J3O`9Z;mj?Vx#-o-eMT^$_=jReH8V!}zeZ z6a0g%xTYMEcQ|k>372%ZXM^BBCy$cq-XQNhmzXJChzGk5>xFOkk^&lFFwJ!@QGg>F zjZ0y+0$V{0zW! zd)BdniDA7${CnZV#IDq41J4z5+ zZE+Vu-bb=}B~(5IFc;6e0V#o%wfmoKWNEk< zgw;cB9k6C79J4XCx`VK+wYz*o*dL<04rLe-91TLavuO>-+Q4UtQ)9d#08Xdu?0Zq-AiiS z3|JADbQz|ImlX;~_W}de=*PM+ksSkRVD}}o8NJC~v z0Cx4=3y?h_#D+c3vc*RmSq< zf-3dmE}}GSeuWEFS^nFA4q!@BaF$8Pl?oI}flI1m@k$Il446GFSgBPfj=Lb#^%~XC z=AB@d1Lm5V_W@GNV)iXOj(2ng`=I}*VK=JW+V&t|F7rI)LaUWR_za)}Osda?Ou~H^ zFpuhTB_5sT#@+#-&?UVFh*K?;Mehf+pgW>B6Tq>i%QP1y2=Yxp$Cyw{;I)M5&{W9{ z`v}ki<>%!J&z=~isa`i!itidgopL82dx}Upe6!g!Z%r`WbHGuiYCBz;j#~jPREmpj zMC%r_?BhLvF_;3?*bA7G897Ju2(f8NGd@dzrjgPZ*$TkiUaLhBw6#jj68* zmb?p)LgnC_0II=JrxhT~3;Dyb)kbzH;LeHW-xT~_400OaRfP+f925CS7wL_HQ{3ow zbckbstK{bt3!ejU!5m8&Tn4C9Fmmdq7xl&jK!u7(LvyjTS@3UQ5KBA(iLqD zU++Yt$dl6tIVa`)Jk;2*nym*A(WynM5?42I_2ZkT$BoJ zCr2C+flT|`?n62Ii!7P#6c6}$Vu3gMwpXM%a$;g{DZ&2tMmyt@yqQYe!PP};3;5-dVNg*9HD_Q*RA*3c}B zwF+aRI+9lRA_{RJXtLVU2-b=wBtlI2;tJG8fQvjCzyqNJOp{#`Q5Fp$S^tL%COs(X zH-RudQk*(6F)9?s0AAIsaqxmG21p|PR`)c7gr^nDY)*J?7yLL1q>dB0ek2C)92Wfk zoM3+u{64&WRq$8vhQ!$q@P?%0f8_QeX^ZEt3;ude@a2L(o!f&?xbfU9_+cQQ!h(r6 zr0!yPdt)k)zk($aAe_MTMB;A&dZ*yO z&K(u}Af9Il_8k;!1>b>UtKfe?F&+1!K?|b)B3gL`&*TmX{%-(1kF+6*mjz#ing#fR z0O-gwe;;qi0{;@lise8!?ZeM*!FQqh8-l-)JBNfsZU)j$fFDL;1MvHhWJNJGjGs=y z)2IPc%W}xSKAHOv$$7y48S@F6cPztC4^j*OHQ_0Dv0&)ZbH$hN^G||pMcWgQ8{R$% z{wT%Wh3BB)1`2#~aUyqY4sae8{IT4-V{>Z---`-lApa52eYo6%MghUE#v5{_KgQb) zf{g4q5(wt(;S|w0b2P50AT5m0Pf6jdTT@e7;iYXeFSd{1>XQXoFqJ# zgMWDfpbbbW1K|U~zlGu*!HIE9^mkFbCpd&oiRkIToOEMuydAsfP~ec^XStbzff&D~9W*k6zn#P28UVmy#i86=<+(HCP!SiL zG;hA(eJG|h<&Y)@LmtdeKX9iD{tI*=FdukZi;zBtME^cKBS{+q-j@YW;SJlg|IC4~ z4sJ6{!Z?8TrLC&=gO6_1;MO8!fP^#mqj*$sXc#4T zUqFFz)&h7;@P%kM;S&H&6Z|9!B$8+6_6yzw_!k7f8(7al&N*nz%c$OrQPL+2-@|hZ znw{Imfp}3PUeS9Uo~tgw59aD?D6r}IV{SGK1&ua?2VhMSd^Ku5Ef~y--`as6DBDXY zknVmKHNArWJJ8Pxz8!DN1ive{O7JHEdR6e-fOm!9>rvb+IJ6N-YyRcj8~6wT&oIUL zD4v0-0RhJMX}lq24~^z6f*;B4KxY6Qfq?>4D)_fid`9pSC?e1kbcnw0!CR%^r%>n> zK>rB$5%7%J`4o!FG4UuGr{L!*!J}xC68u#Z^91h&aGl^Y@wOOS_1yb{KZWP3g82Ca zm|{<3;(#+3=Qz2fVEc1V2!1^(I|TnK3PbSMP|N{o6j8x<=XwQuELR~Itb|V${8zc% zf`1Or^I%Y(ErS0p2ha9dJby`W0k8U}eoyxF@3M2Q&%l{iw=^}!0x|#mIBp>J#pwT- G=Kle_j|q4H literal 16929 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 ALI3~& diff --git a/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj b/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj index eb601662f4c..a256f3b26cb 100644 --- a/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj +++ b/mozilla/chimera/projects/Chimera.pbproj/project.pbxproj @@ -24,6 +24,8 @@ F59E9F3F0237E43401A967DF, F52D5CD0027A887001A80166, F52D5CD4027A88C601A80166, + F52F87CD027D75C301A80165, + F52F87CE027D75C301A80165, ); isa = PBXGroup; name = Classes; @@ -400,6 +402,8 @@ F52D5CD1027A887001A80166, F52D5CD5027A88C601A80166, F52D5CD9027D3D5001A80166, + F52F87CF027D75C301A80165, + F52F87D0027D75C301A80165, ); isa = PBXHeadersBuildPhase; name = Headers; @@ -492,6 +496,8 @@ F52D5CD2027A887001A80166, F52D5CD6027A88C601A80166, F52D5CDA027D3D5001A80166, + F52F87D1027D75C301A80165, + F52F87D2027D75C301A80165, ); isa = PBXSourcesBuildPhase; name = Sources; @@ -896,6 +902,8 @@ F5137A1102676B9101026D05, F52D5CCF027A887001A80166, F52D5CD3027A88C601A80166, + F52F87CB027D75C301A80165, + F52F87CC027D75C301A80165, ); isa = PBXGroup; name = Headers; @@ -1482,6 +1490,50 @@ settings = { }; }; + F52F87CB027D75C301A80165 = { + isa = PBXFileReference; + path = CHHistoryDataSource.h; + refType = 4; + }; + F52F87CC027D75C301A80165 = { + isa = PBXFileReference; + path = CHRDFOutlineViewDataSource.h; + refType = 4; + }; + F52F87CD027D75C301A80165 = { + isa = PBXFileReference; + path = CHHistoryDataSource.mm; + refType = 4; + }; + F52F87CE027D75C301A80165 = { + isa = PBXFileReference; + path = CHRDFOutlineViewDataSource.mm; + refType = 4; + }; + F52F87CF027D75C301A80165 = { + fileRef = F52F87CB027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D0027D75C301A80165 = { + fileRef = F52F87CC027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D1027D75C301A80165 = { + fileRef = F52F87CD027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; + F52F87D2027D75C301A80165 = { + fileRef = F52F87CE027D75C301A80165; + isa = PBXBuildFile; + settings = { + }; + }; F538DFAE023B36A7010001CA = { children = ( F538DFAF023B3739010001CA, diff --git a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib index 669269f11fb..ff1d11f6433 100644 --- a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib +++ b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/classes.nib @@ -34,7 +34,6 @@ stop = id; toggleSidebar = id; viewOnlyThisImage = id; - viewSource = id; }; CLASS = BrowserWindowController; LANGUAGE = ObjC; @@ -44,6 +43,7 @@ mAddBookmarkSheetWindow = id; mAddBookmarkTitleField = id; mCachedBMDS = id; + mHistoryDataSource = id; mImageLinkMenu = id; mImageMenu = id; mInputMenu = id; @@ -75,7 +75,18 @@ {CLASS = CHBookmarksToolbar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = CHExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = CHExtendedTabView; LANGUAGE = ObjC; SUPERCLASS = NSTabView; }, + { + CLASS = CHHistoryDataSource; + LANGUAGE = ObjC; + SUPERCLASS = CHRDFOutlineViewDataSource; + }, {CLASS = CHLocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + { + CLASS = CHRDFOutlineViewDataSource; + LANGUAGE = ObjC; + OUTLETS = {mOutlineView = id; }; + SUPERCLASS = NSObject; + }, {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, @@ -98,7 +109,8 @@ urlbar = id; }; SUPERCLASS = NSView; - } + }, + {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); IBVersion = 1; } \ No newline at end of file diff --git a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib index 2c3eba022a1..4715c3421a5 100644 --- a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -3,29 +3,31 @@ IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 97 226 480 309 0 0 1280 1002 IBEditorPositions 124 431 537 170 180 0 0 1152 746 160 - 478 70 195 666 0 0 1152 746 + 572 326 195 666 0 0 1280 1002 28 - 478 279 195 457 0 0 1152 746 + 572 439 195 457 0 0 1280 1002 297 - 70 110 198 210 0 0 1152 746 + 70 110 187 210 0 0 1152 746 314 - 271 139 198 180 0 0 1152 746 + 271 139 168 180 0 0 1152 746 336 458 90 200 162 0 0 1152 746 + 343 + 499 330 200 252 0 0 1152 746 365 22 500 93 162 0 0 1152 746 463 7 444 200 252 0 0 1152 746 475 - 516 447 120 142 0 0 1152 746 + 609 597 120 142 0 0 1280 1002 56 - 404 484 343 68 0 0 1152 746 + 498 634 343 68 0 0 1280 1002 IBFramework Version 248.0 @@ -45,12 +47,9 @@ IBOpenObjects - 475 - 297 160 - 56 IBSystem Version - 5Q125 + 5L21 diff --git a/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index a59a8c9f98fd20167662f3de23186a6278b9f45e..9fe1c12a92baf381cbab3def8c0914a2d6acbfe3 100644 GIT binary patch literal 18391 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 G=Kle_j|q4H literal 16929 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 ALI3~& diff --git a/mozilla/chimera/src/browser/BrowserWindowController.h b/mozilla/chimera/src/browser/BrowserWindowController.h index 351d7940625..5e843463a3c 100644 --- a/mozilla/chimera/src/browser/BrowserWindowController.h +++ b/mozilla/chimera/src/browser/BrowserWindowController.h @@ -58,6 +58,7 @@ class nsIDOMNode; IBOutlet id mSidebarBrowserView; IBOutlet id mSidebarBookmarksDataSource; + IBOutlet id mHistoryDataSource; IBOutlet CHBookmarksToolbar* mPersonalToolbar; diff --git a/mozilla/chimera/src/browser/BrowserWindowController.mm b/mozilla/chimera/src/browser/BrowserWindowController.mm index 33d61eb485d..d34c77ff679 100644 --- a/mozilla/chimera/src/browser/BrowserWindowController.mm +++ b/mozilla/chimera/src/browser/BrowserWindowController.mm @@ -203,6 +203,8 @@ static NSString *PrintToolbarItemIdentifier = @"Print Toolbar Item"; - (void)drawerWillOpen: (NSNotification*)aNotification { [mSidebarBookmarksDataSource ensureBookmarks]; + + [mHistoryDataSource ensureDataSourceLoaded]; // Force the window to shrink and move if necessary in order to accommodate the sidebar. NSRect screenFrame = [[[self window] screen] visibleFrame]; diff --git a/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.h b/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.h index b703ea3753f..5d08e5d8df6 100644 --- a/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.h +++ b/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.h @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #import -#include +#import class nsIRDFDataSource; class nsIRDFContainer; @@ -46,17 +46,17 @@ class nsIRDFResource; class nsIRDFService; @interface CHRDFOutlineViewDataSource : NSObject { - nsIRDFDataSource* mDataSource; - nsIRDFContainer* mContainer; - nsIRDFContainerUtils* mContainerUtils; - nsIRDFResource* mRootResource; - nsIRDFService* mRDFService; + nsIRDFDataSource* mDataSource; + nsIRDFContainer* mContainer; + nsIRDFContainerUtils* mContainerUtils; + nsIRDFResource* mRootResource; + nsIRDFService* mRDFService; IBOutlet id mOutlineView; } // Initialization Methods -- (id) initWithDataSource: (nsIRDFDataSource*) aDataSource rootResource: (nsIRDFResource*) aRootResource; +- (void) ensureDataSourceLoaded; - (nsIRDFDataSource*) dataSource; - (nsIRDFResource*) rootResource; diff --git a/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.mm b/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.mm index 6f37b665953..1040b84700d 100644 --- a/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.mm +++ b/mozilla/chimera/src/extensions/RDFOutlineViewDataSource.mm @@ -44,6 +44,7 @@ #include "nsIRDFResource.h" #include "nsIRDFContainer.h" #include "nsIRDFContainerUtils.h" +#include "nsRDFCID.h" #include "nsComponentManagerUtils.h" #include "nsIServiceManagerUtils.h" @@ -51,36 +52,23 @@ #include "nsXPIDLString.h" #include "nsString.h" + + @implementation CHRDFOutlineViewDataSource -- (id) init +- (void) ensureDataSourceLoaded { - if ((self = [super init])) { - nsCOMPtr ctr(do_CreateInstance("@mozilla.org/rdf/container;1")); - NS_ADDREF(mContainer = ctr); + nsCOMPtr ctr = do_CreateInstance("@mozilla.org/rdf/container;1"); + NS_ADDREF(mContainer = ctr); - nsCOMPtr ctrUtils(do_GetService("@mozilla.org/rdf/container-utils;1")); - NS_ADDREF(mContainerUtils = ctrUtils); + nsCOMPtr ctrUtils = do_GetService("@mozilla.org/rdf/container-utils;1"); + NS_ADDREF(mContainerUtils = ctrUtils); - nsCOMPtr rdfService(do_GetService("@mozilla.org/rdf/rdf-service;1")); - NS_ADDREF(mRDFService = rdfService); + nsCOMPtr rdfService = do_GetService("@mozilla.org/rdf/rdf-service;1"); + NS_ADDREF(mRDFService = rdfService); - mDataSource = nsnull; - mRootResource = nsnull; - } - return self; -} - -- (id) initWithDataSource: (nsIRDFDataSource*) aDataSource rootResource: (nsIRDFResource*) aRootResource -{ - NS_ASSERTION(aDataSource != nsnull, "Trying to initWithDataSource without a data source!"); - if (!aDataSource) - return nil; - - NS_ADDREF(mDataSource = aDataSource); - NS_IF_ADDREF(mRootResource = aRootResource); - - return [self init]; + mDataSource = nsnull; + mRootResource = nsnull; } - (void) dealloc @@ -127,15 +115,35 @@ return NO; } -// XXX write me -- (BOOL)outlineView: (NSOutlineView*) aOutlineView isItemExpandable: (id) aItem +- (BOOL) outlineView: (NSOutlineView*) aOutlineView isItemExpandable: (id) aItem { - return NO; + NSLog(@"outlineView:%@isItemExpandable:%@", aOutlineView, aItem); + if (!mDataSource) + return NO; + + if (!aItem) + return YES; // The root is always open + + nsCOMPtr itemResource = [aItem resource]; + + PRBool isSeq = PR_FALSE; + mContainerUtils->IsSeq(mDataSource, itemResource, &isSeq); + if (isSeq) + return YES; + + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); + + nsCOMPtr childNode; + mDataSource->GetTarget(itemResource, childProperty, PR_TRUE, getter_AddRefs(childNode)); + + return childNode != nsnull; } - (id) outlineView: (NSOutlineView*) aOutlineView child: (int) aIndex ofItem: (id) aItem { + NSLog(@"outlineView:%@child:%dofItem:%@", aOutlineView, aIndex, aItem); if (!mDataSource) return nil; @@ -157,18 +165,40 @@ - (int) outlineView: (NSOutlineView*) aOutlineView numberOfChildrenOfItem: (id) aItem; { + NSLog(@"outlineView:%@numberOfChildrenOfItem:%@", aOutlineView, aItem); if (!mDataSource) return nil; nsCOMPtr resource = !aItem ? mRootResource : [aItem resource]; - nsresult rv = mContainer->Init(mDataSource, resource); - NS_ASSERTION(NS_SUCCEEDED(rv), "Not a container!"); - if (NS_FAILED(rv)) - return 0; + // XXX just assume NC:child is the only containment arc for now + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); - PRInt32 count; - mContainer->GetCount(&count); + nsCOMPtr childNodes; + mDataSource->GetTargets(resource, childProperty, PR_TRUE, getter_AddRefs(childNodes)); + + PRBool hasMore = PR_FALSE; + childNodes->HasMoreElements(&hasMore); + + PRInt32 count = 0; + + while (hasMore) { + nsCOMPtr supp; + childNodes->GetNext(getter_AddRefs(supp)); + + ++count; + + childNodes->HasMoreElements(&hasMore); + } + + if (!count) { + nsresult rv = mContainer->Init(mDataSource, resource); + if (NS_FAILED(rv)) + return 0; + + mContainer->GetCount(&count); + } return count; } @@ -176,6 +206,7 @@ - (id) outlineView: (NSOutlineView*) aOutlineView objectValueForTableColumn: (NSTableColumn*) aTableColumn byItem: (id) aItem { + NSLog(@"outlineView:%@objectValueForTableColumn:%@byItem:%@", aOutlineView, aTableColumn, aItem); if (!mDataSource || !aItem) return nil;