Revision: 5427
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5427&view=rev
Author:   hofman
Date:     2009-06-15 17:41:10 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
disable process switch from presentation mode also when the presentation is not 
on the main menu display

Modified Paths:
--------------
    trunk/SKMainWindowController.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2009-06-15 17:25:10 UTC (rev 5426)
+++ trunk/SKMainWindowController.m      2009-06-15 17:41:10 UTC (rev 5427)
@@ -1391,17 +1391,11 @@
 }
 
 - (void)saveNormalSetup {
-    if ([self isPresentation] == NO && [self isFullScreen] == NO) {
-        NSScrollView *scrollView = [[pdfView documentView] 
enclosingScrollView];
-        [savedNormalSetup setDictionary:[self currentPDFSettings]];
-        [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView 
hasHorizontalScroller]] forKey:HASHORIZONTALSCROLLER_KEY];
-        [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView 
hasVerticalScroller]] forKey:HASVERTICALSCROLLER_KEY];
-        [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView 
autohidesScrollers]] forKey:AUTOHIDESSCROLLERS_KEY];
-    }
-    
-    NSDictionary *fullScreenSetup = [[NSUserDefaults standardUserDefaults] 
objectForKey:SKDefaultFullScreenPDFDisplaySettingsKey];
-    if ([fullScreenSetup count])
-        [self applyPDFSettings:fullScreenSetup];
+    NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
+    [savedNormalSetup setDictionary:[self currentPDFSettings]];
+    [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView 
hasHorizontalScroller]] forKey:HASHORIZONTALSCROLLER_KEY];
+    [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView 
hasVerticalScroller]] forKey:HASVERTICALSCROLLER_KEY];
+    [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView 
autohidesScrollers]] forKey:AUTOHIDESSCROLLERS_KEY];
 }
 
 - (void)activityTimerFired:(NSTimer *)timer {
@@ -1410,7 +1404,8 @@
 
 - (void)enterPresentationMode {
     NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
-    [self saveNormalSetup];
+    if ([self isFullScreen] == NO)
+        [self saveNormalSetup];
     // Set up presentation mode
     [pdfView setAutoScales:YES];
     [pdfView setDisplayMode:kPDFDisplaySinglePage];
@@ -1463,12 +1458,12 @@
     if ([screen isEqual:[[NSScreen screens] objectAtIndex:0]])
         SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
     
-    [self saveNormalSetup];
-    
-    if ([self isPresentation])
+    if ([self isPresentation]) {
         [self exitPresentationMode];
-    else
+    } else {
+        [self saveNormalSetup];
         [self goFullScreen];
+    }
     
     NSColor *backgroundColor = [[NSUserDefaults standardUserDefaults] 
colorForKey:SKFullScreenBackgroundColorKey];
     [pdfView setBackgroundColor:backgroundColor];
@@ -1494,6 +1489,8 @@
     NSScreen *screen = [[self window] screen] ?: [NSScreen mainScreen]; // @@ 
screen: or should we use the main screen?
     if ([screen isEqual:[[NSScreen screens] objectAtIndex:0]])
         SetSystemUIMode(kUIModeAllHidden, kUIOptionDisableProcessSwitch);
+    else
+        SetSystemUIMode(kUIModeNormal, kUIOptionDisableProcessSwitch);
     
     if (wasFullScreen)
         [self hideSideWindows];


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing 
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to