Changeset 4974

Timestamp:

10/18/07 21:34:14 (1 year ago)

Author:

morris

Message:

Update for WA

Files:

• WiredClient/trunk/WCAccounts.m (modified) (2 diffs)
• WiredClient/trunk/WCDock.m (modified) (3 diffs)
• WiredClient/trunk/WCFilesController.m (modified) (2 diffs)
• WiredClient/trunk/WCMessages.m (modified) (7 diffs)
• WiredClient/trunk/WCTrackers.m (modified) (2 diffs)

WiredClient/trunk/WCAccounts.m

@@ -525 +525 @@
-
-        if(tableColumn == _nameTableColumn) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-        else if(tableColumn == _typeTableColumn) {
@@ -559 +544 @@
-
-
+- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
+        if(tableColumn == _nameTableColumn) {
+                if([[self _accountAtIndex:row] type] == WCAccountUser)
+                        [cell setImage:_userImage];
+                else
+                        [cell setImage:_groupImage];
+        }
+}
+
+
-- (NSString *)tableView:(NSTableView *)tableView stringValueForRow:(NSInteger)row {
-        return [[self _accountAtIndex:row] name];

WiredClient/trunk/WCDock.m

@@ -223 +223 @@
-        
-        iconCell = [[WIIconCell alloc] init];
-
+//
-        [_nameTableColumn setDataCell:iconCell];
-        [iconCell release];
@@ -602 +602 @@
-                        image = [image tintedImageWithColor:[NSColor colorWithDeviceWhite:1.0 alpha:0.5]];
-                
-
-
-
-
+
-        }
-        else if(tableColumn == _usersTableColumn) {
@@ -644 +641 @@
-
-- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
+        WCServerConnection      *connection;
+        NSImage                         *image;
+        
+        connection = [self _connectionAtIndex:row];
+
+        if(tableColumn == _nameTableColumn) {
+                image = [connection isConnected] ? _connectedImage : _disconnectedImage;
+
+                if([connection isHidden])
+                        image = [image tintedImageWithColor:[NSColor colorWithDeviceWhite:1.0 alpha:0.5]];
+                
+                [cell setImage:image];
+        }
+
-        if([cell respondsToSelector:@selector(setTextColor:)]) {
-[self _connectionAtIndex:row]
+connection
-                        ? [NSColor grayColor]
-                        : [NSColor blackColor]];

WiredClient/trunk/WCFilesController.m

@@ -293 +293 @@
-        file = [self fileAtIndex:row];
-
-
-
-
-
-
-
+
+
-        else if(tableColumn == _kindTableColumn)
-                return [file kind];
@@ -322 +318 @@
-
-
+- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
+        if(tableColumn == _nameTableColumn)
+                [cell setImage:[[self fileAtIndex:row] iconWithWidth:16.0]];
+}
+
+
-- (NSString *)tableView:(NSTableView *)tableView stringValueForRow:(NSInteger)row {
-        return [[self fileAtIndex:row] name];

WiredClient/trunk/WCMessages.m

@@ -1016 +1016 @@
-
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
-
-
+
-        WCConversation          *conversation;
-        NSUInteger                      count = 0;
@@ -1023 +1022 @@
-        if([item isKindOfClass:[NSString class]]) {
-                name = item;
-                image = _conversationIcon;
-
-                if([_titles indexOfObject:item] == 0)
@@ -1033 +1031 @@
-                conversation = item;
-                name = [conversation userNick];
-                image = NULL;
-                count = [[self _messagesForConversation:conversation unreadOnly:YES] count];
-        }
@@ -1040 +1037 @@
-                name = [name stringByAppendingFormat:@" (%lu)", count];
-        
-
-
-
-
-
-
+
-}
-
@@ -1051 +1043 @@
-
-- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item {
+        NSImage                 *image;
-        NSUInteger              count = 0;
-        
-        if([item isKindOfClass:[NSString class]]) {
+                image = _conversationIcon;
+
-                if([_titles indexOfObject:item] == 0)
-                        count = [[self _unreadMessagesForType:WCMessagePrivateMessage] count];
@@ -1061 +1056 @@
-        else if([item isKindOfClass:[WCConversation class]]) {
-                count = [[self _messagesForConversation:item unreadOnly:YES] count];
+                image = NULL;
-        }       
-
@@ -1067 +1063 @@
-        else
-                [cell setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
+        
+        [cell setImage:image];
-}
-

WiredClient/trunk/WCTrackers.m

@@ -558 +558 @@
-        tracker = item;
-        
-
-
-
-
-
-
-
-
+
+
-        
-        if([tracker type] == WCTrackerServer && ![tracker netService]) {
@@ -589 +583 @@
-
-
+- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item {
+        WCTracker       *tracker;
+        
+        tracker = item;
+        
+        if(tableColumn == _nameTableColumn)
+                [cell setImage:[tracker icon]];
+}
+
+
+
-- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
-        if([(WCTracker *) item type] != WCTrackerServer)