Changeset 6995

Timestamp:

Oct 31, 2008, 12:13:50 AM (12 years ago)

Author:

livings124

Message:

CTGradientAdditions is now ProgressGradients?

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/Badger.m (modified) (1 diff)
• macosx/FilterButton.h (modified) (1 diff)
• macosx/FilterButton.m (modified) (1 diff)
• macosx/ProgressGradients.h (moved) (moved from trunk/macosx/CTGradient/CTGradientAdditions.h) (1 diff)
• macosx/ProgressGradients.m (moved) (moved from trunk/macosx/CTGradient/CTGradientAdditions.m) (1 diff)
• macosx/TorrentCell.h (modified) (1 diff)
• macosx/TorrentCell.m (modified) (8 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -306 +306 @@
                 D4AF3B300C41F7A600D46B6B /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = D4AF3B2E0C41F7A500D46B6B /* list.h */; };
                 E138A9770C04D88F00C5426C /* CTGradient.m in Sources */ = {isa = PBXBuildFile; fileRef = E138A9740C04D88F00C5426C /* CTGradient.m */; };
-                E138A9780C04D88F00C5426C /* CTGradientAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = E138A9760C04D88F00C5426C /* CTGradientAdditions.m */; };
+                E138A9780C04D88F00C5426C /* ProgressGradients.m in Sources */ = {isa = PBXBuildFile; fileRef = E138A9760C04D88F00C5426C /* ProgressGradients.m */; };
 /* End PBXBuildFile section */
 
@@ -776 +776 @@
                 E138A9730C04D88F00C5426C /* CTGradient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CTGradient.h; sourceTree = "<group>"; };
                 E138A9740C04D88F00C5426C /* CTGradient.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CTGradient.m; sourceTree = "<group>"; };
-                E138A9750C04D88F00C5426C /* CTGradientAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CTGradientAdditions.h; sourceTree = "<group>"; };
-                E138A9760C04D88F00C5426C /* CTGradientAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CTGradientAdditions.m; sourceTree = "<group>"; };
+                E138A9750C04D88F00C5426C /* ProgressGradients.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ProgressGradients.h; path = ../ProgressGradients.h; sourceTree = "<group>"; };
+                E138A9760C04D88F00C5426C /* ProgressGradients.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ProgressGradients.m; path = ../ProgressGradients.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -1315 +1315 @@
                                 E138A9730C04D88F00C5426C /* CTGradient.h */,
                                 E138A9740C04D88F00C5426C /* CTGradient.m */,
-                                E138A9750C04D88F00C5426C /* CTGradientAdditions.h */,
-                                E138A9760C04D88F00C5426C /* CTGradientAdditions.m */,
+                                E138A9750C04D88F00C5426C /* ProgressGradients.h */,
+                                E138A9760C04D88F00C5426C /* ProgressGradients.m */,
                         );
                         name = CTGradient;
@@ -1891 +1891 @@
                                 A2FB057F0BFEB6800095564D /* DragOverlayView.m in Sources */,
                                 E138A9770C04D88F00C5426C /* CTGradient.m in Sources */,
-                                E138A9780C04D88F00C5426C /* CTGradientAdditions.m in Sources */,
+                                E138A9780C04D88F00C5426C /* ProgressGradients.m in Sources */,
                                 A215760B0C0D449A0057A26A /* NSBezierPathAdditions.m in Sources */,
                                 A2DF37070C220D03006523C1 /* CreatorWindowController.m in Sources */,

trunk/macosx/Badger.m

@@ -27 +27 @@
 #import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
-#import "NSBezierPathAdditions.h"
 
 #define COMPLETED_BOTTOM_PADDING 5.0

trunk/macosx/FilterButton.h

@@ -27 +27 @@
 @interface FilterButton : NSButton
 {
-    int fCount;
+    NSInteger fCount;
 }
 
-- (void) setCount: (int) count;
+- (void) setCount: (NSInteger) count;
 
 @end

trunk/macosx/FilterButton.m

@@ -36 +36 @@
 }
 
-- (void) setCount: (int) count
+- (void) setCount: (NSInteger) count
 {
     if (count == fCount)

trunk/macosx/ProgressGradients.h

@@ -23 +23 @@
  *****************************************************************************/
 
-#import "CTGradient.h"
+@class CTGradient;
 
-@interface CTGradient (ProgressBar)
+@interface ProgressGradients : NSObject
 
 + (CTGradient *) progressGradientForRed: (CGFloat) redComponent green: (CGFloat) greenComponent blue: (CGFloat) blueComponent;

trunk/macosx/ProgressGradients.m

@@ -23 +23 @@
  *****************************************************************************/
 
-#import "CTGradientAdditions.h"
+#import "ProgressGradients.h"
+#import "CTGradient.h"
 
-@implementation CTGradient (ProgressBar)
+@implementation ProgressGradients
 
 + (CTGradient *) progressGradientForRed: (CGFloat) redComponent green: (CGFloat) greenComponent blue: (CGFloat) blueComponent

trunk/macosx/TorrentCell.h

@@ -22 +22 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
-
-@class CTGradient;
 
 @interface TorrentCell : NSActionCell

trunk/macosx/TorrentCell.m

@@ -29 +29 @@
 #import "NSStringAdditions.h"
 #import "NSBezierPathAdditions.h"
-#import "CTGradientAdditions.h"
+#import "ProgressGradients.h"
+#import "CTGradient.h"
 
 #define BAR_HEIGHT 12.0f
@@ -589 +590 @@
             noIncludeRect.size.width = rightNoIncludeWidth;
             
-            [[CTGradient progressLightGrayGradient] fillRect: noIncludeRect angle: 90];
+            [[ProgressGradients progressLightGrayGradient] fillRect: noIncludeRect angle: 90];
         }
         
@@ -606 +607 @@
                     notAvailableRect.size.width = notAvailableWidth;
                     
-                    [[CTGradient progressRedGradient] fillRect: notAvailableRect angle: 90];
+                    [[ProgressGradients progressRedGradient] fillRect: notAvailableRect angle: 90];
                 }
             }
@@ -616 +617 @@
                 includeRect.size.width = rightWidth;
                 
-                [[CTGradient progressWhiteGradient] fillRect: includeRect angle: 90];
+                [[ProgressGradients progressWhiteGradient] fillRect: includeRect angle: 90];
             }
         }
@@ -629 +630 @@
         {
             if ([torrent isChecking])
-                [[CTGradient progressYellowGradient] fillRect: completeRect angle: 90];
+                [[ProgressGradients progressYellowGradient] fillRect: completeRect angle: 90];
             else if ([torrent isSeeding])
             {
@@ -641 +642 @@
                     ratioLeftRect.size.width = ratioLeftWidth;
                     
-                    [[CTGradient progressLightGreenGradient] fillRect: ratioLeftRect angle: 90];
+                    [[ProgressGradients progressLightGreenGradient] fillRect: ratioLeftRect angle: 90];
                 }
                 
@@ -648 +649 @@
                     completeRect.size.width = leftWidth;
                     
-                    [[CTGradient progressGreenGradient] fillRect: completeRect angle: 90];
+                    [[ProgressGradients progressGreenGradient] fillRect: completeRect angle: 90];
                 }
             }
             else
-                [[CTGradient progressBlueGradient] fillRect: completeRect angle: 90];
+                [[ProgressGradients progressBlueGradient] fillRect: completeRect angle: 90];
         }
         else
@@ -659 +660 @@
             {
                 if ([torrent progressLeft] <= 0.0f)
-                    [[CTGradient progressDarkGreenGradient] fillRect: completeRect angle: 90];
+                    [[ProgressGradients progressDarkGreenGradient] fillRect: completeRect angle: 90];
                 else
-                    [[CTGradient progressDarkBlueGradient] fillRect: completeRect angle: 90];
+                    [[ProgressGradients progressDarkBlueGradient] fillRect: completeRect angle: 90];
             }
             else
-                [[CTGradient progressGrayGradient] fillRect: completeRect angle: 90];
+                [[ProgressGradients progressGrayGradient] fillRect: completeRect angle: 90];
         }
     }