Diff for /chimera/MyBrowserView.mm between versions 1.13 and 1.14

version 1.13, 2002/02/10 01:12:05 version 1.14, 2002/02/11 03:43:12
Line 40  static const char* ioServiceContractID = Line 40  static const char* ioServiceContractID =
   [browserView loadURI:[NSURL URLWithString:[urlbar stringValue]] flags:NSLoadFlagsNone];    [browserView loadURI:[NSURL URLWithString:[urlbar stringValue]] flags:NSLoadFlagsNone];
 }  }
   
- (void)awakeFromNib -(void)makePrimaryBrowserView: (NSTabViewItem*)tab urlbar: (id)aUrlbar status: (id)aStatus
     progress: (id)aProgress windowController: aWindowController
 {  {
  browserView = [[[NSBrowserView alloc] initWithFrame:[self bounds]] autorelease];  mTab = tab;
  [self addSubview:browserView];  urlbar = aUrlbar;
  [browserView setContainer:self];  status = aStatus;
  [browserView addListener:self];  progress = aProgress;
   progressSuper = [aProgress superview];
   mWindowController = aWindowController;
   
   [progress retain];
   [progress removeFromSuperview];
   
   defaultStatus = NULL;    defaultStatus = NULL;
   loadingStatus = DOCUMENT_DONE_STRING;    loadingStatus = DOCUMENT_DONE_STRING;
   [status setStringValue:loadingStatus];    [status setStringValue:loadingStatus];
   mIsBusy = NO;  
     
   [progress retain];  
   [progress removeFromSuperview];  
       
     mIsBusy = NO;
     mIsPrimary = YES;
    
     browserView = [[[NSBrowserView alloc] initWithFrame:[self bounds]] autorelease];
     [self addSubview:browserView];
     [browserView setContainer:self];
     [browserView addListener:self];
   
   nsCOMPtr<nsIIOService> ioService(do_GetService(ioServiceContractID));    nsCOMPtr<nsIIOService> ioService(do_GetService(ioServiceContractID));
   if (!ioService)    if (!ioService)
     return;      return;
Line 69  static const char* ioServiceContractID = Line 79  static const char* ioServiceContractID =
         object:nil];          object:nil];
 }  }
   
   - (void)awakeFromNib 
   {
   }
   
 - (void)setFrame:(NSRect)frameRect  - (void)setFrame:(NSRect)frameRect
 {  {
   [super setFrame:frameRect];    [super setFrame:frameRect];
Line 178  static const char* ioServiceContractID = Line 192  static const char* ioServiceContractID =
 {  {
     if (!mWindowController)      if (!mWindowController)
         return; // Sidebar panels can't affect the window title.          return; // Sidebar panels can't affect the window title.
            
    if (mOffline) {    // We must be the primary content area.
        NSString* newTitle;    if (mIsPrimary) {
        if (title && ![title isEqualToString:@""])        if (mOffline) {
            newTitle = [title stringByAppendingString: @" [Working Offline]"];            NSString* newTitle;
        else            if (title && ![title isEqualToString:@""])
            newTitle = @"Untitled [Working Offline]";                newTitle = [title stringByAppendingString: @" [Working Offline]"];
        [[mWindowController window] setTitle: newTitle];            else
    }                newTitle = @"Untitled [Working Offline]";
    else {            [[mWindowController window] setTitle: newTitle];
        if (title && ![title isEqualToString:@""])        }
            [[mWindowController window] setTitle:title];        else {
        else            if (title && ![title isEqualToString:@""])
            [[mWindowController window] setTitle:@"Untitled"];                [[mWindowController window] setTitle:title];
             else
                 [[mWindowController window] setTitle:@"Untitled"];
         }
     }      }
       
       // Always set the tab.
       if (title && ![title isEqualToString:@""])
           [mTab setLabel:title];
       else
           [mTab setLabele:@"Untitled"];
 }  }
   
 - (void)offlineModeChanged: (NSNotification*)aNotification  - (void)offlineModeChanged: (NSNotification*)aNotification

Removed from v.1.13  
changed lines
  Added in v.1.14


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