Changeset 3902

Timestamp:

03/15/06 21:31:03 (3 years ago)

Author:

morris

Message:

Correctly update status bar when selecting an upload folder in column view

Files:

• WiredClient/trunk/WCFile.h (modified) (1 diff)
• WiredClient/trunk/WCFile.m (modified) (2 diffs)
• WiredClient/trunk/WCFiles.m (modified) (8 diffs)

WiredClient/trunk/WCFile.h

@@ -63 +63 @@
-+ (id)fileWithDirectory:(NSString *)path;
-+ (id)fileWithPath:(NSString *)path;
++ (id)fileWithPath:(NSString *)path type:(WCFileType)type;
-+ (id)fileWithListArguments:(NSArray *)arguments;
-+ (id)fileWithInfoArguments:(NSArray *)arguments;

WiredClient/trunk/WCFile.m

@@ -229 +229 @@
-
-+ (id)fileWithDirectory:(NSString *)path {
+        return [self fileWithPath:path type:WCFileDirectory];
+}
+
+
+
++ (id)fileWithPath:(NSString *)path {
+        return [self fileWithPath:path type:WCFileFile];
+}
+
+
+
++ (id)fileWithPath:(NSString *)path type:(WCFileType)type {
-        WCFile          *file;
-        
-        file = [[self alloc] init];
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        [file _setPath:path];
-        
@@ -381 +381 @@
-
-- (NSString *)description {
-
+, type = %d
-                [self className],
-                self,
-
+
+
-}
-

WiredClient/trunk/WCFiles.m

@@ -53 +53 @@
-- (void)_updateMenu;
-- (void)_updateFiles;
+- (void)_updateStatus;
-- (void)_showList;
-- (void)_showBrowser;
@@ -307 +308 @@
-
-- (void)_updateFiles {
+        [self _updateStatus];
+        [self _sortFiles];
+
+        [_filesTableView reloadData];
+        [_filesBrowser reloadColumn:[_filesBrowser lastColumn]];
+        [[_filesBrowser matrixInColumn:[_filesBrowser lastColumn]] setMenu:[_filesBrowser menu]];
+
+        if(_selectPath) {
+                [_filesTableView selectRowWithStringValue:[_selectPath lastPathComponent]];
+                
+                [_selectPath release];
+                _selectPath = NULL;
+        }
+        
+        [[self connection] addObserver:self
+                                                  selector:@selector(filesShouldReload:)
+                                                          name:WCFilesShouldReload];
+
+        [_progressIndicator stopAnimation:self];
+        
+        [self _makeFirstResponder];
+}
+
+
+
+- (void)_updateStatus {
-        NSEnumerator            *enumerator;
-        NSArray                         *files;
@@ -313 +340 @@
-        
-        files = [self _files];
-     
+ 
-        
-        while((file = [enumerator nextObject])) {
@@ -338 +365 @@
-                        [NSString humanReadableStringForSize:size]]];
-        }
-
-        [self _sortFiles];
-
-        [_filesTableView reloadData];
-        [_filesBrowser reloadColumn:[_filesBrowser lastColumn]];
-        [[_filesBrowser matrixInColumn:[_filesBrowser lastColumn]] setMenu:[_filesBrowser menu]];
-
-        if(_selectPath) {
-                [_filesTableView selectRowWithStringValue:[_selectPath lastPathComponent]];
-                
-                [_selectPath release];
-                _selectPath = NULL;
-        }
-        
-        [[self connection] addObserver:self
-                                                  selector:@selector(filesShouldReload:)
-                                                          name:WCFilesShouldReload];
-
-        [_progressIndicator stopAnimation:self];
-        
-        [self _makeFirstResponder];
-}
-
@@ -420 +426 @@
-        [self _validate];
-        [self _updateMenu];
+        [self _updateStatus];
-        
-        [[self window] setTitle:[[self _currentPath] path] withSubtitle:[[self connection] name]];
@@ -552 +559 @@
-        WCAccount               *account;
-        WCFileType              type;
-
+
-        account = [[self connection] account];
-        type = [[self _currentPath] type];
@@ -1356 +1363 @@
-
-- (void)browserDidSingleClick:(id)sender {
-path
+file
-        
-        if(![[self connection] isConnected])
@@ -1363 +1370 @@
-        [self _validate];
-        
-path = [WCFile fileWithDirectory:[[_rootPath path] stringByAppendingPathComponent:[_filesBrowser path]]
-
-[[_filesBrowser selectedCell] isLeaf
-path = [WCFile fileWithDirectory:[[path path] stringByDeletingLastPathComponent
+file = [[_filesBrowser selectedCell] representedObject
+
+![file isFolder
+file = [WCFile fileWithPath:[[file path] stringByDeletingLastPathComponent] type:[file type
-                
-
-
+
+
+
+
-        } else {
-path
-path
+file
+file
-        }
-}