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

version 1.41, 2002/03/03 09:34:52 version 1.47, 2002/03/08 03:18:00
Line 1 Line 1
/*/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 *  BrowserWindowController.mm/* ***** BEGIN LICENSE BLOCK *****
 */ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Netscape Public License
  * 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 "BrowserWindowController.h"  #import "BrowserWindowController.h"
 #import "MyBrowserView.h"  #import "MyBrowserView.h"
Line 102  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 418  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];
//  MyBrowserView* newView = [[[MyBrowserView alloc] initWithFrame: [mBrowserView frame]] autorelease];    [newView setTab: newTab];
   
     [newTab setLabel: @"Untitled"];      [newTab setLabel: @"Untitled"];
     [newTab setView: newView];      [newTab setView: newView];
   
     [mTabBrowser addTabViewItem: newTab];      [mTabBrowser addTabViewItem: newTab];
    
     [[newView getBrowserView] loadURI:[NSURL URLWithString:@"about:blank"] flags:NSLoadFlagsNone];      [[newView getBrowserView] loadURI:[NSURL URLWithString:@"about:blank"] flags:NSLoadFlagsNone];
    
     [mTabBrowser selectLastTabViewItem: self];      [mTabBrowser selectLastTabViewItem: self];
    
     if ( [[[self window] toolbar] isVisible] ) {      if ( [[[self window] toolbar] isVisible] ) {
         if ( ([[[self window] toolbar] displayMode] == NSToolbarDisplayModeIconAndLabel) ||          if ( ([[[self window] toolbar] displayMode] == NSToolbarDisplayModeIconAndLabel) ||
              ([[[self window] toolbar] displayMode] == NSToolbarDisplayModeIconOnly) ) {               ([[[self window] toolbar] displayMode] == NSToolbarDisplayModeIconOnly) ) {
             [self focusURLBar];              [self focusURLBar];
        }         }
     }      }
 }  }
   
   -(void)closeTab
   {
       if ( [mTabBrowser numberOfTabViewItems] > 1 ) {
           [mTabBrowser removeTabViewItem:[mTabBrowser selectedTabViewItem]];
       }
   }
   
   - (void)previousTab
   {
       [mTabBrowser selectPreviousTabViewItem:self];
   }
   
   - (void)nextTab
   {
       [mTabBrowser selectNextTabViewItem:self];
   }
   
 - (void)tabView:(NSTabView *)aTabView didSelectTabViewItem:(NSTabViewItem *)aTabViewItem  - (void)tabView:(NSTabView *)aTabView didSelectTabViewItem:(NSTabViewItem *)aTabViewItem
 {  {
     // Disconnect the old view, if one has been designated.      // Disconnect the old view, if one has been designated.
Line 449  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 457  static NSString *PrintToolbarItemIdentif Line 504  static NSString *PrintToolbarItemIdentif
 {  {
     return mBrowserView;      return mBrowserView;
 }  }
   
   -(void)openNewWindowWithURL: (NSURL*)aURL loadInBackground: (BOOL)aLoadInBG
   {
       BrowserWindowController* browser = [[BrowserWindowController alloc] initWithWindowNibName: @"BrowserWindow"];
       [browser loadURL: aURL];
       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.41  
changed lines
  Added in v.1.47


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