[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:11:52 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0180514d64d33c934a4863e1e2dcb0187d08fe8c
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri May 10 01:35:00 2002 +0000
* Bookmarks.subproj/IFBookmarkGroup.h:
* Bookmarks.subproj/IFBookmarkGroup.m:
(-[IFBookmarkGroup addNewBookmarkToBookmark:withTitle:image:URLString:isLeaf:]):
(-[IFBookmarkGroup insertNewBookmarkAtIndex:ofBookmark:withTitle:image:URLString:isLeaf:]):
Gave these two methods return values of the new bookmark created, to make callers'
lives easier.
More work on bookmarks; you can now create new ones and new folders
from the Bookmarks window. You still can't reorder them by dragging.
There are many details wrong still, including some obvious ones.
Fixed these radar bugs along the way:
2921389 -- No way to create a folder in Bookmarks window
2923495 -- Shouldn't be able to create bookmarks with no title and/or URL string
Also improved what Activity Viewer shows for errors that had no description
(was "(null)", now is "error").
* AppController.m:
(-[AppController _insertBookmark:intoMenu:atIndex:]):
Made this method handle non-leaf bookmarks (i.e., folders)
* BookmarksController.m:
(-[BookmarksController _collapseSelectionToSingleRow]):
New helper routine that always ends up with a single row
selected (unless outline view is empty).
(-[BookmarksController _removeSelectedBookmarks:]):
Call _collapseSelectionToSingleRow after removing selected items.
(-[BookmarksController _toggleEdit:]):
New method, turns edit mode on or off for the selected item.
(-[BookmarksController _findParentRowOfRow:]):
New helper routine for finding the row index that's the parent of
a given row.
(-[BookmarksController _newItemWithTitle:image:URLString:isLeaf:]):
Bottleneck for new-item-creating methods, finds appropriate place to
insert new item based on current selection, inserts it, selects it,
and puts its name into edit mode.
(-[BookmarksController _newSeparator:]):
New method, placeholder for now.
(-[BookmarksController _newFolder:]):
(-[BookmarksController _newBookmark:]):
Implement by calling _newItemWithTitle:
(-[BookmarksController outlineView:setObjectValue:forTableColumn:byItem:]):
If new value after trimming whitespace is empty, ignore it.
(-[BookmarksController outlineView:shouldEditTableColumn:item:]):
Don't allow address cell of folder rows to be edited.
(-[BookmarksController toolbarAllowedItemIdentifiers:]):
New set of buttons is: New Bookmark, New Folder, Modify, Remove
(-[BookmarksController validateUserInterfaceItem:]):
Disable Modify when nothing is selected.
* English.lproj/Bookmarks.nib:
I don't remember what I changed here, possibly nothing real.
* IFErrorAdditions.h: Added.
* IFErrorAdditions.m: Added.
(-[IFError errorSummary]): New category on IFError, implements just this
one method, which returns a string of the form "<error description> (<error code>)"
and handles the case where there's no description.
* FrameProgressEntry.m:
(-[FrameProgressEntry statusString]): use errorSummary.
* ResourceProgressEntry.m:
(-[ResourceProgressEntry statusString]): use errorSummary.
* GlobalHistory.m:
(-[GlobalHistory showWindow:]): Changed an NSLog to a WEBKITDEBUG
* WebBrowser.pbproj/project.pbxproj: Updated for new files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1123 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkGroup.h b/WebKit/Bookmarks.subproj/IFBookmarkGroup.h
index c2627b0..c631ea4 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkGroup.h
+++ b/WebKit/Bookmarks.subproj/IFBookmarkGroup.h
@@ -40,17 +40,17 @@
ofBookmark:(IFBookmark *)parent;
- (void)removeBookmark:(IFBookmark *)bookmark;
-- (void)insertNewBookmarkAtIndex:(unsigned)index
- ofBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- isLeaf:(BOOL)flag;
-- (void)addNewBookmarkToBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- isLeaf:(BOOL)flag;
+- (IFBookmark *)insertNewBookmarkAtIndex:(unsigned)index
+ ofBookmark:(IFBookmark *)parent
+ withTitle:(NSString *)newTitle
+ image:(NSImage *)newImage
+ URLString:(NSString *)newURLString
+ isLeaf:(BOOL)flag;
+- (IFBookmark *)addNewBookmarkToBookmark:(IFBookmark *)parent
+ withTitle:(NSString *)newTitle
+ image:(NSImage *)newImage
+ URLString:(NSString *)newURLString
+ isLeaf:(BOOL)flag;
// storing contents on disk
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkGroup.m b/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
index 73696a9..4b041fd 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
@@ -133,26 +133,26 @@
}
}
-- (void)addNewBookmarkToBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- isLeaf:(BOOL)flag
+- (IFBookmark *)addNewBookmarkToBookmark:(IFBookmark *)parent
+ withTitle:(NSString *)newTitle
+ image:(NSImage *)newImage
+ URLString:(NSString *)newURLString
+ isLeaf:(BOOL)flag
{
- [self insertNewBookmarkAtIndex:[parent numberOfChildren]
- ofBookmark:parent
- withTitle:newTitle
- image:newImage
- URLString:newURLString
- isLeaf:flag];
+ return [self insertNewBookmarkAtIndex:[parent numberOfChildren]
+ ofBookmark:parent
+ withTitle:newTitle
+ image:newImage
+ URLString:newURLString
+ isLeaf:flag];
}
-- (void)insertNewBookmarkAtIndex:(unsigned)index
- ofBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- isLeaf:(BOOL)flag
+- (IFBookmark *)insertNewBookmarkAtIndex:(unsigned)index
+ ofBookmark:(IFBookmark *)parent
+ withTitle:(NSString *)newTitle
+ image:(NSImage *)newImage
+ URLString:(NSString *)newURLString
+ isLeaf:(BOOL)flag
{
IFBookmark *bookmark;
@@ -172,6 +172,8 @@
}
[parent insertChild:bookmark atIndex:index];
+
+ return bookmark;
}
- (NSString *)file
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.h b/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
index c2627b0..c631ea4 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.h
@@ -40,17 +40,17 @@
ofBookmark:(IFBookmark *)parent;
- (void)removeBookmark:(IFBookmark *)bookmark;
-- (void)insertNewBookmarkAtIndex:(unsigned)index
- ofBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- isLeaf:(BOOL)flag;
-- (void)addNewBookmarkToBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- isLeaf:(BOOL)flag;
+- (IFBookmark *)insertNewBookmarkAtIndex:(unsigned)index
+ ofBookmark:(IFBookmark *)parent
+ withTitle:(NSString *)newTitle
+ image:(NSImage *)newImage
+ URLString:(NSString *)newURLString
+ isLeaf:(BOOL)flag;
+- (IFBookmark *)addNewBookmarkToBookmark:(IFBookmark *)parent
+ withTitle:(NSString *)newTitle
+ image:(NSImage *)newImage
+ URLString:(NSString *)newURLString
+ isLeaf:(BOOL)flag;
// storing contents on disk
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index 73696a9..4b041fd 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -133,26 +133,26 @@
}
}
-- (void)addNewBookmarkToBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- isLeaf:(BOOL)flag
+- (IFBookmark *)addNewBookmarkToBookmark:(IFBookmark *)parent
+ withTitle:(NSString *)newTitle
+ image:(NSImage *)newImage
+ URLString:(NSString *)newURLString
+ isLeaf:(BOOL)flag
{
- [self insertNewBookmarkAtIndex:[parent numberOfChildren]
- ofBookmark:parent
- withTitle:newTitle
- image:newImage
- URLString:newURLString
- isLeaf:flag];
+ return [self insertNewBookmarkAtIndex:[parent numberOfChildren]
+ ofBookmark:parent
+ withTitle:newTitle
+ image:newImage
+ URLString:newURLString
+ isLeaf:flag];
}
-- (void)insertNewBookmarkAtIndex:(unsigned)index
- ofBookmark:(IFBookmark *)parent
- withTitle:(NSString *)newTitle
- image:(NSImage *)newImage
- URLString:(NSString *)newURLString
- isLeaf:(BOOL)flag
+- (IFBookmark *)insertNewBookmarkAtIndex:(unsigned)index
+ ofBookmark:(IFBookmark *)parent
+ withTitle:(NSString *)newTitle
+ image:(NSImage *)newImage
+ URLString:(NSString *)newURLString
+ isLeaf:(BOOL)flag
{
IFBookmark *bookmark;
@@ -172,6 +172,8 @@
}
[parent insertChild:bookmark atIndex:index];
+
+ return bookmark;
}
- (NSString *)file
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8832f12..10aa898 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-09 John Sullivan <sullivan at apple.com>
+
+ * Bookmarks.subproj/IFBookmarkGroup.h:
+ * Bookmarks.subproj/IFBookmarkGroup.m:
+ (-[IFBookmarkGroup addNewBookmarkToBookmark:withTitle:image:URLString:isLeaf:]):
+ (-[IFBookmarkGroup insertNewBookmarkAtIndex:ofBookmark:withTitle:image:URLString:isLeaf:]):
+ Gave these two methods return values of the new bookmark created, to make callers'
+ lives easier.
+
=== Alexander-3 ===
2002-05-08 Richard J. Williamson <rjw at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8832f12..10aa898 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-05-09 John Sullivan <sullivan at apple.com>
+
+ * Bookmarks.subproj/IFBookmarkGroup.h:
+ * Bookmarks.subproj/IFBookmarkGroup.m:
+ (-[IFBookmarkGroup addNewBookmarkToBookmark:withTitle:image:URLString:isLeaf:]):
+ (-[IFBookmarkGroup insertNewBookmarkAtIndex:ofBookmark:withTitle:image:URLString:isLeaf:]):
+ Gave these two methods return values of the new bookmark created, to make callers'
+ lives easier.
+
=== Alexander-3 ===
2002-05-08 Richard J. Williamson <rjw at apple.com>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list