Menu
▾
▴
skim-app-commit — This tracks source code changes in Subversion.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(23) |
Apr
(254) |
May
(252) |
Jun
(209) |
Jul
(198) |
Aug
(192) |
Sep
(207) |
Oct
(120) |
Nov
(179) |
Dec
(52) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(48) |
Feb
(69) |
Mar
(129) |
Apr
(250) |
May
(113) |
Jun
(177) |
Jul
(228) |
Aug
(155) |
Sep
(218) |
Oct
(185) |
Nov
(109) |
Dec
(88) |
| 2009 |
Jan
(83) |
Feb
(39) |
Mar
(70) |
Apr
(47) |
May
(48) |
Jun
(67) |
Jul
(61) |
Aug
(97) |
Sep
(221) |
Oct
(141) |
Nov
(70) |
Dec
(61) |
| 2010 |
Jan
(45) |
Feb
(76) |
Mar
(178) |
Apr
(106) |
May
(57) |
Jun
(32) |
Jul
(64) |
Aug
(98) |
Sep
(96) |
Oct
(19) |
Nov
(34) |
Dec
(117) |
| 2011 |
Jan
(55) |
Feb
(48) |
Mar
(64) |
Apr
(21) |
May
(39) |
Jun
(53) |
Jul
(99) |
Aug
(56) |
Sep
(39) |
Oct
(26) |
Nov
(19) |
Dec
(69) |
| 2012 |
Jan
(17) |
Feb
(40) |
Mar
(17) |
Apr
|
May
(2) |
Jun
(8) |
Jul
(2) |
Aug
(10) |
Sep
(10) |
Oct
(38) |
Nov
(48) |
Dec
(70) |
| 2013 |
Jan
(43) |
Feb
(47) |
Mar
(39) |
Apr
(37) |
May
(25) |
Jun
(6) |
Jul
(20) |
Aug
(49) |
Sep
(33) |
Oct
(34) |
Nov
(75) |
Dec
(6) |
| 2014 |
Jan
(32) |
Feb
(10) |
Mar
(17) |
Apr
|
May
|
Jun
(26) |
Jul
(5) |
Aug
|
Sep
(4) |
Oct
(23) |
Nov
(80) |
Dec
(48) |
| 2015 |
Jan
(80) |
Feb
(50) |
Mar
(58) |
Apr
(20) |
May
(11) |
Jun
(16) |
Jul
(24) |
Aug
(27) |
Sep
(56) |
Oct
(30) |
Nov
(16) |
Dec
(6) |
| 2016 |
Jan
(31) |
Feb
(14) |
Mar
(23) |
Apr
(17) |
May
(40) |
Jun
(12) |
Jul
(17) |
Aug
(9) |
Sep
(32) |
Oct
(36) |
Nov
(23) |
Dec
(9) |
| 2017 |
Jan
(37) |
Feb
(23) |
Mar
(65) |
Apr
(22) |
May
(6) |
Jun
(3) |
Jul
|
Aug
|
Sep
(3) |
Oct
(22) |
Nov
(63) |
Dec
(71) |
| 2018 |
Jan
(83) |
Feb
(21) |
Mar
(35) |
Apr
(44) |
May
(14) |
Jun
(12) |
Jul
(8) |
Aug
(18) |
Sep
(10) |
Oct
(145) |
Nov
(144) |
Dec
(76) |
| 2019 |
Jan
(18) |
Feb
(28) |
Mar
(5) |
Apr
(208) |
May
(291) |
Jun
(158) |
Jul
(27) |
Aug
(8) |
Sep
(10) |
Oct
(83) |
Nov
(41) |
Dec
(31) |
| 2020 |
Jan
(16) |
Feb
(46) |
Mar
(100) |
Apr
(78) |
May
(69) |
Jun
(71) |
Jul
(28) |
Aug
(131) |
Sep
(176) |
Oct
(89) |
Nov
(147) |
Dec
(19) |
| 2021 |
Jan
(19) |
Feb
(25) |
Mar
(91) |
Apr
(98) |
May
(14) |
Jun
(44) |
Jul
(8) |
Aug
(3) |
Sep
(38) |
Oct
(57) |
Nov
(97) |
Dec
(74) |
| 2022 |
Jan
(89) |
Feb
(47) |
Mar
(15) |
Apr
(50) |
May
(54) |
Jun
(56) |
Jul
(80) |
Aug
(12) |
Sep
(11) |
Oct
(60) |
Nov
(48) |
Dec
(4) |
| 2023 |
Jan
(75) |
Feb
(49) |
Mar
(84) |
Apr
(24) |
May
(13) |
Jun
(74) |
Jul
(32) |
Aug
(66) |
Sep
(50) |
Oct
(38) |
Nov
(105) |
Dec
(181) |
| 2024 |
Jan
(21) |
Feb
(49) |
Mar
(77) |
Apr
(84) |
May
(20) |
Jun
(71) |
Jul
(53) |
Aug
(33) |
Sep
(54) |
Oct
(124) |
Nov
(151) |
Dec
(73) |
| 2025 |
Jan
(61) |
Feb
(17) |
Mar
(136) |
Apr
(72) |
May
(200) |
Jun
(238) |
Jul
(91) |
Aug
(8) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ho...@us...> - 2007-06-26 08:33:11
|
Revision: 2382
http://skim-app.svn.sourceforge.net/skim-app/?rev=2382&view=rev
Author: hofman
Date: 2007-06-26 01:33:02 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
Update textfield bindings in line inspector continuously. Round dash pattern to integer values.
Modified Paths:
--------------
trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
trunk/English.lproj/LineInspector.nib/keyedobjects.nib
trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
trunk/SKLineInspector.m
Modified: trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2007-06-25 17:17:07 UTC (rev 2381)
+++ trunk/SKLineInspector.m 2007-06-26 08:33:02 UTC (rev 2382)
@@ -479,6 +479,15 @@
}
}
+- (void)setNilValueForKey:(NSString *)key {
+ if ([key isEqualToString:@"lineWidth"] || [key isEqualToString:@"style"] ||
+ [key isEqualToString:@"startLineStyle"] || [key isEqualToString:@"endLineStyle"]) {
+ [self setValue:[NSNumber numberWithInt:0] forKey:key];
+ } else {
+ [super setNilValueForKey:key];
+ }
+}
+
@end
#pragma mark -
@@ -489,7 +498,7 @@
numberFormatter = [[NSNumberFormatter alloc] init];
[numberFormatter setFormatterBehavior:NSNumberFormatterBehavior10_4];
[numberFormatter setNumberStyle:NSNumberFormatterDecimalStyle];
- [numberFormatter setFormat:@"#,###.0;0.0;-#,###.0"];
+ [numberFormatter setFormat:@"0;0;-0"];
[numberFormatter setMinimum:[NSNumber numberWithFloat:0.0]];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-25 17:17:18
|
Revision: 2381
http://skim-app.svn.sourceforge.net/skim-app/?rev=2381&view=rev
Author: hofman
Date: 2007-06-25 10:17:07 -0700 (Mon, 25 Jun 2007)
Log Message:
-----------
Fix setter name. Add default interior colors for AppleScript accessor. Use clearColor as default interior colors and ignore it when the alpha is zero.
Modified Paths:
--------------
trunk/InitialUserDefaults.plist
trunk/SKApplicationController.h
trunk/SKApplicationController.m
trunk/SKPDFAnnotationNote.m
trunk/Skim.sdef
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2007-06-24 21:05:24 UTC (rev 2380)
+++ trunk/InitialUserDefaults.plist 2007-06-25 17:17:07 UTC (rev 2381)
@@ -122,9 +122,15 @@
ZmZmAAABAYY=
</data>
<key>SKCircleNoteInteriorColor</key>
- <data></data>
+ <data>
+ BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMDhAJm
+ ZgAAhg==
+ </data>
<key>SKSquareNoteInteriorColor</key>
- <data></data>
+ <data>
+ BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMDhAJm
+ ZgAAhg==
+ </data>
<key>SKFreeTextNoteLineWidth</key>
<real>1.0</real>
<key>SKFreeTextNoteLineStyle</key>
Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h 2007-06-24 21:05:24 UTC (rev 2380)
+++ trunk/SKApplicationController.h 2007-06-25 17:17:07 UTC (rev 2381)
@@ -68,7 +68,7 @@
- (NSColor *)fullScreenBackgroundColor;
- (void)setFullScreenBackgroundColor:(NSColor *)color;
- (NSDictionary *)defaultNoteColors;
-- (void)setDefaultColors:(NSDictionary *)colorDict;
+- (void)setDefaultNoteColors:(NSDictionary *)colorDict;
@end
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-06-24 21:05:24 UTC (rev 2380)
+++ trunk/SKApplicationController.m 2007-06-25 17:17:07 UTC (rev 2381)
@@ -463,10 +463,12 @@
[NSUnarchiver unarchiveObjectWithData:[sud dataForKey:SKHighlightNoteColorKey]], @"highlightNote",
[NSUnarchiver unarchiveObjectWithData:[sud dataForKey:SKUnderlineNoteColorKey]], @"underlineNote",
[NSUnarchiver unarchiveObjectWithData:[sud dataForKey:SKStrikeOutNoteColorKey]], @"strikeOutNote",
- [NSUnarchiver unarchiveObjectWithData:[sud dataForKey:SKLineNoteColorKey]], @"lineNote", nil];
+ [NSUnarchiver unarchiveObjectWithData:[sud dataForKey:SKLineNoteColorKey]], @"lineNote",
+ [NSUnarchiver unarchiveObjectWithData:[sud dataForKey:SKCircleNoteInteriorColorKey]], @"circleNoteInterior",
+ [NSUnarchiver unarchiveObjectWithData:[sud dataForKey:SKSquareNoteInteriorColorKey]], @"squareNoteInterior", nil];
}
-- (void)setDefaultColors:(NSDictionary *)colorDict {
+- (void)setDefaultNoteColors:(NSDictionary *)colorDict {
NSUserDefaults *sud = [NSUserDefaults standardUserDefaults];
NSColor *color;
if (color = [colorDict objectForKey:@"textNote"])
@@ -485,6 +487,10 @@
[sud setObject:[NSArchiver archivedDataWithRootObject:color] forKey:SKStrikeOutNoteColorKey];
if (color = [colorDict objectForKey:@"lineNote"])
[sud setObject:[NSArchiver archivedDataWithRootObject:color] forKey:SKLineNoteColorKey];
+ if (color = [colorDict objectForKey:@"circleNoteInterior"])
+ [sud setObject:[NSArchiver archivedDataWithRootObject:color] forKey:SKCircleNoteInteriorColorKey];
+ if (color = [colorDict objectForKey:@"squareNoteInterior"])
+ [sud setObject:[NSArchiver archivedDataWithRootObject:color] forKey:SKSquareNoteInteriorColorKey];
}
@end
Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m 2007-06-24 21:05:24 UTC (rev 2380)
+++ trunk/SKPDFAnnotationNote.m 2007-06-25 17:17:07 UTC (rev 2381)
@@ -578,9 +578,9 @@
- (id)initWithBounds:(NSRect)bounds {
if (self = [super initWithBounds:bounds]) {
- NSData *colorData = [[NSUserDefaults standardUserDefaults] dataForKey:SKCircleNoteInteriorColorKey];
- if ([colorData length])
- [self setInteriorColor:[NSUnarchiver unarchiveObjectWithData:colorData]];
+ NSColor *color = [NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKCircleNoteInteriorColorKey]];
+ if ([color alphaComponent] > 0.0)
+ [self setInteriorColor:color];
[self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKCircleNoteColorKey]]];
[[self border] setLineWidth:[[NSUserDefaults standardUserDefaults] floatForKey:SKCircleNoteLineWidthKey]];
[[self border] setDashPattern:[[NSUserDefaults standardUserDefaults] arrayForKey:SKCircleNoteDashPatternKey]];
@@ -635,9 +635,9 @@
- (id)initWithBounds:(NSRect)bounds {
if (self = [super initWithBounds:bounds]) {
- NSData *colorData = [[NSUserDefaults standardUserDefaults] dataForKey:SKSquareNoteInteriorColorKey];
- if ([colorData length])
- [self setInteriorColor:[NSUnarchiver unarchiveObjectWithData:colorData]];
+ NSColor *color = [NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKSquareNoteInteriorColorKey]];
+ if ([color alphaComponent] > 0.0)
+ [self setInteriorColor:color];
[self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKSquareNoteColorKey]]];
[[self border] setLineWidth:[[NSUserDefaults standardUserDefaults] floatForKey:SKSquareNoteLineWidthKey]];
[[self border] setDashPattern:[[NSUserDefaults standardUserDefaults] arrayForKey:SKSquareNoteDashPatternKey]];
Modified: trunk/Skim.sdef
===================================================================
--- trunk/Skim.sdef 2007-06-24 21:05:24 UTC (rev 2380)
+++ trunk/Skim.sdef 2007-06-25 17:17:07 UTC (rev 2381)
@@ -824,6 +824,14 @@
description="Default line color.">
<cocoa key="lineNote"/>
</property>
+ <property name="circle note interior color" code="CCiI" type="RGBA color"
+ description="Default circle fill color.">
+ <cocoa key="circleNoteInterior"/>
+ </property>
+ <property name="box note interior color" code="CSqI" type="RGBA color"
+ description="Default box fill color.">
+ <cocoa key="squareNoteInterior"/>
+ </property>
</record-type>
<value-type name="RGBA color" code="RGBA">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-24 21:05:30
|
Revision: 2380
http://skim-app.svn.sourceforge.net/skim-app/?rev=2380&view=rev
Author: hofman
Date: 2007-06-24 14:05:24 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
Restrict line width to integral values between 0 and 10.
Modified Paths:
--------------
trunk/Dutch.lproj/LineInspector.nib/info.nib
trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
trunk/English.lproj/LineInspector.nib/info.nib
trunk/English.lproj/LineInspector.nib/keyedobjects.nib
trunk/Italian.lproj/LineInspector.nib/info.nib
trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/LineInspector.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/LineInspector.nib/info.nib 2007-06-22 17:10:43 UTC (rev 2379)
+++ trunk/Dutch.lproj/LineInspector.nib/info.nib 2007-06-24 21:05:24 UTC (rev 2380)
@@ -11,6 +11,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/LineInspector.nib/info.nib
===================================================================
--- trunk/English.lproj/LineInspector.nib/info.nib 2007-06-22 17:10:43 UTC (rev 2379)
+++ trunk/English.lproj/LineInspector.nib/info.nib 2007-06-24 21:05:24 UTC (rev 2380)
@@ -11,6 +11,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/English.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/LineInspector.nib/info.nib
===================================================================
--- trunk/Italian.lproj/LineInspector.nib/info.nib 2007-06-22 17:10:43 UTC (rev 2379)
+++ trunk/Italian.lproj/LineInspector.nib/info.nib 2007-06-24 21:05:24 UTC (rev 2380)
@@ -11,6 +11,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-22 17:11:37
|
Revision: 2379
http://skim-app.svn.sourceforge.net/skim-app/?rev=2379&view=rev
Author: hofman
Date: 2007-06-22 10:10:43 -0700 (Fri, 22 Jun 2007)
Log Message:
-----------
Don't keep border parameters in a border, as it changes parameters when they are not set.
Modified Paths:
--------------
trunk/SKLineInspector.h
trunk/SKLineInspector.m
Modified: trunk/SKLineInspector.h
===================================================================
--- trunk/SKLineInspector.h 2007-06-22 14:56:24 UTC (rev 2378)
+++ trunk/SKLineInspector.h 2007-06-22 17:10:43 UTC (rev 2379)
@@ -53,7 +53,9 @@
IBOutlet NSTextField *dashPatternField;
IBOutlet NSSegmentedControl *startLineStyleButton;
IBOutlet NSSegmentedControl *endLineStyleButton;
- PDFBorder *border;
+ float lineWidth;
+ PDFBorderStyle style;
+ NSArray *dashPattern;
PDFLineStyle startLineStyle;
PDFLineStyle endLineStyle;
}
@@ -72,7 +74,6 @@
- (PDFLineStyle)endLineStyle;
- (void)setEndLineStyle:(PDFLineStyle)newStyle;
-- (void)setBorder:(PDFBorder *)newBorder;
- (void)setAnnotationStyle:(PDFAnnotation *)annotation;
@end
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2007-06-22 14:56:24 UTC (rev 2378)
+++ trunk/SKLineInspector.m 2007-06-22 17:10:43 UTC (rev 2379)
@@ -64,7 +64,9 @@
- (id)init {
if (sharedLineInspector == nil && (self = [super initWithWindowNibName:@"LineInspector"])) {
sharedLineInspector = self;
- border = [[PDFBorder alloc] init];
+ style = kPDFBorderStyleSolid;
+ lineWidth = 1.0;
+ dashPattern = nil;
startLineStyle = kPDFLineStyleNone;
endLineStyle = kPDFLineStyleNone;
}
@@ -72,7 +74,7 @@
}
- (void)dealloc {
- [border release];
+ [dashPattern release];
[super dealloc];
}
@@ -406,34 +408,35 @@
#pragma mark Accessors
- (float)lineWidth {
- return [border lineWidth];
+ return lineWidth;
}
- (void)setLineWidth:(float)width {
- [border setLineWidth:width];
+ lineWidth = width;
[self sendActionToTarget:@selector(changeLineWidth:)];
[[NSNotificationCenter defaultCenter] postNotificationName:SKLineInspectorLineWidthDidChangeNotification object:self];
}
- (PDFBorderStyle)style {
- return [border style];
+ return style;
}
-- (void)setStyle:(PDFBorderStyle)style {
- if (style != [border style]) {
- [border setStyle:style];
+- (void)setStyle:(PDFBorderStyle)newStyle {
+ if (newStyle != style) {
+ style = newStyle;
[self sendActionToTarget:@selector(changeLineStyle:)];
[[NSNotificationCenter defaultCenter] postNotificationName:SKLineInspectorLineStyleDidChangeNotification object:self];
}
}
- (NSArray *)dashPattern {
- return [border dashPattern];
+ return dashPattern;
}
- (void)setDashPattern:(NSArray *)pattern {
- if (pattern != [border dashPattern]) {
- [border setDashPattern:pattern];
+ if (pattern != dashPattern) {
+ [dashPattern release];
+ dashPattern = [pattern copy];
[self sendActionToTarget:@selector(changeDashPattern:)];
[[NSNotificationCenter defaultCenter] postNotificationName:SKLineInspectorDashPatternDidChangeNotification object:self];
}
@@ -463,18 +466,13 @@
}
}
-- (void)setBorder:(PDFBorder *)newBorder {
- if (newBorder != border) {
- [self setLineWidth:[newBorder lineWidth]];
- [self setDashPattern:[newBorder dashPattern]];
- [self setStyle:[newBorder style]];
- }
-}
-
- (void)setAnnotationStyle:(PDFAnnotation *)annotation {
NSString *type = [annotation type];
- if ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"])
- [self setBorder:[annotation border]];
+ if ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"]) {
+ [self setLineWidth:[[annotation border] lineWidth]];
+ [self setDashPattern:[[annotation border] dashPattern]];
+ [self setStyle:[[annotation border] style]];
+ }
if ([type isEqualToString:@"Line"]) {
[self setStartLineStyle:[(PDFAnnotationLine *)annotation startLineStyle]];
[self setEndLineStyle:[(PDFAnnotationLine *)annotation endLineStyle]];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-22 14:56:26
|
Revision: 2378
http://skim-app.svn.sourceforge.net/skim-app/?rev=2378&view=rev
Author: hofman
Date: 2007-06-22 07:56:24 -0700 (Fri, 22 Jun 2007)
Log Message:
-----------
Draw line endings identical to PDFAnnotationLine.
Modified Paths:
--------------
trunk/SKLineInspector.m
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2007-06-22 11:05:43 UTC (rev 2377)
+++ trunk/SKLineInspector.m 2007-06-22 14:56:24 UTC (rev 2378)
@@ -332,9 +332,9 @@
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(20.0, 6.0)];
[path lineToPoint:NSMakePoint(8.0, 6.0)];
- [path moveToPoint:NSMakePoint(13.0, 3.0)];
- [path lineToPoint:NSMakePoint(7.0, 6.0)];
- [path lineToPoint:NSMakePoint(13.0, 9.0)];
+ [path moveToPoint:NSMakePoint(14.0, 3.0)];
+ [path lineToPoint:NSMakePoint(8.0, 6.0)];
+ [path lineToPoint:NSMakePoint(14.0, 9.0)];
[path setLineWidth:2.0];
[[NSColor blackColor] setStroke];
[path stroke];
@@ -347,9 +347,9 @@
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(4.0, 6.0)];
[path lineToPoint:NSMakePoint(16.0, 6.0)];
- [path moveToPoint:NSMakePoint(11.0, 3.0)];
- [path lineToPoint:NSMakePoint(17.0, 6.0)];
- [path lineToPoint:NSMakePoint(11.0, 9.0)];
+ [path moveToPoint:NSMakePoint(10.0, 3.0)];
+ [path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path lineToPoint:NSMakePoint(10.0, 9.0)];
[path setLineWidth:2.0];
[[NSColor blackColor] setStroke];
[path stroke];
@@ -362,9 +362,9 @@
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(20.0, 6.0)];
[path lineToPoint:NSMakePoint(8.0, 6.0)];
- [path moveToPoint:NSMakePoint(13.0, 3.0)];
- [path lineToPoint:NSMakePoint(7.0, 6.0)];
- [path lineToPoint:NSMakePoint(13.0, 9.0)];
+ [path moveToPoint:NSMakePoint(14.0, 3.0)];
+ [path lineToPoint:NSMakePoint(8.0, 6.0)];
+ [path lineToPoint:NSMakePoint(14.0, 9.0)];
[path closePath];
[path setLineWidth:2.0];
[[NSColor blackColor] setStroke];
@@ -378,9 +378,9 @@
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(4.0, 6.0)];
[path lineToPoint:NSMakePoint(16.0, 6.0)];
- [path moveToPoint:NSMakePoint(11.0, 3.0)];
- [path lineToPoint:NSMakePoint(17.0, 6.0)];
- [path lineToPoint:NSMakePoint(11.0, 9.0)];
+ [path moveToPoint:NSMakePoint(10.0, 3.0)];
+ [path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path lineToPoint:NSMakePoint(10.0, 9.0)];
[path closePath];
[path setLineWidth:2.0];
[[NSColor blackColor] setStroke];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-22 11:05:48
|
Revision: 2377
http://skim-app.svn.sourceforge.net/skim-app/?rev=2377&view=rev
Author: hofman
Date: 2007-06-22 04:05:43 -0700 (Fri, 22 Jun 2007)
Log Message:
-----------
Scroll readingbar to visible when it is moved.
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-22 08:44:19 UTC (rev 2376)
+++ trunk/SKPDFView.m 2007-06-22 11:05:43 UTC (rev 2377)
@@ -493,7 +493,7 @@
[readingBar setPage:[self currentPage]];
[readingBar goToNextLine];
[self setNeedsDisplay:YES];
- [self scrollRect:[readingBar currentBounds] inPageToVisible:[readingBar page]];
+ [self scrollRect:NSInsetRect([readingBar currentBounds], 0.0, -20.0) inPageToVisible:[readingBar page]];
[userInfo setValue:[readingBar page] forKey:@"newPage"];
}
[[NSNotificationCenter defaultCenter] postNotificationName:SKPDFViewReadingBarDidChangeNotification object:self userInfo:userInfo];
@@ -1570,7 +1570,8 @@
- (void)scrollRect:(NSRect)rect inPageToVisible:(PDFPage *)page {
rect = [self convertRect:[self convertRect:rect fromPage:page] toView:[self documentView]];
- [self goToPage:page];
+ if ([[self currentPage] isEqual:page] == NO)
+ [self goToPage:page];
[[self documentView] scrollRectToVisible:rect];
}
@@ -2244,8 +2245,7 @@
else if (eventChar == NSLeftArrowFunctionKey)
moved = [readingBar goToPreviousPage];
if (moved) {
- if ([[self currentPage] isEqual:[readingBar page]] == NO)
- [self goToPage:[readingBar page]];
+ [self scrollRect:NSInsetRect([readingBar currentBounds], 0.0, -20.0) inPageToVisible:[readingBar page]];
[self setNeedsDisplay:YES];
[userInfo setObject:[readingBar page] forKey:@"newPage"];
[[NSNotificationCenter defaultCenter] postNotificationName:SKPDFViewReadingBarDidChangeNotification object:self userInfo:userInfo];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-22 08:44:24
|
Revision: 2376
http://skim-app.svn.sourceforge.net/skim-app/?rev=2376&view=rev
Author: hofman
Date: 2007-06-22 01:44:19 -0700 (Fri, 22 Jun 2007)
Log Message:
-----------
Remove english Localizable.strings as it is generated.
Modified Paths:
--------------
trunk/Skim.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/English.lproj/Localizable.strings
Deleted: trunk/English.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2007-06-21 22:59:53 UTC (rev 2375)
+++ trunk/Skim.xcodeproj/project.pbxproj 2007-06-22 08:44:19 UTC (rev 2376)
@@ -1263,7 +1263,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "#\n# Run the genstrings build phase\n# This takes a while to generate, so it's not worth\n# the wait for development builds.\n#\nif [ ${BUILD_STYLE} = \"Debug\" ]; then\nexit 0\nfi\ncd ${SOURCE_ROOT}\n/usr/bin/genstrings -o ${SOURCE_ROOT}/English.lproj -skipTable Sparkle `/usr/bin/find . -type file -name \"*.[mh]\"`";
+ shellScript = "#\n# Run the genstrings build phase\n# This takes a while to generate, so it's not worth\n# the wait for development builds.\n#\nif [ ${BUILD_STYLE} = \"Debug\" ]; then\n# Check to see if a previous version exists and create it\n# if not, or else pbxcp will complain.\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nexit 0\nfi\n#\n# Run the genstrings build phase\n#\nfi\ncd ${SOURCE_ROOT}\nif [ -f \"English.lproj/Localizable.strings\" ]; then\nmv English.lproj/Localizable.strings English.lproj/Localizable.strings.bak \nfi\n/usr/bin/genstrings -o ${SOURCE_ROOT}/English.lproj -skipTable Sparkle `/usr/bin/find . -type file -name \"*.[mh]\"`";
};
CEE22EA50BFB8691002B746B /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2007-06-21 22:59:57
|
Revision: 2375
http://skim-app.svn.sourceforge.net/skim-app/?rev=2375&view=rev
Author: amaxwell
Date: 2007-06-21 15:59:53 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
Fix drawing problem with active annotation; if you double-clicked an annotation, then scrolled to another page, the previous annotation's box would be present on the new page.
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-21 22:59:02 UTC (rev 2374)
+++ trunk/SKPDFView.m 2007-06-21 22:59:53 UTC (rev 2375)
@@ -245,7 +245,8 @@
[(PDFAnnotationLink *)annotation fixRelativeURLIfNeeded];
}
- if (activeAnnotation) {
+ // activeAnnotation may be a leftover, and we don't want to outline it on the wrong page
+ if (activeAnnotation && [[activeAnnotation page] isEqual:pdfPage]) {
BOOL isLink = [[activeAnnotation type] isEqualToString:@"Link"];
float lineWidth = isLink ? 2.0 : 1.0;
NSRect bounds = [activeAnnotation bounds];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2007-06-21 22:59:10
|
Revision: 2374
http://skim-app.svn.sourceforge.net/skim-app/?rev=2374&view=rev
Author: amaxwell
Date: 2007-06-21 15:59:02 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
Fix exception (looks like image name changed)
Modified Paths:
--------------
trunk/SKNoteOutlineView.m
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2007-06-21 22:22:19 UTC (rev 2373)
+++ trunk/SKNoteOutlineView.m 2007-06-21 22:59:02 UTC (rev 2374)
@@ -379,7 +379,7 @@
SKAddNamedAndFilteredImageForKey(noteImages, invertedNoteImages, @"HighlightNoteAdorn", @"Highlight", filter);
SKAddNamedAndFilteredImageForKey(noteImages, invertedNoteImages, @"UnderlineNoteAdorn", @"Underline", filter);
SKAddNamedAndFilteredImageForKey(noteImages, invertedNoteImages, @"StrikeOutNoteAdorn", @"StrikeOut", filter);
- SKAddNamedAndFilteredImageForKey(noteImages, invertedNoteImages, @"ArrowNoteAdorn", @"Line", filter);
+ SKAddNamedAndFilteredImageForKey(noteImages, invertedNoteImages, @"LineNoteAdorn", @"Line", filter);
}
BOOL isSelected = [self isHighlighted] && [[controlView window] isKeyWindow] && [[[controlView window] firstResponder] isEqual:controlView];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-21 22:22:21
|
Revision: 2373
http://skim-app.svn.sourceforge.net/skim-app/?rev=2373&view=rev
Author: hofman
Date: 2007-06-21 15:22:19 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
Deactivate color wells when pref window resigns main status.
Modified Paths:
--------------
trunk/SKPreferenceController.m
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2007-06-21 20:47:57 UTC (rev 2372)
+++ trunk/SKPreferenceController.m 2007-06-21 22:22:19 UTC (rev 2373)
@@ -47,6 +47,32 @@
static NSString *SKTeXEditorCommands[] = {@"mate", @"bbedit", @"edit", @"emacsclient", @"emacsclient", @"lyxeditor"};
static NSString *SKTeXEditorArguments[] = {@"-l %line \"%file\"", @"+%line \"%file\"", @"+%line \"%file\"", @"--no-wait +%line \"%file\"", @"--no-wait +%line \"%file\"", @"\"%file\" %line"};
+
+@interface NSView (SKExtensions)
+- (void)deactivateColorWells;
+@end
+
+@implementation NSView (SKExtensions)
+- (void)deactivateColorWells {
+ NSEnumerator *viewEnum = [[self subviews] objectEnumerator];
+ NSView *view;
+ while (view = [viewEnum nextObject])
+ [view deactivateColorWells];
+}
+@end
+
+@interface NSColorWell (SKExtensions)
+@end
+
+@implementation NSColorWell (SKExtensions)
+- (void)deactivateColorWells {
+ [self deactivate];
+ [super deactivateColorWells];
+}
+@end
+
+#pragma mark -
+
@implementation SKPreferenceController
+ (id)sharedPrefenceController {
@@ -122,6 +148,10 @@
[self updateRevertButtons];
}
+- (void)windowDidResignMain:(NSNotification *)notification {
+ [[[self window] contentView] deactivateColorWells];
+}
+
- (NSArray *)fonts {
return fonts;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-21 20:47:59
|
Revision: 2372
http://skim-app.svn.sourceforge.net/skim-app/?rev=2372&view=rev
Author: hofman
Date: 2007-06-21 13:47:57 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
AppleScript save command with file argument and without file type argument acts like Save As rather than Save or Export.
Modified Paths:
--------------
trunk/SKDocument.m
trunk/Skim.sdef
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-06-21 17:33:14 UTC (rev 2371)
+++ trunk/SKDocument.m 2007-06-21 20:47:57 UTC (rev 2372)
@@ -1013,8 +1013,13 @@
[command setArguments:arguments];
[arguments release];
}
- if (fileURL == nil || fileType == nil) {
- return [super handleSaveScriptCommand:command];
+ if (fileType == nil) {
+ if (fileURL == nil) {
+ return [super handleSaveScriptCommand:command];
+ } else if ([self saveToURL:fileURL ofType:NSPDFPboardType forSaveOperation:NSSaveAsOperation error:NULL] == NO) {
+ [command setScriptErrorNumber:NSInternalScriptError];
+ [command setScriptErrorString:@"Unable to save."];
+ }
} else if ([fileURL isKindOfClass:[NSURL class]] == NO) {
[command setScriptErrorNumber:NSArgumentsWrongScriptError];
[command setScriptErrorString:@"The file is not a file or alias."];
@@ -1023,7 +1028,7 @@
[command setScriptErrorString:@"The file type should be a string."];
} else if ([self saveToURL:fileURL ofType:fileType forSaveOperation:NSSaveToOperation error:NULL] == NO) {
[command setScriptErrorNumber:NSInternalScriptError];
- [command setScriptErrorString:@"No file name set."];
+ [command setScriptErrorString:@"Unable to export."];
}
return nil;
}
Modified: trunk/Skim.sdef
===================================================================
--- trunk/Skim.sdef 2007-06-21 17:33:14 UTC (rev 2371)
+++ trunk/Skim.sdef 2007-06-21 20:47:57 UTC (rev 2372)
@@ -255,11 +255,11 @@
<direct-parameter type="specifier"
description="The document(s) or window(s) to save."/>
<parameter name="in" code="kfil" type="file" optional="yes"
- description="The file in which to save the document.">
+ description="The file in which to save the document. If this is set, this acts like Save As or Export.">
<cocoa key="File"/>
</parameter>
<parameter name="as" code="fltp" type="text" optional="yes"
- description="The type of file to save. Should be one of "PDF", "PDF Without Notes", "PDF With Embedded Notes", "Skim Notes", "Notes as RTF", and "Notes as Text".">
+ description="The type of file to save. If this is set, this acts like Export. Should be one of "PDF", "PDF Without Notes", "PDF With Embedded Notes", "Skim Notes", "Notes as RTF", and "Notes as Text".">
<cocoa key="FileType"/>
</parameter>
</command>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-21 17:33:53
|
Revision: 2371
http://skim-app.svn.sourceforge.net/skim-app/?rev=2371&view=rev
Author: hofman
Date: 2007-06-21 10:33:14 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
Use calibrated color space consistently. This is consistent with the Apple's UI, such as color panel and built-in AppleScript color support.
Modified Paths:
--------------
trunk/BDSKEdgeView.m
trunk/BDSKImagePopUpButtonCell.m
trunk/InitialUserDefaults.plist
trunk/NSColor_SKExtensions.m
trunk/PDFPage_SKExtensions.m
trunk/SKMainWindowController.m
trunk/SKNoteOutlineView.m
trunk/SKNoteWindowController.m
trunk/SKPDFAnnotationNote.m
trunk/SKPDFView.m
trunk/SKSideWindow.m
trunk/SKSnapshotWindowController.m
trunk/SKSplitView.m
trunk/SKThumbnailTableView.m
Modified: trunk/BDSKEdgeView.m
===================================================================
--- trunk/BDSKEdgeView.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/BDSKEdgeView.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -44,7 +44,7 @@
- (id)initWithFrame:(NSRect)frame {
if (self = [super initWithFrame:frame]) {
- NSColor *color = [NSColor colorWithDeviceWhite:0.75 alpha:1.0];
+ NSColor *color = [NSColor colorWithCalibratedWhite:0.75 alpha:1.0];
edgeColors = [[NSMutableArray alloc] initWithObjects:color, color, color, color, nil];
edges = BDSKNoEdgeMask; // we start with no edge, so we can use this in IB without getting weird offsets
}
Modified: trunk/BDSKImagePopUpButtonCell.m
===================================================================
--- trunk/BDSKImagePopUpButtonCell.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/BDSKImagePopUpButtonCell.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -81,7 +81,7 @@
[path lineToPoint:NSMakePoint(6.5, 5.0)];
[path lineToPoint:NSMakePoint(3.5, 0.0)];
[path closePath];
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.75] setFill];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.75] setFill];
[path fill];
[defaultArrowImage unlockFocus];
}
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/InitialUserDefaults.plist 2007-06-21 17:33:14 UTC (rev 2371)
@@ -83,12 +83,12 @@
<real>11.0</real>
<key>SKFreeTextNoteColor</key>
<data>
- BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
+ BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
ZmZmAQGDPwAAAAGG
</data>
<key>SKAnchoredNoteColor</key>
<data>
- BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
+ BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
ZmZmAQGDPwAAAAGG
</data>
<key>SKCircleNoteColor</key>
@@ -108,7 +108,7 @@
</data>
<key>SKUnderlineNoteColor</key>
<data>
- BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMChARm
+ BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
ZmZmAIM/AAAAAAGG
</data>
<key>SKStrikeOutNoteColor</key>
Modified: trunk/NSColor_SKExtensions.m
===================================================================
--- trunk/NSColor_SKExtensions.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/NSColor_SKExtensions.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -52,21 +52,21 @@
case SKASColorYellow: return [NSColor yellowColor];
case SKASColorMagenta: return [NSColor magentaColor];
case SKASColorCyan: return [NSColor cyanColor];
- case SKASColorDarkRed: return [NSColor colorWithDeviceRed:0.5 green:0.0 blue:0.0 alpha:1.0];
- case SKASColorDarkGreen: return [NSColor colorWithDeviceRed:0.0 green:0.5 blue:0.0 alpha:1.0];
- case SKASColorDarkBlue: return [NSColor colorWithDeviceRed:0.0 green:0.0 blue:0.5 alpha:1.0];
- case SKASColorBanana: return [NSColor colorWithDeviceRed:1.0 green:1.0 blue:0.5 alpha:1.0];
- case SKASColorTurquoise: return [NSColor colorWithDeviceRed:1.0 green:0.5 blue:1.0 alpha:1.0];
- case SKASColorViolet: return [NSColor colorWithDeviceRed:0.5 green:1.0 blue:1.0 alpha:1.0];
+ 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 colorWithDeviceRed:1.0 green:0.0 blue:0.5 alpha:1.0];
- case SKASColorSpringGreen: return [NSColor colorWithDeviceRed:0.0 green:1.0 blue:0.5 alpha:1.0];
- case SKASColorAqua: return [NSColor colorWithDeviceRed:0.0 green:0.5 blue:1.0 alpha:1.0];
- case SKASColorLime: return [NSColor colorWithDeviceRed:0.5 green:1.0 blue:0.0 alpha:1.0];
- case SKASColorDarkViolet: return [NSColor colorWithDeviceRed:0.5 green:0.0 blue:1.0 alpha:1.0];
+ 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 colorWithDeviceRed:0.0 green:0.5 blue:0.5 alpha:1.0];
- case SKASColorOlive: return [NSColor colorWithDeviceRed:0.5 green:0.5 blue:0.0 alpha:1.0];
+ 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];
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/PDFPage_SKExtensions.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -183,7 +183,7 @@
[[NSColor whiteColor] set];
if (hasShadow) {
NSShadow *shadow = [[NSShadow alloc] init];
- [shadow setShadowColor:[NSColor colorWithDeviceWhite:0.0 alpha:0.5]];
+ [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.5]];
[shadow setShadowBlurRadius:shadowBlurRadius];
[shadow setShadowOffset:shadowOffset];
[shadow set];
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/SKMainWindowController.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -207,7 +207,7 @@
[self setWindowFrameAutosaveNameOrCascade:SKMainWindowFrameAutosaveName];
- [[self window] setBackgroundColor:[NSColor colorWithDeviceWhite:0.9 alpha:1.0]];
+ [[self window] setBackgroundColor:[NSColor colorWithCalibratedWhite:0.9 alpha:1.0]];
int windowSizeOption = [[NSUserDefaults standardUserDefaults] integerForKey:SKInitialWindowSizeOptionKey];
if (windowSizeOption == 1)
@@ -2267,7 +2267,7 @@
if (noteToolAdornImages[0] == nil) {
NSSize size = NSMakeSize(23.0, 11.0);
NSPoint point = NSMakePoint(2.0, 0.0);
- NSColor *color = [NSColor colorWithDeviceWhite:0.0 alpha:0.75];
+ NSColor *color = [NSColor colorWithCalibratedWhite:0.0 alpha:0.75];
NSBezierPath *arrowPath = [NSBezierPath bezierPath];
[arrowPath moveToPoint:NSMakePoint(20.5,4.0)];
[arrowPath lineToPoint:NSMakePoint(18.0,7.0)];
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/SKNoteOutlineView.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -388,9 +388,9 @@
if (active) {
[[NSGraphicsContext currentContext] saveGraphicsState];
if (isSelected)
- [[NSColor colorWithDeviceWhite:1.0 alpha:0.8] set];
+ [[NSColor colorWithCalibratedWhite:1.0 alpha:0.8] set];
else
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.7] set];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.7] set];
[NSBezierPath strokeRect:NSInsetRect(cellFrame, 0.5, 0.5)];
[[NSGraphicsContext currentContext] restoreGraphicsState];
}
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/SKNoteWindowController.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -80,7 +80,7 @@
}
- (void)windowDidLoad {
- [[self window] setBackgroundColor:[NSColor colorWithDeviceWhite:0.9 alpha:1.0]];
+ [[self window] setBackgroundColor:[NSColor colorWithCalibratedWhite:0.9 alpha:1.0]];
[[self window] setLevel:keepOnTop || forceOnTop ? NSFloatingWindowLevel : NSNormalWindowLevel];
[[self window] setHidesOnDeactivate:keepOnTop];
Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/SKPDFAnnotationNote.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -739,7 +739,6 @@
[self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKUnderlineNoteColorKey]]];
else if (type == kPDFMarkupTypeStrikeOut)
[self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKStrikeOutNoteColorKey]]];
- [[NSUserDefaults standardUserDefaults] setObject:[NSArchiver archivedDataWithRootObject:[NSColor colorWithDeviceRed:0 green:0.5 blue:0 alpha:1.0]] forKey:SKUnderlineNoteColorKey];
NSArray *quadPoints = nil;
if (pointStrings) {
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/SKPDFView.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -3071,7 +3071,7 @@
[[NSGraphicsContext currentContext] saveGraphicsState];
outlineRect = NSInsetRect(NSIntegralRect([clipView convertRect:magRect fromView:nil]), 1.5, 1.5);
[NSBezierPath setDefaultLineWidth:3.0];
- [[NSColor colorWithDeviceWhite:0.2 alpha:1.0] set];
+ [[NSColor colorWithCalibratedWhite:0.2 alpha:1.0] set];
[NSBezierPath strokeRoundRectInRect:outlineRect radius:8.0];
[[NSGraphicsContext currentContext] restoreGraphicsState];
[clipView unlockFocus];
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/SKSideWindow.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -200,23 +200,23 @@
[NSGraphicsContext saveGraphicsState];
- [[NSColor colorWithDeviceWhite:0.9 alpha:1.0] set];
+ [[NSColor colorWithCalibratedWhite:0.9 alpha:1.0] set];
[NSBezierPath fillRoundRectInRect:topRect radius:CORNER_RADIUS];
- [[NSColor colorWithDeviceWhite:0.4 alpha:1.0] set];
+ [[NSColor colorWithCalibratedWhite:0.4 alpha:1.0] set];
[NSBezierPath fillRoundRectInRect:bottomRect radius:CORNER_RADIUS];
- [[NSColor colorWithDeviceWhite:0.8 alpha:1.0] set];
+ [[NSColor colorWithCalibratedWhite:0.8 alpha:1.0] set];
[NSBezierPath fillRoundRectInRect:NSInsetRect(rect, 0.0, 1.5) radius:CORNER_RADIUS];
rect = [self resizeHandleRect];
startPoint = NSMakePoint(NSMidX(rect) - 1.5, NSMidY(rect) - 10.0);
endPoint = NSMakePoint(startPoint.x, startPoint.y + 20.0);
[NSBezierPath setDefaultLineWidth:1.0];
- [[NSColor colorWithDeviceWhite:0.5 alpha:1.0] set];
+ [[NSColor colorWithCalibratedWhite:0.5 alpha:1.0] set];
[NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
startPoint.x += 2.0;
endPoint.x += 2.0;
[NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
- [[NSColor colorWithDeviceWhite:0.9 alpha:1.0] set];
+ [[NSColor colorWithCalibratedWhite:0.9 alpha:1.0] set];
startPoint.x -= 1.0;
endPoint.x -= 1.0;
[NSBezierPath strokeLineFromPoint:startPoint toPoint:endPoint];
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/SKSnapshotWindowController.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -333,7 +333,7 @@
[[NSColor whiteColor] set];
if (hasShadow) {
NSShadow *shadow = [[NSShadow alloc] init];
- [shadow setShadowColor:[NSColor colorWithDeviceWhite:0.0 alpha:0.5]];
+ [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.5]];
[shadow setShadowBlurRadius:shadowBlurRadius];
[shadow setShadowOffset:shadowOffset];
[shadow set];
Modified: trunk/SKSplitView.m
===================================================================
--- trunk/SKSplitView.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/SKSplitView.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -46,14 +46,14 @@
+ (CIColor *)startColor{
static CIColor *startColor = nil;
if (startColor == nil)
- startColor = [[CIColor colorWithNSColor:[NSColor colorWithDeviceWhite:0.85 alpha:1.0]] retain];
+ startColor = [[CIColor colorWithNSColor:[NSColor colorWithCalibratedWhite:0.85 alpha:1.0]] retain];
return startColor;
}
+ (CIColor *)endColor{
static CIColor *endColor = nil;
if (endColor == nil)
- endColor = [[CIColor colorWithNSColor:[NSColor colorWithDeviceWhite:0.95 alpha:1.0]] retain];
+ endColor = [[CIColor colorWithNSColor:[NSColor colorWithCalibratedWhite:0.95 alpha:1.0]] retain];
return endColor;
}
@@ -88,8 +88,8 @@
- (void)drawDividerInRect:(NSRect)aRect {
NSPoint startPoint, endPoint;
float handleSize = 20.0;
- NSColor *darkColor = [NSColor colorWithDeviceWhite:0.6 alpha:1.0];
- NSColor *lightColor = [NSColor colorWithDeviceWhite:0.95 alpha:1.0];
+ NSColor *darkColor = [NSColor colorWithCalibratedWhite:0.6 alpha:1.0];
+ NSColor *lightColor = [NSColor colorWithCalibratedWhite:0.95 alpha:1.0];
// Draw the gradient
[[NSBezierPath bezierPathWithRect:aRect] fillPathVertically:NO == [self isVertical] withStartColor:[[self class] startColor] endColor:[[self class] endColor]];
Modified: trunk/SKThumbnailTableView.m
===================================================================
--- trunk/SKThumbnailTableView.m 2007-06-21 13:54:07 UTC (rev 2370)
+++ trunk/SKThumbnailTableView.m 2007-06-21 17:33:14 UTC (rev 2371)
@@ -179,14 +179,14 @@
if (NO == didInit) {
didInit = YES;
selectedShadow = [[NSShadow alloc] init];
- [selectedShadow setShadowColor:[NSColor colorWithDeviceWhite:1.0 alpha:0.2]];
+ [selectedShadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.2]];
[selectedShadow setShadowOffset:NSMakeSize(0.0, -1.0)];
deselectedShadow = [[NSShadow alloc] init];
- [deselectedShadow setShadowColor:[NSColor colorWithDeviceWhite:1.0 alpha:0.2]];
+ [deselectedShadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.2]];
[deselectedShadow setShadowOffset:NSMakeSize(0.0, -1.0)];
- selectedColor = [[NSColor colorWithDeviceWhite:1.0 alpha:1.0] copy];
- deselectedColor = [[NSColor colorWithDeviceWhite:0.0 alpha:0.8] copy];
+ selectedColor = [[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] copy];
+ deselectedColor = [[NSColor colorWithCalibratedWhite:0.0 alpha:0.8] copy];
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-21 13:54:09
|
Revision: 2370
http://skim-app.svn.sourceforge.net/skim-app/?rev=2370&view=rev
Author: hofman
Date: 2007-06-21 06:54:07 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
Stroke closed arrow line ending as PDFAnnotationLine does.
Modified Paths:
--------------
trunk/SKLineInspector.m
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2007-06-21 13:00:16 UTC (rev 2369)
+++ trunk/SKLineInspector.m 2007-06-21 13:54:07 UTC (rev 2370)
@@ -362,15 +362,13 @@
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(20.0, 6.0)];
[path lineToPoint:NSMakePoint(8.0, 6.0)];
+ [path moveToPoint:NSMakePoint(13.0, 3.0)];
+ [path lineToPoint:NSMakePoint(7.0, 6.0)];
+ [path lineToPoint:NSMakePoint(13.0, 9.0)];
+ [path closePath];
[path setLineWidth:2.0];
- [[NSColor blackColor] set];
+ [[NSColor blackColor] setStroke];
[path stroke];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(14.0, 1.5)];
- [path lineToPoint:NSMakePoint(5.0, 6.0)];
- [path lineToPoint:NSMakePoint(14.0, 10.5)];
- [path closePath];
- [path fill];
[image unlockFocus];
[startLineStyleButton setImage:image forSegment:kPDFLineStyleClosedArrow];
[image release];
@@ -380,15 +378,13 @@
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(4.0, 6.0)];
[path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path moveToPoint:NSMakePoint(11.0, 3.0)];
+ [path lineToPoint:NSMakePoint(17.0, 6.0)];
+ [path lineToPoint:NSMakePoint(11.0, 9.0)];
+ [path closePath];
[path setLineWidth:2.0];
- [[NSColor blackColor] set];
+ [[NSColor blackColor] setStroke];
[path stroke];
- path = [NSBezierPath bezierPath];
- [path moveToPoint:NSMakePoint(10.0, 1.5)];
- [path lineToPoint:NSMakePoint(19.0, 6.0)];
- [path lineToPoint:NSMakePoint(10.0, 10.5)];
- [path closePath];
- [path fill];
[image unlockFocus];
[endLineStyleButton setImage:image forSegment:kPDFLineStyleClosedArrow];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-21 13:00:18
|
Revision: 2369
http://skim-app.svn.sourceforge.net/skim-app/?rev=2369&view=rev
Author: hofman
Date: 2007-06-21 06:00:16 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
Add hidden defaults for borders and interior colors.
Modified Paths:
--------------
trunk/InitialUserDefaults.plist
trunk/SKPDFAnnotationNote.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2007-06-21 11:50:57 UTC (rev 2368)
+++ trunk/InitialUserDefaults.plist 2007-06-21 13:00:16 UTC (rev 2369)
@@ -121,14 +121,36 @@
BAt0eXBlZHN0cmVhbYED6IQBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
ZmZmAAABAYY=
</data>
+ <key>SKCircleNoteInteriorColor</key>
+ <data></data>
+ <key>SKSquareNoteInteriorColor</key>
+ <data></data>
+ <key>SKFreeTextNoteLineWidth</key>
+ <real>1.0</real>
+ <key>SKFreeTextNoteLineStyle</key>
+ <integer>0</integer>
+ <key>SKFreeTextNoteDashPattern</key>
+ <array/>
<key>SKAnchoredNoteIconType</key>
<integer>2</integer>
<key>SKCircleNoteLineWidth</key>
<real>2.0</real>
+ <key>SKCircleNoteLineStyle</key>
+ <integer>0</integer>
+ <key>SKCircleNoteDashPattern</key>
+ <array/>
<key>SKSquareNoteLineWidth</key>
<real>2.0</real>
+ <key>SKSquareNoteLineStyle</key>
+ <integer>0</integer>
+ <key>SKSquareNoteDashPattern</key>
+ <array/>
<key>SKLineNoteLineWidth</key>
<real>2.0</real>
+ <key>SKLineNoteLineStyle</key>
+ <integer>0</integer>
+ <key>SKLineNoteDashPattern</key>
+ <array/>
<key>SKLineNoteStartLineStyle</key>
<integer>0</integer>
<key>SKLineNoteEndLineStyle</key>
@@ -207,12 +229,23 @@
<string>SKUnderlineNoteColor</string>
<string>SKStrikeOutNoteColor</string>
<string>SKLineNoteColor</string>
+ <string>SKCircleNoteInteriorColor</string>
+ <string>SKSquareNoteInteriorColor</string>
<string>SKTextNoteFontName</string>
<string>SKTextNoteFontSize</string>
+ <string>SKFreeTextNoteLineWidth</string>
+ <string>SKFreeTextNoteLineStyle</string>
+ <string>SKFreeTextNoteDashPattern</string>
<string>SKAnchoredNoteIconType</string>
<string>SKCircleNoteLineWidth</string>
+ <string>SKCircleNoteLineStyle</string>
+ <string>SKCircleNoteDashPattern</string>
<string>SKSquareNoteLineWidth</string>
+ <string>SKSquareNoteLineStyle</string>
+ <string>SKSquareNoteDashPattern</string>
<string>SKLineNoteLineWidth</string>
+ <string>SKLineNoteLineStyle</string>
+ <string>SKLineNoteDashPattern</string>
<string>SKLineNoteStartLineStyle</string>
<string>SKLineNoteEndLineStyle</string>
</array>
Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m 2007-06-21 11:50:57 UTC (rev 2368)
+++ trunk/SKPDFAnnotationNote.m 2007-06-21 13:00:16 UTC (rev 2369)
@@ -578,8 +578,13 @@
- (id)initWithBounds:(NSRect)bounds {
if (self = [super initWithBounds:bounds]) {
- [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKCircleNoteColorKey]]];
+ NSData *colorData = [[NSUserDefaults standardUserDefaults] dataForKey:SKCircleNoteInteriorColorKey];
+ if ([colorData length])
+ [self setInteriorColor:[NSUnarchiver unarchiveObjectWithData:colorData]];
+ [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKCircleNoteColorKey]]];
[[self border] setLineWidth:[[NSUserDefaults standardUserDefaults] floatForKey:SKCircleNoteLineWidthKey]];
+ [[self border] setDashPattern:[[NSUserDefaults standardUserDefaults] arrayForKey:SKCircleNoteDashPatternKey]];
+ [[self border] setStyle:[[NSUserDefaults standardUserDefaults] floatForKey:SKCircleNoteLineStyleKey]];
}
return self;
}
@@ -630,8 +635,13 @@
- (id)initWithBounds:(NSRect)bounds {
if (self = [super initWithBounds:bounds]) {
- [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKSquareNoteColorKey]]];
+ NSData *colorData = [[NSUserDefaults standardUserDefaults] dataForKey:SKSquareNoteInteriorColorKey];
+ if ([colorData length])
+ [self setInteriorColor:[NSUnarchiver unarchiveObjectWithData:colorData]];
+ [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKSquareNoteColorKey]]];
[[self border] setLineWidth:[[NSUserDefaults standardUserDefaults] floatForKey:SKSquareNoteLineWidthKey]];
+ [[self border] setDashPattern:[[NSUserDefaults standardUserDefaults] arrayForKey:SKSquareNoteDashPatternKey]];
+ [[self border] setStyle:[[NSUserDefaults standardUserDefaults] floatForKey:SKSquareNoteLineStyleKey]];
}
return self;
}
@@ -724,11 +734,11 @@
if (self = [super initWithBounds:bounds]) {
[self setMarkupType:type];
if (type == kPDFMarkupTypeHighlight)
- [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKHighlightNoteColorKey]]];
+ [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKHighlightNoteColorKey]]];
else if (type == kPDFMarkupTypeUnderline)
- [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKUnderlineNoteColorKey]]];
+ [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKUnderlineNoteColorKey]]];
else if (type == kPDFMarkupTypeStrikeOut)
- [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKStrikeOutNoteColorKey]]];
+ [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKStrikeOutNoteColorKey]]];
[[NSUserDefaults standardUserDefaults] setObject:[NSArchiver archivedDataWithRootObject:[NSColor colorWithDeviceRed:0 green:0.5 blue:0 alpha:1.0]] forKey:SKUnderlineNoteColorKey];
NSArray *quadPoints = nil;
@@ -972,9 +982,12 @@
NSFont *font = [NSFont fontWithName:[[NSUserDefaults standardUserDefaults] stringForKey:SKTextNoteFontNameKey]
size:[[NSUserDefaults standardUserDefaults] floatForKey:SKTextNoteFontSizeKey]];
[super setFont:font];
- [super setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKFreeTextNoteColorKey]]];
+ [super setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKFreeTextNoteColorKey]]];
PDFBorder *border = [[PDFBorder allocWithZone:[self zone]] init];
- [self setBorder:border];
+ [border setLineWidth:[[NSUserDefaults standardUserDefaults] floatForKey:SKFreeTextNoteLineWidthKey]];
+ [border setDashPattern:[[NSUserDefaults standardUserDefaults] arrayForKey:SKFreeTextNoteDashPatternKey]];
+ [border setStyle:[[NSUserDefaults standardUserDefaults] floatForKey:SKFreeTextNoteLineStyleKey]];
+ [self setBorder:[border lineWidth] > 0.0 ? border : nil];
[border release];
}
return self;
@@ -1053,7 +1066,7 @@
- (id)initWithBounds:(NSRect)bounds {
if (self = [super initWithBounds:bounds]) {
- [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKAnchoredNoteColorKey]]];
+ [self setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKAnchoredNoteColorKey]]];
[self setIconType:[[NSUserDefaults standardUserDefaults] integerForKey:SKAnchoredNoteIconTypeKey]];
texts = [[NSArray alloc] initWithObjects:[[[SKNoteText alloc] initWithAnnotation:self] autorelease], nil];
textStorage = [[NSTextStorage allocWithZone:[self zone]] init];
@@ -1226,14 +1239,16 @@
- (id)initWithBounds:(NSRect)bounds {
if (self = [super initWithBounds:bounds]) {
- [super setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] objectForKey:SKLineNoteColorKey]]];
+ [super setColor:[NSUnarchiver unarchiveObjectWithData:[[NSUserDefaults standardUserDefaults] dataForKey:SKLineNoteColorKey]]];
[super setStartLineStyle:[[NSUserDefaults standardUserDefaults] integerForKey:SKLineNoteStartLineStyleKey]];
[super setEndLineStyle:[[NSUserDefaults standardUserDefaults] integerForKey:SKLineNoteEndLineStyleKey]];
[super setStartPoint:NSMakePoint(0.5, 0.5)];
[super setEndPoint:NSMakePoint(NSWidth(bounds) - 0.5, NSHeight(bounds) - 0.5)];
PDFBorder *border = [[PDFBorder allocWithZone:[self zone]] init];
[border setLineWidth:[[NSUserDefaults standardUserDefaults] floatForKey:SKLineNoteLineWidthKey]];
- [self setBorder:border];
+ [border setDashPattern:[[NSUserDefaults standardUserDefaults] arrayForKey:SKLineNoteDashPatternKey]];
+ [border setStyle:[[NSUserDefaults standardUserDefaults] floatForKey:SKLineNoteLineStyleKey]];
+ [self setBorder:[border lineWidth] > 0.0 ? border : nil];
[border release];
}
return self;
Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h 2007-06-21 11:50:57 UTC (rev 2368)
+++ trunk/SKStringConstants.h 2007-06-21 13:00:16 UTC (rev 2369)
@@ -71,10 +71,21 @@
extern NSString *SKUnderlineNoteColorKey;
extern NSString *SKStrikeOutNoteColorKey;
extern NSString *SKLineNoteColorKey;
+extern NSString *SKCircleNoteInteriorColorKey;
+extern NSString *SKSquareNoteInteriorColorKey;
extern NSString *SKAnchoredNoteIconTypeKey;
+extern NSString *SKFreeTextNoteLineWidthKey;
+extern NSString *SKFreeTextNoteLineStyleKey;
+extern NSString *SKFreeTextNoteDashPatternKey;
extern NSString *SKCircleNoteLineWidthKey;
+extern NSString *SKCircleNoteLineStyleKey;
+extern NSString *SKCircleNoteDashPatternKey;
extern NSString *SKSquareNoteLineWidthKey;
+extern NSString *SKSquareNoteLineStyleKey;
+extern NSString *SKSquareNoteDashPatternKey;
extern NSString *SKLineNoteLineWidthKey;
+extern NSString *SKLineNoteLineStyleKey;
+extern NSString *SKLineNoteDashPatternKey;
extern NSString *SKLineNoteStartLineStyleKey;
extern NSString *SKLineNoteEndLineStyleKey;
extern NSString *SKDefaultPDFDisplaySettingsKey;
Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m 2007-06-21 11:50:57 UTC (rev 2368)
+++ trunk/SKStringConstants.m 2007-06-21 13:00:16 UTC (rev 2369)
@@ -72,10 +72,21 @@
NSString *SKUnderlineNoteColorKey = @"SKUnderlineNoteColor";
NSString *SKStrikeOutNoteColorKey = @"SKStrikeOutNoteColor";
NSString *SKLineNoteColorKey = @"SKLineNoteColor";
+NSString *SKCircleNoteInteriorColorKey = @"SKCircleNoteInteriorColor";
+NSString *SKSquareNoteInteriorColorKey = @"SKSquareNoteInteriorColor";
+NSString *SKFreeTextNoteLineWidthKey = @"SKFreeTextNoteLineWidth";
NSString *SKAnchoredNoteIconTypeKey = @"SKAnchoredNoteIconType";
+NSString *SKFreeTextNoteLineStyleKey = @"SKFreeTextNoteLineStyle";
+NSString *SKFreeTextNoteDashPatternKey = @"SKFreeTextNoteDashPattern";
NSString *SKCircleNoteLineWidthKey = @"SKCircleNoteLineWidth";
+NSString *SKCircleNoteLineStyleKey = @"SKCircleNoteLineStyle";
+NSString *SKCircleNoteDashPatternKey = @"SKCircleNoteDashPattern";
NSString *SKSquareNoteLineWidthKey = @"SKSquareNoteLineWidth";
+NSString *SKSquareNoteLineStyleKey = @"SKSquareNoteLineStyle";
+NSString *SKSquareNoteDashPatternKey = @"SKSquareNoteDashPattern";
NSString *SKLineNoteLineWidthKey = @"SKLineNoteLineWidth";
+NSString *SKLineNoteDashPatternKey = @"SKLineNoteDashPattern";
+NSString *SKLineNoteLineStyleKey = @"SKLineNoteLineStyle";
NSString *SKLineNoteStartLineStyleKey = @"SKLineNoteStartLineStyle";
NSString *SKLineNoteEndLineStyleKey = @"SKLineNoteEndLineStyle";
NSString *SKDefaultPDFDisplaySettingsKey = @"SKDefaultPDFDisplaySettings";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-21 11:50:58
|
Revision: 2368
http://skim-app.svn.sourceforge.net/skim-app/?rev=2368&view=rev
Author: hofman
Date: 2007-06-21 04:50:57 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
Set frame autosave name from windowController, as setting it in the nib seems to be broken.
Modified Paths:
--------------
trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/English.lproj/LineInspector.nib/keyedobjects.nib
trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
trunk/Italian.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/SKInfoWindowController.m
trunk/SKLineInspector.m
trunk/SKPreferenceController.m
Modified: trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKInfoWindowController.m
===================================================================
--- trunk/SKInfoWindowController.m 2007-06-21 11:26:19 UTC (rev 2367)
+++ trunk/SKInfoWindowController.m 2007-06-21 11:50:57 UTC (rev 2368)
@@ -71,6 +71,10 @@
return @"InfoWindow";
}
+- (void)windowDidLoad {
+ [self setWindowFrameAutosaveName:@"SKInfoWindow"];
+}
+
static inline
NSString *SKFileSizeStringForFileURL(NSURL *fileURL, unsigned long long *physicalSizePtr, unsigned long long *logicalSizePtr) {
if (fileURL == nil)
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2007-06-21 11:26:19 UTC (rev 2367)
+++ trunk/SKLineInspector.m 2007-06-21 11:50:57 UTC (rev 2368)
@@ -84,7 +84,9 @@
- (unsigned)retainCount { return UINT_MAX; }
-- (void)awakeFromNib {
+- (void)windowDidLoad {
+ [self setWindowFrameAutosaveName:@"SKLineInspector"];
+
[[styleButton cell] setToolTip:NSLocalizedString(@"Solid line style", @"Tool tip message") forSegment:kPDFBorderStyleSolid];
[[styleButton cell] setToolTip:NSLocalizedString(@"Dashed line style", @"Tool tip message") forSegment:kPDFBorderStyleDashed];
[[styleButton cell] setToolTip:NSLocalizedString(@"Beveled line style", @"Tool tip message") forSegment:kPDFBorderStyleBeveled];
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2007-06-21 11:26:19 UTC (rev 2367)
+++ trunk/SKPreferenceController.m 2007-06-21 11:50:57 UTC (rev 2368)
@@ -100,6 +100,8 @@
}
- (void)windowDidLoad {
+ [self setWindowFrameAutosaveName:@"SKPreferenceWindow"];
+
NSString *editorPreset = [[NSUserDefaults standardUserDefaults] stringForKey:SKTeXEditorPresetKey];
int i = sizeof(SKTeXEditors) / sizeof(NSString *);
int index = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-21 11:26:20
|
Revision: 2367
http://skim-app.svn.sourceforge.net/skim-app/?rev=2367&view=rev
Author: hofman
Date: 2007-06-21 04:26:19 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
Gray out line styles not supported by PDFKit.
Modified Paths:
--------------
trunk/SKLineInspector.m
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2007-06-21 10:20:34 UTC (rev 2366)
+++ trunk/SKLineInspector.m 2007-06-21 11:26:19 UTC (rev 2367)
@@ -151,14 +151,14 @@
[image lockFocus];
path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 3.0, 17.0, 6.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] setStroke];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.3] setStroke];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(7.0, 3.0)];
[path lineToPoint:NSMakePoint(23.0, 3.0)];
[path lineToPoint:NSMakePoint(23.0, 8.0)];
[path setLineWidth:2.0];
- [[NSColor blackColor] set];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] set];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(5.0, 2.0)];
@@ -178,14 +178,14 @@
[image lockFocus];
path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 3.0, 17.0, 6.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] setStroke];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.3] setStroke];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(6.0, 4.0)];
[path lineToPoint:NSMakePoint(6.0, 9.0)];
[path lineToPoint:NSMakePoint(22.0, 9.0)];
[path setLineWidth:2.0];
- [[NSColor blackColor] set];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] set];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(5.0, 2.0)];
@@ -207,7 +207,7 @@
[path moveToPoint:NSMakePoint(6.0, 3.0)];
[path lineToPoint:NSMakePoint(23.0, 3.0)];
[path setLineWidth:2.0];
- [[NSColor blackColor] setStroke];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.65] setStroke];
[path stroke];
[image unlockFocus];
[styleButton setImage:image forSegment:kPDFBorderStyleUnderline];
@@ -302,7 +302,7 @@
[path lineToPoint:NSMakePoint(8.0, 2.0)];
[path closePath];
[path setLineWidth:2.0];
- [[NSColor blackColor] setStroke];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.65] setStroke];
[path stroke];
[image unlockFocus];
[startLineStyleButton setImage:image forSegment:kPDFLineStyleDiamond];
@@ -319,7 +319,7 @@
[path lineToPoint:NSMakePoint(16.0, 2.0)];
[path closePath];
[path setLineWidth:2.0];
- [[NSColor blackColor] setStroke];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.65] setStroke];
[path stroke];
[image unlockFocus];
[endLineStyleButton setImage:image forSegment:kPDFLineStyleDiamond];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-21 10:20:37
|
Revision: 2366
http://skim-app.svn.sourceforge.net/skim-app/?rev=2366&view=rev
Author: hofman
Date: 2007-06-21 03:20:34 -0700 (Thu, 21 Jun 2007)
Log Message:
-----------
Fix some line style changing issues. Changing one component of the border can change others, so we shouldn't avoid observing those changes for the inspector. Don't set the border when this is not necessary.
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKPDFAnnotationNote.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-21 02:43:16 UTC (rev 2365)
+++ trunk/SKMainWindowController.m 2007-06-21 10:20:34 UTC (rev 2366)
@@ -837,7 +837,7 @@
if ([color isEqual:[sender color]] == NO) {
updatingColor = YES;
if (isFill)
- [(id)annotation setInteriorColor:[[sender color] isEqual:[NSColor clearColor]] ? nil : [sender color]];
+ [(id)annotation setInteriorColor:[[sender color] alphaComponent] > 0.0 ? [sender color] : nil];
else
[annotation setColor:[sender color]];
updatingColor = NO;
@@ -863,9 +863,7 @@
PDFAnnotation *annotation = [pdfView activeAnnotation];
NSString *type = [annotation type];
if (updatingLine == NO && [annotation isNoteAnnotation] && ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@""] || [type isEqualToString:@"Line"])) {
- updatingLine = YES;
[annotation setLineWidth:[sender lineWidth]];
- updatingLine = NO;
}
}
@@ -873,9 +871,7 @@
PDFAnnotation *annotation = [pdfView activeAnnotation];
NSString *type = [annotation type];
if (updatingLine == NO && [annotation isNoteAnnotation] && ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"])) {
- //updatingLine = YES;
[annotation setBorderStyle:[sender style]];
- //updatingLine = NO;
}
}
@@ -883,9 +879,7 @@
PDFAnnotation *annotation = [pdfView activeAnnotation];
NSString *type = [annotation type];
if (updatingLine == NO && [annotation isNoteAnnotation] && ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"])) {
- //updatingLine = YES;
[annotation setDashPattern:[sender dashPattern]];
- //updatingLine = NO;
}
}
Modified: trunk/SKPDFAnnotationNote.m
===================================================================
--- trunk/SKPDFAnnotationNote.m 2007-06-21 02:43:16 UTC (rev 2365)
+++ trunk/SKPDFAnnotationNote.m 2007-06-21 10:20:34 UTC (rev 2366)
@@ -273,7 +273,7 @@
- (void)setBorderStyle:(PDFBorderStyle)style {
PDFBorder *border = [[self border] copyWithZone:[self zone]];
- if (border == nil)
+ if (border == nil && style)
border = [[PDFBorder allocWithZone:[self zone]] init];
[border setStyle:style];
[self setBorder:border];
@@ -302,7 +302,7 @@
- (void)setDashPattern:(NSArray *)pattern {
PDFBorder *border = [[self border] copyWithZone:[self zone]];
- if (border == nil)
+ if (border == nil && [pattern count])
border = [[PDFBorder allocWithZone:[self zone]] init];
[border setDashPattern:pattern];
[self setBorder:border];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2007-06-21 02:43:19
|
Revision: 2365
http://skim-app.svn.sourceforge.net/skim-app/?rev=2365&view=rev
Author: amaxwell
Date: 2007-06-20 19:43:16 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
delete per-user file
Modified Paths:
--------------
SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj
Removed Paths:
-------------
SkimNotesAgent/SkimNotesAgent.xcodeproj/amaxwell.mode1v3
Deleted: SkimNotesAgent/SkimNotesAgent.xcodeproj/amaxwell.mode1v3
===================================================================
--- SkimNotesAgent/SkimNotesAgent.xcodeproj/amaxwell.mode1v3 2007-06-21 00:40:57 UTC (rev 2364)
+++ SkimNotesAgent/SkimNotesAgent.xcodeproj/amaxwell.mode1v3 2007-06-21 02:43:16 UTC (rev 2365)
@@ -1,1372 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>ActivePerspectiveName</key>
- <string>Project</string>
- <key>AllowedModules</key>
- <array>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Name</key>
- <string>Groups and Files Outline View</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Name</key>
- <string>Editor</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>XCTaskListModule</string>
- <key>Name</key>
- <string>Task List</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>XCDetailModule</string>
- <key>Name</key>
- <string>File and Smart Group Detail Viewer</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXBuildResultsModule</string>
- <key>Name</key>
- <string>Detailed Build Results Viewer</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXProjectFindModule</string>
- <key>Name</key>
- <string>Project Batch Find Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXBookmarksModule</string>
- <key>Name</key>
- <string>Bookmarks Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXClassBrowserModule</string>
- <key>Name</key>
- <string>Class Browser</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXCVSModule</string>
- <key>Name</key>
- <string>Source Code Control Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXDebugBreakpointsModule</string>
- <key>Name</key>
- <string>Debug Breakpoints Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>XCDockableInspector</string>
- <key>Name</key>
- <string>Inspector</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>PBXOpenQuicklyModule</string>
- <key>Name</key>
- <string>Open Quickly Tool</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXDebugSessionModule</string>
- <key>Name</key>
- <string>Debugger</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>1</string>
- <key>Module</key>
- <string>PBXDebugCLIModule</string>
- <key>Name</key>
- <string>Debug Console</string>
- </dict>
- <dict>
- <key>BundleLoadPath</key>
- <string></string>
- <key>MaxInstances</key>
- <string>n</string>
- <key>Module</key>
- <string>XCSnapshotModule</string>
- <key>Name</key>
- <string>Snapshots Tool</string>
- </dict>
- </array>
- <key>Description</key>
- <string>DefaultDescriptionKey</string>
- <key>DockingSystemVisible</key>
- <false/>
- <key>Extension</key>
- <string>mode1v3</string>
- <key>FavBarConfig</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>F9B57A1E0BCB3C62001FB821</string>
- <key>XCBarModuleItemNames</key>
- <dict/>
- <key>XCBarModuleItems</key>
- <array/>
- </dict>
- <key>FirstTimeWindowDisplayed</key>
- <false/>
- <key>Identifier</key>
- <string>com.apple.perspectives.project.mode1v3</string>
- <key>MajorVersion</key>
- <integer>32</integer>
- <key>MinorVersion</key>
- <integer>1</integer>
- <key>Name</key>
- <string>Default</string>
- <key>Notifications</key>
- <array>
- <dict>
- <key>XCObserverAutoDisconnectKey</key>
- <true/>
- <key>XCObserverDefintionKey</key>
- <dict/>
- <key>XCObserverFactoryKey</key>
- <string>XCPerspectivesSpecificationIdentifier</string>
- <key>XCObserverGUIDKey</key>
- <string>XCObserverProjectIdentifier</string>
- <key>XCObserverNotificationKey</key>
- <string>PBXStatusBuildStateMessageNotification</string>
- <key>XCObserverTargetKey</key>
- <string>XCMainBuildResultsModuleGUID</string>
- <key>XCObserverTriggerKey</key>
- <string>awakenModuleWithObserver:</string>
- <key>XCObserverValidationKey</key>
- <dict/>
- </dict>
- </array>
- <key>OpenEditors</key>
- <array>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>F9B57A2E0BCB3E11001FB821</string>
- <key>PBXProjectModuleLabel</key>
- <string>SkimNotesAgent.m</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>F9B57A2F0BCB3E11001FB821</string>
- <key>PBXProjectModuleLabel</key>
- <string>SkimNotesAgent.m</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>F9B57A690BCB4576001FB821</string>
- <key>history</key>
- <array>
- <string>F9B57A4D0BCB40B6001FB821</string>
- </array>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <true/>
- </dict>
- <key>Geometry</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 20}, {839, 659}}</string>
- <key>PBXModuleWindowStatusBarHidden2</key>
- <false/>
- <key>RubberWindowFrame</key>
- <string>359 132 839 700 0 0 1280 832 </string>
- </dict>
- </dict>
- </array>
- <key>PerspectiveWidths</key>
- <array>
- <integer>-1</integer>
- <integer>-1</integer>
- </array>
- <key>Perspectives</key>
- <array>
- <dict>
- <key>ChosenToolbarItems</key>
- <array>
- <string>active-target-popup</string>
- <string>action</string>
- <string>NSToolbarFlexibleSpaceItem</string>
- <string>buildOrClean</string>
- <string>build-and-goOrGo</string>
- <string>com.apple.ide.PBXToolbarStopButton</string>
- <string>get-info</string>
- <string>toggle-editor</string>
- <string>NSToolbarFlexibleSpaceItem</string>
- <string>com.apple.pbx.toolbar.searchfield</string>
- </array>
- <key>ControllerClassBaseName</key>
- <string></string>
- <key>IconName</key>
- <string>WindowOfProjectWithEditor</string>
- <key>Identifier</key>
- <string>perspective.project</string>
- <key>IsVertical</key>
- <false/>
- <key>Layout</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXBottomSmartGroupGIDs</key>
- <array>
- <string>1C37FBAC04509CD000000102</string>
- <string>1C37FAAC04509CD000000102</string>
- <string>1C08E77C0454961000C914BD</string>
- <string>1C37FABC05509CD000000102</string>
- <string>1C37FABC05539CD112110102</string>
- <string>E2644B35053B69B200211256</string>
- <string>1C37FABC04509CD000100104</string>
- <string>1CC0EA4004350EF90044410B</string>
- <string>1CC0EA4004350EF90041110B</string>
- </array>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Files</string>
- <key>PBXProjectStructureProvided</key>
- <string>yes</string>
- <key>PBXSmartGroupTreeModuleColumnData</key>
- <dict>
- <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
- <array>
- <real>186</real>
- </array>
- <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
- <array>
- <string>MainColumn</string>
- </array>
- </dict>
- <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
- <dict>
- <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
- <array>
- <string>08FB7794FE84155DC02AAC07</string>
- <string>1C37FABC05509CD000000102</string>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
- <array>
- <array>
- <integer>0</integer>
- </array>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {186, 338}}</string>
- </dict>
- <key>PBXTopSmartGroupGIDs</key>
- <array/>
- <key>XCIncludePerspectivesSwitch</key>
- <true/>
- <key>XCSharingToken</key>
- <string>com.apple.Xcode.GFSharingToken</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {203, 356}}</string>
- <key>GroupTreeTableConfiguration</key>
- <array>
- <string>MainColumn</string>
- <real>186</real>
- </array>
- <key>RubberWindowFrame</key>
- <string>547 435 690 397 0 0 1280 832 </string>
- </dict>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Proportion</key>
- <string>203pt</string>
- </dict>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B20306471E060097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>MyNewFile14.java</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B20406471E060097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>MyNewFile14.java</string>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <true/>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {482, 0}}</string>
- <key>RubberWindowFrame</key>
- <string>547 435 690 397 0 0 1280 832 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>0pt</string>
- </dict>
- <dict>
- <key>BecomeActive</key>
- <true/>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B20506471E060097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Detail</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 5}, {482, 351}}</string>
- <key>RubberWindowFrame</key>
- <string>547 435 690 397 0 0 1280 832 </string>
- </dict>
- <key>Module</key>
- <string>XCDetailModule</string>
- <key>Proportion</key>
- <string>351pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>482pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Project</string>
- <key>ServiceClasses</key>
- <array>
- <string>XCModuleDock</string>
- <string>PBXSmartGroupTreeModule</string>
- <string>XCModuleDock</string>
- <string>PBXNavigatorGroup</string>
- <string>XCDetailModule</string>
- </array>
- <key>TableOfContents</key>
- <array>
- <string>F9B57A2C0BCB3E11001FB821</string>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <string>F9B57A2D0BCB3E11001FB821</string>
- <string>1CE0B20306471E060097A5F4</string>
- <string>1CE0B20506471E060097A5F4</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.defaultV3</string>
- </dict>
- <dict>
- <key>ControllerClassBaseName</key>
- <string></string>
- <key>IconName</key>
- <string>WindowOfProject</string>
- <key>Identifier</key>
- <string>perspective.morph</string>
- <key>IsVertical</key>
- <integer>0</integer>
- <key>Layout</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXBottomSmartGroupGIDs</key>
- <array>
- <string>1C37FBAC04509CD000000102</string>
- <string>1C37FAAC04509CD000000102</string>
- <string>1C08E77C0454961000C914BD</string>
- <string>1C37FABC05509CD000000102</string>
- <string>1C37FABC05539CD112110102</string>
- <string>E2644B35053B69B200211256</string>
- <string>1C37FABC04509CD000100104</string>
- <string>1CC0EA4004350EF90044410B</string>
- <string>1CC0EA4004350EF90041110B</string>
- </array>
- <key>PBXProjectModuleGUID</key>
- <string>11E0B1FE06471DED0097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Files</string>
- <key>PBXProjectStructureProvided</key>
- <string>yes</string>
- <key>PBXSmartGroupTreeModuleColumnData</key>
- <dict>
- <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
- <array>
- <real>186</real>
- </array>
- <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
- <array>
- <string>MainColumn</string>
- </array>
- </dict>
- <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
- <dict>
- <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
- <array>
- <string>29B97314FDCFA39411CA2CEA</string>
- <string>1C37FABC05509CD000000102</string>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
- <array>
- <array>
- <integer>0</integer>
- </array>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {186, 337}}</string>
- </dict>
- <key>PBXTopSmartGroupGIDs</key>
- <array/>
- <key>XCIncludePerspectivesSwitch</key>
- <integer>1</integer>
- <key>XCSharingToken</key>
- <string>com.apple.Xcode.GFSharingToken</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {203, 355}}</string>
- <key>GroupTreeTableConfiguration</key>
- <array>
- <string>MainColumn</string>
- <real>186</real>
- </array>
- <key>RubberWindowFrame</key>
- <string>373 269 690 397 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Morph</string>
- <key>PreferredWidth</key>
- <integer>300</integer>
- <key>ServiceClasses</key>
- <array>
- <string>XCModuleDock</string>
- <string>PBXSmartGroupTreeModule</string>
- </array>
- <key>TableOfContents</key>
- <array>
- <string>11E0B1FE06471DED0097A5F4</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.default.shortV3</string>
- </dict>
- </array>
- <key>PerspectivesBarVisible</key>
- <false/>
- <key>ShelfIsVisible</key>
- <false/>
- <key>SourceDescription</key>
- <string>file at '/System/Library/PrivateFrameworks/DevToolsInterface.framework/Resources/XCPerspectivesSpecificationMode1.xcperspec'</string>
- <key>StatusbarIsVisible</key>
- <true/>
- <key>TimeStamp</key>
- <real>197870966.10195199</real>
- <key>ToolbarDisplayMode</key>
- <integer>1</integer>
- <key>ToolbarIsVisible</key>
- <true/>
- <key>ToolbarSizeMode</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Perspectives</string>
- <key>UpdateMessage</key>
- <string>The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'?</string>
- <key>WindowJustification</key>
- <integer>5</integer>
- <key>WindowOrderList</key>
- <array>
- <string>/Volumes/Local/Users/amaxwell/Desktop/SkimNotesAgent/SkimNotesAgent.xcodeproj</string>
- <string>F9B57A2E0BCB3E11001FB821</string>
- <string>F9B57A310BCB3E11001FB821</string>
- </array>
- <key>WindowString</key>
- <string>547 435 690 397 0 0 1280 832 </string>
- <key>WindowToolsV3</key>
- <array>
- <dict>
- <key>FirstTimeWindowDisplayed</key>
- <false/>
- <key>Identifier</key>
- <string>windowTool.build</string>
- <key>IsVertical</key>
- <true/>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528F0623707200166675</string>
- <key>PBXProjectModuleLabel</key>
- <string></string>
- <key>StatusBarVisibility</key>
- <true/>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {500, 218}}</string>
- <key>RubberWindowFrame</key>
- <string>731 40 500 500 0 0 1280 832 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>218pt</string>
- </dict>
- <dict>
- <key>BecomeActive</key>
- <true/>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>XCMainBuildResultsModuleGUID</string>
- <key>PBXProjectModuleLabel</key>
- <string>Build</string>
- <key>XCBuildResultsTrigger_Collapse</key>
- <integer>1021</integer>
- <key>XCBuildResultsTrigger_Open</key>
- <integer>1010</integer>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 223}, {500, 236}}</string>
- <key>RubberWindowFrame</key>
- <string>731 40 500 500 0 0 1280 832 </string>
- </dict>
- <key>Module</key>
- <string>PBXBuildResultsModule</string>
- <key>Proportion</key>
- <string>236pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>459pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Build Results</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXBuildResultsModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <true/>
- <key>TableOfContents</key>
- <array>
- <string>F9B57A310BCB3E11001FB821</string>
- <string>F9B57A320BCB3E11001FB821</string>
- <string>1CD0528F0623707200166675</string>
- <string>XCMainBuildResultsModuleGUID</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.buildV3</string>
- <key>WindowString</key>
- <string>731 40 500 500 0 0 1280 832 </string>
- <key>WindowToolGUID</key>
- <string>F9B57A310BCB3E11001FB821</string>
- <key>WindowToolIsVisible</key>
- <true/>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.debugger</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>Debugger</key>
- <dict>
- <key>HorizontalSplitView</key>
- <dict>
- <key>_collapsingFrameDimension</key>
- <real>0.0</real>
- <key>_indexOfCollapsedView</key>
- <integer>0</integer>
- <key>_percentageOfCollapsedView</key>
- <real>0.0</real>
- <key>isCollapsed</key>
- <string>yes</string>
- <key>sizes</key>
- <array>
- <string>{{0, 0}, {317, 164}}</string>
- <string>{{317, 0}, {377, 164}}</string>
- </array>
- </dict>
- <key>VerticalSplitView</key>
- <dict>
- <key>_collapsingFrameDimension</key>
- <real>0.0</real>
- <key>_indexOfCollapsedView</key>
- <integer>0</integer>
- <key>_percentageOfCollapsedView</key>
- <real>0.0</real>
- <key>isCollapsed</key>
- <string>yes</string>
- <key>sizes</key>
- <array>
- <string>{{0, 0}, {694, 164}}</string>
- <string>{{0, 164}, {694, 216}}</string>
- </array>
- </dict>
- </dict>
- <key>LauncherConfigVersion</key>
- <string>8</string>
- <key>PBXProjectModuleGUID</key>
- <string>1C162984064C10D400B95A72</string>
- <key>PBXProjectModuleLabel</key>
- <string>Debug - GLUTExamples (Underwater)</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>DebugConsoleDrawerSize</key>
- <string>{100, 120}</string>
- <key>DebugConsoleVisible</key>
- <string>None</string>
- <key>DebugConsoleWindowFrame</key>
- <string>{{200, 200}, {500, 300}}</string>
- <key>DebugSTDIOWindowFrame</key>
- <string>{{200, 200}, {500, 300}}</string>
- <key>Frame</key>
- <string>{{0, 0}, {694, 380}}</string>
- <key>RubberWindowFrame</key>
- <string>321 238 694 422 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXDebugSessionModule</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Debugger</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXDebugSessionModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1CD10A99069EF8BA00B06720</string>
- <string>1C0AD2AB069F1E9B00FABCE6</string>
- <string>1C162984064C10D400B95A72</string>
- <string>1C0AD2AC069F1E9B00FABCE6</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.debugV3</string>
- <key>WindowString</key>
- <string>321 238 694 422 0 0 1440 878 </string>
- <key>WindowToolGUID</key>
- <string>1CD10A99069EF8BA00B06720</string>
- <key>WindowToolIsVisible</key>
- <integer>0</integer>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.find</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CDD528C0622207200134675</string>
- <key>PBXProjectModuleLabel</key>
- <string><No Editor></string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528D0623707200166675</string>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <integer>1</integer>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {781, 167}}</string>
- <key>RubberWindowFrame</key>
- <string>62 385 781 470 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>781pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>50%</string>
- </dict>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD0528E0623707200166675</string>
- <key>PBXProjectModuleLabel</key>
- <string>Project Find</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{8, 0}, {773, 254}}</string>
- <key>RubberWindowFrame</key>
- <string>62 385 781 470 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXProjectFindModule</string>
- <key>Proportion</key>
- <string>50%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>428pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Project Find</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXProjectFindModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1C530D57069F1CE1000CFCEE</string>
- <string>1C530D58069F1CE1000CFCEE</string>
- <string>1C530D59069F1CE1000CFCEE</string>
- <string>1CDD528C0622207200134675</string>
- <string>1C530D5A069F1CE1000CFCEE</string>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <string>1CD0528E0623707200166675</string>
- </array>
- <key>WindowString</key>
- <string>62 385 781 470 0 0 1440 878 </string>
- <key>WindowToolGUID</key>
- <string>1C530D57069F1CE1000CFCEE</string>
- <key>WindowToolIsVisible</key>
- <integer>0</integer>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>MENUSEPARATOR</string>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.debuggerConsole</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1C78EAAC065D492600B07095</string>
- <key>PBXProjectModuleLabel</key>
- <string>Debugger Console</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {650, 250}}</string>
- <key>RubberWindowFrame</key>
- <string>650 41 650 250 0 0 1280 1002 </string>
- </dict>
- <key>Module</key>
- <string>PBXDebugCLIModule</string>
- <key>Proportion</key>
- <string>358pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>358pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Debugger Console</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXDebugCLIModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1C78EAAD065D492600B07095</string>
- <string>1C78EAAE065D492600B07095</string>
- <string>1C78EAAC065D492600B07095</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.consoleV3</string>
- <key>WindowString</key>
- <string>650 41 650 250 0 0 1280 1002 </string>
- <key>WindowToolGUID</key>
- <string>1C78EAAD065D492600B07095</string>
- <key>WindowToolIsVisible</key>
- <integer>0</integer>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.snapshots</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>Module</key>
- <string>XCSnapshotModule</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Snapshots</string>
- <key>ServiceClasses</key>
- <array>
- <string>XCSnapshotModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <string>Yes</string>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.snapshots</string>
- <key>WindowString</key>
- <string>315 824 300 550 0 0 1440 878 </string>
- <key>WindowToolIsVisible</key>
- <string>Yes</string>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.scm</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1C78EAB2065D492600B07095</string>
- <key>PBXProjectModuleLabel</key>
- <string><No Editor></string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1C78EAB3065D492600B07095</string>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <integer>1</integer>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {452, 0}}</string>
- <key>RubberWindowFrame</key>
- <string>743 379 452 308 0 0 1280 1002 </string>
- </dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>0pt</string>
- </dict>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CD052920623707200166675</string>
- <key>PBXProjectModuleLabel</key>
- <string>SCM</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>ConsoleFrame</key>
- <string>{{0, 259}, {452, 0}}</string>
- <key>Frame</key>
- <string>{{0, 7}, {452, 259}}</string>
- <key>RubberWindowFrame</key>
- <string>743 379 452 308 0 0 1280 1002 </string>
- <key>TableConfiguration</key>
- <array>
- <string>Status</string>
- <real>30</real>
- <string>FileName</string>
- <real>199</real>
- <string>Path</string>
- <real>197.09500122070312</real>
- </array>
- <key>TableFrame</key>
- <string>{{0, 0}, {452, 250}}</string>
- </dict>
- <key>Module</key>
- <string>PBXCVSModule</string>
- <key>Proportion</key>
- <string>262pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>266pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>SCM</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXCVSModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1C78EAB4065D492600B07095</string>
- <string>1C78EAB5065D492600B07095</string>
- <string>1C78EAB2065D492600B07095</string>
- <string>1CD052920623707200166675</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.scm</string>
- <key>WindowString</key>
- <string>743 379 452 308 0 0 1280 1002 </string>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.breakpoints</string>
- <key>IsVertical</key>
- <integer>0</integer>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXBottomSmartGroupGIDs</key>
- <array>
- <string>1C77FABC04509CD000000102</string>
- </array>
- <key>PBXProjectModuleGUID</key>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <key>PBXProjectModuleLabel</key>
- <string>Files</string>
- <key>PBXProjectStructureProvided</key>
- <string>no</string>
- <key>PBXSmartGroupTreeModuleColumnData</key>
- <dict>
- <key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
- <array>
- <real>168</real>
- </array>
- <key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
- <array>
- <string>MainColumn</string>
- </array>
- </dict>
- <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
- <dict>
- <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
- <array>
- <string>1C77FABC04509CD000000102</string>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
- <array>
- <array>
- <integer>0</integer>
- </array>
- </array>
- <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {168, 350}}</string>
- </dict>
- <key>PBXTopSmartGroupGIDs</key>
- <array/>
- <key>XCIncludePerspectivesSwitch</key>
- <integer>0</integer>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 0}, {185, 368}}</string>
- <key>GroupTreeTableConfiguration</key>
- <array>
- <string>MainColumn</string>
- <real>168</real>
- </array>
- <key>RubberWindowFrame</key>
- <string>315 424 744 409 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXSmartGroupTreeModule</string>
- <key>Proportion</key>
- <string>185pt</string>
- </dict>
- <dict>
- <key>ContentConfiguration</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>1CA1AED706398EBD00589147</string>
- <key>PBXProjectModuleLabel</key>
- <string>Detail</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{{190, 0}, {554, 368}}</string>
- <key>RubberWindowFrame</key>
- <string>315 424 744 409 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>XCDetailModule</string>
- <key>Proportion</key>
- <string>554pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>368pt</string>
- </dict>
- </array>
- <key>MajorVersion</key>
- <integer>3</integer>
- <key>MinorVersion</key>
- <integer>0</integer>
- <key>Name</key>
- <string>Breakpoints</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXSmartGroupTreeModule</string>
- <string>XCDetailModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>TableOfContents</key>
- <array>
- <string>1CDDB66807F98D9800BB5817</string>
- <string>1CDDB66907F98D9800BB5817</string>
- <string>1CE0B1FE06471DED0097A5F4</string>
- <string>1CA1AED706398EBD00589147</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.breakpointsV3</string>
- <key>WindowString</key>
- <string>315 424 744 409 0 0 1440 878 </string>
- <key>WindowToolGUID</key>
- <string>1CDDB66807F98D9800BB5817</string>
- <key>WindowToolIsVisible</key>
- <integer>1</integer>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.debugAnimator</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>Module</key>
- <string>PBXNavigatorGroup</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Debug Visualizer</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXNavigatorGroup</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>1</integer>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.debugAnimatorV3</string>
- <key>WindowString</key>
- <string>100 100 700 500 0 0 1280 1002 </string>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.bookmarks</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>Module</key>
- <string>PBXBookmarksModule</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Bookmarks</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXBookmarksModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>0</integer>
- <key>WindowString</key>
- <string>538 42 401 187 0 0 1280 1002 </string>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.classBrowser</string>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>ContentConfiguration</key>
- <dict>
- <key>OptionsSetName</key>
- <string>Hierarchy, all classes</string>
- <key>PBXProjectModuleGUID</key>
- <string>1CA6456E063B45B4001379D8</string>
- <key>PBXProjectModuleLabel</key>
- <string>Class Browser - NSObject</string>
- </dict>
- <key>GeometryConfiguration</key>
- <dict>
- <key>ClassesFrame</key>
- <string>{{0, 0}, {374, 96}}</string>
- <key>ClassesTreeTableConfiguration</key>
- <array>
- <string>PBXClassNameColumnIdentifier</string>
- <real>208</real>
- <string>PBXClassBookColumnIdentifier</string>
- <real>22</real>
- </array>
- <key>Frame</key>
- <string>{{0, 0}, {630, 331}}</string>
- <key>MembersFrame</key>
- <string>{{0, 105}, {374, 395}}</string>
- <key>MembersTreeTableConfiguration</key>
- <array>
- <string>PBXMemberTypeIconColumnIdentifier</string>
- <real>22</real>
- <string>PBXMemberNameColumnIdentifier</string>
- <real>216</real>
- <string>PBXMemberTypeColumnIdentifier</string>
- <real>97</real>
- <string>PBXMemberBookColumnIdentifier</string>
- <real>22</real>
- </array>
- <key>PBXModuleWindowStatusBarHidden2</key>
- <integer>1</integer>
- <key>RubberWindowFrame</key>
- <string>385 179 630 352 0 0 1440 878 </string>
- </dict>
- <key>Module</key>
- <string>PBXClassBrowserModule</string>
- <key>Proportion</key>
- <string>332pt</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>332pt</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Class Browser</string>
- <key>ServiceClasses</key>
- <array>
- <string>PBXClassBrowserModule</string>
- </array>
- <key>StatusbarIsVisible</key>
- <integer>0</integer>
- <key>TableOfContents</key>
- <array>
- <string>1C0AD2AF069F1E9B00FABCE6</string>
- <string>1C0AD2B0069F1E9B00FABCE6</string>
- <string>1CA6456E063B45B4001379D8</string>
- </array>
- <key>ToolbarConfiguration</key>
- <string>xcode.toolbar.config.classbrowser</string>
- <key>WindowString</key>
- <string>385 179 630 352 0 0 1440 878 </string>
- <key>WindowToolGUID</key>
- <string>1C0AD2AF069F1E9B00FABCE6</string>
- <key>WindowToolIsVisible</key>
- <integer>0</integer>
- </dict>
- <dict>
- <key>Identifier</key>
- <string>windowTool.refactoring</string>
- <key>IncludeInToolsMenu</key>
- <integer>0</integer>
- <key>Layout</key>
- <array>
- <dict>
- <key>Dock</key>
- <array>
- <dict>
- <key>BecomeActive</key>
- <integer>1</integer>
- <key>GeometryConfiguration</key>
- <dict>
- <key>Frame</key>
- <string>{0, 0}, {500, 335}</string>
- <key>RubberWindowFrame</key>
- <string>{0, 0}, {500, 335}</string>
- </dict>
- <key>Module</key>
- <string>XCRefactoringModule</string>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Proportion</key>
- <string>100%</string>
- </dict>
- </array>
- <key>Name</key>
- <string>Refactoring</string>
- <key>ServiceClasses</key>
- <array>
- <string>XCRefactoringModule</string>
- </array>
- <key>WindowString</key>
- <string>200 200 500 356 0 0 1920 1200 </string>
- </dict>
- </array>
-</dict>
-</plist>
Modified: SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj
===================================================================
--- SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj 2007-06-21 00:40:57 UTC (rev 2364)
+++ SkimNotesAgent/SkimNotesAgent.xcodeproj/project.pbxproj 2007-06-21 02:43:16 UTC (rev 2365)
@@ -131,10 +131,12 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "SkimNotesAgent" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 08FB7794FE84155DC02AAC07 /* SkimNotesAgent */;
projectDirPath = "";
projectRoot = "";
+ shouldCheckCompatibility = 1;
targets = (
8DD76F960486AA7600D96B5E /* SkimNotesAgent */,
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-21 00:41:06
|
Revision: 2364
http://skim-app.svn.sourceforge.net/skim-app/?rev=2364&view=rev
Author: hofman
Date: 2007-06-20 17:40:57 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Embed number formatter instead of subclassing, as binding makes assumptions based on the formatter class.
Modified Paths:
--------------
trunk/Dutch.lproj/LineInspector.nib/classes.nib
trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
trunk/English.lproj/LineInspector.nib/classes.nib
trunk/English.lproj/LineInspector.nib/keyedobjects.nib
trunk/Italian.lproj/LineInspector.nib/classes.nib
trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
trunk/SKLineInspector.h
trunk/SKLineInspector.m
trunk/SKMainWindowController.m
Modified: trunk/Dutch.lproj/LineInspector.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/LineInspector.nib/classes.nib 2007-06-21 00:32:34 UTC (rev 2363)
+++ trunk/Dutch.lproj/LineInspector.nib/classes.nib 2007-06-21 00:40:57 UTC (rev 2364)
@@ -30,11 +30,6 @@
styleButton = NSSegmentedControl;
};
SUPERCLASS = NSWindowController;
- },
- {
- CLASS = SKNumberArrayFormatter;
- LANGUAGE = ObjC;
- SUPERCLASS = NSNumberFormatter;
}
);
IBVersion = 1;
Modified: trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/LineInspector.nib/classes.nib
===================================================================
--- trunk/English.lproj/LineInspector.nib/classes.nib 2007-06-21 00:32:34 UTC (rev 2363)
+++ trunk/English.lproj/LineInspector.nib/classes.nib 2007-06-21 00:40:57 UTC (rev 2364)
@@ -30,11 +30,6 @@
styleButton = NSSegmentedControl;
};
SUPERCLASS = NSWindowController;
- },
- {
- CLASS = SKNumberArrayFormatter;
- LANGUAGE = ObjC;
- SUPERCLASS = NSNumberFormatter;
}
);
IBVersion = 1;
Modified: trunk/English.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/LineInspector.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/LineInspector.nib/classes.nib 2007-06-21 00:32:34 UTC (rev 2363)
+++ trunk/Italian.lproj/LineInspector.nib/classes.nib 2007-06-21 00:40:57 UTC (rev 2364)
@@ -30,11 +30,6 @@
styleButton = NSSegmentedControl;
};
SUPERCLASS = NSWindowController;
- },
- {
- CLASS = SKNumberArrayFormatter;
- LANGUAGE = ObjC;
- SUPERCLASS = NSNumberFormatter;
}
);
IBVersion = 1;
Modified: trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKLineInspector.h
===================================================================
--- trunk/SKLineInspector.h 2007-06-21 00:32:34 UTC (rev 2363)
+++ trunk/SKLineInspector.h 2007-06-21 00:40:57 UTC (rev 2364)
@@ -89,5 +89,6 @@
@end
-@interface SKNumberArrayFormatter : NSNumberFormatter
+@interface SKNumberArrayFormatter : NSFormatter
+ NSNumberFormatter *numberFormatter;
@end
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2007-06-21 00:32:34 UTC (rev 2363)
+++ trunk/SKLineInspector.m 2007-06-21 00:40:57 UTC (rev 2364)
@@ -389,6 +389,10 @@
[path fill];
[image unlockFocus];
[endLineStyleButton setImage:image forSegment:kPDFLineStyleClosedArrow];
+
+ SKNumberArrayFormatter *formatter = [[SKNumberArrayFormatter alloc] init];
+ [dashPatternField setFormatter:formatter];
+ [formatter release];
}
- (void)sendActionToTarget:(SEL)selector {
@@ -483,8 +487,33 @@
#pragma mark -
-@implementation SKNumberArrayFormatter : NSNumberFormatter
+@implementation SKNumberArrayFormatter
+- (void)commonInit {
+ numberFormatter = [[NSNumberFormatter alloc] init];
+ [numberFormatter setFormatterBehavior:NSNumberFormatterBehavior10_4];
+ [numberFormatter setNumberStyle:NSNumberFormatterDecimalStyle];
+ [numberFormatter setFormat:@"#,###.0;0.0;-#,###.0"];
+ [numberFormatter setMinimum:[NSNumber numberWithFloat:0.0]];
+}
+
+ - (id)init {
+ if (self = [super init])
+ [self commonInit];
+ return self;
+ }
+
+ - (id)initWithCoder:(NSCoder *)aCoder {
+ if (self = [super initWithCoder:aCoder])
+ [self commonInit];
+ return self;
+}
+
+- (void)dealloc {
+ [numberFormatter release];
+ [super dealloc];
+}
+
- (NSString *)stringForObjectValue:(id)obj {
if ([obj isKindOfClass:[NSNumber class]])
obj = [NSArray arrayWithObjects:obj, nil];
@@ -494,7 +523,7 @@
NSMutableString *string = [NSMutableString string];
while (number = [numberEnum nextObject]) {
- NSString *s = [super stringForObjectValue:number];
+ NSString *s = [numberFormatter stringForObjectValue:number];
if ([s length]) {
if ([string length])
[string appendString:@" "];
@@ -513,7 +542,7 @@
NSMutableAttributedString *string = [[[NSMutableAttributedString alloc] init] autorelease];
while (number = [numberEnum nextObject]) {
- NSAttributedString *s = [super attributedStringForObjectValue:number withDefaultAttributes:attrs];
+ NSAttributedString *s = [numberFormatter attributedStringForObjectValue:number withDefaultAttributes:attrs];
if ([s length]) {
if ([string length])
[string appendAttributedString:[[[NSAttributedString alloc] initWithString:@" " attributes:attrs] autorelease]];
@@ -531,7 +560,7 @@
BOOL success = YES;
while (success && (s = [stringEnum nextObject])) {
- if ([s length] && (success = [super getObjectValue:&number forString:s errorDescription:error]))
+ if ([s length] && (success = [numberFormatter getObjectValue:&number forString:s errorDescription:error]))
[array addObject:number];
}
if (success)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-21 00:32:34 UTC (rev 2363)
+++ trunk/SKMainWindowController.m 2007-06-21 00:40:57 UTC (rev 2364)
@@ -883,9 +883,9 @@
PDFAnnotation *annotation = [pdfView activeAnnotation];
NSString *type = [annotation type];
if (updatingLine == NO && [annotation isNoteAnnotation] && ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"])) {
- updatingLine = YES;
+ //updatingLine = YES;
[annotation setDashPattern:[sender dashPattern]];
- updatingLine = NO;
+ //updatingLine = NO;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ama...@us...> - 2007-06-21 00:32:36
|
Revision: 2363
http://skim-app.svn.sourceforge.net/skim-app/?rev=2363&view=rev
Author: amaxwell
Date: 2007-06-20 17:32:34 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
larger padding amount to fix display problems with large line widths
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-20 23:41:52 UTC (rev 2362)
+++ trunk/SKPDFView.m 2007-06-21 00:32:34 UTC (rev 2363)
@@ -359,7 +359,8 @@
bounds.origin.y -= delta;
bounds.size.height += delta;
} else if ([[annotation type] isEqualToString:@"Line"]) {
- bounds = NSInsetRect(bounds, -4.0, -4.0);
+ // need a large padding amount for large line width and cap changes
+ bounds = NSInsetRect(bounds, -20, -20);
}
[self setNeedsDisplayInRect:bounds ofPage:[annotation page]];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-20 23:41:53
|
Revision: 2362
http://skim-app.svn.sourceforge.net/skim-app/?rev=2362&view=rev
Author: hofman
Date: 2007-06-20 16:41:52 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Remove log.
Modified Paths:
--------------
trunk/SKApplicationController.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-06-20 22:55:37 UTC (rev 2361)
+++ trunk/SKApplicationController.m 2007-06-20 23:41:52 UTC (rev 2362)
@@ -58,7 +58,7 @@
[self setupDefaults];
}
-+ (void)setupDefaults{NSLog(@"%@ %@",[[NSBundle bundleWithPath:@"/Applications/Emacs.app"] pathForAuxiliaryExecutable:@"emacsclient"],[[NSBundle bundleWithPath:@"/Applications/Emacs.app"] pathForAuxiliaryExecutable:@"bin/emacsclient"]);
++ (void)setupDefaults{
NSString *userDefaultsValuesPath;
NSDictionary *userDefaultsValuesDict;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-20 22:55:42
|
Revision: 2361
http://skim-app.svn.sourceforge.net/skim-app/?rev=2361&view=rev
Author: hofman
Date: 2007-06-20 15:55:37 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Add tex editor preset for LyX.
Modified Paths:
--------------
trunk/SKApplicationController.m
trunk/SKDocument.m
trunk/SKPreferenceController.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-06-20 22:06:58 UTC (rev 2360)
+++ trunk/SKApplicationController.m 2007-06-20 22:55:37 UTC (rev 2361)
@@ -58,7 +58,7 @@
[self setupDefaults];
}
-+ (void)setupDefaults{
++ (void)setupDefaults{NSLog(@"%@ %@",[[NSBundle bundleWithPath:@"/Applications/Emacs.app"] pathForAuxiliaryExecutable:@"emacsclient"],[[NSBundle bundleWithPath:@"/Applications/Emacs.app"] pathForAuxiliaryExecutable:@"bin/emacsclient"]);
NSString *userDefaultsValuesPath;
NSDictionary *userDefaultsValuesDict;
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-06-20 22:06:58 UTC (rev 2360)
+++ trunk/SKDocument.m 2007-06-20 22:55:37 UTC (rev 2361)
@@ -826,14 +826,23 @@
if ([editorPreset isEqualToString:@""] == NO) {
NSString *appPath = [[NSWorkspace sharedWorkspace] fullPathForApplication:editorPreset];
- NSString *toolPath = appPath ? [NSBundle pathForResource:editorCmd ofType:nil inDirectory:appPath] : nil;
- if (toolPath) {
- editorCmd = toolPath;
- } else {
- // Emacs has its tool in Emacs.app/Contents/MacOS/bin/
- toolPath = [[[[[NSBundle bundleWithPath:appPath] executablePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"bin"] stringByAppendingPathComponent:editorCmd];
- if ([[NSFileManager defaultManager] isExecutableFileAtPath:toolPath])
+ if (appPath) {
+ NSBundle *appBundle = [NSBundle bundleWithPath:appPath];
+ NSString *toolPath = [appBundle pathForResource:editorCmd ofType:nil];
+ if (toolPath && [[NSFileManager defaultManager] isExecutableFileAtPath:toolPath]) {
+ editorCmd = toolPath;
+ } else if (toolPath = [appBundle pathForAuxiliaryExecutable:editorCmd]) {
editorCmd = toolPath;
+ } else if (toolPath = [appBundle pathForAuxiliaryExecutable:[@"bin" stringByAppendingPathComponent:editorCmd]]) {
+ // Emacs has its tool in Emacs.app/Contents/MacOS/bin/
+ editorCmd = toolPath;
+ } else if ((toolPath = [[appBundle sharedSupportPath] stringByAppendingPathComponent:editorCmd]) &&
+ [[NSFileManager defaultManager] isExecutableFileAtPath:toolPath]) {
+ editorCmd = toolPath;
+ } else if ((toolPath = [[[appBundle sharedSupportPath] stringByAppendingPathComponent:@"bin"] stringByAppendingPathComponent:editorCmd]) &&
+ [[NSFileManager defaultManager] isExecutableFileAtPath:toolPath]) {
+ editorCmd = toolPath;
+ }
}
}
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2007-06-20 22:06:58 UTC (rev 2360)
+++ trunk/SKPreferenceController.m 2007-06-20 22:55:37 UTC (rev 2361)
@@ -43,9 +43,9 @@
#import <Sparkle/Sparkle.h>
static float SKDefaultFontSizes[] = {8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 16.0, 18.0, 20.0, 24.0, 28.0, 32.0, 48.0, 64.0};
-static NSString *SKTeXEditors[] = {@"TextMate", @"BBEdit", @"TextWrangler", @"Emacs", @"Aquamacs Emacs"};
-static NSString *SKTeXEditorCommands[] = {@"mate", @"bbedit", @"edit", @"emacsclient", @"emacsclient"};
-static NSString *SKTeXEditorArguments[] = {@"-l %line \"%file\"", @"+%line \"%file\"", @"+%line \"%file\"", @"--no-wait +%line \"%file\"", @"--no-wait +%line \"%file\""};
+static NSString *SKTeXEditors[] = {@"TextMate", @"BBEdit", @"TextWrangler", @"Emacs", @"Aquamacs Emacs", @"LyX"};
+static NSString *SKTeXEditorCommands[] = {@"mate", @"bbedit", @"edit", @"emacsclient", @"emacsclient", @"lyxeditor"};
+static NSString *SKTeXEditorArguments[] = {@"-l %line \"%file\"", @"+%line \"%file\"", @"+%line \"%file\"", @"--no-wait +%line \"%file\"", @"--no-wait +%line \"%file\"", @"\"%file\" %line"};
@implementation SKPreferenceController
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-20 22:07:00
|
Revision: 2360
http://skim-app.svn.sourceforge.net/skim-app/?rev=2360&view=rev
Author: hofman
Date: 2007-06-20 15:06:58 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Add a line style inspector to the project.
Modified Paths:
--------------
trunk/Dutch.lproj/Localizable.strings
trunk/Dutch.lproj/MainMenu.nib/classes.nib
trunk/Dutch.lproj/MainMenu.nib/info.nib
trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
trunk/English.lproj/Localizable.strings
trunk/English.lproj/MainMenu.nib/classes.nib
trunk/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/SKApplication.h
trunk/SKApplication.m
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/Skim.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/Dutch.lproj/LineInspector.nib/
trunk/Dutch.lproj/LineInspector.nib/classes.nib
trunk/Dutch.lproj/LineInspector.nib/info.nib
trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
trunk/English.lproj/LineInspector.nib/
trunk/English.lproj/LineInspector.nib/classes.nib
trunk/English.lproj/LineInspector.nib/info.nib
trunk/English.lproj/LineInspector.nib/keyedobjects.nib
trunk/Italian.lproj/LineInspector.nib/
trunk/Italian.lproj/LineInspector.nib/classes.nib
trunk/Italian.lproj/LineInspector.nib/info.nib
trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
trunk/SKLineInspector.h
trunk/SKLineInspector.m
Added: trunk/Dutch.lproj/LineInspector.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/LineInspector.nib/classes.nib (rev 0)
+++ trunk/Dutch.lproj/LineInspector.nib/classes.nib 2007-06-20 22:06:58 UTC (rev 2360)
@@ -0,0 +1,41 @@
+{
+ IBClasses = (
+ {
+ ACTIONS = {"" = id; };
+ CLASS = FirstResponder;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
+ ACTIONS = {
+ changeDashPattern = id;
+ changeEndLineStyle = id;
+ changeLineStyle = id;
+ changeLineWidth = id;
+ changeStartLineStyle = id;
+ };
+ CLASS = NSObject;
+ LANGUAGE = ObjC;
+ },
+ {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; },
+ {
+ CLASS = SKLineInspector;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ dashPatternField = NSTextField;
+ endLineStyleButton = NSSegmentedControl;
+ lineWidthField = NSTextField;
+ lineWidthSlider = NSSlider;
+ startLineStyleButton = NSSegmentedControl;
+ styleButton = NSSegmentedControl;
+ };
+ SUPERCLASS = NSWindowController;
+ },
+ {
+ CLASS = SKNumberArrayFormatter;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSNumberFormatter;
+ }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Added: trunk/Dutch.lproj/LineInspector.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/LineInspector.nib/info.nib (rev 0)
+++ trunk/Dutch.lproj/LineInspector.nib/info.nib 2007-06-20 22:06:58 UTC (rev 2360)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBDocumentLocation</key>
+ <string>69 58 356 240 0 0 1440 938 </string>
+ <key>IBFramework Version</key>
+ <string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>5</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>8P135</string>
+</dict>
+</plist>
Added: trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Dutch.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/MainMenu.nib/classes.nib 2007-06-20 12:22:24 UTC (rev 2359)
+++ trunk/Dutch.lproj/MainMenu.nib/classes.nib 2007-06-20 22:06:58 UTC (rev 2360)
@@ -33,6 +33,7 @@
getInfo = id;
myAction = id;
newDocumentFromClipboard = id;
+ orderFrontLineInspector = id;
password = id;
performFit = id;
readNotes = id;
Modified: trunk/Dutch.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-06-20 12:22:24 UTC (rev 2359)
+++ trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-06-20 22:06:58 UTC (rev 2360)
@@ -7,14 +7,10 @@
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>140 614 635 44 0 0 1440 938 </string>
+ <string>140 614 542 44 0 0 1440 938 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>29</integer>
- </array>
<key>IBSystem Version</key>
<string>8P135</string>
</dict>
Modified: trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Added: trunk/English.lproj/LineInspector.nib/classes.nib
===================================================================
--- trunk/English.lproj/LineInspector.nib/classes.nib (rev 0)
+++ trunk/English.lproj/LineInspector.nib/classes.nib 2007-06-20 22:06:58 UTC (rev 2360)
@@ -0,0 +1,41 @@
+{
+ IBClasses = (
+ {
+ ACTIONS = {"" = id; };
+ CLASS = FirstResponder;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
+ ACTIONS = {
+ changeDashPattern = id;
+ changeEndLineStyle = id;
+ changeLineStyle = id;
+ changeLineWidth = id;
+ changeStartLineStyle = id;
+ };
+ CLASS = NSObject;
+ LANGUAGE = ObjC;
+ },
+ {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; },
+ {
+ CLASS = SKLineInspector;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ dashPatternField = NSTextField;
+ endLineStyleButton = NSSegmentedControl;
+ lineWidthField = NSTextField;
+ lineWidthSlider = NSSlider;
+ startLineStyleButton = NSSegmentedControl;
+ styleButton = NSSegmentedControl;
+ };
+ SUPERCLASS = NSWindowController;
+ },
+ {
+ CLASS = SKNumberArrayFormatter;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSNumberFormatter;
+ }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Added: trunk/English.lproj/LineInspector.nib/info.nib
===================================================================
--- trunk/English.lproj/LineInspector.nib/info.nib (rev 0)
+++ trunk/English.lproj/LineInspector.nib/info.nib 2007-06-20 22:06:58 UTC (rev 2360)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBDocumentLocation</key>
+ <string>69 58 356 240 0 0 1440 938 </string>
+ <key>IBFramework Version</key>
+ <string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>5</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>8P135</string>
+</dict>
+</plist>
Added: trunk/English.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: trunk/English.lproj/LineInspector.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/English.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/English.lproj/MainMenu.nib/classes.nib 2007-06-20 12:22:24 UTC (rev 2359)
+++ trunk/English.lproj/MainMenu.nib/classes.nib 2007-06-20 22:06:58 UTC (rev 2360)
@@ -33,6 +33,7 @@
getInfo = id;
myAction = id;
newDocumentFromClipboard = id;
+ orderFrontLineInspector = id;
password = id;
performFit = id;
readNotes = id;
Modified: trunk/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Added: trunk/Italian.lproj/LineInspector.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/LineInspector.nib/classes.nib (rev 0)
+++ trunk/Italian.lproj/LineInspector.nib/classes.nib 2007-06-20 22:06:58 UTC (rev 2360)
@@ -0,0 +1,41 @@
+{
+ IBClasses = (
+ {
+ ACTIONS = {"" = id; };
+ CLASS = FirstResponder;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
+ ACTIONS = {
+ changeDashPattern = id;
+ changeEndLineStyle = id;
+ changeLineStyle = id;
+ changeLineWidth = id;
+ changeStartLineStyle = id;
+ };
+ CLASS = NSObject;
+ LANGUAGE = ObjC;
+ },
+ {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; },
+ {
+ CLASS = SKLineInspector;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ dashPatternField = NSTextField;
+ endLineStyleButton = NSSegmentedControl;
+ lineWidthField = NSTextField;
+ lineWidthSlider = NSSlider;
+ startLineStyleButton = NSSegmentedControl;
+ styleButton = NSSegmentedControl;
+ };
+ SUPERCLASS = NSWindowController;
+ },
+ {
+ CLASS = SKNumberArrayFormatter;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSNumberFormatter;
+ }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Added: trunk/Italian.lproj/LineInspector.nib/info.nib
===================================================================
--- trunk/Italian.lproj/LineInspector.nib/info.nib (rev 0)
+++ trunk/Italian.lproj/LineInspector.nib/info.nib 2007-06-20 22:06:58 UTC (rev 2360)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBDocumentLocation</key>
+ <string>69 58 356 240 0 0 1440 938 </string>
+ <key>IBFramework Version</key>
+ <string>446.1</string>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>5</integer>
+ </array>
+ <key>IBSystem Version</key>
+ <string>8P135</string>
+</dict>
+</plist>
Added: trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Property changes on: trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/SKApplication.h
===================================================================
--- trunk/SKApplication.h 2007-06-20 12:22:24 UTC (rev 2359)
+++ trunk/SKApplication.h 2007-06-20 22:06:58 UTC (rev 2360)
@@ -41,6 +41,7 @@
extern NSString *SKApplicationWillTerminateNotification;
@interface SKApplication : NSApplication
+- (IBAction)orderFrontLineInspector:(id)sender;
@end
Modified: trunk/SKApplication.m
===================================================================
--- trunk/SKApplication.m 2007-06-20 12:22:24 UTC (rev 2359)
+++ trunk/SKApplication.m 2007-06-20 22:06:58 UTC (rev 2360)
@@ -41,6 +41,7 @@
#import "SKDocument.h"
#import "SKPDFSynchronizer.h"
#import "SKPDFView.h"
+#import "SKLineInspector.h"
NSString *SKApplicationWillTerminateNotification = @"SKApplicationWillTerminateNotification";
@@ -67,6 +68,10 @@
@implementation SKApplication
+- (IBAction)orderFrontLineInspector:(id)sender {
+ [[SKLineInspector sharedLineInspector] showWindow:sender];
+}
+
- (void)sendEvent:(NSEvent *)anEvent {
id target = nil;
if ([anEvent type] == NSScrollWheel && [anEvent modifierFlags] & NSAlternateKeyMask)
Added: trunk/SKLineInspector.h
===================================================================
--- trunk/SKLineInspector.h (rev 0)
+++ trunk/SKLineInspector.h 2007-06-20 22:06:58 UTC (rev 2360)
@@ -0,0 +1,93 @@
+
+//
+// SKLineInspector.h
+// Skim
+//
+// Created by Christiaan Hofman on 6/20/07.
+/*
+ This software is Copyright (c) 2007
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+#import <Quartz/Quartz.h>
+
+extern NSString *SKLineInspectorLineWidthDidChangeNotification;
+extern NSString *SKLineInspectorLineStyleDidChangeNotification;
+extern NSString *SKLineInspectorDashPatternDidChangeNotification;
+extern NSString *SKLineInspectorStartLineStyleDidChangeNotification;
+extern NSString *SKLineInspectorEndLineStyleDidChangeNotification;
+
+@interface SKLineInspector : NSWindowController {
+ IBOutlet NSSlider *lineWidthSlider;
+ IBOutlet NSTextField *lineWidthField;
+ IBOutlet NSSegmentedControl *styleButton;
+ IBOutlet NSTextField *dashPatternField;
+ IBOutlet NSSegmentedControl *startLineStyleButton;
+ IBOutlet NSSegmentedControl *endLineStyleButton;
+ PDFBorder *border;
+ PDFLineStyle startLineStyle;
+ PDFLineStyle endLineStyle;
+}
+
++ (id)sharedLineInspector;
+
+- (float)lineWidth;
+- (void)setLineWidth:(float)width;
+- (PDFBorderStyle)style;
+- (void)setStyle:(PDFBorderStyle)newStyle;
+- (NSArray *)dashPattern;
+- (void)setDashPattern:(NSArray *)pattern;
+
+- (PDFLineStyle)startLineStyle;
+- (void)setStartLineStyle:(PDFLineStyle)newStyle;
+- (PDFLineStyle)endLineStyle;
+- (void)setEndLineStyle:(PDFLineStyle)newStyle;
+
+- (void)setBorder:(PDFBorder *)newBorder;
+- (void)setAnnotationStyle:(PDFAnnotation *)annotation;
+
+@end
+
+
+@interface NSObject (SKLineInspectorDelegate)
+
+- (void)changeLineWidth:(id)sender;
+- (void)changeLineStyle:(id)sender;
+- (void)changeDashPattern:(id)sender;
+- (void)changeStartLineStyle:(id)sender;
+- (void)changeEndLineStyle:(id)sender;
+
+@end
+
+
+@interface SKNumberArrayFormatter : NSNumberFormatter
+@end
Added: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m (rev 0)
+++ trunk/SKLineInspector.m 2007-06-20 22:06:58 UTC (rev 2360)
@@ -0,0 +1,542 @@
+//
+// SKLineInspector.m
+// Skim
+//
+// Created by Christiaan Hofman on 6/20/07.
+/*
+ This software is Copyright (c) 2007
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "SKLineInspector.h"
+
+NSString *SKLineInspectorLineWidthDidChangeNotification = @"SKLineInspectorLineWidthDidChangeNotification";
+NSString *SKLineInspectorLineStyleDidChangeNotification = @"SKLineInspectorLineStyleDidChangeNotification";
+NSString *SKLineInspectorDashPatternDidChangeNotification = @"SKLineInspectorDashPatternDidChangeNotification";
+NSString *SKLineInspectorStartLineStyleDidChangeNotification = @"SKLineInspectorStartLineStyleDidChangeNotification";
+NSString *SKLineInspectorEndLineStyleDidChangeNotification = @"SKLineInspectorEndLineStyleDidChangeNotification";
+
+@implementation SKLineInspector
+
+static SKLineInspector *sharedLineInspector = nil;
+
++ (id)sharedLineInspector {
+ if (sharedLineInspector == nil)
+ [[self alloc] init];
+ return sharedLineInspector;
+}
+
++ (id)allocWithZone:(NSZone *)zone {
+ if (sharedLineInspector == nil)
+ return [super allocWithZone:[self zone]];
+ else
+ return sharedLineInspector;
+}
+
+- (id)init {
+ if (sharedLineInspector == nil && (self = [super initWithWindowNibName:@"LineInspector"])) {
+ sharedLineInspector = self;
+ border = [[PDFBorder alloc] init];
+ startLineStyle = kPDFLineStyleNone;
+ endLineStyle = kPDFLineStyleNone;
+ }
+ return sharedLineInspector;
+}
+
+- (void)dealloc {
+ [border release];
+ [super dealloc];
+}
+
+- (id)retain { return self; }
+
+- (id)autorelease { return self; }
+
+- (void)release {}
+
+- (unsigned)retainCount { return UINT_MAX; }
+
+- (void)awakeFromNib {
+ [[styleButton cell] setToolTip:NSLocalizedString(@"Solid line style", @"Tool tip message") forSegment:kPDFBorderStyleSolid];
+ [[styleButton cell] setToolTip:NSLocalizedString(@"Dashed line style", @"Tool tip message") forSegment:kPDFBorderStyleDashed];
+ [[styleButton cell] setToolTip:NSLocalizedString(@"Beveled line style", @"Tool tip message") forSegment:kPDFBorderStyleBeveled];
+ [[styleButton cell] setToolTip:NSLocalizedString(@"Inset line style", @"Tool tip message") forSegment:kPDFBorderStyleInset];
+ [[styleButton cell] setToolTip:NSLocalizedString(@"Underline line style", @"Tool tip message") forSegment:kPDFBorderStyleUnderline];
+
+ [[startLineStyleButton cell] setToolTip:NSLocalizedString(@"No start line style", @"Tool tip message") forSegment:kPDFLineStyleNone];
+ [[startLineStyleButton cell] setToolTip:NSLocalizedString(@"Square start line style", @"Tool tip message") forSegment:kPDFLineStyleSquare];
+ [[startLineStyleButton cell] setToolTip:NSLocalizedString(@"Circle start line style", @"Tool tip message") forSegment:kPDFLineStyleCircle];
+ [[startLineStyleButton cell] setToolTip:NSLocalizedString(@"Diamond start line style", @"Tool tip message") forSegment:kPDFLineStyleDiamond];
+ [[startLineStyleButton cell] setToolTip:NSLocalizedString(@"Open arrow start line style", @"Tool tip message") forSegment:kPDFLineStyleOpenArrow];
+ [[startLineStyleButton cell] setToolTip:NSLocalizedString(@"Closed arrow start line style", @"Tool tip message") forSegment:kPDFLineStyleClosedArrow];
+
+ [[endLineStyleButton cell] setToolTip:NSLocalizedString(@"No end line style", @"Tool tip message") forSegment:kPDFLineStyleNone];
+ [[endLineStyleButton cell] setToolTip:NSLocalizedString(@"Square end line style", @"Tool tip message") forSegment:kPDFLineStyleSquare];
+ [[endLineStyleButton cell] setToolTip:NSLocalizedString(@"Circle end line style", @"Tool tip message") forSegment:kPDFLineStyleCircle];
+ [[endLineStyleButton cell] setToolTip:NSLocalizedString(@"Diamond end line style", @"Tool tip message") forSegment:kPDFLineStyleDiamond];
+ [[endLineStyleButton cell] setToolTip:NSLocalizedString(@"Open arrow end line style", @"Tool tip message") forSegment:kPDFLineStyleOpenArrow];
+ [[endLineStyleButton cell] setToolTip:NSLocalizedString(@"Closed arrow end line style", @"Tool tip message") forSegment:kPDFLineStyleClosedArrow];
+
+ NSImage *image = nil;
+ NSSize size;
+ NSBezierPath *path;
+
+ size = NSMakeSize(29.0, 12.0);
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 3.0, 17.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [styleButton setImage:image forSegment:kPDFBorderStyleSolid];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(6.0, 5.0)];
+ [path lineToPoint:NSMakePoint(6.0, 3.0)];
+ [path lineToPoint:NSMakePoint(9.0, 3.0)];
+ [path moveToPoint:NSMakePoint(12.0, 3.0)];
+ [path lineToPoint:NSMakePoint(17.0, 3.0)];
+ [path moveToPoint:NSMakePoint(20.0, 3.0)];
+ [path lineToPoint:NSMakePoint(23.0, 3.0)];
+ [path lineToPoint:NSMakePoint(23.0, 5.0)];
+ [path moveToPoint:NSMakePoint(23.0, 7.0)];
+ [path lineToPoint:NSMakePoint(23.0, 9.0)];
+ [path lineToPoint:NSMakePoint(20.0, 9.0)];
+ [path moveToPoint:NSMakePoint(17.0, 9.0)];
+ [path lineToPoint:NSMakePoint(12.0, 9.0)];
+ [path moveToPoint:NSMakePoint(9.0, 9.0)];
+ [path lineToPoint:NSMakePoint(6.0, 9.0)];
+ [path lineToPoint:NSMakePoint(6.0, 7.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [styleButton setImage:image forSegment:kPDFBorderStyleDashed];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 3.0, 17.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] setStroke];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(7.0, 3.0)];
+ [path lineToPoint:NSMakePoint(23.0, 3.0)];
+ [path lineToPoint:NSMakePoint(23.0, 8.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] set];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(5.0, 2.0)];
+ [path lineToPoint:NSMakePoint(7.0, 4.0)];
+ [path lineToPoint:NSMakePoint(7.0, 2.0)];
+ [path closePath];
+ [path moveToPoint:NSMakePoint(24.0, 10.0)];
+ [path lineToPoint:NSMakePoint(22.0, 8.0)];
+ [path lineToPoint:NSMakePoint(24.0, 8.0)];
+ [path closePath];
+ [path fill];
+ [image unlockFocus];
+ [styleButton setImage:image forSegment:kPDFBorderStyleBeveled];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 3.0, 17.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] setStroke];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(6.0, 4.0)];
+ [path lineToPoint:NSMakePoint(6.0, 9.0)];
+ [path lineToPoint:NSMakePoint(22.0, 9.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] set];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(5.0, 2.0)];
+ [path lineToPoint:NSMakePoint(7.0, 4.0)];
+ [path lineToPoint:NSMakePoint(5.0, 4.0)];
+ [path closePath];
+ [path moveToPoint:NSMakePoint(24.0, 10.0)];
+ [path lineToPoint:NSMakePoint(22.0, 8.0)];
+ [path lineToPoint:NSMakePoint(22.0, 10.0)];
+ [path closePath];
+ [path fill];
+ [image unlockFocus];
+ [styleButton setImage:image forSegment:kPDFBorderStyleInset];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(6.0, 3.0)];
+ [path lineToPoint:NSMakePoint(23.0, 3.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [styleButton setImage:image forSegment:kPDFBorderStyleUnderline];
+ [image release];
+
+ size = NSMakeSize(24.0, 12.0);
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(20.0, 6.0)];
+ [path lineToPoint:NSMakePoint(8.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [startLineStyleButton setImage:image forSegment:kPDFLineStyleNone];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(4.0, 6.0)];
+ [path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [endLineStyleButton setImage:image forSegment:kPDFLineStyleNone];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(20.0, 6.0)];
+ [path lineToPoint:NSMakePoint(8.0, 6.0)];
+ [path appendBezierPathWithRect:NSMakeRect(5.0, 3.0, 6.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [startLineStyleButton setImage:image forSegment:kPDFLineStyleSquare];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(4.0, 6.0)];
+ [path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path appendBezierPathWithRect:NSMakeRect(13.0, 3.0, 6.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [endLineStyleButton setImage:image forSegment:kPDFLineStyleSquare];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(20.0, 6.0)];
+ [path lineToPoint:NSMakePoint(8.0, 6.0)];
+ [path appendBezierPathWithOvalInRect:NSMakeRect(5.0, 3.0, 6.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [startLineStyleButton setImage:image forSegment:kPDFLineStyleCircle];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(4.0, 6.0)];
+ [path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path appendBezierPathWithOvalInRect:NSMakeRect(13.0, 3.0, 6.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [endLineStyleButton setImage:image forSegment:kPDFLineStyleCircle];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(20.0, 6.0)];
+ [path lineToPoint:NSMakePoint(8.0, 6.0)];
+ [path moveToPoint:NSMakePoint(12.0, 6.0)];
+ [path lineToPoint:NSMakePoint(8.0, 10.0)];
+ [path lineToPoint:NSMakePoint(4.0, 6.0)];
+ [path lineToPoint:NSMakePoint(8.0, 2.0)];
+ [path closePath];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [startLineStyleButton setImage:image forSegment:kPDFLineStyleDiamond];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(4.0, 6.0)];
+ [path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path moveToPoint:NSMakePoint(12.0, 6.0)];
+ [path lineToPoint:NSMakePoint(16.0, 10.0)];
+ [path lineToPoint:NSMakePoint(20.0, 6.0)];
+ [path lineToPoint:NSMakePoint(16.0, 2.0)];
+ [path closePath];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [endLineStyleButton setImage:image forSegment:kPDFLineStyleDiamond];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(20.0, 6.0)];
+ [path lineToPoint:NSMakePoint(8.0, 6.0)];
+ [path moveToPoint:NSMakePoint(13.0, 3.0)];
+ [path lineToPoint:NSMakePoint(7.0, 6.0)];
+ [path lineToPoint:NSMakePoint(13.0, 9.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [startLineStyleButton setImage:image forSegment:kPDFLineStyleOpenArrow];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(4.0, 6.0)];
+ [path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path moveToPoint:NSMakePoint(11.0, 3.0)];
+ [path lineToPoint:NSMakePoint(17.0, 6.0)];
+ [path lineToPoint:NSMakePoint(11.0, 9.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] setStroke];
+ [path stroke];
+ [image unlockFocus];
+ [endLineStyleButton setImage:image forSegment:kPDFLineStyleOpenArrow];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(20.0, 6.0)];
+ [path lineToPoint:NSMakePoint(8.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] set];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(14.0, 1.5)];
+ [path lineToPoint:NSMakePoint(5.0, 6.0)];
+ [path lineToPoint:NSMakePoint(14.0, 10.5)];
+ [path closePath];
+ [path fill];
+ [image unlockFocus];
+ [startLineStyleButton setImage:image forSegment:kPDFLineStyleClosedArrow];
+ [image release];
+
+ image = [[NSImage alloc] initWithSize:size];
+ [image lockFocus];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(4.0, 6.0)];
+ [path lineToPoint:NSMakePoint(16.0, 6.0)];
+ [path setLineWidth:2.0];
+ [[NSColor blackColor] set];
+ [path stroke];
+ path = [NSBezierPath bezierPath];
+ [path moveToPoint:NSMakePoint(10.0, 1.5)];
+ [path lineToPoint:NSMakePoint(19.0, 6.0)];
+ [path lineToPoint:NSMakePoint(10.0, 10.5)];
+ [path closePath];
+ [path fill];
+ [image unlockFocus];
+ [endLineStyleButton setImage:image forSegment:kPDFLineStyleClosedArrow];
+}
+
+- (void)sendActionToTarget:(SEL)selector {
+ NSWindow *mainWindow = [NSApp mainWindow];
+ NSResponder *responder = [mainWindow firstResponder];
+
+ while (responder && [responder respondsToSelector:selector] == NO)
+ responder = [responder nextResponder];
+
+ [responder performSelector:selector withObject:self];
+}
+
+#pragma mark Accessors
+
+- (float)lineWidth {
+ return [border lineWidth];
+}
+
+- (void)setLineWidth:(float)width {
+ [border setLineWidth:width];
+ [self sendActionToTarget:@selector(changeLineWidth:)];
+ [[NSNotificationCenter defaultCenter] postNotificationName:SKLineInspectorLineWidthDidChangeNotification object:self];
+}
+
+- (PDFBorderStyle)style {
+ return [border style];
+}
+
+- (void)setStyle:(PDFBorderStyle)style {
+ if (style != [border style]) {
+ [border setStyle:style];
+ [self sendActionToTarget:@selector(changeLineStyle:)];
+ [[NSNotificationCenter defaultCenter] postNotificationName:SKLineInspectorLineStyleDidChangeNotification object:self];
+ }
+}
+
+- (NSArray *)dashPattern {
+ return [border dashPattern];
+}
+
+- (void)setDashPattern:(NSArray *)pattern {
+ if (pattern != [border dashPattern]) {
+ [border setDashPattern:pattern];
+ [self sendActionToTarget:@selector(changeDashPattern:)];
+ [[NSNotificationCenter defaultCenter] postNotificationName:SKLineInspectorDashPatternDidChangeNotification object:self];
+ }
+}
+
+- (PDFLineStyle)startLineStyle {
+ return startLineStyle;
+}
+
+- (void)setStartLineStyle:(PDFLineStyle)newStyle {
+ if (newStyle != startLineStyle) {
+ startLineStyle = newStyle;
+ [self sendActionToTarget:@selector(changeStartLineStyle:)];
+ [[NSNotificationCenter defaultCenter] postNotificationName:SKLineInspectorStartLineStyleDidChangeNotification object:self];
+ }
+}
+
+- (PDFLineStyle)endLineStyle {
+ return endLineStyle;
+}
+
+- (void)setEndLineStyle:(PDFLineStyle)newStyle {
+ if (newStyle != endLineStyle) {
+ endLineStyle = newStyle;
+ [self sendActionToTarget:@selector(changeEndLineStyle:)];
+ [[NSNotificationCenter defaultCenter] postNotificationName:SKLineInspectorEndLineStyleDidChangeNotification object:self];
+ }
+}
+
+- (void)setBorder:(PDFBorder *)newBorder {
+ if (newBorder != border) {
+ [self setLineWidth:[newBorder lineWidth]];
+ [self setDashPattern:[newBorder dashPattern]];
+ [self setStyle:[newBorder style]];
+ }
+}
+
+- (void)setAnnotationStyle:(PDFAnnotation *)annotation {
+ NSString *type = [annotation type];
+ if ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"])
+ [self setBorder:[annotation border]];
+ if ([type isEqualToString:@"Line"]) {
+ [self setStartLineStyle:[(PDFAnnotationLine *)annotation startLineStyle]];
+ [self setEndLineStyle:[(PDFAnnotationLine *)annotation endLineStyle]];
+ }
+}
+
+@end
+
+#pragma mark -
+
+@implementation SKNumberArrayFormatter : NSNumberFormatter
+
+- (NSString *)stringForObjectValue:(id)obj {
+ if ([obj isKindOfClass:[NSNumber class]])
+ obj = [NSArray arrayWithObjects:obj, nil];
+
+ NSEnumerator *numberEnum = [obj objectEnumerator];
+ NSNumber *number;
+ NSMutableString *string = [NSMutableString string];
+
+ while (number = [numberEnum nextObject]) {
+ NSString *s = [super stringForObjectValue:number];
+ if ([s length]) {
+ if ([string length])
+ [string appendString:@" "];
+ [string appendString:s];
+ }
+ }
+ return string;
+}
+
+- (NSAttributedString *)attributedStringForObjectValue:(id)obj withDefaultAttributes:(NSDictionary *)attrs {
+ if ([obj isKindOfClass:[NSNumber class]])
+ obj = [NSArray arrayWithObjects:obj, nil];
+
+ NSEnumerator *numberEnum = [obj objectEnumerator];
+ NSNumber *number;
+ NSMutableAttributedString *string = [[[NSMutableAttributedString alloc] init] autorelease];
+
+ while (number = [numberEnum nextObject]) {
+ NSAttributedString *s = [super attributedStringForObjectValue:number withDefaultAttributes:attrs];
+ if ([s length]) {
+ if ([string length])
+ [string appendAttributedString:[[[NSAttributedString alloc] initWithString:@" " attributes:attrs] autorelease]];
+ [string appendAttributedString:s];
+ }
+ }
+ return string;
+}
+
+- (BOOL)getObjectValue:(id *)obj forString:(NSString *)string errorDescription:(NSString **)error {
+ NSEnumerator *stringEnum = [[string componentsSeparatedByString:@" "] objectEnumerator];
+ NSString *s;
+ NSNumber *number;
+ NSMutableArray *array = [NSMutableArray array];
+ BOOL success = YES;
+
+ while (success && (s = [stringEnum nextObject])) {
+ if ([s length] && (success = [super getObjectValue:&number forString:s errorDescription:error]))
+ [array addObject:number];
+ }
+ if (success)
+ *obj = array;
+ return success;
+}
+
+@end
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2007-06-20 12:22:24 UTC (rev 2359)
+++ trunk/SKMainWindowController.h 2007-06-20 22:06:58 UTC (rev 2360)
@@ -161,6 +161,7 @@
NSButton *colorAccessoryView;
BOOL updatingColor;
BOOL updatingFont;
+ BOOL updatingLine;
NSMutableArray *lastViewedPages;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-20 12:22:24 UTC (rev 2359)
+++ trunk/SKMainWindowController.m 2007-06-20 22:06:58 UTC (rev 2360)
@@ -71,6 +71,7 @@
#import "NSValue_SKExtensions.h"
#import "NSString_SKExtensions.h"
#import "SKReadingBar.h"
+#import "SKLineInspector.h"
#define SEGMENTED_CONTROL_HEIGHT 25.0
#define WINDOW_X_DELTA 0.0
@@ -138,6 +139,7 @@
isAnimating = NO;
updatingColor = NO;
updatingFont = NO;
+ updatingLine = NO;
}
return self;
@@ -489,10 +491,24 @@
}
}
+- (void)updateLineInspector {
+ PDFAnnotation *annotation = [pdfView activeAnnotation];
+ NSString *type = [annotation type];
+
+ if ([[self window] isMainWindow]) {
+ if ([annotation isNoteAnnotation] && ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@""] || [type isEqualToString:@"Line"])) {
+ updatingLine = YES;
+ [[SKLineInspector sharedLineInspector] setAnnotationStyle:annotation];
+ updatingLine = NO;
+ }
+ }
+}
+
- (void)windowDidBecomeMain:(NSNotification *)notification {
if ([[self window] isEqual:[notification object]]) {
[self updateFontPanel];
[self updateColorPanel];
+ [self updateLineInspector];
}
}
@@ -843,6 +859,56 @@
}
}
+- (void)changeLineWidth:(id)sender {
+ PDFAnnotation *annotation = [pdfView activeAnnotation];
+ NSString *type = [annotation type];
+ if (updatingLine == NO && [annotation isNoteAnnotation] && ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@""] || [type isEqualToString:@"Line"])) {
+ updatingLine = YES;
+ [annotation setLineWidth:[sender lineWidth]];
+ updatingLine = NO;
+ }
+}
+
+- (void)changeLineStyle:(id)sender {
+ PDFAnnotation *annotation = [pdfView activeAnnotation];
+ NSString *type = [annotation type];
+ if (updatingLine == NO && [annotation isNoteAnnotation] && ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"])) {
+ //updatingLine = YES;
+ [annotation setBorderStyle:[sender style]];
+ //updatingLine = NO;
+ }
+}
+
+- (void)changeDashPattern:(id)sender {
+ PDFAnnotation *annotation = [pdfView activeAnnotation];
+ NSString *type = [annotation type];
+ if (updatingLine == NO && [annotation isNoteAnnotation] && ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"])) {
+ updatingLine = YES;
+ [annotation setDashPattern:[sender dashPattern]];
+ updatingLine = NO;
+ }
+}
+
+- (void)changeStartLineStyle:(id)sender {
+ PDFAnnotation *annotation = [pdfView activeAnnotation];
+ NSString *type = [annotation type];
+ if (updatingLine == NO && [annotation isNoteAnnotation] && [type isEqualToString:@"Line"]) {
+ updatingLine = YES;
+ [(SKPDFAnnotationLine *)annotation setStartLineStyle:[sender startLineStyle]];
+ updatingLine = NO;
+ }
+}
+
+- (void)changeEndLineStyle:(id)sender {
+ PDFAnnotation *annotation = [pdfView activeAnnotation];
+ NSString *type = [annotation type];
+ if (updatingLine == NO && [annotation isNoteAnnotation] && [type isEqualToString:@"Line"]) {
+ updatingLine = YES;
+ [(SKPDFAnnotationLine *)annotation setEndLineStyle:[sender endLineStyle]];
+ updatingLine = NO;
+ }
+}
+
- (IBAction)createNewNote:(id)sender{
if ([pdfView hideNotes] == NO) {
[pdfView addAnnotationFromSelectionWithType:[sender tag]];
@@ -2289,6 +2355,7 @@
if ([[self window] isMainWindow]) {
[self updateFontPanel];
[self updateColorPanel];
+ [self updateLineInspector];
}
if ([annotation isNoteAnnotation]) {
if ([self selectedNote] != annotation) {
@@ -2418,6 +2485,11 @@
[[NSFontManager sharedFontManager] setSelectedFont:[(PDFAnnotationFreeText *)annotation font] isMultiple:NO];
updatingFont = NO;
}
+ if (updatingLine == NO && ([key isEqualToString:@"border"] || [key isEqualToString:@"lineWidth"] || [key isEqualToString:@"borderStyle"] || [key isEqualToString:@"dashPattern"] || [key isEqualToString:@"startLineStyle"] || [key isEqualToString:@"endLineStyle"])) {
+ updatingLine = YES;
+ [[SKLineInspector sharedLineInspector] setAnnotationStyle:annotation];
+ updatingLine = NO;
+ }
}
}
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2007-06-20 12:22:24 UTC (rev 2359)
+++ trunk/Skim.xcodeproj/project.pbxproj 2007-06-20 22:06:58 UTC (rev 2360)
@@ -153,6 +153,8 @@
CE7C20500C259A5D0059E08C /* NSColor_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE7C204E0C259A5D0059E08C /* NSColor_SKExtensions.m */; };
CE7C5D050BD8062C0011315D /* LineNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7C5D040BD8062C0011315D /* LineNoteAdorn.tiff */; };
CE7C5D190BD8086C0011315D /* ToolbarLineNote.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE7C5D180BD8086C0011315D /* ToolbarLineNote.tiff */; };
+ CE8B46E90C29CA00005CE7F1 /* SKLineInspector.m in Sources */ = {isa = PBXBuildFile; fileRef = CE8B46E70C29CA00005CE7F1 /* SKLineInspector.m */; };
+ CE8B46F00C29CA3D005CE7F1 /* LineInspector.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE8B46EA0C29CA3D005CE7F1 /* LineInspector.nib */; };
CE9A87930C0C9E9A004F1F97 /* ProgressSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE9A878D0C0C9E9A004F1F97 /* ProgressSheet.nib */; };
CE9C423C0B8B5633004AD8CF /* PreferenceWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE9C42360B8B5633004AD8CF /* PreferenceWindow.nib */; };
CE9DC2E90B9F131900D64F28 /* HighlightNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE9DC2E70B9F131800D64F28 /* HighlightNoteAdorn.tiff */; };
@@ -502,6 +504,11 @@
CE7C5D040BD8062C0011315D /* LineNoteAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = LineNoteAdorn.tiff; path = Images/LineNoteAdorn.tiff; sourceTree = "<group>"; };
CE7C5D180BD8086C0011315D /* ToolbarLineNote.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarLineNote.tiff; path = Images/ToolbarLineNote.tiff; sourceTree = "<group>"; };
CE87EF690BA9FF5A0027BBDD /* skimhelp.css */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 30; name = skimhelp.css; path = "English.lproj/Skim Help/sty/skimhelp.css"; sourceTree = "<group>"; };
+ CE8B46E60C29CA00005CE7F1 /* SKLineInspector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SKLineInspector.h; sourceTree = "<group>"; };
+ CE8B46E70C29CA00005CE7F1 /* SKLineInspector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SKLineInspector.m; sourceTree = "<group>"; };
+ CE8B46EB0C29CA3D005CE7F1 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/LineInspector.nib; sourceTree = "<group>"; };
+ CE8B46F30C29CA4A005CE7F1 /* Dutch */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Dutch; path = Dutch.lproj/LineInspector.nib; sourceTree = "<group>"; };
+ CE8B46F40C29CA50005CE7F1 /* Italian */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Italian; path = Italian.lproj/LineInspector.nib; sourceTree = "<group>"; };
CE9A878E0C0C9E9A004F1F97 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ProgressSheet.nib; sourceTree = "<group>"; };
CE9A87960C0C9EA3004F1F97 /* Dutch */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Dutch; path = Dutch.lproj/ProgressSheet.nib; sourceTree = "<group>"; };
CE9A87970C0C9EA7004F1F97 /* Italian */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Italian; path = Italian.lproj/ProgressSheet.nib; sourceTree = "<group>"; };
@@ -656,6 +663,7 @@
2A37F4B8FDCFA73011CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
+ CE8B46EA0C29CA3D005CE7F1 /* LineInspector.nib */,
CE5475A00B33058B00F8AFB6 /* Images */,
CE4DA9190B9E190D0039E89C /* Skim Help */,
CE54898A0B35D4EF00F8AFB6 /* InfoWindow.nib */,
@@ -790,6 +798,8 @@
4530D7E70B27AAB9007C59F4 /* SKSnapshotWindowController.m */,
CE546FC20B32D5DB00F8AFB6 /* SKNoteWindowController.h */,
CE546FC30B32D5DB00F8AFB6 /* SKNoteWindowController.m */,
+ CE8B46E60C29CA00005CE7F1 /* SKLineInspector.h */,
+ CE8B46E70C29CA00005CE7F1 /* SKLineInspector.m */,
CE4A659D0BAB1598004AD07D /* SKBookmarkController.h */,
CE4A659E0BAB1598004AD07D /* SKBookmarkController.m */,
CE54898D0B35D50E00F8AFB6 /* SKInfoWindowController.h */,
@@ -1174,6 +1184,7 @@
CE48BBB70C08AD7000A166C6 /* notesTemplate.rtf in Resources */,
CE9A87930C0C9E9A004F1F97 /* ProgressSheet.nib in Resources */,
CE327A460C11BF6700DB4BEB /* NoteTypeSheet.nib in Resources */,
+ CE8B46F00C29CA3D005CE7F1 /* LineInspector.nib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1341,6 +1352,7 @@
F9F220890C14BDFF00041284 /* UKFileWatcher.m in Sources */,
F9F2208B0C14BDFF00041284 /* UKKQueue.m in Sources */,
CE7C20500C259A5D0059E08C /* NSColor_SKExtensions.m in Sources */,
+ CE8B46E90C29CA00005CE7F1 /* SKLineInspector.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1514,6 +1526,16 @@
name = ZoomValues.strings;
sourceTree = "<group>";
};
+ CE8B46EA0C29CA3D005CE7F1 /* LineInspector.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ CE8B46EB0C29CA3D005CE7F1 /* English */,
+ CE8B46F30C29CA4A005CE7F1 /* Dutch */,
+ CE8B46F40C29CA50005CE7F1 /* Italian */,
+ );
+ name = LineInspector.nib;
+ sourceTree = "<group>";
+ };
CE9A878D0C0C9E9A004F1F97 /* ProgressSheet.nib */ = {
isa = PBXVariantGroup;
children = (
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-20 12:22:46
|
Revision: 2359
http://skim-app.svn.sourceforge.net/skim-app/?rev=2359&view=rev
Author: hofman
Date: 2007-06-20 05:22:24 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Change keyboard shortcuts.
Modified Paths:
--------------
trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
trunk/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/Italian.lproj/MainMenu.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-20 11:57:58
|
Revision: 2358
http://skim-app.svn.sourceforge.net/skim-app/?rev=2358&view=rev
Author: hofman
Date: 2007-06-20 04:57:57 -0700 (Wed, 20 Jun 2007)
Log Message:
-----------
Use small control size for color panel accesssory view to be consistent with the panel itself.
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-20 11:50:54 UTC (rev 2357)
+++ trunk/SKMainWindowController.m 2007-06-20 11:57:57 UTC (rev 2358)
@@ -463,6 +463,7 @@
colorAccessoryView = [[NSButton alloc] init];
[colorAccessoryView setButtonType:NSSwitchButton];
[colorAccessoryView setTitle:NSLocalizedString(@"Fill color", @"Button title")];
+ [[colorAccessoryView cell] setControlSize:NSSmallControlSize];
[colorAccessoryView setTarget:self];
[colorAccessoryView setAction:@selector(changeColorFill:)];
[colorAccessoryView sizeToFit];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
