Diff for /chimera/BrowserWindowController.mm between versions 1.1 and 1.42

version 1.1, 2002/01/29 10:01:11 version 1.42, 2002/03/03 12:53:10
Line 1 Line 1
///*
//  BrowserWindowController.m *  BrowserWindowController.mm
//  Chimera */
// 
//  Created by David Hyatt on Mon Jan 28 2002. 
//  Copyright (c) 2001 __MyCompanyName__. All rights reserved. 
// 
   
 #import "BrowserWindowController.h"  #import "BrowserWindowController.h"
 #import "MyBrowserView.h"  #import "MyBrowserView.h"
   
   #include "nsIWebNavigation.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";
 static NSString *ForwardToolbarItemIdentifier   = @"Forward Toolbar Item";  static NSString *ForwardToolbarItemIdentifier   = @"Forward Toolbar Item";
Line 17  static NSString *StopToolbarItemIdentifi Line 15  static NSString *StopToolbarItemIdentifi
 static NSString *HomeToolbarItemIdentifier      = @"Home Toolbar Item";  static NSString *HomeToolbarItemIdentifier      = @"Home Toolbar Item";
 static NSString *LocationToolbarItemIdentifier  = @"Location Toolbar Item";  static NSString *LocationToolbarItemIdentifier  = @"Location Toolbar Item";
 static NSString *SidebarToolbarItemIdentifier   = @"Sidebar Toolbar Item";  static NSString *SidebarToolbarItemIdentifier   = @"Sidebar Toolbar Item";
   static NSString *PrintToolbarItemIdentifier     = @"Print Toolbar Item";
   
 @interface BrowserWindowController(Private)  @interface BrowserWindowController(Private)
 - (void)setupToolbar;  - (void)setupToolbar;
Line 24  static NSString *SidebarToolbarItemIdent Line 23  static NSString *SidebarToolbarItemIdent
   
 @implementation BrowserWindowController  @implementation BrowserWindowController
   
   -(void)enterModalSession
   {
       mModalSession = [NSApp beginModalSessionForWindow: [self window]];
       [NSApp runModalSession: mModalSession];
       [NSApp endModalSession: mModalSession];
       mModalSession = nil;
   }
   
   -(void)mouseMoved:(NSEvent*)aEvent
   {
       if (mMoveReentrant)
           return;
           
       mMoveReentrant = YES;
       NSView* view = [[[self window] contentView] hitTest: [aEvent locationInWindow]];
       [view mouseMoved: aEvent];
       [super mouseMoved: aEvent];
       mMoveReentrant = NO;
   }
   
   - (id)initWithWindowNibName:(NSString *)windowNibName
   {
       if ( (self = [super initWithWindowNibName:(NSString *)windowNibName]) ) {
           mInitialized = NO;
           mMoveReentrant = NO;
       }
       return self;
   }
   
   - (void)windowWillClose:(NSNotification *)notification
   {
       printf("Window will close notification.\n");
       [self autorelease];
       [mSidebarBookmarksDataSource windowClosing];
   }
   
   - (void)dealloc
   {
       printf("Browser controller died.\n");
   
       [mBrowserView windowClosed];
       [mSidebarBrowserView windowClosed];
       
       [mProgress release];
         
       [super dealloc];
   }
   
 - (void)windowDidLoad  - (void)windowDidLoad
 {  {
       [super windowDidLoad];
       
       if (mModalSession)
         [NSApp stopModal: mModalSession];
         
       mInitialized = YES;
       
       // Retain with a single extra refcount.  This allows the MyBrowserViews
       // to remove the progress meter from its superview without having to 
       // worry about retaining and releasing it.
       [mProgress retain];
       
       [[self window] setAcceptsMouseMovedEvents: YES];
       
     [self setupToolbar];      [self setupToolbar];
   
   //  03/03/2002 mlj Changing strategy a bit here.  The addTab: method was
   //      duplicating a lot of the code found here.  I have moved it to that method.
   //      We now remove the IB tab, then add one of our own.
   
       [mTabBrowser removeTabViewItem:[mTabBrowser tabViewItemAtIndex:0]];
       [self newTab];
       
       if (mURL) {
         [self loadURL: mURL];
         [mURL release];
       }
       
       [mSidebarDrawer setDelegate: self];
       
   //    [mBrowserView makePrimaryBrowserView: tab urlbar: mURLBar status: mStatus
     //      progress: mProgress windowController: self];
   }
   
   - (void)drawerWillOpen: (NSNotification*)aNotification
   {
       [mSidebarBookmarksDataSource ensureBookmarks];
   }
   
   - (void)drawerDidOpen:(NSNotification *)aNotification
   {
       // XXXdwh This is temporary.
       [[mSidebarBrowserView getBrowserView] loadURI: [NSURL URLWithString: @"http://tinderbox.mozilla.org/SeaMonkey/panel.html"] flags:NSLoadFlagsNone];
   }
   
   - (void)drawerDidClose:(NSNotification *)aNotification
   {
       // Unload the Gecko web page in "My Panels" to save memory.
       [[mSidebarBrowserView getBrowserView] loadURI: [NSURL URLWithString: @"about:blank"] flags:NSLoadFlagsNone];
 }  }
   
 - (void)setupToolbar  - (void)setupToolbar
Line 43  static NSString *SidebarToolbarItemIdent Line 138  static NSString *SidebarToolbarItemIdent
   
 - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar  - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
 {  {
     NSLog(@"toolbarAllowedItemIdentifiers");  
     return [NSArray arrayWithObjects:   BackToolbarItemIdentifier,      return [NSArray arrayWithObjects:   BackToolbarItemIdentifier,
                                         ForwardToolbarItemIdentifier,                                          ForwardToolbarItemIdentifier,
                                         ReloadToolbarItemIdentifier,                                          ReloadToolbarItemIdentifier,
Line 51  static NSString *SidebarToolbarItemIdent Line 145  static NSString *SidebarToolbarItemIdent
                                         HomeToolbarItemIdentifier,                                          HomeToolbarItemIdentifier,
                                         LocationToolbarItemIdentifier,                                          LocationToolbarItemIdentifier,
                                         SidebarToolbarItemIdentifier,                                          SidebarToolbarItemIdentifier,
                                           PrintToolbarItemIdentifier,
                                         NSToolbarCustomizeToolbarItemIdentifier,                                          NSToolbarCustomizeToolbarItemIdentifier,
                                         NSToolbarFlexibleSpaceItemIdentifier,                                          NSToolbarFlexibleSpaceItemIdentifier,
                                         NSToolbarSpaceItemIdentifier,                                          NSToolbarSpaceItemIdentifier,
Line 129  static NSString *SidebarToolbarItemIdent Line 224  static NSString *SidebarToolbarItemIdent
         [toolbarItem setMaxSize:NSMakeSize(2560,32)];          [toolbarItem setMaxSize:NSMakeSize(2560,32)];
                   
         [menuFormRep setTarget:self];          [menuFormRep setTarget:self];
        [menuFormRep setAction:@selector(displayLocationSheet:)];        [menuFormRep setAction:@selector(performAppropriateLocationAction)];
         [menuFormRep setTitle:[toolbarItem label]];          [menuFormRep setTitle:[toolbarItem label]];
                   
         [toolbarItem setMenuFormRepresentation:menuFormRep];          [toolbarItem setMenuFormRepresentation:menuFormRep];
                mLocationToolbarItem = toolbarItem;
 
     } else if ( [itemIdent isEqual:PrintToolbarItemIdentifier] ) {
         [toolbarItem setLabel:@"Print"];
         [toolbarItem setPaletteLabel:@"Print"];
         [toolbarItem setToolTip:@"Print this page"];
         [toolbarItem setImage:[NSImage imageNamed:@"print"]];
         [toolbarItem setTarget:self];
         [toolbarItem setAction:@selector(printDocument)];
     } else {      } else {
         toolbarItem = nil;          toolbarItem = nil;
     }      }
Line 158  static NSString *SidebarToolbarItemIdent Line 261  static NSString *SidebarToolbarItemIdent
     return YES;      return YES;
 }  }
         
-(void)updateToolbarItems- (void)updateToolbarItems
 {  {
   [[[self window] toolbar] validateVisibleItems];    [[[self window] toolbar] validateVisibleItems];
 }  }
   
-(IBAction) back:(id)aSender- (void)performAppropriateLocationAction
 {
     if ( [[[self window] toolbar] isVisible] ) {
         if ( ([[[self window] toolbar] displayMode] == NSToolbarDisplayModeIconAndLabel) ||
              ([[[self window] toolbar] displayMode] == NSToolbarDisplayModeIconOnly) ) {
             [self focusURLBar];
         } else {
             [self beginLocationSheet];
         }
     } else {
         [self beginLocationSheet];
     }
 }
 
 - (void)focusURLBar
 {
     [mURLBar selectText: self];
 }
 
 - (void)beginLocationSheet
 {
     [NSApp beginSheet:  mLocationSheetWindow
        modalForWindow:  [self window]
         modalDelegate:  nil
        didEndSelector:  nil
           contextInfo:  nil];
 }
 
 - (IBAction)endLocationSheet:(id)sender
 {
     [mLocationSheetWindow orderOut:self];
     [NSApp endSheet:mLocationSheetWindow returnCode:1];
     [self loadURL:[NSURL URLWithString:[mLocationSheetURLField stringValue]]];
     
     // Focus and activate our content area.
     [[mBrowserView getBrowserView] setActive: YES];
 }
 
 - (IBAction)goToLocationFromToolbarURLField:(id)sender
 {
     [self loadURL:[NSURL URLWithString:[sender stringValue]]];
     
     // Focus and activate our content area.
     [[mBrowserView getBrowserView] setActive: YES];
 }
 
 - (void)saveDocument: (NSView*)aFilterView filterList: (NSPopUpButton*)aFilterList
 {
     [[mBrowserView getBrowserView] saveDocument: aFilterView filterList: aFilterList];
 }
 
 - (void)printDocument
 {
     [[mBrowserView getBrowserView] printDocument];
 }
 
 - (void)printPreview
 {
     [[mBrowserView getBrowserView] printPreview];
 }
 
 - (void)findInPage
 {
     [[mBrowserView getBrowserView] findInPage];
 }
 
 - (void)findAgain
 {
     [[mBrowserView getBrowserView] findAgain];
 }
 
 - (void)addBookmark
 {
     // XXXdwh Hack.  Just go to the sidebar for now until we get our
     // menu data source going.
     [mSidebarBookmarksDataSource ensureBookmarks];
     [mSidebarBookmarksDataSource addBookmark: self];
 }
 
 - (IBAction)back:(id)aSender
 {  {
   [[mBrowserView getBrowserView] goBack];    [[mBrowserView getBrowserView] goBack];
 }  }
   
-(IBAction) forward:(id)aSender- (IBAction)forward:(id)aSender
 {  {
   [[mBrowserView getBrowserView] goForward];    [[mBrowserView getBrowserView] goForward];
 }  }
   
-(IBAction) reload:(id)aSender- (IBAction)reload:(id)aSender
 {  {
   [[mBrowserView getBrowserView] reload: 0];    [[mBrowserView getBrowserView] reload: 0];
 }  }
   
-(IBAction) stop:(id)aSender- (IBAction)stop:(id)aSender
 {  {
  [[mBrowserView getBrowserView] stop: 0];  [[mBrowserView getBrowserView] stop: nsIWebNavigation::STOP_ALL];
 }  }
   
-(IBAction) home:(id)aSender- (IBAction)home:(id)aSender
 {  {
  NSURL* url = [NSURL URLWithString:@"about:blank"];  [[mBrowserView getBrowserView] loadURI:[NSURL URLWithString:@"about:blank"] flags:NSLoadFlagsNone];
  [[mBrowserView getBrowserView] loadURI:url flags:NSLoadFlagsNone]; 
 }  }
   
-(IBAction) toggleSidebar:(id)aSender- (IBAction)toggleSidebar:(id)aSender
 {  {
    if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) ) {    NSResponder* resp = [[self window] firstResponder];
     [[self window] makeFirstResponder: nil];
     
     if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) )  {
         // XXXHack to bypass sidebar crashes.
         [mSidebarDrawer open];          [mSidebarDrawer open];
     } else {      } else {
         [mSidebarDrawer close];          [mSidebarDrawer close];
     }      }
       
       [[self window] makeFirstResponder: resp];
   }
   
   -(void)loadURL:(NSURL*)aURL
   {
       if (mInitialized) {
           [[mBrowserView getBrowserView] loadURI:aURL flags:NSLoadFlagsNone];
       }
       else {
           mURL = aURL;
           [mURL retain];
       }
   }
   
   - (void)updateLocationFields:(NSString *)locationString
   {
   /* //commenting this out because it doesn't work right yet.
       if ( [locationString length] > 30 ) {
           [[mLocationToolbarItem menuFormRepresentation] setTitle:
               [NSString stringWithFormat:@"Location: %@...", [locationString substringToIndex:31]]];
       } else {
           [[mLocationToolbarItem menuFormRepresentation] setTitle:
               [NSString stringWithFormat:@"Location: %@", locationString]];
       }
   */
   
       [mURLBar setStringValue:locationString];
       [mLocationSheetURLField setStringValue:locationString];
   
       [[self window] update];
       [[self window] display];
   }
   
   -(void)newTab
   {
       NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease];
       MyBrowserView* newView = [[[MyBrowserView alloc] initWithFrame: [[newTab view] frame]] autorelease];
   //  MyBrowserView* newView = [[[MyBrowserView alloc] initWithFrame: [mBrowserView frame]] autorelease];
   
       [newTab setLabel: @"Untitled"];
       [newTab setView: newView];
   
       [mTabBrowser addTabViewItem: newTab];
   
       [[newView getBrowserView] loadURI:[NSURL URLWithString:@"about:blank"] flags:NSLoadFlagsNone];
   
       [mTabBrowser selectLastTabViewItem: self];
   
       if ( [[[self window] toolbar] isVisible] ) {
           if ( ([[[self window] toolbar] displayMode] == NSToolbarDisplayModeIconAndLabel) ||
                ([[[self window] toolbar] displayMode] == NSToolbarDisplayModeIconOnly) ) {
               [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
   {
       // Disconnect the old view, if one has been designated.
       // If the window has just been opened, none has been.
       if ( mBrowserView ) {
           [mBrowserView disconnectView];
       }
       // Connect up the new view
       mBrowserView = [aTabViewItem view];
          
       // Make the new view the primary content area.
       [mBrowserView makePrimaryBrowserView: aTabViewItem urlbar: mURLBar status: mStatus
           progress: mProgress windowController: self];
 }  }
   
-(void)loadURL:(NSString*)aURL-(MyBrowserView*)getMyBrowserView
 {  {
    NSURL* url = [NSURL URLWithString:aURL];    return mBrowserView;
    [[mBrowserView getBrowserView] loadURI:url flags:NSLoadFlagsNone]; 
 }  }
 @end  @end
   

Removed from v.1.1  
changed lines
  Added in v.1.42


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