Changeset 2945

Timestamp:

06/01/05 15:39:22 (4 years ago)

Author:

morris

Message:

Resupport dragging files onto the app, this time using FHFileHandler

Fix an exception during exit if handler was NULL

Files:

• Footagehead/trunk/FHController.m (modified) (14 diffs)

Footagehead/trunk/FHController.m

@@ -45 +45 @@
-- (FHFile *)fileAtIndex:(unsigned int)index;
-
+- (void)loadURL:(ZAURL *)url;
-- (void)loadURL:(ZAURL *)url selectRow:(int)row;
+- (void)loadURL:(ZAURL *)url selectFile:(NSString *)file;
+- (void)loadURL:(ZAURL *)url selectRow:(int)row file:(NSString *)file;
-- (void)loadFile:(FHFile *)file;
-
@@ -190 +193 @@
-
-                // --- load files
- selectRow:0
+
-        }
-        
@@ -199 +202 @@
-
-- (void)applicationWillTerminate:(NSNotification *)notification {
-
+
+
+
+
+
+
-        
-        [[FHCache cache] purgeTemporaryPaths];
@@ -213 +221 @@
-
-- (BOOL)application:(NSApplication *)application openFile:(NSString *)path {
-
+
+
+
+
+
+
+
+
+
+
-
-        return YES;
@@ -377 +394 @@
-- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo {
-        if(returnCode == NSOKButton)
- selectRow:0
+
-}
-
@@ -398 +415 @@
-        
-        if(returnCode == NSRunStoppedResponse)
- selectRow:0
+
-}
-
@@ -423 +440 @@
-                url = [[ZAURL alloc] initWithScheme:@"spotlight" host:@"localhost" port:0];
-                [url setPath:[NSSWF:@"/%@", [_openSpotlightTextView string]]];
- selectRow:0
+
-                [url release];
-        }
@@ -438 +455 @@
-        if(![url isEqual:[_handler URL]]) {
-                name = [[[_handler URL] path] lastPathComponent];
- selectRow:0
+
-                [self updateImage];
-                [_tableView selectRowWithStringValue:name];
@@ -447 +464 @@
-
-- (IBAction)openMenu:(id)sender {
- selectRow:0
+
-        [self updateImage];
-}
@@ -459 +476 @@
-        
-        if([file isDirectory])
- selectRow:0
+
-        else
-                [[NSWorkspace sharedWorkspace] openURL:[[file URL] URL]];
@@ -472 +489 @@
-        
-        if([file isDirectory])
- selectRow:0
+
-}
-
@@ -701 +718 @@
-#pragma mark -
-
+- (void)loadURL:(ZAURL *)url {
+        [self loadURL:url selectRow:0 file:NULL];
+}
+
+
+
-- (void)loadURL:(ZAURL *)url selectRow:(int)row {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        [self startSpinning];
@@ -711 +747 @@
-        if(!handler) {
-                [self stopSpinning];
+                
+                if(!_handler)
+                        [_imageView setImage:NULL];
-                
-                return;
@@ -729 +768 @@
-        [self updateButtons];
-        [self reloadPathMenu];
+        
+        if(file) {
+                for(i = 0, count = [[_handler files] count]; i < count; i++) {
+                        if([[[[_handler files] objectAtIndex:i] name] isEqualToString:file]) {
+                                row = i;
+                                
+                                break;
+                        }
+                }
+        }
-        
-        select = (row != [_tableView selectedRow]);