Revision: 3119 http://skim-app.svn.sourceforge.net/skim-app/?rev=3119&view=rev Author: hofman Date: 2007-11-01 06:19:41 -0700 (Thu, 01 Nov 2007)
Log Message: ----------- Add alternate zoom toolbar items using segmented controls. Modified Paths: -------------- 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/English.lproj/MainWindow.nib/classes.nib trunk/English.lproj/MainWindow.nib/info.nib trunk/English.lproj/MainWindow.nib/keyedobjects.nib trunk/French.lproj/MainWindow.nib/classes.nib trunk/French.lproj/MainWindow.nib/info.nib trunk/French.lproj/MainWindow.nib/keyedobjects.nib 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/SKMainWindowController.h trunk/SKMainWindowController.m trunk/Spanish.lproj/MainWindow.nib/classes.nib trunk/Spanish.lproj/MainWindow.nib/info.nib trunk/Spanish.lproj/MainWindow.nib/keyedobjects.nib Modified: trunk/Dutch.lproj/MainWindow.nib/classes.nib =================================================================== --- trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/Dutch.lproj/MainWindow.nib/classes.nib 2007-11-01 13:19:41 UTC (rev 3119) @@ -106,6 +106,8 @@ togglePresentation = id; toggleRightSidePane = id; toggleStatusBar = id; + zoomInActualOut = id; + zoomInOut = id; }; CLASS = SKMainWindowController; LANGUAGE = ObjC; @@ -161,6 +163,8 @@ thumbnailView = NSView; tocView = NSView; toolModeButton = NSSegmentedControl; + zoomInActualOutButton = NSSegmentedControl; + zoomInOutButton = NSSegmentedControl; }; SUPERCLASS = NSWindowController; }, Modified: trunk/Dutch.lproj/MainWindow.nib/data.dependency =================================================================== --- trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/Dutch.lproj/MainWindow.nib/data.dependency 2007-11-01 13:19:41 UTC (rev 3119) @@ -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-11-01 11:12:17 UTC (rev 3118) +++ trunk/Dutch.lproj/MainWindow.nib/info.nib 2007-11-01 13:19:41 UTC (rev 3119) @@ -7,7 +7,7 @@ <key>IBEditorPositions</key> <dict> <key>168</key> - <string>592 474 255 299 0 0 1440 938 </string> + <string>592 463 255 327 0 0 1440 938 </string> <key>224</key> <string>610 420 220 442 0 0 1440 938 </string> <key>256</key> @@ -27,6 +27,10 @@ <string>446.1</string> <key>IBLockedObjects</key> <array/> + <key>IBOpenObjects</key> + <array> + <integer>168</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/classes.nib =================================================================== --- trunk/English.lproj/MainWindow.nib/classes.nib 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/English.lproj/MainWindow.nib/classes.nib 2007-11-01 13:19:41 UTC (rev 3119) @@ -106,6 +106,8 @@ togglePresentation = id; toggleRightSidePane = id; toggleStatusBar = id; + zoomInActualOut = id; + zoomInOut = id; }; CLASS = SKMainWindowController; LANGUAGE = ObjC; @@ -161,6 +163,8 @@ thumbnailView = NSView; tocView = NSView; toolModeButton = NSSegmentedControl; + zoomInActualOutButton = NSSegmentedControl; + zoomInOutButton = NSSegmentedControl; }; SUPERCLASS = NSWindowController; }, Modified: trunk/English.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/English.lproj/MainWindow.nib/info.nib 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/English.lproj/MainWindow.nib/info.nib 2007-11-01 13:19:41 UTC (rev 3119) @@ -7,7 +7,7 @@ <key>IBEditorPositions</key> <dict> <key>168</key> - <string>592 474 255 299 0 0 1440 938 </string> + <string>592 461 255 329 0 0 1440 938 </string> <key>224</key> <string>610 420 220 442 0 0 1440 938 </string> <key>256</key> @@ -29,15 +29,15 @@ <array/> <key>IBOpenObjects</key> <array> + <integer>511</integer> + <integer>694</integer> + <integer>502</integer> + <integer>224</integer> <integer>168</integer> - <integer>694</integer> <integer>5</integer> - <integer>314</integer> <integer>256</integer> - <integer>502</integer> - <integer>224</integer> - <integer>511</integer> <integer>687</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/MainWindow.nib/classes.nib =================================================================== --- trunk/French.lproj/MainWindow.nib/classes.nib 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/French.lproj/MainWindow.nib/classes.nib 2007-11-01 13:19:41 UTC (rev 3119) @@ -106,6 +106,8 @@ togglePresentation = id; toggleRightSidePane = id; toggleStatusBar = id; + zoomInActualOut = id; + zoomInOut = id; }; CLASS = SKMainWindowController; LANGUAGE = ObjC; @@ -161,6 +163,8 @@ thumbnailView = NSView; tocView = NSView; toolModeButton = NSSegmentedControl; + zoomInActualOutButton = NSSegmentedControl; + zoomInOutButton = NSSegmentedControl; }; SUPERCLASS = NSWindowController; }, Modified: trunk/French.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/French.lproj/MainWindow.nib/info.nib 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/French.lproj/MainWindow.nib/info.nib 2007-11-01 13:19:41 UTC (rev 3119) @@ -7,7 +7,7 @@ <key>IBEditorPositions</key> <dict> <key>168</key> - <string>592 472 255 301 0 0 1440 938 </string> + <string>592 462 255 329 0 0 1440 938 </string> <key>224</key> <string>690 581 220 442 0 0 1600 1178 </string> <key>256</key> @@ -29,9 +29,9 @@ <array/> <key>IBOpenObjects</key> <array> - <integer>168</integer> <integer>256</integer> <integer>314</integer> + <integer>168</integer> <integer>5</integer> <integer>502</integer> </array> Modified: trunk/French.lproj/MainWindow.nib/keyedobjects.nib =================================================================== (Binary files differ) Modified: trunk/Italian.lproj/MainWindow.nib/classes.nib =================================================================== --- trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/Italian.lproj/MainWindow.nib/classes.nib 2007-11-01 13:19:41 UTC (rev 3119) @@ -106,6 +106,8 @@ togglePresentation = id; toggleRightSidePane = id; toggleStatusBar = id; + zoomInActualOut = id; + zoomInOut = id; }; CLASS = SKMainWindowController; LANGUAGE = ObjC; @@ -161,6 +163,8 @@ thumbnailView = NSView; tocView = NSView; toolModeButton = NSSegmentedControl; + zoomInActualOutButton = NSSegmentedControl; + zoomInOutButton = NSSegmentedControl; }; SUPERCLASS = NSWindowController; }, Modified: trunk/Italian.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/Italian.lproj/MainWindow.nib/info.nib 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/Italian.lproj/MainWindow.nib/info.nib 2007-11-01 13:19:41 UTC (rev 3119) @@ -7,7 +7,7 @@ <key>IBEditorPositions</key> <dict> <key>168</key> - <string>592 471 255 303 0 0 1440 938 </string> + <string>592 461 255 331 0 0 1440 938 </string> <key>224</key> <string>610 420 220 442 0 0 1440 938 </string> <key>256</key> @@ -29,15 +29,15 @@ <array/> <key>IBOpenObjects</key> <array> + <integer>511</integer> + <integer>168</integer> + <integer>224</integer> <integer>314</integer> <integer>502</integer> + <integer>5</integer> + <integer>677</integer> <integer>256</integer> - <integer>511</integer> - <integer>168</integer> - <integer>224</integer> <integer>676</integer> - <integer>677</integer> - <integer>5</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-11-01 11:12:17 UTC (rev 3118) +++ trunk/NSImage_SKExtensions.m 2007-11-01 13:19:41 UTC (rev 3119) @@ -72,6 +72,9 @@ static NSImage *forwardAdornImage = nil; static NSImage *firstAdornImage = nil; static NSImage *lastAdornImage = nil; + static NSImage *zoomInAdornImage = nil; + static NSImage *zoomOutAdornImage = nil; + static NSImage *zoomActualAdornImage = nil; static NSImage *outlineViewAdornImage = nil; static NSImage *thumbnailViewAdornImage = nil; static NSImage *noteViewAdornImage = nil; @@ -170,6 +173,38 @@ [lastAdornImage unlockFocus]; [lastAdornImage setName:@"LastAdorn"]; + zoomInAdornImage = [[NSImage alloc] initWithSize:size]; + [zoomInAdornImage lockFocus]; + [shadow set]; + [[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill]; + path = [NSBezierPath bezierPath]; + [path appendBezierPathWithRect:NSMakeRect(8.0, 6.0, 11.0, 3.0)]; + [path appendBezierPathWithRect:NSMakeRect(12.0, 2.0, 3.0, 11.0)]; + [path fill]; + [zoomInAdornImage unlockFocus]; + [zoomInAdornImage setName:@"ZoomInAdorn"]; + + zoomOutAdornImage = [[NSImage alloc] initWithSize:size]; + [zoomOutAdornImage lockFocus]; + [shadow set]; + [[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill]; + path = [NSBezierPath bezierPath]; + [path appendBezierPathWithRect:NSMakeRect(6.0, 6.0, 11.0, 3.0)]; + [path fill]; + [zoomOutAdornImage unlockFocus]; + [zoomOutAdornImage setName:@"ZoomOutAdorn"]; + + zoomActualAdornImage = [[NSImage alloc] initWithSize:size]; + [zoomActualAdornImage lockFocus]; + [shadow set]; + [[NSColor colorWithCalibratedWhite:0.1 alpha:1.0] setFill]; + path = [NSBezierPath bezierPath]; + [path appendBezierPathWithRect:NSMakeRect(7.0, 4.0, 11.0, 3.0)]; + [path appendBezierPathWithRect:NSMakeRect(7.0, 8.0, 11.0, 3.0)]; + [path fill]; + [zoomActualAdornImage unlockFocus]; + [zoomActualAdornImage setName:@"ZoomActualAdorn"]; + outlineViewAdornImage = [[NSImage alloc] initWithSize:size]; [outlineViewAdornImage lockFocus]; [shadow set]; Modified: trunk/SKMainWindowController.h =================================================================== --- trunk/SKMainWindowController.h 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/SKMainWindowController.h 2007-11-01 13:19:41 UTC (rev 3119) @@ -152,6 +152,8 @@ IBOutlet NSSegmentedControl *previousPageButton; IBOutlet NSSegmentedControl *nextPageButton; IBOutlet NSTextField *pageNumberButtonsField; + IBOutlet NSSegmentedControl *zoomInOutButton; + IBOutlet NSSegmentedControl *zoomInActualOutButton; IBOutlet NSSegmentedControl *toolModeButton; IBOutlet NSTextField *scaleField; IBOutlet NSPopUpButton *displayBoxPopUpButton; @@ -227,6 +229,8 @@ - (IBAction)doZoomToActualSize:(id)sender; - (IBAction)doZoomToFit:(id)sender; - (IBAction)doZoomToSelection:(id)sender; +- (IBAction)zoomInOut:(id)sender; +- (IBAction)zoomInActualOut:(id)sender; - (IBAction)doAutoScale:(id)sender; - (IBAction)toggleAutoScale:(id)sender; - (IBAction)toggleAutoActualSize:(id)sender; Modified: trunk/SKMainWindowController.m =================================================================== --- trunk/SKMainWindowController.m 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/SKMainWindowController.m 2007-11-01 13:19:41 UTC (rev 3119) @@ -117,6 +117,8 @@ static NSString *SKDocumentToolbarZoomActualItemIdentifier = @"SKDocumentZoomActualToolbarItemIdentifier"; static NSString *SKDocumentToolbarZoomToSelectionItemIdentifier = @"SKDocumentToolbarZoomToSelectionItemIdentifier"; static NSString *SKDocumentToolbarZoomToFitItemIdentifier = @"SKDocumentToolbarZoomToFitItemIdentifier"; +static NSString *SKDocumentToolbarZoomInOutItemIdentifier = @"SKDocumentToolbarZoomInOutItemIdentifier"; +static NSString *SKDocumentToolbarZoomInActualOutItemIdentifier = @"SKDocumentToolbarZoomInActualOutItemIdentifier"; static NSString *SKDocumentToolbarRotateRightItemIdentifier = @"SKDocumentRotateRightToolbarItemIdentifier"; static NSString *SKDocumentToolbarRotateLeftItemIdentifier = @"SKDocumentRotateLeftToolbarItemIdentifier"; static NSString *SKDocumentToolbarCropItemIdentifier = @"SKDocumentToolbarCropItemIdentifier"; @@ -1524,6 +1526,22 @@ [pdfView setAutoScales:NO]; } +- (IBAction)zoomInOut:(id)sender { + if ([sender selectedSegment] == 0) + [pdfView zoomOut:sender]; + else + [pdfView zoomIn:sender]; +} + +- (IBAction)zoomInActualOut:(id)sender { + if ([sender selectedSegment] == 0) + [pdfView zoomOut:sender]; + else if ([sender selectedSegment] == 1) + [pdfView setScaleFactor:1.0]; + else + [pdfView zoomIn:sender]; +} + - (IBAction)doAutoScale:(id)sender { [pdfView setAutoScales:YES]; } @@ -2912,6 +2930,12 @@ - (void)handleScaleChangedNotification:(NSNotification *)notification { [scaleField setFloatValue:[pdfView scaleFactor] * 100.0]; + + [zoomInOutButton setEnabled:[pdfView canZoomOut] forSegment:0]; + [zoomInOutButton setEnabled:[pdfView canZoomIn] forSegment:1]; + [zoomInActualOutButton setEnabled:[pdfView canZoomOut] forSegment:0]; + [zoomInActualOutButton setEnabled:fabsf([pdfView scaleFactor] - 1.0 ) > 0.01 forSegment:1]; + [zoomInActualOutButton setEnabled:[pdfView canZoomIn] forSegment:2]; } - (void)handleToolModeChangedNotification:(NSNotification *)notification { @@ -4341,6 +4365,49 @@ [toolbarItems setObject:item forKey:SKDocumentToolbarZoomToFitItemIdentifier]; [item release]; + menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""] autorelease]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Zoom In", @"Menu item title") action:@selector(doZoomIn:) keyEquivalent:@""]; + [menuItem setTarget:self]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Zoom Out", @"Menu item title") action:@selector(doZoomOut:) keyEquivalent:@""]; + [menuItem setTarget:self]; + menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Zoom", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease]; + [menuItem setSubmenu:menu]; + item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarZoomInOutItemIdentifier]; + [item setLabels:NSLocalizedString(@"Zoom", @"Toolbar item label")]; + [item setToolTip:NSLocalizedString(@"Zoom", @"Tool tip message")]; + [[zoomInOutButton cell] setToolTip:NSLocalizedString(@"Zoom Out", @"Tool tip message") forSegment:0]; + [[zoomInOutButton cell] setToolTip:NSLocalizedString(@"Zoom In", @"Tool tip message") forSegment:1]; + frame = [zoomInOutButton frame]; + frame.size.height = SEGMENTED_CONTROL_HEIGHT; + [zoomInOutButton setFrame:frame]; + [item setViewWithSizes:zoomInOutButton]; + [item setMenuFormRepresentation:menuItem]; + [toolbarItems setObject:item forKey:SKDocumentToolbarZoomInOutItemIdentifier]; + [item release]; + + menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""] autorelease]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Zoom In", @"Menu item title") action:@selector(doZoomIn:) keyEquivalent:@""]; + [menuItem setTarget:self]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Zoom Out", @"Menu item title") action:@selector(doZoomOut:) keyEquivalent:@""]; + [menuItem setTarget:self]; + menuItem = [menu addItemWithTitle:NSLocalizedString(@"Actual Size", @"Menu item title") action:@selector(doZoomToActualSize:) keyEquivalent:@""]; + [menuItem setTarget:self]; + menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:NSLocalizedString(@"Zoom", @"Toolbar item label") action:NULL keyEquivalent:@""] autorelease]; + [menuItem setSubmenu:menu]; + item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarZoomInActualOutItemIdentifier]; + [item setLabels:NSLocalizedString(@"Zoom", @"Toolbar item label")]; + [item setToolTip:NSLocalizedString(@"Zoom", @"Tool tip message")]; + [[zoomInActualOutButton cell] setToolTip:NSLocalizedString(@"Zoom Out", @"Tool tip message") forSegment:0]; + [[zoomInActualOutButton cell] setToolTip:NSLocalizedString(@"Zoom To Actual Size", @"Tool tip message") forSegment:1]; + [[zoomInActualOutButton cell] setToolTip:NSLocalizedString(@"Zoom In", @"Tool tip message") forSegment:2]; + frame = [zoomInActualOutButton frame]; + frame.size.height = SEGMENTED_CONTROL_HEIGHT; + [zoomInActualOutButton setFrame:frame]; + [item setViewWithSizes:zoomInActualOutButton]; + [item setMenuFormRepresentation:menuItem]; + [toolbarItems setObject:item forKey:SKDocumentToolbarZoomInActualOutItemIdentifier]; + [item release]; + item = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarRotateRightItemIdentifier]; [item setLabels:NSLocalizedString(@"Rotate Right", @"Toolbar item label")]; [item setToolTip:NSLocalizedString(@"Rotate Right", @"Tool tip message")]; @@ -4771,6 +4838,8 @@ SKDocumentToolbarZoomActualItemIdentifier, SKDocumentToolbarZoomToSelectionItemIdentifier, SKDocumentToolbarZoomToFitItemIdentifier, + SKDocumentToolbarZoomInOutItemIdentifier, + SKDocumentToolbarZoomInActualOutItemIdentifier, SKDocumentToolbarRotateRightItemIdentifier, SKDocumentToolbarRotateLeftItemIdentifier, SKDocumentToolbarCropItemIdentifier, Modified: trunk/Spanish.lproj/MainWindow.nib/classes.nib =================================================================== --- trunk/Spanish.lproj/MainWindow.nib/classes.nib 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/Spanish.lproj/MainWindow.nib/classes.nib 2007-11-01 13:19:41 UTC (rev 3119) @@ -106,6 +106,8 @@ togglePresentation = id; toggleRightSidePane = id; toggleStatusBar = id; + zoomInActualOut = id; + zoomInOut = id; }; CLASS = SKMainWindowController; LANGUAGE = ObjC; @@ -161,6 +163,8 @@ thumbnailView = NSView; tocView = NSView; toolModeButton = NSSegmentedControl; + zoomInActualOutButton = NSSegmentedControl; + zoomInOutButton = NSSegmentedControl; }; SUPERCLASS = NSWindowController; }, Modified: trunk/Spanish.lproj/MainWindow.nib/info.nib =================================================================== --- trunk/Spanish.lproj/MainWindow.nib/info.nib 2007-11-01 11:12:17 UTC (rev 3118) +++ trunk/Spanish.lproj/MainWindow.nib/info.nib 2007-11-01 13:19:41 UTC (rev 3119) @@ -7,7 +7,7 @@ <key>IBEditorPositions</key> <dict> <key>168</key> - <string>592 472 255 301 0 0 1440 938 </string> + <string>592 462 255 329 0 0 1440 938 </string> <key>224</key> <string>610 420 220 442 0 0 1440 938 </string> <key>256</key> @@ -29,12 +29,12 @@ <array/> <key>IBOpenObjects</key> <array> + <integer>687</integer> + <integer>502</integer> <integer>224</integer> - <integer>687</integer> + <integer>511</integer> <integer>168</integer> <integer>5</integer> - <integer>511</integer> - <integer>502</integer> </array> <key>IBSystem Version</key> <string>8R218</string> Modified: trunk/Spanish.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. ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Skim-app-commit mailing list Skim-app-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/skim-app-commit