fuse-for-macosx-commits

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

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

Revision: 237
          http://svn.sourceforge.net/fuse-for-macosx/?rev=237&view=rev
Author:   fredm
Date:     2006-11-19 04:09:08 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
Make default action on confirmations the action.

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

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2006-11-14 01:31:57 UTC (rev 236)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2006-11-19 12:09:08 UTC (rev 237)
@@ -1760,9 +1760,9 @@
   fuse_emulation_pause();
 
   NSString *m = [NSString stringWithUTF8String:message];
-  result = NSRunAlertPanel(@"Confirm", m, @"Cancel", @"OK", nil);
+  result = NSRunAlertPanel(@"Confirm", m, @"OK", @"Cancel", nil);
 
-  if( result != NSAlertDefaultReturn ) confirm = 1;
+  if( result == NSAlertDefaultReturn ) confirm = 1;
 
   fuse_emulation_unpause();
 


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

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

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

Revision: 248
          http://svn.sourceforge.net/fuse-for-macosx/?rev=248&view=rev
Author:   fredm
Date:     2006-12-17 03:37:47 -0800 (Sun, 17 Dec 2006)

Log Message:
-----------
When starting an RZX recording from a snapshot, be sure to pass through the
embed snapshot preference.

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

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2006-12-17 03:13:29 UTC (rev 247)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2006-12-17 11:37:47 UTC (rev 248)
@@ -581,7 +581,7 @@
     free( snap ); free( recording ); fuse_emulation_unpause(); return;
   }
 
-  rzx_start_recording( recording, 0 );
+  rzx_start_recording( recording, settings_current.embed_snapshot );
 
   free( recording );
 


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

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

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

Revision: 410
          http://svn.sourceforge.net/fuse-for-macosx/?rev=410&view=rev
Author:   fredm
Date:     2007-06-30 19:19:19 -0700 (Sat, 30 Jun 2007)

Log Message:
-----------
List correct supported plusd file types and allow plusd disks to be ejected.

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

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2007-07-01 02:17:49 UTC (rev 409)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2007-07-01 02:19:19 UTC (rev 410)
@@ -183,8 +183,8 @@
                         @"SCL", nil];
     [trdosFileTypes retain];
 
-    plusdFileTypes = [NSMutableArray arrayWithObjects:@"mgt", @"MGT", @"img",
-                        @"IMG", nil];
+    plusdFileTypes = [NSMutableArray arrayWithObjects:@"dsk", @"DSK", @"mgt",
+                                                      @"MGT",  nil];
     [plusdFileTypes retain];
 
     allFileTypes = [NSMutableArray arrayWithArray:snapFileTypes];
@@ -1916,8 +1916,11 @@
   [[DisplayOpenGLView instance] pause];
   if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
     [[DisplayOpenGLView instance] specplus3DiskEject:drive saveFirst:write];
+  } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PENT ||
+             machine_current->machine == LIBSPECTRUM_MACHINE_SCORP ) {
+    [[DisplayOpenGLView instance] trdosDiskEject:drive saveFirst:write];
   } else {
-    [[DisplayOpenGLView instance] trdosDiskEject:drive saveFirst:write];
+    [[DisplayOpenGLView instance] plusdDiskEject:drive saveFirst:write];
   }
   [[DisplayOpenGLView instance] unpause];
 }


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

[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.

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

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

Revision: 521
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=521&view=rev
Author:   fredm
Date:     2008-04-29 05:44:33 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
Fix betaFileTypes declaration.

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

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2008-04-29 12:24:00 UTC (rev 520)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2008-04-29 12:44:33 UTC (rev 521)
@@ -204,7 +204,7 @@
     [plus3FileTypes retain];
 
     betaFileTypes = [NSMutableArray arrayWithObjects:@"trd", @"TRD", @"scl",
-                        @"SCL", @"udi", @"UDI", @"fdi", "@FDI", nil];
+                        @"SCL", @"udi", @"UDI", @"fdi", @"FDI", nil];
     [betaFileTypes retain];
 
     plusdFileTypes = [NSMutableArray arrayWithObjects:@"dsk", @"DSK", @"mgt",


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