[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [485] trunk/fuse/fusepb/controllers/ FuseController.m

[<fr...@us...>]

Revision: 485
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=485&view=rev
Author:   fredm
Date:     2008-02-17 23:25:41 -0800 (Sun, 17 Feb 2008)

Log Message:
-----------
Ignore any shortcuts that raise dialogs in fullscreen mode.

Modified Paths:
--------------
    trunk/fuse/fusepb/controllers/FuseController.m

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2008-02-18 07:20:32 UTC (rev 484)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2008-02-18 07:25:41 UTC (rev 485)
@@ -137,6 +137,7 @@
 #define QZ_q      0x0C
 #define QZ_o      0x1F
 #define QZ_p      0x23
+#define QZ_k      0x28
 #define QZ_SLASH  0x2C
 #define QZ_PERIOD 0x2F
 
@@ -432,19 +433,21 @@
 {
   char *filename = NULL;
 
-  [[DisplayOpenGLView instance] pause];
+  if( !settings_current.full_screen ) {
+    [[DisplayOpenGLView instance] pause];
 
-  filename = cocoaui_openpanel_get_filename( @"Open Spectrum File", allFileTypes );
+    filename = cocoaui_openpanel_get_filename( @"Open Spectrum File", allFileTypes );
 
-  if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
+    if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  [self addRecentSnapshot:filename];
+    [self addRecentSnapshot:filename];
 
-  [self openFile:filename];
+    [self openFile:filename];
 
-  free(filename);
+    free(filename);
 
-  [[DisplayOpenGLView instance] unpause];
+    [[DisplayOpenGLView instance] unpause];
+  }
   [self releaseCmdKeys:@"o":QZ_o];
 }
 
@@ -597,23 +600,25 @@
 {
   char *filename = NULL;
 
-  [[DisplayOpenGLView instance] pause];
+  if( !settings_current.full_screen ) {
+    [[DisplayOpenGLView instance] pause];
 
-  filename = cocoaui_savepanel_get_filename( @"Save Snapshot As", [NSArray arrayWithObjects:@"szx", @"z80", @"sna", nil] );
+    filename = cocoaui_savepanel_get_filename( @"Save Snapshot As", [NSArray arrayWithObjects:@"szx", @"z80", @"sna", nil] );
 
-  if( !filename ) goto save_as_exit;
+    if( !filename ) goto save_as_exit;
 
-  [[DisplayOpenGLView instance] snapshotWrite:filename];
+    [[DisplayOpenGLView instance] snapshotWrite:filename];
 
-  if( settings_current.thumbnails )
-    add_screen_thumbnail_to( filename );
+    if( settings_current.thumbnails )
+      add_screen_thumbnail_to( filename );
 
-  [self addRecentSnapshot:filename];
+    [self addRecentSnapshot:filename];
 
-  free( filename );
+    free( filename );
 
 save_as_exit:
-  [[DisplayOpenGLView instance] unpause];
+    [[DisplayOpenGLView instance] unpause];
+  }
   [self releaseCmdKeys:@"s":QZ_s];
 }
 
@@ -772,7 +777,9 @@
 
 - (IBAction)quit:(id)sender
 {
-  [[NSApp keyWindow] performClose:self];
+  if( !settings_current.full_screen ) {
+    [[NSApp keyWindow] performClose:self];
+  }
   [self releaseCmdKeys:@"q":QZ_q];
 }
 
@@ -784,7 +791,9 @@
 
 - (IBAction)help:(id)sender
 {
-  [NSApp showHelp:self];
+  if( !settings_current.full_screen ) {
+    [NSApp showHelp:self];
+  }
   [self releaseCmdKeys:@"?":QZ_SLASH];
 }
 
@@ -811,10 +820,13 @@
 
 - (IBAction)showKeyboardPane:(id)sender
 {
-  if( !keyboardController ) {
-    keyboardController = [[KeyboardController alloc] init];
+  if( !settings_current.full_screen ) {
+    if( !keyboardController ) {
+      keyboardController = [[KeyboardController alloc] init];
+    }
+    [keyboardController showCloseWindow:self];
   }
-  [keyboardController showCloseWindow:self];
+  [self releaseCmdKeys:@"k":QZ_k];
 }
 
 - (IBAction)showLoadBinaryPane:(id)sender


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