Changeset 639

Timestamp:

Jul 18, 2006, 11:40:37 PM (17 years ago)

Author:

livings124

Message:

Sort by Progress (and therefore State) will now sort completed torrents by ratio.
Added license info to ImageBackgroundView?.
Use system control text color for main font color rather than black.

Location:

trunk/macosx

Files:

• ImageBackgroundView.h (modified) (1 diff)
• ImageBackgroundView.m (modified) (2 diffs)
• Torrent.m (modified) (1 diff)
• TorrentCell.m (modified) (1 diff)

trunk/macosx/ImageBackgroundView.h

@@ -1 @@
-/* ImageBackgroundView */
+/******************************************************************************
+ * $Id$
+ * 
+ * Copyright (c) 2006 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>

trunk/macosx/ImageBackgroundView.m

@@ +1 @@
+/******************************************************************************
+ * $Id$
+ * 
+ * Copyright (c) 2006 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
+
 #import "ImageBackgroundView.h"
 
@@ -7 +31 @@
     if (fBackgroundColor)
         [fBackgroundColor release];
+    
     fBackgroundColor = [[NSColor colorWithPatternImage: image] retain];
 }

trunk/macosx/Torrent.m

@@ -600 +600 @@
 - (NSNumber *) progressSortKey
 {
-    return [NSNumber numberWithFloat: [self progress]];
+    //if finished downloading sort by ratio instead of progress
+    float progress = [self progress];
+    return [NSNumber numberWithFloat: progress < 1.0 ? progress : 2.0 + [self ratio]];
 }
 

trunk/macosx/TorrentCell.m

@@ -286 +286 @@
                                                         isEqual: [NSColor alternateSelectedControlColor]];
     NSDictionary * nameAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:
-                    highlighted ? [NSColor whiteColor] : [NSColor blackColor], NSForegroundColorAttributeName,
+                    highlighted ? [NSColor whiteColor] : [NSColor controlTextColor], NSForegroundColorAttributeName,
                     [NSFont messageFontOfSize: 12.0], NSFontAttributeName, nil];
     NSDictionary * statusAttributes = [[NSDictionary alloc] initWithObjectsAndKeys: