From 51f8215dae6196e2f2f85b31a1d2f3986de68406 Mon Sep 17 00:00:00 2001
From: "pinkerton%netscape.com" <pinkerton%netscape.com>
Date: Fri, 7 Mar 2003 03:06:47 +0000
Subject: [PATCH] More changes for in-window bookmarks. bookmarks display and
 can be edited, buttons hooked up. Still off by default.

---
 .../BrowserWindow.nib/classes.nib             |  14 +++
 .../English.lproj/BrowserWindow.nib/info.nib  |   2 +-
 .../BrowserWindow.nib/objects.nib             | Bin 22211 -> 22864 bytes
 camino/src/bookmarks/BookmarksDataSource.mm   |  12 +-
 camino/src/browser/BrowserWindowController.h  |  31 ++++++
 camino/src/browser/BrowserWindowController.mm | 104 +++++++++++++++++-
 6 files changed, 156 insertions(+), 7 deletions(-)

diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
index 2a7e6c72386..a0d4d6ad3a0 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
@@ -10,6 +10,19 @@
         }, 
         {CLASS = BookmarkItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {CLASS = BookmarkManagerView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
+        {
+            CLASS = BookmarksController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                mAddFolderButton = NSButton; 
+                mAddItemButton = NSButton; 
+                mContainersSplit = NSSplitView; 
+                mItemPane = NSOutlineView; 
+                mItemSearchSplit = NSSplitView; 
+                mSearchPane = NSTableView; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
         {
             ACTIONS = {
                 addBookmark = id; 
@@ -118,6 +131,7 @@
                 mAddBookmarkSheetWindow = NSWindow; 
                 mAddBookmarkTitleField = NSTextField; 
                 mBackItem = NSMenuItem; 
+                mBookmarksController = BookmarksController; 
                 mContentView = BrowserContentView; 
                 mCopyItem = NSMenuItem; 
                 mForwardItem = NSMenuItem; 
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index 52885259ebf..4908f4f2f1b 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -27,7 +27,7 @@
 		<key>654</key>
 		<string>159 629 198 144 0 0 1280 832 </string>
 		<key>731</key>
-		<string>265 306 654 459 0 0 1280 832 </string>
+		<string>313 341 654 459 0 0 1280 832 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>291.0</string>
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib
index dd2cad8897f35d9b023763dacd71fee5bc6cc02d..735ebe7a6984d0d948764b65d7663b4ffe8463de 100644
GIT binary patch
literal 22864
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
E0bC?jE&u=k

literal 22211
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
Au>b%7

diff --git a/camino/src/bookmarks/BookmarksDataSource.mm b/camino/src/bookmarks/BookmarksDataSource.mm
index 759e08863e6..e0211ec9f14 100644
--- a/camino/src/bookmarks/BookmarksDataSource.mm
+++ b/camino/src/bookmarks/BookmarksDataSource.mm
@@ -525,6 +525,7 @@ const int kBookmarksRootItemTag = -2;
 // Called by the outliner to determine whether or not we should allow the 
 // user to edit this item. We're leaving it off for now, becaue there are
 // some usability issues with inline editing (no undo, Escape doesn't work).
+//
 - (BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item
 {
   return NO;	//([[tableColumn identifier] isEqualToString:@"name"]);
@@ -579,7 +580,7 @@ const int kBookmarksRootItemTag = -2;
   if (!mRegisteredClient) return nil;
 
   NSString *columnName = [tableColumn identifier];
-  NSMutableAttributedString *cellValue = nil;
+  id retValue = nil;
 
   if ([columnName isEqualToString: @"name"])
   {
@@ -588,7 +589,7 @@ const int kBookmarksRootItemTag = -2;
 
       //Set cell's textual contents
       //[cellValue replaceCharactersInRange:NSMakeRange(0, [cellValue length]) withString:[NSString stringWith_nsAString: nameAttr]];
-      cellValue = [[[NSMutableAttributedString alloc] initWithString:[item name]] autorelease];
+      NSMutableAttributedString* cellValue = [[[NSMutableAttributedString alloc] initWithString:[item name]] autorelease];
       
       //Create an attributed string to hold the empty attachment, then release the components.
       NSMutableAttributedString* attachmentAttrString = [NSMutableAttributedString attributedStringWithAttachment:textAttachment];
@@ -608,8 +609,13 @@ const int kBookmarksRootItemTag = -2;
       [cellValue addAttribute:NSBaselineOffsetAttributeName
                         value:[NSNumber numberWithFloat:-3.0]
                         range:NSMakeRange(0, 1)];
+      retValue = cellValue;
   }
-  return cellValue;
+  else if ([columnName isEqualToString: @"url"])
+  {
+      retValue = [item url];
+  }
+  return retValue;
 }
 
 - (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
diff --git a/camino/src/browser/BrowserWindowController.h b/camino/src/browser/BrowserWindowController.h
index 343aeba8fee..5a4d402cedc 100644
--- a/camino/src/browser/BrowserWindowController.h
+++ b/camino/src/browser/BrowserWindowController.h
@@ -78,6 +78,36 @@ class nsIDOMNode;
 
 @end
 
+#pragma mark -
+
+@interface BookmarksController : NSObject
+{
+  IBOutlet NSButton* mAddItemButton;
+  IBOutlet NSButton* mAddFolderButton;
+  
+  IBOutlet NSSplitView* mContainersSplit;       // vertical split
+  IBOutlet NSSplitView* mItemSearchSplit;       // horizontal split
+  IBOutlet NSOutlineView* mItemPane;
+  IBOutlet NSTableView* mSearchPane;            // shows search results, can be hidden
+}
+
+// Set focus to something in the bookmark manager view
+- (void) focus;
+
+- (void) windowDidLoad;
+
+// NSSplitView delegate methods
+//- (void)splitView:(NSSplitView *)sender resizeSubviewsWithOldSize:(NSSize)oldSize;
+- (float)splitView:(NSSplitView *)sender constrainMinCoordinate:(float)proposedCoord ofSubviewAt:(int)offset;
+//- (float)splitView:(NSSplitView *)sender constrainMaxCoordinate:(float)proposedCoord ofSubviewAt:(int)offset;
+//- (void)splitViewWillResizeSubviews:(NSNotification *)notification;
+- (void)splitViewDidResizeSubviews:(NSNotification *)notification;
+- (BOOL)splitView:(NSSplitView *)sender canCollapseSubview:(NSView *)subview;
+//- (float)splitView:(NSSplitView *)splitView constrainSplitPosition:(float)proposedPosition ofSubviewAt:(int)index;
+
+@end
+
+#pragma mark -
 
 typedef enum
 {
@@ -114,6 +144,7 @@ typedef enum
   
   IBOutlet BookmarksDataSource* mSidebarBookmarksDataSource;
   IBOutlet HistoryDataSource*   mHistoryDataSource;
+  IBOutlet BookmarksController* mBookmarksController;
 
   IBOutlet BookmarksToolbar*    mPersonalToolbar;
 
diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm
index e5d34d61a0b..02a1f6ccf8d 100644
--- a/camino/src/browser/BrowserWindowController.mm
+++ b/camino/src/browser/BrowserWindowController.mm
@@ -449,6 +449,9 @@ static NSArray* sToolbarDefaults = nil;
         [[self window] setFrameTopLeftPoint:topLeft];
       }
     }
+    
+    // let the in-window bookmark controller finish up some initialization
+    [mBookmarksController windowDidLoad];
 }
 
 - (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
@@ -1522,7 +1525,6 @@ static NSArray* sToolbarDefaults = nil;
 
 - (void)tabView:(NSTabView *)aTabView didSelectTabViewItem:(NSTabViewItem *)aTabViewItem
 {
-NSLog(@"Notify: did select %@", [aTabViewItem label]);
   // we'll get called for the sidebar tabs as well. ignore any calls coming from
   // there, we're only interested in the browser tabs.
   if (aTabView != mTabBrowser)
@@ -2124,11 +2126,15 @@ NSLog(@"Notify: did select %@", [aTabViewItem label]);
   
   // swap out between content and bookmarks.
 	[mContentView toggleBookmarkManager:sender];
-
+//XXXXXX needed until we can turn this on full time, since it's a nib change. 
+mSidebarBookmarksDataSource->mOutlineView = mBookmarksController->mItemPane; 
+  [mSidebarBookmarksDataSource ensureBookmarks];
+  
   // if we're now showing the bm manager, force it to have focus,
   // otherwise give focus back to gecko.
   if ( [mContentView isBookmarkManagerVisible] ) {
-    //XXX set focus to appropriate area of bm manager
+    // set focus to appropriate area of bm manager
+    [mBookmarksController focus];
   }
   else {
     CHBrowserView* browserView = [mBrowserView getBrowserView];
@@ -2255,3 +2261,95 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par
 
 @end
 
+#pragma mark -
+
+@implementation BookmarksController
+
+#if 0
+- (id) init
+{
+  if ( self = [super init] )
+  {
+    mAddItemButton = nil;
+  }
+  return self;
+}
+#endif
+
+//
+// - splitViewDidResizeSubviews:
+//
+// Called when one of the views got resized. We want to ensure that the "add bookmark
+// item" button gets lined up with the left edge of the item panel. If the container/item
+// split was the one that changed, move it accordingly
+//
+- (void)splitViewDidResizeSubviews:(NSNotification *)notification
+{
+  const int kButtonGutter = 8;
+  
+  if ( [notification object] == mContainersSplit ) {
+    // get the position of the item view relative to the window and set the button
+    // to that X value. Yes, this will fall down if the bookmark view is inset from the window
+    // but i think we can safely assume it won't be.
+    NSRect windowRect = [mItemPane convertRect:[mItemPane bounds] toView:nil];
+    NSRect newButtonLocation = [mAddItemButton frame];
+    newButtonLocation.origin.x = windowRect.origin.x;
+    [mAddItemButton setFrame:newButtonLocation];
+    [mAddItemButton setNeedsDisplay:YES];
+    
+    // offset by the width of the button and the gutter and we've got the location
+    // of the add folder button next to it.
+    newButtonLocation.origin.x += newButtonLocation.size.width + kButtonGutter;
+    [mAddFolderButton setFrame:newButtonLocation];
+    [mAddFolderButton setNeedsDisplay:YES];
+  }
+}
+
+//
+// - splitView:canCollapseSubview:
+//
+// Called when appkit wants to ask if it can collapse a subview. The only subview
+// of our splits that we allow to be hidden is the search panel.
+//
+- (BOOL)splitView:(NSSplitView *)sender canCollapseSubview:(NSView *)subview
+{
+  BOOL retVal = NO;
+  // subview will be a NSScrollView, so we have to get the superview of the
+  // search pane for comparison.
+  if ( sender == mItemSearchSplit && subview == [mSearchPane superview] )
+    retVal = YES;
+  return retVal;
+}
+
+- (void)windowDidLoad
+{
+  // hide the search panel
+  
+  // set up the font on the item view to be smaller
+  NSArray* columns = [mItemPane tableColumns];
+  if ( columns ) {
+    int numColumns = [columns count];
+    NSFont* smallerFont = [NSFont systemFontOfSize:11];
+    NSLog(@"font is %@", smallerFont);
+    for ( int i = 0; i < numColumns; ++i )
+      [[[columns objectAtIndex:i] dataCell] setFont:smallerFont];
+  }
+}
+
+
+- (float)splitView:(NSSplitView *)sender constrainMinCoordinate:(float)proposedCoord ofSubviewAt:(int)offset
+{
+  const int kMinimumContainerSplitWidth = 150;
+  float retVal = proposedCoord;
+  if ( sender == mContainersSplit )
+    retVal = kMinimumContainerSplitWidth;
+  return retVal;
+}
+
+- (void) focus
+{
+  [[mItemPane window] makeFirstResponder:mItemPane];
+}
+
+@end
+