Revision: 4068
http://skim-app.svn.sourceforge.net/skim-app/?rev=4068&view=rev
Author: hofman
Date: 2008-06-23 13:11:01 -0700 (Mon, 23 Jun 2008)
Log Message:
-----------
Remove some cursor images and generate them in code
Modified Paths:
--------------
trunk/NSCursor_SKExtensions.m
trunk/NSImage_SKExtensions.h
trunk/NSImage_SKExtensions.m
trunk/SKApplicationController.m
trunk/Skim.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/Images/ResizeLeftDownCursor.tiff
trunk/Images/ResizeLeftUpCursor.tiff
trunk/Images/ResizeRightDownCursor.tiff
trunk/Images/ResizeRightUpCursor.tiff
trunk/Images/zoomInCursor.tiff
trunk/Images/zoomOutCursor.tiff
Deleted: trunk/Images/ResizeLeftDownCursor.tiff
===================================================================
(Binary files differ)
Deleted: trunk/Images/ResizeLeftUpCursor.tiff
===================================================================
(Binary files differ)
Deleted: trunk/Images/ResizeRightDownCursor.tiff
===================================================================
(Binary files differ)
Deleted: trunk/Images/ResizeRightUpCursor.tiff
===================================================================
(Binary files differ)
Deleted: trunk/Images/zoomInCursor.tiff
===================================================================
(Binary files differ)
Deleted: trunk/Images/zoomOutCursor.tiff
===================================================================
(Binary files differ)
Modified: trunk/NSCursor_SKExtensions.m
===================================================================
--- trunk/NSCursor_SKExtensions.m 2008-06-23 18:02:51 UTC (rev 4067)
+++ trunk/NSCursor_SKExtensions.m 2008-06-23 20:11:01 UTC (rev 4068)
@@ -37,6 +37,7 @@
*/
#import "NSCursor_SKExtensions.h"
+#import "NSImage_SKExtensions.h"
@implementation NSCursor (SKExtensions)
@@ -44,7 +45,7 @@
+ (NSCursor *)zoomInCursor {
static NSCursor *zoomInCursor = nil;
if (nil == zoomInCursor) {
- NSImage *cursorImage = [[[NSImage imageNamed:@"zoomInCursor"] copy]
autorelease];
+ NSImage *cursorImage = [[[NSImage imageNamed:SKImageNameZoomInCursor]
copy] autorelease];
zoomInCursor = [[NSCursor alloc] initWithImage:cursorImage
hotSpot:NSMakePoint(6.0, 6.0)];
}
return zoomInCursor;
@@ -53,7 +54,7 @@
+ (NSCursor *)zoomOutCursor {
static NSCursor *zoomOutCursor = nil;
if (nil == zoomOutCursor) {
- NSImage *cursorImage = [[[NSImage imageNamed:@"zoomOutCursor"] copy]
autorelease];
+ NSImage *cursorImage = [[[NSImage imageNamed:SKImageNameZoomOutCursor]
copy] autorelease];
zoomOutCursor = [[NSCursor alloc] initWithImage:cursorImage
hotSpot:NSMakePoint(6.0, 6.0)];
}
return zoomOutCursor;
@@ -62,7 +63,7 @@
+ (NSCursor *)resizeLeftUpCursor {
static NSCursor *resizeLeftUpCursor = nil;
if (nil == resizeLeftUpCursor) {
- NSImage *cursorImage = [[[NSImage imageNamed:@"ResizeLeftUpCursor"]
copy] autorelease];
+ NSImage *cursorImage = [[[NSImage
imageNamed:SKImageNameResizeLeftUpCursor] copy] autorelease];
resizeLeftUpCursor = [[NSCursor alloc] initWithImage:cursorImage
hotSpot:NSMakePoint(8.0, 8.0)];
}
return resizeLeftUpCursor;
@@ -71,7 +72,7 @@
+ (NSCursor *)resizeLeftDownCursor {
static NSCursor *resizeLeftDownCursor = nil;
if (nil == resizeLeftDownCursor) {
- NSImage *cursorImage = [[[NSImage imageNamed:@"ResizeLeftDownCursor"]
copy] autorelease];
+ NSImage *cursorImage = [[[NSImage
imageNamed:SKImageNameResizeLeftDownCursor] copy] autorelease];
resizeLeftDownCursor = [[NSCursor alloc] initWithImage:cursorImage
hotSpot:NSMakePoint(8.0, 8.0)];
}
return resizeLeftDownCursor;
@@ -80,7 +81,7 @@
+ (NSCursor *)resizeRightUpCursor {
static NSCursor *resizeRightUpCursor = nil;
if (nil == resizeRightUpCursor) {
- NSImage *cursorImage = [[[NSImage imageNamed:@"ResizeRightUpCursor"]
copy] autorelease];
+ NSImage *cursorImage = [[[NSImage
imageNamed:SKImageNameResizeRightUpCursor] copy] autorelease];
resizeRightUpCursor = [[NSCursor alloc] initWithImage:cursorImage
hotSpot:NSMakePoint(8.0, 8.0)];
}
return resizeRightUpCursor;
@@ -89,7 +90,7 @@
+ (NSCursor *)resizeRightDownCursor {
static NSCursor *resizeRightDownCursor = nil;
if (nil == resizeRightDownCursor) {
- NSImage *cursorImage = [[[NSImage imageNamed:@"ResizeRightDownCursor"]
copy] autorelease];
+ NSImage *cursorImage = [[[NSImage
imageNamed:SKImageNameResizeRightDownCursor] copy] autorelease];
resizeRightDownCursor = [[NSCursor alloc] initWithImage:cursorImage
hotSpot:NSMakePoint(8.0, 8.0)];
}
return resizeRightDownCursor;
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2008-06-23 18:02:51 UTC (rev 4067)
+++ trunk/NSImage_SKExtensions.h 2008-06-23 20:11:01 UTC (rev 4068)
@@ -116,10 +116,18 @@
extern NSString *SKImageNameStrikeOutNoteAdorn;
extern NSString *SKImageNameLineNoteAdorn;
+extern NSString *SKImageNameResizeRightDownCursor;
+extern NSString *SKImageNameResizeLeftDownCursor;
+extern NSString *SKImageNameResizeRightUpCursor;
+extern NSString *SKImageNameResizeLeftUpCursor;
+extern NSString *SKImageNameZoomInCursor;
+extern NSString *SKImageNameZoomOutCursor;
+
@interface NSImage (SKExtensions)
+ (void)makeToolbarImages;
+ (void)makeAdornImages;
++ (void)makeCursorImages;
+ (NSImage *)iconWithSize:(NSSize)iconSize forToolboxCode:(OSType)code;
+ (NSImage *)smallImageWithIconForToolboxCode:(OSType)code;
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2008-06-23 18:02:51 UTC (rev 4067)
+++ trunk/NSImage_SKExtensions.m 2008-06-23 20:11:01 UTC (rev 4068)
@@ -120,6 +120,13 @@
NSString *SKImageNameStrikeOutNoteAdorn = @"StrikeOutNoteAdorn";
NSString *SKImageNameLineNoteAdorn = @"LineNoteAdorn";
+NSString *SKImageNameResizeRightDownCursor = @"ResizeRightDownCursor";
+NSString *SKImageNameResizeLeftDownCursor = @"ResizeLeftDownCursor";
+NSString *SKImageNameResizeRightUpCursor = @"ResizeRightUpCursor";
+NSString *SKImageNameResizeLeftUpCursor = @"ResizeLeftUpCursor";
+NSString *SKImageNameZoomInCursor = @"ZoomInCursor";
+NSString *SKImageNameZoomOutCursor = @"ZoomOutCursor";
+
- (NSImage *)copyWithMenuBadge {
NSBezierPath *arrowPath = [NSBezierPath bezierPath];
[arrowPath moveToPoint:NSMakePoint(23.5, 7.0)];
@@ -1785,6 +1792,342 @@
[shadow1 release];
}
++ (void)makeCursorImages {
+ static NSImage *resizeLeftDownCursorImage = nil;
+ static NSImage *resizeRightDownCursorImage = nil;
+ static NSImage *resizeLeftUpCursorImage = nil;
+ static NSImage *resizeRightUpCursorImage = nil;
+ static NSImage *zoomInCursorImage = nil;
+ static NSImage *zoomOutCursorImage = nil;
+
+ if (resizeLeftDownCursorImage)
+ return;
+
+ NSRect rect = NSMakeRect(0.0, 0.0, 16.0, 16.0);
+ NSSize size = rect.size;
+
+ NSColor *fgColor = [NSColor colorWithCalibratedWhite:0.0 alpha:1.0];
+ NSColor *bgColor = [NSColor colorWithCalibratedWhite:1.0 alpha:1.0];
+
+ NSBezierPath *path;
+
+ resizeLeftDownCursorImage = [[NSImage alloc] initWithSize:size];
+ [resizeLeftDownCursorImage lockFocus];
+ [NSGraphicsContext saveGraphicsState];
+ [[NSGraphicsContext currentContext]
setImageInterpolation:NSImageInterpolationNone];
+ [[NSGraphicsContext currentContext] setShouldAntialias:NO];
+ [[NSColor clearColor] setFill];
+ NSRectFill(rect);
+ [bgColor setFill];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(6.0, 16.0)];
+ [path lineToPoint:NSMakePoint(10.0, 16.0)];
+ [path lineToPoint:NSMakePoint(10.0, 10.0)];
+ [path lineToPoint:NSMakePoint(16.0, 10.0)];
+ [path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path lineToPoint:NSMakePoint(13.0, 6.0)];
+ [path lineToPoint:NSMakePoint(13.0, 5.0)];
+ [path lineToPoint:NSMakePoint(15.0, 5.0)];
+ [path lineToPoint:NSMakePoint(15.0, 4.0)];
+ [path lineToPoint:NSMakePoint(11.0, 0.0)];
+ [path lineToPoint:NSMakePoint(7.0, 4.0)];
+ [path lineToPoint:NSMakePoint(7.0, 5.0)];
+ [path lineToPoint:NSMakePoint(9.0, 5.0)];
+ [path lineToPoint:NSMakePoint(9.0, 6.0)];
+ [path lineToPoint:NSMakePoint(6.0, 6.0)];
+ [path lineToPoint:NSMakePoint(6.0, 9.0)];
+ [path lineToPoint:NSMakePoint(5.0, 9.0)];
+ [path lineToPoint:NSMakePoint(5.0, 7.0)];
+ [path lineToPoint:NSMakePoint(4.0, 7.0)];
+ [path lineToPoint:NSMakePoint(0.0, 11.0)];
+ [path lineToPoint:NSMakePoint(4.0, 15.0)];
+ [path lineToPoint:NSMakePoint(5.0, 15.0)];
+ [path lineToPoint:NSMakePoint(5.0, 13.0)];
+ [path lineToPoint:NSMakePoint(6.0, 13.0)];
+ [path closePath];
+ [path fill];
+ [fgColor setFill];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(7.0, 15.0)];
+ [path lineToPoint:NSMakePoint(9.0, 15.0)];
+ [path lineToPoint:NSMakePoint(9.0, 9.0)];
+ [path lineToPoint:NSMakePoint(15.0, 9.0)];
+ [path lineToPoint:NSMakePoint(15.0, 7.0)];
+ [path lineToPoint:NSMakePoint(12.0, 7.0)];
+ [path lineToPoint:NSMakePoint(12.0, 4.0)];
+ [path lineToPoint:NSMakePoint(14.0, 4.0)];
+ [path lineToPoint:NSMakePoint(11.0, 1.0)];
+ [path lineToPoint:NSMakePoint(8.0, 4.0)];
+ [path lineToPoint:NSMakePoint(10.0, 4.0)];
+ [path lineToPoint:NSMakePoint(10.0, 7.0)];
+ [path lineToPoint:NSMakePoint(7.0, 7.0)];
+ [path lineToPoint:NSMakePoint(7.0, 10.0)];
+ [path lineToPoint:NSMakePoint(4.0, 10.0)];
+ [path lineToPoint:NSMakePoint(4.0, 8.0)];
+ [path lineToPoint:NSMakePoint(1.0, 11.0)];
+ [path lineToPoint:NSMakePoint(4.0, 14.0)];
+ [path lineToPoint:NSMakePoint(4.0, 12.0)];
+ [path lineToPoint:NSMakePoint(7.0, 12.0)];
+ [path closePath];
+ [path fill];
+ [NSGraphicsContext restoreGraphicsState];
+ [resizeLeftDownCursorImage unlockFocus];
+ [resizeLeftDownCursorImage setName:SKImageNameResizeLeftDownCursor];
+
+ resizeRightDownCursorImage = [[NSImage alloc] initWithSize:size];
+ [resizeRightDownCursorImage lockFocus];
+ [NSGraphicsContext saveGraphicsState];
+ [[NSGraphicsContext currentContext]
setImageInterpolation:NSImageInterpolationNone];
+ [[NSGraphicsContext currentContext] setShouldAntialias:NO];
+ [[NSColor clearColor] setFill];
+ NSRectFill(rect);
+ [bgColor setFill];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(10.0, 16.0)];
+ [path lineToPoint:NSMakePoint(6.0, 16.0)];
+ [path lineToPoint:NSMakePoint(6.0, 10.0)];
+ [path lineToPoint:NSMakePoint(0.0, 10.0)];
+ [path lineToPoint:NSMakePoint(0.0, 6.0)];
+ [path lineToPoint:NSMakePoint(3.0, 6.0)];
+ [path lineToPoint:NSMakePoint(3.0, 5.0)];
+ [path lineToPoint:NSMakePoint(1.0, 5.0)];
+ [path lineToPoint:NSMakePoint(1.0, 4.0)];
+ [path lineToPoint:NSMakePoint(5.0, 0.0)];
+ [path lineToPoint:NSMakePoint(9.0, 4.0)];
+ [path lineToPoint:NSMakePoint(9.0, 5.0)];
+ [path lineToPoint:NSMakePoint(7.0, 5.0)];
+ [path lineToPoint:NSMakePoint(7.0, 6.0)];
+ [path lineToPoint:NSMakePoint(10.0, 6.0)];
+ [path lineToPoint:NSMakePoint(10.0, 9.0)];
+ [path lineToPoint:NSMakePoint(11.0, 9.0)];
+ [path lineToPoint:NSMakePoint(11.0, 7.0)];
+ [path lineToPoint:NSMakePoint(12.0, 7.0)];
+ [path lineToPoint:NSMakePoint(16.0, 11.0)];
+ [path lineToPoint:NSMakePoint(12.0, 15.0)];
+ [path lineToPoint:NSMakePoint(11.0, 15.0)];
+ [path lineToPoint:NSMakePoint(11.0, 13.0)];
+ [path lineToPoint:NSMakePoint(10.0, 13.0)];
+ [path closePath];
+ [path fill];
+ [fgColor setFill];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(9.0, 15.0)];
+ [path lineToPoint:NSMakePoint(7.0, 15.0)];
+ [path lineToPoint:NSMakePoint(7.0, 9.0)];
+ [path lineToPoint:NSMakePoint(1.0, 9.0)];
+ [path lineToPoint:NSMakePoint(1.0, 7.0)];
+ [path lineToPoint:NSMakePoint(4.0, 7.0)];
+ [path lineToPoint:NSMakePoint(4.0, 4.0)];
+ [path lineToPoint:NSMakePoint(2.0, 4.0)];
+ [path lineToPoint:NSMakePoint(5.0, 1.0)];
+ [path lineToPoint:NSMakePoint(8.0, 4.0)];
+ [path lineToPoint:NSMakePoint(6.0, 4.0)];
+ [path lineToPoint:NSMakePoint(6.0, 7.0)];
+ [path lineToPoint:NSMakePoint(9.0, 7.0)];
+ [path lineToPoint:NSMakePoint(9.0, 10.0)];
+ [path lineToPoint:NSMakePoint(12.0, 10.0)];
+ [path lineToPoint:NSMakePoint(12.0, 8.0)];
+ [path lineToPoint:NSMakePoint(15.0, 11.0)];
+ [path lineToPoint:NSMakePoint(12.0, 14.0)];
+ [path lineToPoint:NSMakePoint(12.0, 12.0)];
+ [path lineToPoint:NSMakePoint(9.0, 12.0)];
+ [path closePath];
+ [path fill];
+ [NSGraphicsContext restoreGraphicsState];
+ [resizeRightDownCursorImage unlockFocus];
+ [resizeRightDownCursorImage setName:SKImageNameResizeRightDownCursor];
+
+ resizeLeftUpCursorImage = [[NSImage alloc] initWithSize:size];
+ [resizeLeftUpCursorImage lockFocus];
+ [NSGraphicsContext saveGraphicsState];
+ [[NSGraphicsContext currentContext]
setImageInterpolation:NSImageInterpolationNone];
+ [[NSGraphicsContext currentContext] setShouldAntialias:NO];
+ [[NSColor clearColor] setFill];
+ NSRectFill(rect);
+ [bgColor setFill];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(6.0, 0.0)];
+ [path lineToPoint:NSMakePoint(10.0, 0.0)];
+ [path lineToPoint:NSMakePoint(10.0, 6.0)];
+ [path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path lineToPoint:NSMakePoint(16.0, 10.0)];
+ [path lineToPoint:NSMakePoint(13.0, 10.0)];
+ [path lineToPoint:NSMakePoint(13.0, 11.0)];
+ [path lineToPoint:NSMakePoint(15.0, 11.0)];
+ [path lineToPoint:NSMakePoint(15.0, 12.0)];
+ [path lineToPoint:NSMakePoint(11.0, 16.0)];
+ [path lineToPoint:NSMakePoint(7.0, 12.0)];
+ [path lineToPoint:NSMakePoint(7.0, 11.0)];
+ [path lineToPoint:NSMakePoint(9.0, 11.0)];
+ [path lineToPoint:NSMakePoint(9.0, 10.0)];
+ [path lineToPoint:NSMakePoint(6.0, 10.0)];
+ [path lineToPoint:NSMakePoint(6.0, 7.0)];
+ [path lineToPoint:NSMakePoint(5.0, 7.0)];
+ [path lineToPoint:NSMakePoint(5.0, 9.0)];
+ [path lineToPoint:NSMakePoint(4.0, 9.0)];
+ [path lineToPoint:NSMakePoint(0.0, 5.0)];
+ [path lineToPoint:NSMakePoint(4.0, 1.0)];
+ [path lineToPoint:NSMakePoint(5.0, 1.0)];
+ [path lineToPoint:NSMakePoint(5.0, 3.0)];
+ [path lineToPoint:NSMakePoint(6.0, 3.0)];
+ [path closePath];
+ [path fill];
+ [fgColor setFill];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(7.0, 1.0)];
+ [path lineToPoint:NSMakePoint(9.0, 1.0)];
+ [path lineToPoint:NSMakePoint(9.0, 7.0)];
+ [path lineToPoint:NSMakePoint(15.0, 7.0)];
+ [path lineToPoint:NSMakePoint(15.0, 9.0)];
+ [path lineToPoint:NSMakePoint(12.0, 9.0)];
+ [path lineToPoint:NSMakePoint(12.0, 12.0)];
+ [path lineToPoint:NSMakePoint(14.0, 12.0)];
+ [path lineToPoint:NSMakePoint(11.0, 15.0)];
+ [path lineToPoint:NSMakePoint(8.0, 12.0)];
+ [path lineToPoint:NSMakePoint(10.0, 12.0)];
+ [path lineToPoint:NSMakePoint(10.0, 9.0)];
+ [path lineToPoint:NSMakePoint(7.0, 9.0)];
+ [path lineToPoint:NSMakePoint(7.0, 6.0)];
+ [path lineToPoint:NSMakePoint(4.0, 6.0)];
+ [path lineToPoint:NSMakePoint(4.0, 8.0)];
+ [path lineToPoint:NSMakePoint(1.0, 5.0)];
+ [path lineToPoint:NSMakePoint(4.0, 2.0)];
+ [path lineToPoint:NSMakePoint(4.0, 4.0)];
+ [path lineToPoint:NSMakePoint(7.0, 4.0)];
+ [path closePath];
+ [path fill];
+ [NSGraphicsContext restoreGraphicsState];
+ [resizeLeftUpCursorImage unlockFocus];
+ [resizeLeftUpCursorImage setName:SKImageNameResizeLeftUpCursor];
+
+ resizeRightUpCursorImage = [[NSImage alloc] initWithSize:size];
+ [resizeRightUpCursorImage lockFocus];
+ [NSGraphicsContext saveGraphicsState];
+ [[NSGraphicsContext currentContext]
setImageInterpolation:NSImageInterpolationNone];
+ [[NSGraphicsContext currentContext] setShouldAntialias:NO];
+ [[NSColor clearColor] setFill];
+ NSRectFill(rect);
+ [bgColor setFill];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(10.0, 0.0)];
+ [path lineToPoint:NSMakePoint(6.0, 0.0)];
+ [path lineToPoint:NSMakePoint(6.0, 6.0)];
+ [path lineToPoint:NSMakePoint(0.0, 6.0)];
+ [path lineToPoint:NSMakePoint(0.0, 10.0)];
+ [path lineToPoint:NSMakePoint(3.0, 10.0)];
+ [path lineToPoint:NSMakePoint(3.0, 11.0)];
+ [path lineToPoint:NSMakePoint(1.0, 11.0)];
+ [path lineToPoint:NSMakePoint(1.0, 12.0)];
+ [path lineToPoint:NSMakePoint(5.0, 16.0)];
+ [path lineToPoint:NSMakePoint(9.0, 12.0)];
+ [path lineToPoint:NSMakePoint(9.0, 11.0)];
+ [path lineToPoint:NSMakePoint(7.0, 11.0)];
+ [path lineToPoint:NSMakePoint(7.0, 10.0)];
+ [path lineToPoint:NSMakePoint(10.0, 10.0)];
+ [path lineToPoint:NSMakePoint(10.0, 7.0)];
+ [path lineToPoint:NSMakePoint(11.0, 7.0)];
+ [path lineToPoint:NSMakePoint(11.0, 9.0)];
+ [path lineToPoint:NSMakePoint(12.0, 9.0)];
+ [path lineToPoint:NSMakePoint(16.0, 5.0)];
+ [path lineToPoint:NSMakePoint(12.0, 1.0)];
+ [path lineToPoint:NSMakePoint(11.0, 1.0)];
+ [path lineToPoint:NSMakePoint(11.0, 3.0)];
+ [path lineToPoint:NSMakePoint(10.0, 3.0)];
+ [path closePath];
+ [path fill];
+ [fgColor setFill];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(9.0, 1.0)];
+ [path lineToPoint:NSMakePoint(7.0, 1.0)];
+ [path lineToPoint:NSMakePoint(7.0, 7.0)];
+ [path lineToPoint:NSMakePoint(1.0, 7.0)];
+ [path lineToPoint:NSMakePoint(1.0, 9.0)];
+ [path lineToPoint:NSMakePoint(4.0, 9.0)];
+ [path lineToPoint:NSMakePoint(4.0, 12.0)];
+ [path lineToPoint:NSMakePoint(2.0, 12.0)];
+ [path lineToPoint:NSMakePoint(5.0, 15.0)];
+ [path lineToPoint:NSMakePoint(8.0, 12.0)];
+ [path lineToPoint:NSMakePoint(6.0, 12.0)];
+ [path lineToPoint:NSMakePoint(6.0, 9.0)];
+ [path lineToPoint:NSMakePoint(9.0, 9.0)];
+ [path lineToPoint:NSMakePoint(9.0, 6.0)];
+ [path lineToPoint:NSMakePoint(12.0, 6.0)];
+ [path lineToPoint:NSMakePoint(12.0, 8.0)];
+ [path lineToPoint:NSMakePoint(15.0, 5.0)];
+ [path lineToPoint:NSMakePoint(12.0, 2.0)];
+ [path lineToPoint:NSMakePoint(12.0, 4.0)];
+ [path lineToPoint:NSMakePoint(9.0, 4.0)];
+ [path closePath];
+ [path fill];
+ [NSGraphicsContext restoreGraphicsState];
+ [resizeRightUpCursorImage unlockFocus];
+ [resizeRightUpCursorImage setName:SKImageNameResizeRightUpCursor];
+
+ zoomInCursorImage = [[NSImage alloc] initWithSize:size];
+ [zoomInCursorImage lockFocus];
+ [NSGraphicsContext saveGraphicsState];
+ [[NSColor clearColor] setFill];
+ NSRectFill(rect);
+ [bgColor set];
+ path = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(0.0, 3.0, 13.0,
13.0)];
+ [path fill];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(15.5, 0.5)];
+ [path lineToPoint:NSMakePoint(10.0, 6.0)];
+ [path setLineWidth:4.5];
+ [path stroke];
+ [fgColor setStroke];
+ path = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(2.0, 5.0, 9.0,
9.0)];
+ [path setLineWidth:2.0];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(14.5, 1.5)];
+ [path lineToPoint:NSMakePoint(9.5, 6.5)];
+ [path setLineWidth:2.5];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(4.0, 9.5)];
+ [path lineToPoint:NSMakePoint(9.0, 9.5)];
+ [path moveToPoint:NSMakePoint(6.5, 7.0)];
+ [path lineToPoint:NSMakePoint(6.5, 12.0)];
+ [path setLineWidth:1.0];
+ [path stroke];
+ [NSGraphicsContext restoreGraphicsState];
+ [zoomInCursorImage unlockFocus];
+ [zoomInCursorImage setName:SKImageNameZoomInCursor];
+
+ zoomOutCursorImage = [[NSImage alloc] initWithSize:size];
+ [zoomOutCursorImage lockFocus];
+ [NSGraphicsContext saveGraphicsState];
+ [[NSColor clearColor] setFill];
+ NSRectFill(rect);
+ [bgColor set];
+ path = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(0.0, 3.0, 13.0,
13.0)];
+ [path fill];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(15.5, 0.5)];
+ [path lineToPoint:NSMakePoint(10.0, 6.0)];
+ [path setLineWidth:4.5];
+ [path stroke];
+ [fgColor setStroke];
+ path = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(2.0, 5.0, 9.0,
9.0)];
+ [path setLineWidth:2.0];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(14.5, 1.5)];
+ [path lineToPoint:NSMakePoint(9.5, 6.5)];
+ [path setLineWidth:2.5];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(4.0, 9.5)];
+ [path lineToPoint:NSMakePoint(9.0, 9.5)];
+ [path setLineWidth:1.0];
+ [path stroke];
+ [NSGraphicsContext restoreGraphicsState];
+ [zoomOutCursorImage unlockFocus];
+ [zoomOutCursorImage setName:SKImageNameZoomOutCursor];
+}
+
static NSSize smallImageSize = {32.0, 32.0};
static NSSize tinyImageSize = {16.0, 16.0};
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2008-06-23 18:02:51 UTC (rev 4067)
+++ trunk/SKApplicationController.m 2008-06-23 20:11:01 UTC (rev 4068)
@@ -175,6 +175,7 @@
- (void)applicationWillFinishLaunching:(NSNotification *)aNotification {
[NSImage makeAdornImages];
[NSImage makeToolbarImages];
+ [NSImage makeCursorImages];
}
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification{
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2008-06-23 18:02:51 UTC (rev
4067)
+++ trunk/Skim.xcodeproj/project.pbxproj 2008-06-23 20:11:01 UTC (rev
4068)
@@ -58,10 +58,6 @@
CE1E2B290BDAB6180011D9DD /* SKPDFSynchronizer.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE1E2B270BDAB6180011D9DD /* SKPDFSynchronizer.m
*/; };
CE1E301D0BDB9D5C0011D9DD /* NSScanner_SKExtensions.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CE1E301B0BDB9D5C0011D9DD /*
NSScanner_SKExtensions.m */; };
CE1E30290BDB9D8E0011D9DD /* NSCharacterSet_SKExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CE1E30270BDB9D8E0011D9DD /*
NSCharacterSet_SKExtensions.m */; };
- CE2082E30C5E09DC009D3EFB /* ResizeLeftDownCursor.tiff in
Resources */ = {isa = PBXBuildFile; fileRef = CE2082DF0C5E09DC009D3EFB /*
ResizeLeftDownCursor.tiff */; };
- CE2082E40C5E09DC009D3EFB /* ResizeLeftUpCursor.tiff in
Resources */ = {isa = PBXBuildFile; fileRef = CE2082E00C5E09DC009D3EFB /*
ResizeLeftUpCursor.tiff */; };
- CE2082E50C5E09DC009D3EFB /* ResizeRightDownCursor.tiff in
Resources */ = {isa = PBXBuildFile; fileRef = CE2082E10C5E09DC009D3EFB /*
ResizeRightDownCursor.tiff */; };
- CE2082E60C5E09DC009D3EFB /* ResizeRightUpCursor.tiff in
Resources */ = {isa = PBXBuildFile; fileRef = CE2082E20C5E09DC009D3EFB /*
ResizeRightUpCursor.tiff */; };
CE2093910C5F9A8D009D3EFB /* BDSKGradientView.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE20938F0C5F9A8D009D3EFB /* BDSKGradientView.m
*/; };
CE209FAA0C9D38C6007C72F9 /* SKProgressController.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CE209FA80C9D38C6007C72F9 /*
SKProgressController.m */; };
CE20B1950C9F23CC007C72F9 /* NSView_SKExtensions.m in Sources */
= {isa = PBXBuildFile; fileRef = CE20B1930C9F23CC007C72F9 /*
NSView_SKExtensions.m */; };
@@ -144,8 +140,6 @@
CE6DC88A0D68C657003A072F /* ToolbarMoveTool.tiff in Resources
*/ = {isa = PBXBuildFile; fileRef = CE6DC8890D68C657003A072F /*
ToolbarMoveTool.tiff */; };
CE6DC9940D699F21003A072F /* TransitionMask.jpg in Resources */
= {isa = PBXBuildFile; fileRef = CE6DC9930D699F21003A072F /* TransitionMask.jpg
*/; };
CE74686F0B7F3B1C00CBF969 /* ToolbarInfo.tiff in Resources */ =
{isa = PBXBuildFile; fileRef = CE7467330B7F2ED700CBF969 /* ToolbarInfo.tiff */;
};
- CE7468810B7F3C0000CBF969 /* zoomInCursor.tiff in Resources */ =
{isa = PBXBuildFile; fileRef = CE7467540B7F321100CBF969 /* zoomInCursor.tiff
*/; };
- CE7468820B7F3C0000CBF969 /* zoomOutCursor.tiff in Resources */
= {isa = PBXBuildFile; fileRef = CE7467550B7F321A00CBF969 /* zoomOutCursor.tiff
*/; };
CE7469180B7F40B700CBF969 /* Skim.icns in Resources */ = {isa =
PBXBuildFile; fileRef = CE7469170B7F40B600CBF969 /* Skim.icns */; };
CE7B85FD0CCF4AA800793F46 /* SmallMenu.tiff in Resources */ =
{isa = PBXBuildFile; fileRef = CE7B85FC0CCF4AA800793F46 /* SmallMenu.tiff */; };
CE7C20500C259A5D0059E08C /* NSColor_SKExtensions.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CE7C204E0C259A5D0059E08C /*
NSColor_SKExtensions.m */; };
@@ -465,10 +459,6 @@
CE1E301B0BDB9D5C0011D9DD /* NSScanner_SKExtensions.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = NSScanner_SKExtensions.m; sourceTree = "<group>"; };
CE1E30260BDB9D8E0011D9DD /* NSCharacterSet_SKExtensions.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = NSCharacterSet_SKExtensions.h; sourceTree = "<group>"; };
CE1E30270BDB9D8E0011D9DD /* NSCharacterSet_SKExtensions.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = NSCharacterSet_SKExtensions.m; sourceTree =
"<group>"; };
- CE2082DF0C5E09DC009D3EFB /* ResizeLeftDownCursor.tiff */ = {isa
= PBXFileReference; lastKnownFileType = image.tiff; name =
ResizeLeftDownCursor.tiff; path = Images/ResizeLeftDownCursor.tiff; sourceTree
= "<group>"; };
- CE2082E00C5E09DC009D3EFB /* ResizeLeftUpCursor.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; name =
ResizeLeftUpCursor.tiff; path = Images/ResizeLeftUpCursor.tiff; sourceTree =
"<group>"; };
- CE2082E10C5E09DC009D3EFB /* ResizeRightDownCursor.tiff */ =
{isa = PBXFileReference; lastKnownFileType = image.tiff; name =
ResizeRightDownCursor.tiff; path = Images/ResizeRightDownCursor.tiff;
sourceTree = "<group>"; };
- CE2082E20C5E09DC009D3EFB /* ResizeRightUpCursor.tiff */ = {isa
= PBXFileReference; lastKnownFileType = image.tiff; name =
ResizeRightUpCursor.tiff; path = Images/ResizeRightUpCursor.tiff; sourceTree =
"<group>"; };
CE20938E0C5F9A8D009D3EFB /* BDSKGradientView.h */ = {isa =
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path =
BDSKGradientView.h; sourceTree = "<group>"; };
CE20938F0C5F9A8D009D3EFB /* BDSKGradientView.m */ = {isa =
PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc;
path = BDSKGradientView.m; sourceTree = "<group>"; };
CE209FA70C9D38C6007C72F9 /* SKProgressController.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKProgressController.h; sourceTree = "<group>"; };
@@ -689,8 +679,6 @@
CE6DC8890D68C657003A072F /* ToolbarMoveTool.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarMoveTool.tiff;
path = Images/ToolbarMoveTool.tiff; sourceTree = "<group>"; };
CE6DC9930D699F21003A072F /* TransitionMask.jpg */ = {isa =
PBXFileReference; lastKnownFileType = image.jpeg; name = TransitionMask.jpg;
path = Images/TransitionMask.jpg; sourceTree = "<group>"; };
CE7467330B7F2ED700CBF969 /* ToolbarInfo.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarInfo.tiff; path
= Images/ToolbarInfo.tiff; sourceTree = "<group>"; };
- CE7467540B7F321100CBF969 /* zoomInCursor.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; name = zoomInCursor.tiff;
path = Images/zoomInCursor.tiff; sourceTree = "<group>"; };
- CE7467550B7F321A00CBF969 /* zoomOutCursor.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; name = zoomOutCursor.tiff;
path = Images/zoomOutCursor.tiff; sourceTree = "<group>"; };
CE7469170B7F40B600CBF969 /* Skim.icns */ = {isa =
PBXFileReference; lastKnownFileType = image.icns; name = Skim.icns; path =
Images/Skim.icns; sourceTree = "<group>"; };
CE7B85FC0CCF4AA800793F46 /* SmallMenu.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; name = SmallMenu.tiff; path =
Images/SmallMenu.tiff; sourceTree = "<group>"; };
CE7C204D0C259A5D0059E08C /* NSColor_SKExtensions.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
NSColor_SKExtensions.h; sourceTree = "<group>"; };
@@ -1434,12 +1422,6 @@
CE6DC9930D699F21003A072F /* TransitionMask.jpg
*/,
CEB735A10C4A8CD6000350F9 /*
TransitionShading.tiff */,
CE380A7A0B834E6100A1B779 /* CameraCursor.tiff
*/,
- CE2082DF0C5E09DC009D3EFB /*
ResizeLeftDownCursor.tiff */,
- CE2082E00C5E09DC009D3EFB /*
ResizeLeftUpCursor.tiff */,
- CE2082E10C5E09DC009D3EFB /*
ResizeRightDownCursor.tiff */,
- CE2082E20C5E09DC009D3EFB /*
ResizeRightUpCursor.tiff */,
- CE7467540B7F321100CBF969 /* zoomInCursor.tiff
*/,
- CE7467550B7F321A00CBF969 /* zoomOutCursor.tiff
*/,
);
name = Images;
sourceTree = "<group>";
@@ -1778,8 +1760,6 @@
CE07158C0B8A3D6500733CC8 /* PDFDocument.icns in
Resources */,
CE7469180B7F40B700CBF969 /* Skim.icns in
Resources */,
CE74686F0B7F3B1C00CBF969 /* ToolbarInfo.tiff in
Resources */,
- CE7468810B7F3C0000CBF969 /* zoomInCursor.tiff
in Resources */,
- CE7468820B7F3C0000CBF969 /* zoomOutCursor.tiff
in Resources */,
CE2DEB920B86206400D0DA12 /* FindPanel.nib in
Resources */,
CE9C423C0B8B5633004AD8CF /*
PreferenceWindow.nib in Resources */,
CEF707240B8F8EFC003A2771 /* SnapshotWindow.nib
in Resources */,
@@ -1801,10 +1781,6 @@
CEAFFD7D0C40ED5400C3ECBB /* ToolbarFonts.tiff
in Resources */,
CEAFFD9D0C40F2A800C3ECBB /* ToolbarLines.tiff
in Resources */,
CEB735A20C4A8CD6000350F9 /*
TransitionShading.tiff in Resources */,
- CE2082E30C5E09DC009D3EFB /*
ResizeLeftDownCursor.tiff in Resources */,
- CE2082E40C5E09DC009D3EFB /*
ResizeLeftUpCursor.tiff in Resources */,
- CE2082E50C5E09DC009D3EFB /*
ResizeRightDownCursor.tiff in Resources */,
- CE2082E60C5E09DC009D3EFB /*
ResizeRightUpCursor.tiff in Resources */,
CEAA55F10C6DE5AE006BD633 /* DownloadsWindow.nib
in Resources */,
CEAA56D40C6DEE83006BD633 /* Cancel.tiff in
Resources */,
CEAA56D50C6DEE83006BD633 /* Delete.tiff in
Resources */,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
