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-08-05 20:29:28
|
Revision: 2606 http://skim-app.svn.sourceforge.net/skim-app/?rev=2606&view=rev Author: hofman Date: 2007-08-05 13:29:27 -0700 (Sun, 05 Aug 2007) Log Message: ----------- Remove copying and contextual menu code from BDSKZoomablePDFView as this is not relevant here. Modified Paths: -------------- trunk/BDSKZoomablePDFView.h trunk/BDSKZoomablePDFView.m Modified: trunk/BDSKZoomablePDFView.h =================================================================== --- trunk/BDSKZoomablePDFView.h 2007-08-05 16:45:53 UTC (rev 2605) +++ trunk/BDSKZoomablePDFView.h 2007-08-05 20:29:27 UTC (rev 2606) @@ -42,7 +42,6 @@ @interface BDSKZoomablePDFView : PDFView { NSPopUpButton *scalePopUpButton; - NSDictionary *pasteboardInfo; } - (void)setScaleFactor:(float)factor adjustPopup:(BOOL)flag; Modified: trunk/BDSKZoomablePDFView.m =================================================================== --- trunk/BDSKZoomablePDFView.m 2007-08-05 16:45:53 UTC (rev 2605) +++ trunk/BDSKZoomablePDFView.m 2007-08-05 20:29:27 UTC (rev 2606) @@ -63,170 +63,6 @@ static float BDSKDefaultScaleMenuFactors[] = {/* 0.0, */ 0, 0.1, 0.25, 0.5, 0.75, 1.0, 1.28, 1.5, 2.0, 4.0, 8.0}; static float BDSKScaleMenuFontSize = 11.0; -#pragma mark Instance methods - -- (id)initWithFrame:(NSRect)rect { - if (self = [super initWithFrame:rect]) { - pasteboardInfo = [[NSMutableDictionary alloc] initWithCapacity:2]; - } - return self; -} - -- (id)initWithCoder:(NSCoder *)coder { - if (self = [super initWithCoder:coder]) { - pasteboardInfo = [[NSMutableDictionary alloc] initWithCapacity:2]; - } - return self; -} - -- (void)dealloc{ - [pasteboardInfo release]; - [super dealloc]; -} - -- (void)printDocument:(id)sender{ - id document = [[[self window] windowController] document]; - if ([document respondsToSelector:_cmd]) - [document printDocument:sender]; - else if ([PDFView instancesRespondToSelector:_cmd]) - [(id)super printDocument:sender]; -} - -#pragma mark Copying - -// used to cache the selection info and document for lazy copying -- (void)updatePasteboardInfo; -{ - PDFSelection *theSelection = [self currentSelection]; - if(!theSelection) - theSelection = [[self document] selectionForEntireDocument]; - - // @@ copy selection since it's mutable; may eliminate exceptions when providing data, but I've never been able to reproduce the problem - [pasteboardInfo setValue:[[theSelection copy] autorelease] forKey:@"selection"]; - [pasteboardInfo setValue:[self document] forKey:@"document"]; - [pasteboardInfo setValue:[self currentPage] forKey:@"page"]; -} - -// override so we can put the entire document on the pasteboard if there is no selection -- (void)copy:(id)sender; -{ - NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSGeneralPboard]; - [pboard declareTypes:[NSArray arrayWithObjects:NSPDFPboardType, NSStringPboardType, NSRTFPboardType, nil] owner:self]; - [self updatePasteboardInfo]; -} - -- (void)pasteboard:(NSPasteboard *)sender provideDataForType:(NSString *)type; -{ - PDFSelection *theSelection = [pasteboardInfo valueForKey:@"selection"]; - PDFDocument *theDocument = [pasteboardInfo valueForKey:@"document"]; - PDFPage *thePage = [pasteboardInfo valueForKey:@"page"]; - - // use a private type to signal that we need to provide a page as PDF - if([type isEqualToString:NSPDFPboardType] && [[sender types] containsObject:@"BDSKPrivatePDFPageDataPboardType"]){ - [sender setData:[thePage dataRepresentation] forType:type]; - } else if([type isEqualToString:NSPDFPboardType]){ - // write the whole document - [sender setData:[theDocument dataRepresentation] forType:type]; - } else if([type isEqualToString:NSStringPboardType]){ - [sender setString:[theSelection string] forType:type]; - } else if([type isEqualToString:NSRTFPboardType]){ - NSAttributedString *attrString = [theSelection attributedString]; - [sender setData:[attrString RTFFromRange:NSMakeRange(0, [attrString length]) documentAttributes:nil] forType:type]; - } else NSBeep(); -} - -- (void)copyAsPDF:(id)sender; -{ - NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSGeneralPboard]; - // don't add the private page pboard type here - [pboard declareTypes:[NSArray arrayWithObjects:NSPDFPboardType, nil] owner:self]; - [self updatePasteboardInfo]; -} - -- (void)copyAsText:(id)sender; -{ - NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSGeneralPboard]; - [pboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType, NSRTFPboardType, nil] owner:self]; - [self updatePasteboardInfo]; -} - -- (void)copyPDFPage:(id)sender; -{ - NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSGeneralPboard]; - [pboard declareTypes:[NSArray arrayWithObjects:NSPDFPboardType, @"BDSKPrivatePDFPageDataPboardType", nil] owner:self]; - [self updatePasteboardInfo]; -} - -- (void)saveDocumentSheetDidEnd:(NSSavePanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo; -{ - NSError *error = nil; - if(returnCode == NSOKButton){ - // -[PDFDocument writeToURL:] returns YES even if you don't have write permission, so we'll use NSData rdar://problem/4475062 - NSData *data = [[self document] dataRepresentation]; - - if([data writeToURL:[sheet URL] options:NSAtomicWrite error:&error] == NO){ - [sheet orderOut:nil]; - [self presentError:error]; - } - } -} - -- (void)saveDocumentAs:(id)sender; -{ - NSString *name = [[[[self document] documentURL] path] lastPathComponent]; - [[NSSavePanel savePanel] beginSheetForDirectory:nil file:(name ? name : NSLocalizedString(@"Untitled.pdf", @"Default file name for saved PDF")) modalForWindow:[self window] modalDelegate:self didEndSelector:@selector(saveDocumentSheetDidEnd:returnCode:contextInfo:) contextInfo:NULL]; -} - -- (void)lookUpCurrentSelectionInDictionary:(id)sender; -{ - NSString *text = [[self currentSelection] string]; - if (nil == text) - NSBeep(); - else - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[@"dict://" stringByAppendingString:text]]]; -} - -- (NSMenu *)menuForEvent:(NSEvent *)theEvent; -{ - NSMenu *menu = [super menuForEvent:theEvent]; - [menu addItem:[NSMenuItem separatorItem]]; - NSMenuItem *item = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Copy Document as PDF", @"Menu item title") action:@selector(copyAsPDF:) keyEquivalent:@""]; - [menu addItem:item]; - [item release]; - - item = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Copy Page as PDF", @"Menu item title") action:@selector(copyPDFPage:) keyEquivalent:@""]; - [menu addItem:item]; - [item release]; - - NSString *title = (nil == [self currentSelection]) ? NSLocalizedString(@"Copy All Text", @"Menu item title") : NSLocalizedString(@"Copy Selected Text", @"Menu item title"); - - item = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:title action:@selector(copyAsText:) keyEquivalent:@""]; - [menu addItem:item]; - [item release]; - - if ([self currentSelection]) { - long version; - OSStatus err = Gestalt(gestaltSystemVersion, &version); - - if (noErr == err && version < 0x00001050) { - - [menu addItem:[NSMenuItem separatorItem]]; - - item = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Look Up in Dictionary", @"") action:@selector(lookUpCurrentSelectionInDictionary:) keyEquivalent:@""]; - [menu addItem:item]; - [item release]; - } - } - - [menu addItem:[NSMenuItem separatorItem]]; - - item = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSLocalizedString(@"Save PDF As", @"Menu item title") stringByAppendingFormat:@"%C", 0x2026] action:@selector(saveDocumentAs:) keyEquivalent:@""]; - [menu addItem:item]; - [item release]; - - return menu; -} - #pragma mark Popup button - (void)makeScalePopUpButton { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-08-05 16:45:59
|
Revision: 2605 http://skim-app.svn.sourceforge.net/skim-app/?rev=2605&view=rev Author: hofman Date: 2007-08-05 09:45:53 -0700 (Sun, 05 Aug 2007) Log Message: ----------- Add new toolbar item to add new notes in a single segmentedControl. Add contextual menus for thumbnail table views. Validate custom menu items for those tables. Hard code the superclass for checking wether super responds to a selector, as the class of super is implicitly also hard coded. Otherwise it may check the wrong (sub)class. Modified Paths: -------------- trunk/BDSKZoomablePDFView.m trunk/Dutch.lproj/Localizable.strings trunk/Dutch.lproj/MainWindow.nib/classes.nib trunk/Dutch.lproj/MainWindow.nib/data.dependency trunk/Dutch.lproj/MainWindow.nib/info.nib trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib trunk/Dutch.lproj/NoteWindow.nib/info.nib trunk/Dutch.lproj/NoteWindow.nib/keyedobjects.nib trunk/English.lproj/MainWindow.nib/classes.nib trunk/English.lproj/MainWindow.nib/info.nib trunk/English.lproj/MainWindow.nib/keyedobjects.nib trunk/French.lproj/Localizable.strings trunk/French.lproj/MainWindow.nib/classes.nib trunk/French.lproj/MainWindow.nib/info.nib trunk/French.lproj/MainWindow.nib/keyedobjects.nib trunk/Italian.lproj/Localizable.strings trunk/Italian.lproj/MainWindow.nib/classes.nib trunk/Italian.lproj/MainWindow.nib/info.nib trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib trunk/NSImage_SKExtensions.m trunk/SKApplication.m trunk/SKMainWindowController.h trunk/SKMainWindowController.m trunk/SKPDFView.m trunk/SKThumbnailTableView.h trunk/SKThumbnailTableView.m Modified: trunk/BDSKZoomablePDFView.m =================================================================== --- trunk/BDSKZoomablePDFView.m 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/BDSKZoomablePDFView.m 2007-08-05 16:45:53 UTC (rev 2605) @@ -88,7 +88,7 @@ id document = [[[self window] windowController] document]; if ([document respondsToSelector:_cmd]) [document printDocument:sender]; - else if ([[self superclass] instancesRespondToSelector:_cmd]) + else if ([PDFView instancesRespondToSelector:_cmd]) [(id)super printDocument:sender]; } Modified: trunk/Dutch.lproj/Localizable.strings =================================================================== (Binary files differ) Modified: trunk/Dutch.lproj/MainWindow.nib/classes.nib =================================================================== --- trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-08-05 16:45:53 UTC (rev 2605) @@ -134,6 +134,7 @@ leftSideGradientView = BDSKGradientView; markupPopUpButton = BDSKImagePopUpButton; noteArrayController = NSArrayController; + noteButton = NSSegmentedControl; noteOutlineView = SKNoteOutlineView; notePopUpButton = BDSKImagePopUpButton; noteSearchField = NSSearchField; Modified: trunk/Dutch.lproj/MainWindow.nib/data.dependency =================================================================== --- trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-08-05 16:45:53 UTC (rev 2605) @@ -4,6 +4,7 @@ <dict> <key>IBPaletteDependency</key> <array> + <string>Controllers</string> <string>PDFKit</string> </array> </dict> Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-08-05 16:45:53 UTC (rev 2605) @@ -7,7 +7,7 @@ <key>IBEditorPositions</key> <dict> <key>168</key> - <string>601 521 237 239 0 0 1440 938 </string> + <string>601 495 237 265 0 0 1440 938 </string> <key>224</key> <string>610 420 220 442 0 0 1440 938 </string> <key>256</key> @@ -29,11 +29,6 @@ <array> <integer>208</integer> </array> - <key>IBOpenObjects</key> - <array> - <integer>687</integer> - <integer>694</integer> - </array> <key>IBSystem Version</key> <string>8R218</string> </dict> Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Dutch.lproj/NoteWindow.nib/info.nib =================================================================== --- trunk/Dutch.lproj/NoteWindow.nib/info.nib 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/Dutch.lproj/NoteWindow.nib/info.nib 2007-08-05 16:45:53 UTC (rev 2605) @@ -6,10 +6,6 @@ <string>69 58 356 240 0 0 1440 938 </string> <key>IBFramework Version</key> <string>446.1</string> - <key>IBOpenObjects</key> - <array> - <integer>7</integer> - </array> <key>IBSystem Version</key> <string>8R218</string> </dict> Modified: trunk/Dutch.lproj/NoteWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/English.lproj/MainWindow.nib/classes.nib =================================================================== --- trunk/English.lproj/MainWindow.nib/classes.nib 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/English.lproj/MainWindow.nib/classes.nib 2007-08-05 16:45:53 UTC (rev 2605) @@ -134,6 +134,7 @@ leftSideGradientView = BDSKGradientView; markupPopUpButton = BDSKImagePopUpButton; noteArrayController = NSArrayController; + noteButton = NSSegmentedControl; noteOutlineView = SKNoteOutlineView; notePopUpButton = BDSKImagePopUpButton; noteSearchField = NSSearchField; Modified: trunk/English.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/English.lproj/MainWindow.nib/info.nib 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/English.lproj/MainWindow.nib/info.nib 2007-08-05 16:45:53 UTC (rev 2605) @@ -7,7 +7,7 @@ <key>IBEditorPositions</key> <dict> <key>168</key> - <string>601 521 237 239 0 0 1440 938 </string> + <string>601 495 237 265 0 0 1440 938 </string> <key>224</key> <string>610 420 220 442 0 0 1440 938 </string> <key>256</key> @@ -31,20 +31,20 @@ </array> <key>IBOpenObjects</key> <array> - <integer>553</integer> - <integer>208</integer> - <integer>687</integer> + <integer>314</integer> + <integer>633</integer> <integer>511</integer> - <integer>585</integer> - <integer>633</integer> + <integer>539</integer> + <integer>168</integer> <integer>256</integer> <integer>5</integer> - <integer>314</integer> <integer>502</integer> + <integer>687</integer> + <integer>224</integer> + <integer>585</integer> <integer>694</integer> - <integer>168</integer> - <integer>224</integer> - <integer>539</integer> + <integer>208</integer> + <integer>553</integer> </array> <key>IBSystem Version</key> <string>8R218</string> Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/French.lproj/Localizable.strings =================================================================== (Binary files differ) Modified: trunk/French.lproj/MainWindow.nib/classes.nib =================================================================== --- trunk/French.lproj/MainWindow.nib/classes.nib 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/French.lproj/MainWindow.nib/classes.nib 2007-08-05 16:45:53 UTC (rev 2605) @@ -134,6 +134,7 @@ leftSideGradientView = BDSKGradientView; markupPopUpButton = BDSKImagePopUpButton; noteArrayController = NSArrayController; + noteButton = NSSegmentedControl; noteOutlineView = SKNoteOutlineView; notePopUpButton = BDSKImagePopUpButton; noteSearchField = NSSearchField; Modified: trunk/French.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/French.lproj/MainWindow.nib/info.nib 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/French.lproj/MainWindow.nib/info.nib 2007-08-05 16:45:53 UTC (rev 2605) @@ -7,7 +7,7 @@ <key>IBEditorPositions</key> <dict> <key>168</key> - <string>601 521 237 239 0 0 1440 938 </string> + <string>601 493 237 267 0 0 1440 938 </string> <key>224</key> <string>610 420 220 442 0 0 1440 938 </string> <key>256</key> @@ -31,16 +31,16 @@ </array> <key>IBOpenObjects</key> <array> - <integer>256</integer> + <integer>511</integer> + <integer>168</integer> <integer>314</integer> + <integer>5</integer> <integer>661</integer> + <integer>256</integer> <integer>660</integer> + <integer>633</integer> + <integer>502</integer> <integer>224</integer> - <integer>5</integer> - <integer>511</integer> - <integer>168</integer> - <integer>502</integer> - <integer>633</integer> </array> <key>IBSystem Version</key> <string>8R218</string> Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Italian.lproj/Localizable.strings =================================================================== (Binary files differ) Modified: trunk/Italian.lproj/MainWindow.nib/classes.nib =================================================================== --- trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-08-05 16:45:53 UTC (rev 2605) @@ -134,6 +134,7 @@ leftSideGradientView = BDSKGradientView; markupPopUpButton = BDSKImagePopUpButton; noteArrayController = NSArrayController; + noteButton = NSSegmentedControl; noteOutlineView = SKNoteOutlineView; notePopUpButton = BDSKImagePopUpButton; noteSearchField = NSSearchField; Modified: trunk/Italian.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-08-05 16:45:53 UTC (rev 2605) @@ -7,7 +7,7 @@ <key>IBEditorPositions</key> <dict> <key>168</key> - <string>601 521 237 239 0 0 1440 938 </string> + <string>601 493 237 267 0 0 1440 938 </string> <key>224</key> <string>610 420 220 442 0 0 1440 938 </string> <key>256</key> @@ -31,19 +31,19 @@ </array> <key>IBOpenObjects</key> <array> + <integer>511</integer> + <integer>314</integer> + <integer>208</integer> <integer>224</integer> + <integer>502</integer> + <integer>256</integer> <integer>628</integer> - <integer>314</integer> - <integer>502</integer> + <integer>676</integer> <integer>677</integer> - <integer>676</integer> + <integer>553</integer> <integer>168</integer> - <integer>511</integer> + <integer>539</integer> <integer>5</integer> - <integer>539</integer> - <integer>553</integer> - <integer>208</integer> - <integer>256</integer> </array> <key>IBSystem Version</key> <string>8R218</string> Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/NSImage_SKExtensions.m =================================================================== --- trunk/NSImage_SKExtensions.m 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/NSImage_SKExtensions.m 2007-08-05 16:45:53 UTC (rev 2605) @@ -41,6 +41,32 @@ @implementation NSImage (SKExtensions) +- (NSImage *)createMenuAdornImage { + NSBezierPath *arrowPath = [NSBezierPath bezierPath]; + [arrowPath moveToPoint:NSMakePoint(20.5,4.0)]; + [arrowPath lineToPoint:NSMakePoint(18.0,7.0)]; + [arrowPath lineToPoint:NSMakePoint(23.0,7.0)]; + [arrowPath closePath]; + + NSImage *image = [[NSImage alloc] initWithSize:NSMakeSize(25.0, 13.0)]; + [image lockFocus]; + [self compositeToPoint:NSMakePoint(2.0, 1.0) operation:NSCompositeCopy]; + [[NSColor colorWithCalibratedWhite:0.0 alpha:0.85] setFill]; + [arrowPath fill]; + [image unlockFocus]; + + return image; +} + +- (NSImage *)createLargeNoteAdornImage { + NSImage *image = [[NSImage alloc] initWithSize:NSMakeSize(19.0, 11.0)]; + [image lockFocus]; + [self compositeToPoint:NSMakePoint(2.0, 0.0) operation:NSCompositeCopy]; + [image unlockFocus]; + + return image; +} + + (void)makeAdornImages { static NSImage *backAdornImage = nil; static NSImage *forwardAdornImage = nil; @@ -68,6 +94,14 @@ static NSImage *underlineNoteAdornImage = nil; static NSImage *strikeOutNoteAdornImage = nil; static NSImage *lineNoteAdornImage = nil; + static NSImage *textNoteAdorn2Image = nil; + static NSImage *anchoredNoteAdorn2Image = nil; + static NSImage *circleNoteAdorn2Image = nil; + static NSImage *squareNoteAdorn2Image = nil; + static NSImage *highlightNoteAdorn2Image = nil; + static NSImage *underlineNoteAdorn2Image = nil; + static NSImage *strikeOutNoteAdorn2Image = nil; + static NSImage *lineNoteAdorn2Image = nil; NSShadow *shadow = [[NSShadow alloc] init]; [shadow setShadowBlurRadius:0.0]; @@ -78,13 +112,7 @@ NSSize size = NSMakeSize(25.0, 13.0); NSSize noteSize = NSMakeSize(15.0, 11.0); - NSPoint point = NSMakePoint(2.0, 1.0); NSBezierPath *path; - NSBezierPath *arrowPath = [NSBezierPath bezierPath]; - [arrowPath moveToPoint:NSMakePoint(20.5,4.0)]; - [arrowPath lineToPoint:NSMakePoint(18.0,7.0)]; - [arrowPath lineToPoint:NSMakePoint(23.0,7.0)]; - [arrowPath closePath]; backAdornImage = [[NSImage alloc] initWithSize:size]; [backAdornImage lockFocus]; @@ -347,13 +375,10 @@ [textNoteAdornImage unlockFocus]; [textNoteAdornImage setName:@"TextNoteAdorn"]; - textNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [textNoteToolAdornImage lockFocus]; - [[NSGraphicsContext currentContext] saveGraphicsState]; - [textNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [textNoteToolAdornImage unlockFocus]; + textNoteAdorn2Image = [textNoteAdornImage createLargeNoteAdornImage]; + [textNoteAdorn2Image setName:@"TextNoteAdorn2"]; + + textNoteToolAdornImage = [textNoteAdornImage createMenuAdornImage]; [textNoteToolAdornImage setName:@"TextNoteToolAdorn"]; anchoredNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; @@ -380,12 +405,10 @@ [anchoredNoteAdornImage unlockFocus]; [anchoredNoteAdornImage setName:@"AnchoredNoteAdorn"]; - anchoredNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [anchoredNoteToolAdornImage lockFocus]; - [anchoredNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [shadow set]; - [arrowPath fill]; - [anchoredNoteToolAdornImage unlockFocus]; + anchoredNoteAdorn2Image = [anchoredNoteAdornImage createLargeNoteAdornImage]; + [anchoredNoteAdorn2Image setName:@"AnchoredNoteAdorn2"]; + + anchoredNoteToolAdornImage = [anchoredNoteAdornImage createMenuAdornImage]; [anchoredNoteToolAdornImage setName:@"AnchoredNoteToolAdorn"]; circleNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; @@ -410,12 +433,10 @@ [circleNoteAdornImage unlockFocus]; [circleNoteAdornImage setName:@"CircleNoteAdorn"]; - circleNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [circleNoteToolAdornImage lockFocus]; - [circleNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [circleNoteToolAdornImage unlockFocus]; + circleNoteAdorn2Image = [circleNoteAdornImage createLargeNoteAdornImage]; + [circleNoteAdorn2Image setName:@"CircleNoteAdorn2"]; + + circleNoteToolAdornImage = [circleNoteAdornImage createMenuAdornImage]; [circleNoteToolAdornImage setName:@"CircleNoteToolAdorn"]; squareNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; @@ -432,12 +453,10 @@ [squareNoteAdornImage unlockFocus]; [squareNoteAdornImage setName:@"SquareNoteAdorn"]; - squareNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [squareNoteToolAdornImage lockFocus]; - [squareNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [squareNoteToolAdornImage unlockFocus]; + squareNoteAdorn2Image = [squareNoteAdornImage createLargeNoteAdornImage]; + [squareNoteAdorn2Image setName:@"SquareNoteAdorn2"]; + + squareNoteToolAdornImage = [squareNoteAdornImage createMenuAdornImage]; [squareNoteToolAdornImage setName:@"SquareNoteToolAdorn"]; highlightNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; @@ -458,12 +477,10 @@ [highlightNoteAdornImage unlockFocus]; [highlightNoteAdornImage setName:@"HighlightNoteAdorn"]; - highlightNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [highlightNoteToolAdornImage lockFocus]; - [highlightNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [highlightNoteToolAdornImage unlockFocus]; + highlightNoteAdorn2Image = [highlightNoteAdornImage createLargeNoteAdornImage]; + [highlightNoteAdorn2Image setName:@"HighlightNoteAdorn2"]; + + highlightNoteToolAdornImage = [highlightNoteAdornImage createMenuAdornImage]; [highlightNoteToolAdornImage setName:@"HighlightNoteToolAdorn"]; underlineNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; @@ -479,12 +496,10 @@ [underlineNoteAdornImage unlockFocus]; [underlineNoteAdornImage setName:@"UnderlineNoteAdorn"]; - underlineNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [underlineNoteToolAdornImage lockFocus]; - [underlineNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [underlineNoteToolAdornImage unlockFocus]; + underlineNoteAdorn2Image = [underlineNoteAdornImage createLargeNoteAdornImage]; + [underlineNoteAdorn2Image setName:@"UnderlineNoteAdorn2"]; + + underlineNoteToolAdornImage = [underlineNoteAdornImage createMenuAdornImage]; [underlineNoteToolAdornImage setName:@"UnderlineNoteToolAdorn"]; strikeOutNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; @@ -500,12 +515,10 @@ [strikeOutNoteAdornImage unlockFocus]; [strikeOutNoteAdornImage setName:@"StrikeOutNoteAdorn"]; - strikeOutNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [strikeOutNoteToolAdornImage lockFocus]; - [strikeOutNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [strikeOutNoteToolAdornImage unlockFocus]; + strikeOutNoteAdorn2Image = [strikeOutNoteAdornImage createLargeNoteAdornImage]; + [strikeOutNoteAdorn2Image setName:@"StrikeOutNoteAdorn2"]; + + strikeOutNoteToolAdornImage = [strikeOutNoteAdornImage createMenuAdornImage]; [strikeOutNoteToolAdornImage setName:@"StrikeOutNoteToolAdorn"]; lineNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; @@ -523,12 +536,10 @@ [lineNoteAdornImage unlockFocus]; [lineNoteAdornImage setName:@"LineNoteAdorn"]; - lineNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [lineNoteToolAdornImage lockFocus]; - [lineNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [lineNoteToolAdornImage unlockFocus]; + lineNoteAdorn2Image = [lineNoteAdornImage createLargeNoteAdornImage]; + [lineNoteAdorn2Image setName:@"LineNoteAdorn2"]; + + lineNoteToolAdornImage = [lineNoteAdornImage createMenuAdornImage]; [lineNoteToolAdornImage setName:@"LineNoteToolAdorn"]; [shadow release]; Modified: trunk/SKApplication.m =================================================================== --- trunk/SKApplication.m 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/SKApplication.m 2007-08-05 16:45:53 UTC (rev 2605) @@ -103,7 +103,7 @@ id source = [args objectForKey:@"source"]; if (lineNumber == nil || ([file isKindOfClass:[NSArray class]] && [file count] != 1)) { - if ([[self superclass] instancesRespondToSelector:_cmd]) + if ([NSApplication instancesRespondToSelector:_cmd]) [super handleOpenScriptCommand:command]; return; } Modified: trunk/SKMainWindowController.h =================================================================== --- trunk/SKMainWindowController.h 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/SKMainWindowController.h 2007-08-05 16:45:53 UTC (rev 2605) @@ -150,6 +150,7 @@ IBOutlet BDSKImagePopUpButton *notePopUpButton; IBOutlet BDSKImagePopUpButton *circlePopUpButton; IBOutlet BDSKImagePopUpButton *markupPopUpButton; + IBOutlet NSSegmentedControl *noteButton; IBOutlet SKColorSwatch *colorSwatch; NSMutableDictionary *toolbarItems; NSToolbarItem *colorSwatchToolbarItem; Modified: trunk/SKMainWindowController.m =================================================================== --- trunk/SKMainWindowController.m 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/SKMainWindowController.m 2007-08-05 16:45:53 UTC (rev 2605) @@ -105,6 +105,7 @@ static NSString *SKDocumentToolbarNewCircleNoteItemIdentifier = @"SKDocumentToolbarNewCircleNoteItemIdentifier"; static NSString *SKDocumentToolbarNewMarkupItemIdentifier = @"SKDocumentToolbarNewMarkupItemIdentifier"; static NSString *SKDocumentToolbarNewLineItemIdentifier = @"SKDocumentToolbarNewLineItemIdentifier"; +static NSString *SKDocumentToolbarNewNotesItemIdentifier = @"SKDocumentToolbarNewNotesItemIdentifier"; static NSString *SKDocumentToolbarInfoItemIdentifier = @"SKDocumentToolbarInfoItemIdentifier"; static NSString *SKDocumentToolbarToolModeItemIdentifier = @"SKDocumentToolbarToolModeItemIdentifier"; static NSString *SKDocumentToolbarDisplayBoxItemIdentifier = @"SKDocumentToolbarDisplayBoxItemIdentifier"; @@ -1118,7 +1119,8 @@ - (IBAction)createNewNote:(id)sender{ if ([pdfView hideNotes] == NO) { - [pdfView addAnnotationFromSelectionWithType:[sender tag]]; + int type = [sender respondsToSelector:@selector(selectedSegment)] ? [sender selectedSegment] : [sender tag]; + [pdfView addAnnotationFromSelectionWithType:type]; } else NSBeep(); } @@ -3339,6 +3341,13 @@ } } +- (BOOL)tableView:(NSTableView *)tv canDeleteRowsWithIndexes:(NSIndexSet *)rowIndexes { + if ([tv isEqual:snapshotTableView]) { + return [rowIndexes count] > 0; + } + return NO; +} + - (void)tableView:(NSTableView *)tv copyRowsWithIndexes:(NSIndexSet *)rowIndexes { if ([tv isEqual:thumbnailTableView]) { unsigned int index = [rowIndexes firstIndex]; @@ -3354,6 +3363,13 @@ } } +- (BOOL)tableView:(NSTableView *)tv canCopyRowsWithIndexes:(NSIndexSet *)rowIndexes { + if ([tv isEqual:thumbnailTableView]) { + return [rowIndexes count] > 0; + } + return NO; +} + - (NSArray *)tableViewHighlightedRows:(NSTableView *)tv { if ([tv isEqual:thumbnailTableView]) { return lastViewedPages; @@ -3882,6 +3898,13 @@ [toolbarItems setObject:item forKey:SKDocumentToolbarNewMarkupItemIdentifier]; [item release]; + [markupPopUpButton setShowsMenuWhenIconClicked:NO]; + [[markupPopUpButton cell] setAltersStateOfSelectedItem:YES]; + [[markupPopUpButton cell] setAlwaysUsesFirstItemAsSelected:NO]; + [[markupPopUpButton cell] setUsesItemFromMenu:YES]; + [markupPopUpButton setRefreshesMenu:NO]; + [markupPopUpButton setMenu:menu]; + item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNewLineItemIdentifier]; [item setLabels:NSLocalizedString(@"Add Line", @"Toolbar item label")]; [item setToolTip:NSLocalizedString(@"Add New Line", @"Tool tip message")]; @@ -3892,12 +3915,59 @@ [toolbarItems setObject:item forKey:SKDocumentToolbarNewLineItemIdentifier]; [item release]; - [markupPopUpButton setShowsMenuWhenIconClicked:NO]; - [[markupPopUpButton cell] setAltersStateOfSelectedItem:YES]; - [[markupPopUpButton cell] setAlwaysUsesFirstItemAsSelected:NO]; - [[markupPopUpButton cell] setUsesItemFromMenu:YES]; - [markupPopUpButton setRefreshesMenu:NO]; - [markupPopUpButton setMenu:menu]; + menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""] autorelease]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""]; + [menuItem setTarget:self]; + [menuItem setTag:SKFreeTextNote]; + [menuItem setImage:[NSImage imageNamed:@"TextNoteAdorn"]]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""]; + [menuItem setTarget:self]; + [menuItem setTag:SKAnchoredNote]; + [menuItem setImage:[NSImage imageNamed:@"AnchoredNoteAdorn"]]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""]; + [menuItem setTarget:self]; + [menuItem setTag:SKCircleNote]; + [menuItem setImage:[NSImage imageNamed:@"CircleNoteAdorn"]]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""]; + [menuItem setTarget:self]; + [menuItem setTag:SKSquareNote]; + [menuItem setImage:[NSImage imageNamed:@"SquareNoteAdorn"]]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""]; + [menuItem setTarget:self]; + [menuItem setTag:SKHighlightNote]; + [menuItem setImage:[NSImage imageNamed:@"HighlightNoteAdorn"]]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""]; + [menuItem setTarget:self]; + [menuItem setTag:SKUnderlineNote]; + [menuItem setImage:[NSImage imageNamed:@"UnderlineNoteAdorn"]]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""]; + [menuItem setTarget:self]; + [menuItem setTag:SKStrikeOutNote]; + [menuItem setImage:[NSImage imageNamed:@"StrikeOutNoteAdorn"]]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item title") action:@selector(createNewNote:) keyEquivalent:@""]; + [menuItem setTarget:self]; + [menuItem setTag:SKLineNote]; + [menuItem setImage:[NSImage imageNamed:@"LineNoteAdorn"]]; + menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Add Note", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease]; + [menuItem setSubmenu:menu]; + item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarNewNotesItemIdentifier]; + [item setLabels:NSLocalizedString(@"Add Note", @"Toolbar item label")]; + [item setToolTip:NSLocalizedString(@"Add New Note", @"Tool tip message")]; + [[noteButton cell] setToolTip:NSLocalizedString(@"Add New Text Note", @"Tool tip message") forSegment:SKFreeTextNote]; + [[noteButton cell] setToolTip:NSLocalizedString(@"Add New Anchored Note", @"Tool tip message") forSegment:SKAnchoredNote]; + [[noteButton cell] setToolTip:NSLocalizedString(@"Add New Circle", @"Tool tip message") forSegment:SKCircleNote]; + [[noteButton cell] setToolTip:NSLocalizedString(@"Add New Box", @"Tool tip message") forSegment:SKSquareNote]; + [[noteButton cell] setToolTip:NSLocalizedString(@"Add New Highlight", @"Tool tip message") forSegment:SKHighlightNote]; + [[noteButton cell] setToolTip:NSLocalizedString(@"Add New Underline", @"Tool tip message") forSegment:SKUnderlineNote]; + [[noteButton cell] setToolTip:NSLocalizedString(@"Add New Strike Out", @"Tool tip message") forSegment:SKStrikeOutNote]; + [[noteButton cell] setToolTip:NSLocalizedString(@"Add New Line", @"Tool tip message") forSegment:SKLineNote]; + frame = [noteButton frame]; + frame.size.height = SEGMENTED_CONTROL_HEIGHT; + [noteButton setFrame:frame]; + [item setViewWithSizes:noteButton]; + [item setMenuFormRepresentation:menuItem]; + [toolbarItems setObject:item forKey:SKDocumentToolbarNewNotesItemIdentifier]; + [item release]; menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""] autorelease]; menuItem = [menu addItemWithTitle:NSLocalizedString(@"Text Tool", @"Menu item title") action:@selector(changeToolMode:) keyEquivalent:@""]; @@ -4143,6 +4213,7 @@ SKDocumentToolbarNewCircleNoteItemIdentifier, SKDocumentToolbarNewMarkupItemIdentifier, SKDocumentToolbarNewLineItemIdentifier, + SKDocumentToolbarNewNotesItemIdentifier, SKDocumentToolbarContentsPaneItemIdentifier, SKDocumentToolbarNotesPaneItemIdentifier, SKDocumentToolbarInfoItemIdentifier, @@ -4185,6 +4256,14 @@ return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes] == NO; } else if ([identifier isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier]) { return ([pdfView toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [[[pdfView currentSelection] pages] count] && [pdfView hideNotes] == NO; + } else if ([identifier isEqualToString:SKDocumentToolbarNewNotesItemIdentifier]) { + if (([pdfView toolMode] != SKTextToolMode && [pdfView toolMode] != SKNoteToolMode) || [pdfView hideNotes]) + return NO; + BOOL enabled = [[[pdfView currentSelection] pages] count] > 0; + [noteButton setEnabled:enabled forSegment:SKHighlightNote]; + [noteButton setEnabled:enabled forSegment:SKUnderlineNote]; + [noteButton setEnabled:enabled forSegment:SKStrikeOutNote]; + return YES; } else if ([identifier isEqualToString:SKDocumentToolbarInfoItemIdentifier]) { return YES; } else { Modified: trunk/SKPDFView.m =================================================================== --- trunk/SKPDFView.m 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/SKPDFView.m 2007-08-05 16:45:53 UTC (rev 2605) @@ -618,7 +618,7 @@ id document = [[[self window] windowController] document]; if ([document respondsToSelector:_cmd]) [document printDocument:sender]; - else if ([[self superclass] instancesRespondToSelector:_cmd]) + else if ([PDFView instancesRespondToSelector:_cmd]) [(id)super printDocument:sender]; } @@ -1404,7 +1404,7 @@ NSString *pboardType = [pboard availableTypeFromArray:[NSArray arrayWithObjects:NSColorPboardType, SKLineStylePboardType, nil]]; if (pboardType) { return [self draggingUpdated:sender]; - } else if ([[self superclass] instancesRespondToSelector:_cmd]) { + } else if ([PDFView instancesRespondToSelector:_cmd]) { dragOp = [super draggingEntered:sender]; } return dragOp; @@ -1442,7 +1442,7 @@ [self setNeedsDisplayForAnnotation:highlightAnnotation]; highlightAnnotation = nil; } - } else if ([[self superclass] instancesRespondToSelector:_cmd]) { + } else if ([PDFView instancesRespondToSelector:_cmd]) { dragOp = [super draggingUpdated:sender]; } return dragOp; @@ -1456,7 +1456,7 @@ [self setNeedsDisplayForAnnotation:highlightAnnotation]; highlightAnnotation = nil; } - } else if ([[self superclass] instancesRespondToSelector:_cmd]) { + } else if ([PDFView instancesRespondToSelector:_cmd]) { [super draggingExited:sender]; } } @@ -1490,7 +1490,7 @@ [self setNeedsDisplayForAnnotation:highlightAnnotation]; highlightAnnotation = nil; } - } else if ([[self superclass] instancesRespondToSelector:_cmd]) { + } else if ([PDFView instancesRespondToSelector:_cmd]) { performedDrag = [super performDragOperation:sender]; } return performedDrag; @@ -1792,7 +1792,7 @@ if (editAnnotation && (command == @selector(insertNewline:) || command == @selector(insertTab:) || command == @selector(insertBacktab:))) { [self endAnnotationEdit:self]; [[self window] makeFirstResponder:self]; - } else if ([[self superclass] instancesRespondToSelector:_cmd]) { + } else if ([PDFView instancesRespondToSelector:_cmd]) { rv = [super control:control textView:textView doCommandBySelector:command]; } return rv; Modified: trunk/SKThumbnailTableView.h =================================================================== --- trunk/SKThumbnailTableView.h 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/SKThumbnailTableView.h 2007-08-05 16:45:53 UTC (rev 2605) @@ -44,10 +44,12 @@ BOOL isScrolling; } - (BOOL)isScrolling; +- (BOOL)canCopy; @end @interface SKSnapshotTableView : SKThumbnailTableView +- (BOOL)canDelete; @end @@ -59,6 +61,7 @@ @interface NSObject (SKSnapshotTableViewDelegate) - (void)tableView:(NSTableView *)aTableView deleteRowsWithIndexes:(NSIndexSet *)rowIndexes; +- (BOOL)tableView:(NSTableView *)aTableView canDeleteRowsWithIndexes:(NSIndexSet *)rowIndexes; @end @@ -66,4 +69,5 @@ - (NSArray *)tableViewHighlightedRows:(NSTableView *)tableView; - (BOOL)tableView:(NSTableView *)tableView commandSelectRow:(int)rowIndex; - (void)tableView:(NSTableView *)aTableView copyRowsWithIndexes:(NSIndexSet *)rowIndexes; +- (BOOL)tableView:(NSTableView *)aTableView canCopyRowsWithIndexes:(NSIndexSet *)rowIndexes; @end Modified: trunk/SKThumbnailTableView.m =================================================================== --- trunk/SKThumbnailTableView.m 2007-08-05 12:58:57 UTC (rev 2604) +++ trunk/SKThumbnailTableView.m 2007-08-05 16:45:53 UTC (rev 2605) @@ -131,24 +131,73 @@ [super mouseDown:theEvent]; } +- (BOOL)canCopy { + NSIndexSet *indexes = [self selectedRowIndexes]; + return [indexes count] && + [[self delegate] respondsToSelector:@selector(tableView:canCopyRowsWithIndexes:)] && + [[self delegate] respondsToSelector:@selector(tableView:copyRowsWithIndexes:)] && + [[self delegate] tableView:self canCopyRowsWithIndexes:indexes]; +} + - (void)copy:(id)sender { - if ([[self delegate] respondsToSelector:@selector(tableView:copyRowsWithIndexes:)]) + if ([self canCopy]) [[self delegate] tableView:self copyRowsWithIndexes:[self selectedRowIndexes]]; + else + NSBeep(); } +- (void)copyFromContextualMenu:(id)sender { + [[self delegate] tableView:self copyRowsWithIndexes:[sender representedObject]]; +} + +- (NSMenu *)menuForEvent:(NSEvent *)theEvent { + NSMenu *menu = [super menuForEvent:theEvent]; + NSPoint mouseLoc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; + int row = [self rowAtPoint:mouseLoc]; + if (row != -1) { + NSIndexSet *indexes = [NSIndexSet indexSetWithIndex:row]; + if ([[self delegate] respondsToSelector:@selector(tableView:canCopyRowsWithIndexes:)] && + [[self delegate] respondsToSelector:@selector(tableView:copyRowsWithIndexes:)] && + [[self delegate] tableView:self canCopyRowsWithIndexes:indexes]) { + if (menu == nil) + menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] init] autorelease]; + NSMenuItem *item = [menu addItemWithTitle:NSLocalizedString(@"Copy", @"Menu item title") action:@selector(copyFromContextualMenu:) keyEquivalent:@""]; + [item setTarget:self]; + [item setRepresentedObject:indexes]; + } + } + return menu; +} + +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem { + if ([menuItem action] == @selector(copy:)) + return [self canCopy]; + else if ([menuItem action] == @selector(copyFromContextualMenu:)) + return YES; + else if ([NSTableView instancesRespondToSelector:@selector(validateMenuItem:)]) + return [super validateMenuItem:menuItem]; + return YES; +} + @end #pragma mark - @implementation SKSnapshotTableView +- (BOOL)canDelete { + NSIndexSet *indexes = [self selectedRowIndexes]; + return [indexes count] && + [[self delegate] respondsToSelector:@selector(tableView:canDeleteRowsWithIndexes:)] && + [[self delegate] respondsToSelector:@selector(tableView:deleteRowsWithIndexes:)] && + [[self delegate] tableView:self canDeleteRowsWithIndexes:indexes]; +} + - (void)delete:(id)sender { - if ([[self delegate] respondsToSelector:@selector(tableView:deleteRowsWithIndexes:)]) { - if ([self selectedRow] == -1) - NSBeep(); - else - [[self delegate] tableView:self deleteRowsWithIndexes:[self selectedRowIndexes]]; - } + if ([self canDelete]) + [[self delegate] tableView:self deleteRowsWithIndexes:[self selectedRowIndexes]]; + else + NSBeep(); } - (void)keyDown:(NSEvent *)theEvent { @@ -156,12 +205,43 @@ unichar eventChar = [characters length] > 0 ? [characters characterAtIndex:0] : 0; unsigned int modifiers = [theEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask; - if ((eventChar == NSDeleteCharacter || eventChar == NSDeleteFunctionKey) && modifiers == 0) + if ((eventChar == NSDeleteCharacter || eventChar == NSDeleteFunctionKey) && modifiers == 0 && [self canDelete]) [self delete:self]; else [super keyDown:theEvent]; } +- (void)deleteFromContextualMenu:(id)sender { + [[self delegate] tableView:self deleteRowsWithIndexes:[sender representedObject]]; +} + +- (NSMenu *)menuForEvent:(NSEvent *)theEvent { + NSMenu *menu = [super menuForEvent:theEvent]; + NSPoint mouseLoc = [self convertPoint:[theEvent locationInWindow] fromView:nil]; + int row = [self rowAtPoint:mouseLoc]; + if (row != -1) { + NSIndexSet *indexes = [NSIndexSet indexSetWithIndex:row]; + if ([[self delegate] respondsToSelector:@selector(tableView:canDeleteRowsWithIndexes:)] && + [[self delegate] respondsToSelector:@selector(tableView:deleteRowsWithIndexes:)] && + [[self delegate] tableView:self canDeleteRowsWithIndexes:indexes]) { + if (menu == nil) + menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] init] autorelease]; + NSMenuItem *item = [menu addItemWithTitle:NSLocalizedString(@"Delete", @"Menu item title") action:@selector(deleteFromContextualMenu:) keyEquivalent:@""]; + [item setTarget:self]; + [item setRepresentedObject:indexes]; + } + } + return menu; +} + +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem { + if ([menuItem action] == @selector(delete:)) + return [self canDelete]; + else if ([menuItem action] == @selector(deleteFromContextualMenu:)) + return YES; + return [super validateMenuItem:menuItem]; +} + @end #pragma mark - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-08-05 12:59:01
|
Revision: 2604 http://skim-app.svn.sourceforge.net/skim-app/?rev=2604&view=rev Author: hofman Date: 2007-08-05 05:58:57 -0700 (Sun, 05 Aug 2007) Log Message: ----------- Remove border when a note was saved with zero line width. Modified Paths: -------------- trunk/SKPDFAnnotationNote.m Modified: trunk/SKPDFAnnotationNote.m =================================================================== --- trunk/SKPDFAnnotationNote.m 2007-08-03 16:40:12 UTC (rev 2603) +++ trunk/SKPDFAnnotationNote.m 2007-08-05 12:58:57 UTC (rev 2604) @@ -189,14 +189,19 @@ originalSetContents(self, @selector(setContents:), contents); if (color) originalSetColor(self, @selector(setColor:), color); - if ((lineWidth || borderStyle || dashPattern) && [self border] == nil) - originalSetBorder(self, @selector(setBorder:), [[[PDFBorder alloc] init] autorelease]); - if (lineWidth) - [[self border] setLineWidth:[lineWidth floatValue]]; - if (borderStyle) - [[self border] setStyle:[lineWidth intValue]]; - if (dashPattern) - [[self border] setDashPattern:dashPattern]; + if (lineWidth == nil && borderStyle == nil && dashPattern == nil) { + if ([self border]) + originalSetBorder(self, @selector(setBorder:), nil); + } else { + if ([self border] == nil) + originalSetBorder(self, @selector(setBorder:), [[[PDFBorder alloc] init] autorelease]); + if (lineWidth) + [[self border] setLineWidth:[lineWidth floatValue]]; + if (borderStyle) + [[self border] setStyle:[lineWidth intValue]]; + if (dashPattern) + [[self border] setDashPattern:dashPattern]; + } } return self; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-08-03 16:40:13
|
Revision: 2603 http://skim-app.svn.sourceforge.net/skim-app/?rev=2603&view=rev Author: hofman Date: 2007-08-03 09:40:12 -0700 (Fri, 03 Aug 2007) Log Message: ----------- Take page rotation into account to decide for prinitng landscape. Modified Paths: -------------- trunk/SKDocument.m Modified: trunk/SKDocument.m =================================================================== --- trunk/SKDocument.m 2007-08-02 08:50:10 UTC (rev 2602) +++ trunk/SKDocument.m 2007-08-03 16:40:12 UTC (rev 2603) @@ -108,11 +108,13 @@ SKMainWindowController *mainController = (SKMainWindowController *)aController; if ([pdfDocument pageCount]) { + PDFPage *page = [pdfDocument pageAtIndex:0]; NSPrintInfo *printInfo = [self printInfo]; NSSize paperSize = [printInfo paperSize]; - NSSize pageSize = [[pdfDocument pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox].size; - if ((pageSize.width > pageSize.height) != (paperSize.width > paperSize.height)) - [printInfo setOrientation:NSLandscapeOrientation]; + NSSize pageSize = [page boundsForBox:kPDFDisplayBoxMediaBox].size; + BOOL isRotated = [page rotation] % 180 == 90; + BOOL isWide = (pageSize.width > pageSize.height) != (paperSize.width > paperSize.height); + [printInfo setOrientation:isRotated == isWide ? NSPortraitOrientation : NSLandscapeOrientation]; } [mainController setPdfDocument:pdfDocument]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-08-02 08:50:12
|
Revision: 2602 http://skim-app.svn.sourceforge.net/skim-app/?rev=2602&view=rev Author: hofman Date: 2007-08-02 01:50:10 -0700 (Thu, 02 Aug 2007) Log Message: ----------- Fix xcode annoyance Modified Paths: -------------- trunk/Skim.xcodeproj/project.pbxproj Modified: trunk/Skim.xcodeproj/project.pbxproj =================================================================== --- trunk/Skim.xcodeproj/project.pbxproj 2007-08-02 08:48:39 UTC (rev 2601) +++ trunk/Skim.xcodeproj/project.pbxproj 2007-08-02 08:50:10 UTC (rev 2602) @@ -555,8 +555,6 @@ CECDD2970C5B68580026AAEC /* SKCenteredTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKCenteredTextFieldCell.m; sourceTree = "<group>"; }; CECDDBAB0C5BB95F0026AAEC /* SKFindTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKFindTableView.h; sourceTree = "<group>"; }; CECDDBAC0C5BB95F0026AAEC /* SKFindTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKFindTableView.m; sourceTree = "<group>"; }; - CEDD421E0C61D1770022856C /* NSImage_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSImage_BDSKExtensions.m; sourceTree = "<group>"; }; - CEDD421F0C61D1840022856C /* NSImage_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSImage_BDSKExtensions.m; sourceTree = "<group>"; }; CEE106130BCBB72C00BF2D3E /* SKNotesDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKNotesDocument.h; sourceTree = "<group>"; }; CEE106140BCBB72C00BF2D3E /* SKNotesDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKNotesDocument.m; sourceTree = "<group>"; }; CEE106590BCBBE1200BF2D3E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NotesDocument.nib; sourceTree = "<group>"; }; @@ -775,8 +773,6 @@ CE5487BA0B35A20A00F8AFB6 /* NSFileManager_ExtendedAttributes.h */, CE5487BB0B35A20A00F8AFB6 /* NSFileManager_ExtendedAttributes.m */, CECDC4FC0C5966A80026AAEC /* NSImage_SKExtensions.h */, - CEDD421E0C61D1770022856C /* NSImage_BDSKExtensions.m */, - CEDD421F0C61D1840022856C /* NSImage_BDSKExtensions.m */, CECDC4FD0C5966A80026AAEC /* NSImage_SKExtensions.m */, CE6C03EE0BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.h */, CE6C03EF0BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.m */, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-08-02 08:48:41
|
Revision: 2601 http://skim-app.svn.sourceforge.net/skim-app/?rev=2601&view=rev Author: hofman Date: 2007-08-02 01:48:39 -0700 (Thu, 02 Aug 2007) Log Message: ----------- rename wrongly named category and files. Modified Paths: -------------- trunk/SKApplicationController.m trunk/Skim.xcodeproj/project.pbxproj Added Paths: ----------- trunk/NSImage_SKExtensions.h trunk/NSImage_SKExtensions.m Removed Paths: ------------- trunk/NSImage_BDSKExtensions.h trunk/NSImage_BDSKExtensions.m Deleted: trunk/NSImage_BDSKExtensions.h =================================================================== --- trunk/NSImage_BDSKExtensions.h 2007-07-31 19:53:22 UTC (rev 2600) +++ trunk/NSImage_BDSKExtensions.h 2007-08-02 08:48:39 UTC (rev 2601) @@ -1,44 +0,0 @@ -// -// NSImage_BDSKExtensions.h -// Skim -// -// Created by Christiaan Hofman on 7/27/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> - - -@interface NSImage (BDSKExtensions) -+ (void)makeAdornImages; -@end Deleted: trunk/NSImage_BDSKExtensions.m =================================================================== --- trunk/NSImage_BDSKExtensions.m 2007-07-31 19:53:22 UTC (rev 2600) +++ trunk/NSImage_BDSKExtensions.m 2007-08-02 08:48:39 UTC (rev 2601) @@ -1,537 +0,0 @@ -// -// NSImage_BDSKExtensions.m -// Skim -// -// Created by Christiaan Hofman on 7/27/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 "NSImage_BDSKExtensions.h" - - -@implementation NSImage (BDSKExtensions) - -+ (void)makeAdornImages { - static NSImage *backAdornImage = nil; - static NSImage *forwardAdornImage = nil; - static NSImage *outlineViewAdornImage = nil; - static NSImage *thumbnailViewAdornImage = nil; - static NSImage *noteViewAdornImage = nil; - static NSImage *snapshotViewAdornImage = nil; - static NSImage *textToolAdornImage = nil; - static NSImage *moveToolAdornImage = nil; - static NSImage *magnifyToolAdornImage = nil; - static NSImage *selectToolAdornImage = nil; - static NSImage *textNoteToolAdornImage = nil; - static NSImage *anchoredNoteToolAdornImage = nil; - static NSImage *circleNoteToolAdornImage = nil; - static NSImage *squareNoteToolAdornImage = nil; - static NSImage *highlightNoteToolAdornImage = nil; - static NSImage *underlineNoteToolAdornImage = nil; - static NSImage *strikeOutNoteToolAdornImage = nil; - static NSImage *lineNoteToolAdornImage = nil; - static NSImage *textNoteAdornImage = nil; - static NSImage *anchoredNoteAdornImage = nil; - static NSImage *circleNoteAdornImage = nil; - static NSImage *squareNoteAdornImage = nil; - static NSImage *highlightNoteAdornImage = nil; - static NSImage *underlineNoteAdornImage = nil; - static NSImage *strikeOutNoteAdornImage = nil; - static NSImage *lineNoteAdornImage = nil; - - NSShadow *shadow = [[NSShadow alloc] init]; - [shadow setShadowBlurRadius:0.0]; - [shadow setShadowOffset:NSMakeSize(0.0, -1.0)]; - [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.1]]; - - NSColor *color = [NSColor colorWithCalibratedWhite:0.0 alpha:0.85]; - - NSSize size = NSMakeSize(25.0, 13.0); - NSSize noteSize = NSMakeSize(15.0, 11.0); - NSPoint point = NSMakePoint(2.0, 1.0); - NSBezierPath *path; - NSBezierPath *arrowPath = [NSBezierPath bezierPath]; - [arrowPath moveToPoint:NSMakePoint(20.5,4.0)]; - [arrowPath lineToPoint:NSMakePoint(18.0,7.0)]; - [arrowPath lineToPoint:NSMakePoint(23.0,7.0)]; - [arrowPath closePath]; - - backAdornImage = [[NSImage alloc] initWithSize:size]; - [backAdornImage lockFocus]; - //[shadow set]; - [[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(16.0, 2.5)]; - [path lineToPoint:NSMakePoint(7.5, 7.0)]; - [path lineToPoint:NSMakePoint(16.0, 11.5)]; - [path closePath]; - [path fill]; - [backAdornImage unlockFocus]; - [backAdornImage setName:@"BackAdorn"]; - - forwardAdornImage = [[NSImage alloc] initWithSize:size]; - [forwardAdornImage lockFocus]; - //[shadow set]; - [[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(9.0, 2.5)]; - [path lineToPoint:NSMakePoint(17.5, 7.0)]; - [path lineToPoint:NSMakePoint(9.0, 11.5)]; - [path closePath]; - [path fill]; - [forwardAdornImage unlockFocus]; - [forwardAdornImage setName:@"ForwardAdorn"]; - - outlineViewAdornImage = [[NSImage alloc] initWithSize:size]; - [outlineViewAdornImage lockFocus]; - [shadow set]; - [color setStroke]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(8.0, 2.5)]; - [path lineToPoint:NSMakePoint(19.0, 2.5)]; - [path moveToPoint:NSMakePoint(8.0, 5.5)]; - [path lineToPoint:NSMakePoint(19.0, 5.5)]; - [path moveToPoint:NSMakePoint(8.0, 8.5)]; - [path lineToPoint:NSMakePoint(19.0, 8.5)]; - [path moveToPoint:NSMakePoint(8.0, 11.5)]; - [path lineToPoint:NSMakePoint(19.0, 11.5)]; - [path stroke]; - [outlineViewAdornImage unlockFocus]; - [outlineViewAdornImage setName:@"OutlineViewAdorn"]; - - thumbnailViewAdornImage = [[NSImage alloc] initWithSize:size]; - [thumbnailViewAdornImage lockFocus]; - [shadow set]; - [color setStroke]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(14.0, 3.5)]; - [path lineToPoint:NSMakePoint(19.0, 3.5)]; - [path moveToPoint:NSMakePoint(14.0, 10.5)]; - [path lineToPoint:NSMakePoint(19.0, 10.5)]; - [path appendBezierPathWithRect:NSMakeRect(8.5, 1.5, 4.0, 4.0)]; - [path appendBezierPathWithRect:NSMakeRect(8.5, 8.5, 4.0, 4.0)]; - [path stroke]; - [thumbnailViewAdornImage unlockFocus]; - [thumbnailViewAdornImage setName:@"ThumbnailViewAdorn"]; - - noteViewAdornImage = [[NSImage alloc] initWithSize:size]; - [noteViewAdornImage lockFocus]; - [shadow set]; - [color setStroke]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(14.0, 3.5)]; - [path lineToPoint:NSMakePoint(19.0, 3.5)]; - [path moveToPoint:NSMakePoint(14.0, 10.5)]; - [path lineToPoint:NSMakePoint(19.0, 10.5)]; - [path moveToPoint:NSMakePoint(11.0, 1.5)]; - [path lineToPoint:NSMakePoint(8.5, 1.5)]; - [path lineToPoint:NSMakePoint(8.5, 5.5)]; - [path lineToPoint:NSMakePoint(12.5, 5.5)]; - [path lineToPoint:NSMakePoint(12.5, 3.0)]; - [path closePath]; - [path moveToPoint:NSMakePoint(11.5, 1.5)]; - [path lineToPoint:NSMakePoint(11.5, 2.5)]; - [path lineToPoint:NSMakePoint(12.5, 2.5)]; - [path moveToPoint:NSMakePoint(11.0, 8.5)]; - [path lineToPoint:NSMakePoint(8.5, 8.5)]; - [path lineToPoint:NSMakePoint(8.5, 12.5)]; - [path lineToPoint:NSMakePoint(12.5, 12.5)]; - [path lineToPoint:NSMakePoint(12.5, 10.0)]; - [path closePath]; - [path moveToPoint:NSMakePoint(11.5, 8.5)]; - [path lineToPoint:NSMakePoint(11.5, 9.5)]; - [path lineToPoint:NSMakePoint(12.5, 9.5)]; - [path stroke]; - [noteViewAdornImage unlockFocus]; - [noteViewAdornImage setName:@"NoteViewAdorn"]; - - snapshotViewAdornImage = [[NSImage alloc] initWithSize:size]; - [snapshotViewAdornImage lockFocus]; - [shadow set]; - [color setStroke]; - path = [NSBezierPath bezierPath]; - [path appendBezierPathWithRect:NSMakeRect(8.5, 1.5, 10.0, 4.0)]; - [path appendBezierPathWithRect:NSMakeRect(8.5, 8.5, 10.0, 4.0)]; - [path stroke]; - [snapshotViewAdornImage unlockFocus]; - [snapshotViewAdornImage setName:@"SnapshotViewAdorn"]; - - textToolAdornImage = [[NSImage alloc] initWithSize:size]; - [textToolAdornImage lockFocus]; - [shadow set]; - [color setFill]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(7.5, 2.0)]; - [path lineToPoint:NSMakePoint(11.5, 12.0)]; - [path lineToPoint:NSMakePoint(13.5, 12.0)]; - [path lineToPoint:NSMakePoint(17.5, 2.0)]; - [path lineToPoint:NSMakePoint(15.5, 2.0)]; - [path lineToPoint:NSMakePoint(14.3, 5.0)]; - [path lineToPoint:NSMakePoint(10.2, 5.0)]; - [path lineToPoint:NSMakePoint(9.0, 2.0)]; - [path closePath]; - [path moveToPoint:NSMakePoint(10.6, 6.0)]; - [path lineToPoint:NSMakePoint(13.9, 6.0)]; - [path lineToPoint:NSMakePoint(12.25, 10.125)]; - [path closePath]; - [path fill]; - [textToolAdornImage unlockFocus]; - [textToolAdornImage setName:@"TextToolAdorn"]; - - moveToolAdornImage = [[NSImage alloc] initWithSize:size]; - [moveToolAdornImage lockFocus]; - [shadow set]; - [[NSColor blackColor] set]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(9.0, 5.5)]; - [path lineToPoint:NSMakePoint(7.0, 7.5)]; - [path lineToPoint:NSMakePoint(9.0, 9.5)]; - [path lineToPoint:NSMakePoint(9.0, 8.0)]; - [path lineToPoint:NSMakePoint(12.0, 8.0)]; - [path lineToPoint:NSMakePoint(12.0, 11.0)]; - [path lineToPoint:NSMakePoint(10.5, 11.0)]; - [path lineToPoint:NSMakePoint(12.5, 13.0)]; - [path lineToPoint:NSMakePoint(14.5, 11.0)]; - [path lineToPoint:NSMakePoint(13.0, 11.0)]; - [path lineToPoint:NSMakePoint(13.0, 8.0)]; - [path lineToPoint:NSMakePoint(16.0, 8.0)]; - [path lineToPoint:NSMakePoint(16.0, 9.5)]; - [path lineToPoint:NSMakePoint(18.0, 7.5)]; - [path lineToPoint:NSMakePoint(16.0, 5.5)]; - [path lineToPoint:NSMakePoint(16.0, 7.0)]; - [path lineToPoint:NSMakePoint(13.0, 7.0)]; - [path lineToPoint:NSMakePoint(13.0, 4.0)]; - [path lineToPoint:NSMakePoint(14.5, 4.0)]; - [path lineToPoint:NSMakePoint(12.5, 2.0)]; - [path lineToPoint:NSMakePoint(10.5, 4.0)]; - [path lineToPoint:NSMakePoint(12.0, 4.0)]; - [path lineToPoint:NSMakePoint(12.0, 7.0)]; - [path lineToPoint:NSMakePoint(9.0, 7.0)]; - [path closePath]; - [path fill]; - [moveToolAdornImage unlockFocus]; - [moveToolAdornImage setName:@"MoveToolAdorn"]; - - magnifyToolAdornImage = [[NSImage alloc] initWithSize:size]; - [magnifyToolAdornImage lockFocus]; - [shadow set]; - [color setStroke]; - path = [NSBezierPath bezierPath]; - [path appendBezierPathWithOvalInRect:NSMakeRect(7.0, 4.0, 8.0, 8.0)]; - [path moveToPoint:NSMakePoint(14.0, 5.0)]; - [path lineToPoint:NSMakePoint(18.0, 1.0)]; - [path setLineWidth:2.0]; - [path stroke]; - [magnifyToolAdornImage unlockFocus]; - [magnifyToolAdornImage setName:@"MagnifyToolAdorn"]; - - selectToolAdornImage = [[NSImage alloc] initWithSize:size]; - [selectToolAdornImage lockFocus]; - [shadow set]; - [color setStroke]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(7.5, 9.0)]; - [path lineToPoint:NSMakePoint(7.5, 11.5)]; - [path lineToPoint:NSMakePoint(10.0, 11.5)]; - [path moveToPoint:NSMakePoint(11.0, 11.5)]; - [path lineToPoint:NSMakePoint(14.0, 11.5)]; - [path moveToPoint:NSMakePoint(15.0, 11.5)]; - [path lineToPoint:NSMakePoint(17.5, 11.5)]; - [path lineToPoint:NSMakePoint(17.5, 9.0)]; - [path moveToPoint:NSMakePoint(17.5, 8.0)]; - [path lineToPoint:NSMakePoint(17.5, 6.0)]; - [path moveToPoint:NSMakePoint(17.5, 5.0)]; - [path lineToPoint:NSMakePoint(17.5, 2.5)]; - [path lineToPoint:NSMakePoint(15.0, 2.5)]; - [path moveToPoint:NSMakePoint(14.0, 2.5)]; - [path lineToPoint:NSMakePoint(11.0, 2.5)]; - [path moveToPoint:NSMakePoint(10.0, 2.5)]; - [path lineToPoint:NSMakePoint(7.5, 2.5)]; - [path lineToPoint:NSMakePoint(7.5, 5.0)]; - [path moveToPoint:NSMakePoint(7.5, 6.0)]; - [path lineToPoint:NSMakePoint(7.5, 8.0)]; - [path stroke]; - [selectToolAdornImage unlockFocus]; - [selectToolAdornImage setName:@"SelectToolAdorn"]; - - textNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; - [textNoteAdornImage lockFocus]; - //[shadow set]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(4.5, 3.5)]; - [path lineToPoint:NSMakePoint(11.5, 10.5)]; - [path lineToPoint:NSMakePoint(11.0, 11.0)]; - [path lineToPoint:NSMakePoint(4.0, 4.0)]; - [path closePath]; - [[NSColor colorWithCalibratedWhite:0.4 alpha:0.85] set]; - [path fill]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(4.0, 4.0)]; - [path lineToPoint:NSMakePoint(11.0, 11.0)]; - [path lineToPoint:NSMakePoint(10.0, 11.0)]; - [path lineToPoint:NSMakePoint(3.0, 4.0)]; - [path closePath]; - [[NSColor colorWithCalibratedWhite:0.0 alpha:0.85] set]; - [path fill]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(6.0, 1.0)]; - [path lineToPoint:NSMakePoint(13.0, 8.0)]; - [path lineToPoint:NSMakePoint(13.0, 9.0)]; - [path lineToPoint:NSMakePoint(11.5, 10.5)]; - [path lineToPoint:NSMakePoint(4.5, 3.5)]; - [path lineToPoint:NSMakePoint(6.0, 2.0)]; - [path closePath]; - [[NSColor colorWithCalibratedWhite:0.0 alpha:0.85] set]; - [path fill]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(3.0, 1.5)]; - [path lineToPoint:NSMakePoint(4.0, 4.0)]; - [path lineToPoint:NSMakePoint(3.0, 4.0)]; - [path lineToPoint:NSMakePoint(2.5, 2.0)]; - [path closePath]; - [[NSColor colorWithCalibratedWhite:0.3 alpha:0.85] set]; - [path fill]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(3.5, 1.0)]; - [path lineToPoint:NSMakePoint(6.0, 2.0)]; - [path lineToPoint:NSMakePoint(4.0, 4.0)]; - [path lineToPoint:NSMakePoint(3.0, 1.5)]; - [path closePath]; - [[NSColor colorWithCalibratedWhite:0.8 alpha:0.85] set]; - [path fill]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(4.0, 0.5)]; - [path lineToPoint:NSMakePoint(6.0, 1.0)]; - [path lineToPoint:NSMakePoint(6.0, 2.0)]; - [path lineToPoint:NSMakePoint(3.5, 1.0)]; - [path closePath]; - [[NSColor colorWithCalibratedWhite:0.1 alpha:0.85] set]; - [path fill]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(2.0, 0.0)]; - [path lineToPoint:NSMakePoint(4.0, 0.5)]; - [path lineToPoint:NSMakePoint(2.5, 2.0)]; - [path closePath]; - [[NSColor colorWithCalibratedWhite:0.0 alpha:0.95] set]; - [path fill]; - [textNoteAdornImage unlockFocus]; - [textNoteAdornImage setName:@"TextNoteAdorn"]; - - textNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [textNoteToolAdornImage lockFocus]; - [[NSGraphicsContext currentContext] saveGraphicsState]; - [textNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [textNoteToolAdornImage unlockFocus]; - [textNoteToolAdornImage setName:@"TextNoteToolAdorn"]; - - anchoredNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; - [anchoredNoteAdornImage lockFocus]; - [shadow set]; - [color setStroke]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(9.5, 0.5)]; - [path lineToPoint:NSMakePoint(2.5, 0.5)]; - [path lineToPoint:NSMakePoint(2.5, 10.5)]; - [path lineToPoint:NSMakePoint(12.5, 10.5)]; - [path lineToPoint:NSMakePoint(12.5, 3.5)]; - [path closePath]; - [path moveToPoint:NSMakePoint(9.5, 0.5)]; - [path lineToPoint:NSMakePoint(9.5, 3.5)]; - [path lineToPoint:NSMakePoint(12.5, 3.5)]; - [path moveToPoint:NSMakePoint(4.0, 4.5)]; - [path lineToPoint:NSMakePoint(8.0, 4.5)]; - [path moveToPoint:NSMakePoint(4.0, 6.5)]; - [path lineToPoint:NSMakePoint(11.0, 6.5)]; - [path moveToPoint:NSMakePoint(4.0, 8.5)]; - [path lineToPoint:NSMakePoint(11.0, 8.5)]; - [path stroke]; - [anchoredNoteAdornImage unlockFocus]; - [anchoredNoteAdornImage setName:@"AnchoredNoteAdorn"]; - - anchoredNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [anchoredNoteToolAdornImage lockFocus]; - [anchoredNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [shadow set]; - [arrowPath fill]; - [anchoredNoteToolAdornImage unlockFocus]; - [anchoredNoteToolAdornImage setName:@"AnchoredNoteToolAdorn"]; - - circleNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; - [circleNoteAdornImage lockFocus]; - [shadow set]; - [color setStroke]; - NSBezierPath *clipPath = [NSBezierPath bezierPath]; - [clipPath moveToPoint:NSMakePoint(0.0, 0.0)]; - [clipPath lineToPoint:NSMakePoint(5.0, 0.0)]; - [clipPath lineToPoint:NSMakePoint(5.0, 7.0)]; - [clipPath lineToPoint:NSMakePoint(15.0, 7.0)]; - [clipPath lineToPoint:NSMakePoint(15.0, 11.0)]; - [clipPath lineToPoint:NSMakePoint(0.0, 11.0)]; - [clipPath closePath]; - path = [NSBezierPath bezierPath]; - [path appendBezierPathWithOvalInRect:NSMakeRect(5.5, 0.5, 9.0, 6.0)]; - [path stroke]; - path = [NSBezierPath bezierPath]; - [clipPath addClip]; - [path appendBezierPathWithOvalInRect:NSMakeRect(0.5, 3.5, 10.0, 7.0)]; - [path stroke]; - [circleNoteAdornImage unlockFocus]; - [circleNoteAdornImage setName:@"CircleNoteAdorn"]; - - circleNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [circleNoteToolAdornImage lockFocus]; - [circleNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [circleNoteToolAdornImage unlockFocus]; - [circleNoteToolAdornImage setName:@"CircleNoteToolAdorn"]; - - squareNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; - [squareNoteAdornImage lockFocus]; - [shadow set]; - [color setStroke]; - path = [NSBezierPath bezierPathWithRect:NSMakeRect(5.5, 1.5, 9.0, 5.0)]; - [path moveToPoint:NSMakePoint(5.0, 4.5)]; - [path lineToPoint:NSMakePoint(0.5, 4.5)]; - [path lineToPoint:NSMakePoint(0.5, 10.5)]; - [path lineToPoint:NSMakePoint(10.5, 10.5)]; - [path lineToPoint:NSMakePoint(10.5, 7.0)]; - [path stroke]; - [squareNoteAdornImage unlockFocus]; - [squareNoteAdornImage setName:@"SquareNoteAdorn"]; - - squareNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [squareNoteToolAdornImage lockFocus]; - [squareNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [squareNoteToolAdornImage unlockFocus]; - [squareNoteToolAdornImage setName:@"SquareNoteToolAdorn"]; - - highlightNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; - [highlightNoteAdornImage lockFocus]; - [shadow set]; - [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setFill]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(5.0, 5.0)]; - [path lineToPoint:NSMakePoint(0.0, 5.0)]; - [path lineToPoint:NSMakePoint(0.0, 8.0)]; - [path lineToPoint:NSMakePoint(12.0, 8.0)]; - [path lineToPoint:NSMakePoint(12.0, 6.0)]; - [path lineToPoint:NSMakePoint(15.0, 6.0)]; - [path lineToPoint:NSMakePoint(15.0, 3.0)]; - [path lineToPoint:NSMakePoint(5.0, 3.0)]; - [path lineToPoint:NSMakePoint(5.0, 5.0)]; - [path fill]; - [highlightNoteAdornImage unlockFocus]; - [highlightNoteAdornImage setName:@"HighlightNoteAdorn"]; - - highlightNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [highlightNoteToolAdornImage lockFocus]; - [highlightNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [highlightNoteToolAdornImage unlockFocus]; - [highlightNoteToolAdornImage setName:@"HighlightNoteToolAdorn"]; - - underlineNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; - [underlineNoteAdornImage lockFocus]; - [shadow set]; - [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setStroke]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(1.0, 3.5)]; - [path lineToPoint:NSMakePoint(15.0, 3.5)]; - [path moveToPoint:NSMakePoint(0.0, 6.5)]; - [path lineToPoint:NSMakePoint(12.0, 6.5)]; - [path stroke]; - [underlineNoteAdornImage unlockFocus]; - [underlineNoteAdornImage setName:@"UnderlineNoteAdorn"]; - - underlineNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [underlineNoteToolAdornImage lockFocus]; - [underlineNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [underlineNoteToolAdornImage unlockFocus]; - [underlineNoteToolAdornImage setName:@"UnderlineNoteToolAdorn"]; - - strikeOutNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; - [strikeOutNoteAdornImage lockFocus]; - [shadow set]; - [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setStroke]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(0.0, 2.5)]; - [path lineToPoint:NSMakePoint(14.0, 8.5)]; - [path moveToPoint:NSMakePoint(0.0, 8.5)]; - [path lineToPoint:NSMakePoint(14.0, 2.5)]; - [path stroke]; - [strikeOutNoteAdornImage unlockFocus]; - [strikeOutNoteAdornImage setName:@"StrikeOutNoteAdorn"]; - - strikeOutNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [strikeOutNoteToolAdornImage lockFocus]; - [strikeOutNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [strikeOutNoteToolAdornImage unlockFocus]; - [strikeOutNoteToolAdornImage setName:@"StrikeOutNoteToolAdorn"]; - - lineNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; - [lineNoteAdornImage lockFocus]; - [shadow set]; - [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setStroke]; - path = [NSBezierPath bezierPath]; - [path moveToPoint:NSMakePoint(2.0, 1.0)]; - [path lineToPoint:NSMakePoint(14.0, 10.0)]; - [path moveToPoint:NSMakePoint(8.0, 8.5)]; - [path lineToPoint:NSMakePoint(14.0, 10.0)]; - [path lineToPoint:NSMakePoint(11.0, 5.0)]; - [path setLineWidth:1.2]; - [path stroke]; - [lineNoteAdornImage unlockFocus]; - [lineNoteAdornImage setName:@"LineNoteAdorn"]; - - lineNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; - [lineNoteToolAdornImage lockFocus]; - [lineNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; - [color setFill]; - [arrowPath fill]; - [lineNoteToolAdornImage unlockFocus]; - [lineNoteToolAdornImage setName:@"LineNoteToolAdorn"]; - - [shadow release]; -} - -@end Copied: trunk/NSImage_SKExtensions.h (from rev 2568, trunk/NSImage_BDSKExtensions.h) =================================================================== --- trunk/NSImage_SKExtensions.h (rev 0) +++ trunk/NSImage_SKExtensions.h 2007-08-02 08:48:39 UTC (rev 2601) @@ -0,0 +1,44 @@ +// +// NSImage_SKExtensions.h +// Skim +// +// Created by Christiaan Hofman on 7/27/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> + + +@interface NSImage (SKExtensions) ++ (void)makeAdornImages; +@end Copied: trunk/NSImage_SKExtensions.m (from rev 2576, trunk/NSImage_BDSKExtensions.m) =================================================================== --- trunk/NSImage_SKExtensions.m (rev 0) +++ trunk/NSImage_SKExtensions.m 2007-08-02 08:48:39 UTC (rev 2601) @@ -0,0 +1,537 @@ +// +// NSImage_SKExtensions.m +// Skim +// +// Created by Christiaan Hofman on 7/27/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 "NSImage_SKExtensions.h" + + +@implementation NSImage (SKExtensions) + ++ (void)makeAdornImages { + static NSImage *backAdornImage = nil; + static NSImage *forwardAdornImage = nil; + static NSImage *outlineViewAdornImage = nil; + static NSImage *thumbnailViewAdornImage = nil; + static NSImage *noteViewAdornImage = nil; + static NSImage *snapshotViewAdornImage = nil; + static NSImage *textToolAdornImage = nil; + static NSImage *moveToolAdornImage = nil; + static NSImage *magnifyToolAdornImage = nil; + static NSImage *selectToolAdornImage = nil; + static NSImage *textNoteToolAdornImage = nil; + static NSImage *anchoredNoteToolAdornImage = nil; + static NSImage *circleNoteToolAdornImage = nil; + static NSImage *squareNoteToolAdornImage = nil; + static NSImage *highlightNoteToolAdornImage = nil; + static NSImage *underlineNoteToolAdornImage = nil; + static NSImage *strikeOutNoteToolAdornImage = nil; + static NSImage *lineNoteToolAdornImage = nil; + static NSImage *textNoteAdornImage = nil; + static NSImage *anchoredNoteAdornImage = nil; + static NSImage *circleNoteAdornImage = nil; + static NSImage *squareNoteAdornImage = nil; + static NSImage *highlightNoteAdornImage = nil; + static NSImage *underlineNoteAdornImage = nil; + static NSImage *strikeOutNoteAdornImage = nil; + static NSImage *lineNoteAdornImage = nil; + + NSShadow *shadow = [[NSShadow alloc] init]; + [shadow setShadowBlurRadius:0.0]; + [shadow setShadowOffset:NSMakeSize(0.0, -1.0)]; + [shadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.1]]; + + NSColor *color = [NSColor colorWithCalibratedWhite:0.0 alpha:0.85]; + + NSSize size = NSMakeSize(25.0, 13.0); + NSSize noteSize = NSMakeSize(15.0, 11.0); + NSPoint point = NSMakePoint(2.0, 1.0); + NSBezierPath *path; + NSBezierPath *arrowPath = [NSBezierPath bezierPath]; + [arrowPath moveToPoint:NSMakePoint(20.5,4.0)]; + [arrowPath lineToPoint:NSMakePoint(18.0,7.0)]; + [arrowPath lineToPoint:NSMakePoint(23.0,7.0)]; + [arrowPath closePath]; + + backAdornImage = [[NSImage alloc] initWithSize:size]; + [backAdornImage lockFocus]; + //[shadow set]; + [[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(16.0, 2.5)]; + [path lineToPoint:NSMakePoint(7.5, 7.0)]; + [path lineToPoint:NSMakePoint(16.0, 11.5)]; + [path closePath]; + [path fill]; + [backAdornImage unlockFocus]; + [backAdornImage setName:@"BackAdorn"]; + + forwardAdornImage = [[NSImage alloc] initWithSize:size]; + [forwardAdornImage lockFocus]; + //[shadow set]; + [[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(9.0, 2.5)]; + [path lineToPoint:NSMakePoint(17.5, 7.0)]; + [path lineToPoint:NSMakePoint(9.0, 11.5)]; + [path closePath]; + [path fill]; + [forwardAdornImage unlockFocus]; + [forwardAdornImage setName:@"ForwardAdorn"]; + + outlineViewAdornImage = [[NSImage alloc] initWithSize:size]; + [outlineViewAdornImage lockFocus]; + [shadow set]; + [color setStroke]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(8.0, 2.5)]; + [path lineToPoint:NSMakePoint(19.0, 2.5)]; + [path moveToPoint:NSMakePoint(8.0, 5.5)]; + [path lineToPoint:NSMakePoint(19.0, 5.5)]; + [path moveToPoint:NSMakePoint(8.0, 8.5)]; + [path lineToPoint:NSMakePoint(19.0, 8.5)]; + [path moveToPoint:NSMakePoint(8.0, 11.5)]; + [path lineToPoint:NSMakePoint(19.0, 11.5)]; + [path stroke]; + [outlineViewAdornImage unlockFocus]; + [outlineViewAdornImage setName:@"OutlineViewAdorn"]; + + thumbnailViewAdornImage = [[NSImage alloc] initWithSize:size]; + [thumbnailViewAdornImage lockFocus]; + [shadow set]; + [color setStroke]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(14.0, 3.5)]; + [path lineToPoint:NSMakePoint(19.0, 3.5)]; + [path moveToPoint:NSMakePoint(14.0, 10.5)]; + [path lineToPoint:NSMakePoint(19.0, 10.5)]; + [path appendBezierPathWithRect:NSMakeRect(8.5, 1.5, 4.0, 4.0)]; + [path appendBezierPathWithRect:NSMakeRect(8.5, 8.5, 4.0, 4.0)]; + [path stroke]; + [thumbnailViewAdornImage unlockFocus]; + [thumbnailViewAdornImage setName:@"ThumbnailViewAdorn"]; + + noteViewAdornImage = [[NSImage alloc] initWithSize:size]; + [noteViewAdornImage lockFocus]; + [shadow set]; + [color setStroke]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(14.0, 3.5)]; + [path lineToPoint:NSMakePoint(19.0, 3.5)]; + [path moveToPoint:NSMakePoint(14.0, 10.5)]; + [path lineToPoint:NSMakePoint(19.0, 10.5)]; + [path moveToPoint:NSMakePoint(11.0, 1.5)]; + [path lineToPoint:NSMakePoint(8.5, 1.5)]; + [path lineToPoint:NSMakePoint(8.5, 5.5)]; + [path lineToPoint:NSMakePoint(12.5, 5.5)]; + [path lineToPoint:NSMakePoint(12.5, 3.0)]; + [path closePath]; + [path moveToPoint:NSMakePoint(11.5, 1.5)]; + [path lineToPoint:NSMakePoint(11.5, 2.5)]; + [path lineToPoint:NSMakePoint(12.5, 2.5)]; + [path moveToPoint:NSMakePoint(11.0, 8.5)]; + [path lineToPoint:NSMakePoint(8.5, 8.5)]; + [path lineToPoint:NSMakePoint(8.5, 12.5)]; + [path lineToPoint:NSMakePoint(12.5, 12.5)]; + [path lineToPoint:NSMakePoint(12.5, 10.0)]; + [path closePath]; + [path moveToPoint:NSMakePoint(11.5, 8.5)]; + [path lineToPoint:NSMakePoint(11.5, 9.5)]; + [path lineToPoint:NSMakePoint(12.5, 9.5)]; + [path stroke]; + [noteViewAdornImage unlockFocus]; + [noteViewAdornImage setName:@"NoteViewAdorn"]; + + snapshotViewAdornImage = [[NSImage alloc] initWithSize:size]; + [snapshotViewAdornImage lockFocus]; + [shadow set]; + [color setStroke]; + path = [NSBezierPath bezierPath]; + [path appendBezierPathWithRect:NSMakeRect(8.5, 1.5, 10.0, 4.0)]; + [path appendBezierPathWithRect:NSMakeRect(8.5, 8.5, 10.0, 4.0)]; + [path stroke]; + [snapshotViewAdornImage unlockFocus]; + [snapshotViewAdornImage setName:@"SnapshotViewAdorn"]; + + textToolAdornImage = [[NSImage alloc] initWithSize:size]; + [textToolAdornImage lockFocus]; + [shadow set]; + [color setFill]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(7.5, 2.0)]; + [path lineToPoint:NSMakePoint(11.5, 12.0)]; + [path lineToPoint:NSMakePoint(13.5, 12.0)]; + [path lineToPoint:NSMakePoint(17.5, 2.0)]; + [path lineToPoint:NSMakePoint(15.5, 2.0)]; + [path lineToPoint:NSMakePoint(14.3, 5.0)]; + [path lineToPoint:NSMakePoint(10.2, 5.0)]; + [path lineToPoint:NSMakePoint(9.0, 2.0)]; + [path closePath]; + [path moveToPoint:NSMakePoint(10.6, 6.0)]; + [path lineToPoint:NSMakePoint(13.9, 6.0)]; + [path lineToPoint:NSMakePoint(12.25, 10.125)]; + [path closePath]; + [path fill]; + [textToolAdornImage unlockFocus]; + [textToolAdornImage setName:@"TextToolAdorn"]; + + moveToolAdornImage = [[NSImage alloc] initWithSize:size]; + [moveToolAdornImage lockFocus]; + [shadow set]; + [[NSColor blackColor] set]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(9.0, 5.5)]; + [path lineToPoint:NSMakePoint(7.0, 7.5)]; + [path lineToPoint:NSMakePoint(9.0, 9.5)]; + [path lineToPoint:NSMakePoint(9.0, 8.0)]; + [path lineToPoint:NSMakePoint(12.0, 8.0)]; + [path lineToPoint:NSMakePoint(12.0, 11.0)]; + [path lineToPoint:NSMakePoint(10.5, 11.0)]; + [path lineToPoint:NSMakePoint(12.5, 13.0)]; + [path lineToPoint:NSMakePoint(14.5, 11.0)]; + [path lineToPoint:NSMakePoint(13.0, 11.0)]; + [path lineToPoint:NSMakePoint(13.0, 8.0)]; + [path lineToPoint:NSMakePoint(16.0, 8.0)]; + [path lineToPoint:NSMakePoint(16.0, 9.5)]; + [path lineToPoint:NSMakePoint(18.0, 7.5)]; + [path lineToPoint:NSMakePoint(16.0, 5.5)]; + [path lineToPoint:NSMakePoint(16.0, 7.0)]; + [path lineToPoint:NSMakePoint(13.0, 7.0)]; + [path lineToPoint:NSMakePoint(13.0, 4.0)]; + [path lineToPoint:NSMakePoint(14.5, 4.0)]; + [path lineToPoint:NSMakePoint(12.5, 2.0)]; + [path lineToPoint:NSMakePoint(10.5, 4.0)]; + [path lineToPoint:NSMakePoint(12.0, 4.0)]; + [path lineToPoint:NSMakePoint(12.0, 7.0)]; + [path lineToPoint:NSMakePoint(9.0, 7.0)]; + [path closePath]; + [path fill]; + [moveToolAdornImage unlockFocus]; + [moveToolAdornImage setName:@"MoveToolAdorn"]; + + magnifyToolAdornImage = [[NSImage alloc] initWithSize:size]; + [magnifyToolAdornImage lockFocus]; + [shadow set]; + [color setStroke]; + path = [NSBezierPath bezierPath]; + [path appendBezierPathWithOvalInRect:NSMakeRect(7.0, 4.0, 8.0, 8.0)]; + [path moveToPoint:NSMakePoint(14.0, 5.0)]; + [path lineToPoint:NSMakePoint(18.0, 1.0)]; + [path setLineWidth:2.0]; + [path stroke]; + [magnifyToolAdornImage unlockFocus]; + [magnifyToolAdornImage setName:@"MagnifyToolAdorn"]; + + selectToolAdornImage = [[NSImage alloc] initWithSize:size]; + [selectToolAdornImage lockFocus]; + [shadow set]; + [color setStroke]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(7.5, 9.0)]; + [path lineToPoint:NSMakePoint(7.5, 11.5)]; + [path lineToPoint:NSMakePoint(10.0, 11.5)]; + [path moveToPoint:NSMakePoint(11.0, 11.5)]; + [path lineToPoint:NSMakePoint(14.0, 11.5)]; + [path moveToPoint:NSMakePoint(15.0, 11.5)]; + [path lineToPoint:NSMakePoint(17.5, 11.5)]; + [path lineToPoint:NSMakePoint(17.5, 9.0)]; + [path moveToPoint:NSMakePoint(17.5, 8.0)]; + [path lineToPoint:NSMakePoint(17.5, 6.0)]; + [path moveToPoint:NSMakePoint(17.5, 5.0)]; + [path lineToPoint:NSMakePoint(17.5, 2.5)]; + [path lineToPoint:NSMakePoint(15.0, 2.5)]; + [path moveToPoint:NSMakePoint(14.0, 2.5)]; + [path lineToPoint:NSMakePoint(11.0, 2.5)]; + [path moveToPoint:NSMakePoint(10.0, 2.5)]; + [path lineToPoint:NSMakePoint(7.5, 2.5)]; + [path lineToPoint:NSMakePoint(7.5, 5.0)]; + [path moveToPoint:NSMakePoint(7.5, 6.0)]; + [path lineToPoint:NSMakePoint(7.5, 8.0)]; + [path stroke]; + [selectToolAdornImage unlockFocus]; + [selectToolAdornImage setName:@"SelectToolAdorn"]; + + textNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; + [textNoteAdornImage lockFocus]; + //[shadow set]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(4.5, 3.5)]; + [path lineToPoint:NSMakePoint(11.5, 10.5)]; + [path lineToPoint:NSMakePoint(11.0, 11.0)]; + [path lineToPoint:NSMakePoint(4.0, 4.0)]; + [path closePath]; + [[NSColor colorWithCalibratedWhite:0.4 alpha:0.85] set]; + [path fill]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(4.0, 4.0)]; + [path lineToPoint:NSMakePoint(11.0, 11.0)]; + [path lineToPoint:NSMakePoint(10.0, 11.0)]; + [path lineToPoint:NSMakePoint(3.0, 4.0)]; + [path closePath]; + [[NSColor colorWithCalibratedWhite:0.0 alpha:0.85] set]; + [path fill]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(6.0, 1.0)]; + [path lineToPoint:NSMakePoint(13.0, 8.0)]; + [path lineToPoint:NSMakePoint(13.0, 9.0)]; + [path lineToPoint:NSMakePoint(11.5, 10.5)]; + [path lineToPoint:NSMakePoint(4.5, 3.5)]; + [path lineToPoint:NSMakePoint(6.0, 2.0)]; + [path closePath]; + [[NSColor colorWithCalibratedWhite:0.0 alpha:0.85] set]; + [path fill]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(3.0, 1.5)]; + [path lineToPoint:NSMakePoint(4.0, 4.0)]; + [path lineToPoint:NSMakePoint(3.0, 4.0)]; + [path lineToPoint:NSMakePoint(2.5, 2.0)]; + [path closePath]; + [[NSColor colorWithCalibratedWhite:0.3 alpha:0.85] set]; + [path fill]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(3.5, 1.0)]; + [path lineToPoint:NSMakePoint(6.0, 2.0)]; + [path lineToPoint:NSMakePoint(4.0, 4.0)]; + [path lineToPoint:NSMakePoint(3.0, 1.5)]; + [path closePath]; + [[NSColor colorWithCalibratedWhite:0.8 alpha:0.85] set]; + [path fill]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(4.0, 0.5)]; + [path lineToPoint:NSMakePoint(6.0, 1.0)]; + [path lineToPoint:NSMakePoint(6.0, 2.0)]; + [path lineToPoint:NSMakePoint(3.5, 1.0)]; + [path closePath]; + [[NSColor colorWithCalibratedWhite:0.1 alpha:0.85] set]; + [path fill]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(2.0, 0.0)]; + [path lineToPoint:NSMakePoint(4.0, 0.5)]; + [path lineToPoint:NSMakePoint(2.5, 2.0)]; + [path closePath]; + [[NSColor colorWithCalibratedWhite:0.0 alpha:0.95] set]; + [path fill]; + [textNoteAdornImage unlockFocus]; + [textNoteAdornImage setName:@"TextNoteAdorn"]; + + textNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; + [textNoteToolAdornImage lockFocus]; + [[NSGraphicsContext currentContext] saveGraphicsState]; + [textNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; + [color setFill]; + [arrowPath fill]; + [textNoteToolAdornImage unlockFocus]; + [textNoteToolAdornImage setName:@"TextNoteToolAdorn"]; + + anchoredNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; + [anchoredNoteAdornImage lockFocus]; + [shadow set]; + [color setStroke]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(9.5, 0.5)]; + [path lineToPoint:NSMakePoint(2.5, 0.5)]; + [path lineToPoint:NSMakePoint(2.5, 10.5)]; + [path lineToPoint:NSMakePoint(12.5, 10.5)]; + [path lineToPoint:NSMakePoint(12.5, 3.5)]; + [path closePath]; + [path moveToPoint:NSMakePoint(9.5, 0.5)]; + [path lineToPoint:NSMakePoint(9.5, 3.5)]; + [path lineToPoint:NSMakePoint(12.5, 3.5)]; + [path moveToPoint:NSMakePoint(4.0, 4.5)]; + [path lineToPoint:NSMakePoint(8.0, 4.5)]; + [path moveToPoint:NSMakePoint(4.0, 6.5)]; + [path lineToPoint:NSMakePoint(11.0, 6.5)]; + [path moveToPoint:NSMakePoint(4.0, 8.5)]; + [path lineToPoint:NSMakePoint(11.0, 8.5)]; + [path stroke]; + [anchoredNoteAdornImage unlockFocus]; + [anchoredNoteAdornImage setName:@"AnchoredNoteAdorn"]; + + anchoredNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; + [anchoredNoteToolAdornImage lockFocus]; + [anchoredNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; + [shadow set]; + [arrowPath fill]; + [anchoredNoteToolAdornImage unlockFocus]; + [anchoredNoteToolAdornImage setName:@"AnchoredNoteToolAdorn"]; + + circleNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; + [circleNoteAdornImage lockFocus]; + [shadow set]; + [color setStroke]; + NSBezierPath *clipPath = [NSBezierPath bezierPath]; + [clipPath moveToPoint:NSMakePoint(0.0, 0.0)]; + [clipPath lineToPoint:NSMakePoint(5.0, 0.0)]; + [clipPath lineToPoint:NSMakePoint(5.0, 7.0)]; + [clipPath lineToPoint:NSMakePoint(15.0, 7.0)]; + [clipPath lineToPoint:NSMakePoint(15.0, 11.0)]; + [clipPath lineToPoint:NSMakePoint(0.0, 11.0)]; + [clipPath closePath]; + path = [NSBezierPath bezierPath]; + [path appendBezierPathWithOvalInRect:NSMakeRect(5.5, 0.5, 9.0, 6.0)]; + [path stroke]; + path = [NSBezierPath bezierPath]; + [clipPath addClip]; + [path appendBezierPathWithOvalInRect:NSMakeRect(0.5, 3.5, 10.0, 7.0)]; + [path stroke]; + [circleNoteAdornImage unlockFocus]; + [circleNoteAdornImage setName:@"CircleNoteAdorn"]; + + circleNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; + [circleNoteToolAdornImage lockFocus]; + [circleNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; + [color setFill]; + [arrowPath fill]; + [circleNoteToolAdornImage unlockFocus]; + [circleNoteToolAdornImage setName:@"CircleNoteToolAdorn"]; + + squareNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; + [squareNoteAdornImage lockFocus]; + [shadow set]; + [color setStroke]; + path = [NSBezierPath bezierPathWithRect:NSMakeRect(5.5, 1.5, 9.0, 5.0)]; + [path moveToPoint:NSMakePoint(5.0, 4.5)]; + [path lineToPoint:NSMakePoint(0.5, 4.5)]; + [path lineToPoint:NSMakePoint(0.5, 10.5)]; + [path lineToPoint:NSMakePoint(10.5, 10.5)]; + [path lineToPoint:NSMakePoint(10.5, 7.0)]; + [path stroke]; + [squareNoteAdornImage unlockFocus]; + [squareNoteAdornImage setName:@"SquareNoteAdorn"]; + + squareNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; + [squareNoteToolAdornImage lockFocus]; + [squareNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; + [color setFill]; + [arrowPath fill]; + [squareNoteToolAdornImage unlockFocus]; + [squareNoteToolAdornImage setName:@"SquareNoteToolAdorn"]; + + highlightNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; + [highlightNoteAdornImage lockFocus]; + [shadow set]; + [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setFill]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(5.0, 5.0)]; + [path lineToPoint:NSMakePoint(0.0, 5.0)]; + [path lineToPoint:NSMakePoint(0.0, 8.0)]; + [path lineToPoint:NSMakePoint(12.0, 8.0)]; + [path lineToPoint:NSMakePoint(12.0, 6.0)]; + [path lineToPoint:NSMakePoint(15.0, 6.0)]; + [path lineToPoint:NSMakePoint(15.0, 3.0)]; + [path lineToPoint:NSMakePoint(5.0, 3.0)]; + [path lineToPoint:NSMakePoint(5.0, 5.0)]; + [path fill]; + [highlightNoteAdornImage unlockFocus]; + [highlightNoteAdornImage setName:@"HighlightNoteAdorn"]; + + highlightNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; + [highlightNoteToolAdornImage lockFocus]; + [highlightNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; + [color setFill]; + [arrowPath fill]; + [highlightNoteToolAdornImage unlockFocus]; + [highlightNoteToolAdornImage setName:@"HighlightNoteToolAdorn"]; + + underlineNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; + [underlineNoteAdornImage lockFocus]; + [shadow set]; + [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setStroke]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(1.0, 3.5)]; + [path lineToPoint:NSMakePoint(15.0, 3.5)]; + [path moveToPoint:NSMakePoint(0.0, 6.5)]; + [path lineToPoint:NSMakePoint(12.0, 6.5)]; + [path stroke]; + [underlineNoteAdornImage unlockFocus]; + [underlineNoteAdornImage setName:@"UnderlineNoteAdorn"]; + + underlineNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; + [underlineNoteToolAdornImage lockFocus]; + [underlineNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; + [color setFill]; + [arrowPath fill]; + [underlineNoteToolAdornImage unlockFocus]; + [underlineNoteToolAdornImage setName:@"UnderlineNoteToolAdorn"]; + + strikeOutNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; + [strikeOutNoteAdornImage lockFocus]; + [shadow set]; + [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setStroke]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(0.0, 2.5)]; + [path lineToPoint:NSMakePoint(14.0, 8.5)]; + [path moveToPoint:NSMakePoint(0.0, 8.5)]; + [path lineToPoint:NSMakePoint(14.0, 2.5)]; + [path stroke]; + [strikeOutNoteAdornImage unlockFocus]; + [strikeOutNoteAdornImage setName:@"StrikeOutNoteAdorn"]; + + strikeOutNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; + [strikeOutNoteToolAdornImage lockFocus]; + [strikeOutNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; + [color setFill]; + [arrowPath fill]; + [strikeOutNoteToolAdornImage unlockFocus]; + [strikeOutNoteToolAdornImage setName:@"StrikeOutNoteToolAdorn"]; + + lineNoteAdornImage = [[NSImage alloc] initWithSize:noteSize]; + [lineNoteAdornImage lockFocus]; + [shadow set]; + [[NSColor colorWithCalibratedWhite:0.0 alpha:0.70] setStroke]; + path = [NSBezierPath bezierPath]; + [path moveToPoint:NSMakePoint(2.0, 1.0)]; + [path lineToPoint:NSMakePoint(14.0, 10.0)]; + [path moveToPoint:NSMakePoint(8.0, 8.5)]; + [path lineToPoint:NSMakePoint(14.0, 10.0)]; + [path lineToPoint:NSMakePoint(11.0, 5.0)]; + [path setLineWidth:1.2]; + [path stroke]; + [lineNoteAdornImage unlockFocus]; + [lineNoteAdornImage setName:@"LineNoteAdorn"]; + + lineNoteToolAdornImage = [[NSImage alloc] initWithSize:size]; + [lineNoteToolAdornImage lockFocus]; + [lineNoteAdornImage compositeToPoint:point operation:NSCompositeCopy]; + [color setFill]; + [arrowPath fill]; + [lineNoteToolAdornImage unlockFocus]; + [lineNoteToolAdornImage setName:@"LineNoteToolAdorn"]; + + [shadow release]; +} + +@end Modified: trunk/SKApplicationController.m =================================================================== --- trunk/SKApplicationController.m 2007-07-31 19:53:22 UTC (rev 2600) +++ trunk/SKApplicationController.m 2007-08-02 08:48:39 UTC (rev 2601) @@ -51,7 +51,7 @@ #import "AppleRemote.h" #import "NSBezierPath_BDSKExtensions.h" #import "SKLine.h" -#import "NSImage_BDSKExtensions.h" +#import "NSImage_SKExtensions.h" @implementation SKApplicationController Modified: trunk/Skim.xcodeproj/project.pbxproj =================================================================== --- trunk/Skim.xcodeproj/project.pbxproj 2007-07-31 19:53:22 UTC (rev 2600) +++ trunk/Skim.xcodeproj/project.pbxproj 2007-08-02 08:48:39 UTC (rev 2601) @@ -162,7 +162,7 @@ CEAFFD9D0C40F2A800C3ECBB /* ToolbarLines.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CEAFFD9C0C40F2A800C3ECBB /* ToolbarLines.tiff */; }; CEB7359C0C4A8C1C000350F9 /* TransitionMask.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CEB7359A0C4A8C1B000350F9 /* TransitionMask.jpg */; }; CEB735A20C4A8CD6000350F9 /* TransitionShading.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CEB735A10C4A8CD6000350F9 /* TransitionShading.tiff */; }; - CECDC4FF0C5966A80026AAEC /* NSImage_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CECDC4FD0C5966A80026AAEC /* NSImage_BDSKExtensions.m */; }; + CECDC4FF0C5966A80026AAEC /* NSImage_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CECDC4FD0C5966A80026AAEC /* NSImage_SKExtensions.m */; }; CECDD2990C5B68580026AAEC /* SKCenteredTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CECDD2970C5B68580026AAEC /* SKCenteredTextFieldCell.m */; }; CECDDBAE0C5BB9600026AAEC /* SKFindTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = CECDDBAC0C5BB95F0026AAEC /* SKFindTableView.m */; }; CEE106150BCBB72C00BF2D3E /* SKNotesDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE106140BCBB72C00BF2D3E /* SKNotesDocument.m */; }; @@ -549,12 +549,14 @@ CECD97530C57A3C90026AAEC /* French */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/Localizable.strings; sourceTree = "<group>"; }; CECD97560C57A3D20026AAEC /* French */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/ZoomValues.strings; sourceTree = "<group>"; }; CECD97590C57A3E30026AAEC /* French */ = {isa = PBXFileReference; lastKnownFileType = folder; name = French; path = "French.lproj/Skim Help"; sourceTree = "<group>"; }; - CECDC4FC0C5966A80026AAEC /* NSImage_BDSKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSImage_BDSKExtensions.h; sourceTree = "<group>"; }; - CECDC4FD0C5966A80026AAEC /* NSImage_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSImage_BDSKExtensions.m; sourceTree = "<group>"; }; + CECDC4FC0C5966A80026AAEC /* NSImage_SKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSImage_SKExtensions.h; sourceTree = "<group>"; }; + CECDC4FD0C5966A80026AAEC /* NSImage_SKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSImage_SKExtensions.m; sourceTree = "<group>"; }; CECDD2960C5B68580026AAEC /* SKCenteredTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKCenteredTextFieldCell.h; sourceTree = "<group>"; }; CECDD2970C5B68580026AAEC /* SKCenteredTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKCenteredTextFieldCell.m; sourceTree = "<group>"; }; CECDDBAB0C5BB95F0026AAEC /* SKFindTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKFindTableView.h; sourceTree = "<group>"; }; CECDDBAC0C5BB95F0026AAEC /* SKFindTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKFindTableView.m; sourceTree = "<group>"; }; + CEDD421E0C61D1770022856C /* NSImage_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSImage_BDSKExtensions.m; sourceTree = "<group>"; }; + CEDD421F0C61D1840022856C /* NSImage_BDSKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSImage_BDSKExtensions.m; sourceTree = "<group>"; }; CEE106130BCBB72C00BF2D3E /* SKNotesDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKNotesDocument.h; sourceTree = "<group>"; }; CEE106140BCBB72C00BF2D3E /* SKNotesDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SKNotesDocument.m; sourceTree = "<group>"; }; CEE106590BCBBE1200BF2D3E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NotesDocument.nib; sourceTree = "<group>"; }; @@ -772,8 +774,10 @@ CE2DE4ED0B85DB6300D0DA12 /* NSCursor_SKExtensions.m */, CE5487BA0B35A20A00F8AFB6 /* NSFileManager_ExtendedAttributes.h */, CE5487BB0B35A20A00F8AFB6 /* NSFileManager_ExtendedAttributes.m */, - CECDC4FC0C5966A80026AAEC /* NSImage_BDSKExtensions.h */, - CECDC4FD0C5966A80026AAEC /* NSImage_BDSKExtensions.m */, + CECDC4FC0C5966A80026AAEC /* NSImage_SKExtensions.h */, + CEDD421E0C61D1770022856C /* NSImage_BDSKExtensions.m */, + CEDD421F0C61D1840022856C /* NSImage_BDSKExtensions.m */, + CECDC4FD0C5966A80026AAEC /* NSImage_SKExtensions.m */, CE6C03EE0BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.h */, CE6C03EF0BEDF759007BF0B5 /* NSParagraphStyle_SKExtensions.m */, CE1E301A0BDB9D5C0011D9DD /* NSScanner_SKExtensions.h */, @@ -1397,7 +1401,7 @@ CEAF079D0C4139EB00C3ECBB /* SKStatusBar.m in Sources */, CEAF2E5A0C45414100C3ECBB /* SKLine.m in Sources */, CE1ADEBF0C4C341100071840 /* SKTransitionController.m in Sources */, - CECDC4FF0C5966A80026AAEC /* NSImage_BDSKExtensions.m in Sources */, + CECDC4FF0C5966A80026AAEC /* NSImage_SKExtensions.m in Sources */, CECDD2990C5B68580026AAEC /* SKCenteredTextFieldCell.m in Sources */, CECDDBAE0C5BB9600026AAEC /* SKFindTableView.m in Sources */, CE2093910C5F9A8D009D3EFB /* BDSKGradientView.m in Sources */, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-31 19:53:27
|
Revision: 2600 http://skim-app.svn.sourceforge.net/skim-app/?rev=2600&view=rev Author: hofman Date: 2007-07-31 12:53:22 -0700 (Tue, 31 Jul 2007) Log Message: ----------- Put gradients in the note window. Modified Paths: -------------- trunk/Dutch.lproj/NoteWindow.nib/classes.nib trunk/Dutch.lproj/NoteWindow.nib/info.nib trunk/Dutch.lproj/NoteWindow.nib/keyedobjects.nib trunk/English.lproj/NoteWindow.nib/classes.nib trunk/English.lproj/NoteWindow.nib/info.nib trunk/English.lproj/NoteWindow.nib/keyedobjects.nib trunk/French.lproj/NoteWindow.nib/classes.nib trunk/French.lproj/NoteWindow.nib/info.nib trunk/French.lproj/NoteWindow.nib/keyedobjects.nib trunk/Italian.lproj/NoteWindow.nib/classes.nib trunk/Italian.lproj/NoteWindow.nib/info.nib trunk/Italian.lproj/NoteWindow.nib/keyedobjects.nib Modified: trunk/Dutch.lproj/NoteWindow.nib/classes.nib =================================================================== --- trunk/Dutch.lproj/NoteWindow.nib/classes.nib 2007-07-31 19:16:02 UTC (rev 2599) +++ trunk/Dutch.lproj/NoteWindow.nib/classes.nib 2007-07-31 19:53:22 UTC (rev 2600) @@ -6,6 +6,7 @@ OUTLETS = {delegate = id; }; SUPERCLASS = NSImageView; }, + {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = NSObject; LANGUAGE = ObjC; }, { @@ -13,6 +14,13 @@ LANGUAGE = ObjC; OUTLETS = {imageView = BDSKDragImageView; }; SUPERCLASS = NSWindowController; + }, + { + ACTIONS = {startAnimation = id; stopAnimation = id; }; + CLASS = SKStatusBar; + LANGUAGE = ObjC; + OUTLETS = {leftCell = id; rightCell = id; }; + SUPERCLASS = NSControl; } ); IBVersion = 1; Modified: trunk/Dutch.lproj/NoteWindow.nib/info.nib =================================================================== --- trunk/Dutch.lproj/NoteWindow.nib/info.nib 2007-07-31 19:16:02 UTC (rev 2599) +++ trunk/Dutch.lproj/NoteWindow.nib/info.nib 2007-07-31 19:53:22 UTC (rev 2600) @@ -11,6 +11,6 @@ <integer>7</integer> </array> <key>IBSystem Version</key> - <string>8P135</string> + <string>8R218</string> </dict> </plist> Modified: trunk/Dutch.lproj/NoteWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/English.lproj/NoteWindow.nib/classes.nib =================================================================== --- trunk/English.lproj/NoteWindow.nib/classes.nib 2007-07-31 19:16:02 UTC (rev 2599) +++ trunk/English.lproj/NoteWindow.nib/classes.nib 2007-07-31 19:53:22 UTC (rev 2600) @@ -6,6 +6,7 @@ OUTLETS = {delegate = id; }; SUPERCLASS = NSImageView; }, + {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = NSObject; LANGUAGE = ObjC; }, { @@ -13,6 +14,13 @@ LANGUAGE = ObjC; OUTLETS = {imageView = BDSKDragImageView; }; SUPERCLASS = NSWindowController; + }, + { + ACTIONS = {startAnimation = id; stopAnimation = id; }; + CLASS = SKStatusBar; + LANGUAGE = ObjC; + OUTLETS = {leftCell = id; rightCell = id; }; + SUPERCLASS = NSControl; } ); IBVersion = 1; Modified: trunk/English.lproj/NoteWindow.nib/info.nib =================================================================== --- trunk/English.lproj/NoteWindow.nib/info.nib 2007-07-31 19:16:02 UTC (rev 2599) +++ trunk/English.lproj/NoteWindow.nib/info.nib 2007-07-31 19:53:22 UTC (rev 2600) @@ -11,6 +11,6 @@ <integer>7</integer> </array> <key>IBSystem Version</key> - <string>8P135</string> + <string>8R218</string> </dict> </plist> Modified: trunk/English.lproj/NoteWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/French.lproj/NoteWindow.nib/classes.nib =================================================================== --- trunk/French.lproj/NoteWindow.nib/classes.nib 2007-07-31 19:16:02 UTC (rev 2599) +++ trunk/French.lproj/NoteWindow.nib/classes.nib 2007-07-31 19:53:22 UTC (rev 2600) @@ -1,30 +1,27 @@ { - IBClasses = ( - { - CLASS = BDSKDragImageView; - LANGUAGE = ObjC; - OUTLETS = { - delegate = id; - }; - SUPERCLASS = NSImageView; - }, - { - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = NSObject; - LANGUAGE = ObjC; - }, - { - CLASS = SKNoteWindowController; - LANGUAGE = ObjC; - OUTLETS = { - imageView = BDSKDragImageView; - }; - SUPERCLASS = NSWindowController; + IBClasses = ( + { + CLASS = BDSKDragImageView; + LANGUAGE = ObjC; + OUTLETS = {delegate = id; }; + SUPERCLASS = NSImageView; + }, + {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + {CLASS = NSObject; LANGUAGE = ObjC; }, + { + CLASS = SKNoteWindowController; + LANGUAGE = ObjC; + OUTLETS = {imageView = BDSKDragImageView; }; + SUPERCLASS = NSWindowController; + }, + { + ACTIONS = {startAnimation = id; stopAnimation = id; }; + CLASS = SKStatusBar; + LANGUAGE = ObjC; + OUTLETS = {leftCell = id; rightCell = id; }; + SUPERCLASS = NSControl; } - ); - IBVersion = 1; + ); + IBVersion = 1; } \ No newline at end of file Modified: trunk/French.lproj/NoteWindow.nib/info.nib =================================================================== --- trunk/French.lproj/NoteWindow.nib/info.nib 2007-07-31 19:16:02 UTC (rev 2599) +++ trunk/French.lproj/NoteWindow.nib/info.nib 2007-07-31 19:53:22 UTC (rev 2600) @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>IBDocumentLocation</key> - <string>79 78 356 240 0 0 1600 1178 </string> + <string>69 58 356 240 0 0 1440 938 </string> <key>IBFramework Version</key> <string>446.1</string> + <key>IBOpenObjects</key> + <array> + <integer>7</integer> + </array> <key>IBSystem Version</key> - <string>9A466</string> + <string>8R218</string> </dict> </plist> Modified: trunk/French.lproj/NoteWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Italian.lproj/NoteWindow.nib/classes.nib =================================================================== --- trunk/Italian.lproj/NoteWindow.nib/classes.nib 2007-07-31 19:16:02 UTC (rev 2599) +++ trunk/Italian.lproj/NoteWindow.nib/classes.nib 2007-07-31 19:53:22 UTC (rev 2600) @@ -6,6 +6,7 @@ OUTLETS = {delegate = id; }; SUPERCLASS = NSImageView; }, + {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, {CLASS = NSObject; LANGUAGE = ObjC; }, { @@ -13,6 +14,13 @@ LANGUAGE = ObjC; OUTLETS = {imageView = BDSKDragImageView; }; SUPERCLASS = NSWindowController; + }, + { + ACTIONS = {startAnimation = id; stopAnimation = id; }; + CLASS = SKStatusBar; + LANGUAGE = ObjC; + OUTLETS = {leftCell = id; rightCell = id; }; + SUPERCLASS = NSControl; } ); IBVersion = 1; Modified: trunk/Italian.lproj/NoteWindow.nib/info.nib =================================================================== --- trunk/Italian.lproj/NoteWindow.nib/info.nib 2007-07-31 19:16:02 UTC (rev 2599) +++ trunk/Italian.lproj/NoteWindow.nib/info.nib 2007-07-31 19:53:22 UTC (rev 2600) @@ -11,6 +11,6 @@ <integer>7</integer> </array> <key>IBSystem Version</key> - <string>8P135</string> + <string>8R218</string> </dict> </plist> Modified: trunk/Italian.lproj/NoteWindow.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-07-31 19:16:04
|
Revision: 2599 http://skim-app.svn.sourceforge.net/skim-app/?rev=2599&view=rev Author: hofman Date: 2007-07-31 12:16:02 -0700 (Tue, 31 Jul 2007) Log Message: ----------- Small changes to layout of side pane buttons. Modified Paths: -------------- trunk/Dutch.lproj/MainWindow.nib/data.dependency 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/French.lproj/MainWindow.nib/info.nib trunk/French.lproj/MainWindow.nib/keyedobjects.nib trunk/Italian.lproj/MainWindow.nib/info.nib trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib Modified: trunk/Dutch.lproj/MainWindow.nib/data.dependency =================================================================== --- trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-07-31 18:38:56 UTC (rev 2598) +++ trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-07-31 19:16:02 UTC (rev 2599) @@ -4,7 +4,6 @@ <dict> <key>IBPaletteDependency</key> <array> - <string>Controllers</string> <string>PDFKit</string> </array> </dict> Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-07-31 18:38:56 UTC (rev 2598) +++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-07-31 19:16:02 UTC (rev 2599) @@ -29,6 +29,11 @@ <array> <integer>208</integer> </array> + <key>IBOpenObjects</key> + <array> + <integer>687</integer> + <integer>694</integer> + </array> <key>IBSystem Version</key> <string>8R218</string> </dict> 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-07-31 18:38:56 UTC (rev 2598) +++ trunk/English.lproj/MainWindow.nib/info.nib 2007-07-31 19:16:02 UTC (rev 2599) @@ -31,20 +31,20 @@ </array> <key>IBOpenObjects</key> <array> + <integer>553</integer> + <integer>208</integer> <integer>687</integer> + <integer>511</integer> + <integer>585</integer> <integer>633</integer> - <integer>585</integer> - <integer>168</integer> - <integer>224</integer> + <integer>256</integer> + <integer>5</integer> <integer>314</integer> - <integer>553</integer> - <integer>511</integer> <integer>502</integer> <integer>694</integer> + <integer>168</integer> + <integer>224</integer> <integer>539</integer> - <integer>208</integer> - <integer>5</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/French.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/French.lproj/MainWindow.nib/info.nib 2007-07-31 18:38:56 UTC (rev 2598) +++ trunk/French.lproj/MainWindow.nib/info.nib 2007-07-31 19:16:02 UTC (rev 2599) @@ -31,15 +31,15 @@ </array> <key>IBOpenObjects</key> <array> - <integer>502</integer> + <integer>256</integer> + <integer>314</integer> + <integer>661</integer> + <integer>660</integer> <integer>224</integer> - <integer>168</integer> <integer>5</integer> - <integer>660</integer> <integer>511</integer> - <integer>314</integer> - <integer>661</integer> - <integer>256</integer> + <integer>168</integer> + <integer>502</integer> <integer>633</integer> </array> <key>IBSystem Version</key> Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Italian.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-07-31 18:38:56 UTC (rev 2598) +++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-07-31 19:16:02 UTC (rev 2599) @@ -31,19 +31,19 @@ </array> <key>IBOpenObjects</key> <array> + <integer>224</integer> + <integer>628</integer> + <integer>314</integer> + <integer>502</integer> + <integer>677</integer> + <integer>676</integer> + <integer>168</integer> <integer>511</integer> - <integer>224</integer> <integer>5</integer> - <integer>502</integer> <integer>539</integer> + <integer>553</integer> <integer>208</integer> - <integer>677</integer> <integer>256</integer> - <integer>168</integer> - <integer>628</integer> - <integer>553</integer> - <integer>676</integer> - <integer>314</integer> </array> <key>IBSystem Version</key> <string>8R218</string> Modified: trunk/Italian.lproj/MainWindow.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-07-31 18:39:19
|
Revision: 2598 http://skim-app.svn.sourceforge.net/skim-app/?rev=2598&view=rev Author: hofman Date: 2007-07-31 11:38:56 -0700 (Tue, 31 Jul 2007) Log Message: ----------- Add a gradient view behind the search views. Put the progressIndicator for searching as a bar in the status bar. Modified Paths: -------------- trunk/Dutch.lproj/Localizable.strings trunk/Dutch.lproj/MainMenu.nib/info.nib trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib trunk/Dutch.lproj/MainWindow.nib/classes.nib trunk/Dutch.lproj/MainWindow.nib/data.dependency trunk/Dutch.lproj/MainWindow.nib/info.nib trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib trunk/Dutch.lproj/NotesDocument.nib/info.nib trunk/Dutch.lproj/NotesDocument.nib/keyedobjects.nib trunk/Dutch.lproj/PreferenceWindow.nib/info.nib trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib trunk/English.lproj/MainWindow.nib/classes.nib trunk/English.lproj/MainWindow.nib/info.nib trunk/English.lproj/MainWindow.nib/keyedobjects.nib trunk/French.lproj/Localizable.strings trunk/French.lproj/MainWindow.nib/classes.nib trunk/French.lproj/MainWindow.nib/info.nib trunk/French.lproj/MainWindow.nib/keyedobjects.nib trunk/Italian.lproj/Localizable.strings trunk/Italian.lproj/MainWindow.nib/classes.nib trunk/Italian.lproj/MainWindow.nib/info.nib trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib trunk/SKMainWindowController.h trunk/SKMainWindowController.m trunk/SKStatusBar.h trunk/SKStatusBar.m trunk/Skim.xcodeproj/project.pbxproj Added Paths: ----------- trunk/BDSKGradientView.h trunk/BDSKGradientView.m Added: trunk/BDSKGradientView.h =================================================================== --- trunk/BDSKGradientView.h (rev 0) +++ trunk/BDSKGradientView.h 2007-07-31 18:38:56 UTC (rev 2598) @@ -0,0 +1,60 @@ +// +// BDSKGradientView.h +// Bibdesk +// +// Created by Adam Maxwell on 10/26/05. +/* + This software is Copyright (c) 2005,2006,2007 + Adam Maxwell. 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 Adam Maxwell 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> + + +@interface BDSKGradientView : NSView +{ + @private + CIColor *startColor; + CIColor *endColor; + BOOL drawsGradient; +} + +- (void)setLowerColor:(NSColor *)color; +- (void)setUpperColor:(NSColor *)color; + +// for subclassers +- (CIColor *)lowerColor; +- (CIColor *)upperColor; + +- (BOOL)drawsGradient; +- (void)setDrawsGradient:(BOOL)flag; + +@end Added: trunk/BDSKGradientView.m =================================================================== --- trunk/BDSKGradientView.m (rev 0) +++ trunk/BDSKGradientView.m 2007-07-31 18:38:56 UTC (rev 2598) @@ -0,0 +1,116 @@ +// +// BDSKGradientView.m +// Bibdesk +// +// Created by Adam Maxwell on 10/26/05. +/* + This software is Copyright (c) 2005,2006,2007 + Adam Maxwell. 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 Adam Maxwell 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 "BDSKGradientView.h" +#import "NSBezierPath_CoreImageExtensions.h" +#import "CIImage_BDSKExtensions.h" + +@interface BDSKGradientView (Private) + +- (void)setDefaultColors; + +@end + +@implementation BDSKGradientView + +- (id)initWithFrame:(NSRect)frame +{ + self = [super initWithFrame:frame]; + [self setDefaultColors]; + drawsGradient = YES; + return self; +} + +- (void)dealloc +{ + [endColor release]; + [startColor release]; + [super dealloc]; +} + +- (void)drawRect:(NSRect)aRect +{ + // fill entire view, not just the (possibly clipped) aRect + if (drawsGradient) + [[NSBezierPath bezierPathWithRect:[self bounds]] fillPathVerticallyWithStartColor:[self upperColor] endColor:[self lowerColor]]; +} + +// -[CIColor initWithColor:] fails (returns nil) with +[NSColor gridColor] rdar://problem/4789043 +- (void)setLowerColor:(NSColor *)color +{ + [endColor autorelease]; + endColor = [[CIColor colorWithNSColor:color] retain]; +} + +- (void)setUpperColor:(NSColor *)color +{ + [startColor autorelease]; + startColor = [[CIColor colorWithNSColor:color] retain]; +} + +- (CIColor *)lowerColor { return endColor; } +- (CIColor *)upperColor { return startColor; } + +- (BOOL)drawsGradient { + return drawsGradient; +} + +- (void)setDrawsGradient:(BOOL)flag { + if (drawsGradient != flag) { + drawsGradient = flag; + [self setNeedsDisplay:YES]; + } +} + + +// required in order for redisplay to work properly with the controls +- (BOOL)isOpaque{ return [self drawsGradient]; } +- (BOOL)isFlipped { return NO; } + +@end + +@implementation BDSKGradientView (Private) + +// provides an example implementation +- (void)setDefaultColors +{ + [self setLowerColor:[NSColor colorWithCalibratedWhite:0.75 alpha:1.0]]; + [self setUpperColor:[NSColor colorWithCalibratedWhite:0.9 alpha:1.0]]; +} + +@end Modified: trunk/Dutch.lproj/Localizable.strings =================================================================== (Binary files differ) Modified: trunk/Dutch.lproj/MainMenu.nib/info.nib =================================================================== --- trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -7,14 +7,10 @@ <key>IBEditorPositions</key> <dict> <key>29</key> - <string>140 614 635 44 0 0 1440 938 </string> + <string>140 614 542 44 0 0 1440 938 </string> </dict> <key>IBFramework Version</key> <string>446.1</string> - <key>IBOpenObjects</key> - <array> - <integer>29</integer> - </array> <key>IBSystem Version</key> <string>8R218</string> </dict> Modified: trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Dutch.lproj/MainWindow.nib/classes.nib =================================================================== --- trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -12,6 +12,7 @@ SUPERCLASS = NSView; }, {CLASS = BDSKEdgeView; LANGUAGE = ObjC; SUPERCLASS = BDSKContainerView; }, + {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, { CLASS = BDSKImagePopUpButton; LANGUAGE = ObjC; @@ -123,8 +124,6 @@ currentRightSideView = NSView; displayBoxPopUpButton = NSPopUpButton; findArrayController = NSArrayController; - findCollapsibleView = BDSKCollapsibleView; - findEdgeView = BDSKEdgeView; findTableView = NSTableView; findView = NSView; leftSideButton = NSSegmentedControl; @@ -132,6 +131,7 @@ leftSideContentBox = NSBox; leftSideContentView = NSView; leftSideEdgeView = BDSKEdgeView; + leftSideGradientView = BDSKGradientView; markupPopUpButton = BDSKImagePopUpButton; noteArrayController = NSArrayController; noteOutlineView = SKNoteOutlineView; @@ -155,12 +155,12 @@ rightSideContentBox = NSBox; rightSideContentView = NSView; rightSideEdgeView = BDSKEdgeView; + rightSideGradientView = BDSKGradientView; scaleField = NSTextField; searchField = NSSearchField; snapshotArrayController = NSArrayController; snapshotTableView = SKSnapshotTableView; snapshotView = NSView; - spinner = NSProgressIndicator; splitView = SKSplitView; thumbnailArrayController = NSArrayController; thumbnailTableView = SKThumbnailTableView; Modified: trunk/Dutch.lproj/MainWindow.nib/data.dependency =================================================================== --- trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-07-31 18:38:56 UTC (rev 2598) @@ -4,6 +4,7 @@ <dict> <key>IBPaletteDependency</key> <array> + <string>Controllers</string> <string>PDFKit</string> </array> </dict> Modified: trunk/Dutch.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -29,14 +29,6 @@ <array> <integer>208</integer> </array> - <key>IBOpenObjects</key> - <array> - <integer>168</integer> - <integer>224</integer> - <integer>256</integer> - <integer>511</integer> - <integer>5</integer> - </array> <key>IBSystem Version</key> <string>8R218</string> </dict> Modified: trunk/Dutch.lproj/MainWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Dutch.lproj/NotesDocument.nib/info.nib =================================================================== --- trunk/Dutch.lproj/NotesDocument.nib/info.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/Dutch.lproj/NotesDocument.nib/info.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -6,10 +6,6 @@ <string>69 58 356 240 0 0 1440 938 </string> <key>IBFramework Version</key> <string>446.1</string> - <key>IBOpenObjects</key> - <array> - <integer>5</integer> - </array> <key>IBSystem Version</key> <string>8R218</string> </dict> Modified: trunk/Dutch.lproj/NotesDocument.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Dutch.lproj/PreferenceWindow.nib/info.nib =================================================================== --- trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -8,10 +8,6 @@ <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/MainWindow.nib/classes.nib =================================================================== --- trunk/English.lproj/MainWindow.nib/classes.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/English.lproj/MainWindow.nib/classes.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -12,6 +12,7 @@ SUPERCLASS = NSView; }, {CLASS = BDSKEdgeView; LANGUAGE = ObjC; SUPERCLASS = BDSKContainerView; }, + {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, { CLASS = BDSKImagePopUpButton; LANGUAGE = ObjC; @@ -123,8 +124,6 @@ currentRightSideView = NSView; displayBoxPopUpButton = NSPopUpButton; findArrayController = NSArrayController; - findCollapsibleView = BDSKCollapsibleView; - findEdgeView = BDSKEdgeView; findTableView = NSTableView; findView = NSView; leftSideButton = NSSegmentedControl; @@ -132,6 +131,7 @@ leftSideContentBox = NSBox; leftSideContentView = NSView; leftSideEdgeView = BDSKEdgeView; + leftSideGradientView = BDSKGradientView; markupPopUpButton = BDSKImagePopUpButton; noteArrayController = NSArrayController; noteOutlineView = SKNoteOutlineView; @@ -155,12 +155,12 @@ rightSideContentBox = NSBox; rightSideContentView = NSView; rightSideEdgeView = BDSKEdgeView; + rightSideGradientView = BDSKGradientView; scaleField = NSTextField; searchField = NSSearchField; snapshotArrayController = NSArrayController; snapshotTableView = SKSnapshotTableView; snapshotView = NSView; - spinner = NSProgressIndicator; splitView = SKSplitView; thumbnailArrayController = NSArrayController; thumbnailTableView = SKThumbnailTableView; Modified: trunk/English.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/English.lproj/MainWindow.nib/info.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/English.lproj/MainWindow.nib/info.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -31,20 +31,20 @@ </array> <key>IBOpenObjects</key> <array> + <integer>687</integer> + <integer>633</integer> + <integer>585</integer> + <integer>168</integer> + <integer>224</integer> + <integer>314</integer> + <integer>553</integer> + <integer>511</integer> <integer>502</integer> - <integer>511</integer> - <integer>224</integer> - <integer>585</integer> + <integer>694</integer> + <integer>539</integer> <integer>208</integer> - <integer>539</integer> <integer>5</integer> - <integer>687</integer> - <integer>168</integer> <integer>256</integer> - <integer>694</integer> - <integer>633</integer> - <integer>553</integer> - <integer>314</integer> </array> <key>IBSystem Version</key> <string>8R218</string> Modified: trunk/English.lproj/MainWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/French.lproj/Localizable.strings =================================================================== (Binary files differ) Modified: trunk/French.lproj/MainWindow.nib/classes.nib =================================================================== --- trunk/French.lproj/MainWindow.nib/classes.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/French.lproj/MainWindow.nib/classes.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -12,6 +12,7 @@ SUPERCLASS = NSView; }, {CLASS = BDSKEdgeView; LANGUAGE = ObjC; SUPERCLASS = BDSKContainerView; }, + {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, { CLASS = BDSKImagePopUpButton; LANGUAGE = ObjC; @@ -123,8 +124,6 @@ currentRightSideView = NSView; displayBoxPopUpButton = NSPopUpButton; findArrayController = NSArrayController; - findCollapsibleView = BDSKCollapsibleView; - findEdgeView = BDSKEdgeView; findTableView = NSTableView; findView = NSView; leftSideButton = NSSegmentedControl; @@ -132,6 +131,7 @@ leftSideContentBox = NSBox; leftSideContentView = NSView; leftSideEdgeView = BDSKEdgeView; + leftSideGradientView = BDSKGradientView; markupPopUpButton = BDSKImagePopUpButton; noteArrayController = NSArrayController; noteOutlineView = SKNoteOutlineView; @@ -155,12 +155,12 @@ rightSideContentBox = NSBox; rightSideContentView = NSView; rightSideEdgeView = BDSKEdgeView; + rightSideGradientView = BDSKGradientView; scaleField = NSTextField; searchField = NSSearchField; snapshotArrayController = NSArrayController; snapshotTableView = SKSnapshotTableView; snapshotView = NSView; - spinner = NSProgressIndicator; splitView = SKSplitView; thumbnailArrayController = NSArrayController; thumbnailTableView = SKThumbnailTableView; Modified: trunk/French.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/French.lproj/MainWindow.nib/info.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/French.lproj/MainWindow.nib/info.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -31,16 +31,16 @@ </array> <key>IBOpenObjects</key> <array> + <integer>502</integer> + <integer>224</integer> + <integer>168</integer> + <integer>5</integer> + <integer>660</integer> + <integer>511</integer> + <integer>314</integer> + <integer>661</integer> <integer>256</integer> - <integer>314</integer> - <integer>5</integer> <integer>633</integer> - <integer>661</integer> - <integer>511</integer> - <integer>168</integer> - <integer>502</integer> - <integer>660</integer> - <integer>224</integer> </array> <key>IBSystem Version</key> <string>8R218</string> Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Italian.lproj/Localizable.strings =================================================================== (Binary files differ) Modified: trunk/Italian.lproj/MainWindow.nib/classes.nib =================================================================== --- trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -12,6 +12,7 @@ SUPERCLASS = NSView; }, {CLASS = BDSKEdgeView; LANGUAGE = ObjC; SUPERCLASS = BDSKContainerView; }, + {CLASS = BDSKGradientView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, { CLASS = BDSKImagePopUpButton; LANGUAGE = ObjC; @@ -123,8 +124,6 @@ currentRightSideView = NSView; displayBoxPopUpButton = NSPopUpButton; findArrayController = NSArrayController; - findCollapsibleView = BDSKCollapsibleView; - findEdgeView = BDSKEdgeView; findTableView = NSTableView; findView = NSView; leftSideButton = NSSegmentedControl; @@ -132,6 +131,7 @@ leftSideContentBox = NSBox; leftSideContentView = NSView; leftSideEdgeView = BDSKEdgeView; + leftSideGradientView = BDSKGradientView; markupPopUpButton = BDSKImagePopUpButton; noteArrayController = NSArrayController; noteOutlineView = SKNoteOutlineView; @@ -155,12 +155,12 @@ rightSideContentBox = NSBox; rightSideContentView = NSView; rightSideEdgeView = BDSKEdgeView; + rightSideGradientView = BDSKGradientView; scaleField = NSTextField; searchField = NSSearchField; snapshotArrayController = NSArrayController; snapshotTableView = SKSnapshotTableView; snapshotView = NSView; - spinner = NSProgressIndicator; splitView = SKSplitView; thumbnailArrayController = NSArrayController; thumbnailTableView = SKThumbnailTableView; Modified: trunk/Italian.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-07-31 18:38:56 UTC (rev 2598) @@ -31,19 +31,19 @@ </array> <key>IBOpenObjects</key> <array> - <integer>256</integer> - <integer>314</integer> + <integer>511</integer> <integer>224</integer> + <integer>5</integer> + <integer>502</integer> + <integer>539</integer> <integer>208</integer> + <integer>677</integer> + <integer>256</integer> + <integer>168</integer> <integer>628</integer> - <integer>677</integer> - <integer>502</integer> - <integer>5</integer> + <integer>553</integer> <integer>676</integer> - <integer>553</integer> - <integer>511</integer> - <integer>539</integer> - <integer>168</integer> + <integer>314</integer> </array> <key>IBSystem Version</key> <string>8R218</string> Modified: trunk/Italian.lproj/MainWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/SKMainWindowController.h =================================================================== --- trunk/SKMainWindowController.h 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/SKMainWindowController.h 2007-07-31 18:38:56 UTC (rev 2598) @@ -64,7 +64,7 @@ } SKPDFViewState; @class PDFOutline, SKThumbnail; -@class SKPDFView, SKOutlineView, SKNoteOutlineView, SKThumbnailTableView, SKSnapshotTableView, SKSplitView, BDSKCollapsibleView, BDSKEdgeView, BDSKImagePopUpButton, SKColorSwatch, SKStatusBar; +@class SKPDFView, SKOutlineView, SKNoteOutlineView, SKThumbnailTableView, SKSnapshotTableView, SKSplitView, BDSKCollapsibleView, BDSKEdgeView, BDSKGradientView, BDSKImagePopUpButton, SKColorSwatch, SKStatusBar; @class SKFullScreenWindow, SKNavigationWindow, SKSideWindow, SKSnapshotWindowController; @interface SKMainWindowController : NSWindowController { @@ -77,6 +77,7 @@ IBOutlet NSView *leftSideContentView; IBOutlet BDSKEdgeView *leftSideEdgeView; IBOutlet BDSKCollapsibleView *leftSideCollapsibleView; + IBOutlet BDSKGradientView *leftSideGradientView; IBOutlet NSSegmentedControl *leftSideButton; IBOutlet NSSearchField *searchField; @@ -84,6 +85,7 @@ IBOutlet NSView *rightSideContentView; IBOutlet BDSKEdgeView *rightSideEdgeView; IBOutlet BDSKCollapsibleView *rightSideCollapsibleView; + IBOutlet BDSKGradientView *rightSideGradientView; IBOutlet NSSegmentedControl *rightSideButton; IBOutlet NSSearchField *noteSearchField; @@ -113,9 +115,6 @@ IBOutlet NSArrayController *findArrayController; IBOutlet NSTableView *findTableView; IBOutlet NSView *findView; - IBOutlet BDSKEdgeView *findEdgeView; - IBOutlet BDSKCollapsibleView *findCollapsibleView; - IBOutlet NSProgressIndicator *spinner; NSMutableArray *searchResults; BOOL findPanelFind; CFMutableSetRef temporaryAnnotations; Modified: trunk/SKMainWindowController.m =================================================================== --- trunk/SKMainWindowController.m 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/SKMainWindowController.m 2007-07-31 18:38:56 UTC (rev 2598) @@ -55,6 +55,7 @@ #import "SKPDFView.h" #import "BDSKCollapsibleView.h" #import "BDSKEdgeView.h" +#import "BDSKGradientView.h" #import "SKPDFAnnotationNote.h" #import "SKSplitView.h" #import "NSScrollView_SKExtensions.h" @@ -242,14 +243,10 @@ [leftSideCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask]; [leftSideCollapsibleView setMinSize:NSMakeSize(111.0, NSHeight([leftSideCollapsibleView frame]))]; - [findCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask]; - [findCollapsibleView setMinSize:NSMakeSize(50.0, NSHeight([findCollapsibleView frame]))]; - [rightSideCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask]; [rightSideCollapsibleView setMinSize:NSMakeSize(111.0, NSHeight([rightSideCollapsibleView frame]))]; [pdfContentBox setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask | BDSKMinYEdgeMask]; - [findEdgeView setEdges:BDSKMaxXEdgeMask]; [leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask]; [rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask]; @@ -281,8 +278,6 @@ [self displayOutlineView]; [self displayNoteView]; - [spinner setUsesThreadedAnimation:YES]; - // Set up the tool bar [self setupToolbar]; @@ -1884,7 +1879,7 @@ [leftSideWindow setMainView:leftSideContentView]; [leftSideEdgeView setEdges:BDSKNoEdgeMask]; - [findEdgeView setEdges:BDSKNoEdgeMask]; + [leftSideGradientView setDrawsGradient:NO]; if ([self isPresentation]) { savedLeftSidePaneState = [self leftSidePaneState]; @@ -1916,6 +1911,7 @@ [rightSideWindow setMainView:rightSideContentView]; [rightSideEdgeView setEdges:BDSKNoEdgeMask]; + [rightSideGradientView setDrawsGradient:NO]; if ([self isPresentation]) { [rightSideWindow expand]; @@ -1939,7 +1935,7 @@ [leftSideContentBox addSubview:leftSideContentView]; [leftSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask]; - [findEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask]; + [leftSideGradientView setDrawsGradient:YES]; if ([self isPresentation]) { [self setLeftSidePaneState:savedLeftSidePaneState]; @@ -1960,6 +1956,7 @@ [rightSideContentBox addSubview:rightSideContentView]; [rightSideEdgeView setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask]; + [rightSideGradientView setDrawsGradient:YES]; if ([self isPresentation]) { [rightSideWindow setLevel:NSFloatingWindowLevel]; @@ -2322,23 +2319,26 @@ - (void)documentDidBeginDocumentFind:(NSNotification *)note { if (findPanelFind == NO) { [findArrayController removeObjects:searchResults]; - [spinner startAnimation:nil]; + [[[[findTableView tableColumns] objectAtIndex:1] headerCell] setStringValue:[NSLocalizedString(@"Searching", @"Message in search table header") stringByAppendingEllipsis]]; + [statusBar setProgressIndicatorStyle:SKProgressIndicatorBarStyle]; + [[statusBar progressIndicator] setMaxValue:[[note object] pageCount]]; + [[statusBar progressIndicator] setDoubleValue:0.0]; + [statusBar startAnimation:self]; } } - (void)documentDidEndDocumentFind:(NSNotification *)note { if (findPanelFind == NO) { - [spinner stopAnimation:nil]; [self willChangeValueForKey:@"searchResults"]; [self didChangeValueForKey:@"searchResults"]; + [[[[findTableView tableColumns] objectAtIndex:1] headerCell] setStringValue:[NSString stringWithFormat:NSLocalizedString(@"%i Results", @"Message in search table header"), [searchResults count]]]; + [statusBar stopAnimation:self]; + [statusBar setProgressIndicatorStyle:SKProgressIndicatorNone]; } } - (void)documentDidEndPageFind:(NSNotification *)note { - if (findPanelFind == NO) { - double pageIndex = [[[note userInfo] objectForKey:@"PDFDocumentPageIndex"] doubleValue]; - [spinner setDoubleValue: pageIndex / [[pdfView document] pageCount]]; - } + [[statusBar progressIndicator] setDoubleValue:[[[note userInfo] objectForKey:@"PDFDocumentPageIndex"] doubleValue]]; } - (void)didMatchString:(PDFSelection *)instance { Modified: trunk/SKStatusBar.h =================================================================== --- trunk/SKStatusBar.h 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/SKStatusBar.h 2007-07-31 18:38:56 UTC (rev 2598) @@ -37,11 +37,19 @@ */ #import <Cocoa/Cocoa.h> +#import "BDSKGradientView.h" +typedef enum { + SKProgressIndicatorNone = -1, + SKProgressIndicatorBarStyle = NSProgressIndicatorBarStyle, + SKProgressIndicatorSpinningStyle = NSProgressIndicatorSpinningStyle +} SKProgressIndicatorStyle; + @interface SKStatusBar : NSControl { id leftCell; id rightCell; + NSProgressIndicator *progressIndicator; int state; } @@ -70,4 +78,12 @@ - (int)state; - (void)setState:(int)newState; +- (NSProgressIndicator *)progressIndicator; + +- (SKProgressIndicatorStyle)progressIndicatorStyle; +- (void)setProgressIndicatorStyle:(SKProgressIndicatorStyle)style; + +- (void)startAnimation:(id)sender; +- (void)stopAnimation:(id)sender; + @end Modified: trunk/SKStatusBar.m =================================================================== --- trunk/SKStatusBar.m 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/SKStatusBar.m 2007-07-31 18:38:56 UTC (rev 2598) @@ -39,10 +39,11 @@ #import "SKStatusBar.h" #import "NSBezierPath_CoreImageExtensions.h" -#define LEFT_MARGIN 5.0 -#define RIGHT_MARGIN 15.0 +#define LEFT_MARGIN 5.0 +#define RIGHT_MARGIN 15.0 +#define SEPARATION 2.0 +#define PROGRESSBAR_WIDTH 100.0 - @implementation SKStatusBar + (CIColor *)lowerColor{ @@ -70,6 +71,7 @@ [rightCell setFont:[NSFont labelFontOfSize:0]]; [rightCell setAlignment:NSRightTextAlignment]; [rightCell setControlView:self]; + progressIndicator = nil; } return self; } @@ -86,11 +88,14 @@ - (void)drawRect:(NSRect)rect { NSRect textRect, ignored; + float rightMargin = RIGHT_MARGIN; [[NSBezierPath bezierPathWithRect:[self bounds]] fillPathVerticallyWithStartColor:[[self class] upperColor] endColor:[[self class] lowerColor]]; + if (progressIndicator) + rightMargin += NSWidth([progressIndicator frame]) + SEPARATION; NSDivideRect([self bounds], &ignored, &textRect, LEFT_MARGIN, NSMinXEdge); - NSDivideRect(textRect, &ignored, &textRect, RIGHT_MARGIN, NSMaxXEdge); + NSDivideRect(textRect, &ignored, &textRect, rightMargin, NSMaxXEdge); if (textRect.size.width < 0.0) textRect.size.width = 0.0; @@ -229,4 +234,62 @@ } } +#pragma mark Progress indicator + +- (NSProgressIndicator *)progressIndicator { + return progressIndicator; +} + +- (SKProgressIndicatorStyle)progressIndicatorStyle { + if (progressIndicator == nil) + return SKProgressIndicatorNone; + else + return [progressIndicator style]; +} + +- (void)setProgressIndicatorStyle:(SKProgressIndicatorStyle)style { + if (style == SKProgressIndicatorNone) { + if (progressIndicator == nil) + return; + [progressIndicator removeFromSuperview]; + progressIndicator = nil; + } else { + if (progressIndicator && (int)[progressIndicator style] == style) + return; + if(progressIndicator == nil) { + progressIndicator = [[NSProgressIndicator alloc] init]; + } else { + [progressIndicator retain]; + [progressIndicator removeFromSuperview]; + } + [progressIndicator setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin | NSViewMaxYMargin]; + [progressIndicator setStyle:style]; + [progressIndicator setControlSize:NSSmallControlSize]; + [progressIndicator setIndeterminate:style == NSProgressIndicatorSpinningStyle]; + [progressIndicator setDisplayedWhenStopped:style == NSProgressIndicatorBarStyle]; + [progressIndicator sizeToFit]; + + NSRect rect, ignored; + NSSize size = [progressIndicator frame].size; + if (size.width < 0.01) size.width = PROGRESSBAR_WIDTH; + NSDivideRect([self bounds], &ignored, &rect, RIGHT_MARGIN, NSMaxXEdge); + NSDivideRect(rect, &rect, &ignored, size.width, NSMaxXEdge); + rect.origin.y = floorf(NSMidY(rect) - 0.5 * size.height); + rect.size.height = size.height; + [progressIndicator setFrame:rect]; + + [self addSubview:progressIndicator]; + [progressIndicator release]; + } + [[self superview] setNeedsDisplayInRect:[self frame]]; +} + +- (void)startAnimation:(id)sender { + [progressIndicator startAnimation:sender]; +} + +- (void)stopAnimation:(id)sender { + [progressIndicator stopAnimation:sender]; +} + @end Modified: trunk/Skim.xcodeproj/project.pbxproj =================================================================== --- trunk/Skim.xcodeproj/project.pbxproj 2007-07-31 15:25:03 UTC (rev 2597) +++ trunk/Skim.xcodeproj/project.pbxproj 2007-07-31 18:38:56 UTC (rev 2598) @@ -72,6 +72,7 @@ CE2082E40C5E09DC009D3EFB /* ResizeLeftUpCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE2082E00C5E09DC009D3EFB /* ResizeLeftUpCursor.tiff */; }; CE2082E50C5E09DC009D3EFB /* ResizeRightDownCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE2082E10C5E09DC009D3EFB /* ResizeRightDownCursor.tiff */; }; CE2082E60C5E09DC009D3EFB /* ResizeRightUpCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE2082E20C5E09DC009D3EFB /* ResizeRightUpCursor.tiff */; }; + CE2093910C5F9A8D009D3EFB /* BDSKGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE20938F0C5F9A8D009D3EFB /* BDSKGradientView.m */; }; CE2BD83E0BD4132B00A5F4DB /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE2BD82A0BD4132B00A5F4DB /* Sparkle.framework */; }; CE2BD8450BD4135600A5F4DB /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE2BD82A0BD4132B00A5F4DB /* Sparkle.framework */; }; CE2DE4920B85D48F00D0DA12 /* SKThumbnail.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2DE4910B85D48F00D0DA12 /* SKThumbnail.m */; }; @@ -369,6 +370,8 @@ CE2082E00C5E09DC009D3EFB /* ResizeLeftUpCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ResizeLeftUpCursor.tiff; path = Images/ResizeLeftUpCursor.tiff; sourceTree = "<group>"; }; CE2082E10C5E09DC009D3EFB /* ResizeRightDownCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ResizeRightDownCursor.tiff; path = Images/ResizeRightDownCursor.tiff; sourceTree = "<group>"; }; CE2082E20C5E09DC009D3EFB /* ResizeRightUpCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ResizeRightUpCursor.tiff; path = Images/ResizeRightUpCursor.tiff; sourceTree = "<group>"; }; + CE20938E0C5F9A8D009D3EFB /* BDSKGradientView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BDSKGradientView.h; sourceTree = "<group>"; }; + CE20938F0C5F9A8D009D3EFB /* BDSKGradientView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BDSKGradientView.m; sourceTree = "<group>"; }; CE2BD8170BD4127A00A5F4DB /* Sparkle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sparkle.xcodeproj; path = vendorsrc/andymatuschak/Sparkle/Sparkle.xcodeproj; sourceTree = "<group>"; }; CE2BD82A0BD4132B00A5F4DB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CE2DE4900B85D48F00D0DA12 /* SKThumbnail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKThumbnail.h; sourceTree = "<group>"; }; @@ -898,6 +901,8 @@ CE0710140B89BDD600733CC8 /* BDSKContainerView.m */, CE0710150B89BDD600733CC8 /* BDSKEdgeView.h */, CE0710160B89BDD600733CC8 /* BDSKEdgeView.m */, + CE20938E0C5F9A8D009D3EFB /* BDSKGradientView.h */, + CE20938F0C5F9A8D009D3EFB /* BDSKGradientView.m */, F98DC2640BA090D8008E46EC /* BDSKImagePopUpButton.h */, F98DC2650BA090D8008E46EC /* BDSKImagePopUpButton.m */, F98DC2660BA090D8008E46EC /* BDSKImagePopUpButtonCell.h */, @@ -1395,6 +1400,7 @@ CECDC4FF0C5966A80026AAEC /* NSImage_BDSKExtensions.m in Sources */, CECDD2990C5B68580026AAEC /* SKCenteredTextFieldCell.m in Sources */, CECDDBAE0C5BB9600026AAEC /* SKFindTableView.m in Sources */, + CE2093910C5F9A8D009D3EFB /* BDSKGradientView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-31 15:39:17
|
Revision: 2597 http://skim-app.svn.sourceforge.net/skim-app/?rev=2597&view=rev Author: hofman Date: 2007-07-31 08:25:03 -0700 (Tue, 31 Jul 2007) Log Message: ----------- Don't use a static flag to check if the app support directory exists, as there are several versions. Modified Paths: -------------- trunk/SKApplicationController.m Modified: trunk/SKApplicationController.m =================================================================== --- trunk/SKApplicationController.m 2007-07-31 15:10:22 UTC (rev 2596) +++ trunk/SKApplicationController.m 2007-07-31 15:25:03 UTC (rev 2597) @@ -382,15 +382,17 @@ CFDictionarySetValue(pathDict, (void *)domain, (void *)path); // the call to FSFindFolder creates the parent hierarchy, but not the directory we're looking for - static BOOL dirExists = NO; - if (dirExists == NO && create) { - BOOL pathIsDir; - dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&pathIsDir]; - if (dirExists == NO || pathIsDir == NO) - [[NSFileManager defaultManager] createDirectoryAtPath:path attributes:nil]; - // make sure it was created - dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&pathIsDir]; - NSAssert1(dirExists && pathIsDir, @"Unable to create folder %@", path); + if (create) { + BOOL dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path]; + if (dirExists == NO) { + BOOL pathIsDir; + dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&pathIsDir]; + if (dirExists == NO || pathIsDir == NO) + [[NSFileManager defaultManager] createDirectoryAtPath:path attributes:nil]; + // make sure it was created + dirExists = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&pathIsDir]; + NSAssert1(dirExists && pathIsDir, @"Unable to create folder %@", path); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-31 15:10:24
|
Revision: 2596 http://skim-app.svn.sourceforge.net/skim-app/?rev=2596&view=rev Author: hofman Date: 2007-07-31 08:10:22 -0700 (Tue, 31 Jul 2007) Log Message: ----------- Change class of doucment because we have several document classes. Modified Paths: -------------- trunk/SKInfoWindowController.h trunk/SKInfoWindowController.m Modified: trunk/SKInfoWindowController.h =================================================================== --- trunk/SKInfoWindowController.h 2007-07-31 13:24:48 UTC (rev 2595) +++ trunk/SKInfoWindowController.h 2007-07-31 15:10:22 UTC (rev 2596) @@ -38,7 +38,6 @@ #import <Cocoa/Cocoa.h> -@class SKDocument; @interface SKInfoWindowController : NSWindowController { NSMutableDictionary *info; @@ -49,8 +48,8 @@ - (NSDictionary *)info; - (void)setInfo:(NSDictionary *)newInfo; -- (NSDictionary *)infoForDocument:(SKDocument *)doc; -- (void)fillInfoForDocument:(SKDocument *)doc; +- (NSDictionary *)infoForDocument:(NSDocument *)doc; +- (void)fillInfoForDocument:(NSDocument *)doc; - (void)handleWindowDidBecomeKeyNotification:(NSNotification *)notification; - (void)handleWindowDidResignKeyNotification:(NSNotification *)notification; Modified: trunk/SKInfoWindowController.m =================================================================== --- trunk/SKInfoWindowController.m 2007-07-31 13:24:48 UTC (rev 2595) +++ trunk/SKInfoWindowController.m 2007-07-31 15:10:22 UTC (rev 2596) @@ -161,32 +161,31 @@ return [NSString stringWithFormat:@"%.1f x %.1f %@ (%.1f x %.1f %@)", size.width * factor, size.height * factor, units, altSize.width * factor, altSize.height * factor, units]; } -- (NSDictionary *)infoForDocument:(SKDocument *)doc { - NSMutableDictionary *dictionary = nil; - if ([doc respondsToSelector:@selector(pdfDocument)]) { - PDFDocument *pdfDoc = [doc pdfDocument]; - dictionary = [NSMutableDictionary dictionary]; - [dictionary setDictionary:[pdfDoc documentAttributes]]; - if (doc) { - unsigned long long logicalSize = 0, physicalSize = 0; - [dictionary setValue:[[doc fileName] lastPathComponent] forKey:@"FileName"]; - [dictionary setValue:[NSString stringWithFormat: @"%d.%d", [pdfDoc majorVersion], [pdfDoc minorVersion]] forKey:@"Version"]; - [dictionary setValue:[NSNumber numberWithInt:[pdfDoc pageCount]] forKey:@"PageCount"]; - [dictionary setValue:SKFileSizeStringForFileURL([doc fileURL], &physicalSize, &logicalSize) forKey:@"FileSize"]; - if ([pdfDoc pageCount]) - [dictionary setValue:SKSizeString([[pdfDoc pageAtIndex:0] boundsForBox:kPDFDisplayBoxCropBox].size, [[pdfDoc pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox].size) forKey:@"PageSize"]; - [dictionary setValue:[NSNumber numberWithUnsignedLongLong:physicalSize] forKey:@"PhysicalSize"]; - [dictionary setValue:[NSNumber numberWithUnsignedLongLong:logicalSize] forKey:@"LogicalSize"]; - [dictionary setValue:[[dictionary valueForKey:@"Keywords"] componentsJoinedByString:@"\n"] forKey:@"KeywordsString"]; - [dictionary setValue:[NSNumber numberWithBool:[pdfDoc isEncrypted]] forKey:@"Encrypted"]; - [dictionary setValue:[NSNumber numberWithBool:[pdfDoc allowsPrinting]] forKey:@"AllowsPrinting"]; - [dictionary setValue:[NSNumber numberWithBool:[pdfDoc allowsCopying]] forKey:@"AllowsCopying"]; - } +- (NSDictionary *)infoForDocument:(NSDocument *)doc { + NSMutableDictionary *dictionary = [NSMutableDictionary dictionary]; + PDFDocument *pdfDoc; + unsigned long long logicalSize = 0, physicalSize = 0; + + if ([doc respondsToSelector:@selector(pdfDocument)] && (pdfDoc = [(SKDocument *)doc pdfDocument])) { + [dictionary addEntriesFromDictionary:[pdfDoc documentAttributes]]; + [dictionary setValue:[NSString stringWithFormat: @"%d.%d", [pdfDoc majorVersion], [pdfDoc minorVersion]] forKey:@"Version"]; + [dictionary setValue:[NSNumber numberWithInt:[pdfDoc pageCount]] forKey:@"PageCount"]; + if ([pdfDoc pageCount]) + [dictionary setValue:SKSizeString([[pdfDoc pageAtIndex:0] boundsForBox:kPDFDisplayBoxCropBox].size, [[pdfDoc pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox].size) forKey:@"PageSize"]; + [dictionary setValue:[[dictionary valueForKey:@"Keywords"] componentsJoinedByString:@"\n"] forKey:@"KeywordsString"]; + [dictionary setValue:[NSNumber numberWithBool:[pdfDoc isEncrypted]] forKey:@"Encrypted"]; + [dictionary setValue:[NSNumber numberWithBool:[pdfDoc allowsPrinting]] forKey:@"AllowsPrinting"]; + [dictionary setValue:[NSNumber numberWithBool:[pdfDoc allowsCopying]] forKey:@"AllowsCopying"]; } + [dictionary setValue:[[doc fileName] lastPathComponent] forKey:@"FileName"]; + [dictionary setValue:SKFileSizeStringForFileURL([doc fileURL], &physicalSize, &logicalSize) forKey:@"FileSize"]; + [dictionary setValue:[NSNumber numberWithUnsignedLongLong:physicalSize] forKey:@"PhysicalSize"]; + [dictionary setValue:[NSNumber numberWithUnsignedLongLong:logicalSize] forKey:@"LogicalSize"]; + return dictionary; } -- (void)fillInfoForDocument:(SKDocument *)doc { +- (void)fillInfoForDocument:(NSDocument *)doc { [self setInfo:[self infoForDocument:doc]]; } @@ -199,7 +198,7 @@ } - (void)handleWindowDidBecomeKeyNotification:(NSNotification *)notification { - SKDocument *doc = (SKDocument *)[[[notification object] windowController] document]; + NSDocument *doc = [[[notification object] windowController] document]; [self setInfo:[self infoForDocument:doc]]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-31 13:24:54
|
Revision: 2595 http://skim-app.svn.sourceforge.net/skim-app/?rev=2595&view=rev Author: hofman Date: 2007-07-31 06:24:48 -0700 (Tue, 31 Jul 2007) Log Message: ----------- Small improvements to side windows. Rename some methods and don't switch too many key views for pages in presentation mode. Modified Paths: -------------- trunk/SKMainWindowController.m trunk/SKSideWindow.h trunk/SKSideWindow.m Modified: trunk/SKMainWindowController.m =================================================================== --- trunk/SKMainWindowController.m 2007-07-31 11:31:48 UTC (rev 2594) +++ trunk/SKMainWindowController.m 2007-07-31 13:24:48 UTC (rev 2595) @@ -652,13 +652,13 @@ if ([[leftSideWindow screen] isEqual:screen] == NO) { [leftSideWindow orderOut:self]; [leftSideWindow moveToScreen:screen]; - [leftSideWindow hideSideWindow]; + [leftSideWindow collapse]; [leftSideWindow orderFront:self]; } if ([[rightSideWindow screen] isEqual:screen] == NO) { [rightSideWindow orderOut:self]; [leftSideWindow moveToScreen:screen]; - [rightSideWindow hideSideWindow]; + [rightSideWindow collapse]; [rightSideWindow orderFront:self]; } } else if ([self isPresentation]) { @@ -1644,7 +1644,7 @@ - (IBAction)searchPDF:(id)sender { if ([self isFullScreen]) { if ([leftSideWindow state] == NSDrawerClosedState || [leftSideWindow state] == NSDrawerClosingState) - [leftSideWindow showSideWindow]; + [leftSideWindow expand]; } else if (NSWidth([leftSideContentBox frame]) <= 0.0) { [self toggleLeftSidePane:sender]; } @@ -1777,9 +1777,9 @@ if ([self isFullScreen]) { [[SKPDFHoverWindow sharedHoverWindow] hide]; if ([leftSideWindow state] == NSDrawerOpenState || [leftSideWindow state] == NSDrawerOpeningState) - [leftSideWindow hideSideWindow]; + [leftSideWindow collapse]; else - [leftSideWindow showSideWindow]; + [leftSideWindow expand]; } else if ([self isPresentation]) { if ([leftSideWindow isVisible]) [self hideLeftSideWindow]; @@ -1816,9 +1816,9 @@ - (IBAction)toggleRightSidePane:(id)sender { if ([self isFullScreen]) { if ([rightSideWindow state] == NSDrawerOpenState || [rightSideWindow state] == NSDrawerOpeningState) - [rightSideWindow hideSideWindow]; + [rightSideWindow collapse]; else - [rightSideWindow showSideWindow]; + [rightSideWindow expand]; } else { NSRect sideFrame = [rightSideContentBox frame]; NSRect pdfFrame = [pdfContentBox frame]; @@ -1882,7 +1882,6 @@ if ([[mainWindow firstResponder] isDescendantOf:leftSideContentView]) [mainWindow makeFirstResponder:nil]; [leftSideWindow setMainView:leftSideContentView]; - [leftSideWindow setInitialFirstResponder:searchField]; [leftSideEdgeView setEdges:BDSKNoEdgeMask]; [findEdgeView setEdges:BDSKNoEdgeMask]; @@ -1890,16 +1889,16 @@ if ([self isPresentation]) { savedLeftSidePaneState = [self leftSidePaneState]; [self setLeftSidePaneState:SKThumbnailSidePaneState]; - [leftSideWindow showSideWindow]; [leftSideWindow setLevel:[[self window] level] + 1]; [leftSideWindow setAlphaValue:0.95]; [leftSideWindow setEnabled:NO]; [leftSideWindow makeFirstResponder:thumbnailTableView]; + [leftSideWindow expand]; } else { - [leftSideWindow hideSideWindow]; + [leftSideWindow makeFirstResponder:searchField]; + [leftSideWindow collapse]; + [leftSideWindow orderFront:self]; } - - [leftSideWindow orderFront:self]; } - (void)showRightSideWindow { @@ -1919,12 +1918,12 @@ [rightSideEdgeView setEdges:BDSKNoEdgeMask]; if ([self isPresentation]) { - [rightSideWindow showSideWindow]; + [rightSideWindow expand]; [leftSideWindow setLevel:[[self window] level] + 1]; [leftSideWindow setAlphaValue:0.95]; [leftSideWindow setEnabled:NO]; } else { - [rightSideWindow hideSideWindow]; + [rightSideWindow collapse]; } [rightSideWindow orderFront:self]; @@ -2540,7 +2539,7 @@ } - (void)hideRightSideWindow:(NSTimer *)timer { - [rightSideWindow hideSideWindow]; + [rightSideWindow collapse]; } - (NSRect)snapshotControllerTargetRectForMiniaturize:(SKSnapshotWindowController *)controller { @@ -2548,7 +2547,7 @@ if ([self isFullScreen] == NO && NSWidth([rightSideContentBox frame]) <= 0.0) { [self toggleRightSidePane:self]; } else if ([self isFullScreen] && ([rightSideWindow state] == NSDrawerClosedState || [rightSideWindow state] == NSDrawerClosingState)) { - [rightSideWindow showSideWindow]; + [rightSideWindow expand]; [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(hideRightSideWindow:) userInfo:NULL repeats:NO]; } [self setRightSidePaneState:SKSnapshotSidePaneState]; Modified: trunk/SKSideWindow.h =================================================================== --- trunk/SKSideWindow.h 2007-07-31 11:31:48 UTC (rev 2594) +++ trunk/SKSideWindow.h 2007-07-31 13:24:48 UTC (rev 2595) @@ -51,8 +51,8 @@ - (void)moveToScreen:(NSScreen *)screen; - (void)slideIn; - (void)slideOut; -- (void)showSideWindow; -- (void)hideSideWindow; +- (void)expand; +- (void)collapse; - (NSView *)mainView; - (void)setMainView:(NSView *)newContentView; - (NSRectEdge)edge; @@ -70,12 +70,12 @@ NSRectEdge edge; BOOL enabled; BOOL resizing; - BOOL isStatic; + BOOL acceptsMouseOver; } - (id)initWithFrame:(NSRect)frameRect edge:(NSRectEdge)anEdge; -- (void)showWindow; -- (void)hideWindow; - (void)trackMouseOvers; - (BOOL)isEnabled; - (void)setEnabled:(BOOL)flag; +- (BOOL)acceptsMouseOver; +- (void)setAcceptsMouseOver:(BOOL)flag; @end Modified: trunk/SKSideWindow.m =================================================================== --- trunk/SKSideWindow.m 2007-07-31 11:31:48 UTC (rev 2594) +++ trunk/SKSideWindow.m 2007-07-31 13:24:48 UTC (rev 2595) @@ -155,13 +155,15 @@ return state; } -- (void)showSideWindow { - [[self contentView] showWindow]; +- (void)expand { + [[self contentView] setAcceptsMouseOver:NO]; + [self slideIn]; [self makeKeyAndOrderFront:nil]; } -- (void)hideSideWindow { - [[self contentView] hideWindow]; +- (void)collapse { + [self slideOut]; + [[self contentView] setAcceptsMouseOver:YES]; } - (BOOL)isEnabled { @@ -262,6 +264,21 @@ } } +- (BOOL)acceptsMouseOver { + return acceptsMouseOver; +} + +- (void)setAcceptsMouseOver:(BOOL)flag { + if (acceptsMouseOver != flag) { + acceptsMouseOver = flag; + if (timer) { + [timer invalidate]; + [timer release]; + timer = nil; + } + } +} + - (NSRect)resizeHandleRect { NSRect rect, ignored; NSDivideRect([self bounds], &rect, &ignored, CONTENT_INSET, edge == NSMaxXEdge ? NSMinXEdge : NSMaxXEdge); @@ -412,7 +429,7 @@ NSRect resizeHandleRect = [self resizeHandleRect]; if (NSPointInRect(mouseLoc, resizeHandleRect) && [(SKSideWindow *)[self window] state] == NSDrawerOpenState) { if (enabled && [theEvent clickCount] == 2) - [self hideWindow]; + [(SKSideWindow *)[self window] collapse]; else [self resizeWithEvent:theEvent]; } else @@ -433,7 +450,7 @@ } - (void)mouseExited:(NSEvent *)theEvent { - if (isStatic) + if (acceptsMouseOver == NO) return; if (timer) { [timer invalidate]; @@ -452,7 +469,7 @@ } - (void)mouseEntered:(NSEvent *)theEvent { - if (isStatic) + if (acceptsMouseOver == NO) return; if (NSPointInRect([NSEvent mouseLocation], [[self window] frame])) { if (timer == nil) @@ -464,24 +481,4 @@ } } -- (void)showWindow { - isStatic = YES; - if (timer) { - [timer invalidate]; - [timer release]; - timer = nil; - } - [(SKSideWindow *)[self window] slideIn]; -} - -- (void)hideWindow { - isStatic = NO; - if (timer) { - [timer invalidate]; - [timer release]; - timer = nil; - } - [(SKSideWindow *)[self window] slideOut]; -} - @end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-31 11:32:07
|
Revision: 2594 http://skim-app.svn.sourceforge.net/skim-app/?rev=2594&view=rev Author: hofman Date: 2007-07-31 04:31:48 -0700 (Tue, 31 Jul 2007) Log Message: ----------- Fade in search view after starting the find so it does not fade in the previous results. Modified Paths: -------------- trunk/SKMainWindowController.m Modified: trunk/SKMainWindowController.m =================================================================== --- trunk/SKMainWindowController.m 2007-07-31 11:01:04 UTC (rev 2593) +++ trunk/SKMainWindowController.m 2007-07-31 11:31:48 UTC (rev 2594) @@ -2438,8 +2438,8 @@ else [self fadeInOutlineView]; } else { + [[pdfView document] beginFindString:[sender stringValue] withOptions:NSCaseInsensitiveSearch]; [self fadeInSearchView]; - [[pdfView document] beginFindString:[sender stringValue] withOptions:NSCaseInsensitiveSearch]; NSPasteboard *findPboard = [NSPasteboard pasteboardWithName:NSFindPboard]; [findPboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-31 11:02:14
|
Revision: 2593 http://skim-app.svn.sourceforge.net/skim-app/?rev=2593&view=rev Author: hofman Date: 2007-07-31 04:01:04 -0700 (Tue, 31 Jul 2007) Log Message: ----------- commit edits before finding next/previous Modified Paths: -------------- trunk/SKFindController.h trunk/SKFindController.m Modified: trunk/SKFindController.h =================================================================== --- trunk/SKFindController.h 2007-07-31 09:53:44 UTC (rev 2592) +++ trunk/SKFindController.h 2007-07-31 11:01:04 UTC (rev 2593) @@ -47,6 +47,7 @@ int lastChangeCount; BOOL ignoreCase; BDSKFindFieldEditor *fieldEditor; + CFArrayRef editors; } + (id)sharedFindController; @@ -68,6 +69,8 @@ - (id)target; - (id)selectionSource; +- (BOOL)commitEditing; + @end Modified: trunk/SKFindController.m =================================================================== --- trunk/SKFindController.m 2007-07-31 09:53:44 UTC (rev 2592) +++ trunk/SKFindController.m 2007-07-31 11:01:04 UTC (rev 2593) @@ -56,11 +56,13 @@ - (id)init { if (self = [super init]) { ignoreCase = YES; + editors = CFArrayCreateMutable(kCFAllocatorMallocZone, 0, NULL); } return self; } - (void)dealloc { + CFRelease(editors); [fieldEditor release]; [super dealloc]; } @@ -134,6 +136,7 @@ } - (IBAction)findNext:(id)sender { + [self commitEditing]; [[self target] findString:findString options:[self findOptions] & ~NSBackwardsSearch]; [self updateFindPboard]; } @@ -144,6 +147,7 @@ } - (IBAction)findPrevious:(id)sender { + [self commitEditing]; [[self target] findString:findString options:[self findOptions] | NSBackwardsSearch]; [self updateFindPboard]; } @@ -243,4 +247,25 @@ return fieldEditor; } +- (void)objectDidBeginEditing:(id)editor { + if (CFArrayGetFirstIndexOfValue(editors, CFRangeMake(0, CFArrayGetCount(editors)), editor) == -1) + CFArrayAppendValue((CFMutableArrayRef)editors, editor); +} + +- (void)objectDidEndEditing:(id)editor { + CFIndex index = CFArrayGetFirstIndexOfValue(editors, CFRangeMake(0, CFArrayGetCount(editors)), editor); + if (index != -1) + CFArrayRemoveValueAtIndex((CFMutableArrayRef)editors, index); +} + +- (BOOL)commitEditing { + CFIndex index = CFArrayGetCount(editors); + + while (index--) + if([(NSObject *)(CFArrayGetValueAtIndex(editors, index)) commitEditing] == NO) + return NO; + + return YES; +} + @end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-31 09:53:46
|
Revision: 2592 http://skim-app.svn.sourceforge.net/skim-app/?rev=2592&view=rev Author: hofman Date: 2007-07-31 02:53:44 -0700 (Tue, 31 Jul 2007) Log Message: ----------- Update find pboard and use it for the Find panel. Change the find panel string when the find pboard has changed. Invert check to use for getting find string from selection to enable that action. Modified Paths: -------------- trunk/Dutch.lproj/FindPanel.nib/info.nib trunk/Dutch.lproj/FindPanel.nib/keyedobjects.nib trunk/English.lproj/FindPanel.nib/info.nib trunk/English.lproj/FindPanel.nib/keyedobjects.nib trunk/French.lproj/FindPanel.nib/classes.nib trunk/French.lproj/FindPanel.nib/info.nib trunk/French.lproj/FindPanel.nib/keyedobjects.nib trunk/Italian.lproj/FindPanel.nib/info.nib trunk/Italian.lproj/FindPanel.nib/keyedobjects.nib trunk/SKFindController.h trunk/SKFindController.m trunk/SKMainWindowController.m Modified: trunk/Dutch.lproj/FindPanel.nib/info.nib =================================================================== --- trunk/Dutch.lproj/FindPanel.nib/info.nib 2007-07-30 19:20:12 UTC (rev 2591) +++ trunk/Dutch.lproj/FindPanel.nib/info.nib 2007-07-31 09:53:44 UTC (rev 2592) @@ -11,6 +11,6 @@ <integer>5</integer> </array> <key>IBSystem Version</key> - <string>8P135</string> + <string>8R218</string> </dict> </plist> Modified: trunk/Dutch.lproj/FindPanel.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/English.lproj/FindPanel.nib/info.nib =================================================================== --- trunk/English.lproj/FindPanel.nib/info.nib 2007-07-30 19:20:12 UTC (rev 2591) +++ trunk/English.lproj/FindPanel.nib/info.nib 2007-07-31 09:53:44 UTC (rev 2592) @@ -11,6 +11,6 @@ <integer>5</integer> </array> <key>IBSystem Version</key> - <string>8L127</string> + <string>8R218</string> </dict> </plist> Modified: trunk/English.lproj/FindPanel.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/French.lproj/FindPanel.nib/classes.nib =================================================================== --- trunk/French.lproj/FindPanel.nib/classes.nib 2007-07-30 19:20:12 UTC (rev 2591) +++ trunk/French.lproj/FindPanel.nib/classes.nib 2007-07-31 09:53:44 UTC (rev 2592) @@ -1,25 +1,18 @@ { - IBClasses = ( - { - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - findNext = id; - findNextAndOrderOutFindPanel = id; - findPrevious = id; - performFindPanelAction = id; - }; - CLASS = SKFindController; - LANGUAGE = ObjC; - OUTLETS = { - findField = NSTextField; - ignoreCaseCheckbox = NSButton; - }; - SUPERCLASS = NSWindowController; + IBClasses = ( + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + { + ACTIONS = { + findNext = id; + findNextAndOrderOutFindPanel = id; + findPrevious = id; + performFindPanelAction = id; + }; + CLASS = SKFindController; + LANGUAGE = ObjC; + OUTLETS = {findField = NSTextField; ignoreCaseCheckbox = NSButton; }; + SUPERCLASS = NSWindowController; } - ); - IBVersion = 1; + ); + IBVersion = 1; } \ No newline at end of file Modified: trunk/French.lproj/FindPanel.nib/info.nib =================================================================== --- trunk/French.lproj/FindPanel.nib/info.nib 2007-07-30 19:20:12 UTC (rev 2591) +++ trunk/French.lproj/FindPanel.nib/info.nib 2007-07-31 09:53:44 UTC (rev 2592) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>IBDocumentLocation</key> - <string>79 78 356 240 0 0 1600 1178 </string> + <string>69 58 356 240 0 0 1440 938 </string> <key>IBFramework Version</key> <string>446.1</string> <key>IBOpenObjects</key> @@ -11,6 +11,6 @@ <integer>5</integer> </array> <key>IBSystem Version</key> - <string>9A466</string> + <string>8R218</string> </dict> </plist> Modified: trunk/French.lproj/FindPanel.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Italian.lproj/FindPanel.nib/info.nib =================================================================== --- trunk/Italian.lproj/FindPanel.nib/info.nib 2007-07-30 19:20:12 UTC (rev 2591) +++ trunk/Italian.lproj/FindPanel.nib/info.nib 2007-07-31 09:53:44 UTC (rev 2592) @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>IBDocumentLocation</key> - <string>43 101 356 240 0 0 1024 746 </string> + <string>70 139 356 240 0 0 1440 938 </string> <key>IBFramework Version</key> <string>446.1</string> <key>IBOpenObjects</key> @@ -11,6 +11,6 @@ <integer>5</integer> </array> <key>IBSystem Version</key> - <string>8P135</string> + <string>8R218</string> </dict> </plist> Modified: trunk/Italian.lproj/FindPanel.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/SKFindController.h =================================================================== --- trunk/SKFindController.h 2007-07-30 19:20:12 UTC (rev 2591) +++ trunk/SKFindController.h 2007-07-31 09:53:44 UTC (rev 2592) @@ -43,6 +43,8 @@ @interface SKFindController : NSWindowController { IBOutlet NSTextField *findField; IBOutlet NSButton *ignoreCaseCheckbox; + NSString *findString; + int lastChangeCount; BOOL ignoreCase; BDSKFindFieldEditor *fieldEditor; } @@ -53,8 +55,11 @@ - (IBAction)findNext:(id)sender; - (IBAction)findNextAndOrderOutFindPanel:(id)sender; - (IBAction)findPrevious:(id)sender; -- (IBAction)setFindString:(id)sender; +- (IBAction)pickFindString:(id)sender; +- (NSString *)findString; +- (void)setFindString:(NSString *)newFindString; + - (BOOL)ignoreCase; - (void)setIgnoreCase:(BOOL)newIgnoreCase; Modified: trunk/SKFindController.m =================================================================== --- trunk/SKFindController.m 2007-07-30 19:20:12 UTC (rev 2591) +++ trunk/SKFindController.m 2007-07-31 09:53:44 UTC (rev 2592) @@ -91,6 +91,21 @@ [self setWindowFrameAutosaveName:SKFindPanelFrameAutosaveName]; } +- (void)windowDidBecomeKey:(NSNotification *)notification { + NSPasteboard *findPboard = [NSPasteboard pasteboardWithName:NSFindPboard]; + if (lastChangeCount < [findPboard changeCount] && [findPboard availableTypeFromArray:[NSArray arrayWithObject:NSStringPboardType]]) { + [self setFindString:[findPboard stringForType:NSStringPboardType]]; + lastChangeCount = [findPboard changeCount]; + } +} + +- (void)updateFindPboard { + NSPasteboard *findPboard = [NSPasteboard pasteboardWithName:NSFindPboard]; + [findPboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; + [findPboard setString:findString forType:NSStringPboardType]; + lastChangeCount = [findPboard changeCount]; +} + - (IBAction)performFindPanelAction:(id)sender { switch ([sender tag]) { case NSFindPanelActionShowFindPanel: @@ -109,7 +124,7 @@ NSBeep(); break; case NSFindPanelActionSetFindString: - [self setFindString:self]; + [self pickFindString:self]; break; case NSFindPanelActionSelectAll: case NSFindPanelActionSelectAllInSelection: @@ -119,7 +134,8 @@ } - (IBAction)findNext:(id)sender { - [[self target] findString:[findField stringValue] options:[self findOptions] & ~NSBackwardsSearch]; + [[self target] findString:findString options:[self findOptions] & ~NSBackwardsSearch]; + [self updateFindPboard]; } - (IBAction)findNextAndOrderOutFindPanel:(id)sender { @@ -128,23 +144,32 @@ } - (IBAction)findPrevious:(id)sender { - [[self target] findString:[findField stringValue] options:[self findOptions] | NSBackwardsSearch]; + [[self target] findString:findString options:[self findOptions] | NSBackwardsSearch]; + [self updateFindPboard]; } -- (IBAction)setFindString:(id)sender { +- (IBAction)pickFindString:(id)sender { id source = [self selectionSource]; if (source) { PDFSelection *selection = [[source pdfView] currentSelection]; - if (selection == nil) { - NSPasteboard *findPasteboard = [NSPasteboard pasteboardWithName:NSFindPboard]; - [findPasteboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; - [findPasteboard setString:[selection string] forType:NSStringPboardType]; - - [findField setStringValue:[selection string]]; + if (selection) { + [self setFindString:[selection string]]; + [self updateFindPboard]; } } } +- (NSString *)findString { + return findString; +} + +- (void)setFindString:(NSString *)newFindString { + if (findString != newFindString) { + [findString release]; + findString = [newFindString retain]; + } +} + - (BOOL)ignoreCase { return ignoreCase; } Modified: trunk/SKMainWindowController.m =================================================================== --- trunk/SKMainWindowController.m 2007-07-30 19:20:12 UTC (rev 2591) +++ trunk/SKMainWindowController.m 2007-07-31 09:53:44 UTC (rev 2592) @@ -2440,6 +2440,10 @@ } else { [self fadeInSearchView]; [[pdfView document] beginFindString:[sender stringValue] withOptions:NSCaseInsensitiveSearch]; + + NSPasteboard *findPboard = [NSPasteboard pasteboardWithName:NSFindPboard]; + [findPboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; + [findPboard setString:[sender stringValue] forType:NSStringPboardType]; } } @@ -2478,6 +2482,11 @@ if ([[sender stringValue] length] && rightSidePaneState != SKNoteSidePaneState) [self setRightSidePaneState:SKNoteSidePaneState]; [self updateNoteFilterPredicate]; + if ([[sender stringValue] length]) { + NSPasteboard *findPboard = [NSPasteboard pasteboardWithName:NSFindPboard]; + [findPboard declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; + [findPboard setString:[sender stringValue] forType:NSStringPboardType]; + } } #pragma mark Sub- and note- windows This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-30 19:20:17
|
Revision: 2591 http://skim-app.svn.sourceforge.net/skim-app/?rev=2591&view=rev Author: hofman Date: 2007-07-30 12:20:12 -0700 (Mon, 30 Jul 2007) Log Message: ----------- Change shortcut for Presentation and for Search, to be consistent with other apps. Modified Paths: -------------- trunk/Dutch.lproj/MainMenu.nib/info.nib trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib trunk/English.lproj/MainMenu.nib/keyedobjects.nib trunk/French.lproj/MainMenu.nib/keyedobjects.nib trunk/Italian.lproj/MainMenu.nib/keyedobjects.nib Modified: trunk/Dutch.lproj/MainMenu.nib/info.nib =================================================================== --- trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-07-30 16:32:46 UTC (rev 2590) +++ trunk/Dutch.lproj/MainMenu.nib/info.nib 2007-07-30 19:20:12 UTC (rev 2591) @@ -7,10 +7,14 @@ <key>IBEditorPositions</key> <dict> <key>29</key> - <string>140 614 542 44 0 0 1440 938 </string> + <string>140 614 635 44 0 0 1440 938 </string> </dict> <key>IBFramework Version</key> <string>446.1</string> + <key>IBOpenObjects</key> + <array> + <integer>29</integer> + </array> <key>IBSystem Version</key> <string>8R218</string> </dict> Modified: trunk/Dutch.lproj/MainMenu.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/English.lproj/MainMenu.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/French.lproj/MainMenu.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Italian.lproj/MainMenu.nib/keyedobjects.nib =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-30 16:32:47
|
Revision: 2590 http://skim-app.svn.sourceforge.net/skim-app/?rev=2590&view=rev Author: hofman Date: 2007-07-30 09:32:46 -0700 (Mon, 30 Jul 2007) Log Message: ----------- Set window frame autosave name for find panel. Modified Paths: -------------- trunk/SKFindController.m Modified: trunk/SKFindController.m =================================================================== --- trunk/SKFindController.m 2007-07-30 16:22:12 UTC (rev 2589) +++ trunk/SKFindController.m 2007-07-30 16:32:46 UTC (rev 2590) @@ -41,6 +41,7 @@ #import "SKDocument.h" #import <Quartz/Quartz.h> +static NSString *SKFindPanelFrameAutosaveName = @"SKFindPanel"; @implementation SKFindController @@ -85,6 +86,11 @@ - (NSString *)windowNibName { return @"FindPanel"; } +- (void)awakeFromNib { + if (self == sharedFindController) + [self setWindowFrameAutosaveName:SKFindPanelFrameAutosaveName]; +} + - (IBAction)performFindPanelAction:(id)sender { switch ([sender tag]) { case NSFindPanelActionShowFindPanel: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-30 16:22:13
|
Revision: 2589 http://skim-app.svn.sourceforge.net/skim-app/?rev=2589&view=rev Author: hofman Date: 2007-07-30 09:22:12 -0700 (Mon, 30 Jul 2007) Log Message: ----------- Make sure text edits are committed before closing the pref window or changing the tab item. Modified Paths: -------------- trunk/Dutch.lproj/PreferenceWindow.nib/info.nib trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib trunk/French.lproj/PreferenceWindow.nib/keyedobjects.nib trunk/Italian.lproj/PreferenceWindow.nib/keyedobjects.nib trunk/SKPreferenceController.m Modified: trunk/Dutch.lproj/PreferenceWindow.nib/info.nib =================================================================== --- trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-07-30 16:10:03 UTC (rev 2588) +++ trunk/Dutch.lproj/PreferenceWindow.nib/info.nib 2007-07-30 16:22:12 UTC (rev 2589) @@ -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/French.lproj/PreferenceWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Italian.lproj/PreferenceWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/SKPreferenceController.m =================================================================== --- trunk/SKPreferenceController.m 2007-07-30 16:10:03 UTC (rev 2588) +++ trunk/SKPreferenceController.m 2007-07-30 16:22:12 UTC (rev 2589) @@ -180,6 +180,18 @@ [[[self window] contentView] deactivateColorAndLineWells]; } +- (void)windowWillClose:(NSNotification *)notification { + // make sure edits are committed + if ([[[self window] firstResponder] isKindOfClass:[NSText class]] && [[self window] makeFirstResponder:[self window]] == NO) + [[self window] endEditingFor:nil]; +} + +- (void)tabView:(NSTabView *)tabView willSelectTabViewItem:(NSTabViewItem *)tabViewItem { + // make sure edits are committed + if ([[[self window] firstResponder] isKindOfClass:[NSText class]] && [[self window] makeFirstResponder:[self window]] == NO) + [[self window] endEditingFor:nil]; +} + - (NSArray *)fonts { return fonts; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-30 16:10:06
|
Revision: 2588 http://skim-app.svn.sourceforge.net/skim-app/?rev=2588&view=rev Author: hofman Date: 2007-07-30 09:10:03 -0700 (Mon, 30 Jul 2007) Log Message: ----------- Increase min width of left/right side collapsible view. Modified Paths: -------------- trunk/SKMainWindowController.m Modified: trunk/SKMainWindowController.m =================================================================== --- trunk/SKMainWindowController.m 2007-07-30 14:50:51 UTC (rev 2587) +++ trunk/SKMainWindowController.m 2007-07-30 16:10:03 UTC (rev 2588) @@ -240,13 +240,13 @@ // Set up the panes and subviews, needs to be done before we resize them [leftSideCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask]; - [leftSideCollapsibleView setMinSize:NSMakeSize(100.0, 42.0)]; + [leftSideCollapsibleView setMinSize:NSMakeSize(111.0, NSHeight([leftSideCollapsibleView frame]))]; [findCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask]; - [findCollapsibleView setMinSize:NSMakeSize(50.0, 25.0)]; + [findCollapsibleView setMinSize:NSMakeSize(50.0, NSHeight([findCollapsibleView frame]))]; [rightSideCollapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMinYEdgeMask]; - [rightSideCollapsibleView setMinSize:NSMakeSize(100.0, 42.0)]; + [rightSideCollapsibleView setMinSize:NSMakeSize(111.0, NSHeight([rightSideCollapsibleView frame]))]; [pdfContentBox setEdges:BDSKMinXEdgeMask | BDSKMaxXEdgeMask | BDSKMinYEdgeMask]; [findEdgeView setEdges:BDSKMaxXEdgeMask]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-30 14:50:52
|
Revision: 2587 http://skim-app.svn.sourceforge.net/skim-app/?rev=2587&view=rev Author: hofman Date: 2007-07-30 07:50:51 -0700 (Mon, 30 Jul 2007) Log Message: ----------- removed a line too many Modified Paths: -------------- trunk/SKApplicationController.m Modified: trunk/SKApplicationController.m =================================================================== --- trunk/SKApplicationController.m 2007-07-30 14:49:41 UTC (rev 2586) +++ trunk/SKApplicationController.m 2007-07-30 14:50:51 UTC (rev 2587) @@ -61,7 +61,7 @@ } + (void)setupDefaults{ - + NSString *userDefaultsValuesPath; NSDictionary *userDefaultsValuesDict; NSDictionary *initialValuesDict; NSArray *resettableUserDefaultsKeys; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-30 14:49:42
|
Revision: 2586 http://skim-app.svn.sourceforge.net/skim-app/?rev=2586&view=rev Author: hofman Date: 2007-07-30 07:49:41 -0700 (Mon, 30 Jul 2007) Log Message: ----------- remove logs Modified Paths: -------------- trunk/SKApplicationController.m Modified: trunk/SKApplicationController.m =================================================================== --- trunk/SKApplicationController.m 2007-07-30 12:14:10 UTC (rev 2585) +++ trunk/SKApplicationController.m 2007-07-30 14:49:41 UTC (rev 2586) @@ -61,9 +61,7 @@ } + (void)setupDefaults{ - NSLog(NSStringFromPoint([[NSCursor resizeLeftRightCursor] hotSpot])); - NSLog(NSStringFromPoint([[NSCursor resizeUpDownCursor] hotSpot])); - NSString *userDefaultsValuesPath; + NSDictionary *userDefaultsValuesDict; NSDictionary *initialValuesDict; NSArray *resettableUserDefaultsKeys; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-30 12:14:12
|
Revision: 2585 http://skim-app.svn.sourceforge.net/skim-app/?rev=2585&view=rev Author: hofman Date: 2007-07-30 05:14:10 -0700 (Mon, 30 Jul 2007) Log Message: ----------- Add some corner resize cursors. Use resize cursors for edges of selection. Modified Paths: -------------- trunk/NSCursor_SKExtensions.h trunk/NSCursor_SKExtensions.m trunk/SKApplicationController.m trunk/SKPDFView.m trunk/Skim.xcodeproj/project.pbxproj Added Paths: ----------- trunk/Images/ResizeLeftDownCursor.tiff trunk/Images/ResizeLeftUpCursor.tiff trunk/Images/ResizeRightDownCursor.tiff trunk/Images/ResizeRightUpCursor.tiff Added: trunk/Images/ResizeLeftDownCursor.tiff =================================================================== (Binary files differ) Property changes on: trunk/Images/ResizeLeftDownCursor.tiff ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Images/ResizeLeftUpCursor.tiff =================================================================== (Binary files differ) Property changes on: trunk/Images/ResizeLeftUpCursor.tiff ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Images/ResizeRightDownCursor.tiff =================================================================== (Binary files differ) Property changes on: trunk/Images/ResizeRightDownCursor.tiff ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/Images/ResizeRightUpCursor.tiff =================================================================== (Binary files differ) Property changes on: trunk/Images/ResizeRightUpCursor.tiff ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/NSCursor_SKExtensions.h =================================================================== --- trunk/NSCursor_SKExtensions.h 2007-07-29 14:38:53 UTC (rev 2584) +++ trunk/NSCursor_SKExtensions.h 2007-07-30 12:14:10 UTC (rev 2585) @@ -43,6 +43,10 @@ + (NSCursor *)zoomInCursor; + (NSCursor *)zoomOutCursor; ++ (NSCursor *)resizeLeftUpCursor; ++ (NSCursor *)resizeLeftDownCursor; ++ (NSCursor *)resizeRightUpCursor; ++ (NSCursor *)resizeRightDownCursor; + (NSCursor *)cameraCursor; @end Modified: trunk/NSCursor_SKExtensions.m =================================================================== --- trunk/NSCursor_SKExtensions.m 2007-07-29 14:38:53 UTC (rev 2584) +++ trunk/NSCursor_SKExtensions.m 2007-07-30 12:14:10 UTC (rev 2585) @@ -59,6 +59,42 @@ return zoomOutCursor; } ++ (NSCursor *)resizeLeftUpCursor { + static NSCursor *resizeLeftUpCursor = nil; + if (nil == resizeLeftUpCursor) { + NSImage *cursorImage = [[[NSImage imageNamed:@"ResizeLeftUpCursor"] copy] autorelease]; + resizeLeftUpCursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:NSMakePoint(8.0, 8.0)]; + } + return resizeLeftUpCursor; +} + ++ (NSCursor *)resizeLeftDownCursor { + static NSCursor *resizeLeftDownCursor = nil; + if (nil == resizeLeftDownCursor) { + NSImage *cursorImage = [[[NSImage imageNamed:@"ResizeLeftDownCursor"] copy] autorelease]; + resizeLeftDownCursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:NSMakePoint(8.0, 8.0)]; + } + return resizeLeftDownCursor; +} + ++ (NSCursor *)resizeRightUpCursor { + static NSCursor *resizeRightUpCursor = nil; + if (nil == resizeRightUpCursor) { + NSImage *cursorImage = [[[NSImage imageNamed:@"ResizeRightUpCursor"] copy] autorelease]; + resizeRightUpCursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:NSMakePoint(8.0, 8.0)]; + } + return resizeRightUpCursor; +} + ++ (NSCursor *)resizeRightDownCursor { + static NSCursor *resizeRightDownCursor = nil; + if (nil == resizeRightDownCursor) { + NSImage *cursorImage = [[[NSImage imageNamed:@"ResizeRightDownCursor"] copy] autorelease]; + resizeRightDownCursor = [[NSCursor alloc] initWithImage:cursorImage hotSpot:NSMakePoint(8.0, 8.0)]; + } + return resizeRightDownCursor; +} + + (NSCursor *)cameraCursor { NSCursor *cameraCursor = nil; Modified: trunk/SKApplicationController.m =================================================================== --- trunk/SKApplicationController.m 2007-07-29 14:38:53 UTC (rev 2584) +++ trunk/SKApplicationController.m 2007-07-30 12:14:10 UTC (rev 2585) @@ -61,7 +61,8 @@ } + (void)setupDefaults{ - + NSLog(NSStringFromPoint([[NSCursor resizeLeftRightCursor] hotSpot])); + NSLog(NSStringFromPoint([[NSCursor resizeUpDownCursor] hotSpot])); NSString *userDefaultsValuesPath; NSDictionary *userDefaultsValuesDict; NSDictionary *initialValuesDict; Modified: trunk/SKPDFView.m =================================================================== --- trunk/SKPDFView.m 2007-07-29 14:38:53 UTC (rev 2584) +++ trunk/SKPDFView.m 2007-07-30 12:14:10 UTC (rev 2585) @@ -3457,12 +3457,27 @@ float margin = 4.0 / [self scaleFactor]; PDFPage *page = [self pageForPoint:p nearest:NO]; p = [self convertPoint:p toPage:page]; - if (NSPointInRect(p, NSInsetRect(selectionRect, -margin, -margin)) == NO) + if (NSIsEmptyRect(selectionRect) || NSPointInRect(p, NSInsetRect(selectionRect, -margin, -margin)) == NO) { cursor = [NSCursor crosshairCursor]; - else if (NSPointInRect(p, NSInsetRect(selectionRect, margin, margin))) + } else if (p.x > NSMaxX(selectionRect) - margin) { + if (p.y > NSMaxY(selectionRect) - margin) + cursor = [NSCursor resizeRightUpCursor]; + else if (p.y < NSMinY(selectionRect) + margin) + cursor = [NSCursor resizeRightDownCursor]; + else + cursor = [NSCursor resizeLeftRightCursor]; + } else if (p.x < NSMinX(selectionRect) + margin) { + if (p.y > NSMaxY(selectionRect) - margin) + cursor = [NSCursor resizeLeftUpCursor]; + else if (p.y < NSMinY(selectionRect) + margin) + cursor = [NSCursor resizeLeftDownCursor]; + else + cursor = [NSCursor resizeLeftRightCursor]; + } else if (p.y > NSMaxY(selectionRect) - margin || p.y < NSMinY(selectionRect) + margin) { + cursor = [NSCursor resizeUpDownCursor]; + } else { cursor = [NSCursor openHandCursor]; - else - cursor = [NSCursor arrowCursor]; + } } break; case SKMagnifyToolMode: Modified: trunk/Skim.xcodeproj/project.pbxproj =================================================================== --- trunk/Skim.xcodeproj/project.pbxproj 2007-07-29 14:38:53 UTC (rev 2584) +++ trunk/Skim.xcodeproj/project.pbxproj 2007-07-30 12:14:10 UTC (rev 2585) @@ -68,6 +68,10 @@ CE1E2B290BDAB6180011D9DD /* SKPDFSynchronizer.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1E2B270BDAB6180011D9DD /* SKPDFSynchronizer.m */; }; CE1E301D0BDB9D5C0011D9DD /* NSScanner_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1E301B0BDB9D5C0011D9DD /* NSScanner_SKExtensions.m */; }; CE1E30290BDB9D8E0011D9DD /* NSCharacterSet_SKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1E30270BDB9D8E0011D9DD /* NSCharacterSet_SKExtensions.m */; }; + CE2082E30C5E09DC009D3EFB /* ResizeLeftDownCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE2082DF0C5E09DC009D3EFB /* ResizeLeftDownCursor.tiff */; }; + CE2082E40C5E09DC009D3EFB /* ResizeLeftUpCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE2082E00C5E09DC009D3EFB /* ResizeLeftUpCursor.tiff */; }; + CE2082E50C5E09DC009D3EFB /* ResizeRightDownCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE2082E10C5E09DC009D3EFB /* ResizeRightDownCursor.tiff */; }; + CE2082E60C5E09DC009D3EFB /* ResizeRightUpCursor.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CE2082E20C5E09DC009D3EFB /* ResizeRightUpCursor.tiff */; }; CE2BD83E0BD4132B00A5F4DB /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE2BD82A0BD4132B00A5F4DB /* Sparkle.framework */; }; CE2BD8450BD4135600A5F4DB /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE2BD82A0BD4132B00A5F4DB /* Sparkle.framework */; }; CE2DE4920B85D48F00D0DA12 /* SKThumbnail.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2DE4910B85D48F00D0DA12 /* SKThumbnail.m */; }; @@ -361,6 +365,10 @@ CE1E301B0BDB9D5C0011D9DD /* NSScanner_SKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSScanner_SKExtensions.m; sourceTree = "<group>"; }; CE1E30260BDB9D8E0011D9DD /* NSCharacterSet_SKExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSCharacterSet_SKExtensions.h; sourceTree = "<group>"; }; CE1E30270BDB9D8E0011D9DD /* NSCharacterSet_SKExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSCharacterSet_SKExtensions.m; sourceTree = "<group>"; }; + CE2082DF0C5E09DC009D3EFB /* ResizeLeftDownCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ResizeLeftDownCursor.tiff; path = Images/ResizeLeftDownCursor.tiff; sourceTree = "<group>"; }; + CE2082E00C5E09DC009D3EFB /* ResizeLeftUpCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ResizeLeftUpCursor.tiff; path = Images/ResizeLeftUpCursor.tiff; sourceTree = "<group>"; }; + CE2082E10C5E09DC009D3EFB /* ResizeRightDownCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ResizeRightDownCursor.tiff; path = Images/ResizeRightDownCursor.tiff; sourceTree = "<group>"; }; + CE2082E20C5E09DC009D3EFB /* ResizeRightUpCursor.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ResizeRightUpCursor.tiff; path = Images/ResizeRightUpCursor.tiff; sourceTree = "<group>"; }; CE2BD8170BD4127A00A5F4DB /* Sparkle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sparkle.xcodeproj; path = vendorsrc/andymatuschak/Sparkle/Sparkle.xcodeproj; sourceTree = "<group>"; }; CE2BD82A0BD4132B00A5F4DB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CE2DE4900B85D48F00D0DA12 /* SKThumbnail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SKThumbnail.h; sourceTree = "<group>"; }; @@ -962,7 +970,6 @@ CE4373B30BB5440E00A56987 /* PSDocument.icns */, CE4D88D70C3AE52F002C20CB /* DVIDocument.icns */, CE0715890B8A3D6300733CC8 /* NoteDocument.icns */, - CE380A7A0B834E6100A1B779 /* CameraCursor.tiff */, CE7C5D180BD8086C0011315D /* ToolbarLineNote.tiff */, CE4190C20B94963A00ECF819 /* ToolbarCircleNote.tiff */, CEAFFD7A0C40ED5400C3ECBB /* ToolbarColors.tiff */, @@ -992,6 +999,11 @@ CE5478C70B33456300F8AFB6 /* ToolbarZoomToFit.tiff */, CEB7359A0C4A8C1B000350F9 /* TransitionMask.jpg */, CEB735A10C4A8CD6000350F9 /* TransitionShading.tiff */, + CE380A7A0B834E6100A1B779 /* CameraCursor.tiff */, + CE2082DF0C5E09DC009D3EFB /* ResizeLeftDownCursor.tiff */, + CE2082E00C5E09DC009D3EFB /* ResizeLeftUpCursor.tiff */, + CE2082E10C5E09DC009D3EFB /* ResizeRightDownCursor.tiff */, + CE2082E20C5E09DC009D3EFB /* ResizeRightUpCursor.tiff */, CE7467540B7F321100CBF969 /* zoomInCursor.tiff */, CE7467550B7F321A00CBF969 /* zoomOutCursor.tiff */, ); @@ -1201,6 +1213,10 @@ CEAFFD9D0C40F2A800C3ECBB /* ToolbarLines.tiff in Resources */, CEB7359C0C4A8C1C000350F9 /* TransitionMask.jpg in Resources */, CEB735A20C4A8CD6000350F9 /* TransitionShading.tiff in Resources */, + CE2082E30C5E09DC009D3EFB /* ResizeLeftDownCursor.tiff in Resources */, + CE2082E40C5E09DC009D3EFB /* ResizeLeftUpCursor.tiff in Resources */, + CE2082E50C5E09DC009D3EFB /* ResizeRightDownCursor.tiff in Resources */, + CE2082E60C5E09DC009D3EFB /* ResizeRightUpCursor.tiff in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-29 14:38:55
|
Revision: 2584 http://skim-app.svn.sourceforge.net/skim-app/?rev=2584&view=rev Author: hofman Date: 2007-07-29 07:38:53 -0700 (Sun, 29 Jul 2007) Log Message: ----------- Fix layout of french localization. Modified Paths: -------------- trunk/French.lproj/LineInspector.nib/classes.nib trunk/French.lproj/LineInspector.nib/info.nib trunk/French.lproj/LineInspector.nib/keyedobjects.nib trunk/Skim.xcodeproj/project.pbxproj Modified: trunk/French.lproj/LineInspector.nib/classes.nib =================================================================== --- trunk/French.lproj/LineInspector.nib/classes.nib 2007-07-29 10:09:11 UTC (rev 2583) +++ trunk/French.lproj/LineInspector.nib/classes.nib 2007-07-29 14:38:53 UTC (rev 2584) @@ -1,56 +1,44 @@ { - IBClasses = ( - { - ACTIONS = { - "" = id; - }; - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - changeDashPattern = id; - changeEndLineStyle = id; - changeLineStyle = id; - changeLineWidth = id; - changeStartLineStyle = id; - }; - CLASS = NSObject; - LANGUAGE = ObjC; - }, - { - CLASS = NSSegmentedControl; - LANGUAGE = ObjC; - SUPERCLASS = NSControl; - }, - { - CLASS = SKLineInspector; - LANGUAGE = ObjC; - OUTLETS = { - dashPatternField = NSTextField; - endLineStyleButton = NSSegmentedControl; - 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; + IBClasses = ( + { + ACTIONS = {"" = id; }; + CLASS = FirstResponder; + LANGUAGE = ObjC; + SUPERCLASS = NSObject; + }, + { + ACTIONS = { + changeDashPattern = id; + changeEndLineStyle = id; + changeLineStyle = id; + changeLineWidth = id; + changeStartLineStyle = id; + }; + CLASS = NSObject; + LANGUAGE = ObjC; + }, + {CLASS = NSSegmentedControl; LANGUAGE = ObjC; SUPERCLASS = NSControl; }, + { + CLASS = SKLineInspector; + LANGUAGE = ObjC; + OUTLETS = { + dashPatternField = NSTextField; + endLineStyleButton = NSSegmentedControl; + 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/French.lproj/LineInspector.nib/info.nib =================================================================== --- trunk/French.lproj/LineInspector.nib/info.nib 2007-07-29 10:09:11 UTC (rev 2583) +++ trunk/French.lproj/LineInspector.nib/info.nib 2007-07-29 14:38:53 UTC (rev 2584) @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>IBDocumentLocation</key> - <string>79 78 356 240 0 0 1600 1178 </string> + <string>69 58 356 240 0 0 1440 938 </string> <key>IBFramework Version</key> <string>446.1</string> + <key>IBOpenObjects</key> + <array> + <integer>5</integer> + </array> <key>IBSystem Version</key> - <string>9A466</string> + <string>8R218</string> </dict> </plist> Modified: trunk/French.lproj/LineInspector.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Skim.xcodeproj/project.pbxproj =================================================================== --- trunk/Skim.xcodeproj/project.pbxproj 2007-07-29 10:09:11 UTC (rev 2583) +++ trunk/Skim.xcodeproj/project.pbxproj 2007-07-29 14:38:53 UTC (rev 2584) @@ -159,7 +159,6 @@ CEB735A20C4A8CD6000350F9 /* TransitionShading.tiff in Resources */ = {isa = PBXBuildFile; fileRef = CEB735A10C4A8CD6000350F9 /* TransitionShading.tiff */; }; CECDC4FF0C5966A80026AAEC /* NSImage_BDSKExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = CECDC4FD0C5966A80026AAEC /* NSImage_BDSKExtensions.m */; }; CECDD2990C5B68580026AAEC /* SKCenteredTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CECDD2970C5B68580026AAEC /* SKCenteredTextFieldCell.m */; }; - CECDDBAD0C5BB9600026AAEC /* SKFindTableView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECDDBAB0C5BB95F0026AAEC /* SKFindTableView.h */; }; CECDDBAE0C5BB9600026AAEC /* SKFindTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = CECDDBAC0C5BB95F0026AAEC /* SKFindTableView.m */; }; CEE106150BCBB72C00BF2D3E /* SKNotesDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE106140BCBB72C00BF2D3E /* SKNotesDocument.m */; }; CEE1065E0BCBBE1300BF2D3E /* NotesDocument.nib in Resources */ = {isa = PBXBuildFile; fileRef = CEE106580BCBBE1200BF2D3E /* NotesDocument.nib */; }; @@ -259,7 +258,6 @@ dstSubfolderSpec = 10; files = ( CE2BD8450BD4135600A5F4DB /* Sparkle.framework in CopyFiles */, - CECDDBAD0C5BB9600026AAEC /* SKFindTableView.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-29 10:09:13
|
Revision: 2583 http://skim-app.svn.sourceforge.net/skim-app/?rev=2583&view=rev Author: hofman Date: 2007-07-29 03:09:11 -0700 (Sun, 29 Jul 2007) Log Message: ----------- Hide hover window when closing left side pane. Modified Paths: -------------- trunk/SKMainWindowController.m Modified: trunk/SKMainWindowController.m =================================================================== --- trunk/SKMainWindowController.m 2007-07-29 09:38:47 UTC (rev 2582) +++ trunk/SKMainWindowController.m 2007-07-29 10:09:11 UTC (rev 2583) @@ -1775,6 +1775,7 @@ - (IBAction)toggleLeftSidePane:(id)sender { if ([self isFullScreen]) { + [[SKPDFHoverWindow sharedHoverWindow] hide]; if ([leftSideWindow state] == NSDrawerOpenState || [leftSideWindow state] == NSDrawerOpeningState) [leftSideWindow hideSideWindow]; else @@ -1788,7 +1789,9 @@ NSRect sideFrame = [leftSideContentBox frame]; NSRect pdfFrame = [pdfContentBox frame]; - if(NSWidth(sideFrame) > 0.0){ + if (NSWidth(sideFrame) > 0.0) { + if (leftSidePaneState == SKOutlineSidePaneState || [[searchField stringValue] length]) + [[SKPDFHoverWindow sharedHoverWindow] hide]; lastLeftSidePaneWidth = NSWidth(sideFrame); // cache this pdfFrame.size.width += lastLeftSidePaneWidth; sideFrame.size.width = 0.0; @@ -1820,7 +1823,7 @@ NSRect sideFrame = [rightSideContentBox frame]; NSRect pdfFrame = [pdfContentBox frame]; - if(NSWidth(sideFrame) > 1.0){ + if (NSWidth(sideFrame) > 1.0) { lastRightSidePaneWidth = NSWidth(sideFrame); // cache this pdfFrame.size.width += lastRightSidePaneWidth; sideFrame.size.width = 0.0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ho...@us...> - 2007-07-29 09:38:49
|
Revision: 2582 http://skim-app.svn.sourceforge.net/skim-app/?rev=2582&view=rev Author: hofman Date: 2007-07-29 02:38:47 -0700 (Sun, 29 Jul 2007) Log Message: ----------- Don't check delegate before removing trackingrects from tables, as it may not be valid anymore. Modified Paths: -------------- trunk/SKFindTableView.m trunk/SKOutlineView.m Modified: trunk/SKFindTableView.m =================================================================== --- trunk/SKFindTableView.m 2007-07-28 19:34:35 UTC (rev 2581) +++ trunk/SKFindTableView.m 2007-07-29 09:38:47 UTC (rev 2582) @@ -18,13 +18,12 @@ } - (void)removeTrackingRects { - if ([[self delegate] respondsToSelector:@selector(tableView:shouldTrackTableColumn:row:)] == NO) - return; - - CFIndex idx = CFArrayGetCount(trackingRects); - while(idx--) - [self removeTrackingRect:(NSTrackingRectTag)CFArrayGetValueAtIndex(trackingRects, idx)]; - CFArrayRemoveAllValues(trackingRects); + if (trackingRects) { + CFIndex idx = CFArrayGetCount(trackingRects); + while(idx--) + [self removeTrackingRect:(NSTrackingRectTag)CFArrayGetValueAtIndex(trackingRects, idx)]; + CFArrayRemoveAllValues(trackingRects); + } } - (void)rebuildTrackingRects { Modified: trunk/SKOutlineView.m =================================================================== --- trunk/SKOutlineView.m 2007-07-28 19:34:35 UTC (rev 2581) +++ trunk/SKOutlineView.m 2007-07-29 09:38:47 UTC (rev 2582) @@ -72,13 +72,12 @@ } - (void)removeTrackingRects { - if ([[self delegate] respondsToSelector:@selector(outlineView:shouldTrackTableColumn:item:)] == NO) - return; - - CFIndex idx = CFArrayGetCount(trackingRects); - while(idx--) - [self removeTrackingRect:(NSTrackingRectTag)CFArrayGetValueAtIndex(trackingRects, idx)]; - CFArrayRemoveAllValues(trackingRects); + if (trackingRects) { + CFIndex idx = CFArrayGetCount(trackingRects); + while(idx--) + [self removeTrackingRect:(NSTrackingRectTag)CFArrayGetValueAtIndex(trackingRects, idx)]; + CFArrayRemoveAllValues(trackingRects); + } } - (void)rebuildTrackingRects { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |