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

version 1.13, 2002/02/10 01:12:05 version 1.21, 2002/02/25 08:44:17
Line 3 Line 3
  */   */
   
 #import "MyBrowserView.h"  #import "MyBrowserView.h"
   #import "BrowserWindowController.h"
   
 #include "nsCOMPtr.h"  #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"  #include "nsIServiceManager.h"
Line 40  static const char* ioServiceContractID = Line 41  static const char* ioServiceContractID =
   [browserView loadURI:[NSURL URLWithString:[urlbar stringValue]] flags:NSLoadFlagsNone];    [browserView loadURI:[NSURL URLWithString:[urlbar stringValue]] flags:NSLoadFlagsNone];
 }  }
   
- (void)awakeFromNib -(void)disconnectView
 {  {
  browserView = [[[NSBrowserView alloc] initWithFrame:[self bounds]] autorelease];    urlbar = nil;
  [self addSubview:browserView];    status = nil;
  [browserView setContainer:self];    progress = nil;
  [browserView addListener:self];    progressSuper = nil;
     mIsPrimary = NO;
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     
     [browserView setActive: NO];
 }
   
   - (id)initWithFrame:(NSRect)frameRect
   {
       [super initWithFrame: frameRect];
        browserView = [[[NSBrowserView alloc] initWithFrame:[self bounds]] autorelease];
       [self addSubview:browserView];
       [browserView setContainer:self];
       [browserView addListener:self];
       mIsBusy = NO;
       return self;
   }
   
   -(void)makePrimaryBrowserView: (NSTabViewItem*)tab urlbar: (id)aUrlbar status: (id)aStatus
       progress: (id)aProgress windowController: aWindowController
   {
     mTab = tab;
     urlbar = aUrlbar;
     status = aStatus;
     progress = aProgress;
     progressSuper = [aProgress superview];
     mWindowController = aWindowController;
     
     if (!mIsBusy)
         [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];  
       
     mIsPrimary = YES;
    
   nsCOMPtr<nsIIOService> ioService(do_GetService(ioServiceContractID));    nsCOMPtr<nsIIOService> ioService(do_GetService(ioServiceContractID));
   if (!ioService)    if (!ioService)
     return;      return;
Line 67  static const char* ioServiceContractID = Line 95  static const char* ioServiceContractID =
         selector:@selector(offlineModeChanged:)          selector:@selector(offlineModeChanged:)
         name:@"offlineModeChanged"          name:@"offlineModeChanged"
         object:nil];          object:nil];
           
     // Update the URL bar.
     [mWindowController updateLocationFields:[self getCurrentURLSpec]];
   }
   
   -(NSString*)getCurrentURLSpec
   {
     return [browserView getCurrentURLSpec];
   }
   
   - (void)awakeFromNib 
   {
 }  }
   
 - (void)setFrame:(NSRect)frameRect  - (void)setFrame:(NSRect)frameRect
Line 89  static const char* ioServiceContractID = Line 129  static const char* ioServiceContractID =
   }    }
   
   [progressSuper addSubview:progress];    [progressSuper addSubview:progress];
   [progress release];  
   [progress setIndeterminate:YES];    [progress setIndeterminate:YES];
   [progress startAnimation:self];    [progress startAnimation:self];
   
Line 97  static const char* ioServiceContractID = Line 136  static const char* ioServiceContractID =
   [status setStringValue:loadingStatus];    [status setStringValue:loadingStatus];
   
   mIsBusy = YES;    mIsBusy = YES;
     [mTab setLabel: LOADING_STRING];
     
   if (mWindowController)    if (mWindowController)
     [mWindowController updateToolbarItems];      [mWindowController updateToolbarItems];
 }  }
Line 105  static const char* ioServiceContractID = Line 146  static const char* ioServiceContractID =
 {  {
   [progress setIndeterminate:YES];    [progress setIndeterminate:YES];
   [progress stopAnimation:self];    [progress stopAnimation:self];
   [progress retain];  
   [progress removeFromSuperview];    [progress removeFromSuperview];
   
   loadingStatus = DOCUMENT_DONE_STRING;    loadingStatus = DOCUMENT_DONE_STRING;
Line 178  static const char* ioServiceContractID = Line 218  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 setLabel:@"Untitled"];
 }  }
   
 - (void)offlineModeChanged: (NSNotification*)aNotification  - (void)offlineModeChanged: (NSNotification*)aNotification
Line 229  static const char* ioServiceContractID = Line 278  static const char* ioServiceContractID =
   
 - (NSBrowserView*)createBrowserWindow:(unsigned int)mask  - (NSBrowserView*)createBrowserWindow:(unsigned int)mask
 {  {
  // XXX not implemented   BrowserWindowController* controller = [[BrowserWindowController alloc] initWithWindowNibName: @"BrowserWindow"];
  return NULL;  [controller enterModalSession];
   return [[controller getMyBrowserView] getBrowserView];
 }  }
   
 - (NSBrowserView*)getBrowserView  - (NSBrowserView*)getBrowserView

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


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