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-07-01 19:00:25
|
Revision: 2407
http://skim-app.svn.sourceforge.net/skim-app/?rev=2407&view=rev
Author: hofman
Date: 2007-07-01 12:00:13 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
Add file extension if needed when saving from AppleScript.
Modified Paths:
--------------
trunk/SKDocument.m
Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m 2007-07-01 18:14:29 UTC (rev 2406)
+++ trunk/SKDocument.m 2007-07-01 19:00:13 UTC (rev 2407)
@@ -1013,22 +1013,35 @@
[command setArguments:arguments];
[arguments release];
}
- 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."];
+ if (fileURL) {
+ if ([fileURL isKindOfClass:[NSURL class]] == NO) {
+ [command setScriptErrorNumber:NSArgumentsWrongScriptError];
+ [command setScriptErrorString:@"The file is not a file or alias."];
+ } else {
+ NSArray *fileExtensions = [[NSDocumentController sharedDocumentController] fileExtensionsFromType:fileType ? fileType : NSPDFPboardType];
+ NSString *extension = [[fileURL path] pathExtension];
+ if (extension == nil) {
+ extension = [fileExtensions objectAtIndex:0];
+ fileURL = [NSURL fileURLWithPath:[[fileURL path] stringByAppendingPathExtension:extension]];
+ }
+ if ([fileExtensions containsObject:[extension lowercaseString]] == NO) {
+ [command setScriptErrorNumber:NSArgumentsWrongScriptError];
+ [command setScriptErrorString:[NSString stringWithFormat:@"Invalid file extension for this file type."];
+ } else if (fileType) {
+ if ([self saveToURL:fileURL ofType:fileType forSaveOperation:NSSaveToOperation error:NULL] == NO) {
+ [command setScriptErrorNumber:NSInternalScriptError];
+ [command setScriptErrorString:@"Unable to export."];
+ }
+ } 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) {
+ } else if (fileType) {
[command setScriptErrorNumber:NSArgumentsWrongScriptError];
- [command setScriptErrorString:@"The file is not a file or alias."];
- } else if ([fileType isKindOfClass:[NSString class]] == NO) {
- [command setScriptErrorNumber:NSArgumentsWrongScriptError];
- [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:@"Unable to export."];
+ [command setScriptErrorString:@"Missing file argument."];
+ } else {
+ return [super handleSaveScriptCommand:command];
}
return nil;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-07-01 18:14:30
|
Revision: 2406
http://skim-app.svn.sourceforge.net/skim-app/?rev=2406&view=rev
Author: hofman
Date: 2007-07-01 11:14:29 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
Fix note type for text note when dragging line styles.
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-07-01 18:07:20 UTC (rev 2405)
+++ trunk/SKPDFView.m 2007-07-01 18:14:29 UTC (rev 2406)
@@ -1227,7 +1227,7 @@
annotation = [annotations objectAtIndex:i];
NSString *type = [annotation type];
if ([annotation isNoteAnnotation] && [annotation hitTest:location] &&
- ([pboardType isEqualToString:NSColorPboardType] || [type isEqualToString:@"Text"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"])) {
+ ([pboardType isEqualToString:NSColorPboardType] || [type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"])) {
if ([annotation isEqual:highlightAnnotation] == NO) {
if (highlightAnnotation)
[self setNeedsDisplayForAnnotation:highlightAnnotation];
@@ -1272,7 +1272,7 @@
if ([pboardType isEqualToString:NSColorPboardType]) {
[highlightAnnotation setColor:[NSColor colorFromPasteboard:pboard]];
performedDrag = YES;
- } else if ([type isEqualToString:@"Text"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"]) {
+ } else if ([type isEqualToString:@"FreeText"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"]) {
NSDictionary *dict = [pboard propertyListForType:SKLineStylePboardType];
NSNumber *number;
if (number = [dict objectForKey:@"lineWidth"])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-07-01 18:07:25
|
Revision: 2405
http://skim-app.svn.sourceforge.net/skim-app/?rev=2405&view=rev
Author: hofman
Date: 2007-07-01 11:07:20 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
Update value when binding.
Modified Paths:
--------------
trunk/SKLineWell.m
Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m 2007-07-01 09:15:49 UTC (rev 2404)
+++ trunk/SKLineWell.m 2007-07-01 18:07:20 UTC (rev 2405)
@@ -485,8 +485,10 @@
}
- (void)updateValue:(id)value forKey:(NSString *)key {
- if (updatingFromBinding == NO)
- [[bindingInfo objectForKey:NSObservedObjectKey] setValue:value forKeyPath:[bindingInfo objectForKey:NSObservedKeyPathKey]];
+ if (updatingFromBinding == NO) {
+ NSDictionary *info = [self infoForBinding:key];
+ [[info objectForKey:NSObservedObjectKey] setValue:value forKeyPath:[info objectForKey:NSObservedKeyPathKey]];
+ }
if ([self isActive] && updatingFromLineInspector == NO)
[[SKLineInspector sharedLineInspector] setValue:value forKey:key];
[self setNeedsDisplay:YES];
@@ -681,7 +683,9 @@
NSDictionary *bindingsData = [NSDictionary dictionaryWithObjectsAndKeys:observableController, NSObservedObjectKey, [[keyPath copy] autorelease], NSObservedKeyPathKey, [[options copy] autorelease], NSOptionsKey, nil];
[bindingInfo setObject:bindingsData forKey:bindingName];
- [observableController addObserver:self forKeyPath:keyPath options:nil context:[observationContexts objectForKey:bindingName]];
+ void *context = (void *)[observationContexts objectForKey:bindingName];
+ [observableController addObserver:self forKeyPath:keyPath options:nil context:context];
+ [self observeValueForKeyPath:keyPath ofObject:observableController change:nil context:context];
} else {
[super bind:bindingName toObject:observableController withKeyPath:keyPath options:options];
}
@@ -692,7 +696,8 @@
if ([bindingName isEqualToString:@"lineWidth"] || [bindingName isEqualToString:@"style"] || [bindingName isEqualToString:@"dashPattern"] ||
[bindingName isEqualToString:@"startLineStyle"] || [bindingName isEqualToString:@"endLineStyle"]) {
- [[bindingInfo objectForKey:NSObservedObjectKey] removeObserver:self forKeyPath:[bindingInfo objectForKey:NSObservedKeyPathKey]];
+ NSDictionary *info = [self infoForBinding:bindingName];
+ [[info objectForKey:NSObservedObjectKey] removeObserver:self forKeyPath:[info objectForKey:NSObservedKeyPathKey]];
[bindingInfo removeObjectForKey:bindingName];
} else {
[super unbind:bindingName];
@@ -715,7 +720,8 @@
key = @"endLineStyle";
if (key) {
- id value = [[bindingInfo objectForKey:NSObservedObjectKey] valueForKeyPath:[bindingInfo objectForKey:NSObservedKeyPathKey]];
+ NSDictionary *info = [self infoForBinding:key];
+ id value = [[info objectForKey:NSObservedObjectKey] valueForKeyPath:[info objectForKey:NSObservedKeyPathKey]];
if (NSIsControllerMarker(value) == NO) {
updatingFromBinding = YES;
[self setValue:value forKey:key];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-07-01 09:15:50
|
Revision: 2404
http://skim-app.svn.sourceforge.net/skim-app/?rev=2404&view=rev
Author: hofman
Date: 2007-07-01 02:15:49 -0700 (Sun, 01 Jul 2007)
Log Message:
-----------
Don't rely on undocumented default binding behavior.
Modified Paths:
--------------
trunk/SKLineWell.h
trunk/SKLineWell.m
Modified: trunk/SKLineWell.h
===================================================================
--- trunk/SKLineWell.h 2007-06-30 21:16:11 UTC (rev 2403)
+++ trunk/SKLineWell.h 2007-07-01 09:15:49 UTC (rev 2404)
@@ -56,6 +56,8 @@
id target;
SEL action;
+ NSMutableDictionary *bindingInfo;
+
BOOL updatingFromLineInspector;
BOOL updatingFromBinding;
}
Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m 2007-06-30 21:16:11 UTC (rev 2403)
+++ trunk/SKLineWell.m 2007-07-01 09:15:49 UTC (rev 2404)
@@ -80,6 +80,8 @@
target = nil;
action = NULL;
+ bindingInfo = [[NSMutableDictionary alloc] init];
+
existsActiveLineWell = NO;
updatingFromLineInspector = NO;
@@ -114,6 +116,8 @@
target = [decoder decodeObject];
}
+ bindingInfo = [[NSMutableDictionary alloc] init];
+
existsActiveLineWell = NO;
updatingFromLineInspector = NO;
@@ -155,6 +159,7 @@
[self unbind:@"dashPattern"];
[self unbind:@"startLineStyle"];
[self unbind:@"endLineStyle"];
+ [bindingInfo release];
if (active)
[self deactivate];
[dashPattern release];
@@ -480,10 +485,8 @@
}
- (void)updateValue:(id)value forKey:(NSString *)key {
- if (updatingFromBinding == NO) {
- NSDictionary *bindingInfo = [self infoForBinding:key];
+ if (updatingFromBinding == NO)
[[bindingInfo objectForKey:NSObservedObjectKey] setValue:value forKeyPath:[bindingInfo objectForKey:NSObservedKeyPathKey]];
- }
if ([self isActive] && updatingFromLineInspector == NO)
[[SKLineInspector sharedLineInspector] setValue:value forKey:key];
[self setNeedsDisplay:YES];
@@ -671,19 +674,29 @@
- (void)bind:(NSString *)bindingName toObject:(id)observableController withKeyPath:(NSString *)keyPath options:(NSDictionary *)options {
if ([bindingName isEqualToString:@"lineWidth"] || [bindingName isEqualToString:@"style"] || [bindingName isEqualToString:@"dashPattern"] ||
[bindingName isEqualToString:@"startLineStyle"] || [bindingName isEqualToString:@"endLineStyle"]) {
+
+ if ([bindingInfo objectForKey:bindingName])
+ [self unbind:bindingName];
+
+ NSDictionary *bindingsData = [NSDictionary dictionaryWithObjectsAndKeys:observableController, NSObservedObjectKey, [[keyPath copy] autorelease], NSObservedKeyPathKey, [[options copy] autorelease], NSOptionsKey, nil];
+ [bindingInfo setObject:bindingsData forKey:bindingName];
+
[observableController addObserver:self forKeyPath:keyPath options:nil context:[observationContexts objectForKey:bindingName]];
+ } else {
+ [super bind:bindingName toObject:observableController withKeyPath:keyPath options:options];
}
- [super bind:bindingName toObject:observableController withKeyPath:keyPath options:options];
[self setNeedsDisplay:YES];
}
- (void)unbind:(NSString *)bindingName {
if ([bindingName isEqualToString:@"lineWidth"] || [bindingName isEqualToString:@"style"] || [bindingName isEqualToString:@"dashPattern"] ||
[bindingName isEqualToString:@"startLineStyle"] || [bindingName isEqualToString:@"endLineStyle"]) {
- NSDictionary *bindingInfo = [self infoForBinding:bindingName];
+
[[bindingInfo objectForKey:NSObservedObjectKey] removeObserver:self forKeyPath:[bindingInfo objectForKey:NSObservedKeyPathKey]];
+ [bindingInfo removeObjectForKey:bindingName];
+ } else {
+ [super unbind:bindingName];
}
- [super unbind:bindingName];
[self setNeedsDisplay:YES];
}
@@ -702,7 +715,6 @@
key = @"endLineStyle";
if (key) {
- NSDictionary *bindingInfo = [self infoForBinding:key];
id value = [[bindingInfo objectForKey:NSObservedObjectKey] valueForKeyPath:[bindingInfo objectForKey:NSObservedKeyPathKey]];
if (NSIsControllerMarker(value) == NO) {
updatingFromBinding = YES;
@@ -712,9 +724,15 @@
} else {
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
}
-
- [self setNeedsDisplay:YES];
}
+
+- (NSDictionary *)infoForBinding:(NSString *)bindingName {
+ NSDictionary *info = [bindingInfo objectForKey:bindingName];
+ if (info == nil)
+ info = [super infoForBinding:bindingName];
+ return info;
+}
+
#pragma mark NSDraggingDestination protocol
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-30 21:16:14
|
Revision: 2403
http://skim-app.svn.sourceforge.net/skim-app/?rev=2403&view=rev
Author: hofman
Date: 2007-06-30 14:16:11 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Simplification of binding for SKLineWell. Use built-in infoForBinding instead of keeping our own copies of the binding info.
Modified Paths:
--------------
trunk/SKLineWell.h
trunk/SKLineWell.m
Modified: trunk/SKLineWell.h
===================================================================
--- trunk/SKLineWell.h 2007-06-30 19:13:17 UTC (rev 2402)
+++ trunk/SKLineWell.h 2007-06-30 21:16:11 UTC (rev 2403)
@@ -58,9 +58,6 @@
BOOL updatingFromLineInspector;
BOOL updatingFromBinding;
-
- NSMutableDictionary *observedObjects;
- NSMutableDictionary *observedKeyPaths;
}
- (void)activate:(BOOL)exclusive;
Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m 2007-06-30 19:13:17 UTC (rev 2402)
+++ trunk/SKLineWell.m 2007-06-30 21:16:11 UTC (rev 2403)
@@ -85,9 +85,6 @@
updatingFromLineInspector = NO;
updatingFromBinding = NO;
- observedObjects = [[NSMutableDictionary alloc] init];
- observedKeyPaths = [[NSMutableDictionary alloc] init];
-
[self registerForDraggedTypes:[NSArray arrayWithObjects:SKLineStylePboardType, nil]];
}
return self;
@@ -122,9 +119,6 @@
updatingFromLineInspector = NO;
updatingFromBinding = NO;
- observedObjects = [[NSMutableDictionary alloc] init];
- observedKeyPaths = [[NSMutableDictionary alloc] init];
-
[self registerForDraggedTypes:[NSArray arrayWithObjects:SKLineStylePboardType, nil]];
}
return self;
@@ -161,8 +155,6 @@
[self unbind:@"dashPattern"];
[self unbind:@"startLineStyle"];
[self unbind:@"endLineStyle"];
- [observedObjects release];
- [observedKeyPaths release];
if (active)
[self deactivate];
[dashPattern release];
@@ -488,8 +480,10 @@
}
- (void)updateValue:(id)value forKey:(NSString *)key {
- if (updatingFromBinding == NO)
- [[observedObjects objectForKey:key] setValue:value forKeyPath:[observedKeyPaths objectForKey:key]];
+ if (updatingFromBinding == NO) {
+ NSDictionary *bindingInfo = [self infoForBinding:key];
+ [[bindingInfo objectForKey:NSObservedObjectKey] setValue:value forKeyPath:[bindingInfo objectForKey:NSObservedKeyPathKey]];
+ }
if ([self isActive] && updatingFromLineInspector == NO)
[[SKLineInspector sharedLineInspector] setValue:value forKey:key];
[self setNeedsDisplay:YES];
@@ -675,15 +669,10 @@
#pragma mark Binding support
- (void)bind:(NSString *)bindingName toObject:(id)observableController withKeyPath:(NSString *)keyPath options:(NSDictionary *)options {
- if (observableController && bindingName) {
- if ([bindingName isEqualToString:@"lineWidth"] || [bindingName isEqualToString:@"style"] || [bindingName isEqualToString:@"dashPattern"] ||
- [bindingName isEqualToString:@"startLineStyle"] || [bindingName isEqualToString:@"endLineStyle"]) {
-
- [observableController addObserver:self forKeyPath:keyPath options:nil context:[observationContexts objectForKey:bindingName]];
- [observedObjects setObject:observableController forKey:bindingName];
- [observedKeyPaths setObject:keyPath forKey:bindingName];
- }
- }
+ if ([bindingName isEqualToString:@"lineWidth"] || [bindingName isEqualToString:@"style"] || [bindingName isEqualToString:@"dashPattern"] ||
+ [bindingName isEqualToString:@"startLineStyle"] || [bindingName isEqualToString:@"endLineStyle"]) {
+ [observableController addObserver:self forKeyPath:keyPath options:nil context:[observationContexts objectForKey:bindingName]];
+ }
[super bind:bindingName toObject:observableController withKeyPath:keyPath options:options];
[self setNeedsDisplay:YES];
}
@@ -691,10 +680,8 @@
- (void)unbind:(NSString *)bindingName {
if ([bindingName isEqualToString:@"lineWidth"] || [bindingName isEqualToString:@"style"] || [bindingName isEqualToString:@"dashPattern"] ||
[bindingName isEqualToString:@"startLineStyle"] || [bindingName isEqualToString:@"endLineStyle"]) {
-
- [[observedObjects objectForKey:bindingName] removeObserver:self forKeyPath:[observedKeyPaths objectForKey:bindingName]];
- [observedObjects removeObjectForKey:bindingName];
- [observedKeyPaths removeObjectForKey:bindingName];
+ NSDictionary *bindingInfo = [self infoForBinding:bindingName];
+ [[bindingInfo objectForKey:NSObservedObjectKey] removeObserver:self forKeyPath:[bindingInfo objectForKey:NSObservedKeyPathKey]];
}
[super unbind:bindingName];
[self setNeedsDisplay:YES];
@@ -713,9 +700,10 @@
key = @"startLineStyle";
else if (context == [observationContexts objectForKey:@"endLineStyle"])
key = @"endLineStyle";
-
- if (key) {
- id value = [[observedObjects objectForKey:key] valueForKeyPath:[observedKeyPaths valueForKey:key]];
+
+ if (key) {
+ NSDictionary *bindingInfo = [self infoForBinding:key];
+ id value = [[bindingInfo objectForKey:NSObservedObjectKey] valueForKeyPath:[bindingInfo objectForKey:NSObservedKeyPathKey]];
if (NSIsControllerMarker(value) == NO) {
updatingFromBinding = YES;
[self setValue:value forKey:key];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-30 19:13:19
|
Revision: 2402
http://skim-app.svn.sourceforge.net/skim-app/?rev=2402&view=rev
Author: hofman
Date: 2007-06-30 12:13:17 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Ensure integral bounds for new notes.
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-30 18:34:45 UTC (rev 2401)
+++ trunk/SKPDFView.m 2007-06-30 19:13:17 UTC (rev 2402)
@@ -648,6 +648,8 @@
// Convert to "page space".
center = [self convertPoint: center toPage: page];
+ center.x = roundf(center.x);
+ center.y = roundf(center.y);
NSSize defaultSize = isAlternate ? NSMakeSize(16.0, 16.0) : ([page rotation] % 180 == 90) ? NSMakeSize(64.0, 128.0) : NSMakeSize(128.0, 64.0);
NSRect bounds = NSMakeRect(center.x - 0.5 * defaultSize.width, center.y - 0.5 * defaultSize.height, defaultSize.width, defaultSize.height);
@@ -1372,6 +1374,8 @@
// Convert to "page space".
center = [self convertPoint: center toPage: page];
+ center.x = roundf(center.x);
+ center.y = roundf(center.y);
if ([page rotation] % 180 == 90)
defaultSize = NSMakeSize(defaultSize.height, defaultSize.width);
bounds = NSMakeRect(center.x - 0.5 * defaultSize.width, center.y - 0.5 * defaultSize.height, defaultSize.width, defaultSize.height);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-30 18:34:46
|
Revision: 2401
http://skim-app.svn.sourceforge.net/skim-app/?rev=2401&view=rev
Author: hofman
Date: 2007-06-30 11:34:45 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Fix layout of pref window.
Modified Paths:
--------------
trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/Italian.lproj/PreferenceWindow.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-06-30 14:15:36 UTC (rev 2400)
+++ trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-06-30 18:34:45 UTC (rev 2401)
@@ -8,6 +8,10 @@
<string>446.1</string>
<key>IBLockedObjects</key>
<array/>
+ <key>IBOpenObjects</key>
+ <array>
+ <integer>5</integer>
+ </array>
<key>IBSystem Version</key>
<string>8R218</string>
</dict>
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/PreferenceWindow.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-30 14:15:39
|
Revision: 2400
http://skim-app.svn.sourceforge.net/skim-app/?rev=2400&view=rev
Author: hofman
Date: 2007-06-30 07:15:36 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Set dash pattern before border style, as setting the former can change the latter in PDFBorder.
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-30 13:04:23 UTC (rev 2399)
+++ trunk/SKPDFView.m 2007-06-30 14:15:36 UTC (rev 2400)
@@ -1275,9 +1275,9 @@
NSNumber *number;
if (number = [dict objectForKey:@"lineWidth"])
[highlightAnnotation setLineWidth:[number floatValue]];
+ [highlightAnnotation setDashPattern:[dict objectForKey:@"dashPattern"]];
if (number = [dict objectForKey:@"style"])
[highlightAnnotation setBorderStyle:[number intValue]];
- [highlightAnnotation setDashPattern:[dict objectForKey:@"dashPattern"]];
if ([type isEqualToString:@"Line"]) {
if (number = [dict objectForKey:@"startLineStyle"])
[(SKPDFAnnotationLine *)highlightAnnotation setStartLineStyle:[number intValue]];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-30 13:04:24
|
Revision: 2399
http://skim-app.svn.sourceforge.net/skim-app/?rev=2399&view=rev
Author: hofman
Date: 2007-06-30 06:04:23 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Disable line wells when pref window looses main status.
Modified Paths:
--------------
trunk/SKPreferenceController.m
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2007-06-30 13:03:47 UTC (rev 2398)
+++ trunk/SKPreferenceController.m 2007-06-30 13:04:23 UTC (rev 2399)
@@ -50,15 +50,12 @@
@interface NSView (SKExtensions)
-- (void)deactivateColorWells;
+- (void)deactivateColorAndLineWells;
@end
@implementation NSView (SKExtensions)
-- (void)deactivateColorWells {
- NSEnumerator *viewEnum = [[self subviews] objectEnumerator];
- NSView *view;
- while (view = [viewEnum nextObject])
- [view deactivateColorWells];
+- (void)deactivateColorAndLineWells {
+ [[self subviews] makeObjectsPerformSelector:_cmd];
}
@end
@@ -66,12 +63,19 @@
@end
@implementation NSColorWell (SKExtensions)
-- (void)deactivateColorWells {
+- (void)deactivateColorAndLineWells {
[self deactivate];
- [super deactivateColorWells];
+ [super deactivateColorAndLineWells];
}
@end
+@implementation SKLineWell (SKExtensions)
+- (void)deactivateColorAndLineWells {
+ [self deactivate];
+ [super deactivateColorAndLineWells];
+}
+@end
+
#pragma mark -
@implementation SKPreferenceController
@@ -173,7 +177,7 @@
}
- (void)windowDidResignMain:(NSNotification *)notification {
- [[[self window] contentView] deactivateColorWells];
+ [[[self window] contentView] deactivateColorAndLineWells];
}
- (NSArray *)fonts {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-30 13:03:48
|
Revision: 2398
http://skim-app.svn.sourceforge.net/skim-app/?rev=2398&view=rev
Author: hofman
Date: 2007-06-30 06:03:47 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Remove unnecessary argument.
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-30 11:40:30 UTC (rev 2397)
+++ trunk/SKMainWindowController.m 2007-06-30 13:03:47 UTC (rev 2398)
@@ -577,7 +577,7 @@
[[self mutableArrayValueForKey:@"thumbnails"] removeAllObjects];
NSArray *snapshotDicts = [snapshots valueForKey:@"currentSetup"];
- [snapshots makeObjectsPerformSelector:@selector(close) withObject:nil];
+ [snapshots makeObjectsPerformSelector:@selector(close)];
[[self mutableArrayValueForKey:@"snapshots"] removeAllObjects];
[lastViewedPages removeAllObjects];
@@ -2554,7 +2554,7 @@
if (displayChanged)
[self updateThumbnailAtPageIndex:index];
} else {
- [snapshots makeObjectsPerformSelector:@selector(redisplay) withObject:nil];
+ [snapshots makeObjectsPerformSelector:@selector(redisplay)];
[self allSnapshotsNeedUpdate];
if (displayChanged)
[self allThumbnailsNeedUpdate];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-30 11:40:31
|
Revision: 2397
http://skim-app.svn.sourceforge.net/skim-app/?rev=2397&view=rev
Author: hofman
Date: 2007-06-30 04:40:30 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Use combo box for choose page sheet. Cache page labels, for choices in the combo box and to look up the index from the label.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/info.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-06-30 10:20:10 UTC (rev 2396)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-06-30 11:40:30 UTC (rev 2397)
@@ -27,8 +27,9 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>539</integer>
+ <integer>208</integer>
<integer>168</integer>
- <integer>539</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-06-30 10:20:10 UTC (rev 2396)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-06-30 11:40:30 UTC (rev 2397)
@@ -27,17 +27,17 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>5</integer>
+ <integer>256</integer>
+ <integer>539</integer>
+ <integer>511</integer>
+ <integer>553</integer>
<integer>208</integer>
+ <integer>224</integer>
+ <integer>168</integer>
<integer>585</integer>
- <integer>553</integer>
<integer>314</integer>
- <integer>539</integer>
- <integer>5</integer>
- <integer>511</integer>
- <integer>224</integer>
<integer>502</integer>
- <integer>168</integer>
- <integer>256</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-06-30 10:20:10 UTC (rev 2396)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-06-30 11:40:30 UTC (rev 2397)
@@ -27,10 +27,10 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>553</integer>
+ <integer>168</integer>
<integer>511</integer>
- <integer>168</integer>
<integer>539</integer>
+ <integer>553</integer>
<integer>208</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2007-06-30 10:20:10 UTC (rev 2396)
+++ trunk/SKMainWindowController.h 2007-06-30 11:40:30 UTC (rev 2397)
@@ -163,6 +163,8 @@
BOOL updatingFont;
BOOL updatingLine;
+ NSMutableArray *pageLabels;
+
NSMutableArray *lastViewedPages;
NSTimer *activityTimer;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-30 10:20:10 UTC (rev 2396)
+++ trunk/SKMainWindowController.m 2007-06-30 11:40:30 UTC (rev 2397)
@@ -129,6 +129,7 @@
notes = [[NSMutableArray alloc] init];
snapshots = [[NSMutableArray alloc] init];
dirtySnapshots = [[NSMutableArray alloc] init];
+ pageLabels = [[NSMutableArray alloc] init];
lastViewedPages = [[NSMutableArray alloc] init];
// @@ remove or set to nil for Leopard?
pdfOutlineItems = [[NSMutableArray alloc] init];
@@ -156,6 +157,7 @@
[thumbnails release];
[notes release];
[snapshots release];
+ [pageLabels release];
[lastViewedPages release];
[leftSideWindow release];
[rightSideWindow release];
@@ -607,6 +609,15 @@
[self resetThumbnails];
[self updateThumbnailSelection];
+ [self willChangeValueForKey:@"pageLabels"];
+ [pageLabels removeAllObjects];
+ int i, count = [document pageCount];
+ for (i = 0; i < count; i++) {
+ NSString *label = [[document pageAtIndex:i] label];
+ [pageLabels addObject:label ? label : @""];
+ }
+ [self didChangeValueForKey:@"pageLabels"];
+
NSEnumerator *setupEnum = [snapshotDicts objectEnumerator];
NSDictionary *setup;
while (setup = [setupEnum nextObject])
@@ -692,23 +703,14 @@
}
- (void)setPageLabel:(NSString *)label {
- PDFDocument *pdfDoc = [pdfView document];
- int i, count = [pdfDoc pageCount];
- for (i = 0; i < count; i++) {
- if ([[[pdfDoc pageAtIndex:i] label] isEqualToString:label]) {
- [pdfView goToPage:[pdfDoc pageAtIndex:i]];
- break;
- }
- }
+ unsigned int index = [pageLabels indexOfObject:label];
+ if (index != NSNotFound)
+ [pdfView goToPage:[[pdfView document] pageAtIndex:index]];
}
- (BOOL)validatePageLabel:(id *)value error:(NSError **)error {
- PDFDocument *pdfDoc = [pdfView document];
- int i, count = [pdfDoc pageCount];
- for (i = 0; i < count; i++)
- if ([[[pdfDoc pageAtIndex:i] label] isEqualToString:*value])
- return YES;
- *value = [self pageLabel];
+ if ([pageLabels indexOfObject:*value] == NSNotFound)
+ *value = [self pageLabel];
return YES;
}
@@ -1039,7 +1041,7 @@
}
- (IBAction)doGoToPage:(id)sender {
- [choosePageField setStringValue:@""];
+ [choosePageField setStringValue:[self pageLabel]];
[NSApp beginSheet: choosePageSheet
modalForWindow: [self window]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-30 10:20:16
|
Revision: 2396
http://skim-app.svn.sourceforge.net/skim-app/?rev=2396&view=rev
Author: hofman
Date: 2007-06-30 03:20:10 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Update Italian localized strings.
Modified Paths:
--------------
trunk/Italian.lproj/Localizable.strings
Modified: trunk/Italian.lproj/Localizable.strings
===================================================================
(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-30 10:08:25
|
Revision: 2395
http://skim-app.svn.sourceforge.net/skim-app/?rev=2395&view=rev
Author: hofman
Date: 2007-06-30 03:08:20 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Add hidden default for timout of apple remote switch indication.
Modified Paths:
--------------
trunk/InitialUserDefaults.plist
trunk/SKApplicationController.h
trunk/SKApplicationController.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2007-06-30 09:33:15 UTC (rev 2394)
+++ trunk/InitialUserDefaults.plist 2007-06-30 10:08:20 UTC (rev 2395)
@@ -177,6 +177,8 @@
<true/>
<key>SKEnableAppleRemote</key>
<true/>
+ <key>SKAppleRemoteSwitchIndicationTimeout</key>
+ <real>2.0</real>
<key>SKReadMissingNotesFromSkimFileOption</key>
<integer>-1</integer>
<key>SKBlankAllScreensInFullScreen</key>
Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h 2007-06-30 09:33:15 UTC (rev 2394)
+++ trunk/SKApplicationController.h 2007-06-30 10:08:20 UTC (rev 2395)
@@ -90,7 +90,8 @@
@interface SKSplashWindow : NSWindow
- (id)initWithType:(int)splashType atPoint:(NSPoint)point screen:(NSScreen *)screen;
-- (void)show;
+- (void)showWithTimeout:(NSTimeInterval)timeout;
+- (void)fadeOut:(id)sender;
@end
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-06-30 09:33:15 UTC (rev 2394)
+++ trunk/SKApplicationController.m 2007-06-30 10:08:20 UTC (rev 2395)
@@ -275,14 +275,15 @@
[controller togglePresentation:nil];
break;
case kRemoteButtonMenu:
- {
remoteScrolling = !remoteScrolling;
-
- NSWindow *window = [controller window];
- NSRect rect = [window frame];
- [[[[SKSplashWindow alloc] initWithType:remoteScrolling ? SKSplashTypeScroll : SKSplashTypeResize atPoint:NSMakePoint(NSMidX(rect), NSMidY(rect)) screen:[window screen]] autorelease] show];
+ float timeout = [[NSUserDefaults standardUserDefaults] floatForKey:SKAppleRemoteSwitchIndicationTimeoutKey];
+ if (timeout > 0.0) {
+ NSWindow *window = [controller window];
+ NSRect rect = [window frame];
+ SKSplashWindow *splashWindow = [[[SKSplashWindow alloc] initWithType:remoteScrolling ? SKSplashTypeScroll : SKSplashTypeResize atPoint:NSMakePoint(NSMidX(rect), NSMidY(rect)) screen:[window screen]] autorelease];
+ [splashWindow showWithTimeout:timeout];
+ }
break;
- }
default:
break;
}
@@ -559,7 +560,7 @@
- (void)animationDidStop:(NSAnimation *)animation { [self close]; }
-- (void)fadeOut:(NSTimer *)timer {
+- (void)fadeOut:(id)sender {
NSDictionary *fadeOutDict = [[NSDictionary alloc] initWithObjectsAndKeys:self, NSViewAnimationTargetKey, NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey, nil];
NSViewAnimation *animation = [[[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObjects:fadeOutDict, nil]] autorelease];
[fadeOutDict release];
@@ -569,10 +570,10 @@
[animation startAnimation];
}
-- (void)show {
+- (void)showWithTimeout:(NSTimeInterval)timeout {
[self retain]; // isReleasedWhenClosed is true by default
[self orderFrontRegardless];
- [NSTimer scheduledTimerWithTimeInterval:2.0 target:self selector:@selector(fadeOut:) userInfo:nil repeats:NO];
+ [NSTimer scheduledTimerWithTimeInterval:timeout target:self selector:@selector(fadeOut:) userInfo:nil repeats:NO];
}
@end
Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h 2007-06-30 09:33:15 UTC (rev 2394)
+++ trunk/SKStringConstants.h 2007-06-30 10:08:20 UTC (rev 2395)
@@ -92,6 +92,7 @@
extern NSString *SKDefaultPDFDisplaySettingsKey;
extern NSString *SKDefaultFullScreenPDFDisplaySettingsKey;
extern NSString *SKEnableAppleRemoteKey;
+extern NSString *SKAppleRemoteSwitchIndicationTimeoutKey;
extern NSString *SKReadMissingNotesFromSkimFileOptionKey;
extern NSString *SKBlankAllScreensInFullScreenKey;
extern NSString *SKActivateFullScreenNavigationAtBottomKey;
Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m 2007-06-30 09:33:15 UTC (rev 2394)
+++ trunk/SKStringConstants.m 2007-06-30 10:08:20 UTC (rev 2395)
@@ -93,6 +93,7 @@
NSString *SKDefaultPDFDisplaySettingsKey = @"SKDefaultPDFDisplaySettings";
NSString *SKDefaultFullScreenPDFDisplaySettingsKey = @"SKDefaultFullScreenPDFDisplaySettings";
NSString *SKEnableAppleRemoteKey = @"SKEnableAppleRemote";
+NSString *SKAppleRemoteSwitchIndicationTimeoutKey = @"SKAppleRemoteSwitchIndicationTimeout";
NSString *SKReadMissingNotesFromSkimFileOptionKey = @"SKReadMissingNotesFromSkimFileOption";
NSString *SKBlankAllScreensInFullScreenKey = @"SKBlankAllScreensInFullScreen";
NSString *SKActivateFullScreenNavigationAtBottomKey = @"SKActivateFullScreenNavigationAtBottom";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-30 09:33:17
|
Revision: 2394
http://skim-app.svn.sourceforge.net/skim-app/?rev=2394&view=rev
Author: hofman
Date: 2007-06-30 02:33:15 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Validate page label from toolbar text field.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/info.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.m
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-06-29 23:35:57 UTC (rev 2393)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-06-30 09:33:15 UTC (rev 2394)
@@ -27,8 +27,8 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>168</integer>
<integer>539</integer>
- <integer>168</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-06-29 23:35:57 UTC (rev 2393)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-06-30 09:33:15 UTC (rev 2394)
@@ -27,17 +27,17 @@
</array>
<key>IBOpenObjects</key>
<array>
- <integer>224</integer>
<integer>208</integer>
- <integer>5</integer>
- <integer>256</integer>
+ <integer>585</integer>
<integer>553</integer>
+ <integer>314</integer>
<integer>539</integer>
- <integer>168</integer>
+ <integer>5</integer>
<integer>511</integer>
+ <integer>224</integer>
<integer>502</integer>
- <integer>585</integer>
- <integer>314</integer>
+ <integer>168</integer>
+ <integer>256</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-06-29 23:35:57 UTC (rev 2393)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-06-30 09:33:15 UTC (rev 2394)
@@ -27,8 +27,8 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>553</integer>
<integer>511</integer>
- <integer>553</integer>
<integer>168</integer>
<integer>539</integer>
<integer>208</integer>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-29 23:35:57 UTC (rev 2393)
+++ trunk/SKMainWindowController.m 2007-06-30 09:33:15 UTC (rev 2394)
@@ -702,6 +702,16 @@
}
}
+- (BOOL)validatePageLabel:(id *)value error:(NSError **)error {
+ PDFDocument *pdfDoc = [pdfView document];
+ int i, count = [pdfDoc pageCount];
+ for (i = 0; i < count; i++)
+ if ([[[pdfDoc pageAtIndex:i] label] isEqualToString:*value])
+ return YES;
+ *value = [self pageLabel];
+ return YES;
+}
+
- (BOOL)isFullScreen {
return [self window] == fullScreenWindow && isPresentation == NO;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-29 23:36:03
|
Revision: 2393
http://skim-app.svn.sourceforge.net/skim-app/?rev=2393&view=rev
Author: hofman
Date: 2007-06-29 16:35:57 -0700 (Fri, 29 Jun 2007)
Log Message:
-----------
Use label for page field in toolbar instead of the page index shifted by one.
Modified Paths:
--------------
trunk/Dutch.lproj/MainWindow.nib/info.nib
trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
trunk/English.lproj/MainWindow.nib/info.nib
trunk/English.lproj/MainWindow.nib/keyedobjects.nib
trunk/Italian.lproj/MainWindow.nib/info.nib
trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-06-29 21:52:57 UTC (rev 2392)
+++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-06-29 23:35:57 UTC (rev 2393)
@@ -28,8 +28,9 @@
<key>IBOpenObjects</key>
<array>
<integer>539</integer>
+ <integer>168</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/MainWindow.nib/info.nib 2007-06-29 21:52:57 UTC (rev 2392)
+++ trunk/English.lproj/MainWindow.nib/info.nib 2007-06-29 23:35:57 UTC (rev 2393)
@@ -27,19 +27,19 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>224</integer>
<integer>208</integer>
- <integer>585</integer>
- <integer>511</integer>
- <integer>168</integer>
- <integer>224</integer>
+ <integer>5</integer>
<integer>256</integer>
+ <integer>553</integer>
<integer>539</integer>
- <integer>553</integer>
+ <integer>168</integer>
+ <integer>511</integer>
<integer>502</integer>
- <integer>5</integer>
+ <integer>585</integer>
<integer>314</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/MainWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-06-29 21:52:57 UTC (rev 2392)
+++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-06-29 23:35:57 UTC (rev 2393)
@@ -27,12 +27,13 @@
</array>
<key>IBOpenObjects</key>
<array>
+ <integer>511</integer>
<integer>553</integer>
- <integer>511</integer>
+ <integer>168</integer>
<integer>539</integer>
- <integer>168</integer>
+ <integer>208</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2007-06-29 21:52:57 UTC (rev 2392)
+++ trunk/SKMainWindowController.h 2007-06-29 23:35:57 UTC (rev 2393)
@@ -268,6 +268,8 @@
- (unsigned int)pageNumber;
- (void)setPageNumber:(unsigned int)pageNumber;
+- (NSString *)pageLabel;
+- (void)setPageLabel:(NSString *)label;
- (BOOL)isFullScreen;
- (BOOL)isPresentation;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-29 21:52:57 UTC (rev 2392)
+++ trunk/SKMainWindowController.m 2007-06-29 23:35:57 UTC (rev 2393)
@@ -687,6 +687,21 @@
[pdfView goToPage:[[pdfView document] pageAtIndex:pageNumber - 1]];
}
+- (NSString *)pageLabel {
+ return [[pdfView currentPage] label];
+}
+
+- (void)setPageLabel:(NSString *)label {
+ PDFDocument *pdfDoc = [pdfView document];
+ int i, count = [pdfDoc pageCount];
+ for (i = 0; i < count; i++) {
+ if ([[[pdfDoc pageAtIndex:i] label] isEqualToString:label]) {
+ [pdfView goToPage:[pdfDoc pageAtIndex:i]];
+ break;
+ }
+ }
+}
+
- (BOOL)isFullScreen {
return [self window] == fullScreenWindow && isPresentation == NO;
}
@@ -1010,7 +1025,7 @@
- (void)choosePageSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo {
if (returnCode == NSOKButton)
- [self setPageNumber:[choosePageField intValue]];
+ [self setPageLabel:[choosePageField stringValue]];
}
- (IBAction)doGoToPage:(id)sender {
@@ -2264,6 +2279,8 @@
[outlineView setNeedsDisplay:YES];
[self willChangeValueForKey:@"pageNumber"];
+ [self willChangeValueForKey:@"pageLabel"];
+ [self didChangeValueForKey:@"pageLabel"];
[self didChangeValueForKey:@"pageNumber"];
[self updateOutlineSelection];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-29 21:53:04
|
Revision: 2392
http://skim-app.svn.sourceforge.net/skim-app/?rev=2392&view=rev
Author: hofman
Date: 2007-06-29 14:52:57 -0700 (Fri, 29 Jun 2007)
Log Message:
-----------
Implement dragging destination for color and line styles on notes.
Modified Paths:
--------------
trunk/SKPDFView.h
trunk/SKPDFView.m
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2007-06-29 19:17:07 UTC (rev 2391)
+++ trunk/SKPDFView.h 2007-06-29 21:52:57 UTC (rev 2392)
@@ -87,6 +87,7 @@
SKReadingBar *readingBar;
PDFAnnotation *activeAnnotation;
+ PDFAnnotation *highlightAnnotation;
PDFAnnotationTextWidget *editAnnotation;
PDFSelection *wasSelection;
NSRect wasBounds;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-29 19:17:07 UTC (rev 2391)
+++ trunk/SKPDFView.m 2007-06-29 21:52:57 UTC (rev 2392)
@@ -52,6 +52,7 @@
#import "SKPDFSynchronizer.h"
#import "PDFSelection_SKExtensions.h"
#import "NSBezierPath_BDSKExtensions.h"
+#import "SKLineWell.h"
#import <Carbon/Carbon.h>
NSString *SKPDFViewToolModeChangedNotification = @"SKPDFViewToolModeChangedNotification";
@@ -180,6 +181,8 @@
trackingRect = 0;
+ [self registerForDraggedTypes:[NSArray arrayWithObjects:NSColorPboardType, SKLineStylePboardType, nil]];
+
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAnnotationWillChangeNotification:)
name:SKAnnotationWillChangeNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAnnotationDidChangeNotification:)
@@ -284,6 +287,13 @@
}
}
}
+ if (highlightAnnotation && [[highlightAnnotation page] isEqual:pdfPage]) {
+ float color[4] = { 0.0, 0.0, 0.0, 1.0 };
+ NSRect bounds = [highlightAnnotation bounds];
+ NSRect rect = NSInsetRect(NSIntegralRect(bounds), 0.5, 0.5);
+ CGContextSetStrokeColor(context, color);
+ CGContextStrokeRectWithWidth(context, *(CGRect *)&rect, 1.0);
+ }
}
@@ -1185,6 +1195,106 @@
trackingRect = [self addTrackingRect:[self bounds] owner:self userData:NULL assumeInside:NO];
}
+#pragma mark NSDraggingDestination protocol
+
+- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender {
+ NSDragOperation dragOp = NSDragOperationNone;
+ NSPasteboard *pboard = [sender draggingPasteboard];
+ NSString *pboardType = [pboard availableTypeFromArray:[NSArray arrayWithObjects:NSColorPboardType, SKLineStylePboardType, nil]];
+ if (pboardType) {
+ return [self draggingUpdated:sender];
+ } else if ([[self superclass] instancesRespondToSelector:_cmd]) {
+ dragOp = [super draggingEntered:sender];
+ }
+ return dragOp;
+}
+
+- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender {
+ NSDragOperation dragOp = NSDragOperationNone;
+ NSPasteboard *pboard = [sender draggingPasteboard];
+ NSString *pboardType = [pboard availableTypeFromArray:[NSArray arrayWithObjects:NSColorPboardType, SKLineStylePboardType, nil]];
+ if (pboardType) {
+ NSPoint location = [self convertPoint:[sender draggingLocation] fromView:nil];
+ PDFPage *page = [self pageForPoint:location nearest:NO];
+ if (page) {
+ NSArray *annotations = [page annotations];
+ PDFAnnotation *annotation = nil;
+ int i = [annotations count];
+ location = [self convertPoint:location toPage:page];
+ while (i-- > 0) {
+ annotation = [annotations objectAtIndex:i];
+ NSString *type = [annotation type];
+ if ([annotation isNoteAnnotation] && [annotation hitTest:location] &&
+ ([pboardType isEqualToString:NSColorPboardType] || [type isEqualToString:@"Text"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"])) {
+ if ([annotation isEqual:highlightAnnotation] == NO) {
+ if (highlightAnnotation)
+ [self setNeedsDisplayForAnnotation:highlightAnnotation];
+ highlightAnnotation = annotation;
+ [self setNeedsDisplayForAnnotation:highlightAnnotation];
+ }
+ dragOp = NSDragOperationEvery;
+ break;
+ }
+ }
+ }
+ if (dragOp == NSDragOperationNone && highlightAnnotation) {
+ [self setNeedsDisplayForAnnotation:highlightAnnotation];
+ highlightAnnotation = nil;
+ }
+ } else if ([[self superclass] instancesRespondToSelector:_cmd]) {
+ dragOp = [super draggingUpdated:sender];
+ }
+ return dragOp;
+}
+
+- (void)draggingExited:(id <NSDraggingInfo>)sender {
+ NSPasteboard *pboard = [sender draggingPasteboard];
+ NSString *pboardType = [pboard availableTypeFromArray:[NSArray arrayWithObjects:NSColorPboardType, SKLineStylePboardType, nil]];
+ if (pboardType) {
+ if (highlightAnnotation) {
+ [self setNeedsDisplayForAnnotation:highlightAnnotation];
+ highlightAnnotation = nil;
+ }
+ } else if ([[self superclass] instancesRespondToSelector:_cmd]) {
+ [super draggingExited:sender];
+ }
+}
+
+- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender {
+ BOOL performedDrag = NO;
+ NSPasteboard *pboard = [sender draggingPasteboard];
+ NSString *pboardType = [pboard availableTypeFromArray:[NSArray arrayWithObjects:NSColorPboardType, SKLineStylePboardType, nil]];
+ if (pboardType) {
+ if (highlightAnnotation) {
+ NSString *type = [highlightAnnotation type];
+ if ([pboardType isEqualToString:NSColorPboardType]) {
+ [highlightAnnotation setColor:[NSColor colorFromPasteboard:pboard]];
+ performedDrag = YES;
+ } else if ([type isEqualToString:@"Text"] || [type isEqualToString:@"Circle"] || [type isEqualToString:@"Square"] || [type isEqualToString:@"Line"]) {
+ NSDictionary *dict = [pboard propertyListForType:SKLineStylePboardType];
+ NSNumber *number;
+ if (number = [dict objectForKey:@"lineWidth"])
+ [highlightAnnotation setLineWidth:[number floatValue]];
+ if (number = [dict objectForKey:@"style"])
+ [highlightAnnotation setBorderStyle:[number intValue]];
+ [highlightAnnotation setDashPattern:[dict objectForKey:@"dashPattern"]];
+ if ([type isEqualToString:@"Line"]) {
+ if (number = [dict objectForKey:@"startLineStyle"])
+ [(SKPDFAnnotationLine *)highlightAnnotation setStartLineStyle:[number intValue]];
+ if (number = [dict objectForKey:@"endLineStyle"])
+ [(SKPDFAnnotationLine *)highlightAnnotation setEndLineStyle:[number intValue]];
+ }
+ performedDrag = YES;
+ }
+ [self setNeedsDisplayForAnnotation:highlightAnnotation];
+ highlightAnnotation = nil;
+ }
+ } else if ([[self superclass] instancesRespondToSelector:_cmd]) {
+ performedDrag = [super performDragOperation:sender];
+ }
+ return performedDrag;
+}
+
#pragma mark UndoManager
- (NSUndoManager *)undoManager {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-29 19:17:08
|
Revision: 2391
http://skim-app.svn.sourceforge.net/skim-app/?rev=2391&view=rev
Author: hofman
Date: 2007-06-29 12:17:07 -0700 (Fri, 29 Jun 2007)
Log Message:
-----------
Reorganize preference panel. Add a new pref check button for remembering snapshots. Add color wells for interior color prefs. Add new line well controls for line style prefs.
Add line well to line inspector panel.
Add line well files to project.
Modified Paths:
--------------
trunk/Dutch.lproj/LineInspector.nib/classes.nib
trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
trunk/Dutch.lproj/PreferenceWindow.nib/classes.nib
trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/Dutch.lproj/Skim Help/skim.texi
trunk/English.lproj/LineInspector.nib/classes.nib
trunk/English.lproj/LineInspector.nib/keyedobjects.nib
trunk/English.lproj/PreferenceWindow.nib/classes.nib
trunk/English.lproj/PreferenceWindow.nib/info.nib
trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/English.lproj/Skim Help/skim.texi
trunk/InitialUserDefaults.plist
trunk/Italian.lproj/LineInspector.nib/classes.nib
trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
trunk/Italian.lproj/PreferenceWindow.nib/classes.nib
trunk/Italian.lproj/PreferenceWindow.nib/info.nib
trunk/Italian.lproj/PreferenceWindow.nib/keyedobjects.nib
trunk/Italian.lproj/Skim Help/skim.texi
trunk/SKLineInspector.h
trunk/SKLineInspector.m
trunk/SKPreferenceController.h
trunk/SKPreferenceController.m
trunk/Skim.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/SKLineWell.h
trunk/SKLineWell.m
Modified: trunk/Dutch.lproj/LineInspector.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/LineInspector.nib/classes.nib 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/Dutch.lproj/LineInspector.nib/classes.nib 2007-06-29 19:17:07 UTC (rev 2391)
@@ -24,13 +24,21 @@
OUTLETS = {
dashPatternField = NSTextField;
endLineStyleButton = NSSegmentedControl;
+ lineWell = SKLineWell;
lineWidthField = NSTextField;
lineWidthSlider = NSSlider;
startLineStyleButton = NSSegmentedControl;
styleButton = NSSegmentedControl;
};
SUPERCLASS = NSWindowController;
- }
+ },
+ {
+ CLASS = SKLineWell;
+ LANGUAGE = ObjC;
+ OUTLETS = {target = id; };
+ SUPERCLASS = NSControl;
+ },
+ {CLASS = SKNumberArrayFormatter; LANGUAGE = ObjC; SUPERCLASS = NSFormatter; }
);
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/Dutch.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/PreferenceWindow.nib/classes.nib 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/Dutch.lproj/PreferenceWindow.nib/classes.nib 2007-06-29 19:17:07 UTC (rev 2391)
@@ -7,6 +7,12 @@
SUPERCLASS = NSObject;
},
{
+ CLASS = SKLineWell;
+ LANGUAGE = ObjC;
+ OUTLETS = {target = id; };
+ SUPERCLASS = NSControl;
+ },
+ {
ACTIONS = {
changeDiscreteThumbnailSizes = id;
changeTeXEditorPreset = id;
@@ -19,11 +25,15 @@
CLASS = SKPreferenceController;
LANGUAGE = ObjC;
OUTLETS = {
+ boxLineWell = SKLineWell;
+ circleLineWell = SKLineWell;
+ lineLineWell = SKLineWell;
revertFullScreenPDFSettingsButton = NSButton;
revertPDFSettingsButton = NSButton;
snapshotSizeSlider = NSSlider;
tabView = NSTabView;
texEditorPopUpButton = NSPopUpButton;
+ textLineWell = SKLineWell;
thumbnailSizeSlider = NSSlider;
};
SUPERCLASS = NSWindowController;
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-06-29 19:17:07 UTC (rev 2391)
@@ -8,11 +8,7 @@
<string>446.1</string>
<key>IBLockedObjects</key>
<array/>
- <key>IBOpenObjects</key>
- <array>
- <integer>5</integer>
- </array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Dutch.lproj/Skim Help/skim.texi
===================================================================
--- trunk/Dutch.lproj/Skim Help/skim.texi 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/Dutch.lproj/Skim Help/skim.texi 2007-06-29 19:17:07 UTC (rev 2391)
@@ -302,10 +302,10 @@
@box{taskbox}
@itemize
-@item Om de normale achtergrondkleur te wijzigen, kies Skim > Voorkeuren, klik op Kleuren, en vervolgens op Normaal onder Achtergrondkleur.
+@item Om de normale achtergrondkleur te wijzigen, kies Skim > Voorkeuren, klik op Weergave, en vervolgens op Normaal onder Achtergrondkleur.
@end itemize
@itemize
-@item Om de achtergrondkleur voor beeldschermvullende modus te wijzigen, kies Skim > Voorkeuren, klik op Kleuren, en vervolgens op Beeldschermvullend onder Achtergrondkleur.
+@item Om de achtergrondkleur voor beeldschermvullende modus te wijzigen, kies Skim > Voorkeuren, klik op Weergave, en vervolgens op Beeldschermvullend onder Achtergrondkleur.
@end itemize
@endbox
Modified: trunk/English.lproj/LineInspector.nib/classes.nib
===================================================================
--- trunk/English.lproj/LineInspector.nib/classes.nib 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/English.lproj/LineInspector.nib/classes.nib 2007-06-29 19:17:07 UTC (rev 2391)
@@ -24,13 +24,21 @@
OUTLETS = {
dashPatternField = NSTextField;
endLineStyleButton = NSSegmentedControl;
+ lineWell = SKLineWell;
lineWidthField = NSTextField;
lineWidthSlider = NSSlider;
startLineStyleButton = NSSegmentedControl;
styleButton = NSSegmentedControl;
};
SUPERCLASS = NSWindowController;
- }
+ },
+ {
+ CLASS = SKLineWell;
+ LANGUAGE = ObjC;
+ OUTLETS = {target = id; };
+ SUPERCLASS = NSControl;
+ },
+ {CLASS = SKNumberArrayFormatter; LANGUAGE = ObjC; SUPERCLASS = NSFormatter; }
);
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/English.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/PreferenceWindow.nib/classes.nib
===================================================================
--- trunk/English.lproj/PreferenceWindow.nib/classes.nib 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/English.lproj/PreferenceWindow.nib/classes.nib 2007-06-29 19:17:07 UTC (rev 2391)
@@ -7,6 +7,12 @@
SUPERCLASS = NSObject;
},
{
+ CLASS = SKLineWell;
+ LANGUAGE = ObjC;
+ OUTLETS = {target = id; };
+ SUPERCLASS = NSControl;
+ },
+ {
ACTIONS = {
changeDiscreteThumbnailSizes = id;
changeTeXEditorPreset = id;
@@ -19,11 +25,15 @@
CLASS = SKPreferenceController;
LANGUAGE = ObjC;
OUTLETS = {
+ boxLineWell = SKLineWell;
+ circleLineWell = SKLineWell;
+ lineLineWell = SKLineWell;
revertFullScreenPDFSettingsButton = NSButton;
revertPDFSettingsButton = NSButton;
snapshotSizeSlider = NSSlider;
tabView = NSTabView;
texEditorPopUpButton = NSPopUpButton;
+ textLineWell = SKLineWell;
thumbnailSizeSlider = NSSlider;
};
SUPERCLASS = NSWindowController;
Modified: trunk/English.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/PreferenceWindow.nib/info.nib 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/English.lproj/PreferenceWindow.nib/info.nib 2007-06-29 19:17:07 UTC (rev 2391)
@@ -13,6 +13,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/Skim Help/skim.texi
===================================================================
--- trunk/English.lproj/Skim Help/skim.texi 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/English.lproj/Skim Help/skim.texi 2007-06-29 19:17:07 UTC (rev 2391)
@@ -300,10 +300,10 @@
@box{taskbox}
@itemize
-@item To change the default background color, choose Skim > Preferences, click Colors, and then click Normal below "Background color".
+@item To change the default background color, choose Skim > Preferences, click Display, and then click Normal below "Background color".
@end itemize
@itemize
-@item To change the background color for Full Screen mode, choose Skim > Preferences, click Colors, and then click "Full Screen" below "Background color".
+@item To change the background color for Full Screen mode, choose Skim > Preferences, click Display, and then click "Full Screen" below "Background color".
@end itemize
@endbox
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/InitialUserDefaults.plist 2007-06-29 19:17:07 UTC (rev 2391)
@@ -24,6 +24,8 @@
<false/>
<key>SKRememberLastPageViewed</key>
<false/>
+ <key>SKRememberSnapshots</key>
+ <false/>
<key>SKDefaultPDFDisplaySettings</key>
<dict>
<key>scaleFactor</key>
@@ -202,6 +204,7 @@
<string>SKInitialWindowSizeOption</string>
<string>SKOpenContentsPaneOnlyForTOC</string>
<string>SKRememberLastPageViewed</string>
+ <string>SKRememberSnapshots</string>
<string>SKDefaultPDFDisplaySettings</string>
<string>SKDefaultFullScreenPDFDisplaySettings</string>
<string>SKAutoSaveSkimNotes</string>
@@ -215,9 +218,6 @@
<string>SKSnapshotThumbnailSize</string>
<string>SKShouldAntiAlias</string>
<string>SKGreekingThreshold</string>
- </array>
- <key>colors</key>
- <array>
<string>SKBackgroundColor</string>
<string>SKFullScreenBackgroundColor</string>
<string>SKShouldHighlightSearchResults</string>
Modified: trunk/Italian.lproj/LineInspector.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/LineInspector.nib/classes.nib 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/Italian.lproj/LineInspector.nib/classes.nib 2007-06-29 19:17:07 UTC (rev 2391)
@@ -24,13 +24,21 @@
OUTLETS = {
dashPatternField = NSTextField;
endLineStyleButton = NSSegmentedControl;
+ lineWell = SKLineWell;
lineWidthField = NSTextField;
lineWidthSlider = NSSlider;
startLineStyleButton = NSSegmentedControl;
styleButton = NSSegmentedControl;
};
SUPERCLASS = NSWindowController;
- }
+ },
+ {
+ CLASS = SKLineWell;
+ LANGUAGE = ObjC;
+ OUTLETS = {target = id; };
+ SUPERCLASS = NSControl;
+ },
+ {CLASS = SKNumberArrayFormatter; LANGUAGE = ObjC; SUPERCLASS = NSFormatter; }
);
IBVersion = 1;
}
\ No newline at end of file
Modified: trunk/Italian.lproj/LineInspector.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/PreferenceWindow.nib/classes.nib
===================================================================
--- trunk/Italian.lproj/PreferenceWindow.nib/classes.nib 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/Italian.lproj/PreferenceWindow.nib/classes.nib 2007-06-29 19:17:07 UTC (rev 2391)
@@ -7,6 +7,12 @@
SUPERCLASS = NSObject;
},
{
+ CLASS = SKLineWell;
+ LANGUAGE = ObjC;
+ OUTLETS = {target = id; };
+ SUPERCLASS = NSControl;
+ },
+ {
ACTIONS = {
changeDiscreteThumbnailSizes = id;
changeTeXEditorPreset = id;
Modified: trunk/Italian.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/PreferenceWindow.nib/info.nib 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/Italian.lproj/PreferenceWindow.nib/info.nib 2007-06-29 19:17:07 UTC (rev 2391)
@@ -13,6 +13,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/Italian.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/Skim Help/skim.texi
===================================================================
--- trunk/Italian.lproj/Skim Help/skim.texi 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/Italian.lproj/Skim Help/skim.texi 2007-06-29 19:17:07 UTC (rev 2391)
@@ -300,10 +300,10 @@
@box{taskbox}
@itemize
-@item To change the default background color, choose Skim > Preferences, click Colors, and then click Normal below "Background color".
+@item To change the default background color, choose Skim > Preferences, click Display, and then click Normal below "Background color".
@end itemize
@itemize
-@item To change the background color for Full Screen mode, choose Skim > Preferences, click Colors, and then click "Full Screen" below "Background color".
+@item To change the background color for Full Screen mode, choose Skim > Preferences, click Display, and then click "Full Screen" below "Background color".
@end itemize
@endbox
Modified: trunk/SKLineInspector.h
===================================================================
--- trunk/SKLineInspector.h 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/SKLineInspector.h 2007-06-29 19:17:07 UTC (rev 2391)
@@ -46,6 +46,8 @@
extern NSString *SKLineInspectorStartLineStyleDidChangeNotification;
extern NSString *SKLineInspectorEndLineStyleDidChangeNotification;
+@class SKLineWell;
+
@interface SKLineInspector : NSWindowController {
IBOutlet NSSlider *lineWidthSlider;
IBOutlet NSTextField *lineWidthField;
@@ -53,6 +55,7 @@
IBOutlet NSTextField *dashPatternField;
IBOutlet NSSegmentedControl *startLineStyleButton;
IBOutlet NSSegmentedControl *endLineStyleButton;
+ IBOutlet SKLineWell *lineWell;
float lineWidth;
PDFBorderStyle style;
NSArray *dashPattern;
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/SKLineInspector.m 2007-06-29 19:17:07 UTC (rev 2391)
@@ -37,6 +37,7 @@
*/
#import "SKLineInspector.h"
+#import "SKLineWell.h"
NSString *SKLineInspectorLineWidthDidChangeNotification = @"SKLineInspectorLineWidthDidChangeNotification";
NSString *SKLineInspectorLineStyleDidChangeNotification = @"SKLineInspectorLineStyleDidChangeNotification";
@@ -89,6 +90,17 @@
- (void)windowDidLoad {
[self setWindowFrameAutosaveName:@"SKLineInspector"];
+ [lineWell setCanActivate:NO];
+ [lineWell bind:@"lineWidth" toObject:self withKeyPath:@"lineWidth" options:nil];
+ [lineWell bind:@"style" toObject:self withKeyPath:@"style" options:nil];
+ [lineWell bind:@"dashPattern" toObject:self withKeyPath:@"dashPattern" options:nil];
+ [lineWell bind:@"startLineStyle" toObject:self withKeyPath:@"startLineStyle" options:nil];
+ [lineWell bind:@"endLineStyle" toObject:self withKeyPath:@"endLineStyle" options:nil];
+
+ SKNumberArrayFormatter *formatter = [[SKNumberArrayFormatter alloc] init];
+ [dashPatternField setFormatter:formatter];
+ [formatter release];
+
[[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];
@@ -389,10 +401,6 @@
[path stroke];
[image unlockFocus];
[endLineStyleButton setImage:image forSegment:kPDFLineStyleClosedArrow];
-
- SKNumberArrayFormatter *formatter = [[SKNumberArrayFormatter alloc] init];
- [dashPatternField setFormatter:formatter];
- [formatter release];
}
- (void)sendActionToTarget:(SEL)selector {
Added: trunk/SKLineWell.h
===================================================================
--- trunk/SKLineWell.h (rev 0)
+++ trunk/SKLineWell.h 2007-06-29 19:17:07 UTC (rev 2391)
@@ -0,0 +1,98 @@
+//
+// SKLineWell.h
+// Skim
+//
+// Created by Christiaan Hofman on 6/22/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 *SKLineStylePboardType;
+
+@interface SKLineWell : NSControl {
+ float lineWidth;
+ PDFBorderStyle style;
+ NSArray *dashPattern;
+ PDFLineStyle startLineStyle;
+ PDFLineStyle endLineStyle;
+ BOOL active;
+ BOOL canActivate;
+ BOOL isHighlighted;
+ BOOL ignoresLineEndings;
+ BOOL existsActiveLineWell;
+
+ id target;
+ SEL action;
+
+ BOOL updatingFromLineInspector;
+ BOOL updatingFromBinding;
+
+ NSMutableDictionary *observedObjects;
+ NSMutableDictionary *observedKeyPaths;
+}
+
+- (void)activate:(BOOL)exclusive;
+- (void)deactivate;
+
+- (BOOL)isActive;
+
+- (BOOL)canActivate;
+- (void)setCanActivate:(BOOL)flag;
+
+- (BOOL)isHighlighted;
+- (void)setHighlighted:(BOOL)flag;
+
+- (BOOL)ignoresLineEndings;
+- (void)setIgnoresLineEndings:(BOOL)flag;
+
+- (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)lineInspectorLineWidthChanged:(NSNotification *)notification;
+- (void)lineInspectorLineStyleChanged:(NSNotification *)notification;
+- (void)lineInspectorDashPatternChanged:(NSNotification *)notification;
+- (void)lineInspectorStartLineStyleChanged:(NSNotification *)notification;
+- (void)lineInspectorEndLineStyleChanged:(NSNotification *)notification;
+
+@end
Added: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m (rev 0)
+++ trunk/SKLineWell.m 2007-06-29 19:17:07 UTC (rev 2391)
@@ -0,0 +1,776 @@
+//
+// SKLineWell.m
+// Skim
+//
+// Created by Christiaan Hofman on 6/22/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 "SKLineWell.h"
+#import "SKLineInspector.h"
+
+NSString *SKLineStylePboardType = @"SKLineStylePboardType";
+
+static NSDictionary *observationContexts = nil;
+
+static NSString *SKLineWellWillBecomeActiveNotification = @"SKLineWellWillBecomeActiveNotification";
+
+@implementation SKLineWell
+
++ (void)initialize {
+ id keys[5] = {@"lineWidth", @"style", @"dashPattern", @"startLineStyle", @"endLineStyle"};
+ int values[5] = {2091, 2092, 2093, 2094, 2095};
+ observationContexts = (NSDictionary *)CFDictionaryCreate(NULL, (const void **)keys, (const void **)values, 5, &kCFCopyStringDictionaryKeyCallBacks, NULL);
+
+ [self exposeBinding:@"lineWidth"];
+ [self exposeBinding:@"style"];
+ [self exposeBinding:@"dashPattern"];
+ [self exposeBinding:@"startLineStyle"];
+ [self exposeBinding:@"endLineStyle"];
+}
+
+- (Class)valueClassForBinding:(NSString *)binding {
+ if ([binding isEqualToString:@"dashPattern"])
+ return [NSArray class];
+ else
+ return [NSNumber class];
+}
+
+- (id)initWithFrame:(NSRect)frame {
+ if (self = [super initWithFrame:frame]) {
+ lineWidth = 1.0;
+ style = kPDFBorderStyleSolid;
+ dashPattern = nil;
+ startLineStyle = kPDFLineStyleNone;
+ endLineStyle = kPDFLineStyleNone;
+ active = NO;
+ canActivate = YES;
+ ignoresLineEndings = NO;
+
+ target = nil;
+ action = NULL;
+
+ existsActiveLineWell = NO;
+
+ updatingFromLineInspector = NO;
+ updatingFromBinding = NO;
+
+ observedObjects = [[NSMutableDictionary alloc] init];
+ observedKeyPaths = [[NSMutableDictionary alloc] init];
+
+ [self registerForDraggedTypes:[NSArray arrayWithObjects:SKLineStylePboardType, nil]];
+ }
+ return self;
+}
+
+- (id)initWithCoder:(NSCoder *)decoder {
+ if (self = [super initWithCoder:decoder]) {
+ if ([decoder allowsKeyedCoding]) {
+ lineWidth = [decoder decodeFloatForKey:@"lineWidth"];
+ style = [decoder decodeIntForKey:@"style"];
+ dashPattern = [[decoder decodeObjectForKey:@"dashPattern"] retain];
+ startLineStyle = [decoder decodeIntForKey:@"startLineStyle"];
+ endLineStyle = [decoder decodeIntForKey:@"endLineStyle"];
+ active = [decoder decodeBoolForKey:@"active"];
+ ignoresLineEndings = [decoder decodeBoolForKey:@"ignoresLineEndings"];
+ action = NSSelectorFromString([decoder decodeObjectForKey:@"action"]);
+ target = [decoder decodeObjectForKey:@"target"];
+ } else {
+ [decoder decodeValueOfObjCType:@encode(float) at:&lineWidth];
+ [decoder decodeValueOfObjCType:@encode(int) at:&style];
+ dashPattern = [[decoder decodeObject] retain];
+ [decoder decodeValueOfObjCType:@encode(int) at:&startLineStyle];
+ [decoder decodeValueOfObjCType:@encode(int) at:&endLineStyle];
+ [decoder decodeValueOfObjCType:@encode(BOOL) at:&active];
+ [decoder decodeValueOfObjCType:@encode(BOOL) at:&ignoresLineEndings];
+ [decoder decodeValueOfObjCType:@encode(SEL) at:&action];
+ target = [decoder decodeObject];
+ }
+
+ existsActiveLineWell = NO;
+
+ updatingFromLineInspector = NO;
+ updatingFromBinding = NO;
+
+ observedObjects = [[NSMutableDictionary alloc] init];
+ observedKeyPaths = [[NSMutableDictionary alloc] init];
+
+ [self registerForDraggedTypes:[NSArray arrayWithObjects:SKLineStylePboardType, nil]];
+ }
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+ [super encodeWithCoder:coder];
+ if ([coder allowsKeyedCoding]) {
+ [coder encodeFloat:lineWidth forKey:@"lineWidth"];
+ [coder encodeInt:style forKey:@"style"];
+ [coder encodeObject:dashPattern forKey:@"dashPattern"];
+ [coder encodeInt:startLineStyle forKey:@"startLineStyle"];
+ [coder encodeInt:endLineStyle forKey:@"endLineStyle"];
+ [coder encodeBool:active forKey:@"active"];
+ [coder encodeBool:ignoresLineEndings forKey:@"ignoresLineEndings"];
+ [coder encodeObject:NSStringFromSelector(action) forKey:@"action"];
+ [coder encodeObject:target forKey:@"target"];
+ } else {
+ [coder encodeValueOfObjCType:@encode(float) at:&lineWidth];
+ [coder encodeValueOfObjCType:@encode(int) at:&style];
+ [coder encodeObject:dashPattern];
+ [coder encodeValueOfObjCType:@encode(int) at:&startLineStyle];
+ [coder encodeValueOfObjCType:@encode(int) at:&endLineStyle];
+ [coder encodeValueOfObjCType:@encode(BOOL) at:&active];
+ [coder encodeValueOfObjCType:@encode(BOOL) at:&ignoresLineEndings];
+ [coder encodeValueOfObjCType:@encode(SEL) at:action];
+ [coder encodeObject:target];
+ }
+}
+
+- (void)dealloc {
+ [self unbind:@"lineWidth"];
+ [self unbind:@"style"];
+ [self unbind:@"dashPattern"];
+ [self unbind:@"startLineStyle"];
+ [self unbind:@"endLineStyle"];
+ [observedObjects release];
+ [observedKeyPaths release];
+ if (active)
+ [self deactivate];
+ [dashPattern release];
+ [super dealloc];
+}
+
+- (BOOL)acceptsFirstResponder { return [self canActivate]; }
+
+- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return [self canActivate]; }
+
+- (void)viewWillMoveToWindow:(NSWindow *)newWindow {
+ [self deactivate];
+ [super viewWillMoveToWindow:newWindow];
+}
+
+- (NSBezierPath *)path {
+ NSBezierPath *path = [NSBezierPath bezierPath];
+ NSRect bounds = [self bounds];
+
+ if ([self ignoresLineEndings] == NO) {
+ float offset = 0.5 * lineWidth - floorf(0.5 * lineWidth);
+ NSPoint startPoint = NSMakePoint(NSMinX(bounds) + ceilf(0.5 * NSHeight(bounds)), roundf(NSMidY(bounds)) - offset);
+ NSPoint endPoint = NSMakePoint(NSMaxX(bounds) - ceilf(0.5 * NSHeight(bounds)), roundf(NSMidY(bounds)) - offset);
+
+ switch (startLineStyle) {
+ case kPDFLineStyleNone:
+ break;
+ case kPDFLineStyleSquare:
+ [path appendBezierPath:[NSBezierPath bezierPathWithRect:NSMakeRect(startPoint.x - 1.5 * lineWidth, startPoint.y - 1.5 * lineWidth, 3 * lineWidth, 3 * lineWidth)]];
+ break;
+ case kPDFLineStyleCircle:
+ [path appendBezierPath:[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(startPoint.x - 1.5 * lineWidth, startPoint.y - 1.5 * lineWidth, 3 * lineWidth, 3 * lineWidth)]];
+ break;
+ case kPDFLineStyleDiamond:
+ [path moveToPoint:NSMakePoint(startPoint.x - 2.0 * lineWidth, startPoint.y)];
+ [path lineToPoint:NSMakePoint(startPoint.x, startPoint.y + 2.0 * lineWidth)];
+ [path lineToPoint:NSMakePoint(startPoint.x + 2.0 * lineWidth, startPoint.y)];
+ [path lineToPoint:NSMakePoint(startPoint.x, startPoint.y - 2.0 * lineWidth)];
+ [path closePath];
+ break;
+ case kPDFLineStyleOpenArrow:
+ [path moveToPoint:NSMakePoint(startPoint.x + 3.0 * lineWidth, startPoint.y - 1.5 * lineWidth)];
+ [path lineToPoint:NSMakePoint(startPoint.x, startPoint.y)];
+ [path lineToPoint:NSMakePoint(startPoint.x + 3.0 * lineWidth, startPoint.y + 1.5 * lineWidth)];
+ break;
+ case kPDFLineStyleClosedArrow:
+ [path moveToPoint:NSMakePoint(startPoint.x + 3.0 * lineWidth, startPoint.y - 1.5 * lineWidth)];
+ [path lineToPoint:NSMakePoint(startPoint.x, startPoint.y)];
+ [path lineToPoint:NSMakePoint(startPoint.x + 3.0 * lineWidth, startPoint.y + 1.5 * lineWidth)];
+ [path closePath];
+ break;
+ }
+
+ [path moveToPoint:startPoint];
+ [path lineToPoint:endPoint];
+
+ switch (endLineStyle) {
+ case kPDFLineStyleNone:
+ break;
+ case kPDFLineStyleSquare:
+ [path appendBezierPath:[NSBezierPath bezierPathWithRect:NSMakeRect(endPoint.x - 1.5 * lineWidth, endPoint.y - 1.5 * lineWidth, 3 * lineWidth, 3 * lineWidth)]];
+ break;
+ case kPDFLineStyleCircle:
+ [path appendBezierPath:[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(endPoint.x - 1.5 * lineWidth, endPoint.y - 1.5 * lineWidth, 3 * lineWidth, 3 * lineWidth)]];
+ break;
+ case kPDFLineStyleDiamond:
+ [path moveToPoint:NSMakePoint(endPoint.x + 2.0 * lineWidth, endPoint.y)];
+ [path lineToPoint:NSMakePoint(endPoint.x, endPoint.y + 2.0 * lineWidth)];
+ [path lineToPoint:NSMakePoint(endPoint.x - 2.0 * lineWidth, endPoint.y)];
+ [path lineToPoint:NSMakePoint(endPoint.x, endPoint.y - 2.0 * lineWidth)];
+ [path closePath];
+ break;
+ case kPDFLineStyleOpenArrow:
+ [path moveToPoint:NSMakePoint(endPoint.x - 3.0 * lineWidth, endPoint.y - 1.5 * lineWidth)];
+ [path lineToPoint:NSMakePoint(endPoint.x, endPoint.y)];
+ [path lineToPoint:NSMakePoint(endPoint.x - 3.0 * lineWidth, endPoint.y + 1.5 * lineWidth)];
+ break;
+ case kPDFLineStyleClosedArrow:
+ [path moveToPoint:NSMakePoint(endPoint.x - 3.0 * lineWidth, endPoint.y - 1.5 * lineWidth)];
+ [path lineToPoint:NSMakePoint(endPoint.x, endPoint.y)];
+ [path lineToPoint:NSMakePoint(endPoint.x - 3.0 * lineWidth, endPoint.y + 1.5 * lineWidth)];
+ [path closePath];
+ break;
+ }
+ } else {
+ float inset = 7.0 + 0.5 * lineWidth;
+ [path appendBezierPath:[NSBezierPath bezierPathWithRect:NSInsetRect(bounds, inset, inset)]];
+ }
+
+ [path setLineWidth:lineWidth];
+
+ if (style == kPDFBorderStyleDashed) {
+ int i, count = [dashPattern count];
+ if (count) {
+ float pattern[count];
+ for (i = 0; i < count; i++)
+ pattern[i] = [[dashPattern objectAtIndex:i] floatValue];
+ [path setLineDash:pattern count:count phase:0.0];
+ }
+ }
+
+ return path;
+}
+
+- (void)drawRect:(NSRect)rect {
+ [NSGraphicsContext saveGraphicsState];
+
+ NSRect bounds = [self bounds];
+ NSRectEdge sides[8] = {NSMaxYEdge, NSMaxXEdge, NSMinXEdge, NSMinYEdge, NSMaxYEdge, NSMaxXEdge, NSMinXEdge, NSMinYEdge};
+ float grays[8];
+
+ if ([self isHighlighted] || [self isActive]) {
+ grays[0] = 0.3;
+ grays[1] = grays[2] = grays[3] = 0.4;
+ grays[4] = 0.6;
+ grays[5] = grays[6] = grays[7] = 0.7;
+ } else {
+ grays[0] = 0.5;
+ grays[1] = grays[2] = grays[3] = 0.6;
+ grays[4] = 0.8;
+ grays[5] = grays[6] = grays[7] = 0.9;
+ }
+
+ rect = NSDrawTiledRects(bounds, rect, sides, grays, 8);
+
+ if ([self isActive])
+ [[NSColor selectedControlColor] setFill];
+ else
+ [[NSColor controlBackgroundColor] setFill];
+ NSRectFill(rect);
+
+ NSRectClip(rect);
+
+ [[NSColor blackColor] setStroke];
+ [[self path] stroke];
+
+ [NSGraphicsContext restoreGraphicsState];
+
+ if ([self refusesFirstResponder] == NO && [NSApp isActive] && [[self window] isKeyWindow] && [[self window] firstResponder] == self) {
+ [NSGraphicsContext saveGraphicsState];
+ NSSetFocusRingStyle(NSFocusRingOnly);
+ NSRectFill(bounds);
+ [NSGraphicsContext restoreGraphicsState];
+ }
+}
+
+- (NSImage *)dragImage {
+ NSRect bounds = [self bounds];
+ NSRect sourceRect = NSInsetRect(bounds, 1.0, 1.0);
+ NSRect targetRect = {NSZeroPoint, sourceRect.size};
+ NSImage *image = [[NSImage alloc] initWithSize:bounds.size];
+
+ [image lockFocus];
+ [[NSColor darkGrayColor] set];
+ NSRectFill(bounds);
+ [[NSColor controlBackgroundColor] setFill];
+ NSRectFill(NSInsetRect(bounds, 2.0, 2.0));
+ [[self path] stroke];
+ [image unlockFocus];
+
+ NSImage *dragImage = [[[NSImage alloc] initWithSize:targetRect.size] autorelease];
+
+ [dragImage lockFocus];
+ [image drawInRect:targetRect fromRect:sourceRect operation:NSCompositeCopy fraction:0.7];
+ [dragImage unlockFocus];
+ [image release];
+
+ return dragImage;
+}
+
+- (void)mouseDown:(NSEvent *)theEvent {
+ if ([self isEnabled]) {
+ [self setHighlighted:YES];
+ [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
+ [self setNeedsDisplay:YES];
+ unsigned int modifiers = [theEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask;
+ BOOL keepOn = YES;
+ while (keepOn) {
+ theEvent = [[self window] nextEventMatchingMask: NSLeftMouseUpMask | NSLeftMouseDraggedMask];
+ switch ([theEvent type]) {
+ case NSLeftMouseDragged:
+ {
+ [self setHighlighted:NO];
+ [self setNeedsDisplay:YES];
+
+ NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];
+ [pboard declareTypes:[NSArray arrayWithObjects:SKLineStylePboardType, nil] owner:nil];
+ NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+ [NSNumber numberWithFloat:lineWidth], @"lineWidth", [NSNumber numberWithInt:style], @"style", dashPattern, @"dashPattern", nil];
+ if ([self ignoresLineEndings] == NO) {
+ [dict setObject:[NSNumber numberWithInt:startLineStyle] forKey:@"startLineStyle"];
+ [dict setObject:[NSNumber numberWithInt:endLineStyle] forKey:@"endLineStyle"];
+ }
+ [pboard setPropertyList:dict forType:SKLineStylePboardType];
+
+ NSRect bounds = [self bounds];
+ NSPoint imageLoc = NSMakePoint(NSMinX(bounds) + 1.0, NSMinY(bounds) + 1.0);
+ [self dragImage:[self dragImage] at:imageLoc offset:NSZeroSize event:theEvent pasteboard:pboard source:self slideBack:YES];
+
+ keepOn = NO;
+ break;
+ }
+ case NSLeftMouseUp:
+ [self setHighlighted:NO];
+ [self setNeedsDisplay:YES];
+ if ([self isActive])
+ [self deactivate];
+ else
+ [self activate:(modifiers & NSShiftKeyMask) == 0];
+ keepOn = NO;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+}
+
+- (void)keyDown:(NSEvent *)theEvent {
+ NSString *characters = [theEvent charactersIgnoringModifiers];
+ unichar eventChar = [characters length] > 0 ? [characters characterAtIndex:0] : 0;
+ unsigned int modifiers = [theEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask;
+ if (eventChar == 0x20) {
+ if ([self isEnabled]) {
+ if ([self isActive])
+ [self deactivate];
+ else
+ [self activate:(modifiers & NSShiftKeyMask) == 0];
+ }
+ } else
+ [super keyDown:theEvent];
+}
+
+- (void)performClick:(id)sender {
+ if ([self isEnabled]) {
+ if ([self isActive])
+ [self deactivate];
+ else
+ [self activate:YES];
+ }
+}
+
+- (void)existsActiveLineWell {
+ existsActiveLineWell = YES;
+}
+
+- (void)lineWellWillBecomeActive:(NSNotification *)notification {
+ id sender = [notification object];
+ if (sender != self && [self isActive]) {
+ if ([[[notification userInfo] valueForKey:@"exclusive"] boolValue])
+ [self deactivate];
+ else
+ [sender existsActiveLineWell];
+ }
+}
+
+- (void)lineInspectorWindowWillClose:(NSNotification *)notification {
+ [self deactivate];
+}
+
+- (void)activate:(BOOL)exclusive {
+ if ([self canActivate]) {
+ NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+ SKLineInspector *inspector = [SKLineInspector sharedLineInspector];
+
+ existsActiveLineWell = NO;
+
+ [nc postNotificationName:SKLineWellWillBecomeActiveNotification object:self
+ userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:exclusive], @"exclusive", nil]];
+
+ if (existsActiveLineWell) {
+ updatingFromLineInspector = YES;
+ [self setLineWidth:[inspector lineWidth]];
+ [self setDashPattern:[inspector dashPattern]];
+ [self setStyle:[inspector style]];
+ if ([self ignoresLineEndings] == NO) {
+ [self setStartLineStyle:[inspector startLineStyle]];
+ [self setEndLineStyle:[inspector endLineStyle]];
+ }
+ updatingFromLineInspector = NO;
+ } else {
+ [inspector setLineWidth:[self lineWidth]];
+ [inspector setDashPattern:[self dashPattern]];
+ [inspector setStyle:[self style]];
+ if ([self ignoresLineEndings] == NO) {
+ [inspector setStartLineStyle:[self startLineStyle]];
+ [inspector setEndLineStyle:[self endLineStyle]];
+ }
+ }
+ [[inspector window] orderFront:self];
+
+ [nc addObserver:self selector:@selector(lineWellWillBecomeActive:)
+ name:SKLineWellWillBecomeActiveNotification object:nil];
+ [nc addObserver:self selector:@selector(lineInspectorWindowWillClose:)
+ name:NSWindowWillCloseNotification object:[inspector window]];
+ [nc addObserver:self selector:@selector(lineInspectorLineWidthChanged:)
+ name:SKLineInspectorLineWidthDidChangeNotification object:inspector];
+ [nc addObserver:self selector:@selector(lineInspectorLineStyleChanged:)
+ name:SKLineInspectorLineStyleDidChangeNotification object:inspector];
+ [nc addObserver:self selector:@selector(lineInspectorDashPatternChanged:)
+ name:SKLineInspectorDashPatternDidChangeNotification object:inspector];
+ if ([self ignoresLineEndings] == NO) {
+ [nc addObserver:self selector:@selector(lineInspectorStartLineStyleChanged:)
+ name:SKLineInspectorStartLineStyleDidChangeNotification object:inspector];
+ [nc addObserver:self selector:@selector(lineInspectorEndLineStyleChanged:)
+ name:SKLineInspectorEndLineStyleDidChangeNotification object:inspector];
+ }
+
+ active = YES;
+
+ [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
+ [self setNeedsDisplay:YES];
+ }
+}
+
+- (void)deactivate {
+ if ([self isActive]) {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ active = NO;
+ [self setKeyboardFocusRingNeedsDisplayInRect:[self bounds]];
+ [self setNeedsDisplay:YES];
+ }
+}
+
+- (void)updateValue:(id)value forKey:(NSString *)key {
+ if (updatingFromBinding == NO)
+ [[observedObjects objectForKey:key] setValue:value forKeyPath:[observedKeyPaths objectForKey:key]];
+ if ([self isActive] && updatingFromLineInspector == NO)
+ [[SKLineInspector sharedLineInspector] setValue:value forKey:key];
+ [self setNeedsDisplay:YES];
+}
+
+#pragma mark Accessors
+
+- (SEL)action {
+ return action;
+}
+
+- (void)setAction:(SEL)selector {
+ if (selector != action) {
+ action = selector;
+ }
+}
+
+- (id)target {
+ return target;
+}
+
+- (void)setTarget:(id)newTarget {
+ if (target != newTarget) {
+ target = newTarget;
+ }
+}
+
+- (BOOL)isActive {
+ return active;
+}
+
+- (BOOL)canActivate {
+ return canActivate;
+}
+
+- (void)setCanActivate:(BOOL)flag {
+ if (canActivate != flag) {
+ canActivate = flag;
+ if ([self isActive] && canActivate == NO)
+ [self deactivate];
+ }
+}
+
+- (BOOL)isHighlighted {
+ return isHighlighted;
+}
+
+- (void)setHighlighted:(BOOL)flag {
+ if (isHighlighted != flag) {
+ isHighlighted = flag;
+ }
+}
+
+- (BOOL)ignoresLineEndings {
+ return ignoresLineEndings;
+}
+
+- (void)setIgnoresLineEndings:(BOOL)flag {
+ if (ignoresLineEndings != flag) {
+ ignoresLineEndings = flag;
+ if ([self isActive]) {
+ NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+ SKLineInspector *inspector = [SKLineInspector sharedLineInspector];
+ if ([self ignoresLineEndings]) {
+ [nc removeObserver:self name:SKLineInspectorStartLineStyleDidChangeNotification object:inspector];
+ [nc removeObserver:self name:SKLineInspectorEndLineStyleDidChangeNotification object:inspector];
+ } else {
+ [nc addObserver:self selector:@selector(lineInspectorStartLineStyleChanged:)
+ name:SKLineInspectorStartLineStyleDidChangeNotification object:inspector];
+ [nc addObserver:self selector:@selector(lineInspectorEndLineStyleChanged:)
+ name:SKLineInspectorEndLineStyleDidChangeNotification object:inspector];
+ }
+ }
+ [self setNeedsDisplay:YES];
+ }
+}
+
+- (float)lineWidth {
+ return lineWidth;
+}
+
+- (void)setLineWidth:(float)width {
+ lineWidth = width;
+ [self updateValue:[NSNumber numberWithFloat:lineWidth] forKey:@"lineWidth"];
+}
+
+- (PDFBorderStyle)style {
+ return style;
+}
+
+- (void)setStyle:(PDFBorderStyle)newStyle {
+ if (newStyle != style) {
+ style = newStyle;
+ [self updateValue:[NSNumber numberWithInt:newStyle] forKey:@"style"];
+ }
+}
+
+- (NSArray *)dashPattern {
+ return dashPattern;
+}
+
+- (void)setDashPattern:(NSArray *)pattern {
+ if (pattern != dashPattern) {
+ [dashPattern release];
+ dashPattern = [pattern copy];
+ [self updateValue:dashPattern forKey:@"dashPattern"];
+ }
+}
+
+- (PDFLineStyle)startLineStyle {
+ return startLineStyle;
+}
+
+- (void)setStartLineStyle:(PDFLineStyle)newStyle {
+ if (newStyle != startLineStyle) {
+ startLineStyle = newStyle;
+ [self updateValue:[NSNumber numberWithInt:startLineStyle] forKey:@"startLineStyle"];
+ }
+}
+
+- (PDFLineStyle)endLineStyle {
+ return endLineStyle;
+}
+
+- (void)setEndLineStyle:(PDFLineStyle)newStyle {
+ if (newStyle != endLineStyle) {
+ endLineStyle = newStyle;
+ [self updateValue:[NSNumber numberWithInt:endLineStyle] forKey:@"endLineStyle"];
+ }
+}
+
+- (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];
+ }
+}
+
+#pragma mark Notification handlers
+
+- (void)lineInspectorLineWidthChanged:(NSNotification *)notification {
+ BOOL savedUpdatingFromLineInspector = updatingFromLineInspector;
+ updatingFromLineInspector = YES;
+ [self setLineWidth:[[notification object] lineWidth]];
+ [self sendAction:[self action] to:[self target]];
+ updatingFromLineInspector = savedUpdatingFromLineInspector;
+}
+
+- (void)lineInspectorLineStyleChanged:(NSNotification *)notification {
+ BOOL savedUpdatingFromLineInspector = updatingFromLineInspector;
+ updatingFromLineInspector = YES;
+ [self setStyle:[[notification object] style]];
+ [self sendAction:[self action] to:[self target]];
+ updatingFromLineInspector = savedUpdatingFromLineInspector;
+}
+
+- (void)lineInspectorDashPatternChanged:(NSNotification *)notification {
+ BOOL savedUpdatingFromLineInspector = updatingFromLineInspector;
+ updatingFromLineInspector = YES;
+ [self setDashPattern:[[notification object] dashPattern]];
+ [self sendAction:[self action] to:[self target]];
+ updatingFromLineInspector = savedUpdatingFromLineInspector;
+}
+
+- (void)lineInspectorStartLineStyleChanged:(NSNotification *)notification {
+ BOOL savedUpdatingFromLineInspector = updatingFromLineInspector;
+ updatingFromLineInspector = YES;
+ [self setStartLineStyle:[[notification object] startLineStyle]];
+ [self sendAction:[self action] to:[self target]];
+ updatingFromLineInspector = savedUpdatingFromLineInspector;
+}
+
+- (void)lineInspectorEndLineStyleChanged:(NSNotification *)notification {
+ BOOL savedUpdatingFromLineInspector = updatingFromLineInspector;
+ updatingFromLineInspector = YES;
+ [self setEndLineStyle:[[notification object] endLineStyle]];
+ [self sendAction:[self action] to:[self target]];
+ updatingFromLineInspector = savedUpdatingFromLineInspector;
+}
+
+#pragma mark Binding support
+
+- (void)bind:(NSString *)bindingName toObject:(id)observableController withKeyPath:(NSString *)keyPath options:(NSDictionary *)options {
+ if (observableController && bindingName) {
+ if ([bindingName isEqualToString:@"lineWidth"] || [bindingName isEqualToString:@"style"] || [bindingName isEqualToString:@"dashPattern"] ||
+ [bindingName isEqualToString:@"startLineStyle"] || [bindingName isEqualToString:@"endLineStyle"]) {
+
+ [observableController addObserver:self forKeyPath:keyPath options:nil context:[observationContexts objectForKey:bindingName]];
+ [observedObjects setObject:observableController forKey:bindingName];
+ [observedKeyPaths setObject:keyPath forKey:bindingName];
+ }
+ }
+ [super bind:bindingName toObject:observableController withKeyPath:keyPath options:options];
+ [self setNeedsDisplay:YES];
+}
+
+- (void)unbind:(NSString *)bindingName {
+ if ([bindingName isEqualToString:@"lineWidth"] || [bindingName isEqualToString:@"style"] || [bindingName isEqualToString:@"dashPattern"] ||
+ [bindingName isEqualToString:@"startLineStyle"] || [bindingName isEqualToString:@"endLineStyle"]) {
+
+ [[observedObjects objectForKey:bindingName] removeObserver:self forKeyPath:[observedKeyPaths objectForKey:bindingName]];
+ [observedObjects removeObjectForKey:bindingName];
+ [observedKeyPaths removeObjectForKey:bindingName];
+ }
+ [super unbind:bindingName];
+ [self setNeedsDisplay:YES];
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+ NSString *key = nil;
+
+ if (context == [observationContexts objectForKey:@"lineWidth"])
+ key = @"lineWidth";
+ else if (context == [observationContexts objectForKey:@"style"])
+ key = @"style";
+ else if (context == [observationContexts objectForKey:@"dashPattern"])
+ key = @"dashPattern";
+ else if (context == [observationContexts objectForKey:@"startLineStyle"])
+ key = @"startLineStyle";
+ else if (context == [observationContexts objectForKey:@"endLineStyle"])
+ key = @"endLineStyle";
+
+ if (key) {
+ id value = [[observedObjects objectForKey:key] valueForKeyPath:[observedKeyPaths valueForKey:key]];
+ if (NSIsControllerMarker(value) == NO) {
+ updatingFromBinding = YES;
+ [self setValue:value forKey:key];
+ updatingFromBinding = NO;
+ }
+ } else {
+ [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+ }
+
+ [self setNeedsDisplay:YES];
+}
+#pragma mark NSDraggingDestination protocol
+
+- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender {
+ if ([self isEnabled] && [sender draggingSource] != self && [[sender draggingPasteboard] availableTypeFromArray:[NSArray arrayWithObjects:SKLineStylePboardType, nil]]) {
+ [self setHighlighted:YES];
+ [self setNeedsDisplay:YES];
+ return NSDragOperationEvery;
+ } else
+ return NSDragOperationNone;
+}
+
+- (void)draggingExited:(id <NSDraggingInfo>)sender {
+ if ([self isEnabled] && [sender draggingSource] != self && [[sender draggingPasteboard] availableTypeFromArray:[NSArray arrayWithObjects:SKLineStylePboardType, nil]]) {
+ [self setHighlighted:NO];
+ [self setNeedsDisplay:YES];
+ }
+}
+
+- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender {
+ return [self isEnabled] && [sender draggingSource] != self && [[sender draggingPasteboard] availableTypeFromArray:[NSArray arrayWithObjects:SKLineStylePboardType, nil]];
+}
+
+- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender{
+ NSPasteboard *pboard = [sender draggingPasteboard];
+ NSDictionary *dict = [pboard propertyListForType:SKLineStylePboardType];
+ NSNumber *number;
+
+ if (number = [dict objectForKey:@"lineWidth"])
+ [self setLineWidth:[number floatValue]];
+ if (number = [dict objectForKey:@"style"])
+ [self setStyle:[number intValue]];
+ [self setDashPattern:[dict objectForKey:@"dashPattern"]];
+ if ([self ignoresLineEndings] == NO) {
+ if (number = [dict objectForKey:@"startLineStyle"])
+ [self setStartLineStyle:[number intValue]];
+ if (number = [dict objectForKey:@"endLineStyle"])
+ [self setEndLineStyle:[number intValue]];
+ }
+ [self sendAction:[self action] to:[self target]];
+
+ [self setHighlighted:NO];
+ [self setNeedsDisplay:YES];
+
+ return dict != nil;
+}
+
+@end
Modified: trunk/SKPreferenceController.h
===================================================================
--- trunk/SKPreferenceController.h 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/SKPreferenceController.h 2007-06-29 19:17:07 UTC (rev 2391)
@@ -38,6 +38,7 @@
#import <Cocoa/Cocoa.h>
+@class SKLineWell;
@interface SKPreferenceController : NSWindowController {
IBOutlet NSTabView *tabView;
@@ -46,6 +47,10 @@
IBOutlet NSPopUpButton *texEditorPopUpButton;
IBOutlet NSButton *revertPDFSettingsButton;
IBOutlet NSButton *revertFullScreenPDFSettingsButton;
+ IBOutlet SKLineWell *textLineWell;
+ IBOutlet SKLineWell *lineLineWell;
+ IBOutlet SKLineWell *circleLineWell;
+ IBOutlet SKLineWell *boxLineWell;
NSArray *fonts;
NSDictionary *resettableKeys;
BOOL isCustomTeXEditor;
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/SKPreferenceController.m 2007-06-29 19:17:07 UTC (rev 2391)
@@ -40,6 +40,7 @@
#import "SKStringConstants.h"
#import "NSUserDefaultsController_SKExtensions.h"
#import "SKApplicationController.h"
+#import "SKLineWell.h"
#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};
@@ -146,6 +147,29 @@
[texEditorPopUpButton selectItemAtIndex:index];
[self updateRevertButtons];
+
+ NSUserDefaultsController *sudc = [NSUserDefaultsController sharedUserDefaultsController];
+
+ [textLineWell bind:@"lineWidth" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKFreeTextNoteLineWidthKey] options:nil];
+ [textLineWell bind:@"style" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKFreeTextNoteLineStyleKey] options:nil];
+ [textLineWell bind:@"dashPattern" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKFreeTextNoteDashPatternKey] options:nil];
+ [textLineWell setIgnoresLineEndings:YES];
+
+ [circleLineWell bind:@"lineWidth" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKCircleNoteLineWidthKey] options:nil];
+ [circleLineWell bind:@"style" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKCircleNoteLineStyleKey] options:nil];
+ [circleLineWell bind:@"dashPattern" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKCircleNoteDashPatternKey] options:nil];
+ [circleLineWell setIgnoresLineEndings:YES];
+
+ [boxLineWell bind:@"lineWidth" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKSquareNoteLineWidthKey] options:nil];
+ [boxLineWell bind:@"style" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKSquareNoteLineStyleKey] options:nil];
+ [boxLineWell bind:@"dashPattern" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKSquareNoteDashPatternKey] options:nil];
+ [boxLineWell setIgnoresLineEndings:YES];
+
+ [lineLineWell bind:@"lineWidth" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKLineNoteLineWidthKey] options:nil];
+ [lineLineWell bind:@"style" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKLineNoteLineStyleKey] options:nil];
+ [lineLineWell bind:@"dashPattern" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKLineNoteDashPatternKey] options:nil];
+ [lineLineWell bind:@"startLineStyle" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKLineNoteStartLineStyleKey] options:nil];
+ [lineLineWell bind:@"endLineStyle" toObject:sudc withKeyPath:[NSString stringWithFormat:@"values.%@", SKLineNoteEndLineStyleKey] options:nil];
}
- (void)windowDidResignMain:(NSNotification *)notification {
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2007-06-29 12:30:50 UTC (rev 2390)
+++ trunk/Skim.xcodeproj/project.pbxproj 2007-06-29 19:17:07 UTC (rev 2391)
@@ -111,6 +111,8 @@
CE4A659F0BAB1598004AD07D /* SKBookmarkController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4A659E0BAB1598004AD07D /* SKBookmarkController.m */; };
CE4A65CC0BAB1E2E004AD07D /* BookmarksWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE4A65CA0BAB1E2E004AD07D /* BookmarksWindow.nib */; };
CE4A8BA20BB15980004AD07D /* NSWindowController_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4A8BA10BB15980004AD07D /* NSWindowController_SKExtensions.m */; };
+ CE4BC12F0C357A0300C2AF03 /* SKLineWell.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE4BC12D0C357A0300C2AF03 /* SKLineWell.h */; };
+ CE4BC1300C357A0300C2AF03 /* SKLineWell.m in Sources */ = {isa = PBXBuildFile; fileRef = CE4BC12E0C357A0300C2AF03 /* SKLineWell.m */; };
CE4DA2380B9D9BE10039E89C /* ToolbarSquareNote.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4DA2160B9D9AA70039E89C /* ToolbarSquareNote.tiff */; };
CE4DA2440B9D9EC00039E89C /* SquareNoteAdorn.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE4DA2430B9D9E640039E89C /* SquareNoteAdorn.tiff */; };
CE4DA9240B9E190D0039E89C /* Skim Help in Resources */ = {isa = PBXBuildFile; fileRef = CE4DA9190B9E190D0039E89C /* Skim Help */; };
@@ -261,6 +263,7 @@
dstSubfolderSpec = 10;
files = (
CE2BD8450BD4135600A5F4DB /* Sparkle.framework in CopyFiles */,
+ CE4BC12F0C357A0300C2AF03 /* SKLineWell.h in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -443,6 +446,8 @@
CE4A65CB0BAB1E2E004AD07D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/BookmarksWindow.nib; sourceTree = "<group>"; };
CE4A8BA00BB1597F004AD07D /* NSWindowController_SKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSWindowController_SKExtensions.h; sourceTree = "<group>"; };
CE4A8BA10BB15980004AD07D /* NSWindowController_SKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSWindowController_SKExtensions.m; sourceTree = "<group>"; };
+ CE4BC12D0C357A0300C2AF03 /* SKLineWell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SKLineWell.h; sourceTree = "<group>"; };
+ CE4BC12E0C357A0300C2AF03 /* SKLineWell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SKLineWell.m; sourceTree = "<group>"; };
CE4DA2160B9D9AA70039E89C /* ToolbarSquareNote.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ToolbarSquareNote.tiff; path = Images/ToolbarSquareNote.tiff; sourceTree = "<group>"; };
CE4DA2430B9D9E640039E89C /* SquareNoteAdorn.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = SquareNoteAdorn.tiff; path = Images/SquareNoteAdorn.tiff; sourceTree = "<group>"; };
CE4DA8D00B9E15AD0039E89C /* applehelp.init */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = applehelp.init; path = "Skim Help/applehelp.init"; sourceTree = "<group>"; };
@@ -836,6 +841,8 @@
CE2DE4D10B85D92F00D0DA12 /* Views */ = {
isa = PBXGroup;
children = (
+ CE4BC12D0C357A0300C2AF03 /* SKLineWell.h */,
+ CE4BC12E0C357A0300C2AF03 /* SKLineWell.m */,
CEA575CC0B9206E60003D2E7 /* SKNot...
[truncated message content] |
|
From: <ho...@us...> - 2007-06-29 12:30:52
|
Revision: 2390
http://skim-app.svn.sourceforge.net/skim-app/?rev=2390&view=rev
Author: hofman
Date: 2007-06-29 05:30:50 -0700 (Fri, 29 Jun 2007)
Log Message:
-----------
Update release notes.
Modified Paths:
--------------
trunk/ReleaseNotes.rtf
Modified: trunk/ReleaseNotes.rtf
===================================================================
--- trunk/ReleaseNotes.rtf 2007-06-26 17:16:21 UTC (rev 2389)
+++ trunk/ReleaseNotes.rtf 2007-06-29 12:30:50 UTC (rev 2390)
@@ -86,16 +86,21 @@
{\list\listtemplateid81\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid81}
{\list\listtemplateid82\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid82}
{\list\listtemplateid83\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid83}
-{\list\listtemplateid84\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid84}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}{\listoverride\listid19\listoverridecount0\ls19}{\listoverride\listid20\listoverridecount0\ls20}{\listoverride\listid21\listoverridecount0\ls21}{\listoverride\listid22\listoverridecount0\ls22}{\listoverride\listid23\listoverridecount0\ls23}{\listoverride\listid24\listoverridecount0\ls24}{\listoverride\listid25\listoverridecount0\ls25}{\listoverride\listid26\listoverridecount0\ls26}{\listoverride\listid27\listoverridecount0\ls27}{\listoverride\listid28\listoverridecount0\ls28}{\listoverride\listid29\listoverridecount0\ls29}{\listoverride\listid30\listoverridecount0\ls30}{\listoverride\listid31\listoverridecount0\ls31}{\listoverride\listid32\listoverridecount0\ls32}{\listoverride\listid33\listoverridecount0\ls33}{\listoverride\listid34\listoverridecount0\ls34}{\listoverride\listid35\listoverridecount0\ls35}{\listoverride\listid36\listoverridecount0\ls36}{\listoverride\listid37\listoverridecount0\ls37}{\listoverride\listid38\listoverridecount0\ls38}{\listoverride\listid39\listoverridecount0\ls39}{\listoverride\listid40\listoverridecount0\ls40}{\listoverride\listid41\listoverridecount0\ls41}{\listoverride\listid42\listoverridecount0\ls42}{\listoverride\listid43\listoverridecount0\ls43}{\listoverride\listid44\listoverridecount0\ls44}{\listoverride\listid45\listoverridecount0\ls45}{\listoverride\listid46\listoverridecount0\ls46}{\listoverride\listid47\listoverridecount0\ls47}{\listoverride\listid48\listoverridecount0\ls48}{\listoverride\listid49\listoverridecount0\ls49}{\listoverride\listid50\listoverridecount0\ls50}{\listoverride\listid51\listoverridecount0\ls51}{\listoverride\listid52\listoverridecount0\ls52}{\listoverride\listid53\listoverridecount0\ls53}{\listoverride\listid54\listoverridecount0\ls54}{\listoverride\listid55\listoverridecount0\ls55}{\listoverride\listid56\listoverridecount0\ls56}{\listoverride\listid57\listoverridecount0\ls57}{\listoverride\listid58\listoverridecount0\ls58}{\listoverride\listid59\listoverridecount0\ls59}{\listoverride\listid60\listoverridecount0\ls60}{\listoverride\listid61\listoverridecount0\ls61}{\listoverride\listid62\listoverridecount0\ls62}{\listoverride\listid63\listoverridecount0\ls63}{\listoverride\listid64\listoverridecount0\ls64}{\listoverride\listid65\listoverridecount0\ls65}{\listoverride\listid66\listoverridecount0\ls66}{\listoverride\listid67\listoverridecount0\ls67}{\listoverride\listid68\listoverridecount0\ls68}{\listoverride\listid69\listoverridecount0\ls69}{\listoverride\listid70\listoverridecount0\ls70}{\listoverride\listid71\listoverridecount0\ls71}{\listoverride\listid72\listoverridecount0\ls72}{\listoverride\listid73\listoverridecount0\ls73}{\listoverride\listid74\listoverridecount0\ls74}{\listoverride\listid75\listoverridecount0\ls75}{\listoverride\listid76\listoverridecount0\ls76}{\listoverride\listid77\listoverridecount0\ls77}{\listoverride\listid78\listoverridecount0\ls78}{\listoverride\listid79\listoverridecount0\ls79}{\listoverride\listid80\listoverridecount0\ls80}{\listoverride\listid81\listoverridecount0\ls81}{\listoverride\listid82\listoverridecount0\ls82}{\listoverride\listid83\listoverridecount0\ls83}{\listoverride\listid84\listoverridecount0\ls84}}
+{\list\listtemplateid84\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid84}
+{\list\listtemplateid85\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid85}
+{\list\listtemplateid86\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid86}
+{\list\listtemplateid87\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid87}
+{\list\listtemplateid88\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid88}
+{\list\listtemplateid89\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid89}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}{\listoverride\listid8\listoverridecount0\ls8}{\listoverride\listid9\listoverridecount0\ls9}{\listoverride\listid10\listoverridecount0\ls10}{\listoverride\listid11\listoverridecount0\ls11}{\listoverride\listid12\listoverridecount0\ls12}{\listoverride\listid13\listoverridecount0\ls13}{\listoverride\listid14\listoverridecount0\ls14}{\listoverride\listid15\listoverridecount0\ls15}{\listoverride\listid16\listoverridecount0\ls16}{\listoverride\listid17\listoverridecount0\ls17}{\listoverride\listid18\listoverridecount0\ls18}{\listoverride\listid19\listoverridecount0\ls19}{\listoverride\listid20\listoverridecount0\ls20}{\listoverride\listid21\listoverridecount0\ls21}{\listoverride\listid22\listoverridecount0\ls22}{\listoverride\listid23\listoverridecount0\ls23}{\listoverride\listid24\listoverridecount0\ls24}{\listoverride\listid25\listoverridecount0\ls25}{\listoverride\listid26\listoverridecount0\ls26}{\listoverride\listid27\listoverridecount0\ls27}{\listoverride\listid28\listoverridecount0\ls28}{\listoverride\listid29\listoverridecount0\ls29}{\listoverride\listid30\listoverridecount0\ls30}{\listoverride\listid31\listoverridecount0\ls31}{\listoverride\listid32\listoverridecount0\ls32}{\listoverride\listid33\listoverridecount0\ls33}{\listoverride\listid34\listoverridecount0\ls34}{\listoverride\listid35\listoverridecount0\ls35}{\listoverride\listid36\listoverridecount0\ls36}{\listoverride\listid37\listoverridecount0\ls37}{\listoverride\listid38\listoverridecount0\ls38}{\listoverride\listid39\listoverridecount0\ls39}{\listoverride\listid40\listoverridecount0\ls40}{\listoverride\listid41\listoverridecount0\ls41}{\listoverride\listid42\listoverridecount0\ls42}{\listoverride\listid43\listoverridecount0\ls43}{\listoverride\listid44\listoverridecount0\ls44}{\listoverride\listid45\listoverridecount0\ls45}{\listoverride\listid46\listoverridecount0\ls46}{\listoverride\listid47\listoverridecount0\ls47}{\listoverride\listid48\listoverridecount0\ls48}{\listoverride\listid49\listoverridecount0\ls49}{\listoverride\listid50\listoverridecount0\ls50}{\listoverride\listid51\listoverridecount0\ls51}{\listoverride\listid52\listoverridecount0\ls52}{\listoverride\listid53\listoverridecount0\ls53}{\listoverride\listid54\listoverridecount0\ls54}{\listoverride\listid55\listoverridecount0\ls55}{\listoverride\listid56\listoverridecount0\ls56}{\listoverride\listid57\listoverridecount0\ls57}{\listoverride\listid58\listoverridecount0\ls58}{\listoverride\listid59\listoverridecount0\ls59}{\listoverride\listid60\listoverridecount0\ls60}{\listoverride\listid61\listoverridecount0\ls61}{\listoverride\listid62\listoverridecount0\ls62}{\listoverride\listid63\listoverridecount0\ls63}{\listoverride\listid64\listoverridecount0\ls64}{\listoverride\listid65\listoverridecount0\ls65}{\listoverride\listid66\listoverridecount0\ls66}{\listoverride\listid67\listoverridecount0\ls67}{\listoverride\listid68\listoverridecount0\ls68}{\listoverride\listid69\listoverridecount0\ls69}{\listoverride\listid70\listoverridecount0\ls70}{\listoverride\listid71\listoverridecount0\ls71}{\listoverride\listid72\listoverridecount0\ls72}{\listoverride\listid73\listoverridecount0\ls73}{\listoverride\listid74\listoverridecount0\ls74}{\listoverride\listid75\listoverridecount0\ls75}{\listoverride\listid76\listoverridecount0\ls76}{\listoverride\listid77\listoverridecount0\ls77}{\listoverride\listid78\listoverridecount0\ls78}{\listoverride\listid79\listoverridecount0\ls79}{\listoverride\listid80\listoverridecount0\ls80}{\listoverride\listid81\listoverridecount0\ls81}{\listoverride\listid82\listoverridecount0\ls82}{\listoverride\listid83\listoverridecount0\ls83}{\listoverride\listid84\listoverridecount0\ls84}{\listoverride\listid85\listoverridecount0\ls85}{\listoverride\listid86\listoverridecount0\ls86}{\listoverride\listid87\listoverridecount0\ls87}{\listoverride\listid88\listoverridecount0\ls88}{\listoverride\listid89\listoverridecount0\ls89}}
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\f0\fs60 \cf0 Skim Release Notes\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f1\fs22 \cf0 \
-Last update: 14 June 2007 (rev
-\f2\fs20 2307)
+Last update: 29 June 2007 (rev
+\f2\fs20 2389)
\f1\fs22 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
@@ -124,14 +129,24 @@
{\listtext \'a5 }Extensions to AppleScript support. Support for selections, additional note properties; new revert, find, and join commands; allow creation of markups; many new properties for documents, pages, and notes.\
{\listtext \'a5 }You can now change the icon type of anchored notes from the note's window to some standard proofreader marks.\
{\listtext \'a5 }Hidden default for icon type of anchored notes (SKAnchoredNoteiconType).\
-\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
+\ls2\ilvl0\cf0 {\listtext \'a5 }Skim now saves the file type and creator code.\
+\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
+\ls3\ilvl0\cf0 {\listtext \'a5 }The reading bar is now shown on the thumbnails.\
+\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
+\ls4\ilvl0\cf0 {\listtext \'a5 }Add border/line properties to circle, box, text and line notes. Accessible through a new inspector panel and AppleScript.\
+\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
+\ls5\ilvl0\cf0 {\listtext \'a5 }Allow setting the interior (fill) color for circles and boxes. Select the check button at the bottom of the color panel.\
+{\listtext \'a5 }Add a TeX editor perset for LyX.\
+{\listtext \'a5 }Hidden defaults for line styles and interior colors.\
+\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\f3\b\fs28 \cf0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f4\i\fs26 \cf0 Bugs Fixed\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls2\ilvl0
+\ls6\ilvl0
\f1\i0\b0\fs22 \cf0 {\listtext \'a5 }Use old-style check for network availability for the updater, as the newer API is not reliable for dial-up connections.\
{\listtext \'a5 }Never add a new note on a click in note tool mode, because undoing such an addition can also remove a text edit in progress.\
{\listtext \'a5 }Update the window title when the document is reloaded; the number of pages can change. \
@@ -140,6 +155,16 @@
{\listtext \'a5 }Fix AppleScript support for note color property.\
{\listtext \'a5 }Add help about cropping pages.\
{\listtext \'a5 }Start and end points for arrow notes in AppleScript are now relative to the page, and changing them automatically changes the bounds.\
+\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
+\ls7\ilvl0\cf0 {\listtext \'a5 }The side panels in full screen mode are now hidden when you switch to another application.\
+{\listtext \'a5 }Renamed "Arrow" to "Line", as it now allows more general line styles. Also change some keyboard shortcuts.\
+{\listtext \'a5 }Enable Password menu item for encrypted files that are flagged as unlocked, as the latter is unreliable in PDFKit.\
+{\listtext \'a5 }Fix tab-loop for PDFs with fiallable forms. Also add some help about fillable forms.\
+{\listtext \'a5 }Fix issues with updating the color panel.\
+{\listtext \'a5 }Fix saving of window frames for shared windows.\
+{\listtext \'a5 }Scroll reading bar to visible when it is moved.\
+{\listtext \'a5 }Default text templates now sort the notes according to the page.\
+{\listtext \'a5 }Fix a bug that prevented adding notes in note tool mode on some places on the page.\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f3\b\fs28 \cf0 \
@@ -149,7 +174,7 @@
\f4\i\fs26 \cf0 Bugs Fixed\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls3\ilvl0
+\ls8\ilvl0
\f1\i0\b0\fs22 \cf0 {\listtext \'a5 }Fixed installation of new versions by updater.\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
@@ -161,50 +186,50 @@
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 New Features\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls4\ilvl0
+\ls9\ilvl0
\f1\i0\b0\fs22 \cf0 {\listtext \'a5 }Add a menu item in the Help menu to visit the web site.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls5\ilvl0\cf0 {\listtext \'a5 }Add single-character shortcuts to change the note style in note mode (t, n, c, b, h, u, s, a).\
+\ls10\ilvl0\cf0 {\listtext \'a5 }Add single-character shortcuts to change the note style in note mode (t, n, c, b, h, u, s, a).\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls6\ilvl0\cf0 {\listtext \'a5 }Fix PDFSync support to work with file names containing spaces.\
+\ls11\ilvl0\cf0 {\listtext \'a5 }Fix PDFSync support to work with file names containing spaces.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls7\ilvl0\cf0 {\listtext \'a5 }Add hidden default for activation of navigation buttons in presentation mode (SKActivatePresentationNavigationAtBottom).\
+\ls12\ilvl0\cf0 {\listtext \'a5 }Add hidden default for activation of navigation buttons in presentation mode (SKActivatePresentationNavigationAtBottom).\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls8\ilvl0\cf0 {\listtext \'a5 }Start search using the find panel at the current page when there is no selection.\
+\ls13\ilvl0\cf0 {\listtext \'a5 }Start search using the find panel at the current page when there is no selection.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls9\ilvl0\cf0 {\listtext \'a5 }Wrap selection using the find panel.\
+\ls14\ilvl0\cf0 {\listtext \'a5 }Wrap selection using the find panel.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls10\ilvl0\cf0 {\listtext \'a5 }Add support for apple remote control. It can be disabled through the hidden default SKEnableAppleRemote.\
+\ls15\ilvl0\cf0 {\listtext \'a5 }Add support for apple remote control. It can be disabled through the hidden default SKEnableAppleRemote.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls11\ilvl0\cf0 {\listtext \'a5 }Hidden defaults for line ending style of arrows (SKLineNoteStartLineStyle, SKLineNoteEndLineStyle).\
+\ls16\ilvl0\cf0 {\listtext \'a5 }Hidden defaults for line ending style of arrows (SKLineNoteStartLineStyle, SKLineNoteEndLineStyle).\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls12\ilvl0\cf0 {\listtext \'a5 }Hidden pref option for reading missing notes from separate .skim file (SKReadMissingNotesFromSkimFileOption). \
+\ls17\ilvl0\cf0 {\listtext \'a5 }Hidden pref option for reading missing notes from separate .skim file (SKReadMissingNotesFromSkimFileOption). \
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls13\ilvl0\cf0 {\listtext \'a5 }You can now open the corresponding PDF from a Skim Notes document.\
+\ls18\ilvl0\cf0 {\listtext \'a5 }You can now open the corresponding PDF from a Skim Notes document.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls14\ilvl0\cf0 {\listtext \'a5 }Skim can now read TIFF images from the clipboard.\
+\ls19\ilvl0\cf0 {\listtext \'a5 }Skim can now read TIFF images from the clipboard.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls15\ilvl0\cf0 {\listtext \'a5 }New select tool. Allows you to copy PDF and TIFF images from a section of a page.\
+\ls20\ilvl0\cf0 {\listtext \'a5 }New select tool. Allows you to copy PDF and TIFF images from a section of a page.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls16\ilvl0\cf0 {\listtext \'a5 }You can now search Skim note files from Spotlight.\
+\ls21\ilvl0\cf0 {\listtext \'a5 }You can now search Skim note files from Spotlight.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls17\ilvl0\cf0 {\listtext \'a5 }New Crop menu items and toolbar button.\
+\ls22\ilvl0\cf0 {\listtext \'a5 }New Crop menu items and toolbar button.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls18\ilvl0\cf0 {\listtext \'a5 }Cropping and page rotation are now undoable.\
+\ls23\ilvl0\cf0 {\listtext \'a5 }Cropping and page rotation are now undoable.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls19\ilvl0\cf0 {\listtext \'a5 }Allow reverting a document when it has changed on disk.\
+\ls24\ilvl0\cf0 {\listtext \'a5 }Allow reverting a document when it has changed on disk.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls20\ilvl0\cf0 {\listtext \'a5 }New menu item to set the selection from the content of the page.\
+\ls25\ilvl0\cf0 {\listtext \'a5 }New menu item to set the selection from the content of the page.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls21\ilvl0\cf0 {\listtext \'a5 }Hidden defaults for automatic crop box margins (SKAutoCropBoxMarginWidth, SKAutoCropBoxMarginHeight).\
+\ls26\ilvl0\cf0 {\listtext \'a5 }Hidden defaults for automatic crop box margins (SKAutoCropBoxMarginWidth, SKAutoCropBoxMarginHeight).\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls22\ilvl0\cf0 {\listtext \'a5 }New Zoom To Selection menu item and toolbar button.\
+\ls27\ilvl0\cf0 {\listtext \'a5 }New Zoom To Selection menu item and toolbar button.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls23\ilvl0\cf0 {\listtext \'a5 }New preference option to open files fit to the PDF.\
+\ls28\ilvl0\cf0 {\listtext \'a5 }New preference option to open files fit to the PDF.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls24\ilvl0\cf0 {\listtext \'a5 }You can now join markup highlights using shift-click, or by selecting a highlight before adding a new one.\
+\ls29\ilvl0\cf0 {\listtext \'a5 }You can now join markup highlights using shift-click, or by selecting a highlight before adding a new one.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls25\ilvl0\cf0 {\listtext \'a5 }You can now supply templates for text export of notes. See the wiki for more information.\
+\ls30\ilvl0\cf0 {\listtext \'a5 }You can now supply templates for text export of notes. See the wiki for more information.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\f3\b\fs28 \cf0 \
@@ -212,26 +237,26 @@
\f4\i\fs26 \cf0 Bugs Fixed\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls26\ilvl0
+\ls31\ilvl0
\f1\i0\b0\fs22 \cf0 {\listtext \'a5 }Fix links in help.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls27\ilvl0\cf0 {\listtext \'a5 }Don't create a new note in note tool mode on mousedown outside a page.\
+\ls32\ilvl0\cf0 {\listtext \'a5 }Don't create a new note in note tool mode on mousedown outside a page.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls28\ilvl0\cf0 {\listtext \'a5 }Don't add new resizable notes in note tool mode when just clicking.\
+\ls33\ilvl0\cf0 {\listtext \'a5 }Don't add new resizable notes in note tool mode when just clicking.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls29\ilvl0\cf0 {\listtext \'a5 }You can now access links that are "hidden" by transparent highlights and arrows.\
+\ls34\ilvl0\cf0 {\listtext \'a5 }You can now access links that are "hidden" by transparent highlights and arrows.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls30\ilvl0\cf0 {\listtext \'a5 }Scroll reading bar to visible when it is shown.\
+\ls35\ilvl0\cf0 {\listtext \'a5 }Scroll reading bar to visible when it is shown.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls31\ilvl0\cf0 {\listtext \'a5 }Scroll to previous position on page when reloading PDF.\
+\ls36\ilvl0\cf0 {\listtext \'a5 }Scroll to previous position on page when reloading PDF.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls32\ilvl0\cf0 {\listtext \'a5 }Escape spaces in TeX editor command.\
+\ls37\ilvl0\cf0 {\listtext \'a5 }Escape spaces in TeX editor command.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls33\ilvl0\cf0 {\listtext \'a5 }Thumbnails now use the current display box.\
+\ls38\ilvl0\cf0 {\listtext \'a5 }Thumbnails now use the current display box.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls34\ilvl0\cf0 {\listtext \'a5 }Retry automatic reloading of files changed on disk a few times.\
+\ls39\ilvl0\cf0 {\listtext \'a5 }Retry automatic reloading of files changed on disk a few times.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls34\ilvl0
+\ls39\ilvl0
\f3\b\fs28 \cf0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 Changes since 0.2\
@@ -241,74 +266,74 @@
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 New Features\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls35\ilvl0
+\ls40\ilvl0
\f1\i0\b0\fs22 \cf0 {\listtext \'a5 }Add shortcuts for bigger/smaller font sizes.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls36\ilvl0\cf0 {\listtext \'a5 }Command-click a snapshot.\
+\ls41\ilvl0\cf0 {\listtext \'a5 }Command-click a snapshot.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls37\ilvl0\cf0 {\listtext \'a5 }We now print notes and highlights.\
+\ls42\ilvl0\cf0 {\listtext \'a5 }We now print notes and highlights.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls38\ilvl0\cf0 {\listtext \'a5 }Add copy/cut/paste items to the contextual menu, when they apply.\
+\ls43\ilvl0\cf0 {\listtext \'a5 }Add copy/cut/paste items to the contextual menu, when they apply.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls39\ilvl0\cf0 {\listtext \'a5 }You can now make a snapshot of a page by Command-clicking a thumbnail.\
+\ls44\ilvl0\cf0 {\listtext \'a5 }You can now make a snapshot of a page by Command-clicking a thumbnail.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls40\ilvl0\cf0 {\listtext \'a5 }Added Dutch localization.\
+\ls45\ilvl0\cf0 {\listtext \'a5 }Added Dutch localization.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls41\ilvl0\cf0 {\listtext \'a5 }We now do not leave Full Screen when switching to another application.\
+\ls46\ilvl0\cf0 {\listtext \'a5 }We now do not leave Full Screen when switching to another application.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls42\ilvl0\cf0 {\listtext \'a5 }Export notes as RTF.\
+\ls47\ilvl0\cf0 {\listtext \'a5 }Export notes as RTF.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls43\ilvl0\cf0 {\listtext \'a5 }Add preference options for default note/highlight colors and text note font.\
+\ls48\ilvl0\cf0 {\listtext \'a5 }Add preference options for default note/highlight colors and text note font.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls44\ilvl0\cf0 {\listtext \'a5 }Add menu item to save the current PDF display settings to be used for new documents.\
+\ls49\ilvl0\cf0 {\listtext \'a5 }Add menu item to save the current PDF display settings to be used for new documents.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls45\ilvl0\cf0 {\listtext \'a5 }Search results from the Find Panel are now also highlighted with a red oval.\
+\ls50\ilvl0\cf0 {\listtext \'a5 }Search results from the Find Panel are now also highlighted with a red oval.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls46\ilvl0\cf0 {\listtext \'a5 }Select search field when opening the Contents pane in full screen mode.\
+\ls51\ilvl0\cf0 {\listtext \'a5 }Select search field when opening the Contents pane in full screen mode.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls47\ilvl0\cf0 {\listtext \'a5 }You can now reset all preferences or all preferences in a pane.\
+\ls52\ilvl0\cf0 {\listtext \'a5 }You can now reset all preferences or all preferences in a pane.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls48\ilvl0\cf0 {\listtext \'a5 }Added Italian localization. (Thanks Andrea Bergia!)\
+\ls53\ilvl0\cf0 {\listtext \'a5 }Added Italian localization. (Thanks Andrea Bergia!)\
{\listtext \'a5 }Screensaver and sleep are now disabled in Presentation mode.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls49\ilvl0\cf0 {\listtext \'a5 }Skim can now return to the last page viewed in a document.\
+\ls54\ilvl0\cf0 {\listtext \'a5 }Skim can now return to the last page viewed in a document.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls50\ilvl0\cf0 {\listtext \'a5 }Link tool tips now show the top of the text when the link refers to the (empty) top of a page. \
+\ls55\ilvl0\cf0 {\listtext \'a5 }Link tool tips now show the top of the text when the link refers to the (empty) top of a page. \
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls51\ilvl0\cf0 {\listtext \'a5 }Skim can now also view separate Skim notes (.skim) files.\
+\ls56\ilvl0\cf0 {\listtext \'a5 }Skim can now also view separate Skim notes (.skim) files.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls52\ilvl0\cf0 {\listtext \'a5 }Using Sparkle for automatic updating. (Thanks Andy Matuschak!)\
+\ls57\ilvl0\cf0 {\listtext \'a5 }Using Sparkle for automatic updating. (Thanks Andy Matuschak!)\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls53\ilvl0\cf0 {\listtext \'a5 }Display the number of pages in the title bar.\
+\ls58\ilvl0\cf0 {\listtext \'a5 }Display the number of pages in the title bar.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls54\ilvl0\cf0 {\listtext \'a5 }Skim can now automatically backup a skim notes file whenever it saves a PDF file.\
+\ls59\ilvl0\cf0 {\listtext \'a5 }Skim can now automatically backup a skim notes file whenever it saves a PDF file.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls55\ilvl0\cf0 {\listtext \'a5 }You can now resize the current note using the arrow keys, when you hold down the Control key.\
+\ls60\ilvl0\cf0 {\listtext \'a5 }You can now resize the current note using the arrow keys, when you hold down the Control key.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls56\ilvl0\cf0 {\listtext \'a5 }Notes are now ordered according to page and location in page.\
+\ls61\ilvl0\cf0 {\listtext \'a5 }Notes are now ordered according to page and location in page.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls57\ilvl0\cf0 {\listtext \'a5 }Several improvements of Skim's custom tool-tips.\
+\ls62\ilvl0\cf0 {\listtext \'a5 }Several improvements of Skim's custom tool-tips.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls58\ilvl0\cf0 {\listtext \'a5 }Add a menu item to select the search field.\
+\ls63\ilvl0\cf0 {\listtext \'a5 }Add a menu item to select the search field.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls59\ilvl0\cf0 {\listtext \'a5 }You can now add arrows to a PDF document.\
+\ls64\ilvl0\cf0 {\listtext \'a5 }You can now add arrows to a PDF document.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls60\ilvl0\cf0 {\listtext \'a5 }You can now add notes from external .skim files rather than just overwriting them.\
+\ls65\ilvl0\cf0 {\listtext \'a5 }You can now add notes from external .skim files rather than just overwriting them.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls61\ilvl0\cf0 {\listtext \'a5 }PDFSync support. See the Wiki for more information.\
+\ls66\ilvl0\cf0 {\listtext \'a5 }PDFSync support. See the Wiki for more information.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls62\ilvl0\cf0 {\listtext \'a5 }You can now set transparent colors from the color panel. \
+\ls67\ilvl0\cf0 {\listtext \'a5 }You can now set transparent colors from the color panel. \
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls63\ilvl0\cf0 {\listtext \'a5 }You can now set separate PDF view settings for full screen mode. \
+\ls68\ilvl0\cf0 {\listtext \'a5 }You can now set separate PDF view settings for full screen mode. \
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls64\ilvl0\cf0 {\listtext \'a5 }Add a Look Up in Dictionary item to the contextual menu.\
+\ls69\ilvl0\cf0 {\listtext \'a5 }Add a Look Up in Dictionary item to the contextual menu.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls65\ilvl0\cf0 {\listtext \'a5 }You can now undo edits of notes and highlights.\
+\ls70\ilvl0\cf0 {\listtext \'a5 }You can now undo edits of notes and highlights.\
{\listtext \'a5 }Add a hidden preference (SKActivateFullScreenNavigationAtBottom) to show the navigation buttons in full screen mode only when moving the mouse at the bottom of the screen. \
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls66\ilvl0\cf0 {\listtext \'a5 }Add hidden preferences for the line widths of circles and boxes (SKCircleNoteLineWidth and SKSquareNoteLineWidth).\
+\ls71\ilvl0\cf0 {\listtext \'a5 }Add hidden preferences for the line widths of circles and boxes (SKCircleNoteLineWidth and SKSquareNoteLineWidth).\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls67\ilvl0\cf0 {\listtext \'a5 }New tool modes for ading notes or highlights.\
+\ls72\ilvl0\cf0 {\listtext \'a5 }New tool modes for ading notes or highlights.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
\f3\b\fs28 \cf0 \
@@ -316,40 +341,40 @@
\f4\i\fs26 \cf0 Bugs Fixed\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls68\ilvl0
+\ls73\ilvl0
\f1\i0\b0\fs22 \cf0 {\listtext \'a5 }We now don't edit new text notes, so they can be moved, resized or deleted.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls69\ilvl0\cf0 {\listtext \'a5 }We now make sure new notes are added to a visible page.\
+\ls74\ilvl0\cf0 {\listtext \'a5 }We now make sure new notes are added to a visible page.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls70\ilvl0\cf0 {\listtext \'a5 }Disable the TOC menu item when there is no TOC.\
+\ls75\ilvl0\cf0 {\listtext \'a5 }Disable the TOC menu item when there is no TOC.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls71\ilvl0\cf0 {\listtext \'a5 }Return to the location that was viewed when reloading a document.\
+\ls76\ilvl0\cf0 {\listtext \'a5 }Return to the location that was viewed when reloading a document.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls72\ilvl0\cf0 {\listtext \'a5 }Search text in a PDf file asynchronously, so it does not block Skim.\
+\ls77\ilvl0\cf0 {\listtext \'a5 }Search text in a PDf file asynchronously, so it does not block Skim.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls73\ilvl0\cf0 {\listtext \'a5 }Fix crashes that can appear for links with missing URLs.\
+\ls78\ilvl0\cf0 {\listtext \'a5 }Fix crashes that can appear for links with missing URLs.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls74\ilvl0\cf0 {\listtext \'a5 }Add separators in the Notes menu for categories.\
+\ls79\ilvl0\cf0 {\listtext \'a5 }Add separators in the Notes menu for categories.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls75\ilvl0\cf0 {\listtext \'a5 }Fix a crasher when reverting a PDF-document.\
+\ls80\ilvl0\cf0 {\listtext \'a5 }Fix a crasher when reverting a PDF-document.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls76\ilvl0\cf0 {\listtext \'a5 }Fix typos in the Help and update for new features.\
+\ls81\ilvl0\cf0 {\listtext \'a5 }Fix typos in the Help and update for new features.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls77\ilvl0\cf0 {\listtext \'a5 }Fix a crasher when reverting the document. Unfortunately this disabled tool tips.\
+\ls82\ilvl0\cf0 {\listtext \'a5 }Fix a crasher when reverting the document. Unfortunately this disabled tool tips.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls78\ilvl0\cf0 {\listtext \'a5 }Open the contents pane to display the search term when opening from Spotlight.\
+\ls83\ilvl0\cf0 {\listtext \'a5 }Open the contents pane to display the search term when opening from Spotlight.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls79\ilvl0\cf0 {\listtext \'a5 }Save notes when auto-saving and exporting as PDF.\
+\ls84\ilvl0\cf0 {\listtext \'a5 }Save notes when auto-saving and exporting as PDF.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls80\ilvl0\cf0 {\listtext \'a5 }Remember the width of notes pane.\
+\ls85\ilvl0\cf0 {\listtext \'a5 }Remember the width of notes pane.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls81\ilvl0\cf0 {\listtext \'a5 }Fix leaks leading to excessive memory use.\
+\ls86\ilvl0\cf0 {\listtext \'a5 }Fix leaks leading to excessive memory use.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls82\ilvl0\cf0 {\listtext \'a5 }Fix back-tabbing through notes and links.\
+\ls87\ilvl0\cf0 {\listtext \'a5 }Fix back-tabbing through notes and links.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls83\ilvl0\cf0 {\listtext \'a5 }Zooming using the scroll-wheel now only affects the current window.\
+\ls88\ilvl0\cf0 {\listtext \'a5 }Zooming using the scroll-wheel now only affects the current window.\
\pard\tx220\tx720\tx1440\tx2880\tx4320\tx5760\tx7200\li720\fi-720\ql\qnatural
-\ls84\ilvl0\cf0 {\listtext \'a5 }Lazy updating of page thumbnails to avoid slowdown when opening a file.\
+\ls89\ilvl0\cf0 {\listtext \'a5 }Lazy updating of page thumbnails to avoid slowdown when opening a file.\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f3\b\fs28 \cf0 \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-26 17:16:23
|
Revision: 2389
http://skim-app.svn.sourceforge.net/skim-app/?rev=2389&view=rev
Author: hofman
Date: 2007-06-26 10:16:21 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
Also remember if a snapshot window was open.
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKSnapshotWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-26 17:04:49 UTC (rev 2388)
+++ trunk/SKMainWindowController.m 2007-06-26 17:16:21 UTC (rev 2389)
@@ -283,7 +283,7 @@
NSEnumerator *setupEnum = [[[SKBookmarkController sharedBookmarkController] snapshotsAtPath:[[[self document] fileURL] path]] objectEnumerator];
NSDictionary *setup;
if (setup = [setupEnum nextObject])
- [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"page"] floatValue] display:NO];
+ [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"page"] floatValue] display:[[setup objectForKey:@"hasWindow"] boolValue]];
}
[self handleChangedHistoryNotification:nil];
@@ -610,7 +610,7 @@
NSEnumerator *setupEnum = [snapshotDicts objectEnumerator];
NSDictionary *setup;
while (setup = [setupEnum nextObject])
- [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"page"] floatValue] display:NO];
+ [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"page"] floatValue] display:[[setup objectForKey:@"hasWindow"] boolValue]];
if (pageIndex != NSNotFound && [document pageCount]) {
PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document pageCount] - 1)];
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2007-06-26 17:04:49 UTC (rev 2388)
+++ trunk/SKSnapshotWindowController.m 2007-06-26 17:16:21 UTC (rev 2389)
@@ -288,7 +288,7 @@
- (NSDictionary *)currentSetup {
NSView *clipView = [[[pdfView documentView] enclosingScrollView] contentView];
NSRect rect = [pdfView convertRect:[pdfView convertRect:[clipView bounds] fromView:clipView] toPage:[pdfView currentPage]];
- return [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:[self pageIndex]], @"page", NSStringFromRect(rect), @"rect", [NSNumber numberWithFloat:[pdfView scaleFactor]], @"scaleFactor", nil];
+ return [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:[self pageIndex]], @"page", NSStringFromRect(rect), @"rect", [NSNumber numberWithFloat:[pdfView scaleFactor]], @"scaleFactor", [NSNumber numberWithBool:[[self window] isVisible]], @"hasWindow", nil];
}
#pragma mark Thumbnails
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-26 17:04:50
|
Revision: 2388
http://skim-app.svn.sourceforge.net/skim-app/?rev=2388&view=rev
Author: hofman
Date: 2007-06-26 10:04:49 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
Reopen snapshots when reverting the document. Add a hidden pref to remember the snapshots.
Modified Paths:
--------------
trunk/SKBookmarkController.h
trunk/SKBookmarkController.m
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKPDFView.m
trunk/SKSnapshotWindowController.h
trunk/SKSnapshotWindowController.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
Modified: trunk/SKBookmarkController.h
===================================================================
--- trunk/SKBookmarkController.h 2007-06-26 15:32:27 UTC (rev 2387)
+++ trunk/SKBookmarkController.h 2007-06-26 17:04:49 UTC (rev 2388)
@@ -57,8 +57,9 @@
- (NSString *)bookmarksFilePath;
- (NSArray *)recentDocuments;
-- (void)addRecentDocumentForPath:(NSString *)path pageIndex:(unsigned)pageIndex;
+- (void)addRecentDocumentForPath:(NSString *)path pageIndex:(unsigned)pageIndex snapshots:(NSArray *)setups;
- (unsigned int)pageIndexForRecentDocumentAtPath:(NSString *)path;
+- (NSArray *)snapshotsAtPath:(NSString *)path;
@end
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2007-06-26 15:32:27 UTC (rev 2387)
+++ trunk/SKBookmarkController.m 2007-06-26 17:04:49 UTC (rev 2388)
@@ -146,7 +146,7 @@
return index;
}
-- (void)addRecentDocumentForPath:(NSString *)path pageIndex:(unsigned)pageIndex {
+- (void)addRecentDocumentForPath:(NSString *)path pageIndex:(unsigned)pageIndex snapshots:(NSArray *)setups {
if (path == nil)
return;
@@ -155,7 +155,7 @@
[recentDocuments removeObjectAtIndex:index];
NSData *data = [[BDAlias aliasWithPath:path] aliasData];
- NSMutableDictionary *bm = [NSMutableDictionary dictionaryWithObjectsAndKeys:path, @"path", [NSNumber numberWithUnsignedInt:pageIndex], @"pageIndex", data, @"_BDAlias", nil];
+ NSMutableDictionary *bm = [NSMutableDictionary dictionaryWithObjectsAndKeys:path, @"path", [NSNumber numberWithUnsignedInt:pageIndex], @"pageIndex", data, @"_BDAlias", [setups count] ? setups : nil, @"snapshots", nil];
[recentDocuments insertObject:bm atIndex:0];
if ([recentDocuments count] > maxRecentDocumentsCount)
[recentDocuments removeLastObject];
@@ -170,6 +170,14 @@
return index == NSNotFound ? NSNotFound : [[[recentDocuments objectAtIndex:index] objectForKey:@"pageIndex"] unsignedIntValue];
}
+- (NSArray *)snapshotsAtPath:(NSString *)path {
+ if (path == nil)
+ return nil;
+ unsigned int index = [self indexOfRecentDocumentAtPath:path];
+ NSArray *setups = index == NSNotFound ? nil : [[recentDocuments objectAtIndex:index] objectForKey:@"snapshots"];
+ return [setups count] ? setups : nil;
+}
+
- (void)saveBookmarks {
NSDictionary *bookmarksDictionary = [NSDictionary dictionaryWithObjectsAndKeys:bookmarks, @"bookmarks", recentDocuments, @"recentDocuments", nil];
NSString *error = nil;
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2007-06-26 15:32:27 UTC (rev 2387)
+++ trunk/SKMainWindowController.h 2007-06-26 17:04:49 UTC (rev 2388)
@@ -236,7 +236,7 @@
- (IBAction)dismissPasswordSheet:(id)sender;
- (IBAction)savePDFSettingToDefaults:(id)sender;
-- (void)showSnapshotAtPageNumber:(int)pageNum forRect:(NSRect)rect factor:(int)factor;
+- (void)showSnapshotAtPageNumber:(int)pageNum forRect:(NSRect)rect factor:(int)factor display:(BOOL)display;
- (void)toggleSnapshots:(NSArray *)snapshotArray;
- (void)showNote:(PDFAnnotation *)annotation;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-26 15:32:27 UTC (rev 2387)
+++ trunk/SKMainWindowController.m 2007-06-26 17:04:49 UTC (rev 2388)
@@ -279,6 +279,13 @@
[[self window] makeFirstResponder:[pdfView documentView]];
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:SKRememberSnapshotsKey]) {
+ NSEnumerator *setupEnum = [[[SKBookmarkController sharedBookmarkController] snapshotsAtPath:[[[self document] fileURL] path]] objectEnumerator];
+ NSDictionary *setup;
+ if (setup = [setupEnum nextObject])
+ [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"page"] floatValue] display:NO];
+ }
+
[self handleChangedHistoryNotification:nil];
[self handlePageChangedNotification:nil];
[self handleScaleChangedNotification:nil];
@@ -540,7 +547,7 @@
unsigned int pageIndex = [[pdfView document] indexForPage:[pdfView currentPage]];
NSString *path = [[[self document] fileURL] path];
if (pageIndex != NSNotFound && path)
- [[SKBookmarkController sharedBookmarkController] addRecentDocumentForPath:path pageIndex:pageIndex];
+ [[SKBookmarkController sharedBookmarkController] addRecentDocumentForPath:path pageIndex:pageIndex snapshots:[snapshots valueForKey:@"currentSetup"]];
}
[super setDocument:document];
}
@@ -567,6 +574,10 @@
[[self mutableArrayValueForKey:@"notes"] removeAllObjects];
[[self mutableArrayValueForKey:@"thumbnails"] removeAllObjects];
+ NSArray *snapshotDicts = [snapshots valueForKey:@"currentSetup"];
+ [snapshots makeObjectsPerformSelector:@selector(close) withObject:nil];
+ [[self mutableArrayValueForKey:@"snapshots"] removeAllObjects];
+
[lastViewedPages removeAllObjects];
[self unregisterForDocumentNotifications];
@@ -596,6 +607,11 @@
[self resetThumbnails];
[self updateThumbnailSelection];
+ NSEnumerator *setupEnum = [snapshotDicts objectEnumerator];
+ NSDictionary *setup;
+ while (setup = [setupEnum nextObject])
+ [self showSnapshotAtPageNumber:[[setup objectForKey:@"page"] unsignedIntValue] forRect:NSRectFromString([setup objectForKey:@"rect"]) factor:[[setup objectForKey:@"page"] floatValue] display:NO];
+
if (pageIndex != NSNotFound && [document pageCount]) {
PDFPage *page = [document pageAtIndex:MIN(pageIndex, [document pageCount] - 1)];
[pdfView goToPage:page];
@@ -2102,7 +2118,7 @@
#pragma mark Sub- and note- windows
-- (void)showSnapshotAtPageNumber:(int)pageNum forRect:(NSRect)rect factor:(int)factor{
+- (void)showSnapshotAtPageNumber:(int)pageNum forRect:(NSRect)rect factor:(int)factor display:(BOOL)display{
SKSnapshotWindowController *swc = [[SKSnapshotWindowController alloc] init];
BOOL snapshotsOnTop = [[NSUserDefaults standardUserDefaults] boolForKey:SKSnapshotsOnTopKey];
@@ -2120,7 +2136,9 @@
[[self document] addWindowController:swc];
[swc release];
- [swc showWindow:self];
+
+ if (display)
+ [swc showWindow:self];
}
- (void)toggleSnapshots:(NSArray *)snapshotArray {
@@ -2926,7 +2944,7 @@
rect.origin.y = NSMidY(rect) - 100.0;
rect.size.height = 200.0;
- [self showSnapshotAtPageNumber:row forRect:rect factor:1];
+ [self showSnapshotAtPageNumber:row forRect:rect factor:1 display:YES];
return YES;
}
return NO;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-26 15:32:27 UTC (rev 2387)
+++ trunk/SKPDFView.m 2007-06-26 17:04:49 UTC (rev 2388)
@@ -1629,7 +1629,7 @@
SKMainWindowController *controller = [[self window] windowController];
- [controller showSnapshotAtPageNumber:[[self document] indexForPage:page] forRect:rect factor:1];
+ [controller showSnapshotAtPageNumber:[[self document] indexForPage:page] forRect:rect factor:1 display:YES];
}
#pragma mark Notification handling
@@ -2992,7 +2992,7 @@
SKMainWindowController *controller = [[self window] windowController];
- [controller showSnapshotAtPageNumber:[[self document] indexForPage:page] forRect:[self convertRect:rect toPage:page] factor:factor];
+ [controller showSnapshotAtPageNumber:[[self document] indexForPage:page] forRect:[self convertRect:rect toPage:page] factor:factor display:YES];
}
- (void)magnifyWithEvent:(NSEvent *)theEvent {
Modified: trunk/SKSnapshotWindowController.h
===================================================================
--- trunk/SKSnapshotWindowController.h 2007-06-26 15:32:27 UTC (rev 2387)
+++ trunk/SKSnapshotWindowController.h 2007-06-26 17:04:49 UTC (rev 2388)
@@ -66,6 +66,8 @@
- (NSDictionary *)pageAndWindow;
+- (NSDictionary *)currentSetup;
+
- (BOOL)forceOnTop;
- (void)setForceOnTop:(BOOL)flag;
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2007-06-26 15:32:27 UTC (rev 2387)
+++ trunk/SKSnapshotWindowController.m 2007-06-26 17:04:49 UTC (rev 2388)
@@ -285,6 +285,12 @@
[[self window] setLevel:keepOnTop || forceOnTop ? NSFloatingWindowLevel : NSNormalWindowLevel];
}
+- (NSDictionary *)currentSetup {
+ NSView *clipView = [[[pdfView documentView] enclosingScrollView] contentView];
+ NSRect rect = [pdfView convertRect:[pdfView convertRect:[clipView bounds] fromView:clipView] toPage:[pdfView currentPage]];
+ return [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:[self pageIndex]], @"page", NSStringFromRect(rect), @"rect", [NSNumber numberWithFloat:[pdfView scaleFactor]], @"scaleFactor", nil];
+}
+
#pragma mark Thumbnails
- (NSImage *)thumbnailWithSize:(float)size {
Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h 2007-06-26 15:32:27 UTC (rev 2387)
+++ trunk/SKStringConstants.h 2007-06-26 17:04:49 UTC (rev 2388)
@@ -49,6 +49,7 @@
extern NSString *SKInitialWindowSizeOptionKey;
extern NSString *SKReopenLastOpenFilesKey;
extern NSString *SKRememberLastPageViewedKey;
+extern NSString *SKRememberSnapshotsKey;
extern NSString *SKAutoSaveSkimNotesKey;
extern NSString *SKSearchHighlightColorKey;
extern NSString *SKShouldHighlightSearchResultsKey;
Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m 2007-06-26 15:32:27 UTC (rev 2387)
+++ trunk/SKStringConstants.m 2007-06-26 17:04:49 UTC (rev 2388)
@@ -50,6 +50,7 @@
NSString *SKInitialWindowSizeOptionKey = @"SKInitialWindowSizeOption";
NSString *SKReopenLastOpenFilesKey = @"SKReopenLastOpenFiles";
NSString *SKRememberLastPageViewedKey = @"SKRememberLastPageViewed";
+NSString *SKRememberSnapshotsKey = @"SKRememberSnapshots";
NSString *SKAutoSaveSkimNotesKey = @"SKAutoSaveSkimNotes";
NSString *SKSearchHighlightColorKey = @"SKSearchHighlightColor";
NSString *SKShouldHighlightSearchResultsKey = @"SKShouldHighlightSearchResults";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-26 15:32:28
|
Revision: 2387
http://skim-app.svn.sourceforge.net/skim-app/?rev=2387&view=rev
Author: hofman
Date: 2007-06-26 08:32:27 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
Don't defer snapshot window, so the thumbnail is drawn more reliably, and the doesn't need the window to be open initially.
Modified Paths:
--------------
trunk/Dutch.lproj/SnapshotWindow.nib/info.nib
trunk/Dutch.lproj/SnapshotWindow.nib/keyedobjects.nib
trunk/English.lproj/SnapshotWindow.nib/info.nib
trunk/English.lproj/SnapshotWindow.nib/keyedobjects.nib
trunk/Italian.lproj/SnapshotWindow.nib/info.nib
trunk/Italian.lproj/SnapshotWindow.nib/keyedobjects.nib
Modified: trunk/Dutch.lproj/SnapshotWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/SnapshotWindow.nib/info.nib 2007-06-26 15:00:28 UTC (rev 2386)
+++ trunk/Dutch.lproj/SnapshotWindow.nib/info.nib 2007-06-26 15:32:27 UTC (rev 2387)
@@ -7,6 +7,6 @@
<key>IBFramework Version</key>
<string>446.1</string>
<key>IBSystem Version</key>
- <string>8P135</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/Dutch.lproj/SnapshotWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/English.lproj/SnapshotWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/SnapshotWindow.nib/info.nib 2007-06-26 15:00:28 UTC (rev 2386)
+++ trunk/English.lproj/SnapshotWindow.nib/info.nib 2007-06-26 15:32:27 UTC (rev 2387)
@@ -11,6 +11,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8L127</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/English.lproj/SnapshotWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/Italian.lproj/SnapshotWindow.nib/info.nib
===================================================================
--- trunk/Italian.lproj/SnapshotWindow.nib/info.nib 2007-06-26 15:00:28 UTC (rev 2386)
+++ trunk/Italian.lproj/SnapshotWindow.nib/info.nib 2007-06-26 15:32:27 UTC (rev 2387)
@@ -11,6 +11,6 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8L127</string>
+ <string>8R218</string>
</dict>
</plist>
Modified: trunk/Italian.lproj/SnapshotWindow.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-26 15:00:30
|
Revision: 2386
http://skim-app.svn.sourceforge.net/skim-app/?rev=2386&view=rev
Author: hofman
Date: 2007-06-26 08:00:28 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
Check mouse loc in page coordinates.
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-26 14:31:50 UTC (rev 2385)
+++ trunk/SKPDFView.m 2007-06-26 15:00:28 UTC (rev 2386)
@@ -2315,7 +2315,7 @@
[newAnnotation release];
} else if (toolMode == SKNoteToolMode && newActiveAnnotation == nil &&
annotationMode != SKHighlightNote && annotationMode != SKUnderlineNote && annotationMode != SKStrikeOutNote &&
- NSPointInRect(mouseDownOnPage, [page boundsForBox:[self displayBox]])) {
+ NSPointInRect(pagePoint, [page boundsForBox:[self displayBox]])) {
// add a new annotation immediately, unless this is just a click
if (annotationMode == SKAnchoredNote || NSLeftMouseDragged == [[NSApp nextEventMatchingMask:(NSLeftMouseUpMask | NSLeftMouseDraggedMask) untilDate:[NSDate distantFuture] inMode:NSDefaultRunLoopMode dequeue:NO] type]) {
float width = annotationMode == SKAnchoredNote ? 16.0 : annotationMode == SKLineNote ? 4.0 : 8.0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-26 14:31:51
|
Revision: 2385
http://skim-app.svn.sourceforge.net/skim-app/?rev=2385&view=rev
Author: hofman
Date: 2007-06-26 07:31:50 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
Sort notes in default text templates.
Modified Paths:
--------------
trunk/notesTemplate.rtf
trunk/notesTemplate.txt
Modified: trunk/notesTemplate.rtf
===================================================================
--- trunk/notesTemplate.rtf 2007-06-26 12:13:00 UTC (rev 2384)
+++ trunk/notesTemplate.rtf 2007-06-26 14:31:50 UTC (rev 2385)
@@ -1,9 +1,10 @@
{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf410
{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
{\colortbl;\red255\green255\blue255;}
+\vieww10500\viewh9000\viewkind0
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-\f0\fs24 \cf0 <$notes>\
+\f0\fs24 \cf0 <$notes.@arraySortedByBounds.@arraySortedByPageIndex>\
\'a5 <$type.typeName/>, page <$pageIndex.numberByAddingOne/>\
\
<$contents?>\
@@ -14,5 +15,5 @@
<$text/>\
\
</$text?>\
-</$notes>\
+</$notes.@arraySortedByBounds.@arraySortedByPageIndex>\
}
\ No newline at end of file
Modified: trunk/notesTemplate.txt
===================================================================
--- trunk/notesTemplate.txt 2007-06-26 12:13:00 UTC (rev 2384)
+++ trunk/notesTemplate.txt 2007-06-26 14:31:50 UTC (rev 2385)
@@ -1,4 +1,4 @@
-<$notes>
+<$notes.@arraySortedByBounds.@arraySortedByPageIndex>
* <$type.typeName/>, page <$pageIndex.numberByAddingOne/>
<$contents?>
@@ -9,4 +9,4 @@
<$text/>
</$text?>
-</$notes>
+</$notes.@arraySortedByBounds.@arraySortedByPageIndex>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2007-06-26 12:13:07
|
Revision: 2384
http://skim-app.svn.sourceforge.net/skim-app/?rev=2384&view=rev
Author: hofman
Date: 2007-06-26 05:13:00 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
Revert previous commit. I was fooled by the color panel. Calibrated colors are preferable.
Modified Paths:
--------------
trunk/BDSKEdgeView.m
trunk/BDSKImagePopUpButtonCell.m
trunk/PDFPage_SKExtensions.m
trunk/SKApplicationController.m
trunk/SKLineInspector.m
trunk/SKMainWindowController.m
trunk/SKNavigationWindow.m
trunk/SKNoteOutlineView.m
trunk/SKNoteWindowController.m
trunk/SKPDFHoverWindow.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-26 11:59:11 UTC (rev 2383)
+++ trunk/BDSKEdgeView.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -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-26 11:59:11 UTC (rev 2383)
+++ trunk/BDSKImagePopUpButtonCell.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -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/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2007-06-26 11:59:11 UTC (rev 2383)
+++ trunk/PDFPage_SKExtensions.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -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/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-06-26 11:59:11 UTC (rev 2383)
+++ trunk/SKApplicationController.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -592,7 +592,7 @@
NSRect bounds = [self bounds];
NSPoint center = NSMakePoint(NSMidX(bounds), NSMidY(bounds));
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.5] setFill];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] setFill];
[NSBezierPath fillRoundRectInRect:[self bounds] radius:10.0];
NSBezierPath *path = nil;
@@ -669,7 +669,7 @@
}
- [[NSColor colorWithDeviceWhite:1.0 alpha:1.0] setFill];
+ [[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] setFill];
[path fill];
}
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2007-06-26 11:59:11 UTC (rev 2383)
+++ trunk/SKLineInspector.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -155,14 +155,14 @@
[image lockFocus];
path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 3.0, 17.0, 6.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.3] 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 colorWithDeviceWhite:0.0 alpha:0.5] set];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] set];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(5.0, 2.0)];
@@ -182,14 +182,14 @@
[image lockFocus];
path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 3.0, 17.0, 6.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.3] 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 colorWithDeviceWhite:0.0 alpha:0.5] set];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] set];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(5.0, 2.0)];
@@ -211,7 +211,7 @@
[path moveToPoint:NSMakePoint(6.0, 3.0)];
[path lineToPoint:NSMakePoint(23.0, 3.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.65] setStroke];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.65] setStroke];
[path stroke];
[image unlockFocus];
[styleButton setImage:image forSegment:kPDFBorderStyleUnderline];
@@ -306,7 +306,7 @@
[path lineToPoint:NSMakePoint(8.0, 2.0)];
[path closePath];
[path setLineWidth:2.0];
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.65] setStroke];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.65] setStroke];
[path stroke];
[image unlockFocus];
[startLineStyleButton setImage:image forSegment:kPDFLineStyleDiamond];
@@ -323,7 +323,7 @@
[path lineToPoint:NSMakePoint(16.0, 2.0)];
[path closePath];
[path setLineWidth:2.0];
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.65] setStroke];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.65] setStroke];
[path stroke];
[image unlockFocus];
[endLineStyleButton setImage:image forSegment:kPDFLineStyleDiamond];
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-26 11:59:11 UTC (rev 2383)
+++ trunk/SKMainWindowController.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -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/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2007-06-26 11:59:11 UTC (rev 2383)
+++ trunk/SKNavigationWindow.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -178,10 +178,10 @@
- (void)drawRect:(NSRect)rect {
rect = NSInsetRect([self bounds], 1.0, 1.0);
- [[NSColor colorWithDeviceWhite:0.0 alpha:0.5] set];
+ [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] set];
[NSBezierPath fillRoundRectInRect:rect radius:10.0];
rect = NSInsetRect([self bounds], 0.5, 0.5);
- [[NSColor colorWithDeviceWhite:1.0 alpha:0.2] set];
+ [[NSColor colorWithCalibratedWhite:1.0 alpha:0.2] set];
[NSBezierPath strokeRoundRectInRect:rect radius:10.0];
}
@@ -359,7 +359,7 @@
}
- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
- [[NSColor colorWithDeviceWhite:1.0 alpha:[self isHighlighted] ? 0.9 : 0.6] set];
+ [[NSColor colorWithCalibratedWhite:1.0 alpha:[self isHighlighted] ? 0.9 : 0.6] set];
[[self pathWithFrame:cellFrame] fill];
}
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2007-06-26 11:59:11 UTC (rev 2383)
+++ trunk/SKNoteOutlineView.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -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-26 11:59:11 UTC (rev 2383)
+++ trunk/SKNoteWindowController.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -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/SKPDFHoverWindow.m
===================================================================
--- trunk/SKPDFHoverWindow.m 2007-06-26 11:59:11 UTC (rev 2383)
+++ trunk/SKPDFHoverWindow.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -74,9 +74,9 @@
[imageView release];
font = [[NSFont toolTipsFontOfSize:11.0] retain];
- backgroundColor = [[NSColor colorWithDeviceRed:1.0 green:1.0 blue:0.75 alpha:1.0] retain];
+ backgroundColor = [[NSColor colorWithCalibratedRed:1.0 green:1.0 blue:0.75 alpha:1.0] retain];
labelFont = [[NSFont boldSystemFontOfSize:11.0] retain];
- labelColor = [[NSColor colorWithDeviceWhite:0.5 alpha:0.8] retain];
+ labelColor = [[NSColor colorWithCalibratedWhite:0.5 alpha:0.8] retain];
annotation = nil;
point = NSZeroPoint;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-26 11:59:11 UTC (rev 2383)
+++ trunk/SKPDFView.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -3072,7 +3072,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-26 11:59:11 UTC (rev 2383)
+++ trunk/SKSideWindow.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -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-26 11:59:11 UTC (rev 2383)
+++ trunk/SKSnapshotWindowController.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -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-26 11:59:11 UTC (rev 2383)
+++ trunk/SKSplitView.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -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-26 11:59:11 UTC (rev 2383)
+++ trunk/SKThumbnailTableView.m 2007-06-26 12:13:00 UTC (rev 2384)
@@ -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-26 11:59:25
|
Revision: 2383
http://skim-app.svn.sourceforge.net/skim-app/?rev=2383&view=rev
Author: hofman
Date: 2007-06-26 04:59:11 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
Use device RGB colors for controls, consistent with Apple controls.
Modified Paths:
--------------
trunk/BDSKEdgeView.m
trunk/BDSKImagePopUpButtonCell.m
trunk/PDFPage_SKExtensions.m
trunk/SKApplicationController.m
trunk/SKLineInspector.m
trunk/SKMainWindowController.m
trunk/SKNavigationWindow.m
trunk/SKNoteOutlineView.m
trunk/SKNoteWindowController.m
trunk/SKPDFHoverWindow.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-26 08:33:02 UTC (rev 2382)
+++ trunk/BDSKEdgeView.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -44,7 +44,7 @@
- (id)initWithFrame:(NSRect)frame {
if (self = [super initWithFrame:frame]) {
- NSColor *color = [NSColor colorWithCalibratedWhite:0.75 alpha:1.0];
+ NSColor *color = [NSColor colorWithDeviceWhite: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-26 08:33:02 UTC (rev 2382)
+++ trunk/BDSKImagePopUpButtonCell.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -81,7 +81,7 @@
[path lineToPoint:NSMakePoint(6.5, 5.0)];
[path lineToPoint:NSMakePoint(3.5, 0.0)];
[path closePath];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.75] setFill];
+ [[NSColor colorWithDeviceWhite:0.0 alpha:0.75] setFill];
[path fill];
[defaultArrowImage unlockFocus];
}
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2007-06-26 08:33:02 UTC (rev 2382)
+++ trunk/PDFPage_SKExtensions.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -183,7 +183,7 @@
[[NSColor whiteColor] set];
if (hasShadow) {
NSShadow *shadow = [[NSShadow alloc] init];
- [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.5]];
+ [shadow setShadowColor:[NSColor colorWithDeviceWhite:0.0 alpha:0.5]];
[shadow setShadowBlurRadius:shadowBlurRadius];
[shadow setShadowOffset:shadowOffset];
[shadow set];
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-06-26 08:33:02 UTC (rev 2382)
+++ trunk/SKApplicationController.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -592,7 +592,7 @@
NSRect bounds = [self bounds];
NSPoint center = NSMakePoint(NSMidX(bounds), NSMidY(bounds));
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] setFill];
+ [[NSColor colorWithDeviceWhite:0.0 alpha:0.5] setFill];
[NSBezierPath fillRoundRectInRect:[self bounds] radius:10.0];
NSBezierPath *path = nil;
@@ -669,7 +669,7 @@
}
- [[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] setFill];
+ [[NSColor colorWithDeviceWhite:1.0 alpha:1.0] setFill];
[path fill];
}
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2007-06-26 08:33:02 UTC (rev 2382)
+++ trunk/SKLineInspector.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -155,14 +155,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.3] setStroke];
+ [[NSColor colorWithDeviceWhite: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 colorWithCalibratedWhite:0.0 alpha:0.5] set];
+ [[NSColor colorWithDeviceWhite:0.0 alpha:0.5] set];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(5.0, 2.0)];
@@ -182,14 +182,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.3] setStroke];
+ [[NSColor colorWithDeviceWhite: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 colorWithCalibratedWhite:0.0 alpha:0.5] set];
+ [[NSColor colorWithDeviceWhite:0.0 alpha:0.5] set];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(5.0, 2.0)];
@@ -211,7 +211,7 @@
[path moveToPoint:NSMakePoint(6.0, 3.0)];
[path lineToPoint:NSMakePoint(23.0, 3.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.65] setStroke];
+ [[NSColor colorWithDeviceWhite:0.0 alpha:0.65] setStroke];
[path stroke];
[image unlockFocus];
[styleButton setImage:image forSegment:kPDFBorderStyleUnderline];
@@ -306,7 +306,7 @@
[path lineToPoint:NSMakePoint(8.0, 2.0)];
[path closePath];
[path setLineWidth:2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.65] setStroke];
+ [[NSColor colorWithDeviceWhite:0.0 alpha:0.65] setStroke];
[path stroke];
[image unlockFocus];
[startLineStyleButton setImage:image forSegment:kPDFLineStyleDiamond];
@@ -323,7 +323,7 @@
[path lineToPoint:NSMakePoint(16.0, 2.0)];
[path closePath];
[path setLineWidth:2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.65] setStroke];
+ [[NSColor colorWithDeviceWhite:0.0 alpha:0.65] setStroke];
[path stroke];
[image unlockFocus];
[endLineStyleButton setImage:image forSegment:kPDFLineStyleDiamond];
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-06-26 08:33:02 UTC (rev 2382)
+++ trunk/SKMainWindowController.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -207,7 +207,7 @@
[self setWindowFrameAutosaveNameOrCascade:SKMainWindowFrameAutosaveName];
- [[self window] setBackgroundColor:[NSColor colorWithCalibratedWhite:0.9 alpha:1.0]];
+ [[self window] setBackgroundColor:[NSColor colorWithDeviceWhite: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 colorWithCalibratedWhite:0.0 alpha:0.75];
+ NSColor *color = [NSColor colorWithDeviceWhite: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/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2007-06-26 08:33:02 UTC (rev 2382)
+++ trunk/SKNavigationWindow.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -178,10 +178,10 @@
- (void)drawRect:(NSRect)rect {
rect = NSInsetRect([self bounds], 1.0, 1.0);
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] set];
+ [[NSColor colorWithDeviceWhite:0.0 alpha:0.5] set];
[NSBezierPath fillRoundRectInRect:rect radius:10.0];
rect = NSInsetRect([self bounds], 0.5, 0.5);
- [[NSColor colorWithCalibratedWhite:1.0 alpha:0.2] set];
+ [[NSColor colorWithDeviceWhite:1.0 alpha:0.2] set];
[NSBezierPath strokeRoundRectInRect:rect radius:10.0];
}
@@ -359,7 +359,7 @@
}
- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
- [[NSColor colorWithCalibratedWhite:1.0 alpha:[self isHighlighted] ? 0.9 : 0.6] set];
+ [[NSColor colorWithDeviceWhite:1.0 alpha:[self isHighlighted] ? 0.9 : 0.6] set];
[[self pathWithFrame:cellFrame] fill];
}
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2007-06-26 08:33:02 UTC (rev 2382)
+++ trunk/SKNoteOutlineView.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -388,9 +388,9 @@
if (active) {
[[NSGraphicsContext currentContext] saveGraphicsState];
if (isSelected)
- [[NSColor colorWithCalibratedWhite:1.0 alpha:0.8] set];
+ [[NSColor colorWithDeviceWhite:1.0 alpha:0.8] set];
else
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.7] set];
+ [[NSColor colorWithDeviceWhite: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-26 08:33:02 UTC (rev 2382)
+++ trunk/SKNoteWindowController.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -80,7 +80,7 @@
}
- (void)windowDidLoad {
- [[self window] setBackgroundColor:[NSColor colorWithCalibratedWhite:0.9 alpha:1.0]];
+ [[self window] setBackgroundColor:[NSColor colorWithDeviceWhite:0.9 alpha:1.0]];
[[self window] setLevel:keepOnTop || forceOnTop ? NSFloatingWindowLevel : NSNormalWindowLevel];
[[self window] setHidesOnDeactivate:keepOnTop];
Modified: trunk/SKPDFHoverWindow.m
===================================================================
--- trunk/SKPDFHoverWindow.m 2007-06-26 08:33:02 UTC (rev 2382)
+++ trunk/SKPDFHoverWindow.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -74,9 +74,9 @@
[imageView release];
font = [[NSFont toolTipsFontOfSize:11.0] retain];
- backgroundColor = [[NSColor colorWithCalibratedRed:1.0 green:1.0 blue:0.75 alpha:1.0] retain];
+ backgroundColor = [[NSColor colorWithDeviceRed:1.0 green:1.0 blue:0.75 alpha:1.0] retain];
labelFont = [[NSFont boldSystemFontOfSize:11.0] retain];
- labelColor = [[NSColor colorWithCalibratedWhite:0.5 alpha:0.8] retain];
+ labelColor = [[NSColor colorWithDeviceWhite:0.5 alpha:0.8] retain];
annotation = nil;
point = NSZeroPoint;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2007-06-26 08:33:02 UTC (rev 2382)
+++ trunk/SKPDFView.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -3072,7 +3072,7 @@
[[NSGraphicsContext currentContext] saveGraphicsState];
outlineRect = NSInsetRect(NSIntegralRect([clipView convertRect:magRect fromView:nil]), 1.5, 1.5);
[NSBezierPath setDefaultLineWidth:3.0];
- [[NSColor colorWithCalibratedWhite:0.2 alpha:1.0] set];
+ [[NSColor colorWithDeviceWhite: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-26 08:33:02 UTC (rev 2382)
+++ trunk/SKSideWindow.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -200,23 +200,23 @@
[NSGraphicsContext saveGraphicsState];
- [[NSColor colorWithCalibratedWhite:0.9 alpha:1.0] set];
+ [[NSColor colorWithDeviceWhite:0.9 alpha:1.0] set];
[NSBezierPath fillRoundRectInRect:topRect radius:CORNER_RADIUS];
- [[NSColor colorWithCalibratedWhite:0.4 alpha:1.0] set];
+ [[NSColor colorWithDeviceWhite:0.4 alpha:1.0] set];
[NSBezierPath fillRoundRectInRect:bottomRect radius:CORNER_RADIUS];
- [[NSColor colorWithCalibratedWhite:0.8 alpha:1.0] set];
+ [[NSColor colorWithDeviceWhite: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 colorWithCalibratedWhite:0.5 alpha:1.0] set];
+ [[NSColor colorWithDeviceWhite: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 colorWithCalibratedWhite:0.9 alpha:1.0] set];
+ [[NSColor colorWithDeviceWhite: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-26 08:33:02 UTC (rev 2382)
+++ trunk/SKSnapshotWindowController.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -333,7 +333,7 @@
[[NSColor whiteColor] set];
if (hasShadow) {
NSShadow *shadow = [[NSShadow alloc] init];
- [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.5]];
+ [shadow setShadowColor:[NSColor colorWithDeviceWhite:0.0 alpha:0.5]];
[shadow setShadowBlurRadius:shadowBlurRadius];
[shadow setShadowOffset:shadowOffset];
[shadow set];
Modified: trunk/SKSplitView.m
===================================================================
--- trunk/SKSplitView.m 2007-06-26 08:33:02 UTC (rev 2382)
+++ trunk/SKSplitView.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -46,14 +46,14 @@
+ (CIColor *)startColor{
static CIColor *startColor = nil;
if (startColor == nil)
- startColor = [[CIColor colorWithNSColor:[NSColor colorWithCalibratedWhite:0.85 alpha:1.0]] retain];
+ startColor = [[CIColor colorWithNSColor:[NSColor colorWithDeviceWhite:0.85 alpha:1.0]] retain];
return startColor;
}
+ (CIColor *)endColor{
static CIColor *endColor = nil;
if (endColor == nil)
- endColor = [[CIColor colorWithNSColor:[NSColor colorWithCalibratedWhite:0.95 alpha:1.0]] retain];
+ endColor = [[CIColor colorWithNSColor:[NSColor colorWithDeviceWhite: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 colorWithCalibratedWhite:0.6 alpha:1.0];
- NSColor *lightColor = [NSColor colorWithCalibratedWhite:0.95 alpha:1.0];
+ NSColor *darkColor = [NSColor colorWithDeviceWhite:0.6 alpha:1.0];
+ NSColor *lightColor = [NSColor colorWithDeviceWhite: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-26 08:33:02 UTC (rev 2382)
+++ trunk/SKThumbnailTableView.m 2007-06-26 11:59:11 UTC (rev 2383)
@@ -179,14 +179,14 @@
if (NO == didInit) {
didInit = YES;
selectedShadow = [[NSShadow alloc] init];
- [selectedShadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.2]];
+ [selectedShadow setShadowColor:[NSColor colorWithDeviceWhite:1.0 alpha:0.2]];
[selectedShadow setShadowOffset:NSMakeSize(0.0, -1.0)];
deselectedShadow = [[NSShadow alloc] init];
- [deselectedShadow setShadowColor:[NSColor colorWithCalibratedWhite:1.0 alpha:0.2]];
+ [deselectedShadow setShadowColor:[NSColor colorWithDeviceWhite:1.0 alpha:0.2]];
[deselectedShadow setShadowOffset:NSMakeSize(0.0, -1.0)];
- selectedColor = [[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] copy];
- deselectedColor = [[NSColor colorWithCalibratedWhite:0.0 alpha:0.8] copy];
+ selectedColor = [[NSColor colorWithDeviceWhite:1.0 alpha:1.0] copy];
+ deselectedColor = [[NSColor colorWithDeviceWhite:0.0 alpha:0.8] copy];
}
}
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.
