Diff for /chimera/BrowserWindowController.mm between versions 1.9 and 1.36

version 1.9, 2002/02/04 03:53:59 version 1.36, 2002/02/22 09:16:48
Line 13  static NSString *StopToolbarItemIdentifi Line 13  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 20  static NSString *SidebarToolbarItemIdent Line 21  static NSString *SidebarToolbarItemIdent
   
 @implementation BrowserWindowController  @implementation BrowserWindowController
   
   -(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)init   - (id)init 
 {  {
     mInitialized = NO;      mInitialized = NO;
       mMoveReentrant = NO;
     return [super init];      return [super init];
 }  }
   
   - (void)windowWillClose:(NSNotification *)notification
   {
       [self autorelease];
       [mSidebarBookmarksDataSource windowClosing];
   }
   
 - (void)dealloc  - (void)dealloc
 {  {
       printf("Browser controller died.\n");
       
       [mBrowserView windowClosed];
       [mSidebarBrowserView windowClosed];
       
     [super dealloc];      [super dealloc];
 }  }
   
 - (void)windowDidLoad  - (void)windowDidLoad
 {  {
       [super windowDidLoad];
       
     mInitialized = YES;      mInitialized = YES;
       [[self window] setAcceptsMouseMovedEvents: YES];
       
     [self setupToolbar];      [self setupToolbar];
   
       // Our initial view is our primary view.  Connect it up.
       NSTabViewItem* tab = [mTabBrowser tabViewItemAtIndex: 0];
       NSView* view = [tab view];
       
       MyBrowserView* newView = [[[MyBrowserView alloc] initWithFrame: [view frame]] autorelease];
       [tab setView: newView];
       mBrowserView = newView;
           
     if (mURL) {      if (mURL) {
       [self loadURL: mURL];        [self loadURL: mURL];
       [mURL release];        [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 63  static NSString *SidebarToolbarItemIdent Line 122  static NSString *SidebarToolbarItemIdent
                                         HomeToolbarItemIdentifier,                                          HomeToolbarItemIdentifier,
                                         LocationToolbarItemIdentifier,                                          LocationToolbarItemIdentifier,
                                         SidebarToolbarItemIdentifier,                                          SidebarToolbarItemIdentifier,
                                           PrintToolbarItemIdentifier,
                                         NSToolbarCustomizeToolbarItemIdentifier,                                          NSToolbarCustomizeToolbarItemIdentifier,
                                         NSToolbarFlexibleSpaceItemIdentifier,                                          NSToolbarFlexibleSpaceItemIdentifier,
                                         NSToolbarSpaceItemIdentifier,                                          NSToolbarSpaceItemIdentifier,
Line 146  static NSString *SidebarToolbarItemIdent Line 206  static NSString *SidebarToolbarItemIdent
                   
         [toolbarItem setMenuFormRepresentation:menuFormRep];          [toolbarItem setMenuFormRepresentation:menuFormRep];
         mLocationToolbarItem = toolbarItem;          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 209  static NSString *SidebarToolbarItemIdent Line 276  static NSString *SidebarToolbarItemIdent
     [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 221  static NSString *SidebarToolbarItemIdent Line 294  static NSString *SidebarToolbarItemIdent
     [[mBrowserView getBrowserView] saveDocument: aFilterView filterList: 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  - (IBAction)back:(id)aSender
 {  {
   [[mBrowserView getBrowserView] goBack];    [[mBrowserView getBrowserView] goBack];
Line 248  static NSString *SidebarToolbarItemIdent Line 349  static NSString *SidebarToolbarItemIdent
   
 - (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  -(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];
Line 284  static NSString *SidebarToolbarItemIdent Line 392  static NSString *SidebarToolbarItemIdent
     [[self window] display];      [[self window] display];
 }  }
   
- (void)windowWillClose:(NSNotification *)notification-(void)newTab
 {  {
    [self autorelease];    NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease];
     [mTabBrowser addTabViewItem: newTab];
     
     MyBrowserView* newView = [[[MyBrowserView alloc] initWithFrame: [mBrowserView frame]] autorelease];
     [newTab setView: newView];
     [newTab setLabel: @"Untitled"];
     
     [[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];
         } 
     }
     
     //XXXdwh Do this if we ever support auto-hide.
     //if ([mTabBrowser numberOfTabViewItems] == 2)
     //    [mTabBrowser setTabViewType: NSTopTabsBezelBorder];
 }
 
 - (void)tabView:(NSTabView *)aTabView didSelectTabViewItem:(NSTabViewItem *)aTabViewItem
 {
     // Disconnect the old view.
     [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];
 }  }
   
   -(MyBrowserView*)getMyBrowserView
   {
       return mBrowserView;
   }
 @end  @end
   

Removed from v.1.9  
changed lines
  Added in v.1.36


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