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

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

Revision: 744
          http://sourceforge.net/p/fuse-for-macosx/code/744
Author:   fredm
Date:     2013-05-11 05:17:28 +0000 (Sat, 11 May 2013)
Log Message:
-----------
Don't try to show secondary dialogs when in fullscreen mode (thanks, Andrew
Owen).

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

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2013-04-26 05:15:13 UTC (rev 743)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2013-05-11 05:17:28 UTC (rev 744)
@@ -1055,78 +1055,96 @@
 
 - (IBAction)showRollbackPane:(id)sender
 {
-  if( !rollbackController ) {
-    rollbackController = [[RollbackController alloc] init];
+  if( !settings_current.full_screen ) {
+    if( !rollbackController ) {
+      rollbackController = [[RollbackController alloc] init];
+    }
+    [rollbackController showWindow:self];
   }
-  [rollbackController showWindow:self];
 }
 
 - (IBAction)showTapeBrowserPane:(id)sender
 {
-  if( !tapeBrowserController ) {
-    tapeBrowserController = [[TapeBrowserController alloc] init];
+  if( !settings_current.full_screen ) {
+    if( !tapeBrowserController ) {
+      tapeBrowserController = [[TapeBrowserController alloc] init];
+    }
+    [tapeBrowserController showWindow:self];
   }
-  [tapeBrowserController showWindow:self];
 }
 
 - (IBAction)showKeyboardPane:(id)sender
 {
   if( !settings_current.full_screen ) {
-    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" withCode:QZ_k];
 }
 
 - (IBAction)showLoadBinaryPane:(id)sender
 {
-  if( !loadBinaryController ) {
-    loadBinaryController = [[LoadBinaryController alloc] init];
+  if( !settings_current.full_screen ) {
+    if( !loadBinaryController ) {
+      loadBinaryController = [[LoadBinaryController alloc] init];
+    }
+
+    [loadBinaryController showWindow:self];
   }
-
-  [loadBinaryController showWindow:self];
 }
 
 - (IBAction)showSaveBinaryPane:(id)sender
 {
-  if( !saveBinaryController ) {
-    saveBinaryController = [[SaveBinaryController alloc] init];
+  if( !settings_current.full_screen ) {
+    if( !saveBinaryController ) {
+      saveBinaryController = [[SaveBinaryController alloc] init];
+    }
+    [saveBinaryController showWindow:self];
   }
-  [saveBinaryController showWindow:self];
 }
 
 - (IBAction)showPokeFinderPane:(id)sender
 {
-  if( !pokeFinderController ) {
-    pokeFinderController = [[PokeFinderController alloc] init];
+  if( !settings_current.full_screen ) {
+    if( !pokeFinderController ) {
+      pokeFinderController = [[PokeFinderController alloc] init];
+    }
+    [pokeFinderController showWindow:self];
   }
-  [pokeFinderController showWindow:self];
 }
 
 - (IBAction)showPokeMemoryPane:(id)sender
 {
-  if( !pokeMemoryController ) {
-    pokeMemoryController = [[PokeMemoryController alloc] init];
+  if( !settings_current.full_screen ) {
+    if( !pokeMemoryController ) {
+      pokeMemoryController = [[PokeMemoryController alloc] init];
+    }
+    [pokeMemoryController showWindow:self];
   }
-  [pokeMemoryController showWindow:self];
 }
 
 - (IBAction)showMemoryBrowserPane:(id)sender
 {
-  if( !memoryBrowserController ) {
-    memoryBrowserController = [[MemoryBrowserController alloc] init];
+  if( !settings_current.full_screen ) {
+    if( !memoryBrowserController ) {
+      memoryBrowserController = [[MemoryBrowserController alloc] init];
+    }
   }
   [memoryBrowserController showWindow:self];
 }
 
 - (IBAction)showPreferencesPane:(id)sender;
 {
-  if( !preferencesController ) {
-    preferencesController = [[PreferencesController alloc] init];
+  if( !settings_current.full_screen ) {
+    if( !preferencesController ) {
+      preferencesController = [[PreferencesController alloc] init];
+    }
+    [preferencesController showWindow:self];
   }
-  [preferencesController showWindow:self];
   [self releaseCmdKeys:@"." withCode:QZ_PERIOD];
 }
 

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