Revision: 6630
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6630&view=rev
Author:   hofman
Date:     2010-07-17 21:01:54 +0000 (Sat, 17 Jul 2010)

Log Message:
-----------
replace fullscreen and presentation flags by a single interactionMode property

Modified Paths:
--------------
    trunk/SKApplicationController.m
    trunk/SKFullScreenWindow.m
    trunk/SKMainToolbarController.m
    trunk/SKMainWindowController.h
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_Actions.m
    trunk/SKMainWindowController_UI.m
    trunk/SKPDFView.h
    trunk/SKSideWindow.m

Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m     2010-07-17 17:34:07 UTC (rev 6629)
+++ trunk/SKApplicationController.m     2010-07-17 21:01:54 UTC (rev 6630)
@@ -161,10 +161,10 @@
     id doc = [[[aNotification object] windowController] document];
     SKMainWindowController *mwc = [doc 
respondsToSelector:@selector(mainWindowController)] ? [doc 
mainWindowController] : nil;
     if ([[[mwc window] screen] isEqual:[[NSScreen screens] objectAtIndex:0]]) {
-        if ([mwc isPresentation]) {
+        if ([mwc interactionMode] == SKPresentationMode) {
             mode = kUIModeAllHidden;
             options = kUIOptionDisableProcessSwitch;
-        } else if ([mwc isFullScreen]) {
+        } else if ([mwc interactionMode] == SKFullScreenMode) {
             mode = kUIModeAllHidden;
             options = kUIOptionAutoShowMenuBar;
         }

Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m  2010-07-17 17:34:07 UTC (rev 6629)
+++ trunk/SKFullScreenWindow.m  2010-07-17 21:01:54 UTC (rev 6630)
@@ -82,7 +82,7 @@
 - (void)sendEvent:(NSEvent *)theEvent {
     if (canBecomeMain && ([theEvent type] == NSLeftMouseDown || [theEvent 
type] == NSRightMouseDown)) {
         SKMainWindowController *wc = (SKMainWindowController *)[self 
windowController];
-        if ([wc isPresentation] && ([theEvent type] == NSRightMouseDown || 
([theEvent modifierFlags] & NSControlKeyMask))) {
+        if ([wc interactionMode] == SKPresentationMode && ([theEvent type] == 
NSRightMouseDown || ([theEvent modifierFlags] & NSControlKeyMask))) {
             [wc doGoToPreviousPage:self];
             return;
         }

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m     2010-07-17 17:34:07 UTC (rev 6629)
+++ trunk/SKMainToolbarController.m     2010-07-17 21:01:54 UTC (rev 6630)
@@ -793,13 +793,13 @@
     SEL action = [menuItem action];
     if (action == @selector(createNewTextNote:)) {
         [menuItem setState:[textNoteButton tagForSegment:0] == [menuItem tag] 
? NSOnState : NSOffState];
-        return [mainController isPresentation] == NO && 
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView 
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
+        return [mainController interactionMode] != SKPresentationMode && 
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView 
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
     } else if (action == @selector(createNewCircleNote:)) {
         [menuItem setState:[circleNoteButton tagForSegment:0] == [menuItem 
tag] ? NSOnState : NSOffState];
-        return [mainController isPresentation] == NO && 
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView 
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
+        return [mainController interactionMode] != SKPresentationMode && 
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView 
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO;
     } else if (action == @selector(createNewMarkupNote:)) {
         [menuItem setState:[markupNoteButton tagForSegment:0] == [menuItem 
tag] ? NSOnState : NSOffState];
-        return [mainController isPresentation] == NO && 
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView 
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO && 
[[mainController.pdfView currentSelection] hasCharacters];
+        return [mainController interactionMode] != SKPresentationMode && 
([mainController.pdfView toolMode] == SKTextToolMode || [mainController.pdfView 
toolMode] == SKNoteToolMode) && [mainController.pdfView hideNotes] == NO && 
[[mainController.pdfView currentSelection] hasCharacters];
     }
     return YES;
 }

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2010-07-17 17:34:07 UTC (rev 6629)
+++ trunk/SKMainWindowController.h      2010-07-17 21:01:54 UTC (rev 6630)
@@ -60,6 +60,13 @@
 typedef NSInteger SKFindPaneState;
 
 enum {
+    SKNormalMode,
+    SKFullScreenMode,
+    SKPresentationMode
+};
+typedef NSInteger SKInteractionMode;
+
+enum {
     SKDefaultWindowOption,
     SKMaximizeWindowOption,
     SKFitWindowOption
@@ -117,6 +124,8 @@
     SKSideWindow                        *rightSideWindow;
     NSMutableArray                      *blankingWindows;
     
+    SKInteractionMode                   interactionMode;
+    
     SKProgressController                *progressController;
     
     SKPresentationOptionsSheetController *presentationSheetController;
@@ -170,7 +179,6 @@
         unsigned int updatingFontAttributes:1;
         unsigned int updatingLine:1;
         unsigned int settingUpWindow:1;
-        unsigned int isPresentation:1;
         unsigned int usesDrawers:1;
         unsigned int isEditingPDF:1;
         unsigned int isEditingTable:1;
@@ -256,8 +264,10 @@
 @property (nonatomic) NSUInteger pageNumber;
 @property (nonatomic, copy) NSString *pageLabel;
 
-...@property (nonatomic, readonly) BOOL isFullScreen, isPresentation, 
autoScales;
+...@property (nonatomic, readonly) SKInteractionMode interactionMode;
 
+...@property (nonatomic, readonly) BOOL autoScales;
+
 @property (nonatomic) SKLeftSidePaneState leftSidePaneState;
 @property (nonatomic) SKRightSidePaneState rightSidePaneState;
 @property (nonatomic) SKFindPaneState findPaneState;

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2010-07-17 17:34:07 UTC (rev 6629)
+++ trunk/SKMainWindowController.m      2010-07-17 21:01:54 UTC (rev 6630)
@@ -193,8 +193,8 @@
 
 @implementation SKMainWindowController
 
-...@synthesize mainWindow, splitView, centerContentView, pdfSplitView, 
pdfContentView, pdfView, leftSideController, rightSideController, 
toolbarController, leftSideContentView, rightSideContentView, 
progressController, presentationNotesDocument, tags, rating, pageNumber, 
pageLabel;
-...@dynamic pdfDocument, presentationOptions, selectedNotes, isPresentation, 
isFullScreen, autoScales, leftSidePaneState, rightSidePaneState, findPaneState, 
leftSidePaneIsOpen, rightSidePaneIsOpen;
+...@synthesize mainWindow, splitView, centerContentView, pdfSplitView, 
pdfContentView, pdfView, leftSideController, rightSideController, 
toolbarController, leftSideContentView, rightSideContentView, 
progressController, presentationNotesDocument, tags, rating, pageNumber, 
pageLabel, interactionMode;
+...@dynamic pdfDocument, presentationOptions, selectedNotes, autoScales, 
leftSidePaneState, rightSidePaneState, findPaneState, leftSidePaneIsOpen, 
rightSidePaneIsOpen;
 
 + (void)initialize {
     SKINITIALIZE;
@@ -211,7 +211,7 @@
 
 - (id)init {
     if (self = [super initWithWindowNibName:@"MainWindow"]) {
-        mwcFlags.isPresentation = 0;
+        interactionMode = SKNormalMode;
         searchResults = [[NSMutableArray alloc] init];
         mwcFlags.findPanelFind = 0;
         mwcFlags.caseInsensitiveSearch = 1;
@@ -519,10 +519,10 @@
         if ([snapshotSetups count])
             [self showSnapshotsWithSetups:snapshotSetups];
         
-        if ([self isFullScreen] || [self isPresentation])
-            [savedNormalSetup addEntriesFromDictionary:setup];
-        else
+        if ([self interactionMode] == SKNormalMode)
             [self applyPDFSettings:setup];
+        else
+            [savedNormalSetup addEntriesFromDictionary:setup];
     }
 }
 
@@ -535,11 +535,11 @@
     [setup setObject:[NSNumber numberWithUnsignedInteger:[[pdfView 
currentPage] pageIndex]] forKey:PAGEINDEX_KEY];
     if ([snapshots count])
         [setup setObject:[snapshots valueForKey:SKSnapshotCurrentSetupKey] 
forKey:SNAPSHOTS_KEY];
-    if ([self isFullScreen] || [self isPresentation]) {
+    if ([self interactionMode] == SKNormalMode) {
+        [setup addEntriesFromDictionary:[self currentPDFSettings]];
+    } else {
         [setup addEntriesFromDictionary:savedNormalSetup];
         [setup removeObjectsForKeys:[NSArray 
arrayWithObjects:HASHORIZONTALSCROLLER_KEY, HASVERTICALSCROLLER_KEY, 
AUTOHIDESSCROLLERS_KEY, nil]];
-    } else {
-        [setup addEntriesFromDictionary:[self currentPDFSettings]];
     }
     
     return setup;
@@ -564,7 +564,7 @@
 - (NSDictionary *)currentPDFSettings {
     NSMutableDictionary *setup = [NSMutableDictionary dictionary];
     
-    if ([self isPresentation]) {
+    if ([self interactionMode] == SKPresentationMode) {
         [setup setDictionary:savedNormalSetup];
         [setup removeObjectsForKeys:[NSArray 
arrayWithObjects:HASHORIZONTALSCROLLER_KEY, HASVERTICALSCROLLER_KEY, 
AUTOHIDESSCROLLERS_KEY, nil]];
     } else {
@@ -884,14 +884,6 @@
     return YES;
 }
 
-- (BOOL)isFullScreen {
-    return [self isWindowLoaded] && [self window] != mainWindow && 
mwcFlags.isPresentation == 0;
-}
-
-- (BOOL)isPresentation {
-    return mwcFlags.isPresentation;
-}
-
 - (BOOL)autoScales {
     return [pdfView autoScales];
 }
@@ -952,9 +944,9 @@
 
 - (BOOL)leftSidePaneIsOpen {
     NSInteger state;
-    if ([self isFullScreen])
+    if ([self interactionMode] == SKFullScreenMode)
         state = [leftSideWindow state];
-    else if ([self isPresentation])
+    else if ([self interactionMode] == SKPresentationMode)
         state = [leftSideWindow isVisible];
     else if (mwcFlags.usesDrawers)
         state = [leftSideDrawer state];
@@ -965,9 +957,9 @@
 
 - (BOOL)rightSidePaneIsOpen {
     NSInteger state;
-    if ([self isFullScreen])
+    if ([self interactionMode] == SKFullScreenMode)
         state = [rightSideWindow state];
-    else if ([self isPresentation])
+    else if ([self interactionMode] == SKPresentationMode)
         state = [rightSideWindow isVisible];
     else if (mwcFlags.usesDrawers)
         state = [rightSideDrawer state];
@@ -1216,7 +1208,7 @@
         [[leftSideController.view window] makeFirstResponder:nil];
     [leftSideWindow setMainView:leftSideController.view];
     
-    if ([self isPresentation]) {
+    if ([self interactionMode] == SKPresentationMode) {
         mwcFlags.savedLeftSidePaneState = [self leftSidePaneState];
         [self setLeftSidePaneState:SKThumbnailSidePaneState];
         [leftSideWindow setAlphaValue:PRESENTATION_SIDE_WINDOW_ALPHA];
@@ -1238,7 +1230,7 @@
         [[rightSideController.view window] makeFirstResponder:nil];
     [rightSideWindow setMainView:rightSideController.view];
     
-    if ([self isPresentation]) {
+    if ([self interactionMode] == SKPresentationMode) {
         [rightSideWindow setAlphaValue:PRESENTATION_SIDE_WINDOW_ALPHA];
         [rightSideWindow setEnabled:NO];
         [rightSideWindow attachToWindow:[self window] onScreen:screen];
@@ -1302,18 +1294,18 @@
 
 - (void)goFullScreen {
     NSScreen *screen = [[self window] screen] ?: [NSScreen mainScreen]; // @@ 
screen: or should we use the main screen?
-    NSColor *backgroundColor = [self isPresentation] ? [NSColor blackColor] : 
[[NSUserDefaults standardUserDefaults] 
colorForKey:SKFullScreenBackgroundColorKey];
-    NSInteger level = [self isPresentation] && [[NSUserDefaults 
standardUserDefaults] boolForKey:SKUseNormalLevelForPresentationKey] == NO ? 
NSPopUpMenuWindowLevel : NSNormalWindowLevel;
+    NSColor *backgroundColor = [self interactionMode] == SKPresentationMode ? 
[NSColor blackColor] : [[NSUserDefaults standardUserDefaults] 
colorForKey:SKFullScreenBackgroundColorKey];
+    NSInteger level = [self interactionMode] == SKPresentationMode && 
[[NSUserDefaults standardUserDefaults] 
boolForKey:SKUseNormalLevelForPresentationKey] == NO ? NSPopUpMenuWindowLevel : 
NSNormalWindowLevel;
     
     // create a new full screen window
     SKFullScreenWindow *fullScreenWindow = [[[SKFullScreenWindow alloc] 
initWithScreen:screen] autorelease];
     
     if ([[mainWindow firstResponder] isDescendantOf:pdfView])
         [mainWindow makeFirstResponder:nil];
-    [fullScreenWindow setMainView:([self isPresentation] ? (id)pdfView : 
(id)pdfSplitView)];
+    [fullScreenWindow setMainView:([self interactionMode] == 
SKPresentationMode ? (id)pdfView : (id)pdfSplitView)];
     [fullScreenWindow setBackgroundColor:backgroundColor];
     [fullScreenWindow setLevel:level];
-    [pdfView setBackgroundColor:[self isPresentation] ? [NSColor clearColor] : 
backgroundColor];
+    [pdfView setBackgroundColor:[self interactionMode] == SKPresentationMode ? 
[NSColor clearColor] : backgroundColor];
     [secondaryPdfView setBackgroundColor:backgroundColor];
     [pdfView layoutDocumentView];
     [pdfView setNeedsDisplay:YES];
@@ -1323,7 +1315,7 @@
             [(id)wc setForceOnTop:YES];
     }
         
-    if (NO == [self isPresentation] && [[NSUserDefaults standardUserDefaults] 
boolForKey:SKBlankAllScreensInFullScreenKey] && [[NSScreen screens] count] > 1) 
{
+    if (NO == [self interactionMode] == SKPresentationMode && [[NSUserDefaults 
standardUserDefaults] boolForKey:SKBlankAllScreensInFullScreenKey] && 
[[NSScreen screens] count] > 1) {
         if (nil == blankingWindows)
             blankingWindows = [[NSMutableArray alloc] init];
         [blankingWindows removeAllObjects];
@@ -1362,7 +1354,7 @@
 
 - (void)enterPresentationMode {
     NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
-    if ([self isFullScreen] == NO)
+    if ([self interactionMode] == SKNormalMode)
         [self saveNormalSetup];
     // Set up presentation mode
     [pdfView setAutoScales:YES];
@@ -1390,8 +1382,6 @@
     // prevent sleep
     if (activityAssertionID == kIOPMNullAssertionID && kIOReturnSuccess != 
IOPMAssertionCreate(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, 
&activityAssertionID))
         activityAssertionID = kIOPMNullAssertionID;
-    
-    mwcFlags.isPresentation = 1;
 }
 
 - (void)exitPresentationMode {
@@ -1405,21 +1395,23 @@
     [scrollView setAutohidesScrollers:[[savedNormalSetup 
objectForKey:AUTOHIDESSCROLLERS_KEY] boolValue]];
     
     [self hideLeftSideWindow];
-    
-    mwcFlags.isPresentation = 0;
 }
 
 - (IBAction)enterFullScreen:(id)sender {
-    if ([self isFullScreen])
+    if ([self interactionMode] == SKFullScreenMode)
         return;
     
+    BOOL wasPresentation = [self interactionMode] == SKPresentationMode;
+    
     NSScreen *screen = [[self window] screen] ?: [NSScreen mainScreen]; // @@ 
screen: or should we use the main screen?
     if ([screen isEqual:[[NSScreen screens] objectAtIndex:0]])
         SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
-    else if ([self isPresentation])
+    else if (wasPresentation)
         SetSystemUIMode(kUIModeNormal, 0);
     
-    if ([self isPresentation]) {
+    interactionMode = SKFullScreenMode;
+    
+    if (wasPresentation) {
         [self exitPresentationMode];
         [pdfView setFrame:[pdfContentView bounds]];
         [pdfContentView addSubview:pdfView];
@@ -1444,10 +1436,10 @@
 }
 
 - (IBAction)enterPresentation:(id)sender {
-    if ([self isPresentation])
+    if ([self interactionMode] == SKPresentationMode)
         return;
     
-    BOOL wasFullScreen = [self isFullScreen];
+    BOOL wasFullScreen = [self interactionMode] == SKFullScreenMode;
     
     [self enterPresentationMode];
     
@@ -1457,6 +1449,8 @@
     else
         SetSystemUIMode(kUIModeNormal, 0);
     
+    interactionMode = SKPresentationMode;
+    
     if (wasFullScreen) {
         [pdfSplitView setFrame:[centerContentView bounds]];
         [centerContentView addSubview:pdfSplitView];
@@ -1470,10 +1464,10 @@
 }
 
 - (IBAction)exitFullScreen:(id)sender {
-    if ([self isFullScreen] == NO && [self isPresentation] == NO)
+    if ([self interactionMode] == SKNormalMode)
         return;
     
-    if ([self isFullScreen])
+    if ([self interactionMode] == SKFullScreenMode)
         [self hideSideWindows];
     
     if ([[[self window] firstResponder] isDescendantOf:pdfView])
@@ -1497,7 +1491,7 @@
     [fadeWindow release];
     
     // this should be done before exitPresentationMode to get a smooth 
transition
-    if ([self isFullScreen]) {
+    if ([self interactionMode] == SKFullScreenMode) {
         [pdfSplitView setFrame:[centerContentView bounds]];
         [centerContentView addSubview:pdfSplitView];
     } else {
@@ -1508,7 +1502,7 @@
     [secondaryPdfView setBackgroundColor:[[NSUserDefaults 
standardUserDefaults] colorForKey:SKBackgroundColorKey]];
     [pdfView layoutDocumentView];
     
-    if ([self isPresentation])
+    if ([self interactionMode] == SKPresentationMode)
         [self exitPresentationMode];
     else
         [self applyPDFSettings:savedNormalSetup];
@@ -1522,6 +1516,8 @@
     
     SetSystemUIMode(kUIModeNormal, 0);
     
+    interactionMode = SKNormalMode;
+    
     [self setWindow:mainWindow];
     // trick to make sure the main window shows up in the same space as the 
fullscreen window
     [fullScreenWindow addChildWindow:mainWindow ordered:NSWindowBelow];
@@ -1971,7 +1967,7 @@
                    rect:rect
                autoFits:autoFits];
     
-    [swc setForceOnTop:[self isFullScreen] || [self isPresentation]];
+    [swc setForceOnTop:[self interactionMode] != SKNormalMode];
     [[swc window] setHidesOnDeactivate:snapshotsOnTop];
     
     [[self document] addWindowController:swc];
@@ -1990,7 +1986,7 @@
         
         [swc setPdfDocument:[pdfView document] setup:setup];
         
-        [swc setForceOnTop:[self isFullScreen] || [self isPresentation]];
+        [swc setForceOnTop:[self interactionMode] != SKNormalMode];
         [[swc window] setHidesOnDeactivate:snapshotsOnTop];
         
         [[self document] addWindowController:swc];
@@ -2038,10 +2034,10 @@
 }
 
 - 
(NSRect)snapshotControllerTargetRectForMiniaturize:(SKSnapshotWindowController 
*)controller {
-    if ([self isPresentation] == NO) {
-        if ([self isFullScreen] == NO && [self rightSidePaneIsOpen] == NO) {
+    if ([self interactionMode] != SKPresentationMode) {
+        if ([self interactionMode] == SKNormalMode && [self 
rightSidePaneIsOpen] == NO) {
             [self toggleRightSidePane:self];
-        } else if ([self isFullScreen] && ([rightSideWindow state] == 
NSDrawerClosedState || [rightSideWindow state] == NSDrawerClosingState)) {
+        } else if ([self interactionMode] == SKFullScreenMode && 
([rightSideWindow state] == NSDrawerClosedState || [rightSideWindow state] == 
NSDrawerClosingState)) {
             [rightSideWindow expand];
             [NSTimer scheduledTimerWithTimeInterval:1.0 target:self 
selector:@selector(hideRightSideWindow:) userInfo:NULL repeats:NO];
         }
@@ -2064,7 +2060,7 @@
     }
     if (wc == nil) {
         wc = [[SKNoteWindowController alloc] initWithNote:annotation];
-        [(SKNoteWindowController *)wc setForceOnTop:[self isFullScreen] || 
[self isPresentation]];
+        [(SKNoteWindowController *)wc setForceOnTop:[self interactionMode] != 
SKNormalMode];
         [[self document] addWindowController:wc];
         [wc release];
     }
@@ -2139,12 +2135,12 @@
         // A default value that we are observing has changed
         NSString *key = [keyPath substringFromIndex:7];
         if ([key isEqualToString:SKBackgroundColorKey]) {
-            if ([self isFullScreen] == NO && [self isPresentation] == NO) {
+            if ([self interactionMode] == SKNormalMode) {
                 [pdfView setBackgroundColor:[[NSUserDefaults 
standardUserDefaults] colorForKey:SKBackgroundColorKey]];
                 [secondaryPdfView setBackgroundColor:[[NSUserDefaults 
standardUserDefaults] colorForKey:SKBackgroundColorKey]];
             }
         } else if ([key isEqualToString:SKFullScreenBackgroundColorKey]) {
-            if ([self isFullScreen]) {
+            if ([self interactionMode] == SKFullScreenMode) {
                 NSColor *color = [[NSUserDefaults standardUserDefaults] 
colorForKey:SKFullScreenBackgroundColorKey];
                 if (color) {
                     [pdfView setBackgroundColor:color];
@@ -2556,7 +2552,7 @@
         case kRemoteButtonPlus:
             if (remoteScrolling)
                 [[[self pdfView] documentView] scrollLineUp];
-            else if ([self isPresentation])
+            else if ([self interactionMode] == SKPresentationMode)
                 [self doAutoScale:nil];
             else
                 [self doZoomIn:nil];
@@ -2564,7 +2560,7 @@
         case kRemoteButtonMinus:
             if (remoteScrolling)
                 [[[self pdfView] documentView] scrollLineDown];
-            else if ([self isPresentation])
+            else if ([self interactionMode] == SKPresentationMode)
                 [self doZoomToActualSize:nil];
             else
                 [self doZoomOut:nil];

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m      2010-07-17 17:34:07 UTC (rev 
6629)
+++ trunk/SKMainWindowController_Actions.m      2010-07-17 21:01:54 UTC (rev 
6630)
@@ -426,7 +426,7 @@
 }
 
 - (IBAction)toggleAutoScale:(id)sender {
-    if ([self isPresentation])
+    if ([self interactionMode] == SKPresentationMode)
         [pdfView toggleAutoActualSize:sender];
     else
         [pdfView setAutoScales:[pdfView autoScales] == NO];
@@ -716,7 +716,7 @@
 
 - (IBAction)searchPDF:(id)sender {
     BOOL selectImmediate = YES;
-    if ([self isFullScreen]) {
+    if ([self interactionMode] == SKFullScreenMode) {
         if ([leftSideWindow state] == NSDrawerClosedState || [leftSideWindow 
state] == NSDrawerClosingState)
             [leftSideWindow expand];
     } else if ([self leftSidePaneIsOpen] == NO) {
@@ -731,7 +731,7 @@
 }
 
 - (IBAction)performFit:(id)sender {
-    if ([self isFullScreen] || [self isPresentation]) {
+    if ([self interactionMode] != SKNormalMode) {
         NSBeep();
         return;
     }
@@ -799,9 +799,9 @@
 }
 
 - (IBAction)savePDFSettingToDefaults:(id)sender {
-    if ([self isFullScreen])
+    if ([self interactionMode] == SKFullScreenMode)
         [[NSUserDefaults standardUserDefaults] setObject:[self 
currentPDFSettings] forKey:SKDefaultFullScreenPDFDisplaySettingsKey];
-    else if ([self isPresentation] == NO)
+    else if ([self interactionMode] == SKNormalMode)
         [[NSUserDefaults standardUserDefaults] setObject:[self 
currentPDFSettings] forKey:SKDefaultPDFDisplaySettingsKey];
 }
 
@@ -838,13 +838,13 @@
 }
 
 - (IBAction)toggleLeftSidePane:(id)sender {
-    if ([self isFullScreen]) {
+    if ([self interactionMode] == SKFullScreenMode) {
         [[SKImageToolTipWindow sharedToolTipWindow] fadeOut];
         if ([self leftSidePaneIsOpen])
             [leftSideWindow collapse];
         else
             [leftSideWindow expand];
-    } else if ([self isPresentation]) {
+    } else if ([self interactionMode] == SKPresentationMode) {
         if ([leftSideWindow isVisible])
             [self hideLeftSideWindow];
         else
@@ -873,12 +873,12 @@
 }
 
 - (IBAction)toggleRightSidePane:(id)sender {
-    if ([self isFullScreen]) {
+    if ([self interactionMode] == SKFullScreenMode) {
         if ([self rightSidePaneIsOpen])
             [rightSideWindow collapse];
         else
             [rightSideWindow expand];
-    } else if ([self isPresentation]) {
+    } else if ([self interactionMode] == SKPresentationMode) {
         if ([rightSideWindow isVisible])
             [self hideRightSideWindow];
         else
@@ -966,19 +966,19 @@
     }
     
     [[self window] recalculateKeyViewLoop];
-    if ([self isFullScreen])
+    if ([self interactionMode] == SKFullScreenMode)
         [[self window] makeFirstResponder:pdfView];
 }
 
 - (IBAction)toggleFullScreen:(id)sender {
-    if ([self isFullScreen])
+    if ([self interactionMode] == SKFullScreenMode)
         [self exitFullScreen:sender];
     else
         [self enterFullScreen:sender];
 }
 
 - (IBAction)togglePresentation:(id)sender {
-    if ([self isPresentation])
+    if ([self interactionMode] == SKPresentationMode)
         [self exitFullScreen:sender];
     else
         [self enterPresentation:sender];

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2010-07-17 17:34:07 UTC (rev 6629)
+++ trunk/SKMainWindowController_UI.m   2010-07-17 21:01:54 UTC (rev 6630)
@@ -249,7 +249,7 @@
     if ([[notification object] isEqual:[self window]] && [[notification 
object] isEqual:mainWindow] == NO) {
         NSScreen *screen = [[self window] screen];
         [[self window] setFrame:[screen frame] display:NO];
-        if ([self isFullScreen]) {
+        if ([self interactionMode] == SKFullScreenMode) {
             if ([[leftSideWindow screen] isEqual:screen] == NO) {
                 [leftSideWindow remove];
                 [leftSideWindow attachToWindow:[self window] onScreen:screen];
@@ -270,7 +270,7 @@
         NSRect screenFrame = [screen frame];
         if (NSEqualRects(screenFrame, [[self window] frame]) == NO) {
             [[self window] setFrame:screenFrame display:NO];
-            if ([self isFullScreen]) {
+            if ([self interactionMode] == SKFullScreenMode) {
                 [leftSideWindow remove];
                 [leftSideWindow attachToWindow:[self window] onScreen:screen];
                 [rightSideWindow remove];
@@ -360,7 +360,7 @@
     if ([[aNotification object] isEqual:leftSideController.findTableView] || 
[[aNotification object] isEqual:leftSideController.groupedFindTableView]) {
         [self updateFindResultHighlights:YES];
         
-        if ([self isPresentation] && [[NSUserDefaults standardUserDefaults] 
boolForKey:SKAutoHidePresentationContentsKey])
+        if ([self interactionMode] == SKPresentationMode && [[NSUserDefaults 
standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
             [self hideLeftSideWindow];
     } else if ([[aNotification object] 
isEqual:leftSideController.thumbnailTableView]) {
         if (mwcFlags.updatingThumbnailSelection == 0) {
@@ -368,7 +368,7 @@
             if (row != -1)
                 [pdfView goToPage:[[pdfView document] pageAtIndex:row]];
             
-            if ([self isPresentation] && [[NSUserDefaults 
standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
+            if ([self interactionMode] == SKPresentationMode && 
[[NSUserDefaults standardUserDefaults] 
boolForKey:SKAutoHidePresentationContentsKey])
                 [self hideLeftSideWindow];
         }
     } else if ([[aNotification object] 
isEqual:rightSideController.snapshotTableView]) {
@@ -659,7 +659,7 @@
         mwcFlags.updatingOutlineSelection = 1;
         [self goToSelectedOutlineItem:nil];
         mwcFlags.updatingOutlineSelection = 0;
-        if ([self isPresentation] && [[NSUserDefaults standardUserDefaults] 
boolForKey:SKAutoHidePresentationContentsKey])
+        if ([self interactionMode] == SKPresentationMode && [[NSUserDefaults 
standardUserDefaults] boolForKey:SKAutoHidePresentationContentsKey])
             [self hideLeftSideWindow];
     }
 }
@@ -1312,10 +1312,10 @@
     SEL action = [menuItem action];
     if (action == @selector(createNewNote:)) {
         BOOL isMarkup = [menuItem tag] == SKHighlightNote || [menuItem tag] == 
SKUnderlineNote || [menuItem tag] == SKStrikeOutNote;
-        return [self isPresentation] == NO && ([pdfView toolMode] == 
SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && [pdfView hideNotes] 
== NO && (isMarkup == NO || [[pdfView currentSelection] hasCharacters]);
+        return [self interactionMode] != SKPresentationMode && ([pdfView 
toolMode] == SKTextToolMode || [pdfView toolMode] == SKNoteToolMode) && 
[pdfView hideNotes] == NO && (isMarkup == NO || [[pdfView currentSelection] 
hasCharacters]);
     } else if (action == @selector(editNote:)) {
         PDFAnnotation *annotation = [pdfView activeAnnotation];
-        return [self isPresentation] == NO && [annotation isSkimNote] && 
([annotation isEditable]);
+        return [self interactionMode] != SKPresentationMode && [annotation 
isSkimNote] && ([annotation isEditable]);
     } else if (action == @selector(toggleHideNotes:)) {
         if ([pdfView hideNotes])
             [menuItem setTitle:NSLocalizedString(@"Show Notes", @"Menu item 
title")];
@@ -1325,33 +1325,33 @@
     } else if (action == @selector(displaySinglePages:)) {
         BOOL displaySinglePages = [pdfView displayMode] == 
kPDFDisplaySinglePage || [pdfView displayMode] == 
kPDFDisplaySinglePageContinuous;
         [menuItem setState:displaySinglePages ? NSOnState : NSOffState];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(displayFacingPages:)) {
         BOOL displayFacingPages = [pdfView displayMode] == kPDFDisplayTwoUp || 
[pdfView displayMode] == kPDFDisplayTwoUpContinuous;
         [menuItem setState:displayFacingPages ? NSOnState : NSOffState];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(changeDisplaySinglePages:)) {
         BOOL displaySinglePages1 = [pdfView displayMode] == 
kPDFDisplaySinglePage || [pdfView displayMode] == 
kPDFDisplaySinglePageContinuous;
         BOOL displaySinglePages2 = (PDFDisplayMode)[menuItem tag] == 
kPDFDisplaySinglePage;
         [menuItem setState:displaySinglePages1 == displaySinglePages2 ? 
NSOnState : NSOffState];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(changeDisplayContinuous:)) {
         BOOL displayContinuous1 = [pdfView displayMode] == 
kPDFDisplaySinglePageContinuous || [pdfView displayMode] == 
kPDFDisplayTwoUpContinuous;
         BOOL displayContinuous2 = (PDFDisplayMode)[menuItem tag] == 
kPDFDisplaySinglePageContinuous;
         [menuItem setState:displayContinuous1 == displayContinuous2 ? 
NSOnState : NSOffState];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(changeDisplayMode:)) {
         [menuItem setState:[pdfView displayMode] == (PDFDisplayMode)[menuItem 
tag] ? NSOnState : NSOffState];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(toggleDisplayAsBook:)) {
         [menuItem setState:[pdfView displaysAsBook] ? NSOnState : NSOffState];
-        return [self isPresentation] == NO && ([pdfView displayMode] == 
kPDFDisplayTwoUp || [pdfView displayMode] == kPDFDisplayTwoUpContinuous);
+        return [self interactionMode] != SKPresentationMode && ([pdfView 
displayMode] == kPDFDisplayTwoUp || [pdfView displayMode] == 
kPDFDisplayTwoUpContinuous);
     } else if (action == @selector(toggleDisplayPageBreaks:)) {
         [menuItem setState:[pdfView displaysPageBreaks] ? NSOnState : 
NSOffState];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(changeDisplayBox:)) {
         [menuItem setState:[pdfView displayBox] == (PDFDisplayBox)[menuItem 
tag] ? NSOnState : NSOffState];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(delete:) || action == @selector(copy:) || 
action == @selector(cut:) || action == @selector(paste:) || action == 
@selector(alternatePaste:) || action == @selector(pasteAsPlainText:) || action 
== @selector(deselectAll:) || action == @selector(changeAnnotationMode:) || 
action == @selector(changeToolMode:) || action == @selector(changeToolMode:)) {
         return [pdfView validateMenuItem:menuItem];
     } else if (action == @selector(doGoToNextPage:)) {
@@ -1383,17 +1383,17 @@
             return markedPageIndex != NSNotFound && markedPageIndex != 
[[pdfView currentPage] pageIndex];
         }
     } else if (action == @selector(doZoomIn:)) {
-        return [self isPresentation] == NO && [pdfView canZoomIn];
+        return [self interactionMode] != SKPresentationMode && [pdfView 
canZoomIn];
     } else if (action == @selector(doZoomOut:)) {
-        return [self isPresentation] == NO && [pdfView canZoomOut];
+        return [self interactionMode] != SKPresentationMode && [pdfView 
canZoomOut];
     } else if (action == @selector(doZoomToActualSize:)) {
         return fabs([pdfView scaleFactor] - 1.0 ) > 0.01;
     } else if (action == @selector(doZoomToPhysicalSize:)) {
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(doZoomToSelection:)) {
-        return [self isPresentation] == NO && NSIsEmptyRect([pdfView 
currentSelectionRect]) == NO;
+        return [self interactionMode] != SKPresentationMode && 
NSIsEmptyRect([pdfView currentSelectionRect]) == NO;
     } else if (action == @selector(doZoomToFit:)) {
-        return [self isPresentation] == NO && [pdfView autoScales] == NO;
+        return [self interactionMode] != SKPresentationMode && [pdfView 
autoScales] == NO;
     } else if (action == @selector(alternateZoomToFit:)) {
         PDFDisplayMode displayMode = [pdfView displayMode];
         if (displayMode == kPDFDisplaySinglePage || displayMode == 
kPDFDisplayTwoUp) {
@@ -1401,16 +1401,16 @@
         } else {
             [menuItem setTitle:NSLocalizedString(@"Zoom To Height", @"Menu 
item title")];
         }
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(doAutoScale:)) {
         return [pdfView autoScales] == NO;
     } else if (action == @selector(toggleAutoScale:)) {
         [menuItem setState:[pdfView autoScales] ? NSOnState : NSOffState];
         return YES;
     } else if (action == @selector(cropAll:) || action == @selector(crop:) || 
action == @selector(autoCropAll:) || action == @selector(smartAutoCropAll:)) {
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(autoSelectContent:)) {
-        return [self isPresentation] == NO && [pdfView toolMode] == 
SKSelectToolMode;
+        return [self interactionMode] != SKPresentationMode && [pdfView 
toolMode] == SKSelectToolMode;
     } else if (action == @selector(toggleLeftSidePane:)) {
         if ([self leftSidePaneIsOpen])
             [menuItem setTitle:NSLocalizedString(@"Hide Contents Pane", @"Menu 
item title")];
@@ -1422,57 +1422,57 @@
             [menuItem setTitle:NSLocalizedString(@"Hide Notes Pane", @"Menu 
item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Show Notes Pane", @"Menu 
item title")];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(changeLeftSidePaneState:)) {
         [menuItem setState:mwcFlags.leftSidePaneState == 
(SKLeftSidePaneState)[menuItem tag] ? (([leftSideController.findTableView 
window] || [leftSideController.groupedFindTableView window]) ? NSMixedState : 
NSOnState) : NSOffState];
         return (SKLeftSidePaneState)[menuItem tag] == SKThumbnailSidePaneState 
|| [[pdfView document] outlineRoot];
     } else if (action == @selector(changeRightSidePaneState:)) {
         [menuItem setState:mwcFlags.rightSidePaneState == 
(SKRightSidePaneState)[menuItem tag] ? NSOnState : NSOffState];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(toggleSplitPDF:)) {
         if ([secondaryPdfView window])
             [menuItem setTitle:NSLocalizedString(@"Hide Split PDF", @"Menu 
item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Show Split PDF", @"Menu 
item title")];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(toggleStatusBar:)) {
         if ([statusBar isVisible])
             [menuItem setTitle:NSLocalizedString(@"Hide Status Bar", @"Menu 
item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Show Status Bar", @"Menu 
item title")];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(searchPDF:)) {
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(toggleFullScreen:)) {
-        if ([self isFullScreen])
+        if ([self interactionMode] == SKFullScreenMode)
             [menuItem setTitle:NSLocalizedString(@"Remove Full Screen", @"Menu 
item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Full Screen", @"Menu item 
title")];
         return [[self pdfDocument] isLocked] == NO;
     } else if (action == @selector(togglePresentation:)) {
-        if ([self isPresentation])
+        if ([self interactionMode] == SKPresentationMode)
             [menuItem setTitle:NSLocalizedString(@"Remove Presentation", 
@"Menu item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Presentation", @"Menu item 
title")];
         return [[self pdfDocument] isLocked] == NO;
     } else if (action == @selector(getInfo:)) {
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(performFit:)) {
-        return [self isFullScreen] == NO && [self isPresentation] == NO;
+        return [self interactionMode] == SKNormalMode;
     } else if (action == @selector(password:)) {
-        return [self isPresentation] == NO && [[self pdfDocument] isLocked];
+        return [self interactionMode] != SKPresentationMode && [[self 
pdfDocument] isLocked];
     } else if (action == @selector(toggleReadingBar:)) {
         if ([[self pdfView] hasReadingBar])
             [menuItem setTitle:NSLocalizedString(@"Hide Reading Bar", @"Menu 
item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Show Reading Bar", @"Menu 
item title")];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(savePDFSettingToDefaults:)) {
-        if ([self isFullScreen])
+        if ([self interactionMode] == SKFullScreenMode)
             [menuItem setTitle:NSLocalizedString(@"Use Current View Settings 
as Default for Full Screen", @"Menu item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Use Current View Settings 
as Default", @"Menu item title")];
-        return [self isPresentation] == NO;
+        return [self interactionMode] != SKPresentationMode;
     } else if (action == @selector(chooseTransition:)) {
         return [[self pdfDocument] pageCount] > 1;
     } else if (action == @selector(toggleCaseInsensitiveSearch:)) {
@@ -1513,7 +1513,7 @@
     [self synchronizeWindowTitleWithDocumentName];
     [self updateLeftStatus];
     
-    if ([self isPresentation]) {
+    if ([self interactionMode] == SKPresentationMode) {
         SKPDFView *notesPdfView = [[self presentationNotesDocument] pdfView];
         if (notesPdfView)
             [notesPdfView goToPage:[[notesPdfView document] pageAtIndex:[page 
pageIndex]]];
@@ -1529,18 +1529,18 @@
 }
 
 - (void)handleApplicationWillTerminateNotification:(NSNotification 
*)notification {
-    if ([self isFullScreen] || [self isPresentation])
+    if ([self interactionMode] != SKNormalMode)
         [self exitFullScreen:self];
 }
 
 - (void)handleApplicationDidResignActiveNotification:(NSNotification 
*)notification {
-    if ([self isPresentation] && [[NSUserDefaults standardUserDefaults] 
boolForKey:SKUseNormalLevelForPresentationKey] == NO) {
+    if ([self interactionMode] == SKPresentationMode && [[NSUserDefaults 
standardUserDefaults] boolForKey:SKUseNormalLevelForPresentationKey] == NO) {
         [[self window] setLevel:NSNormalWindowLevel];
     }
 }
 
 - (void)handleApplicationWillBecomeActiveNotification:(NSNotification 
*)notification {
-    if ([self isPresentation] && [[NSUserDefaults standardUserDefaults] 
boolForKey:SKUseNormalLevelForPresentationKey] == NO) {
+    if ([self interactionMode] == SKPresentationMode && [[NSUserDefaults 
standardUserDefaults] boolForKey:SKUseNormalLevelForPresentationKey] == NO) {
         [[self window] setLevel:NSPopUpMenuWindowLevel];
     }
 }

Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h   2010-07-17 17:34:07 UTC (rev 6629)
+++ trunk/SKPDFView.h   2010-07-17 21:01:54 UTC (rev 6630)
@@ -82,13 +82,6 @@
 };
 typedef NSInteger SKNoteType;
 
-enum {
-    SKNormalMode,
-    SKFullScreenMode,
-    SKPresentationMode
-};
-typedef NSInteger SKInteractionMode;
-
 @class SKReadingBar, SKTransitionController, SKTypeSelectHelper, 
SKNavigationWindow;
 
 @interface SKPDFView : PDFView <NSTextFieldDelegate> {

Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m        2010-07-17 17:34:07 UTC (rev 6629)
+++ trunk/SKSideWindow.m        2010-07-17 21:01:54 UTC (rev 6630)
@@ -262,7 +262,7 @@
             [controller closeSideWindow:self];
         else
             [controller exitFullScreen:self];
-    } else if (ch == 'p' && modifierFlags == 0 && [controller isPresentation]) 
{
+    } else if (ch == 'p' && modifierFlags == 0 && [controller interactionMode] 
== SKPresentationMode) {
         [controller closeSideWindow:self];
     } else {
         [super keyDown:theEvent];


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 Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to