mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Let's try this NIB thing again...

This commit is contained in:
ben%netscape.com 2002-04-29 21:31:08 +00:00
Родитель 5d7b5f9a26
Коммит 0e83845ca1
22 изменённых файлов: 298 добавлений и 60 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
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;
}

14
camino/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,17 +3,17 @@
<plist version="0.9">
<dict>
<key>IBDocumentLocation</key>
<string>7 130 480 309 0 0 1152 746 </string>
<string>91 273 480 309 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>124</key>
<string>431 537 170 180 0 0 1152 746 </string>
<key>160</key>
<string>478 70 195 666 0 0 1152 746 </string>
<string>572 326 195 666 0 0 1280 1002 </string>
<key>28</key>
<string>478 279 195 457 0 0 1152 746 </string>
<key>297</key>
<string>70 110 198 210 0 0 1152 746 </string>
<string>79 163 198 210 0 0 1280 1002 </string>
<key>314</key>
<string>271 139 198 180 0 0 1152 746 </string>
<key>336</key>
@ -23,9 +23,9 @@
<key>463</key>
<string>7 444 200 252 0 0 1152 746 </string>
<key>475</key>
<string>516 447 120 142 0 0 1152 746 </string>
<string>609 597 120 142 0 0 1280 1002 </string>
<key>56</key>
<string>404 484 343 68 0 0 1152 746 </string>
<string>498 634 343 68 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
<string>248.0</string>
@ -46,11 +46,11 @@
<key>IBOpenObjects</key>
<array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer>
<integer>56</integer>
</array>
<key>IBSystem Version</key>
<string>5Q125</string>
<string>5L21</string>
</dict>
</plist>

Двоичные данные
camino/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

46
camino/CHRDFOutlineViewDataSource.mm
Просмотреть файл

@ -148,16 +148,56 @@
nsCOMPtr<nsIRDFResource> resource = !aItem ? mRootResource : [aItem resource];
nsCOMPtr<nsIRDFResource> ordinalResource;
mContainerUtils->IndexToOrdinalResource(aIndex, getter_AddRefs(ordinalResource));
mContainerUtils->IndexToOrdinalResource(aIndex + 1, getter_AddRefs(ordinalResource));
nsCOMPtr<nsIRDFNode> 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<nsIRDFResource> 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<nsIRDFResource> childProperty;
mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty));
NSLog(@"1");
nsCOMPtr<nsISimpleEnumerator> 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<nsISupports> supp;
while (hasMore && count < aIndex) {
childNodes->GetNext(getter_AddRefs(supp));
NSLog(@"4");
++count;
childNodes->HasMoreElements(&hasMore);
NSLog(@"5");
}
nsCOMPtr<nsIRDFResource> 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;
}

15
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;
}

14
camino/English.lproj/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,17 +3,17 @@
<plist version="0.9">
<dict>
<key>IBDocumentLocation</key>
<string>7 130 480 309 0 0 1152 746 </string>
<string>91 273 480 309 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>124</key>
<string>431 537 170 180 0 0 1152 746 </string>
<key>160</key>
<string>478 70 195 666 0 0 1152 746 </string>
<string>572 326 195 666 0 0 1280 1002 </string>
<key>28</key>
<string>478 279 195 457 0 0 1152 746 </string>
<key>297</key>
<string>70 110 198 210 0 0 1152 746 </string>
<string>79 163 198 210 0 0 1280 1002 </string>
<key>314</key>
<string>271 139 198 180 0 0 1152 746 </string>
<key>336</key>
@ -23,9 +23,9 @@
<key>463</key>
<string>7 444 200 252 0 0 1152 746 </string>
<key>475</key>
<string>516 447 120 142 0 0 1152 746 </string>
<string>609 597 120 142 0 0 1280 1002 </string>
<key>56</key>
<string>404 484 343 68 0 0 1152 746 </string>
<string>498 634 343 68 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
<string>248.0</string>
@ -46,11 +46,11 @@
<key>IBOpenObjects</key>
<array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer>
<integer>56</integer>
</array>
<key>IBSystem Version</key>
<string>5Q125</string>
<string>5L21</string>
</dict>
</plist>

Двоичные данные
camino/English.lproj/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

15
camino/resources/localized/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;
}

14
camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,17 +3,17 @@
<plist version="0.9">
<dict>
<key>IBDocumentLocation</key>
<string>7 130 480 309 0 0 1152 746 </string>
<string>91 273 480 309 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>124</key>
<string>431 537 170 180 0 0 1152 746 </string>
<key>160</key>
<string>478 70 195 666 0 0 1152 746 </string>
<string>572 326 195 666 0 0 1280 1002 </string>
<key>28</key>
<string>478 279 195 457 0 0 1152 746 </string>
<key>297</key>
<string>70 110 198 210 0 0 1152 746 </string>
<string>79 163 198 210 0 0 1280 1002 </string>
<key>314</key>
<string>271 139 198 180 0 0 1152 746 </string>
<key>336</key>
@ -23,9 +23,9 @@
<key>463</key>
<string>7 444 200 252 0 0 1152 746 </string>
<key>475</key>
<string>516 447 120 142 0 0 1152 746 </string>
<string>609 597 120 142 0 0 1280 1002 </string>
<key>56</key>
<string>404 484 343 68 0 0 1152 746 </string>
<string>498 634 343 68 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
<string>248.0</string>
@ -46,11 +46,11 @@
<key>IBOpenObjects</key>
<array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer>
<integer>56</integer>
</array>
<key>IBSystem Version</key>
<string>5Q125</string>
<string>5L21</string>
</dict>
</plist>

Двоичные данные
camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

46
camino/src/extensions/RDFOutlineViewDataSource.mm
Просмотреть файл

@ -148,16 +148,56 @@
nsCOMPtr<nsIRDFResource> resource = !aItem ? mRootResource : [aItem resource];
nsCOMPtr<nsIRDFResource> ordinalResource;
mContainerUtils->IndexToOrdinalResource(aIndex, getter_AddRefs(ordinalResource));
mContainerUtils->IndexToOrdinalResource(aIndex + 1, getter_AddRefs(ordinalResource));
nsCOMPtr<nsIRDFNode> 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<nsIRDFResource> 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<nsIRDFResource> childProperty;
mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty));
NSLog(@"1");
nsCOMPtr<nsISimpleEnumerator> 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<nsISupports> supp;
while (hasMore && count < aIndex) {
childNodes->GetNext(getter_AddRefs(supp));
NSLog(@"4");
++count;
childNodes->HasMoreElements(&hasMore);
NSLog(@"5");
}
nsCOMPtr<nsIRDFResource> 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;
}

15
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;
}

14
chimera/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,17 +3,17 @@
<plist version="0.9">
<dict>
<key>IBDocumentLocation</key>
<string>7 130 480 309 0 0 1152 746 </string>
<string>91 273 480 309 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>124</key>
<string>431 537 170 180 0 0 1152 746 </string>
<key>160</key>
<string>478 70 195 666 0 0 1152 746 </string>
<string>572 326 195 666 0 0 1280 1002 </string>
<key>28</key>
<string>478 279 195 457 0 0 1152 746 </string>
<key>297</key>
<string>70 110 198 210 0 0 1152 746 </string>
<string>79 163 198 210 0 0 1280 1002 </string>
<key>314</key>
<string>271 139 198 180 0 0 1152 746 </string>
<key>336</key>
@ -23,9 +23,9 @@
<key>463</key>
<string>7 444 200 252 0 0 1152 746 </string>
<key>475</key>
<string>516 447 120 142 0 0 1152 746 </string>
<string>609 597 120 142 0 0 1280 1002 </string>
<key>56</key>
<string>404 484 343 68 0 0 1152 746 </string>
<string>498 634 343 68 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
<string>248.0</string>
@ -46,11 +46,11 @@
<key>IBOpenObjects</key>
<array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer>
<integer>56</integer>
</array>
<key>IBSystem Version</key>
<string>5Q125</string>
<string>5L21</string>
</dict>
</plist>

Двоичные данные
chimera/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

46
chimera/CHRDFOutlineViewDataSource.mm
Просмотреть файл

@ -148,16 +148,56 @@
nsCOMPtr<nsIRDFResource> resource = !aItem ? mRootResource : [aItem resource];
nsCOMPtr<nsIRDFResource> ordinalResource;
mContainerUtils->IndexToOrdinalResource(aIndex, getter_AddRefs(ordinalResource));
mContainerUtils->IndexToOrdinalResource(aIndex + 1, getter_AddRefs(ordinalResource));
nsCOMPtr<nsIRDFNode> 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<nsIRDFResource> 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<nsIRDFResource> childProperty;
mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty));
NSLog(@"1");
nsCOMPtr<nsISimpleEnumerator> 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<nsISupports> supp;
while (hasMore && count < aIndex) {
childNodes->GetNext(getter_AddRefs(supp));
NSLog(@"4");
++count;
childNodes->HasMoreElements(&hasMore);
NSLog(@"5");
}
nsCOMPtr<nsIRDFResource> 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;
}

15
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;
}

14
chimera/English.lproj/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,17 +3,17 @@
<plist version="0.9">
<dict>
<key>IBDocumentLocation</key>
<string>7 130 480 309 0 0 1152 746 </string>
<string>91 273 480 309 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>124</key>
<string>431 537 170 180 0 0 1152 746 </string>
<key>160</key>
<string>478 70 195 666 0 0 1152 746 </string>
<string>572 326 195 666 0 0 1280 1002 </string>
<key>28</key>
<string>478 279 195 457 0 0 1152 746 </string>
<key>297</key>
<string>70 110 198 210 0 0 1152 746 </string>
<string>79 163 198 210 0 0 1280 1002 </string>
<key>314</key>
<string>271 139 198 180 0 0 1152 746 </string>
<key>336</key>
@ -23,9 +23,9 @@
<key>463</key>
<string>7 444 200 252 0 0 1152 746 </string>
<key>475</key>
<string>516 447 120 142 0 0 1152 746 </string>
<string>609 597 120 142 0 0 1280 1002 </string>
<key>56</key>
<string>404 484 343 68 0 0 1152 746 </string>
<string>498 634 343 68 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
<string>248.0</string>
@ -46,11 +46,11 @@
<key>IBOpenObjects</key>
<array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer>
<integer>56</integer>
</array>
<key>IBSystem Version</key>
<string>5Q125</string>
<string>5L21</string>
</dict>
</plist>

Двоичные данные
chimera/English.lproj/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

15
chimera/resources/localized/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;
}

14
chimera/resources/localized/English.lproj/BrowserWindow.nib/info.nib сгенерированный
Просмотреть файл

@ -3,17 +3,17 @@
<plist version="0.9">
<dict>
<key>IBDocumentLocation</key>
<string>7 130 480 309 0 0 1152 746 </string>
<string>91 273 480 309 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>124</key>
<string>431 537 170 180 0 0 1152 746 </string>
<key>160</key>
<string>478 70 195 666 0 0 1152 746 </string>
<string>572 326 195 666 0 0 1280 1002 </string>
<key>28</key>
<string>478 279 195 457 0 0 1152 746 </string>
<key>297</key>
<string>70 110 198 210 0 0 1152 746 </string>
<string>79 163 198 210 0 0 1280 1002 </string>
<key>314</key>
<string>271 139 198 180 0 0 1152 746 </string>
<key>336</key>
@ -23,9 +23,9 @@
<key>463</key>
<string>7 444 200 252 0 0 1152 746 </string>
<key>475</key>
<string>516 447 120 142 0 0 1152 746 </string>
<string>609 597 120 142 0 0 1280 1002 </string>
<key>56</key>
<string>404 484 343 68 0 0 1152 746 </string>
<string>498 634 343 68 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
<string>248.0</string>
@ -46,11 +46,11 @@
<key>IBOpenObjects</key>
<array>
<integer>475</integer>
<integer>56</integer>
<integer>297</integer>
<integer>160</integer>
<integer>56</integer>
</array>
<key>IBSystem Version</key>
<string>5Q125</string>
<string>5L21</string>
</dict>
</plist>

Двоичные данные
chimera/resources/localized/English.lproj/BrowserWindow.nib/objects.nib сгенерированный
Просмотреть файл

Двоичный файл не отображается.

46
chimera/src/extensions/RDFOutlineViewDataSource.mm
Просмотреть файл

@ -148,16 +148,56 @@
nsCOMPtr<nsIRDFResource> resource = !aItem ? mRootResource : [aItem resource];
nsCOMPtr<nsIRDFResource> ordinalResource;
mContainerUtils->IndexToOrdinalResource(aIndex, getter_AddRefs(ordinalResource));
mContainerUtils->IndexToOrdinalResource(aIndex + 1, getter_AddRefs(ordinalResource));
nsCOMPtr<nsIRDFNode> 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<nsIRDFResource> 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<nsIRDFResource> childProperty;
mRDFService->GetResource("http://home.netscape.com/NC-rdf#child", getter_AddRefs(childProperty));
NSLog(@"1");
nsCOMPtr<nsISimpleEnumerator> 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<nsISupports> supp;
while (hasMore && count < aIndex) {
childNodes->GetNext(getter_AddRefs(supp));
NSLog(@"4");
++count;
childNodes->HasMoreElements(&hasMore);
NSLog(@"5");
}
nsCOMPtr<nsIRDFResource> 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;
}