Revision: 3641
http://skim-app.svn.sourceforge.net/skim-app/?rev=3641&view=rev
Author: hofman
Date: 2008-04-05 14:41:15 -0700 (Sat, 05 Apr 2008)
Log Message:
-----------
Use different images for display mode toolbar buttons, consistent with other
images.
Modified Paths:
--------------
trunk/NSImage_SKExtensions.m
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2008-04-05 21:16:17 UTC (rev 3640)
+++ trunk/NSImage_SKExtensions.m 2008-04-05 21:41:15 UTC (rev 3641)
@@ -562,17 +562,10 @@
[path fill];
[NSGraphicsContext restoreGraphicsState];
[NSGraphicsContext saveGraphicsState];
- [[NSColor colorWithCalibratedRed:1.0 green:0.46 blue:0.46 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(9.0, 13.0, 2.0 , 2.0)];
- [path fill];
- [[NSColor colorWithCalibratedRed:0.616 green:0.616 blue:0.616 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(12.0, 13.0, 5.0 , 1.0)];
- [path fill];
- [[NSColor colorWithCalibratedRed:0.8 green:0.8 blue:0.8 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(9.0, 11.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(9.0, 9.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(9.0, 7.0, 6.0 , 1.0)];
- [path fill];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(9.0, 4.0, 9.0 , 12.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.337 blue:0.814 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.584 blue:0.872 alpha:1.0]];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(10.0, 5.0, 7.0 , 10.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.431 blue:0.891 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.636 blue:0.944 alpha:1.0]];
[NSGraphicsContext restoreGraphicsState];
[toolbarSinglePageImage unlockFocus];
[toolbarSinglePageImage setName:@"ToolbarSinglePage"];
@@ -587,22 +580,12 @@
[path fill];
[NSGraphicsContext restoreGraphicsState];
[NSGraphicsContext saveGraphicsState];
- [[NSColor colorWithCalibratedRed:1.0 green:0.46 blue:0.46 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(3.0, 13.0, 2.0 , 2.0)];
- [path appendBezierPathWithRect:NSMakeRect(15.0, 13.0, 2.0 , 2.0)];
- [path fill];
- [[NSColor colorWithCalibratedRed:0.616 green:0.616 blue:0.616 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 13.0, 5.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(18.0, 13.0, 5.0 , 1.0)];
- [path fill];
- [[NSColor colorWithCalibratedRed:0.8 green:0.8 blue:0.8 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(3.0, 11.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(3.0, 9.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(3.0, 7.0, 6.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(15.0, 11.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(15.0, 9.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(17.0, 7.0, 6.0 , 1.0)];
- [path fill];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(3.0, 4.0, 9.0 , 12.0)];
+ [path appendBezierPathWithRect:NSMakeRect(15.0, 4.0, 9.0 , 12.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.337 blue:0.814 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.584 blue:0.872 alpha:1.0]];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(4.0, 5.0, 7.0 , 10.0)];
+ [path appendBezierPathWithRect:NSMakeRect(16.0, 5.0, 7.0 , 10.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.431 blue:0.891 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.636 blue:0.944 alpha:1.0]];
[NSGraphicsContext restoreGraphicsState];
[toolbarTwoUpImage unlockFocus];
[toolbarTwoUpImage setName:@"ToolbarTwoUp"];
@@ -617,17 +600,16 @@
[path fill];
[NSGraphicsContext restoreGraphicsState];
[NSGraphicsContext saveGraphicsState];
- [[NSColor colorWithCalibratedRed:1.0 green:0.46 blue:0.46 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(9.0, 6.0, 2.0 , 2.0)];
- [path fill];
- [[NSColor colorWithCalibratedRed:0.616 green:0.616 blue:0.616 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(12.0, 6.0, 5.0 , 1.0)];
- [path fill];
- [[NSColor colorWithCalibratedRed:0.8 green:0.8 blue:0.8 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(9.0, 4.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(9.0, 15.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(9.0, 13.0, 6.0 , 1.0)];
- [path fill];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(8.0, 3.0, 11.0 , 14.0)];
+ [path addClip];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(9.0, 12.0, 9.0 , 12.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.337 blue:0.814 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.584 blue:0.872 alpha:1.0]];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(10.0, 13.0, 7.0 ,
10.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.431 blue:0.891 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.636 blue:0.944 alpha:1.0]];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(9.0, -3.0, 9.0 , 12.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.337 blue:0.814 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.584 blue:0.872 alpha:1.0]];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(10.0, -2.0, 7.0 ,
10.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.431 blue:0.891 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.636 blue:0.944 alpha:1.0]];
[NSGraphicsContext restoreGraphicsState];
[toolbarSinglePageContinuousImage unlockFocus];
[toolbarSinglePageContinuousImage setName:@"ToolbarSinglePageContinuous"];
@@ -644,22 +626,20 @@
[path fill];
[NSGraphicsContext restoreGraphicsState];
[NSGraphicsContext saveGraphicsState];
- [[NSColor colorWithCalibratedRed:1.0 green:0.46 blue:0.46 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(3.0, 6.0, 2.0 , 2.0)];
- [path appendBezierPathWithRect:NSMakeRect(15.0, 6.0, 2.0 , 2.0)];
- [path fill];
- [[NSColor colorWithCalibratedRed:0.616 green:0.616 blue:0.616 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 6.0, 5.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(18.0, 6.0, 5.0 , 1.0)];
- [path fill];
- [[NSColor colorWithCalibratedRed:0.8 green:0.8 blue:0.8 alpha:1.0]
setFill];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(3.0, 4.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(3.0, 15.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(3.0, 13.0, 6.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(15.0, 4.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(15.0, 15.0, 8.0 , 1.0)];
- [path appendBezierPathWithRect:NSMakeRect(17.0, 13.0, 6.0 , 1.0)];
- [path fill];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(2.0, 3.0, 23.0 , 14.0)];
+ [path addClip];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(3.0, 12.0, 9.0 , 12.0)];
+ [path appendBezierPathWithRect:NSMakeRect(15.0, 12.0, 9.0 , 12.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.337 blue:0.814 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.584 blue:0.872 alpha:1.0]];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(4.0, 13.0, 7.0 , 10.0)];
+ [path appendBezierPathWithRect:NSMakeRect(16.0, 13.0, 7.0 , 10.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.431 blue:0.891 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.636 blue:0.944 alpha:1.0]];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(3.0, -3.0, 9.0 , 12.0)];
+ [path appendBezierPathWithRect:NSMakeRect(15.0, -3.0, 9.0 , 12.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.337 blue:0.814 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.584 blue:0.872 alpha:1.0]];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(4.0, -2.0, 7.0 , 10.0)];
+ [path appendBezierPathWithRect:NSMakeRect(16.0, -2.0, 7.0 , 10.0)];
+ [path fillPathVerticallyWithStartColor:[CIColor colorWithRed:0.0
green:0.431 blue:0.891 alpha:1.0] endColor:[CIColor colorWithRed:0.0
green:0.636 blue:0.944 alpha:1.0]];
[NSGraphicsContext restoreGraphicsState];
[toolbarTwoUpContinuousImage unlockFocus];
[toolbarTwoUpContinuousImage setName:@"ToolbarTwoUpContinuous"];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit