Commit 016203ef authored by sullivan's avatar sullivan
Browse files

WebKit:

	- removed small folder image used for bookmark lists; it is now
	up to clients to display an icon for bookmark lists.

        * Bookmarks.subproj/WebBookmarkList.h: Removed _icon ivar
        * Bookmarks.subproj/WebBookmarkList.m:
        (-[WebBookmarkList dealloc]): Don't release _icon
        (-[WebBookmarkList icon]): just return nil
        * Resources/bookmark_folder.tiff: Removed.
        * WebKit.pbproj/project.pbxproj: Updated for removed file.

WebBrowser:

	- made Favorites bar handle folder icons
	- made bookmarks view start with all top-level folders expanded
	- fixed bug where bookmarks outline would sometimes have horizontal
	scroll bar (which you couldn't get rid of)
	- fixed bug where bookmarks window (Debug menu) wouldn't start
	with outline view focused (so some menu items were disabled)

        * Resources/Images/folder16.tiff: Added. Small folder icon.
        * Resources/Images/folder32.tiff: Added. Bigger folder icon.
        * WebBrowser.pbproj/project.pbxproj: Updated for new images.

        * BookmarksController.m:
        (-[BookmarksController imageForBookmark:]): return small folder icon

        * BookmarksViewController.m:
        (-[BookmarksViewController expandTopLevelItems]): New method.
        (-[BookmarksViewController awakeFromNib]): Call expandTopLevelItems.

        * BookmarksWindowController.m:
        (-[BookmarksWindowController windowDidLoad]): set outline view as first responder;
	this handled in the mode-switching code in the bookmarks-in-browser-window case.

        * FavoriteButton.m:
        (-[FavoriteButton buttonImageFromBookmark]): New method, extracted from setBookmark
	and updated to handle large folder icons (will probably be consolidated with
	[BookmarksController imageForBookmark:] soon)
        (-[FavoriteButton setBookmark:]): call buttonImageFromBookmark


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1954 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent cd430f3e
......@@ -10,7 +10,6 @@
@interface WebBookmarkList : WebBookmark {
NSString *_title;
NSImage *_icon;
NSMutableArray *_list;
}
......
......@@ -97,7 +97,6 @@ - (NSDictionary *)dictionaryRepresentation
- (void)dealloc
{
[_title release];
[_icon release];
[_list release];
[super dealloc];
}
......@@ -139,25 +138,7 @@ - (void)setTitle:(NSString *)title
- (NSImage *)icon
{
static NSImage *defaultImage = nil;
static BOOL loadedDefaultImage = NO;
if (_icon != nil) {
return _icon;
}
// Attempt to load default image only once, to avoid performance penalty of repeatedly
// trying and failing to find it.
if (!loadedDefaultImage) {
NSString *pathForDefaultImage =
[[NSBundle bundleForClass:[self class]] pathForResource:@"bookmark_folder" ofType:@"tiff"];
if (pathForDefaultImage != nil) {
defaultImage = [[NSImage alloc] initByReferencingFile: pathForDefaultImage];
}
loadedDefaultImage = YES;
}
return defaultImage;
return nil;
}
- (WebBookmarkType)bookmarkType
......
2002-09-03 John Sullivan <sullivan@apple.com>
- removed small folder image used for bookmark lists; it is now
up to clients to display an icon for bookmark lists.
* Bookmarks.subproj/WebBookmarkList.h: Removed _icon ivar
* Bookmarks.subproj/WebBookmarkList.m:
(-[WebBookmarkList dealloc]): Don't release _icon
(-[WebBookmarkList icon]): just return nil
* Resources/bookmark_folder.tiff: Removed.
* WebKit.pbproj/project.pbxproj: Updated for removed file.
2002-09-03 Chris Blumenberg <cblu@apple.com>
- Moved the default icon method to WebIconDatabase
......
2002-09-03 John Sullivan <sullivan@apple.com>
- removed small folder image used for bookmark lists; it is now
up to clients to display an icon for bookmark lists.
* Bookmarks.subproj/WebBookmarkList.h: Removed _icon ivar
* Bookmarks.subproj/WebBookmarkList.m:
(-[WebBookmarkList dealloc]): Don't release _icon
(-[WebBookmarkList icon]): just return nil
* Resources/bookmark_folder.tiff: Removed.
* WebKit.pbproj/project.pbxproj: Updated for removed file.
2002-09-03 Chris Blumenberg <cblu@apple.com>
- Moved the default icon method to WebIconDatabase
......
......@@ -72,6 +72,7 @@
F58C8A07025BD3BC018635CA,
F531DDFF02F0C36F018635CA,
);
hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
......@@ -282,7 +283,6 @@
35F357800198AAB80ACA1520,
F5B67131023EDF8901C1A525,
F5883BDF025E5C6A01000102,
F599A818028C6D0D0124FDD6,
F8CA15C0029A39FC01000122,
);
isa = PBXResourcesBuildPhase;
......@@ -380,7 +380,6 @@
children = (
35F3577E0198AAB80ACA1520,
089C1666FE841158C02AAC07,
F599A817028C6D0D0124FDD6,
F5B67130023EDF8901C1A525,
F5883BDE025E5C6A01000102,
F5F732D202FF4D4F01A80180,
......@@ -1945,18 +1944,6 @@
settings = {
};
};
F599A817028C6D0D0124FDD6 = {
isa = PBXFileReference;
name = bookmark_folder.tiff;
path = Resources/bookmark_folder.tiff;
refType = 4;
};
F599A818028C6D0D0124FDD6 = {
fileRef = F599A817028C6D0D0124FDD6;
isa = PBXBuildFile;
settings = {
};
};
F59EAE3E0253C7EE018635CA = {
fileEncoding = 30;
isa = PBXFileReference;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment