Diff for /chimera/BrowserWindowController.mm between versions 1.31 and 1.34

version 1.31, 2002/02/12 01:47:57 version 1.34, 2002/02/21 08:59:58
Line 46  static NSString *PrintToolbarItemIdentif Line 46  static NSString *PrintToolbarItemIdentif
 - (void)windowDidLoad  - (void)windowDidLoad
 {  {
     mInitialized = YES;      mInitialized = YES;
       [[self window] setAcceptsMouseMovedEvents: YES];
       
     [self setupToolbar];      [self setupToolbar];
   
     // Our initial view is our primary view.  Connect it up.      // Our initial view is our primary view.  Connect it up.
Line 56  static NSString *PrintToolbarItemIdentif Line 58  static NSString *PrintToolbarItemIdentif
     [tab setView: newView];      [tab setView: newView];
     mBrowserView = newView;      mBrowserView = newView;
           
     [mBrowserView makePrimaryBrowserView: tab urlbar: mURLBar status: mStatus  
         progress: mProgress windowController: self];  
   
     if (mURL) {      if (mURL) {
       [self loadURL: mURL];        [self loadURL: mURL];
       [mURL release];        [mURL release];
     }      }
           
     [mSidebarDrawer setDelegate: self];      [mSidebarDrawer setDelegate: self];
       
       [mBrowserView makePrimaryBrowserView: tab urlbar: mURLBar status: mStatus
           progress: mProgress windowController: self];
 }  }
   
 - (void)drawerWillOpen: (NSNotification*)aNotification  - (void)drawerWillOpen: (NSNotification*)aNotification
Line 259  static NSString *PrintToolbarItemIdentif Line 261  static NSString *PrintToolbarItemIdentif
     [mLocationSheetWindow orderOut:self];      [mLocationSheetWindow orderOut:self];
     [NSApp endSheet:mLocationSheetWindow returnCode:1];      [NSApp endSheet:mLocationSheetWindow returnCode:1];
     [self loadURL:[NSURL URLWithString:[mLocationSheetURLField stringValue]]];      [self loadURL:[NSURL URLWithString:[mLocationSheetURLField stringValue]]];
       
       // Focus and activate our content area.
       [[mBrowserView getBrowserView] setActive: YES];
 }  }
   
 - (IBAction)goToLocationFromToolbarURLField:(id)sender  - (IBAction)goToLocationFromToolbarURLField:(id)sender
 {  {
     [self loadURL:[NSURL URLWithString:[sender stringValue]]];      [self loadURL:[NSURL URLWithString:[sender stringValue]]];
       
       // Focus and activate our content area.
       [[mBrowserView getBrowserView] setActive: YES];
 }  }
   
 - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList  - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList
Line 326  static NSString *PrintToolbarItemIdentif Line 334  static NSString *PrintToolbarItemIdentif
   
 - (IBAction)toggleSidebar:(id)aSender  - (IBAction)toggleSidebar:(id)aSender
 {  {
     NSLog(@"The sidebar drawer is: %@", mSidebarDrawer);  
     if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) )  {      if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) )  {
        NSLog(@"opening drawer");        // XXXHack to bypass sidebar crashes.
         [[self window] makeFirstResponder: nil];
         [mSidebarDrawer open];          [mSidebarDrawer open];
     } else {      } else {
         NSLog(@"closing drawer");  
         [mSidebarDrawer close];          [mSidebarDrawer close];
     }      }
 }  }
   
 -(void)loadURL:(NSURL*)aURL  -(void)loadURL:(NSURL*)aURL
 {  {
    if (mInitialized)    if (mInitialized) {
         [[mBrowserView getBrowserView] loadURI:aURL flags:NSLoadFlagsNone];          [[mBrowserView getBrowserView] loadURI:aURL flags:NSLoadFlagsNone];
       }
     else {      else {
         mURL = aURL;          mURL = aURL;
         [mURL retain];          [mURL retain];

Removed from v.1.31  
changed lines
  Added in v.1.34


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