Revision: 3827
http://skim-app.svn.sourceforge.net/skim-app/?rev=3827&view=rev
Author: hofman
Date: 2008-04-28 15:53:33 -0700 (Mon, 28 Apr 2008)
Log Message:
-----------
Rename enum values for scripting support.
Modified Paths:
--------------
trunk/NSColor_SKExtensions.h
trunk/NSColor_SKExtensions.m
trunk/PDFSelection_SKExtensions.m
trunk/SKPDFDocument.h
trunk/SKPDFDocument.m
Modified: trunk/NSColor_SKExtensions.h
===================================================================
--- trunk/NSColor_SKExtensions.h 2008-04-28 21:24:35 UTC (rev 3826)
+++ trunk/NSColor_SKExtensions.h 2008-04-28 22:53:33 UTC (rev 3827)
@@ -39,34 +39,34 @@
#import <Cocoa/Cocoa.h>
enum {
- SKASColorRed = 'Red ',
- SKASColorGreen = 'Gren',
- SKASColorBlue = 'Blue',
- SKASColorYellow = 'Yelw',
- SKASColorMagenta = 'Mgnt',
- SKASColorCyan = 'Cyan',
- SKASColorDarkRed = 'DRed',
- SKASColorDarkGreen = 'DGrn',
- SKASColorDarkBlue = 'DBlu',
- SKASColorBanana = 'Bana',
- SKASColorTurquoise = 'Turq',
- SKASColorViolet = 'Viol',
- SKASColorOrange = 'Orng',
- SKASColorDeepPink = 'DpPk',
- SKASColorSpringGreen = 'SprG',
- SKASColorAqua = 'Aqua',
- SKASColorLime = 'Lime',
- SKASColorDarkViolet = 'DVio',
- SKASColorPurple = 'Prpl',
- SKASColorTeal = 'Teal',
- SKASColorOlive = 'Oliv',
- SKASColorBrown = 'Brwn',
- SKASColorBlack = 'Blck',
- SKASColorWhite = 'Whit',
- SKASColorGray = 'Gray',
- SKASColorLightGray = 'LGry',
- SKASColorDarkGray = 'DGry',
- SKASColorClear = 'Clea'
+ SKScriptingColorRed = 'Red ',
+ SKScriptingColorGreen = 'Gren',
+ SKScriptingColorBlue = 'Blue',
+ SKScriptingColorYellow = 'Yelw',
+ SKScriptingColorMagenta = 'Mgnt',
+ SKScriptingColorCyan = 'Cyan',
+ SKScriptingColorDarkRed = 'DRed',
+ SKScriptingColorDarkGreen = 'DGrn',
+ SKScriptingColorDarkBlue = 'DBlu',
+ SKScriptingColorBanana = 'Bana',
+ SKScriptingColorTurquoise = 'Turq',
+ SKScriptingColorViolet = 'Viol',
+ SKScriptingColorOrange = 'Orng',
+ SKScriptingColorDeepPink = 'DpPk',
+ SKScriptingColorSpringGreen = 'SprG',
+ SKScriptingColorAqua = 'Aqua',
+ SKScriptingColorLime = 'Lime',
+ SKScriptingColorDarkViolet = 'DVio',
+ SKScriptingColorPurple = 'Prpl',
+ SKScriptingColorTeal = 'Teal',
+ SKScriptingColorOlive = 'Oliv',
+ SKScriptingColorBrown = 'Brwn',
+ SKScriptingColorBlack = 'Blck',
+ SKScriptingColorWhite = 'Whit',
+ SKScriptingColorGray = 'Gray',
+ SKScriptingColorLightGray = 'LGry',
+ SKScriptingColorDarkGray = 'DGry',
+ SKScriptingColorClear = 'Clea'
};
@interface NSColor (SKExtensions)
Modified: trunk/NSColor_SKExtensions.m
===================================================================
--- trunk/NSColor_SKExtensions.m 2008-04-28 21:24:35 UTC (rev 3826)
+++ trunk/NSColor_SKExtensions.m 2008-04-28 22:53:33 UTC (rev 3827)
@@ -63,34 +63,34 @@
switch ([descriptor numberOfItems]) {
case 0:
switch ([descriptor enumCodeValue]) {
- case SKASColorRed: return [NSColor redColor];
- case SKASColorGreen: return [NSColor greenColor];
- case SKASColorBlue: return [NSColor blueColor];
- case SKASColorYellow: return [NSColor yellowColor];
- case SKASColorMagenta: return [NSColor magentaColor];
- case SKASColorCyan: return [NSColor cyanColor];
- case SKASColorDarkRed: return [NSColor
colorWithCalibratedRed:0.5 green:0.0 blue:0.0 alpha:1.0];
- case SKASColorDarkGreen: return [NSColor
colorWithCalibratedRed:0.0 green:0.5 blue:0.0 alpha:1.0];
- case SKASColorDarkBlue: return [NSColor
colorWithCalibratedRed:0.0 green:0.0 blue:0.5 alpha:1.0];
- case SKASColorBanana: return [NSColor
colorWithCalibratedRed:1.0 green:1.0 blue:0.5 alpha:1.0];
- case SKASColorTurquoise: return [NSColor
colorWithCalibratedRed:1.0 green:0.5 blue:1.0 alpha:1.0];
- case SKASColorViolet: return [NSColor
colorWithCalibratedRed:0.5 green:1.0 blue:1.0 alpha:1.0];
- case SKASColorOrange: return [NSColor orangeColor];
- case SKASColorDeepPink: return [NSColor
colorWithCalibratedRed:1.0 green:0.0 blue:0.5 alpha:1.0];
- case SKASColorSpringGreen: return [NSColor
colorWithCalibratedRed:0.0 green:1.0 blue:0.5 alpha:1.0];
- case SKASColorAqua: return [NSColor colorWithCalibratedRed:0.0
green:0.5 blue:1.0 alpha:1.0];
- case SKASColorLime: return [NSColor colorWithCalibratedRed:0.5
green:1.0 blue:0.0 alpha:1.0];
- case SKASColorDarkViolet: return [NSColor
colorWithCalibratedRed:0.5 green:0.0 blue:1.0 alpha:1.0];
- case SKASColorPurple: return [NSColor purpleColor];
- case SKASColorTeal: return [NSColor colorWithCalibratedRed:0.0
green:0.5 blue:0.5 alpha:1.0];
- case SKASColorOlive: return [NSColor
colorWithCalibratedRed:0.5 green:0.5 blue:0.0 alpha:1.0];
- case SKASColorBrown: return [NSColor brownColor];
- case SKASColorBlack: return [NSColor blackColor];
- case SKASColorWhite: return [NSColor whiteColor];
- case SKASColorGray: return [NSColor grayColor];
- case SKASColorDarkGray: return [NSColor darkGrayColor];
- case SKASColorLightGray: return [NSColor lightGrayColor];
- case SKASColorClear: return [NSColor clearColor];
+ case SKScriptingColorRed: return [NSColor redColor];
+ case SKScriptingColorGreen: return [NSColor greenColor];
+ case SKScriptingColorBlue: return [NSColor blueColor];
+ case SKScriptingColorYellow: return [NSColor yellowColor];
+ case SKScriptingColorMagenta: return [NSColor magentaColor];
+ case SKScriptingColorCyan: return [NSColor cyanColor];
+ case SKScriptingColorDarkRed: return [NSColor
colorWithCalibratedRed:0.5 green:0.0 blue:0.0 alpha:1.0];
+ case SKScriptingColorDarkGreen: return [NSColor
colorWithCalibratedRed:0.0 green:0.5 blue:0.0 alpha:1.0];
+ case SKScriptingColorDarkBlue: return [NSColor
colorWithCalibratedRed:0.0 green:0.0 blue:0.5 alpha:1.0];
+ case SKScriptingColorBanana: return [NSColor
colorWithCalibratedRed:1.0 green:1.0 blue:0.5 alpha:1.0];
+ case SKScriptingColorTurquoise: return [NSColor
colorWithCalibratedRed:1.0 green:0.5 blue:1.0 alpha:1.0];
+ case SKScriptingColorViolet: return [NSColor
colorWithCalibratedRed:0.5 green:1.0 blue:1.0 alpha:1.0];
+ case SKScriptingColorOrange: return [NSColor orangeColor];
+ case SKScriptingColorDeepPink: return [NSColor
colorWithCalibratedRed:1.0 green:0.0 blue:0.5 alpha:1.0];
+ case SKScriptingColorSpringGreen: return [NSColor
colorWithCalibratedRed:0.0 green:1.0 blue:0.5 alpha:1.0];
+ case SKScriptingColorAqua: return [NSColor
colorWithCalibratedRed:0.0 green:0.5 blue:1.0 alpha:1.0];
+ case SKScriptingColorLime: return [NSColor
colorWithCalibratedRed:0.5 green:1.0 blue:0.0 alpha:1.0];
+ case SKScriptingColorDarkViolet: return [NSColor
colorWithCalibratedRed:0.5 green:0.0 blue:1.0 alpha:1.0];
+ case SKScriptingColorPurple: return [NSColor purpleColor];
+ case SKScriptingColorTeal: return [NSColor
colorWithCalibratedRed:0.0 green:0.5 blue:0.5 alpha:1.0];
+ case SKScriptingColorOlive: return [NSColor
colorWithCalibratedRed:0.5 green:0.5 blue:0.0 alpha:1.0];
+ case SKScriptingColorBrown: return [NSColor brownColor];
+ case SKScriptingColorBlack: return [NSColor blackColor];
+ case SKScriptingColorWhite: return [NSColor whiteColor];
+ case SKScriptingColorGray: return [NSColor grayColor];
+ case SKScriptingColorDarkGray: return [NSColor darkGrayColor];
+ case SKScriptingColorLightGray: return [NSColor
lightGrayColor];
+ case SKScriptingColorClear: return [NSColor clearColor];
default: return nil;
}
break;
Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m 2008-04-28 21:24:35 UTC (rev 3826)
+++ trunk/PDFSelection_SKExtensions.m 2008-04-28 22:53:33 UTC (rev 3827)
@@ -384,7 +384,7 @@
NSDictionary *args = [self evaluatedArguments];
PDFPage *page = [args objectForKey:@"Page"];
NSNumber *boxNumber = [args objectForKey:@"Box"];
- PDFDisplayBox box = [boxNumber intValue] == SKASMediaBox ?
kPDFDisplayBoxMediaBox : kPDFDisplayBoxCropBox;
+ PDFDisplayBox box = [boxNumber intValue] == SKScriptingMediaBox ?
kPDFDisplayBoxMediaBox : kPDFDisplayBoxCropBox;
NSRect bounds = NSZeroRect;
if ([dPO isKindOfClass:[SKPDFDocument class]]) {
Modified: trunk/SKPDFDocument.h
===================================================================
--- trunk/SKPDFDocument.h 2008-04-28 21:24:35 UTC (rev 3826)
+++ trunk/SKPDFDocument.h 2008-04-28 22:53:33 UTC (rev 3827)
@@ -44,15 +44,15 @@
extern NSString *SKSkimFileDidSaveNotification;
enum {
- SKASDisplaySinglePage = '1Pg ',
- SKASDisplaySinglePageContinuous = '1PgC',
- SKASDisplayTwoUp = '2Up ',
- SKASDisplayTwoUpContinuous = '2UpC'
+ SKScriptingDisplaySinglePage = '1Pg ',
+ SKScriptingDisplaySinglePageContinuous = '1PgC',
+ SKScriptingDisplayTwoUp = '2Up ',
+ SKScriptingDisplayTwoUpContinuous = '2UpC'
};
enum {
- SKASMediaBox = 'Mdia',
- SKASCropBox = 'Crop'
+ SKScriptingMediaBox = 'Mdia',
+ SKScriptingCropBox = 'Crop'
};
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2008-04-28 21:24:35 UTC (rev 3826)
+++ trunk/SKPDFDocument.m 2008-04-28 22:53:33 UTC (rev 3827)
@@ -1939,17 +1939,17 @@
unsigned long displayMode = 0;
switch ([[setup objectForKey:@"displayMode"] intValue]) {
- case kPDFDisplaySinglePage: displayMode = SKASDisplaySinglePage; break;
- case kPDFDisplaySinglePageContinuous: displayMode =
SKASDisplaySinglePageContinuous; break;
- case kPDFDisplayTwoUp: displayMode = SKASDisplayTwoUp; break;
- case kPDFDisplayTwoUpContinuous: displayMode =
SKASDisplayTwoUpContinuous; break;
+ case kPDFDisplaySinglePage: displayMode =
SKScriptingDisplaySinglePage; break;
+ case kPDFDisplaySinglePageContinuous: displayMode =
SKScriptingDisplaySinglePageContinuous; break;
+ case kPDFDisplayTwoUp: displayMode = SKScriptingDisplayTwoUp; break;
+ case kPDFDisplayTwoUpContinuous: displayMode =
SKScriptingDisplayTwoUpContinuous; break;
}
[setup setObject:[NSNumber numberWithInt:displayMode]
forKey:@"displayMode"];
unsigned long displayBox = 0;
switch ([[setup objectForKey:@"displayBox"] intValue]) {
- case kPDFDisplayBoxMediaBox: displayBox = SKASMediaBox; break;
- case kPDFDisplayBoxCropBox: displayBox = SKASCropBox; break;
+ case kPDFDisplayBoxMediaBox: displayBox = SKScriptingMediaBox; break;
+ case kPDFDisplayBoxCropBox: displayBox = SKScriptingCropBox; break;
}
[setup setObject:[NSNumber numberWithInt:displayBox] forKey:@"displayBox"];
@@ -1963,10 +1963,10 @@
if (number = [setup objectForKey:@"displayMode"]) {
int displayMode = 0;
switch ([number unsignedLongValue]) {
- case SKASDisplaySinglePage: displayMode = kPDFDisplaySinglePage;
break;
- case SKASDisplaySinglePageContinuous: displayMode =
kPDFDisplaySinglePageContinuous; break;
- case SKASDisplayTwoUp: displayMode = kPDFDisplayTwoUp; break;
- case SKASDisplayTwoUpContinuous: displayMode =
kPDFDisplayTwoUpContinuous; break;
+ case SKScriptingDisplaySinglePage: displayMode =
kPDFDisplaySinglePage; break;
+ case SKScriptingDisplaySinglePageContinuous: displayMode =
kPDFDisplaySinglePageContinuous; break;
+ case SKScriptingDisplayTwoUp: displayMode = kPDFDisplayTwoUp;
break;
+ case SKScriptingDisplayTwoUpContinuous: displayMode =
kPDFDisplayTwoUpContinuous; break;
}
[setup setObject:[NSNumber numberWithInt:displayMode]
forKey:@"displayMode"];
}
@@ -1974,8 +1974,8 @@
if (number = [setup objectForKey:@"displayBox"]) {
int displayBox = 0;
switch ([number unsignedLongValue]) {
- case SKASMediaBox: displayBox = kPDFDisplayBoxMediaBox; break;
- case SKASCropBox: displayBox = kPDFDisplayBoxCropBox; break;
+ case SKScriptingMediaBox: displayBox = kPDFDisplayBoxMediaBox;
break;
+ case SKScriptingCropBox: displayBox = kPDFDisplayBoxCropBox; break;
}
[setup setObject:[NSNumber numberWithInt:displayBox]
forKey:@"displayBox"];
}
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
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
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
