make progress bar yellow when checking cache (color is temporary until someone can make a real yellow one)
This commit is contained in:
parent
1067a001d9
commit
b94ddd9bc4
|
@ -36,6 +36,7 @@
|
||||||
+ (CTGradient *)progressBlueGradient;
|
+ (CTGradient *)progressBlueGradient;
|
||||||
+ (CTGradient *)progressGreenGradient;
|
+ (CTGradient *)progressGreenGradient;
|
||||||
+ (CTGradient *)progressLightGreenGradient;
|
+ (CTGradient *)progressLightGreenGradient;
|
||||||
|
+ (CTGradient *)progressYellowGradient;
|
||||||
+ (CTGradient *)progressTransparentGradient;
|
+ (CTGradient *)progressTransparentGradient;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|
|
@ -310,6 +310,12 @@
|
||||||
return [newInstance autorelease];
|
return [newInstance autorelease];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
+ (CTGradient *)progressYellowGradient
|
||||||
|
{
|
||||||
|
#warning someone make a real one!
|
||||||
|
return [CTGradient gradientWithBeginningColor: [NSColor orangeColor] endingColor: [NSColor yellowColor]];
|
||||||
|
}
|
||||||
|
|
||||||
+ (CTGradient *)progressTransparentGradient
|
+ (CTGradient *)progressTransparentGradient
|
||||||
{
|
{
|
||||||
CTGradient *newInstance = [[[self class] alloc] init];
|
CTGradient *newInstance = [[[self class] alloc] init];
|
||||||
|
|
|
@ -524,6 +524,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
|
||||||
[NSNumber numberWithFloat: [self progress]], @"Progress",
|
[NSNumber numberWithFloat: [self progress]], @"Progress",
|
||||||
[NSNumber numberWithFloat: (float)fStat->left/[self size]], @"Left",
|
[NSNumber numberWithFloat: (float)fStat->left/[self size]], @"Left",
|
||||||
[NSNumber numberWithBool: [self isActive]], @"Active",
|
[NSNumber numberWithBool: [self isActive]], @"Active",
|
||||||
|
[NSNumber numberWithBool: [self isChecking]], @"Checking",
|
||||||
[NSNumber numberWithBool: [self isError]], @"Error", nil];
|
[NSNumber numberWithBool: [self isError]], @"Error", nil];
|
||||||
|
|
||||||
if ([self isSeeding])
|
if ([self isSeeding])
|
||||||
|
@ -1658,7 +1659,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
|
||||||
{
|
{
|
||||||
NSEnumerator * enumerator = [siblings objectEnumerator];
|
NSEnumerator * enumerator = [siblings objectEnumerator];
|
||||||
while ((dict = [enumerator nextObject]))
|
while ((dict = [enumerator nextObject]))
|
||||||
if ([[dict objectForKey: @"Name"] isEqualToString: name] && [[dict objectForKey: @"IsFolder"] boolValue])
|
if ([[dict objectForKey: @"IsFolder"] boolValue] && [[dict objectForKey: @"Name"] isEqualToString: name])
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
{
|
{
|
||||||
NSImage * fErrorImage;
|
NSImage * fErrorImage;
|
||||||
CTGradient * fWhiteGradient, * fGrayGradient, * fLightGrayGradient, * fLightGreenGradient,
|
CTGradient * fWhiteGradient, * fGrayGradient, * fLightGrayGradient, * fLightGreenGradient,
|
||||||
* fGreenGradient, * fBlueGradient, * fTransparentGradient;
|
* fGreenGradient, * fYellowGradient, * fBlueGradient, * fTransparentGradient;
|
||||||
NSUserDefaults * fDefaults;
|
NSUserDefaults * fDefaults;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,6 +52,7 @@
|
||||||
fBlueGradient = [[CTGradient progressBlueGradient] retain];
|
fBlueGradient = [[CTGradient progressBlueGradient] retain];
|
||||||
fGreenGradient = [[CTGradient progressGreenGradient] retain];
|
fGreenGradient = [[CTGradient progressGreenGradient] retain];
|
||||||
fLightGreenGradient = [[CTGradient progressLightGreenGradient] retain];
|
fLightGreenGradient = [[CTGradient progressLightGreenGradient] retain];
|
||||||
|
fYellowGradient = [[CTGradient progressYellowGradient] retain];
|
||||||
fTransparentGradient = [[CTGradient progressTransparentGradient] retain];
|
fTransparentGradient = [[CTGradient progressTransparentGradient] retain];
|
||||||
|
|
||||||
fErrorImage = [[NSImage imageNamed: @"Error"] copy];
|
fErrorImage = [[NSImage imageNamed: @"Error"] copy];
|
||||||
|
@ -100,7 +101,9 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ([[info objectForKey: @"Seeding"] boolValue])
|
if ([[info objectForKey: @"Checking"] boolValue])
|
||||||
|
[fYellowGradient fillRect: completeBounds angle: -90];
|
||||||
|
else if ([[info objectForKey: @"Seeding"] boolValue])
|
||||||
{
|
{
|
||||||
NSRect ratioBounds = completeBounds;
|
NSRect ratioBounds = completeBounds;
|
||||||
ratioBounds.size.width *= [[info objectForKey: @"ProgressStopRatio"] floatValue];
|
ratioBounds.size.width *= [[info objectForKey: @"ProgressStopRatio"] floatValue];
|
||||||
|
@ -109,13 +112,10 @@
|
||||||
[fLightGreenGradient fillRect: completeBounds angle: -90];
|
[fLightGreenGradient fillRect: completeBounds angle: -90];
|
||||||
[fGreenGradient fillRect: ratioBounds angle: -90];
|
[fGreenGradient fillRect: ratioBounds angle: -90];
|
||||||
}
|
}
|
||||||
|
else if ([[info objectForKey: @"Active"] boolValue])
|
||||||
|
[fBlueGradient fillRect: completeBounds angle: -90];
|
||||||
else
|
else
|
||||||
{
|
[fGrayGradient fillRect: completeBounds angle: -90];
|
||||||
if ([[info objectForKey: @"Active"] boolValue])
|
|
||||||
[fBlueGradient 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