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

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

Revision: 697
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=697&view=rev
Author:   fredm
Date:     2012-10-29 12:12:40 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
Update calls to deprecated load and save panel APIs.

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

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2012-10-29 12:08:37 UTC (rev 696)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2012-10-29 12:12:40 UTC (rev 697)
@@ -1058,7 +1058,7 @@
 
 - (IBAction)saveFileTypeClicked:(id)sender;
 {
-  [sPanel setRequiredFileType:[saveFileType titleOfSelectedItem]];
+  [sPanel setAllowedFileTypes:[NSArray arrayWithObject:[saveFileType titleOfSelectedItem]]];
 }
 
 - savePanelAccessoryView
@@ -2484,10 +2484,11 @@
 
   [oPanel setTitle:title];
 
-  result = [oPanel runModalForTypes:fileTypes];
+  [oPanel setAllowedFileTypes:fileTypes];
+  result = [oPanel runModal];
   if (result == NSOKButton) {
-    NSArray *filesToOpen = [oPanel filenames];
-    NSString *aFile = [filesToOpen objectAtIndex:0];
+    NSArray *filesToOpen = [oPanel URLs];
+    NSString *aFile = [[filesToOpen objectAtIndex:0] path];
     [aFile getFileSystemRepresentation:buffer maxLength:PATH_MAX];
     filename = strdup ( buffer );
   }
@@ -2505,7 +2506,7 @@
   sPanel = [NSSavePanel savePanel];
 
   [sPanel setTitle:title];
-  [sPanel setRequiredFileType:[fileTypes objectAtIndex:0]];
+  [sPanel setAllowedFileTypes:[NSArray arrayWithObject:[fileTypes objectAtIndex:0]]];
   [sPanel setCanSelectHiddenExtension:YES];
 
   if( [fileTypes count] > 1 ) {
@@ -2518,7 +2519,7 @@
 
   result = [sPanel runModal];
   if (result == NSOKButton) {
-    NSString *oFile = [sPanel filename];
+    NSString *oFile = [[sPanel URL] path];
     [oFile getFileSystemRepresentation:buffer maxLength:PATH_MAX];
     filename = strdup ( buffer );
   }

Modified: trunk/fuse/fusepb/controllers/LoadBinaryController.m
===================================================================
--- trunk/fuse/fusepb/controllers/LoadBinaryController.m	2012-10-29 12:08:37 UTC (rev 696)
+++ trunk/fuse/fusepb/controllers/LoadBinaryController.m	2012-10-29 12:12:40 UTC (rev 697)
@@ -116,13 +116,13 @@
   int result;
   NSOpenPanel *oPanel = [NSOpenPanel openPanel];
 
-  [oPanel setRequiredFileType:@""];
+  [oPanel setAllowedFileTypes:nil];
 
   result = [oPanel runModal];
   if (result == NSOKButton) {
     char buffer[PATH_MAX+1];
     int error;
-    NSString *oFile = [oPanel filename];
+    NSString *oFile = [[oPanel URL] path];
 
     utils_file new_file;
 

Modified: trunk/fuse/fusepb/controllers/PreferencesController.m
===================================================================
--- trunk/fuse/fusepb/controllers/PreferencesController.m	2012-10-29 12:08:37 UTC (rev 696)
+++ trunk/fuse/fusepb/controllers/PreferencesController.m	2012-10-29 12:12:40 UTC (rev 697)
@@ -190,16 +190,16 @@
 
   switch( [sender tag] ) {
   case 0:	/* graphic */
-    [sPanel setRequiredFileType:@"pbm"];
+    [sPanel setAllowedFileTypes:[NSArray arrayWithObject:@"pbm"]];
     break;
   case 1:	/* text */
-    [sPanel setRequiredFileType:@"txt"];
+    [sPanel setAllowedFileTypes:[NSArray arrayWithObject:@"txt"]];
     break;
   }
 
   result = [sPanel runModal];
   if (result == NSOKButton) {
-    NSString *oFile = [sPanel filename];
+    NSString *oFile = [[sPanel URL] path];
     [oFile getFileSystemRepresentation:buffer maxLength:PATH_MAX];
 
     switch( [sender tag] ) {
@@ -249,10 +249,11 @@
   NSArray *romFileTypes = [NSArray arrayWithObjects:@"rom", @"ROM", nil];
   NSString *romString;
 
-  result = [oPanel runModalForTypes:romFileTypes];
+  [oPanel setAllowedFileTypes:romFileTypes];
+  result = [oPanel runModal];
   if (result == NSOKButton) {
     NSString *key = NULL;
-    NSString *oFile = [oPanel filename];
+    NSString *oFile = [[oPanel URL] path];
     [oFile getFileSystemRepresentation:buffer maxLength:PATH_MAX];
 
     romString = [NSString stringWithUTF8String:buffer];

Modified: trunk/fuse/fusepb/controllers/SaveBinaryController.m
===================================================================
--- trunk/fuse/fusepb/controllers/SaveBinaryController.m	2012-10-29 12:08:37 UTC (rev 696)
+++ trunk/fuse/fusepb/controllers/SaveBinaryController.m	2012-10-29 12:12:40 UTC (rev 697)
@@ -120,12 +120,12 @@
   int result;
   NSSavePanel *sPanel = [NSSavePanel savePanel];
 
-  [sPanel setRequiredFileType:@""];
+  [sPanel setAllowedFileTypes:nil];
 
   result = [sPanel runModal];
   if (result == NSOKButton) {
     char buffer[PATH_MAX+1];
-    NSString *sFile = [sPanel filename];
+    NSString *sFile = [[sPanel URL] path];
 
     [sFile getFileSystemRepresentation:buffer maxLength:PATH_MAX];
     

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