Diff for /chimera/BrowserWindowController.mm between versions 1.49 and 1.56

version 1.49, 2002/03/11 03:41:42 version 1.56, 2002/04/08 23:33:41
Line 37 Line 37
   
 #import "BrowserWindowController.h"  #import "BrowserWindowController.h"
 #import "MyBrowserView.h"  #import "MyBrowserView.h"
   #import "IconTabViewItem.h"
   
 #include "nsIWebNavigation.h"  #include "nsIWebNavigation.h"
   #include "nsCocoaBrowserService.h"
   
 static NSString *BrowserToolbarIdentifier       = @"Browser Window Toolbar";  static NSString *BrowserToolbarIdentifier       = @"Browser Window Toolbar";
 static NSString *BackToolbarItemIdentifier      = @"Back Toolbar Item";  static NSString *BackToolbarItemIdentifier      = @"Back Toolbar Item";
Line 52  static NSString *PrintToolbarItemIdentif Line 54  static NSString *PrintToolbarItemIdentif
   
 @interface BrowserWindowController(Private)  @interface BrowserWindowController(Private)
 - (void)setupToolbar;  - (void)setupToolbar;
   - (void)setupSidebarTabs;
 @end  @end
   
 @implementation BrowserWindowController  @implementation BrowserWindowController
Line 79  static NSString *PrintToolbarItemIdentif Line 82  static NSString *PrintToolbarItemIdentif
 - (id)initWithWindowNibName:(NSString *)windowNibName  - (id)initWithWindowNibName:(NSString *)windowNibName
 {  {
     if ( (self = [super initWithWindowNibName:(NSString *)windowNibName]) ) {      if ( (self = [super initWithWindowNibName:(NSString *)windowNibName]) ) {
           if ( nsCocoaBrowserService::sNumBrowsers == 0 ) {
               [self setShouldCascadeWindows:NO];
           } else {
               [self setShouldCascadeWindows:YES];
           }
         mInitialized = NO;          mInitialized = NO;
         mMoveReentrant = NO;          mMoveReentrant = NO;
         mShouldAutosave = YES;          mShouldAutosave = YES;
Line 157  static NSString *PrintToolbarItemIdentif Line 165  static NSString *PrintToolbarItemIdentif
     }      }
           
     [mSidebarDrawer setDelegate: self];      [mSidebarDrawer setDelegate: self];
   
       [self setupSidebarTabs];
 }  }
   
 - (void)drawerWillOpen: (NSNotification*)aNotification  - (void)drawerWillOpen: (NSNotification*)aNotification
Line 167  static NSString *PrintToolbarItemIdentif Line 177  static NSString *PrintToolbarItemIdentif
 - (void)drawerDidOpen:(NSNotification *)aNotification  - (void)drawerDidOpen:(NSNotification *)aNotification
 {  {
     // XXXdwh This is temporary.      // XXXdwh This is temporary.
    [[mSidebarBrowserView getBrowserView] loadURI: [NSURL URLWithString: @"http://tinderbox.mozilla.org/SeaMonkey/panel.html"] flags:NSLoadFlagsNone];  //  [[mSidebarBrowserView getBrowserView] loadURI: [NSURL URLWithString: @"http://tinderbox.mozilla.org/SeaMonkey/panel.html"] flags:NSLoadFlagsNone];
     [mSidebarToolbarItem setImage:[NSImage imageNamed:@"sidebarOpened"]];
 }  }
   
 - (void)drawerDidClose:(NSNotification *)aNotification  - (void)drawerDidClose:(NSNotification *)aNotification
 {  {
     // Unload the Gecko web page in "My Panels" to save memory.      // Unload the Gecko web page in "My Panels" to save memory.
    [[mSidebarBrowserView getBrowserView] loadURI: [NSURL URLWithString: @"about:blank"] flags:NSLoadFlagsNone];    [mSidebarToolbarItem setImage:[NSImage imageNamed:@"sidebarClosed"]];
   //  [[mSidebarBrowserView getBrowserView] loadURI: [NSURL URLWithString: @"about:blank"] flags:NSLoadFlagsNone];
 }  }
   
 - (void)setupToolbar  - (void)setupToolbar
Line 261  static NSString *PrintToolbarItemIdentif Line 273  static NSString *PrintToolbarItemIdentif
         [toolbarItem setLabel:@"Sidebar"];          [toolbarItem setLabel:@"Sidebar"];
         [toolbarItem setPaletteLabel:@"Toggle Sidebar"];          [toolbarItem setPaletteLabel:@"Toggle Sidebar"];
         [toolbarItem setToolTip:@"Show or hide the Sidebar"];          [toolbarItem setToolTip:@"Show or hide the Sidebar"];
        [toolbarItem setImage:[NSImage imageNamed:@"sidebar"]];        [toolbarItem setImage:[NSImage imageNamed:@"sidebarClosed"]];
         [toolbarItem setTarget:self];          [toolbarItem setTarget:self];
         [toolbarItem setAction:@selector(toggleSidebar:)];          [toolbarItem setAction:@selector(toggleSidebar:)];
           mSidebarToolbarItem = toolbarItem;
     } else if ( [itemIdent isEqual:LocationToolbarItemIdentifier] ) {      } else if ( [itemIdent isEqual:LocationToolbarItemIdentifier] ) {
                   
         NSMenuItem *menuFormRep = [[[NSMenuItem alloc] init] autorelease];          NSMenuItem *menuFormRep = [[[NSMenuItem alloc] init] autorelease];
Line 379  static NSString *PrintToolbarItemIdentif Line 392  static NSString *PrintToolbarItemIdentif
     [[mBrowserView getBrowserView] printPreview];      [[mBrowserView getBrowserView] printPreview];
 }  }
   
- (void)findInPage- (void)findInPage:(NSString*)text
 {  {
    [[mBrowserView getBrowserView] findInPage];    [[mBrowserView getBrowserView] findInPage:text];
 }  }
   
 - (void)findAgain  - (void)findAgain
Line 437  static NSString *PrintToolbarItemIdentif Line 450  static NSString *PrintToolbarItemIdentif
     [[self window] makeFirstResponder: resp];      [[self window] makeFirstResponder: resp];
 }  }
   
   
 -(void)loadURL:(NSURL*)aURL  -(void)loadURL:(NSURL*)aURL
 {  {
     if (mInitialized) {      if (mInitialized) {
Line 564  static NSString *PrintToolbarItemIdentif Line 578  static NSString *PrintToolbarItemIdentif
                   
     // XXXdwh Focus the content area.      // XXXdwh Focus the content area.
 }  }
   
   -(void)setupSidebarTabs
   {
       IconTabViewItem   *bookItem = [[IconTabViewItem alloc] initWithIdentifier:@"bookmarkSidebarIconTabViewItem"
                                     withTabIcon:[NSImage imageNamed:@"bookicon"]];
       IconTabViewItem   *histItem = [[IconTabViewItem alloc] initWithIdentifier:@"historySidebarIconTabViewItem"
                                     withTabIcon:[NSImage imageNamed:@"historyicon"]];
       IconTabViewItem *searchItem = [[IconTabViewItem alloc] initWithIdentifier:@"searchSidebarIconTabViewItem"
                                     withTabIcon:[NSImage imageNamed:@"searchicon"]];
   
       [bookItem   setView:[[mSidebarSourceTabView tabViewItemAtIndex:0] view]];
       [histItem   setView:[[mSidebarSourceTabView tabViewItemAtIndex:1] view]];
       [searchItem setView:[[mSidebarSourceTabView tabViewItemAtIndex:2] view]];
   
       [mSidebarTabView insertTabViewItem:bookItem   atIndex:0];
       [mSidebarTabView insertTabViewItem:histItem   atIndex:1];
       [mSidebarTabView insertTabViewItem:searchItem atIndex:2];
   
       [mSidebarTabView selectFirstTabViewItem:self];
   }
   
   
 @end  @end
   

Removed from v.1.49  
changed lines
  Added in v.1.56


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