slightly color the progress bars of waiting (queued)torrents, and adjust the light green color a bit (thanks macHD for the gradients)
This commit is contained in:
parent
c7bd0fcddd
commit
4daada62a4
|
@ -34,8 +34,10 @@
|
||||||
+ (CTGradient *)progressGrayGradient;
|
+ (CTGradient *)progressGrayGradient;
|
||||||
+ (CTGradient *)progressLightGrayGradient;
|
+ (CTGradient *)progressLightGrayGradient;
|
||||||
+ (CTGradient *)progressBlueGradient;
|
+ (CTGradient *)progressBlueGradient;
|
||||||
|
+ (CTGradient *)progressDarkBlueGradient;
|
||||||
+ (CTGradient *)progressGreenGradient;
|
+ (CTGradient *)progressGreenGradient;
|
||||||
+ (CTGradient *)progressLightGreenGradient;
|
+ (CTGradient *)progressLightGreenGradient;
|
||||||
|
+ (CTGradient *)progressDarkGreenGradient;
|
||||||
+ (CTGradient *)progressYellowGradient;
|
+ (CTGradient *)progressYellowGradient;
|
||||||
+ (CTGradient *)progressTransparentGradient;
|
+ (CTGradient *)progressTransparentGradient;
|
||||||
@end
|
@end
|
||||||
|
|
|
@ -230,6 +230,46 @@
|
||||||
return [newInstance autorelease];
|
return [newInstance autorelease];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ (CTGradient *)progressDarkBlueGradient
|
||||||
|
{
|
||||||
|
CTGradient *newInstance = [[[self class] alloc] init];
|
||||||
|
|
||||||
|
CTGradientElement color1;
|
||||||
|
color1.red = 0.616;
|
||||||
|
color1.green = 0.722;
|
||||||
|
color1.blue = 0.776;
|
||||||
|
color1.alpha = 1.00;
|
||||||
|
color1.position = 0;
|
||||||
|
|
||||||
|
CTGradientElement color2;
|
||||||
|
color2.red = 0.525;
|
||||||
|
color2.green = 0.631;
|
||||||
|
color2.blue = 0.737;
|
||||||
|
color2.alpha = 1.00;
|
||||||
|
color2.position = 0.5;
|
||||||
|
|
||||||
|
CTGradientElement color3;
|
||||||
|
color3.red = 0.651;
|
||||||
|
color3.green = 0.725;
|
||||||
|
color3.blue = 0.804;
|
||||||
|
color3.alpha = 1.00;
|
||||||
|
color3.position = 0.5;
|
||||||
|
|
||||||
|
CTGradientElement color4;
|
||||||
|
color4.red = 0.659;
|
||||||
|
color4.green = 0.733;
|
||||||
|
color4.blue = 0.800;
|
||||||
|
color4.alpha = 1.00;
|
||||||
|
color4.position = 1;
|
||||||
|
|
||||||
|
[newInstance addElement:&color1];
|
||||||
|
[newInstance addElement:&color2];
|
||||||
|
[newInstance addElement:&color3];
|
||||||
|
[newInstance addElement:&color4];
|
||||||
|
|
||||||
|
return [newInstance autorelease];
|
||||||
|
}
|
||||||
|
|
||||||
+ (CTGradient *)progressGreenGradient
|
+ (CTGradient *)progressGreenGradient
|
||||||
{
|
{
|
||||||
CTGradient *newInstance = [[[self class] alloc] init];
|
CTGradient *newInstance = [[[self class] alloc] init];
|
||||||
|
@ -275,30 +315,70 @@
|
||||||
CTGradient *newInstance = [[[self class] alloc] init];
|
CTGradient *newInstance = [[[self class] alloc] init];
|
||||||
|
|
||||||
CTGradientElement color1;
|
CTGradientElement color1;
|
||||||
color1.red = 0.478;
|
color1.red = 0.522;
|
||||||
color1.green = 1.00;
|
color1.green = 0.894;
|
||||||
color1.blue = 0.55;
|
color1.blue = 0.565;
|
||||||
color1.alpha = 1.00;
|
color1.alpha = 1.00;
|
||||||
color1.position = 0;
|
color1.position = 0;
|
||||||
|
|
||||||
CTGradientElement color2;
|
CTGradientElement color2;
|
||||||
color2.red = 0.388;
|
color2.red = 0.373;
|
||||||
color2.green = 0.92;
|
color2.green = 0.780;
|
||||||
color2.blue = 0.44;
|
color2.blue = 0.408;
|
||||||
color2.alpha = 1.00;
|
color2.alpha = 1.00;
|
||||||
color2.position = 0.5;
|
color2.position = 0.5;
|
||||||
|
|
||||||
CTGradientElement color3;
|
CTGradientElement color3;
|
||||||
color3.red = 0.627;
|
color3.red = 0.659;
|
||||||
color3.green = 1.00;
|
color3.green = 0.918;
|
||||||
color3.blue = 0.53;
|
color3.blue = 0.604;
|
||||||
color3.alpha = 1.00;
|
color3.alpha = 1.00;
|
||||||
color3.position = 0.5;
|
color3.position = 0.5;
|
||||||
|
|
||||||
CTGradientElement color4;
|
CTGradientElement color4;
|
||||||
color4.red = 0.675;
|
color4.red = 0.678;
|
||||||
color4.green = 1.00;
|
color4.green = 0.929;
|
||||||
color4.blue = 0.55;
|
color4.blue = 0.608;
|
||||||
|
color4.alpha = 1.00;
|
||||||
|
color4.position = 1;
|
||||||
|
|
||||||
|
[newInstance addElement:&color1];
|
||||||
|
[newInstance addElement:&color2];
|
||||||
|
[newInstance addElement:&color3];
|
||||||
|
[newInstance addElement:&color4];
|
||||||
|
|
||||||
|
return [newInstance autorelease];
|
||||||
|
}
|
||||||
|
|
||||||
|
+ (CTGradient *)progressDarkGreenGradient
|
||||||
|
{
|
||||||
|
CTGradient *newInstance = [[[self class] alloc] init];
|
||||||
|
|
||||||
|
CTGradientElement color1;
|
||||||
|
color1.red = 0.627;
|
||||||
|
color1.green = 0.714;
|
||||||
|
color1.blue = 0.639;
|
||||||
|
color1.alpha = 1.00;
|
||||||
|
color1.position = 0;
|
||||||
|
|
||||||
|
CTGradientElement color2;
|
||||||
|
color2.red = 0.545;
|
||||||
|
color2.green = 0.635;
|
||||||
|
color2.blue = 0.561;
|
||||||
|
color2.alpha = 1.00;
|
||||||
|
color2.position = 0.5;
|
||||||
|
|
||||||
|
CTGradientElement color3;
|
||||||
|
color3.red = 0.690;
|
||||||
|
color3.green = 0.745;
|
||||||
|
color3.blue = 0.675;
|
||||||
|
color3.alpha = 1.00;
|
||||||
|
color3.position = 0.5;
|
||||||
|
|
||||||
|
CTGradientElement color4;
|
||||||
|
color4.red = 0.694;
|
||||||
|
color4.green = 0.741;
|
||||||
|
color4.blue = 0.678;
|
||||||
color4.alpha = 1.00;
|
color4.alpha = 1.00;
|
||||||
color4.position = 1;
|
color4.position = 1;
|
||||||
|
|
||||||
|
|
|
@ -525,6 +525,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
|
||||||
[NSNumber numberWithBool: [self isActive]], @"Active",
|
[NSNumber numberWithBool: [self isActive]], @"Active",
|
||||||
[NSNumber numberWithBool: [self isSeeding]], @"Seeding",
|
[NSNumber numberWithBool: [self isSeeding]], @"Seeding",
|
||||||
[NSNumber numberWithBool: [self isChecking]], @"Checking",
|
[NSNumber numberWithBool: [self isChecking]], @"Checking",
|
||||||
|
[NSNumber numberWithBool: fWaitToStart], @"Waiting",
|
||||||
[NSNumber numberWithBool: [self isError]], @"Error", nil];
|
[NSNumber numberWithBool: [self isError]], @"Error", nil];
|
||||||
|
|
||||||
if ([self isSeeding])
|
if ([self isSeeding])
|
||||||
|
|
|
@ -50,10 +50,10 @@
|
||||||
fGrayGradient = [[CTGradient progressGrayGradient] retain];
|
fGrayGradient = [[CTGradient progressGrayGradient] retain];
|
||||||
fLightGrayGradient = [[CTGradient progressLightGrayGradient] retain];
|
fLightGrayGradient = [[CTGradient progressLightGrayGradient] retain];
|
||||||
fBlueGradient = [[CTGradient progressBlueGradient] retain];
|
fBlueGradient = [[CTGradient progressBlueGradient] retain];
|
||||||
//fDarkBlueGradient = [[CTGradient progressDarkBlueGradient] retain];
|
fDarkBlueGradient = [[CTGradient progressDarkBlueGradient] retain];
|
||||||
fGreenGradient = [[CTGradient progressGreenGradient] retain];
|
fGreenGradient = [[CTGradient progressGreenGradient] retain];
|
||||||
fLightGreenGradient = [[CTGradient progressLightGreenGradient] retain];
|
fLightGreenGradient = [[CTGradient progressLightGreenGradient] retain];
|
||||||
//fDarkGreenGradient = [[CTGradient progressDarkGreenGradient] retain];
|
fDarkGreenGradient = [[CTGradient progressDarkGreenGradient] retain];
|
||||||
fYellowGradient = [[CTGradient progressYellowGradient] retain];
|
fYellowGradient = [[CTGradient progressYellowGradient] retain];
|
||||||
fTransparentGradient = [[CTGradient progressTransparentGradient] retain];
|
fTransparentGradient = [[CTGradient progressTransparentGradient] retain];
|
||||||
|
|
||||||
|
@ -88,11 +88,12 @@
|
||||||
float progress = [[info objectForKey: @"Progress"] floatValue];
|
float progress = [[info objectForKey: @"Progress"] floatValue];
|
||||||
completeBounds.size.width = progress * width;
|
completeBounds.size.width = progress * width;
|
||||||
|
|
||||||
|
float left = INVALID;
|
||||||
if (progress < 1.0)
|
if (progress < 1.0)
|
||||||
{
|
{
|
||||||
[fWhiteGradient fillRect: barBounds angle: -90];
|
[fWhiteGradient fillRect: barBounds angle: -90];
|
||||||
|
|
||||||
float left = [[info objectForKey: @"Left"] floatValue];
|
left = [[info objectForKey: @"Left"] floatValue];
|
||||||
if ((progress + left) < 1.0)
|
if ((progress + left) < 1.0)
|
||||||
{
|
{
|
||||||
NSRect blankBounds = barBounds;
|
NSRect blankBounds = barBounds;
|
||||||
|
@ -120,7 +121,20 @@
|
||||||
[fBlueGradient fillRect: completeBounds angle: -90];
|
[fBlueGradient fillRect: completeBounds angle: -90];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
[fGrayGradient fillRect: completeBounds angle: -90];
|
{
|
||||||
|
if ([[info objectForKey: @"Waiting"] boolValue])
|
||||||
|
{
|
||||||
|
if (left == INVALID)
|
||||||
|
left = [[info objectForKey: @"Left"] floatValue];
|
||||||
|
|
||||||
|
if (left <= 0.0)
|
||||||
|
[fDarkGreenGradient fillRect: completeBounds angle: -90];
|
||||||
|
else
|
||||||
|
[fDarkBlueGradient fillRect: completeBounds angle: -90];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
[fGrayGradient fillRect: completeBounds angle: -90];
|
||||||
|
}
|
||||||
|
|
||||||
[[NSColor colorWithDeviceWhite: 0.0 alpha: 0.2] set];
|
[[NSColor colorWithDeviceWhite: 0.0 alpha: 0.2] set];
|
||||||
[NSBezierPath strokeRect: NSInsetRect(barBounds, 0.5, 0.5)];
|
[NSBezierPath strokeRect: NSInsetRect(barBounds, 0.5, 0.5)];
|
||||||
|
|
Loading…
Reference in New Issue