Revision: 4717
http://skim-app.svn.sourceforge.net/skim-app/?rev=4717&view=rev
Author: hofman
Date: 2008-09-30 12:22:02 +0000 (Tue, 30 Sep 2008)
Log Message:
-----------
remove old style note adorn images
Modified Paths:
--------------
trunk/NSImage_SKExtensions.h
trunk/NSImage_SKExtensions.m
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2008-09-30 12:11:14 UTC (rev 4716)
+++ trunk/NSImage_SKExtensions.h 2008-09-30 12:22:02 UTC (rev 4717)
@@ -111,15 +111,6 @@
extern NSString *SKImageNameSnapshotViewAdorn;
extern NSString *SKImageNameFindViewAdorn;
extern NSString *SKImageNameGroupedFindViewAdorn;
-extern NSString *SKImageNameTextNoteAdorn;
-extern NSString *SKImageNameAnchoredNoteAdorn;
-extern NSString *SKImageNameCircleNoteAdorn;
-extern NSString *SKImageNameSquareNoteAdorn;
-extern NSString *SKImageNameHighlightNoteAdorn;
-extern NSString *SKImageNameUnderlineNoteAdorn;
-extern NSString *SKImageNameStrikeOutNoteAdorn;
-extern NSString *SKImageNameLineNoteAdorn;
-extern NSString *SKImageNameInkNoteAdorn;
extern NSString *SKImageNameResizeRightDownCursor;
extern NSString *SKImageNameResizeLeftDownCursor;
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2008-09-30 12:11:14 UTC (rev 4716)
+++ trunk/NSImage_SKExtensions.m 2008-09-30 12:22:02 UTC (rev 4717)
@@ -115,15 +115,6 @@
NSString *SKImageNameSnapshotViewAdorn = @"SnapshotViewAdorn";
NSString *SKImageNameFindViewAdorn = @"FindViewAdorn";
NSString *SKImageNameGroupedFindViewAdorn = @"GroupedFindViewAdorn";
-NSString *SKImageNameTextNoteAdorn = @"TextNoteAdorn";
-NSString *SKImageNameAnchoredNoteAdorn = @"AnchoredNoteAdorn";
-NSString *SKImageNameCircleNoteAdorn = @"CircleNoteAdorn";
-NSString *SKImageNameSquareNoteAdorn = @"SquareNoteAdorn";
-NSString *SKImageNameHighlightNoteAdorn = @"HighlightNoteAdorn";
-NSString *SKImageNameUnderlineNoteAdorn = @"UnderlineNoteAdorn";
-NSString *SKImageNameStrikeOutNoteAdorn = @"StrikeOutNoteAdorn";
-NSString *SKImageNameLineNoteAdorn = @"LineNoteAdorn";
-NSString *SKImageNameInkNoteAdorn = @"InkNoteAdorn";
NSString *SKImageNameResizeRightDownCursor = @"ResizeRightDownCursor";
NSString *SKImageNameResizeLeftDownCursor = @"ResizeLeftDownCursor";
@@ -1448,15 +1439,6 @@
static NSImage *snapshotViewAdornImage = nil;
static NSImage *findViewAdornImage = nil;
static NSImage *groupedFindViewAdornImage = nil;
- static NSImage *textNoteAdornImage = nil;
- static NSImage *anchoredNoteAdornImage = nil;
- static NSImage *circleNoteAdornImage = nil;
- static NSImage *squareNoteAdornImage = nil;
- static NSImage *highlightNoteAdornImage = nil;
- static NSImage *underlineNoteAdornImage = nil;
- static NSImage *strikeOutNoteAdornImage = nil;
- static NSImage *lineNoteAdornImage = nil;
- static NSImage *inkNoteAdornImage = nil;
if (outlineViewAdornImage)
return;
@@ -1467,9 +1449,7 @@
[shadow1 setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.1]];
NSSize size = NSMakeSize(25.0, 14.0);
- NSSize noteSize = NSMakeSize(15.0, 11.0);
NSRect rect = {NSZeroPoint, size};
- NSRect noteRect = {NSZeroPoint, noteSize};
// 14 looks nicer on Leopard, 13 looks better on Tiger
if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4)
@@ -1622,237 +1602,6 @@
[groupedFindViewAdornImage setTemplate:YES];
[groupedFindViewAdornImage setName:SKImageNameGroupedFindViewAdorn];
- textNoteAdornImage = [[NSImage alloc] initWithSize:noteSize];
- [textNoteAdornImage lockFocus];
- [NSGraphicsContext saveGraphicsState];
- [[NSColor clearColor] setFill];
- NSRectFill(noteRect);
- //[shadow1 set];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(4.5, 3.5)];
- [path lineToPoint:NSMakePoint(11.5, 10.5)];
- [path lineToPoint:NSMakePoint(11.0, 11.0)];
- [path lineToPoint:NSMakePoint(4.0, 4.0)];
- [path closePath];
- [[NSColor colorWithCalibratedWhite:0.4 alpha:0.85] set];
- [path fill];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(4.0, 4.0)];
- [path lineToPoint:NSMakePoint(11.0, 11.0)];
- [path lineToPoint:NSMakePoint(10.0, 11.0)];
- [path lineToPoint:NSMakePoint(3.0, 4.0)];
- [path closePath];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.85] set];
- [path fill];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(6.0, 1.0)];
- [path lineToPoint:NSMakePoint(13.0, 8.0)];
- [path lineToPoint:NSMakePoint(13.0, 9.0)];
- [path lineToPoint:NSMakePoint(11.5, 10.5)];
- [path lineToPoint:NSMakePoint(4.5, 3.5)];
- [path lineToPoint:NSMakePoint(6.0, 2.0)];
- [path closePath];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.85] set];
- [path fill];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(3.0, 1.5)];
- [path lineToPoint:NSMakePoint(4.0, 4.0)];
- [path lineToPoint:NSMakePoint(3.0, 4.0)];
- [path lineToPoint:NSMakePoint(2.5, 2.0)];
- [path closePath];
- [[NSColor colorWithCalibratedWhite:0.3 alpha:0.85] set];
- [path fill];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(3.5, 1.0)];
- [path lineToPoint:NSMakePoint(6.0, 2.0)];
- [path lineToPoint:NSMakePoint(4.0, 4.0)];
- [path lineToPoint:NSMakePoint(3.0, 1.5)];
- [path closePath];
- [[NSColor colorWithCalibratedWhite:0.8 alpha:0.85] set];
- [path fill];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(4.0, 0.5)];
- [path lineToPoint:NSMakePoint(6.0, 1.0)];
- [path lineToPoint:NSMakePoint(6.0, 2.0)];
- [path lineToPoint:NSMakePoint(3.5, 1.0)];
- [path closePath];
- [[NSColor colorWithCalibratedWhite:0.1 alpha:0.85] set];
- [path fill];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(2.0, 0.0)];
- [path lineToPoint:NSMakePoint(4.0, 0.5)];
- [path lineToPoint:NSMakePoint(2.5, 2.0)];
- [path closePath];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.95] set];
- [path fill];
- [NSGraphicsContext restoreGraphicsState];
- [textNoteAdornImage unlockFocus];
- [textNoteAdornImage setName:SKImageNameTextNoteAdorn];
-
- anchoredNoteAdornImage = [[NSImage alloc] initWithSize:noteSize];
- [anchoredNoteAdornImage lockFocus];
- [NSGraphicsContext saveGraphicsState];
- [[NSColor clearColor] setFill];
- NSRectFill(noteRect);
- [shadow1 set];
- [color setStroke];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(9.5, 0.5)];
- [path lineToPoint:NSMakePoint(2.5, 0.5)];
- [path lineToPoint:NSMakePoint(2.5, 10.5)];
- [path lineToPoint:NSMakePoint(12.5, 10.5)];
- [path lineToPoint:NSMakePoint(12.5, 3.5)];
- [path closePath];
- [path moveToPoint:NSMakePoint(9.5, 0.5)];
- [path lineToPoint:NSMakePoint(9.5, 3.5)];
- [path lineToPoint:NSMakePoint(12.5, 3.5)];
- [path moveToPoint:NSMakePoint(4.0, 4.5)];
- [path lineToPoint:NSMakePoint(8.0, 4.5)];
- [path moveToPoint:NSMakePoint(4.0, 6.5)];
- [path lineToPoint:NSMakePoint(11.0, 6.5)];
- [path moveToPoint:NSMakePoint(4.0, 8.5)];
- [path lineToPoint:NSMakePoint(11.0, 8.5)];
- [path stroke];
- [NSGraphicsContext restoreGraphicsState];
- [anchoredNoteAdornImage unlockFocus];
- [anchoredNoteAdornImage setName:SKImageNameAnchoredNoteAdorn];
-
- circleNoteAdornImage = [[NSImage alloc] initWithSize:noteSize];
- [circleNoteAdornImage lockFocus];
- [NSGraphicsContext saveGraphicsState];
- [[NSColor clearColor] setFill];
- NSRectFill(noteRect);
- [shadow1 set];
- [color setStroke];
- NSBezierPath *clipPath = [NSBezierPath bezierPath];
- [clipPath moveToPoint:NSMakePoint(0.0, 0.0)];
- [clipPath lineToPoint:NSMakePoint(5.0, 0.0)];
- [clipPath lineToPoint:NSMakePoint(5.0, 7.0)];
- [clipPath lineToPoint:NSMakePoint(15.0, 7.0)];
- [clipPath lineToPoint:NSMakePoint(15.0, 11.0)];
- [clipPath lineToPoint:NSMakePoint(0.0, 11.0)];
- [clipPath closePath];
- path = [NSBezierPath bezierPath];
- [path appendBezierPathWithOvalInRect:NSMakeRect(5.5, 0.5, 9.0, 6.0)];
- [path stroke];
- path = [NSBezierPath bezierPath];
- [clipPath addClip];
- [path appendBezierPathWithOvalInRect:NSMakeRect(0.5, 3.5, 10.0, 7.0)];
- [path stroke];
- [NSGraphicsContext restoreGraphicsState];
- [circleNoteAdornImage unlockFocus];
- [circleNoteAdornImage setName:SKImageNameCircleNoteAdorn];
-
- squareNoteAdornImage = [[NSImage alloc] initWithSize:noteSize];
- [squareNoteAdornImage lockFocus];
- [NSGraphicsContext saveGraphicsState];
- [[NSColor clearColor] setFill];
- NSRectFill(noteRect);
- [shadow1 set];
- [color setStroke];
- path = [NSBezierPath bezierPathWithRect:NSMakeRect(5.5, 1.5, 9.0, 5.0)];
- [path moveToPoint:NSMakePoint(5.0, 4.5)];
- [path lineToPoint:NSMakePoint(0.5, 4.5)];
- [path lineToPoint:NSMakePoint(0.5, 10.5)];
- [path lineToPoint:NSMakePoint(10.5, 10.5)];
- [path lineToPoint:NSMakePoint(10.5, 7.0)];
- [path stroke];
- [NSGraphicsContext restoreGraphicsState];
- [squareNoteAdornImage unlockFocus];
- [squareNoteAdornImage setName:SKImageNameSquareNoteAdorn];
-
-
- highlightNoteAdornImage = [[NSImage alloc] initWithSize:noteSize];
- [highlightNoteAdornImage lockFocus];
- [NSGraphicsContext saveGraphicsState];
- [[NSColor clearColor] setFill];
- NSRectFill(noteRect);
- [shadow1 set];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setFill];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(5.0, 5.0)];
- [path lineToPoint:NSMakePoint(0.0, 5.0)];
- [path lineToPoint:NSMakePoint(0.0, 8.0)];
- [path lineToPoint:NSMakePoint(12.0, 8.0)];
- [path lineToPoint:NSMakePoint(12.0, 6.0)];
- [path lineToPoint:NSMakePoint(15.0, 6.0)];
- [path lineToPoint:NSMakePoint(15.0, 3.0)];
- [path lineToPoint:NSMakePoint(5.0, 3.0)];
- [path lineToPoint:NSMakePoint(5.0, 5.0)];
- [path fill];
- [NSGraphicsContext restoreGraphicsState];
- [highlightNoteAdornImage unlockFocus];
- [highlightNoteAdornImage setName:SKImageNameHighlightNoteAdorn];
-
- underlineNoteAdornImage = [[NSImage alloc] initWithSize:noteSize];
- [underlineNoteAdornImage lockFocus];
- [NSGraphicsContext saveGraphicsState];
- [[NSColor clearColor] setFill];
- NSRectFill(noteRect);
- [shadow1 set];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setStroke];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(1.0, 3.5)];
- [path lineToPoint:NSMakePoint(15.0, 3.5)];
- [path moveToPoint:NSMakePoint(0.0, 6.5)];
- [path lineToPoint:NSMakePoint(12.0, 6.5)];
- [path stroke];
- [NSGraphicsContext restoreGraphicsState];
- [underlineNoteAdornImage unlockFocus];
- [underlineNoteAdornImage setName:SKImageNameUnderlineNoteAdorn];
-
- strikeOutNoteAdornImage = [[NSImage alloc] initWithSize:noteSize];
- [strikeOutNoteAdornImage lockFocus];
- [NSGraphicsContext saveGraphicsState];
- [[NSColor clearColor] setFill];
- NSRectFill(noteRect);
- [shadow1 set];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setStroke];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(0.0, 2.5)];
- [path lineToPoint:NSMakePoint(14.0, 8.5)];
- [path moveToPoint:NSMakePoint(0.0, 8.5)];
- [path lineToPoint:NSMakePoint(14.0, 2.5)];
- [path stroke];
- [NSGraphicsContext restoreGraphicsState];
- [strikeOutNoteAdornImage unlockFocus];
- [strikeOutNoteAdornImage setName:SKImageNameStrikeOutNoteAdorn];
-
- lineNoteAdornImage = [[NSImage alloc] initWithSize:noteSize];
- [lineNoteAdornImage lockFocus];
- [NSGraphicsContext saveGraphicsState];
- [[NSColor clearColor] setFill];
- NSRectFill(noteRect);
- [shadow1 set];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setStroke];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(2.0, 1.0)];
- [path lineToPoint:NSMakePoint(14.0, 10.0)];
- [path moveToPoint:NSMakePoint(8.0, 8.5)];
- [path lineToPoint:NSMakePoint(14.0, 10.0)];
- [path lineToPoint:NSMakePoint(11.0, 5.0)];
- [path setLineWidth:1.2];
- [path stroke];
- [NSGraphicsContext restoreGraphicsState];
- [lineNoteAdornImage unlockFocus];
- [lineNoteAdornImage setName:SKImageNameLineNoteAdorn];
-
- inkNoteAdornImage = [[NSImage alloc] initWithSize:noteSize];
- [inkNoteAdornImage lockFocus];
- [NSGraphicsContext saveGraphicsState];
- [[NSColor clearColor] setFill];
- NSRectFill(noteRect);
- [shadow1 set];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setStroke];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(2.0, 5.0)];
- [path curveToPoint:NSMakePoint(7.5, 5.5) controlPoint1:NSMakePoint(7.0,
1.5) controlPoint2:NSMakePoint(9.0, 1.5)];
- [path curveToPoint:NSMakePoint(13.0, 6.0) controlPoint1:NSMakePoint(6.0,
9.5) controlPoint2:NSMakePoint(8.0, 9.5)];
- [path stroke];
- [NSGraphicsContext restoreGraphicsState];
- [inkNoteAdornImage unlockFocus];
- [inkNoteAdornImage setName:SKImageNameInkNoteAdorn];
-
[shadow1 release];
}
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 Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
