Changeset 3597

Timestamp:

01/25/06 19:34:24 (3 years ago)

Author:

morris

Message:

Use WebKit? to display HTML in preview

Better error handling in preview window

Files:

• WiredClient/trunk/English.lproj/Preferences.nib/info.nib (modified) (1 diff)
• WiredClient/trunk/English.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
• WiredClient/trunk/English.lproj/Preferences.nib/objects.nib (modified) (previous)
• WiredClient/trunk/English.lproj/Preview.nib/classes.nib (modified) (1 diff)
• WiredClient/trunk/English.lproj/Preview.nib/info.nib (modified) (1 diff)
• WiredClient/trunk/English.lproj/Preview.nib/keyedobjects.nib (modified) (previous)
• WiredClient/trunk/English.lproj/Preview.nib/objects.nib (modified) (previous)
• WiredClient/trunk/WCFileInfo.m (modified) (2 diffs)
• WiredClient/trunk/WCMessages.m (modified) (1 diff)
• WiredClient/trunk/WCPreview.h (modified) (3 diffs)
• WiredClient/trunk/WCPreview.m (modified) (9 diffs)
• WiredClient/trunk/WCTrackers.m (modified) (1 diff)
• WiredClient/trunk/WCTransfers.m (modified) (2 diffs)
• WiredClient/trunk/WiredClient.xcodeproj/project.pbxproj (modified) (4 diffs)
• WiredClient/trunk/prefix.pch (modified) (1 diff)

WiredClient/trunk/English.lproj/Preferences.nib/info.nib

@@ -4 +4 @@
-<dict>
-        <key>IBDocumentLocation</key>
-519 196 356 294 0 0 1280 1002
+880 41 481 528 0 0 1920 1178
-        <key>IBFramework Version</key>
-        <string>443.0</string>

WiredClient/trunk/English.lproj/Preview.nib/classes.nib

@@ -11 +11 @@
-            LANGUAGE = ObjC; 
-            OUTLETS = {
+                "_htmlView" = WebView; 
+                "_htmlWindow" = NSWindow; 
-                "_imageView" = NSImageView; 
-                "_imageWindow" = NSWindow; 

WiredClient/trunk/English.lproj/Preview.nib/info.nib

@@ -10 +10 @@
-        <array>
-                <integer>5</integer>
+                <integer>9</integer>
-                <integer>24</integer>
-9
+54
-        </array>
-        <key>IBSystem Version</key>
-F46
+G32
-</dict>
-</plist>

WiredClient/trunk/WCFileInfo.m

@@ -149 +149 @@
-                
-                // --- compare the existing comment with the one in the text field
-? [_file comment] : @"" 
+
-                        if([[self connection] protocol] >= 1.1) {
-                                [[self connection] sendCommand:WCCommentCommand
@@ -215 +215 @@
-        if(![[file path] isEqualToString:[_file path]])
-                return;
+        
+        [_file release];
+        _file = [file retain];
-
-        // --- set fields

WiredClient/trunk/WCMessages.m

@@ -129 +129 @@
-        [_replyTextView setInsertionPointColor:[WCSettings objectForKey:WCMessagesTextColor]];
-        [_replyTextView setNeedsDisplay:YES];
+        [_broadcastTextView setFont:[WCSettings objectForKey:WCMessagesFont]];
-        [_broadcastTextView setTextColor:[WCSettings objectForKey:WCMessagesTextColor]];
-        [_broadcastTextView setBackgroundColor:[WCSettings objectForKey:WCMessagesBackgroundColor]];

WiredClient/trunk/WCPreview.h

@@ -27 +27 @@
- */
-
+@class WCError;
+
-@interface WCPreview : WCConnectionController {
-        IBOutlet NSWindow                               *_textWindow;
@@ -37 +39 @@
-        IBOutlet WIPDFView                              *_pdfView;
-
-
+
+
-}
-
@@ -50 +53 @@
-+ (NSArray *)imageFileTypes;
-
-
+ error:(WCError **)error
-
-@end

WiredClient/trunk/WCPreview.m

@@ -30 +30 @@
-#import "WCPreview.h"
-
-
+pod 
-#define WCPreviewRTFExtensions                  @"rtf"
-#define WCPreviewHTMLExtensions                 @"htm html shtm shtml"
@@ -39 +39 @@
-@interface WCPreview(Private)
-
-
+ error:(WCError **)error
-
-- (void)_update;
-
+- (BOOL)_openFileAtPath:(NSString *)path error:(WCError **)error;
+
-@end
-
@@ -48 +50 @@
-@implementation WCPreview(Private)
-
-
+error:(WCError **)error 
-        self = [super initWithWindowNibName:@"Preview" connection:connection];
-
-        _path = [path retain];
-
-        [self window];
@@ -60 +60 @@
-                           name:WCPreferencesDidChange];
-        
+        if(![self _openFileAtPath:path error:error]) {
+                [self release];
+                
+                return NULL;
+        }
+        
-        [self showWindow:self];
-        
@@ -75 +81 @@
-        [_textView setTextColor:[WCSettings objectForKey:WCPreviewTextColor]];
-        [_textView setBackgroundColor:[WCSettings objectForKey:WCPreviewBackgroundColor]];
+}
+
+
+
+#pragma mark -
+
+- (BOOL)_openFileAtPath:(NSString *)path error:(WCError **)error {
+        NSString                *extension;
+        BOOL                    result = NO;
+
+        extension = [[path pathExtension] lowercaseString];
+
+        if([[WCPreview textFileTypes] containsObject:extension] || [extension isEqualToString:@""]) {
+                NSString        *text;
+ 
+                text = [NSString stringWithContentsOfFile:path];
+
+                if(!text) {
+                        *error = [WCError errorWithDomain:WCWiredClientErrorDomain code:WCWiredClientOpenFailed argument:path];
+                        
+                        goto end;
+                }
+
+                [_textView setString:text];
+                [_textWindow setTitleWithRepresentedFilename:path];
+                [self setWindow:_textWindow];
+        }
+        else if([[WCPreview RTFFileTypes] containsObject:extension]) {
+                NSAttributedString      *rtf;
+                NSData                          *data;
+
+                data = [NSData dataWithContentsOfFile:path];
+
+                if(!data) {
+                        *error = [WCError errorWithDomain:WCWiredClientErrorDomain code:WCWiredClientOpenFailed argument:path];
+
+                        goto end;
+                }
+
+                rtf = [[NSAttributedString alloc] initWithRTF:data documentAttributes:NULL];
+
+                if(!rtf) {
+                        *error = [WCError errorWithDomain:WCWiredClientErrorDomain code:WCWiredClientOpenFailed argument:path];
+
+                        goto end;
+                }
+
+                [[_textView textStorage] setAttributedString:rtf];
+                [_textWindow setTitleWithRepresentedFilename:path];
+                [self setWindow:_textWindow];
+
+                [rtf release];
+        }
+        else if([[WCPreview HTMLFileTypes] containsObject:extension]) {
+                NSData                          *data;
+
+                data = [NSData dataWithContentsOfFile:path];
+
+                if(!data) {
+                        *error = [WCError errorWithDomain:WCWiredClientErrorDomain code:WCWiredClientOpenFailed argument:path];
+
+                        goto end;
+                }
+
+                [[_htmlView mainFrame] loadData:data MIMEType:NULL textEncodingName:NULL baseURL:NULL];
+
+                [_htmlWindow setTitleWithRepresentedFilename:path];
+                [self setWindow:_htmlWindow];
+        }
+        else if([[WCPreview PDFFileTypes] containsObject:extension]) {
+                NSPDFImageRep   *pdf;
+                NSRect                  rect, frame;
+                NSSize                  size;
+
+                pdf = [NSPDFImageRep imageRepWithContentsOfFile:path];
+
+                if(!pdf) {
+                        *error = [WCError errorWithDomain:WCWiredClientErrorDomain code:WCWiredClientOpenFailed argument:path];
+
+                        goto end;
+                }
+
+                size = [pdf bounds].size;
+                rect = NSMakeRect(0, 0, size.width, size.height);
+                frame = [NSWindow frameRectForContentRect:rect styleMask:[_pdfWindow styleMask]];
+                size.height += 1.0;
+                frame.size.height += 1.0;
+
+                [_pdfView setPDF:pdf];
+                [_pdfWindow setContentSize:size];
+                [_pdfWindow setMaxSize:NSMakeSize(frame.size.width, frame.size.height * [pdf pageCount])];
+                [_pdfWindow setMinSize:frame.size];
+                [_pdfWindow center];
+                [_pdfWindow setTitleWithRepresentedFilename:path];
+                [self setWindow:_pdfWindow];
+        }
+        else if([[WCPreview NFOFileTypes] containsObject:extension]) {
+                NSString                        *nfo;
+                NSData                          *data;
+                NSStringEncoding        encoding;
+                
+                data = [NSData dataWithContentsOfFile:path];
+                
+                if(!data) {
+                        *error = [WCError errorWithDomain:WCWiredClientErrorDomain code:WCWiredClientOpenFailed argument:path];
+                        
+                        goto end;
+                }
+                
+                encoding = CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingDOSLatinUS);
+                nfo = [NSString stringWithData:data encoding:encoding];
+                
+                if(!nfo) {
+                        *error = [WCError errorWithDomain:WCWiredClientErrorDomain code:WCWiredClientOpenFailed argument:path];
+                        
+                        goto end;
+                }
+                
+                [_textView setString:nfo];
+                [_textView setHorizontallyResizable:NO];
+                [_textView setFrameSize:NSMakeSize(1e7, [_textView frame].size.height)];
+                [_textWindow setContentSize:NSMakeSize(550, 550)];
+                [_textWindow setTitleWithRepresentedFilename:path];
+                [self setWindow:_textWindow];
+        }
+        else if([[WCPreview imageFileTypes] containsObject:extension]) {
+                NSImage         *image;
+                NSRect          rect;
+                NSSize          size, minSize, maxSize;
+
+                image = [[NSImage alloc] initWithContentsOfFile:path];
+
+                if(!image) {
+                        *error = [WCError errorWithDomain:WCWiredClientErrorDomain code:WCWiredClientOpenFailed argument:path];
+
+                        goto end;
+                }
+
+                minSize = [_imageWindow minSize];
+                rect = NSMakeRect(0, 0, minSize.width, minSize.height);
+                minSize = [NSWindow contentRectForFrameRect:rect styleMask:[_imageWindow styleMask]].size;
+                
+                if(size.width < minSize.width)
+                        size.width = minSize.width;
+                if(size.height < minSize.height)
+                        size.height = minSize.height;
+                
+                size = [image size];
+                rect = NSMakeRect(0, 0, size.width, size.height);
+                maxSize = [NSWindow frameRectForContentRect:rect styleMask:[_imageWindow styleMask]].size;
+
+                [_imageView setImage:image];
+                [_imageWindow setBackgroundColor:[NSColor whiteColor]];
+                [_imageWindow setContentSize:size];
+                [_imageWindow setMaxSize:maxSize];
+                [_imageWindow center];
+                [_imageWindow setTitleWithRepresentedFilename:path];
+                [self setWindow:_imageWindow];
+
+                [image release];
+        }
+        
+        result = YES;
+
+end:
+        [[NSFileManager defaultManager] removeFileAtPath:path];
+
+        return result;
-}
-
@@ -204 +378 @@
-#pragma mark -
-
-
-
+error:(WCError **)error 
+ error:error
-}
-
@@ -213 +387 @@
-        [[NSNotificationCenter defaultCenter] removeObserver:self];
-        
-        [_path release];
-
-        [super dealloc];
-}
@@ -233 +405 @@
-
-- (void)windowWillClose:(NSNotification *)notification {
-
-
-
+
+
-}
-
@@ -250 +421 @@
-}
-
-
-
-#pragma mark -
-
-- (void)showWindow:(id)sender {
-        NSString                *extension;
-
-        extension = [[_path pathExtension] lowercaseString];
-
-        if([[WCPreview textFileTypes] containsObject:extension]) {
-                NSString        *text;
- 
-                text = [NSString stringWithContentsOfFile:_path];
-
-                if(!text) {
-//                      [WCError setWithError:WCApplicationErrorOpenFailed];
-//                      [WCError setArgument:_path];
-//                      [WCError show];
-
-                        [self release];
-                        return;
-                }
-
-                [_textView setString:text];
-                [_textWindow setTitleWithRepresentedFilename:_path];
-                [self setWindow:_textWindow];
-        }
-        else if([[WCPreview RTFFileTypes] containsObject:extension]) {
-                NSAttributedString      *rtf;
-                NSData                          *data;
-
-                data = [NSData dataWithContentsOfFile:_path];
-
-                if(!data) {
-//                      [WCError setWithError:WCApplicationErrorOpenFailed];
-//                      [WCError setArgument:_path];
-//                      [WCError show];
-
-                        [self release];
-                        return;
-                }
-
-                rtf = [[NSAttributedString alloc] initWithRTF:data documentAttributes:NULL];
-
-                if(!rtf) {
-//                      [WCError setWithError:WCApplicationErrorOpenFailed];
-//                      [WCError setArgument:_path];
-//                      [WCError show];
-
-                        [self release];
-                        return;
-                }
-
-                [[_textView textStorage] setAttributedString:rtf];
-                [_textWindow setTitleWithRepresentedFilename:_path];
-                [self setWindow:_textWindow];
-
-                [rtf release];
-        }
-        else if([[WCPreview HTMLFileTypes] containsObject:extension]) {
-                NSAttributedString      *html;
-                NSData                          *data;
-
-                data = [NSData dataWithContentsOfFile:_path];
-
-                if(!data) {
-//                      [WCError setWithError:WCApplicationErrorOpenFailed];
-//                      [WCError setArgument:_path];
-//                      [WCError show];
-
-                        [self release];
-                        return;
-                }
-
-                html = [[NSAttributedString alloc] initWithHTML:data documentAttributes:NULL];
-
-                if(!html) {
-//                      [WCError setWithError:WCApplicationErrorOpenFailed];
-//                      [WCError setArgument:_path];
-//                      [WCError show];
-
-                        [self release];
-                        return;
-                }
-
-                [[_textView textStorage] setAttributedString:html];
-                [_textWindow setTitleWithRepresentedFilename:_path];
-                [self setWindow:_textWindow];
-
-                [html release];
-        }
-        else if([[WCPreview PDFFileTypes] containsObject:extension]) {
-                NSPDFImageRep   *pdf;
-                NSRect                  rect, frame;
-                NSSize                  size;
-
-                pdf = [NSPDFImageRep imageRepWithContentsOfFile:_path];
-
-                if(!pdf) {
-//                      [WCError setWithError:WCApplicationErrorOpenFailed];
-//                      [WCError setArgument:_path];
-//                      [WCError show];
-
-                        [self release];
-                        return;
-                }
-
-                size = [pdf bounds].size;
-                rect = NSMakeRect(0, 0, size.width, size.height);
-                frame = [NSWindow frameRectForContentRect:rect styleMask:[_pdfWindow styleMask]];
-                size.height += 1.0;
-                frame.size.height += 1.0;
-
-                [_pdfView setPDF:pdf];
-                [_pdfWindow setContentSize:size];
-                [_pdfWindow setMaxSize:NSMakeSize(frame.size.width, frame.size.height * [pdf pageCount])];
-                [_pdfWindow setMinSize:frame.size];
-                [_pdfWindow center];
-                [_pdfWindow setTitleWithRepresentedFilename:_path];
-                [self setWindow:_pdfWindow];
-        }
-        else if([[WCPreview NFOFileTypes] containsObject:extension]) {
-                NSString                        *nfo;
-                NSData                          *data;
-                NSStringEncoding        encoding;
-                
-                data = [NSData dataWithContentsOfFile:_path];
-                
-                if(!data) {
-//                      [WCError setWithError:WCApplicationErrorOpenFailed];
-//                      [WCError setArgument:_path];
-//                      [WCError show];
-                        
-                        [self release];
-                        return;
-                }
-                
-                encoding = CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingDOSLatinUS);
-                nfo = [NSString stringWithData:data encoding:encoding];
-                
-                if(!nfo) {
-//                      [WCError setWithError:WCApplicationErrorOpenFailed];
-//                      [WCError setArgument:_path];
-//                      [WCError show];
-                        
-                        [self release];
-                        return;
-                }
-                
-                [_textView setString:nfo];
-                [_textView setHorizontallyResizable:NO];
-                [_textView setFrameSize:NSMakeSize(1e7, [_textView frame].size.height)];
-                [_textWindow setContentSize:NSMakeSize(550, 550)];
-                [_textWindow setTitleWithRepresentedFilename:_path];
-                [self setWindow:_textWindow];
-        }
-        else if([[WCPreview imageFileTypes] containsObject:extension]) {
-                NSImage         *image;
-                NSRect          rect;
-                NSSize          size, minSize, maxSize;
-
-                image = [[NSImage alloc] initWithContentsOfFile:_path];
-
-                if(!image) {
-//                      [WCError setWithError:WCApplicationErrorOpenFailed];
-//                      [WCError setArgument:_path];
-//                      [WCError show];
-
-                        [self release];
-                        return;
-                }
-
-                minSize = [_imageWindow minSize];
-                rect = NSMakeRect(0, 0, minSize.width, minSize.height);
-                minSize = [NSWindow contentRectForFrameRect:rect styleMask:[_imageWindow styleMask]].size;
-                
-                if(size.width < minSize.width)
-                        size.width = minSize.width;
-                if(size.height < minSize.height)
-                        size.height = minSize.height;
-                
-                size = [image size];
-                rect = NSMakeRect(0, 0, size.width, size.height);
-                maxSize = [NSWindow frameRectForContentRect:rect styleMask:[_imageWindow styleMask]].size;
-
-                [_imageView setImage:image];
-                [_imageWindow setBackgroundColor:[NSColor whiteColor]];
-                [_imageWindow setContentSize:size];
-                [_imageWindow setMaxSize:maxSize];
-                [_imageWindow center];
-                [_imageWindow setTitleWithRepresentedFilename:_path];
-                [self setWindow:_imageWindow];
-
-                [image release];
-        }
-
-        [super showWindow:sender];
-}
-
-@end

WiredClient/trunk/WCTrackers.m

@@ -539 +539 @@
-        if([tracker type] == WCTrackerServer && ![tracker netService]) {
-                if(tableColumn == _usersTableColumn)
-item
+tracker
-                else if(tableColumn == _speedTableColumn)
-item
+tracker
-                else if(tableColumn == _guestTableColumn)
-item
+tracker
-                else if(tableColumn == _downloadTableColumn)
-item
+tracker
-                else if(tableColumn == _filesTableColumn)
-item
+tracker
-                else if(tableColumn == _sizeTableColumn)
-                        return [NSString humanReadableStringForSize:[tracker size]];
-                else if(tableColumn == _descriptionTableColumn)
-item
+tracker
-        }
-

WiredClient/trunk/WCTransfers.m

@@ -399 +399 @@
-        WCTransfer                      *nextTransfer;
-        WCFile                          *file;
+        WCPreview                       *preview;
+        WCError                         *error;
-        unsigned int            files;
-        BOOL                            next = YES;
@@ -438 +440 @@
-                        
-                        if([transfer type] == WCTransferDownload) {
-
-
+
+
+
+
+
+
-                        } else {
-                                dictionary = [NSDictionary dictionaryWithObjectsAndKeys:

WiredClient/trunk/WiredClient.xcodeproj/project.pbxproj

@@ -84 +84 @@
-                771E6D510755F506000F9195 /* WCConversation.m in Sources */ = {isa = PBXBuildFile; fileRef = 771E6D4F0755F506000F9195 /* WCConversation.m */; };
-                77724B3F097D39EE0003B608 /* WiredAdditions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5E8BAFA08748EFD0010F2A4 /* WiredAdditions.framework */; };
+                777D36C50987E125005B5EC1 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 777D36C40987E125005B5EC1 /* WebKit.framework */; };
-                777E657B0740F34700A8DE0B /* WCFilesBrowserCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 777E65790740F34700A8DE0B /* WCFilesBrowserCell.m */; };
-                777E663D07412EF300A8DE0B /* Columns.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 777E663C07412EF300A8DE0B /* Columns.tiff */; };
@@ -343 +344 @@
-                771E6D4E0755F506000F9195 /* WCConversation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCConversation.h; sourceTree = "<group>"; };
-                771E6D4F0755F506000F9195 /* WCConversation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WCConversation.m; sourceTree = "<group>"; };
+                777D36C40987E125005B5EC1 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
-                777E65780740F34700A8DE0B /* WCFilesBrowserCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCFilesBrowserCell.h; sourceTree = "<group>"; };
-                777E65790740F34700A8DE0B /* WCFilesBrowserCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WCFilesBrowserCell.m; sourceTree = "<group>"; };
@@ -555 +557 @@
-                                A5D4F28006D75DA4002A33D0 /* ExceptionHandling.framework in Frameworks */,
-                                A5A3400707216D8900A16E9A /* Security.framework in Frameworks */,
+                                777D36C50987E125005B5EC1 /* WebKit.framework in Frameworks */,
-                                77724B3F097D39EE0003B608 /* WiredAdditions.framework in Frameworks */,
-                        );
@@ -569 +572 @@
-                                A5D4F27F06D75DA4002A33D0 /* ExceptionHandling.framework */,
-                                A5A3400607216D8900A16E9A /* Security.framework */,
+                                777D36C40987E125005B5EC1 /* WebKit.framework */,
-                                A54D35FA0762565B00227EBE /* WiredAdditions.framework */,
-                        );

WiredClient/trunk/prefix.pch

@@ -35 +35 @@
-#import <Security/SecKeychain.h>
-#import <Security/SecKeychainItem.h>
+#import <WebKit/WebKit.h>
-#import <WiredAdditions/WiredAdditions.h>
-