Changeset 5163

Timestamp:

Feb 28, 2008, 4:40:14 PM (14 years ago)

Author:

livings124

Message:

make the group "ying-yang" full sized; hide dl speed columns when showing ratio

Location:

trunk/macosx

Files:

• Controller.m (modified) (3 diffs)
• TorrentTableView.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -2498 +2498 @@
         }
         else if ([ident isEqualToString: @"DL Image"])
-            return ![fDefaults boolForKey: @"DisplayGroupRowRatio"] ? [NSImage imageNamed: @"DownArrowGroupTemplate.png"] : nil;
+            return [NSImage imageNamed: @"DownArrowGroupTemplate.png"];
         else if ([ident isEqualToString: @"UL Image"])
             return [NSImage imageNamed: [fDefaults boolForKey: @"DisplayGroupRowRatio"]
@@ -2504 +2504 @@
         else
         {
-            BOOL upload = [ident isEqualToString: @"UL"];
             if ([fDefaults boolForKey: @"DisplayGroupRowRatio"])
             {
-                if (!upload)
-                    return nil;
-                
                 uint64_t uploaded = 0, downloaded = 0;
                 NSEnumerator * enumerator = [[item objectForKey: @"Torrents"] objectEnumerator];
@@ -2523 +2519 @@
             else
             {
+                BOOL upload = [ident isEqualToString: @"UL"];
+                
                 float rate = 0.0;
                 NSEnumerator * enumerator = [[item objectForKey: @"Torrents"] objectEnumerator];

trunk/macosx/TorrentTableView.m

@@ -49 +49 @@
 - (BOOL) pointInGroupStatusRect: (NSPoint) point;
 
+- (void) setGroupStatusColumns;
+
 - (void) updateFileMenu: (NSMenu *) menu forFiles: (NSArray *) files;
 
@@ -90 +92 @@
             fCollapsedGroups = [[NSMutableIndexSet alloc] init];
         
+        //set group columns to show ratio (nib is set to speeds)
+        if ([fDefaults boolForKey: @"DisplayGroupRowRatio"])
+            [self setGroupStatusColumns];
+        
         fMouseControlRow = -1;
         fMouseRevealRow = -1;
@@ -346 +352 @@
     {
         [fDefaults setBool: ![fDefaults boolForKey: @"DisplayGroupRowRatio"] forKey: @"DisplayGroupRowRatio"];
-        [self reloadData];
+        [self setGroupStatusColumns];
+        
         return;
     }
@@ -775 +782 @@
             || (([ident isEqualToString: @"DL"] || [ident isEqualToString: @"DL Image"])
             && ![fDefaults boolForKey: @"DisplayGroupRowRatio"]);
+}
+
+- (void) setGroupStatusColumns
+{
+    BOOL ratio = [fDefaults boolForKey: @"DisplayGroupRowRatio"];
+    
+    NSTableColumn * dlTableColumn = [self tableColumnWithIdentifier: @"DL"];
+    if ([dlTableColumn isHidden] == ratio)
+        return;
+    
+    [dlTableColumn setHidden: ratio];
+    [[self tableColumnWithIdentifier: @"DL Image"] setHidden: ratio];
+    
+    [[self tableColumnWithIdentifier: @"UL Image"] setWidth: ratio ? 10.0 : 8.0];
+    
+    NSTableColumn * groupTableColumn = [self tableColumnWithIdentifier: @"Group"];
+    [groupTableColumn setWidth: [groupTableColumn width] + (ratio ? -2.0 : 2.0)];
 }