Thread: [Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[697] trunk/fuse/fusepb/controllers
Brought to you by:
fredm
Menu
▾
▴
fuse-for-macosx-commits
|
From: <fr...@us...> - 2012-10-29 12:12:48
|
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.
|
|
From: <fr...@us...> - 2012-10-29 12:14:01
|
Revision: 698
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=698&view=rev
Author: fredm
Date: 2012-10-29 12:13:52 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
Fix some format strings.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/JoystickConfigurationController.m
trunk/fuse/fusepb/controllers/MemoryBrowserController.m
trunk/fuse/fusepb/controllers/PokeFinderController.m
Modified: trunk/fuse/fusepb/controllers/JoystickConfigurationController.m
===================================================================
--- trunk/fuse/fusepb/controllers/JoystickConfigurationController.m 2012-10-29 12:12:40 UTC (rev 697)
+++ trunk/fuse/fusepb/controllers/JoystickConfigurationController.m 2012-10-29 12:13:52 UTC (rev 698)
@@ -215,9 +215,9 @@
}
for( i=0; i<10; i++ ) {
- [joyXAxis addItemWithTitle:[NSString stringWithFormat:@"%d", i]];
+ [joyXAxis addItemWithTitle:[NSString stringWithFormat:@"%ld", i]];
[[joyXAxis lastItem] setTag:i];
- [joyYAxis addItemWithTitle:[NSString stringWithFormat:@"%d", i]];
+ [joyYAxis addItemWithTitle:[NSString stringWithFormat:@"%ld", i]];
[[joyYAxis lastItem] setTag:i];
if( i == x_axis ) {
Modified: trunk/fuse/fusepb/controllers/MemoryBrowserController.m
===================================================================
--- trunk/fuse/fusepb/controllers/MemoryBrowserController.m 2012-10-29 12:12:40 UTC (rev 697)
+++ trunk/fuse/fusepb/controllers/MemoryBrowserController.m 2012-10-29 12:13:52 UTC (rev 698)
@@ -84,7 +84,7 @@
[tableContents retain];
for( i = 0; i<= 0xfff; i++ ) {
- address = [NSString stringWithFormat:@"%04X", i * 0x10];
+ address = [NSString stringWithFormat:@"%04lX", i * 0x10];
hex = [NSMutableString stringWithCapacity:64];
data = [NSMutableString stringWithCapacity:20];
Modified: trunk/fuse/fusepb/controllers/PokeFinderController.m
===================================================================
--- trunk/fuse/fusepb/controllers/PokeFinderController.m 2012-10-29 12:12:40 UTC (rev 697)
+++ trunk/fuse/fusepb/controllers/PokeFinderController.m 2012-10-29 12:13:52 UTC (rev 698)
@@ -186,7 +186,7 @@
for( offset = 0; offset < 0x2000; offset++ )
if( !(pokefinder_impossible[page][offset/8] & 1 << (offset & 7)) ) {
NSNumber *p = [NSNumber numberWithUnsignedLong:page/2];
- NSString *o = [NSString stringWithFormat:@"0x%04X", offset + 8192 * (page & 1)];
+ NSString *o = [NSString stringWithFormat:@"0x%04lX", offset + 8192 * (page & 1)];
NSNumber *on = [NSNumber numberWithUnsignedLong:offset + 8192 * (page & 1)];
[tableContents addObject:
[NSDictionary dictionaryWithObjectsAndKeys:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2012-11-21 11:42:06
|
Revision: 704
http://sourceforge.net/p/fuse-for-macosx/code/704
Author: fredm
Date: 2012-11-21 11:42:04 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Fix problem leaving modal state when closing Memory Browser window.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/MemoryBrowserController.h
trunk/fuse/fusepb/controllers/MemoryBrowserController.m
Modified: trunk/fuse/fusepb/controllers/MemoryBrowserController.h
===================================================================
--- trunk/fuse/fusepb/controllers/MemoryBrowserController.h 2012-11-02 12:39:26 UTC (rev 703)
+++ trunk/fuse/fusepb/controllers/MemoryBrowserController.h 2012-11-21 11:42:04 UTC (rev 704)
@@ -31,7 +31,6 @@
IBOutlet NSTableView *memoryBrowser;
NSMutableArray *tableContents;
}
-- (IBAction)apply:(id)sender;
- (void)showWindow:(id)sender;
- (int)numberOfRowsInTableView:(NSTableView *)table;
- (id)tableView:(NSTableView *)table objectValueForTableColumn:(NSTableColumn *)col row:(int)row;
Modified: trunk/fuse/fusepb/controllers/MemoryBrowserController.m
===================================================================
--- trunk/fuse/fusepb/controllers/MemoryBrowserController.m 2012-11-02 12:39:26 UTC (rev 703)
+++ trunk/fuse/fusepb/controllers/MemoryBrowserController.m 2012-11-21 11:42:04 UTC (rev 704)
@@ -34,11 +34,31 @@
- (id)init
{
+ NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+ NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
+
tableContents = nil;
self = [super initWithWindowNibName:@"MemoryBrowser"];
[self setWindowFrameAutosaveName:@"MemoryBrowserWindow"];
+ [nc addObserverForName:@"NSWindowWillCloseNotification"
+ object:[self window]
+ queue:mainQueue
+ usingBlock:^(NSNotification *note) {
+ [NSApp stopModal];
+
+ [tableContents removeAllObjects];
+
+ [tableContents release];
+
+ tableContents = nil;
+
+ [memoryBrowser reloadData];
+
+ [[DisplayOpenGLView instance] unpause];
+ }];
+
return self;
}
@@ -55,22 +75,6 @@
[super dealloc];
}
-- (IBAction)apply:(id)sender
-{
- [NSApp stopModal];
- [[self window] close];
-
- [tableContents removeAllObjects];
-
- [tableContents release];
-
- tableContents = nil;
-
- [memoryBrowser reloadData];
-
- [[DisplayOpenGLView instance] unpause];
-}
-
- (void)showWindow:(id)sender
{
size_t i, j;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2013-02-09 05:02:42
|
Revision: 728
http://sourceforge.net/p/fuse-for-macosx/code/728
Author: fredm
Date: 2013-02-09 05:02:38 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
Properly handle opening and closing windows more than once.
Modified Paths:
--------------
trunk/fuse/fusepb/controllers/KeyboardController.m
trunk/fuse/fusepb/controllers/MemoryBrowserController.m
trunk/fuse/fusepb/controllers/PokeFinderController.m
Modified: trunk/fuse/fusepb/controllers/KeyboardController.m
===================================================================
--- trunk/fuse/fusepb/controllers/KeyboardController.m 2013-01-21 11:50:05 UTC (rev 727)
+++ trunk/fuse/fusepb/controllers/KeyboardController.m 2013-02-09 05:02:38 UTC (rev 728)
@@ -35,20 +35,12 @@
- (id)init
{
- NSNotificationCenter *nc;
-
self = [super initWithWindowNibName:@"Keyboard"];
[self setWindowFrameAutosaveName:@"KeyboardWindow"];
window_open = 0;
- nc = [NSNotificationCenter defaultCenter];
- [nc addObserver:self
- selector:@selector(handleWillClose:)
- name:@"NSWindowWillCloseNotification"
- object:[self window]];
-
return self;
}
@@ -70,6 +62,14 @@
- (void)showWindow:(id)sender
{
+ NSNotificationCenter *nc;
+
+ nc = [NSNotificationCenter defaultCenter];
+ [nc addObserver:self
+ selector:@selector(handleWillClose:)
+ name:@"NSWindowWillCloseNotification"
+ object:[self window]];
+
[super showWindow:sender];
/* The TC2068 has a different keyboard layout */
Modified: trunk/fuse/fusepb/controllers/MemoryBrowserController.m
===================================================================
--- trunk/fuse/fusepb/controllers/MemoryBrowserController.m 2013-01-21 11:50:05 UTC (rev 727)
+++ trunk/fuse/fusepb/controllers/MemoryBrowserController.m 2013-02-09 05:02:38 UTC (rev 728)
@@ -36,21 +36,37 @@
- (id)init
{
- NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
- NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
-
tableContents = nil;
self = [super initWithWindowNibName:@"MemoryBrowser"];
[self setWindowFrameAutosaveName:@"MemoryBrowserWindow"];
-
+
+ return self;
+}
+
+- (void)dealloc
+{
+ NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+ [nc removeObserver:notificationObserver];
+
+ [super dealloc];
+}
+
+- (void)showWindow:(id)sender
+{
+ NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+ NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
+ size_t i, j;
+ NSString *address;
+ NSMutableString *hex, *data;
+
notificationObserver =
[nc addObserverForName:@"NSWindowWillCloseNotification"
object:[self window]
queue:mainQueue
usingBlock:^(NSNotification *note) {
[nc removeObserver:notificationObserver];
-
+
[NSApp stopModal];
[tableContents removeAllObjects];
@@ -63,24 +79,7 @@
[[DisplayOpenGLView instance] unpause];
}];
-
- return self;
-}
-
-- (void)dealloc
-{
- NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
- [nc removeObserver:notificationObserver];
-
- [super dealloc];
-}
-
-- (void)showWindow:(id)sender
-{
- size_t i, j;
- NSString *address;
- NSMutableString *hex, *data;
-
+
[[DisplayOpenGLView instance] pause];
tableContents = [NSMutableArray arrayWithCapacity:0xfff];
Modified: trunk/fuse/fusepb/controllers/PokeFinderController.m
===================================================================
--- trunk/fuse/fusepb/controllers/PokeFinderController.m 2013-01-21 11:50:05 UTC (rev 727)
+++ trunk/fuse/fusepb/controllers/PokeFinderController.m 2013-02-09 05:02:38 UTC (rev 728)
@@ -39,17 +39,9 @@
- (id)init
{
- NSNotificationCenter *nc;
-
[super init];
self = [super initWithWindowNibName:@"PokeFinder"];
- nc = [NSNotificationCenter defaultCenter];
- [nc addObserver:self
- selector:@selector(handleWillClose:)
- name:@"NSWindowWillCloseNotification"
- object:[self window]];
-
[self setWindowFrameAutosaveName:@"PokeFinderWindow"];
tableContents = nil;
@@ -117,6 +109,14 @@
- (void)showWindow:(id)sender
{
+ NSNotificationCenter *nc;
+
+ nc = [NSNotificationCenter defaultCenter];
+ [nc addObserver:self
+ selector:@selector(handleWillClose:)
+ name:@"NSWindowWillCloseNotification"
+ object:[self window]];
+
[[DisplayOpenGLView instance] pause];
[super showWindow:sender];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X