Changeset 4963

Timestamp:

10/16/07 18:25:40 (1 year ago)

Author:

morris

Message:

Update for WiredAdditions?

Files:

• WiredClient/trunk/WCFileInfo.m (modified) (1 diff)
• WiredClient/trunk/WCFilesController.m (modified) (3 diffs)
• WiredClient/trunk/WCServerInfo.m (modified) (1 diff)
• WiredClient/trunk/WCStats.m (modified) (1 diff)
• WiredClient/trunk/WCTrackers.m (modified) (1 diff)
• WiredClient/trunk/WCTransfer.m (modified) (3 diffs)
• WiredClient/trunk/WCUserInfo.m (modified) (1 diff)

WiredClient/trunk/WCFileInfo.m

@@ -272 +272 @@
-        if([file type] == WCFileFile) {
-                [_sizeTextField setStringValue:
-WithBytesForSize:[file size]
+ForSizeInBytes:[file size] withBytes:YES
-        } else {
-                [_sizeTextField setStringValue:[NSSWF:

WiredClient/trunk/WCFilesController.m

@@ -137 +137 @@
-                                ? NSLS(@"item", @"Item singular")
-                                : NSLS(@"items", @"Item plural"),
-
+InBytes
-        } else {
-                [_statusTextField setStringValue:[NSSWF:
@@ -145 +145 @@
-                                ? NSLS(@"item", @"Item singular")
-                                : NSLS(@"items", @"Item plural"),
-
-
+InBytes
+InBytes
-        }
-}
@@ -307 +307 @@
-        else if(tableColumn == _sizeTableColumn) {
-                if([file type] == WCFileFile) {
-
+InBytes
-                } else {
-                        return [NSSWF:NSLS(@"%llu %@", @"Files folder size (count, 'item(s)'"),

WiredClient/trunk/WCServerInfo.m

@@ -100 +100 @@
-        [_filesTextField setIntValue:[server files]];
-        [_sizeTextField setStringValue:
-
+InBytes
-        
-        // --- resize dynamic fields

WiredClient/trunk/WCStats.m

@@ -320 +320 @@
-        
-        string = [NSSWF:NSLS(@"%@ downloaded, %@/s max download speed, %@ uploaded, %@/s max upload speed, %@ chat, %@ online, %lu %@ received, %lu %@ sent", @"Stats message"),
-
+InBytes
-                        [[self _objectForKey:WCStatsDownloaded] unsignedLongLongValue]],
-
+InBytes
-                        [[self _objectForKey:WCStatsMaxDownloadSpeed] unsignedLongLongValue]],
-
+InBytes
-                        [[self _objectForKey:WCStatsUploaded] unsignedLongLongValue]],
-
+InBytes
-                        [[self _objectForKey:WCStatsMaxUploadSpeed] unsignedLongLongValue]],
-
+InBytes
-                        [[self _objectForKey:WCStatsChat] unsignedLongLongValue]],
-                [NSString humanReadableStringForTimeInterval:

WiredClient/trunk/WCTrackers.m

@@ -579 +579 @@
-                        return [NSSWF:@"%lu", [tracker files]];
-                else if(tableColumn == _sizeTableColumn)
-
+InBytes
-                else if(tableColumn == _descriptionTableColumn)
-                        return [tracker serverDescription];

WiredClient/trunk/WCTransfer.m

@@ -484 +484 @@
-                                        [self transferredFiles],
-                                        [self totalFiles],
-
-
-
+InBytes
+InBytes
+InBytes
-                                        [NSString humanReadableStringForTimeInterval:interval]];
-                        } else {
-                                return [NSSWF:NSLS(@"%@ of %@, %@/s, %@", @"Transfer status (transferred, size, speed, time)"),
-
-
-
+InBytes
+InBytes
+InBytes
-                                        [NSString humanReadableStringForTimeInterval:interval]];
-                        }
@@ -509 +509 @@
-                                        [self transferredFiles],
-                                        [self totalFiles],
-
-
+InBytes
+InBytes
-                        } else {
-                                return [NSSWF:
-                                        NSLS(@"Stopped at %@ of %@", @"Transfer stopped (transferred, size)"),
-
-
+InBytes
+InBytes
-                        }
-                        break;
@@ -527 +527 @@
-                                return [NSSWF:NSLS(@"Finished %lu files, %@, average %@/s, took %@", @"Transfer finished (files, transferred, speed, time)"),
-                                        [self transferredFiles],
-
-
+InBytes
+InBytes
-                                        [NSString humanReadableStringForTimeInterval:_accumulatedTime]];
-                        } else {
-                                return [NSSWF:NSLS(@"Finished %@, average %@/s, took %@", @"Transfer finished (files, transferred, speed, time)"),
-
-
+InBytes
+InBytes
-                                        [NSString humanReadableStringForTimeInterval:_accumulatedTime]];
-                        }

WiredClient/trunk/WCUserInfo.m

@@ -126 +126 @@
-        [textField setStringValue:[NSSWF:
-                NSLS(@"%@ of %@, %@/s, %@", "User info transfer (transferred, total, speed, time)"),
-
-
-
+InBytes
+InBytes
+InBytes
-                [NSString humanReadableStringForTimeInterval:interval]]];
-        [textField setFrameSize:[[textField cell] cellSizeForBounds:NSMakeRect(0.0, 0.0, _fieldFrame.size.width, 10000.0)]];