Revision: 3637
http://skim-app.svn.sourceforge.net/skim-app/?rev=3637&view=rev
Author: hofman
Date: 2008-04-05 12:17:02 -0700 (Sat, 05 Apr 2008)
Log Message:
-----------
Validate new menu items for display mode toolbar buttons. Add display mode
toolbar buttons to nib and to available toolbar items.
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Toolbar.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-04-05 17:31:59 UTC (rev 3636)
+++ trunk/SKMainWindowController.m 2008-04-05 19:17:02 UTC (rev 3637)
@@ -4719,6 +4719,19 @@
BOOL displayFacingPages = [pdfView displayMode] == kPDFDisplayTwoUp ||
[pdfView displayMode] == kPDFDisplayTwoUpContinuous;
[menuItem setState:displayFacingPages ? NSOnState : NSOffState];
return [self isPresentation] == NO;
+ } else if (action == @selector(changeDisplaySinglePages:)) {
+ BOOL displaySinglePages1 = [pdfView displayMode] ==
kPDFDisplaySinglePage || [pdfView displayMode] ==
kPDFDisplaySinglePageContinuous;
+ BOOL displaySinglePages2 = [menuItem tag] == kPDFDisplaySinglePage;
+ [menuItem setState:displaySinglePages1 == displaySinglePages2 ?
NSOnState : NSOffState];
+ return [self isPresentation] == NO;
+ } else if (action == @selector(changeDisplayContinuous:)) {
+ BOOL displayContinuous1 = [pdfView displayMode] ==
kPDFDisplaySinglePageContinuous || [pdfView displayMode] ==
kPDFDisplayTwoUpContinuous;
+ BOOL displayContinuous2 = [menuItem tag] ==
kPDFDisplaySinglePageContinuous;
+ [menuItem setState:displayContinuous1 == displayContinuous2 ?
NSOnState : NSOffState];
+ return [self isPresentation] == NO;
+ } else if (action == @selector(changeDisplayMode:)) {
+ [menuItem setState:[pdfView displayMode] == [menuItem tag] ? NSOnState
: NSOffState];
+ return [self isPresentation] == NO;
} else if (action == @selector(toggleDisplayContinuous:)) {
BOOL displayContinuous = [pdfView displayMode] ==
kPDFDisplaySinglePageContinuous || [pdfView displayMode] ==
kPDFDisplayTwoUpContinuous;
[menuItem setState:displayContinuous ? NSOnState : NSOffState];
Modified: trunk/SKMainWindowController_Toolbar.m
===================================================================
--- trunk/SKMainWindowController_Toolbar.m 2008-04-05 17:31:59 UTC (rev
3636)
+++ trunk/SKMainWindowController_Toolbar.m 2008-04-05 19:17:02 UTC (rev
3637)
@@ -74,7 +74,7 @@
static NSString *SKDocumentToolbarToolModeItemIdentifier =
@"SKDocumentToolbarToolModeItemIdentifier";
static NSString *SKDocumentToolbarSingleTwoUpItemIdentifier =
@"SKDocumentToolbarSingleTwoUpItemIdentifier";
static NSString *SKDocumentToolbarContinuousItemIdentifier =
@"SKDocumentToolbarContinuousItemIdentifier";
-static NSString *SKDocumentToolbarSingleTwoUpContinuousItemIdentifier =
@"SKDocumentToolbarSingleTwoUpContinuousItemIdentifier";
+static NSString *SKDocumentToolbarDisplayModeItemIdentifier =
@"SKDocumentToolbarDisplayModeItemIdentifier";
static NSString *SKDocumentToolbarDisplayBoxItemIdentifier =
@"SKDocumentToolbarDisplayBoxItemIdentifier";
static NSString *SKDocumentToolbarColorSwatchItemIdentifier =
@"SKDocumentToolbarColorSwatchItemIdentifier";
static NSString *SKDocumentToolbarColorsItemIdentifier =
@"SKDocumentToolbarColorsItemIdentifier";
@@ -699,13 +699,13 @@
[menuItem setTag:kPDFDisplaySinglePageContinuous];
menuItem = [[[NSMenuItem allocWithZone:[NSMenu menuZone]]
initWithTitle:NSLocalizedString(@"Display Mode", @"Toolbar item label")
action:NULL keyEquivalent:@""] autorelease];
[menuItem setSubmenu:menu];
- item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarSingleTwoUpContinuousItemIdentifier];
+ item = [[SKToolbarItem alloc]
initWithItemIdentifier:SKDocumentToolbarDisplayModeItemIdentifier];
[item setLabels:NSLocalizedString(@"Display Mode", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Display Mode", @"Tool tip message")];
[displayModeButton makeCapsule];
[item setViewWithSizes:displayModeButton];
[item setMenuFormRepresentation:menuItem];
- [toolbarItems setObject:item
forKey:SKDocumentToolbarSingleTwoUpContinuousItemIdentifier];
+ [toolbarItems setObject:item
forKey:SKDocumentToolbarDisplayModeItemIdentifier];
[item release];
menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@""]
autorelease];
@@ -875,22 +875,25 @@
SKDocumentToolbarZoomToFitItemIdentifier,
SKDocumentToolbarZoomToSelectionItemIdentifier,
SKDocumentToolbarScaleItemIdentifier,
+ SKDocumentToolbarSingleTwoUpItemIdentifier,
+ SKDocumentToolbarContinuousItemIdentifier,
+ SKDocumentToolbarDisplayModeItemIdentifier,
SKDocumentToolbarDisplayBoxItemIdentifier,
+ SKDocumentToolbarToolModeItemIdentifier,
SKDocumentToolbarRotateRightItemIdentifier,
SKDocumentToolbarRotateLeftItemIdentifier,
SKDocumentToolbarRotateLeftRightItemIdentifier,
SKDocumentToolbarCropItemIdentifier,
+ SKDocumentToolbarFullScreenItemIdentifier,
+ SKDocumentToolbarPresentationItemIdentifier,
+ SKDocumentToolbarContentsPaneItemIdentifier,
+ SKDocumentToolbarNotesPaneItemIdentifier,
SKDocumentToolbarColorSwatchItemIdentifier,
+ SKDocumentToolbarNewNoteItemIdentifier,
SKDocumentToolbarNewTextNoteItemIdentifier,
SKDocumentToolbarNewCircleNoteItemIdentifier,
SKDocumentToolbarNewMarkupItemIdentifier,
SKDocumentToolbarNewLineItemIdentifier,
- SKDocumentToolbarNewNoteItemIdentifier,
- SKDocumentToolbarToolModeItemIdentifier,
- SKDocumentToolbarFullScreenItemIdentifier,
- SKDocumentToolbarPresentationItemIdentifier,
- SKDocumentToolbarContentsPaneItemIdentifier,
- SKDocumentToolbarNotesPaneItemIdentifier,
SKDocumentToolbarInfoItemIdentifier,
SKDocumentToolbarColorsItemIdentifier,
SKDocumentToolbarFontsItemIdentifier,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
