From 0e83845ca1f3567e665c7fbddc891ad7c0235103 Mon Sep 17 00:00:00 2001 From: "ben%netscape.com" Date: Mon, 29 Apr 2002 21:31:08 +0000 Subject: [PATCH] Let's try this NIB thing again... --- camino/BrowserWindow.nib/classes.nib | 15 +++++- camino/BrowserWindow.nib/info.nib | 14 +++--- camino/BrowserWindow.nib/objects.nib | Bin 16970 -> 17147 bytes camino/CHRDFOutlineViewDataSource.mm | 46 ++++++++++++++++-- .../BrowserWindow.nib/classes.nib | 15 +++++- .../English.lproj/BrowserWindow.nib/info.nib | 14 +++--- .../BrowserWindow.nib/objects.nib | Bin 16970 -> 17147 bytes .../BrowserWindow.nib/classes.nib | 15 +++++- .../English.lproj/BrowserWindow.nib/info.nib | 14 +++--- .../BrowserWindow.nib/objects.nib | Bin 16970 -> 17147 bytes .../extensions/RDFOutlineViewDataSource.mm | 46 ++++++++++++++++-- chimera/BrowserWindow.nib/classes.nib | 15 +++++- chimera/BrowserWindow.nib/info.nib | 14 +++--- chimera/BrowserWindow.nib/objects.nib | Bin 16970 -> 17147 bytes chimera/CHRDFOutlineViewDataSource.mm | 46 ++++++++++++++++-- .../BrowserWindow.nib/classes.nib | 15 +++++- .../English.lproj/BrowserWindow.nib/info.nib | 14 +++--- .../BrowserWindow.nib/objects.nib | Bin 16970 -> 17147 bytes .../BrowserWindow.nib/classes.nib | 15 +++++- .../English.lproj/BrowserWindow.nib/info.nib | 14 +++--- .../BrowserWindow.nib/objects.nib | Bin 16970 -> 17147 bytes .../extensions/RDFOutlineViewDataSource.mm | 46 ++++++++++++++++-- 22 files changed, 298 insertions(+), 60 deletions(-) diff --git a/camino/BrowserWindow.nib/classes.nib b/camino/BrowserWindow.nib/classes.nib index 669269f11fb0..1695d169840a 100644 --- a/camino/BrowserWindow.nib/classes.nib +++ b/camino/BrowserWindow.nib/classes.nib @@ -44,6 +44,7 @@ mAddBookmarkSheetWindow = id; mAddBookmarkTitleField = id; mCachedBMDS = id; + mHistoryDataSource = id; mImageLinkMenu = id; mImageMenu = id; mInputMenu = id; @@ -75,7 +76,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 +110,8 @@ urlbar = id; }; SUPERCLASS = NSView; - } + }, + {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); IBVersion = 1; } \ No newline at end of file diff --git a/camino/BrowserWindow.nib/info.nib b/camino/BrowserWindow.nib/info.nib index 8738aab0fe7c..3c5cfcad099d 100644 --- a/camino/BrowserWindow.nib/info.nib +++ b/camino/BrowserWindow.nib/info.nib @@ -3,17 +3,17 @@ IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 91 273 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 297 - 70 110 198 210 0 0 1152 746 + 79 163 198 210 0 0 1280 1002 314 271 139 198 180 0 0 1152 746 336 @@ -23,9 +23,9 @@ 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 @@ -46,11 +46,11 @@ IBOpenObjects 475 - 56 297 160 + 56 IBSystem Version - 5Q125 + 5L21 diff --git a/camino/BrowserWindow.nib/objects.nib b/camino/BrowserWindow.nib/objects.nib index abf53d203f790de061b644eb5549a074c5a90043..953585d20c2879f767d5dbccff62818d80a1c0e9 100644 GIT binary patch literal 17147 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

bgoACPwf*(MO&kBA5psCC88!~wqHCQTk0rdMi zJmv{LU_uqD@f#WaLGum4VMU%=WV-=Es`l%6`=sD0yqyc<_lE`ldk}dAZBe``_}`g9 zXbozv793N|-YEm>t=9t3DfnsgZNYCdaUt*%=HXKF&w_UYWrN_~Gw%@GYYuSWeM#_B zfC94#O`$Na0@y70PXRn3_#zaK+zC)z@YnJCjNre<+x3F)LE#e|L-#<^n^1gA@bxI> z3;q*eJ_wPZcvP@^%wECHq2>dEuQ6W}Jc{35!Plbrg5WQq=n(ul^DS5rS{(J_u}$!A zfuH|@b>mEeZ^iG4f;hw0^ixEQ~u3!XF^;GE3M1%qSr yR0#HS^IgGj2Zl%R-@wPcG3YUlKV$T)%)nVzx6W^h1!IBcIL?jN#OVLL;r{`YL~LaM literal 16970 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 resource = !aItem ? mRootResource : [aItem resource]; nsCOMPtr ordinalResource; - mContainerUtils->IndexToOrdinalResource(aIndex, getter_AddRefs(ordinalResource)); + mContainerUtils->IndexToOrdinalResource(aIndex + 1, getter_AddRefs(ordinalResource)); nsCOMPtr childNode; mDataSource->GetTarget(resource, ordinalResource, PR_TRUE, getter_AddRefs(childNode)); if (childNode) { + // Yay. A regular container. We don't need to count, we can go directly to + // our object. nsCOMPtr childResource(do_QueryInterface(childNode)); if (childResource) return [self MakeWrapperFor:childResource]; } - +#if 0 + else { + // Oh well, not a regular container. We need to count, dagnabbit. + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); + + NSLog(@"1"); + nsCOMPtr childNodes; + mDataSource->GetTargets(resource, childProperty, PR_TRUE, getter_AddRefs(childNodes)); + + NSLog(@"2"); + PRBool hasMore = PR_FALSE; + childNodes->HasMoreElements(&hasMore); + + PRInt32 count = 0; + + NSLog(@"3"); + nsCOMPtr supp; + while (hasMore && count < aIndex) { + childNodes->GetNext(getter_AddRefs(supp)); + + NSLog(@"4"); + ++count; + + childNodes->HasMoreElements(&hasMore); + NSLog(@"5"); + } + nsCOMPtr childResource(do_QueryInterface(supp)); + NSLog(@"6"); + if (childResource) { + NSLog(@"6.5"); + RDFOutlineViewItem* thing = [self MakeWrapperFor:childResource]; + + NSLog(@"thing = %@", thing); + return thing; + } + } + NSLog(@"7"); +#endif return nil; } @@ -264,7 +304,7 @@ - (id) MakeWrapperFor: (nsIRDFResource*) aRDFResource { - RDFOutlineViewItem* item = [[RDFOutlineViewItem alloc] init]; + RDFOutlineViewItem* item = [[[RDFOutlineViewItem alloc] init] autorelease]; [item setResource: aRDFResource]; return item; } diff --git a/camino/English.lproj/BrowserWindow.nib/classes.nib b/camino/English.lproj/BrowserWindow.nib/classes.nib index 669269f11fb0..1695d169840a 100644 --- a/camino/English.lproj/BrowserWindow.nib/classes.nib +++ b/camino/English.lproj/BrowserWindow.nib/classes.nib @@ -44,6 +44,7 @@ mAddBookmarkSheetWindow = id; mAddBookmarkTitleField = id; mCachedBMDS = id; + mHistoryDataSource = id; mImageLinkMenu = id; mImageMenu = id; mInputMenu = id; @@ -75,7 +76,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 +110,8 @@ urlbar = id; }; SUPERCLASS = NSView; - } + }, + {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); IBVersion = 1; } \ No newline at end of file diff --git a/camino/English.lproj/BrowserWindow.nib/info.nib b/camino/English.lproj/BrowserWindow.nib/info.nib index 8738aab0fe7c..3c5cfcad099d 100644 --- a/camino/English.lproj/BrowserWindow.nib/info.nib +++ b/camino/English.lproj/BrowserWindow.nib/info.nib @@ -3,17 +3,17 @@ IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 91 273 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 297 - 70 110 198 210 0 0 1152 746 + 79 163 198 210 0 0 1280 1002 314 271 139 198 180 0 0 1152 746 336 @@ -23,9 +23,9 @@ 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 @@ -46,11 +46,11 @@ IBOpenObjects 475 - 56 297 160 + 56 IBSystem Version - 5Q125 + 5L21 diff --git a/camino/English.lproj/BrowserWindow.nib/objects.nib b/camino/English.lproj/BrowserWindow.nib/objects.nib index abf53d203f790de061b644eb5549a074c5a90043..953585d20c2879f767d5dbccff62818d80a1c0e9 100644 GIT binary patch literal 17147 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

bgoACPwf*(MO&kBA5psCC88!~wqHCQTk0rdMi zJmv{LU_uqD@f#WaLGum4VMU%=WV-=Es`l%6`=sD0yqyc<_lE`ldk}dAZBe``_}`g9 zXbozv793N|-YEm>t=9t3DfnsgZNYCdaUt*%=HXKF&w_UYWrN_~Gw%@GYYuSWeM#_B zfC94#O`$Na0@y70PXRn3_#zaK+zC)z@YnJCjNre<+x3F)LE#e|L-#<^n^1gA@bxI> z3;q*eJ_wPZcvP@^%wECHq2>dEuQ6W}Jc{35!Plbrg5WQq=n(ul^DS5rS{(J_u}$!A zfuH|@b>mEeZ^iG4f;hw0^ixEQ~u3!XF^;GE3M1%qSr yR0#HS^IgGj2Zl%R-@wPcG3YUlKV$T)%)nVzx6W^h1!IBcIL?jN#OVLL;r{`YL~LaM literal 16970 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 IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 91 273 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 297 - 70 110 198 210 0 0 1152 746 + 79 163 198 210 0 0 1280 1002 314 271 139 198 180 0 0 1152 746 336 @@ -23,9 +23,9 @@ 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 @@ -46,11 +46,11 @@ IBOpenObjects 475 - 56 297 160 + 56 IBSystem Version - 5Q125 + 5L21 diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index abf53d203f790de061b644eb5549a074c5a90043..953585d20c2879f767d5dbccff62818d80a1c0e9 100644 GIT binary patch literal 17147 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

bgoACPwf*(MO&kBA5psCC88!~wqHCQTk0rdMi zJmv{LU_uqD@f#WaLGum4VMU%=WV-=Es`l%6`=sD0yqyc<_lE`ldk}dAZBe``_}`g9 zXbozv793N|-YEm>t=9t3DfnsgZNYCdaUt*%=HXKF&w_UYWrN_~Gw%@GYYuSWeM#_B zfC94#O`$Na0@y70PXRn3_#zaK+zC)z@YnJCjNre<+x3F)LE#e|L-#<^n^1gA@bxI> z3;q*eJ_wPZcvP@^%wECHq2>dEuQ6W}Jc{35!Plbrg5WQq=n(ul^DS5rS{(J_u}$!A zfuH|@b>mEeZ^iG4f;hw0^ixEQ~u3!XF^;GE3M1%qSr yR0#HS^IgGj2Zl%R-@wPcG3YUlKV$T)%)nVzx6W^h1!IBcIL?jN#OVLL;r{`YL~LaM literal 16970 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 resource = !aItem ? mRootResource : [aItem resource]; nsCOMPtr ordinalResource; - mContainerUtils->IndexToOrdinalResource(aIndex, getter_AddRefs(ordinalResource)); + mContainerUtils->IndexToOrdinalResource(aIndex + 1, getter_AddRefs(ordinalResource)); nsCOMPtr childNode; mDataSource->GetTarget(resource, ordinalResource, PR_TRUE, getter_AddRefs(childNode)); if (childNode) { + // Yay. A regular container. We don't need to count, we can go directly to + // our object. nsCOMPtr childResource(do_QueryInterface(childNode)); if (childResource) return [self MakeWrapperFor:childResource]; } - +#if 0 + else { + // Oh well, not a regular container. We need to count, dagnabbit. + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); + + NSLog(@"1"); + nsCOMPtr childNodes; + mDataSource->GetTargets(resource, childProperty, PR_TRUE, getter_AddRefs(childNodes)); + + NSLog(@"2"); + PRBool hasMore = PR_FALSE; + childNodes->HasMoreElements(&hasMore); + + PRInt32 count = 0; + + NSLog(@"3"); + nsCOMPtr supp; + while (hasMore && count < aIndex) { + childNodes->GetNext(getter_AddRefs(supp)); + + NSLog(@"4"); + ++count; + + childNodes->HasMoreElements(&hasMore); + NSLog(@"5"); + } + nsCOMPtr childResource(do_QueryInterface(supp)); + NSLog(@"6"); + if (childResource) { + NSLog(@"6.5"); + RDFOutlineViewItem* thing = [self MakeWrapperFor:childResource]; + + NSLog(@"thing = %@", thing); + return thing; + } + } + NSLog(@"7"); +#endif return nil; } @@ -264,7 +304,7 @@ - (id) MakeWrapperFor: (nsIRDFResource*) aRDFResource { - RDFOutlineViewItem* item = [[RDFOutlineViewItem alloc] init]; + RDFOutlineViewItem* item = [[[RDFOutlineViewItem alloc] init] autorelease]; [item setResource: aRDFResource]; return item; } diff --git a/chimera/BrowserWindow.nib/classes.nib b/chimera/BrowserWindow.nib/classes.nib index 669269f11fb0..1695d169840a 100644 --- a/chimera/BrowserWindow.nib/classes.nib +++ b/chimera/BrowserWindow.nib/classes.nib @@ -44,6 +44,7 @@ mAddBookmarkSheetWindow = id; mAddBookmarkTitleField = id; mCachedBMDS = id; + mHistoryDataSource = id; mImageLinkMenu = id; mImageMenu = id; mInputMenu = id; @@ -75,7 +76,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 +110,8 @@ urlbar = id; }; SUPERCLASS = NSView; - } + }, + {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); IBVersion = 1; } \ No newline at end of file diff --git a/chimera/BrowserWindow.nib/info.nib b/chimera/BrowserWindow.nib/info.nib index 8738aab0fe7c..3c5cfcad099d 100644 --- a/chimera/BrowserWindow.nib/info.nib +++ b/chimera/BrowserWindow.nib/info.nib @@ -3,17 +3,17 @@ IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 91 273 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 297 - 70 110 198 210 0 0 1152 746 + 79 163 198 210 0 0 1280 1002 314 271 139 198 180 0 0 1152 746 336 @@ -23,9 +23,9 @@ 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 @@ -46,11 +46,11 @@ IBOpenObjects 475 - 56 297 160 + 56 IBSystem Version - 5Q125 + 5L21 diff --git a/chimera/BrowserWindow.nib/objects.nib b/chimera/BrowserWindow.nib/objects.nib index abf53d203f790de061b644eb5549a074c5a90043..953585d20c2879f767d5dbccff62818d80a1c0e9 100644 GIT binary patch literal 17147 zcmbtc4SZD9mA`k$cS1fOdb%B%txG=@ZnnZ zhBwpQWq;c`OP;3qlTxIm2n8uQNSxU>K-381)4t@4@Gahq)-=VU z$#^Ur*5c_@TIV6bHW+A9*6v@dMf+NlT14>w-AL4n6iBdNZPW`wKA*4u9>$n{|NRAo znO6NT?n?$b!&+lJ9$3e8y|~@4er_Br&*@i`wtQNVkrTL*%Ob zfz_I~1H5?~6IWh&<;Y|Q6%XSjT(ndR#{y%qNi0nHd`Mg4C6V^TV|~#suM*YhypNZS zYDrv<&o3ur5W}oN`%RncYZ7;r*%|eZX$)PuyuvH zyFzNK^{c$y5B=$lMZ2^(gC-x$qz0K@K^oX?{nIxO7LbYqb(yv{*&NcsT{CpO6f~82 zTyZdSXt4hhXu(4%{9_*BDX3(Oo|!|WQ<)TOA{g{B4z1Url@6UIEgYUJ`D+X&L$N5m z*GT^8S0ijR6zVVF=U6}U!JG<+FU(`*f>^LGqD7Mp-mX{_x-OeEgPkcG2WRPpH(&Ls z;4MX9s1ASU&a*bw$AT=xx>$hSz~XpD@mm8$-d(QqAlt+DustlDN}th@BVww;91ADwa{Tzyt<YezeuHyr_(PS?Jr@hfHUb?en^T^ zX7MQbVuJq#9D#3o+8vW4o7B|eDEP8iEZiB0lepn%<=7?Typ%@c0Yz1+F`=u${tsm( zq3e^|{T=aGPh3kRTBBW|U?3Tb3-%ueGY1CyeS}C36<)o=zc_%kU~SDt=urKf?prv6 z&f*{EJgXz@+?^GS-C2S8Qp#Nz40d$|f!S3c*%F?w7u*S^?ksZ;$mSe_a9dqEeaL`6 z&>wgpZ^_s^SVDf#l!jlh9P81D?m^-89|otRI$}j@LQ`LI3{vDQ3z}lR>&Ags*b#s& zj03S~ffm-r#2jN3ui37!%nxe8q_;5~9kOThN!~Gj?KiAk#4t3{Nr@OMf-0@YDlW_?O;DU>^MWUdQtF2)pL(zrn!70 z3F%wlm!6qvSy83*a`?9HZu~Vggwzzn+lI9kEr8{cC|z_gqfgK6>tgb#oQTy(k~NuH zki3}w^g^F62zP3)2~({#Az#$LK`@4e0VAOC(R?aO7QGKD7Bh9U?oC`l>u@}(_+e_` zmRO{R6>KZ304o)W5eo5g{dri!9QH+`h=@yQ(I*~Lf^9CL=vwNvYtW>_7eR#z#5t%B zCawhGLti+VaLrt5FQa8}|N859&>H9rw`!%7TXqG6){r{Z)}Ql9TKu}~^w;fWl~1NQ z$0*YiJe3ZS(w=yz%cYU)=V9icm6fSf|0Lf%SZC-zwK~*b5(Ix!iVdZlh&oi){rW>v zz?Rl1z0$BEJbgsYWuEwI$|VtcN)n*|9dw$?)anzuyBpa0d7U?J)+<(Y#cWCqh$g&< zq^}u5?tuqjkX6LdgH?INo(7?>eC_#X5R0Jg2Q!zFA`#|p;lU!LN@+x-qgQ7>4P6D6 zUPy6TsI08Ix?cxda_D6>@94(GlqWhAUfo8(j`zc?x%o4KatUYND-=vaeOWb^;$#iwTEh; z@rX+{>XWYGoMxL zkmpVPQvU#XiyVSWhIoq>v{*uamXeO-1?)L(OY5^F&3n{<@{OM8kwqw@|HyC2w5vtY zv-)h86&JUJur-da%i14|_+uZ>HBZl~o@{-avQL(2llECp_LmvX{#?Q!R@&&#vA=7E z;~e%zjp&)NxL5YpLMF2M*6W{f%!_2{9ygiSE@@u7s)lKMoBxbuULBdGF6GJENi*1^ zIlC$IC6vHAF@|CJfK1{gYVZC@u%8OgYMOm2GmWb9fLfxJKG&z!CX1A>I0JBla0YFZMsHum>Ip8h+r?L0un49^)s=%o>^x%m%(KL zd36G+KA{DHr$3JBgttl(OIMtNh^{ik=XB73P7uZXXmBcFVv=SgIVo|a`#GrXx zVsBVK6JOdr$^C>j&Ve;*Op_!m97IbbFo^`y) zj}&DP8N0SjdEpQ$VNcSAv1#%Qzef{n+q1*PM`}OM5P{@vF+H@w6zscli&?r1NoFnH z8CyGSv?SQK;WmN29m!|eph6{lLw9I-=~E|iQf*St$;b@-P77QNXM#F`?%Uw zx!Yk^GG?Rx!*E2<2G5e-F>wj6Y$4R$yNoheLHl73siD+D03%18j zh153TFeIr-X{uSs(+@_GwLKB&Asbu6B=Ul4I9pN~S{rr?zS%C7F^sWFWTO!dy?uh{ zsF;XvBRW47d>i1$6fKI12<>rb-s3LKbA{8&?D^dm6L$mqsA?=zfgORU7EX}*64UrI zF0UIkmxk<%)ZA%OkJ>`fRiwD%RzlTSslB`LsG2C)Q%VO^>q(SV^UBt3F(e|9^d3Xg zR6BKgBHN8|dLliHYBYt83uGJjalx4VN&Oo&k!TB2onOcvMzsRc)X}MeqS4zk((GA& z=d_%?0(mAj+M$hL3UlleEM$_@?5GCS@{CHJ3XOG0CB>{-O`ji*1y`xVq=dIQ9*cPW zT6{H54adV|g*v_($61s;tXfJvd6z`P>%7U8p~N^_jxK+<6sjbBC569vT2C8--5bE; zRj_X~W0f)XZZggk8i$Zv!a1aJ|I4&UZx}vI@b@<27&Ihv8pysO8CB`2BG(}k{r$ab zr9UrjS{aIH@c_929N=0@2-e#IVm*B*#q|Or0mo5@vjKAt-!Iq+#2*0i98jI_p{jrT$xvWK>@ub>{3Cmf)s;;od^=b%EYO zHIj#mL%hXkONpD+@wx)L&3M#N@pYj_X^rNuG)mR_LX1+i_-l+(wY(s6qbTKqmoLH2 z8t<9L@-`^?Nm6vden-W=P5AXZ{lfV{Haea_NqoU6M~)RdRr?vi1C%DjlfY^Pb{{6- zAi*8m^BH@2MU|Di7knyh%d+GIzr13Zm$7BuJYvq~@mjTc^xP1`qMqH7@tMzJjh|sB zBN5|I#D#`qgBRhjZqBvpz_%9h9u9n4aJU<0tMN?Y*f+=myX}1?(j+P-#@QkNM~W=) zw1bP(ylYa(Z<~!0Bab0I0%w ziGAFqC2{^$i1QQtz#W%XY<`eZYWFvX!Wv~_5*?i}T=Q6ldo{?T3)a7=fw4smM9wwU z+1}_3;EJC=+|M8f?DEx(5*&Xu_V$M9Y!x9*D^51#&I5VkPzZC9-oxeY++i^#_^nwr zaCbCB4VEm*6=?l1Y9ROrt^L2dhl=s_P}CHN2DNZ*FW2PvGBXXHRWD>6mZ(!TfjBfJ zPI}@VMZTUCwL{VkWx0J^msJgAat_gji$HYISVYUMz`r$`Px&)0%7V|5+g*p{FV7R) zkF*Fq^VoJax|p+_2&-MzH_zJY7U3uWD=kaQ2N~cvvvDpHboQ1*cF5Qf@CEjUcXE3y z>HQ*Yu@D_-bm0RR3tTZ(cHhg9hfUl2UcL~gAh`k!ens&1dKz+jecq7sXR4z;usYO3 zsTS{=P&n)jAcmG<7LJ1>Wb5m2yT@zio)X?b64ja)A)r)!Z=zQVhPp#qm$wu5lGa?A zH|MRcnUQ|cp7Tjl1p5cN2!UrFi zu>rRqR2okD3gu8H;I5Aho&0M;$>2)ZYSt?r5$p&_ipqS?7+4|rV!0M9rnMkX<6Q^K zIjS=&yB?qoyk8l4zvG9DH%;TELvVlZz$LPSDMVi`&6rksS^W8ymt0r}#;XFE21mAr2(RTtcj^fKTSI65JjHmWAu30h&^H`+mWX+0xQr(8+Ca2kg=NtfU^V&olg%K zEzL&58DkHCd>Tv^z%4$bt`@H|XhE?~#Au~vtgDOu>{+AbWLi^8V_!1X6eAN#YKTwO zAvk87hTEzJxe&uOHqk5`qsL(quV8;99(1)T*=m=_Ta|!0VDtom{R(04Al~nzc>lY| zj-fzgum$}TDJkAa)KdXtKaHlGU|?U4z)4V(2UuaHAb68>Q%!VgEB_lcNj=y<8*YmZ zR*+{SAHBj#dy{OYdIbM4Zcx&bsuVpZim5->=)MjixR%w~j4t>`6uAQG0Mr1PeQMN& zw18Kmx9a@91ivzG<(!y^z>;l$B3I3qnMbaeBn1!nz8+x>J;B4RSvgE>YOzC(`FWS4 zfM?uAldvIRykVj|OLL7ljuaZ3EYdbk(k~=qIz+R*g=S=?j8Hg~94gOVrwJ_s245if zLgV}y<6WZls8kMq4N+@r0RS5-3Msc?vVn`;8re&|>TIGSWfCdD&eL1tfKfw4uOp0- zxyIWd%6lYJ3_j-(;|}6{Cz*v{Z%Y-F7he{{18cN6|4}A|&D>G^55;c$Z$DD7qUxJ^ zL2GMwH;y@~l!!>Z*;~}y*N6@#D@M@n7~lt}pJ2c+2aMAPPHb#u$XfQ0Roq zv2??yeoorh4-oDbXF+r7)5iM%x~>7!4${nP3amzeCi+8NT4x|`1#&=q98he0VTlyC z$!_X_OxNe^^A}(}Ka?C;2e8~CD0jMGeX2sFYZdZtCRoOf8$j@<{5~-(_|1ZU$=C}x zPOx2rNgHPXE0q_G+HeY-HVPGv>*|r*AOnhfYfejoZJ?G;FKMG87e{hJ)N>@Y9015u zIwE!RgxF&z0d{jnB7vVD23o6N+3P?O^EjZTw0mtL7Sl#A-iLIv3qbeu%9am0n9h7q z*ZUOM8Sos*5x+$6OCim9sLj2fl{U@;mMbF3lrz<7<0W9I6a_jsftMV~UI1(!q0hj6$>MTIr zw}S~*1DJLHTp5xa3bH^7*O4kodixMq0FdnHcpF|FJ-eEk>;c40zP|n{IhUsaFOzYO zr3NhkV8~fzxhic?<9sn}p@v!YralNXjGfj2Orv!cQjB(n1+#6Cn!gB`Ti3`Mcq@SD zI%}*Fx)4ye1;TFu;#LHueC&^^xg$L}f$VS|GK4{W-6Hsx!N()iX8z(PTvG;n$~bxe z%OAsyfYl&jY%lZ+LV<9shemQ1HC0lmj(tgC->0Z3Cv%lDk1D{1GR}(t&KCxI1;8Ac zU#=SGx`x;CDXKv~nnw{F{TZPAc^x1$+UZ`N@Ge<{YjSCW#5Kt^2hdFVMR#JtRokrPOQ-Brn79V-jsb#OGRR#0A$O6rShfwX zAe*~}@OnU9V?iVcfSa!19zfjVkfIstSP>rs(Je0N70K(MwKD^9TCU3j(g@i*02W&x z`=pJx6-w5w(#8t_k)>u=>9lbdU^)C#1}I0In*b=KZ$K>fgCJMYaY)mwzLDRIVu!NU zXm4NAZpV%iC8vL4c`G1}h=X_mdpUj$VGN)ZwkuZw0(nFa>4*&9RXR~ z+LRg;Q||$PCgIoMOAZ@dc4;9%RM-szp@gnMAPs?>oFk800H0}()%Mfw4VjHfF0MF2 zUv~8+oc5#%r4jo>2nS3tN_hl&Zd-#zgdEj%JkTrR=3n54sqkjKaYW7|UGi^x?s zuSN!y5n76~6*QO=)NySLmoliXHHvd>rR&ZZaLh$GH90sCy9?nYA(SWZsU8t&#Jz4u zSSD3fP?hA$RkzD&L<4bEAdsP|NvpBZq4UaRIIfh9vw~6KN@{sp09Q(6;0R`OC z+*sxs433)?H41a_jn%SHFV!y6*3rSLygeYlXUw@hK>T|aLElosL;X#*lF$Ly z{S&D)5@~}%nwo>;w=c70@$OZ4ljH>)nQpZQn8mqI;nb?{h*VNG2TQFQ6owT?;CLx3 zVo6(OJ#I$D5XT@l#=|$cnWn!cqKpV4v%dwFG~e5|pQ_7AwUz&JP1PBxI5}oE#1zj< z>Nz+$rpOB<{ozcJms8cSrih&v)s1R#GN7+iz9rX<$W`|eY9AST24#s7SxUkf#`jt^ z!-)72Qj|PTj`P7m!G5cId?ET;iC=08ezpsbTSCYd9TxmYDE=t8&m2V3%oLv61phs% zwd>46!5%Y_m;JW6L-3E9?;{C>iW*9dD;_Y+%+R8v%4K_!B6m`2oLI z@MrM*GQl^Pn*_fCzu)-+n&EJ75JijNPXmO+%SpW5D)`GNs^Rd=(-YD9PlA6MfH{JH z6>qTa-R7Z6;Kyd*f%Mte06i=ClPI1OyxGKO?R!xJDIW*uh~PiQ8&<-7<_m)TGkzmC z|ELL%v=hGz1V4&mmf-)2KCTt~0TkVW|2Kg6lI2&Ra9r>X^9+&>sQHNCccW(J=kd5v z@P7hm0dm|Zt`uBHfwadu6iDNK11N9ILwh8_m!Q}#_=9E}5_YKW75on-9OoS1R0;lD zRKE-fqu46=b`(zu{yB3C!b}s>^hp4K{BJ0ZU4+L;!Izr2i19D@4FcEW4=KwG=uQ

bgoACPwf*(MO&kBA5psCC88!~wqHCQTk0rdMi zJmv{LU_uqD@f#WaLGum4VMU%=WV-=Es`l%6`=sD0yqyc<_lE`ldk}dAZBe``_}`g9 zXbozv793N|-YEm>t=9t3DfnsgZNYCdaUt*%=HXKF&w_UYWrN_~Gw%@GYYuSWeM#_B zfC94#O`$Na0@y70PXRn3_#zaK+zC)z@YnJCjNre<+x3F)LE#e|L-#<^n^1gA@bxI> z3;q*eJ_wPZcvP@^%wECHq2>dEuQ6W}Jc{35!Plbrg5WQq=n(ul^DS5rS{(J_u}$!A zfuH|@b>mEeZ^iG4f;hw0^ixEQ~u3!XF^;GE3M1%qSr yR0#HS^IgGj2Zl%R-@wPcG3YUlKV$T)%)nVzx6W^h1!IBcIL?jN#OVLL;r{`YL~LaM literal 16970 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 resource = !aItem ? mRootResource : [aItem resource]; nsCOMPtr ordinalResource; - mContainerUtils->IndexToOrdinalResource(aIndex, getter_AddRefs(ordinalResource)); + mContainerUtils->IndexToOrdinalResource(aIndex + 1, getter_AddRefs(ordinalResource)); nsCOMPtr childNode; mDataSource->GetTarget(resource, ordinalResource, PR_TRUE, getter_AddRefs(childNode)); if (childNode) { + // Yay. A regular container. We don't need to count, we can go directly to + // our object. nsCOMPtr childResource(do_QueryInterface(childNode)); if (childResource) return [self MakeWrapperFor:childResource]; } - +#if 0 + else { + // Oh well, not a regular container. We need to count, dagnabbit. + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); + + NSLog(@"1"); + nsCOMPtr childNodes; + mDataSource->GetTargets(resource, childProperty, PR_TRUE, getter_AddRefs(childNodes)); + + NSLog(@"2"); + PRBool hasMore = PR_FALSE; + childNodes->HasMoreElements(&hasMore); + + PRInt32 count = 0; + + NSLog(@"3"); + nsCOMPtr supp; + while (hasMore && count < aIndex) { + childNodes->GetNext(getter_AddRefs(supp)); + + NSLog(@"4"); + ++count; + + childNodes->HasMoreElements(&hasMore); + NSLog(@"5"); + } + nsCOMPtr childResource(do_QueryInterface(supp)); + NSLog(@"6"); + if (childResource) { + NSLog(@"6.5"); + RDFOutlineViewItem* thing = [self MakeWrapperFor:childResource]; + + NSLog(@"thing = %@", thing); + return thing; + } + } + NSLog(@"7"); +#endif return nil; } @@ -264,7 +304,7 @@ - (id) MakeWrapperFor: (nsIRDFResource*) aRDFResource { - RDFOutlineViewItem* item = [[RDFOutlineViewItem alloc] init]; + RDFOutlineViewItem* item = [[[RDFOutlineViewItem alloc] init] autorelease]; [item setResource: aRDFResource]; return item; } diff --git a/chimera/English.lproj/BrowserWindow.nib/classes.nib b/chimera/English.lproj/BrowserWindow.nib/classes.nib index 669269f11fb0..1695d169840a 100644 --- a/chimera/English.lproj/BrowserWindow.nib/classes.nib +++ b/chimera/English.lproj/BrowserWindow.nib/classes.nib @@ -44,6 +44,7 @@ mAddBookmarkSheetWindow = id; mAddBookmarkTitleField = id; mCachedBMDS = id; + mHistoryDataSource = id; mImageLinkMenu = id; mImageMenu = id; mInputMenu = id; @@ -75,7 +76,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 +110,8 @@ urlbar = id; }; SUPERCLASS = NSView; - } + }, + {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; } ); IBVersion = 1; } \ No newline at end of file diff --git a/chimera/English.lproj/BrowserWindow.nib/info.nib b/chimera/English.lproj/BrowserWindow.nib/info.nib index 8738aab0fe7c..3c5cfcad099d 100644 --- a/chimera/English.lproj/BrowserWindow.nib/info.nib +++ b/chimera/English.lproj/BrowserWindow.nib/info.nib @@ -3,17 +3,17 @@ IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 91 273 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 297 - 70 110 198 210 0 0 1152 746 + 79 163 198 210 0 0 1280 1002 314 271 139 198 180 0 0 1152 746 336 @@ -23,9 +23,9 @@ 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 @@ -46,11 +46,11 @@ IBOpenObjects 475 - 56 297 160 + 56 IBSystem Version - 5Q125 + 5L21 diff --git a/chimera/English.lproj/BrowserWindow.nib/objects.nib b/chimera/English.lproj/BrowserWindow.nib/objects.nib index abf53d203f790de061b644eb5549a074c5a90043..953585d20c2879f767d5dbccff62818d80a1c0e9 100644 GIT binary patch literal 17147 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

bgoACPwf*(MO&kBA5psCC88!~wqHCQTk0rdMi zJmv{LU_uqD@f#WaLGum4VMU%=WV-=Es`l%6`=sD0yqyc<_lE`ldk}dAZBe``_}`g9 zXbozv793N|-YEm>t=9t3DfnsgZNYCdaUt*%=HXKF&w_UYWrN_~Gw%@GYYuSWeM#_B zfC94#O`$Na0@y70PXRn3_#zaK+zC)z@YnJCjNre<+x3F)LE#e|L-#<^n^1gA@bxI> z3;q*eJ_wPZcvP@^%wECHq2>dEuQ6W}Jc{35!Plbrg5WQq=n(ul^DS5rS{(J_u}$!A zfuH|@b>mEeZ^iG4f;hw0^ixEQ~u3!XF^;GE3M1%qSr yR0#HS^IgGj2Zl%R-@wPcG3YUlKV$T)%)nVzx6W^h1!IBcIL?jN#OVLL;r{`YL~LaM literal 16970 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 IBDocumentLocation - 7 130 480 309 0 0 1152 746 + 91 273 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 297 - 70 110 198 210 0 0 1152 746 + 79 163 198 210 0 0 1280 1002 314 271 139 198 180 0 0 1152 746 336 @@ -23,9 +23,9 @@ 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 @@ -46,11 +46,11 @@ IBOpenObjects 475 - 56 297 160 + 56 IBSystem Version - 5Q125 + 5L21 diff --git a/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index abf53d203f790de061b644eb5549a074c5a90043..953585d20c2879f767d5dbccff62818d80a1c0e9 100644 GIT binary patch literal 17147 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

bgoACPwf*(MO&kBA5psCC88!~wqHCQTk0rdMi zJmv{LU_uqD@f#WaLGum4VMU%=WV-=Es`l%6`=sD0yqyc<_lE`ldk}dAZBe``_}`g9 zXbozv793N|-YEm>t=9t3DfnsgZNYCdaUt*%=HXKF&w_UYWrN_~Gw%@GYYuSWeM#_B zfC94#O`$Na0@y70PXRn3_#zaK+zC)z@YnJCjNre<+x3F)LE#e|L-#<^n^1gA@bxI> z3;q*eJ_wPZcvP@^%wECHq2>dEuQ6W}Jc{35!Plbrg5WQq=n(ul^DS5rS{(J_u}$!A zfuH|@b>mEeZ^iG4f;hw0^ixEQ~u3!XF^;GE3M1%qSr yR0#HS^IgGj2Zl%R-@wPcG3YUlKV$T)%)nVzx6W^h1!IBcIL?jN#OVLL;r{`YL~LaM literal 16970 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 resource = !aItem ? mRootResource : [aItem resource]; nsCOMPtr ordinalResource; - mContainerUtils->IndexToOrdinalResource(aIndex, getter_AddRefs(ordinalResource)); + mContainerUtils->IndexToOrdinalResource(aIndex + 1, getter_AddRefs(ordinalResource)); nsCOMPtr childNode; mDataSource->GetTarget(resource, ordinalResource, PR_TRUE, getter_AddRefs(childNode)); if (childNode) { + // Yay. A regular container. We don't need to count, we can go directly to + // our object. nsCOMPtr childResource(do_QueryInterface(childNode)); if (childResource) return [self MakeWrapperFor:childResource]; } - +#if 0 + else { + // Oh well, not a regular container. We need to count, dagnabbit. + nsCOMPtr childProperty; + mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty)); + + NSLog(@"1"); + nsCOMPtr childNodes; + mDataSource->GetTargets(resource, childProperty, PR_TRUE, getter_AddRefs(childNodes)); + + NSLog(@"2"); + PRBool hasMore = PR_FALSE; + childNodes->HasMoreElements(&hasMore); + + PRInt32 count = 0; + + NSLog(@"3"); + nsCOMPtr supp; + while (hasMore && count < aIndex) { + childNodes->GetNext(getter_AddRefs(supp)); + + NSLog(@"4"); + ++count; + + childNodes->HasMoreElements(&hasMore); + NSLog(@"5"); + } + nsCOMPtr childResource(do_QueryInterface(supp)); + NSLog(@"6"); + if (childResource) { + NSLog(@"6.5"); + RDFOutlineViewItem* thing = [self MakeWrapperFor:childResource]; + + NSLog(@"thing = %@", thing); + return thing; + } + } + NSLog(@"7"); +#endif return nil; } @@ -264,7 +304,7 @@ - (id) MakeWrapperFor: (nsIRDFResource*) aRDFResource { - RDFOutlineViewItem* item = [[RDFOutlineViewItem alloc] init]; + RDFOutlineViewItem* item = [[[RDFOutlineViewItem alloc] init] autorelease]; [item setResource: aRDFResource]; return item; }