Diff for /chimera/BrowserWindowController.mm between versions 1.50 and 1.57

version 1.50, 2002/03/11 09:23:36 version 1.57, 2002/04/09 01:11:32
Line 40 Line 40
 #import "IconTabViewItem.h"  #import "IconTabViewItem.h"
   
 #include "nsIWebNavigation.h"  #include "nsIWebNavigation.h"
   #include "nsCocoaBrowserService.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";
Line 53  static NSString *PrintToolbarItemIdentif Line 54  static NSString *PrintToolbarItemIdentif
   
 @interface BrowserWindowController(Private)  @interface BrowserWindowController(Private)
 - (void)setupToolbar;  - (void)setupToolbar;
   - (void)setupSidebarTabs;
 @end  @end
   
 @implementation BrowserWindowController  @implementation BrowserWindowController
Line 80  static NSString *PrintToolbarItemIdentif Line 82  static NSString *PrintToolbarItemIdentif
 - (id)initWithWindowNibName:(NSString *)windowNibName  - (id)initWithWindowNibName:(NSString *)windowNibName
 {  {
     if ( (self = [super initWithWindowNibName:(NSString *)windowNibName]) ) {      if ( (self = [super initWithWindowNibName:(NSString *)windowNibName]) ) {
           if ( nsCocoaBrowserService::sNumBrowsers == 0 ) {
               [self setShouldCascadeWindows:NO];
           } else {
               [self setShouldCascadeWindows:YES];
           }
         mInitialized = NO;          mInitialized = NO;
         mMoveReentrant = NO;          mMoveReentrant = NO;
         mShouldAutosave = YES;          mShouldAutosave = YES;
Line 135  static NSString *PrintToolbarItemIdentif Line 142  static NSString *PrintToolbarItemIdentif
       [NSApp stopModal: mModalSession];        [NSApp stopModal: mModalSession];
               
     mInitialized = YES;      mInitialized = YES;
   
       mDrawerCachedFrame = NO;
           
     // Retain with a single extra refcount.  This allows the MyBrowserViews      // Retain with a single extra refcount.  This allows the MyBrowserViews
     // to remove the progress meter from its superview without having to       // to remove the progress meter from its superview without having to 
Line 159  static NSString *PrintToolbarItemIdentif Line 168  static NSString *PrintToolbarItemIdentif
           
     [mSidebarDrawer setDelegate: self];      [mSidebarDrawer setDelegate: self];
   
    [mSidebarTabView addTabViewItem: //testing...    [self setupSidebarTabs];
        [[[IconTabViewItem alloc] initWithIdentifier:nil withTabIcon:[NSImage imageNamed:@"bookicon"]] autorelease]]; 
 }  }
   
 - (void)drawerWillOpen: (NSNotification*)aNotification  - (void)drawerWillOpen: (NSNotification*)aNotification
 {  {
    [mSidebarBookmarksDataSource ensureBookmarks];  [mSidebarBookmarksDataSource ensureBookmarks];
 
   // Force the window to shrink and move if necessary in order to accommodate the sidebar.
   NSRect screenFrame = [[[self window] screen] frame];
   NSRect windowFrame = [[self window] frame];
   NSSize drawerSize = [mSidebarDrawer contentSize];
   int fudgeFactor = 12; // Not sure how to get the drawer's border info, so we fudge it for now.
   drawerSize.width += fudgeFactor;
   if (windowFrame.origin.x + windowFrame.size.width + drawerSize.width >
       screenFrame.size.width) {
     // We need to adjust the window so that it can fit.
     int shrinkDelta = (windowFrame.size.width + drawerSize.width) - screenFrame.size.width;
     if (shrinkDelta < 0) shrinkDelta = 0;
     int newWidth = (windowFrame.size.width - shrinkDelta);
     int newPosition = screenFrame.size.width - newWidth - drawerSize.width;
     if (newPosition < 0) newPosition = 0;
     mCachedFrameBeforeDrawerOpen = windowFrame;
     windowFrame.origin.x = newPosition;
     windowFrame.size.width = newWidth;
     mCachedFrameAfterDrawerOpen = windowFrame;
     [[self window] setFrame: windowFrame display: YES];
     mDrawerCachedFrame = YES;
   }
 }  }
   
 - (void)drawerDidOpen:(NSNotification *)aNotification  - (void)drawerDidOpen:(NSNotification *)aNotification
 {  {
    // XXXdwh This is temporary.  // XXXdwh This is temporary.
    [[mSidebarBrowserView getBrowserView] loadURI: [NSURL URLWithString: @"http://tinderbox.mozilla.org/SeaMonkey/panel.html"] flags:NSLoadFlagsNone];  //  [[mSidebarBrowserView getBrowserView] loadURI: [NSURL URLWithString: @"http://tinderbox.mozilla.org/SeaMonkey/panel.html"] flags:NSLoadFlagsNone];
 
   // Toggle the sidebar icon.
   [mSidebarToolbarItem setImage:[NSImage imageNamed:@"sidebarOpened"]];
 }  }
   
 - (void)drawerDidClose:(NSNotification *)aNotification  - (void)drawerDidClose:(NSNotification *)aNotification
 {  {
    // Unload the Gecko web page in "My Panels" to save memory.  // Unload the Gecko web page in "My Panels" to save memory.
    [[mSidebarBrowserView getBrowserView] loadURI: [NSURL URLWithString: @"about:blank"] flags:NSLoadFlagsNone];  [mSidebarToolbarItem setImage:[NSImage imageNamed:@"sidebarClosed"]];
 
   // XXXdwh ignore for now.
   //  [[mSidebarBrowserView getBrowserView] loadURI: [NSURL URLWithString: @"about:blank"] flags:NSLoadFlagsNone];
 
   if (mDrawerCachedFrame) {
     printf("Got here.\n");
     mDrawerCachedFrame = NO;
     NSRect frame = [[self window] frame];
     if (frame.origin.x == mCachedFrameAfterDrawerOpen.origin.x &&
         frame.origin.y == mCachedFrameAfterDrawerOpen.origin.y &&
         frame.size.width == mCachedFrameAfterDrawerOpen.size.width &&
         frame.size.height == mCachedFrameAfterDrawerOpen.size.height) {
       printf("Got here too.\n");
       printf("Xes are %d %d\n", frame.origin.x, mCachedFrameAfterDrawerOpen.origin.x);
       printf("Widths are %d %d\n", frame.size.width, mCachedFrameAfterDrawerOpen.size.width);
       // Restore the original frame.
       [[self window] setFrame: mCachedFrameBeforeDrawerOpen display: YES];
     }
   }
 }  }
   
 - (void)setupToolbar  - (void)setupToolbar
Line 265  static NSString *PrintToolbarItemIdentif Line 317  static NSString *PrintToolbarItemIdentif
         [toolbarItem setLabel:@"Sidebar"];          [toolbarItem setLabel:@"Sidebar"];
         [toolbarItem setPaletteLabel:@"Toggle Sidebar"];          [toolbarItem setPaletteLabel:@"Toggle Sidebar"];
         [toolbarItem setToolTip:@"Show or hide the Sidebar"];          [toolbarItem setToolTip:@"Show or hide the Sidebar"];
        [toolbarItem setImage:[NSImage imageNamed:@"sidebar"]];        [toolbarItem setImage:[NSImage imageNamed:@"sidebarClosed"]];
         [toolbarItem setTarget:self];          [toolbarItem setTarget:self];
         [toolbarItem setAction:@selector(toggleSidebar:)];          [toolbarItem setAction:@selector(toggleSidebar:)];
           mSidebarToolbarItem = toolbarItem;
     } else if ( [itemIdent isEqual:LocationToolbarItemIdentifier] ) {      } else if ( [itemIdent isEqual:LocationToolbarItemIdentifier] ) {
                   
         NSMenuItem *menuFormRep = [[[NSMenuItem alloc] init] autorelease];          NSMenuItem *menuFormRep = [[[NSMenuItem alloc] init] autorelease];
Line 383  static NSString *PrintToolbarItemIdentif Line 436  static NSString *PrintToolbarItemIdentif
     [[mBrowserView getBrowserView] printPreview];      [[mBrowserView getBrowserView] printPreview];
 }  }
   
- (void)findInPage- (void)findInPage:(NSString*)text
 {  {
    [[mBrowserView getBrowserView] findInPage];    [[mBrowserView getBrowserView] findInPage:text];
 }  }
   
 - (void)findAgain  - (void)findAgain
Line 433  static NSString *PrintToolbarItemIdentif Line 486  static NSString *PrintToolbarItemIdentif
           
     if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) )  {      if ( ([mSidebarDrawer state] == NSDrawerClosedState) || ([mSidebarDrawer state] == NSDrawerClosingState) )  {
         // XXXHack to bypass sidebar crashes.          // XXXHack to bypass sidebar crashes.
        [mSidebarDrawer open];        [mSidebarDrawer openOnEdge: NSMaxXEdge];
     } else {      } else {
         [mSidebarDrawer close];          [mSidebarDrawer close];
     }      }
Line 441  static NSString *PrintToolbarItemIdentif Line 494  static NSString *PrintToolbarItemIdentif
     [[self window] makeFirstResponder: resp];      [[self window] makeFirstResponder: resp];
 }  }
   
   
 -(void)loadURL:(NSURL*)aURL  -(void)loadURL:(NSURL*)aURL
 {  {
     if (mInitialized) {      if (mInitialized) {
Line 568  static NSString *PrintToolbarItemIdentif Line 622  static NSString *PrintToolbarItemIdentif
                   
     // XXXdwh Focus the content area.      // XXXdwh Focus the content area.
 }  }
   
   -(void)setupSidebarTabs
   {
       IconTabViewItem   *bookItem = [[IconTabViewItem alloc] initWithIdentifier:@"bookmarkSidebarIconTabViewItem"
                                     withTabIcon:[NSImage imageNamed:@"bookicon"]];
       IconTabViewItem   *histItem = [[IconTabViewItem alloc] initWithIdentifier:@"historySidebarIconTabViewItem"
                                     withTabIcon:[NSImage imageNamed:@"historyicon"]];
       IconTabViewItem *searchItem = [[IconTabViewItem alloc] initWithIdentifier:@"searchSidebarIconTabViewItem"
                                     withTabIcon:[NSImage imageNamed:@"searchicon"]];
   
       [bookItem   setView:[[mSidebarSourceTabView tabViewItemAtIndex:0] view]];
       [histItem   setView:[[mSidebarSourceTabView tabViewItemAtIndex:1] view]];
       [searchItem setView:[[mSidebarSourceTabView tabViewItemAtIndex:2] view]];
   
       [mSidebarTabView insertTabViewItem:bookItem   atIndex:0];
       [mSidebarTabView insertTabViewItem:histItem   atIndex:1];
       [mSidebarTabView insertTabViewItem:searchItem atIndex:2];
   
       [mSidebarTabView selectFirstTabViewItem:self];
   }
   
   
 @end  @end
   

Removed from v.1.50  
changed lines
  Added in v.1.57


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