Diff for /chimera/BrowserWindowController.mm between versions 1.45 and 1.47

version 1.45, 2002/03/08 01:43:01 version 1.47, 2002/03/08 03:18:00
Line 135  static NSString *PrintToolbarItemIdentif Line 135  static NSString *PrintToolbarItemIdentif
     }      }
           
     [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 451  static NSString *PrintToolbarItemIdentif Line 448  static NSString *PrintToolbarItemIdentif
 -(void)newTab  -(void)newTab
 {  {
     NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease];      NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease];
    MyBrowserView* newView = [[[MyBrowserView alloc] initWithFrame: [[newTab view] frame]] autorelease];    MyBrowserView* newView = [[[MyBrowserView alloc] initWithFrame: [mBrowserView frame]] autorelease];
     [newView setTab: newTab];
   
     [newTab setLabel: @"Untitled"];      [newTab setLabel: @"Untitled"];
     [newTab setView: newView];      [newTab setView: newView];
Line 498  static NSString *PrintToolbarItemIdentif Line 496  static NSString *PrintToolbarItemIdentif
     mBrowserView = [aTabViewItem view];      mBrowserView = [aTabViewItem view];
                 
     // Make the new view the primary content area.      // Make the new view the primary content area.
    [mBrowserView makePrimaryBrowserView: aTabViewItem urlbar: mURLBar status: mStatus    [mBrowserView makePrimaryBrowserView: mURLBar status: mStatus
         progress: mProgress windowController: self];          progress: mProgress windowController: self];
 }  }
   
Line 511  static NSString *PrintToolbarItemIdentif Line 509  static NSString *PrintToolbarItemIdentif
 {  {
     BrowserWindowController* browser = [[BrowserWindowController alloc] initWithWindowNibName: @"BrowserWindow"];      BrowserWindowController* browser = [[BrowserWindowController alloc] initWithWindowNibName: @"BrowserWindow"];
     [browser loadURL: aURL];      [browser loadURL: aURL];
        [browser showWindow: self];    if (aLoadInBG)
       [[browser window] orderWindow: NSWindowBelow relativeTo: [[self window] windowNumber]];
         else
       [browser showWindow: self];
       
     // XXXdwh Focus the content area.
 }
 
 -(void)openNewTabWithURL: (NSURL*)aURL loadInBackground: (BOOL)aLoadInBG
 {
     NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease];
     
     NSTabViewItem* selectedTab = [mTabBrowser selectedTabViewItem];
     int index = [mTabBrowser indexOfTabViewItem: selectedTab];
     [mTabBrowser insertTabViewItem: newTab atIndex: index+1];
     
     MyBrowserView* newView = [[[MyBrowserView alloc] initWithFrame: [mBrowserView frame]] autorelease];
     [newView setTab: newTab];
     
     [newTab setLabel: @"Loading..."];
     [newTab setView: newView];
 
     [[newView getBrowserView] loadURI:aURL flags:NSLoadFlagsNone];
 
     if (!aLoadInBG)
         [mTabBrowser selectTabViewItem: newTab];
         
     // XXXdwh Focus the content area.
 }  }
 @end  @end
   

Removed from v.1.45  
changed lines
  Added in v.1.47


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