Diff for /chimera/BookmarksService.mm between versions 1.11 and 1.18

version 1.11, 2002/02/11 10:23:03 version 1.18, 2002/04/12 08:45:17
Line 1 Line 1
/*/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 *  BookmarksService.cpp/* ***** BEGIN LICENSE BLOCK *****
 *  Chimera * Version: NPL 1.1/GPL 2.0/LGPL 2.1
  *   *
 *  Created by David Hyatt on Thu Feb 07 2002. * The contents of this file are subject to the Netscape Public License
 *  Copyright (c) 2001 __MyCompanyName__. All rights reserved. * Version 1.1 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
  * http://www.mozilla.org/NPL/
  *   *
 */ * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
  * for the specific language governing rights and limitations under the
  * License.
  *
  * The Original Code is mozilla.org code.
  *
  * The Initial Developer of the Original Code is 
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 2002
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or 
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the NPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the NPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
   
 #import "NSBrowserView.h"  #import "NSBrowserView.h"
 #include "BookmarksService.h"  #include "BookmarksService.h"
Line 85 Line 113
                             getter_AddRefs(elt));                              getter_AddRefs(elt));
           
     // Fetch the title of the current page and the URL.      // Fetch the title of the current page and the URL.
    nsCOMPtr<nsIWebBrowser> webBrowser = getter_AddRefs([[mBrowserView getBrowserView] getWebBrowser]);    nsCOMPtr<nsIWebBrowser> webBrowser = getter_AddRefs([[[mBrowserWindowController getMyBrowserView] getBrowserView] getWebBrowser]);
     nsCOMPtr<nsIDOMWindow> window;      nsCOMPtr<nsIDOMWindow> window;
     webBrowser->GetContentDOMWindow(getter_AddRefs(window));      webBrowser->GetContentDOMWindow(getter_AddRefs(window));
     nsCOMPtr<nsIDOMDocument> htmlDoc;      nsCOMPtr<nsIDOMDocument> htmlDoc;
Line 96 Line 124
     if (pageDoc) {      if (pageDoc) {
         nsCOMPtr<nsIURI> url;          nsCOMPtr<nsIURI> url;
         pageDoc->GetDocumentURL(getter_AddRefs(url));          pageDoc->GetDocumentURL(getter_AddRefs(url));
        nsXPIDLCString spec;        nsCAutoString spec;
        url->GetSpec(getter_Copies(spec));        url->GetSpec(spec);
         href.AssignWithConversion(spec.get());          href.AssignWithConversion(spec.get());
     }      }
           
Line 167 Line 195
         if (!href.IsEmpty()) {          if (!href.IsEmpty()) {
             nsCAutoString cstr; cstr.AssignWithConversion(href);              nsCAutoString cstr; cstr.AssignWithConversion(href);
             NSString* url = [NSString stringWithCString: cstr.get()];              NSString* url = [NSString stringWithCString: cstr.get()];
            [[mBrowserView getBrowserView] loadURI:[NSURL URLWithString: url] flags:NSLoadFlagsNone];            [[[mBrowserWindowController getMyBrowserView] getBrowserView] loadURI:[NSURL URLWithString: url] flags:NSLoadFlagsNone];
             // Focus and activate our content area.
             [[[mBrowserWindowController getMyBrowserView] getBrowserView] setActive: YES];
         }          }
     }       } 
 }  }
Line 227 Line 257
   
 - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item  - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
 {  {
       NSString          *columnName = [tableColumn identifier];
     NSMutableAttributedString   *cellValue = [[NSMutableAttributedString alloc] init];      NSMutableAttributedString   *cellValue = [[NSMutableAttributedString alloc] init];
       NSFileWrapper       *fileWrapper = [[NSFileWrapper alloc] initRegularFileWithContents:nil];
       NSTextAttachment      *textAttachment = [[NSTextAttachment alloc] initWithFileWrapper:fileWrapper];
     NSMutableAttributedString   *attachmentAttrString = nil;      NSMutableAttributedString   *attachmentAttrString = nil;
    NSString                                    *columnName = [tableColumn identifier];    NSCell                                              *attachmentAttrStringCell;
    NSCell                                              *attachmentCell; 
   
    if ( item ) {    if ([columnName isEqualToString: @"name"]) {
        NSLog(@"%@", item);        nsIContent* content = [item contentNode];
        if ([columnName isEqualToString: @"name"]) {        nsAutoString nameAttr;
            nsIContent* content = [item contentNode];        content->GetAttr(kNameSpaceID_None, BookmarksService::gNameAtom, nameAttr);
            nsAutoString nameAttr;        nsCAutoString cStr; cStr.AssignWithConversion(nameAttr);
            content->GetAttr(kNameSpaceID_None, BookmarksService::gNameAtom, nameAttr);        
            nsCAutoString cStr; cStr.AssignWithConversion(nameAttr);        //Set cell's textual contents
                    [cellValue replaceCharactersInRange:NSMakeRange(0, [cellValue length])
        //set cell's textual contents                                 withString:[NSString stringWithCString: cStr.get()]];
            [cellValue replaceCharactersInRange:NSMakeRange(0, [cellValue length])        
                                     withString:[NSString stringWithCString: cStr.get()]];        //Create an attributed string to hold the empty attachment, then release the components.
                    attachmentAttrString = [[NSMutableAttributedString attributedStringWithAttachment:textAttachment] retain];
        //Add image to cell's text in front of the text.        [textAttachment release];
            NSFileWrapper *wrapper = [[NSFileWrapper alloc] initRegularFileWithContents:nil];        [fileWrapper release];
            NSTextAttachment *attachment = [[NSTextAttachment allocWithZone:NULL] initWithFileWrapper:wrapper];
            attachmentAttrString = [[NSMutableAttributedString attributedStringWithAttachment:attachment] retain];        //Get the cell of the text attachment.
            [attachment release];        attachmentAttrStringCell = (NSCell *)[(NSTextAttachment *)[attachmentAttrString attribute:NSAttachmentAttributeName
            [wrapper release];                                                                                          atIndex:0
                                                                                   effectiveRange:nil] attachmentCell];
            attachmentCell = (NSCell *)[(NSTextAttachment *)[attachmentAttrString attribute:NSAttachmentAttributeName        //Figure out which image to add, and set the cell's image.
                                                                                    atIndex:0        if ( [self outlineView:outlineView isItemExpandable:item] ) {
                                                                             effectiveRange:NULL] attachmentCell];            [attachmentAttrStringCell setImage:[NSImage imageNamed:@"folder"]];
        } else {
            [attachmentCell setImage:[NSImage imageNamed:@"folder"]];            [attachmentAttrStringCell setImage:[NSImage imageNamed:@"smallbookmark"]];
            [cellValue replaceCharactersInRange:NSMakeRange(0, 0) withAttributedString:attachmentAttrString]; 
            [cellValue addAttribute:NSBaselineOffsetAttributeName 
                              value:[NSNumber numberWithFloat:-3.0] 
                              range:NSMakeRange(0, 1)]; 
        //Done adding image 
         }          }
        return cellValue;        //Insert the image
    } else {        [cellValue replaceCharactersInRange:NSMakeRange(0, 0) withAttributedString:attachmentAttrString];
        return nil;        
         //Tweak the baseline to vertically center the text.
         [cellValue addAttribute:NSBaselineOffsetAttributeName
                           value:[NSNumber numberWithFloat:-3.0]
                           range:NSMakeRange(0, 1)];
     }      }
       return cellValue;
 }  }
   
 - (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item  - (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
Line 428  BookmarksService::AddObserver() Line 460  BookmarksService::AddObserver()
         NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileDir));          NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileDir));
         profileDir->Append("bookmarks.xml");          profileDir->Append("bookmarks.xml");
           
        nsXPIDLCString bookmarksFileURL;        nsCAutoString bookmarksFileURL;
        NS_GetURLSpecFromFile(profileDir, getter_Copies(bookmarksFileURL));        NS_GetURLSpecFromFile(profileDir, bookmarksFileURL);
                   
         nsCOMPtr<nsIURI> uri;          nsCOMPtr<nsIURI> uri;
         NS_NewURI(getter_AddRefs(uri), bookmarksFileURL.get());          NS_NewURI(getter_AddRefs(uri), bookmarksFileURL.get());
Line 548  BookmarksService::OpenMenuBookmark(Brows Line 580  BookmarksService::OpenMenuBookmark(Brows
           
     // Now load the URL in the window.      // Now load the URL in the window.
     [aController loadURL:[NSURL URLWithString: url]];      [aController loadURL:[NSURL URLWithString: url]];
       
       // Focus and activate our content area.
       [[[aController getMyBrowserView] getBrowserView] setActive: YES];
 }  }
   

Removed from v.1.11  
changed lines
  Added in v.1.18


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>