[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [468] trunk/fuse/fusepb
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [468] trunk/fuse/fusepb
|
From: <fr...@us...> - 2008-02-10 20:47:08
|
Revision: 468
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=468&view=rev
Author: fredm
Date: 2008-02-10 12:47:11 -0800 (Sun, 10 Feb 2008)
Log Message:
-----------
Make application quit menu use performClose on the window, and switch exit
confirm dialog to windowShouldClose in DisplayOpenGLView (partial fix to
bug #1842576).
Modified Paths:
--------------
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/controllers/FuseController.h
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
trunk/fuse/fusepb/views/DisplayOpenGLView.h
trunk/fuse/fusepb/views/DisplayOpenGLView.m
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2007-12-21 02:42:46 UTC (rev 467)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-02-10 20:47:11 UTC (rev 468)
@@ -8,8 +8,6 @@
/* Begin PBXBuildFile section */
B615BFE80B4261E50082D535 /* HIDJoysticks.m in Sources */ = {isa = PBXBuildFile; fileRef = B615BFE60B4261E50082D535 /* HIDJoysticks.m */; };
- B61EEBA60D1A917D006FEA80 /* FuseGenerator.qlgenerator in Resources */ = {isa = PBXBuildFile; fileRef = B61EEB950D1A917D006FEA80 /* FuseGenerator.qlgenerator */; };
- B61EEBB10D1A91A9006FEA80 /* FuseGenerator.qlgenerator in CopyFiles */ = {isa = PBXBuildFile; fileRef = B61EEB950D1A917D006FEA80 /* FuseGenerator.qlgenerator */; };
B61F459309121DF100C8096C /* Fuse Help in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6F905ED05CDA24300C2F10D /* Fuse Help */; };
B61F459409121DF100C8096C /* disk_plus3.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F2076596C700DE7E81 /* disk_plus3.szx */; };
B61F459509121DF100C8096C /* tape_16.szx in CopyFiles */ = {isa = PBXBuildFile; fileRef = B650C3F4076596FD00DE7E81 /* tape_16.szx */; };
@@ -240,7 +238,6 @@
dstPath = Contents/Library/QuickLook;
dstSubfolderSpec = 1;
files = (
- B61EEBB10D1A91A9006FEA80 /* FuseGenerator.qlgenerator in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1348,7 +1345,6 @@
B6CADD730C48E1A3004BA954 /* microdrive_red.png in Resources */,
B6CADD740C48E1A3004BA954 /* plus3disk_green.png in Resources */,
B6CADD750C48E1A3004BA954 /* plus3disk_red.png in Resources */,
- B61EEBA60D1A917D006FEA80 /* FuseGenerator.qlgenerator in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/fuse/fusepb/controllers/FuseController.h
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.h 2007-12-21 02:42:46 UTC (rev 467)
+++ trunk/fuse/fusepb/controllers/FuseController.h 2008-02-10 20:47:11 UTC (rev 468)
@@ -206,7 +206,6 @@
-(ui_confirm_joystick_t) confirmJoystick:(libspectrum_joystick)type inputs:(int)theInputs;
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename;
- (void)setAcceptsMouseMovedEvents:(BOOL)flag;
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2007-12-21 02:42:46 UTC (rev 467)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2008-02-10 20:47:11 UTC (rev 468)
@@ -59,7 +59,7 @@
static char* cocoaui_openpanel_get_filename( NSString *title, NSArray *fileTypes );
static char* cocoaui_savepanel_get_filename( NSString *title, NSArray *fileTypes );
static void cocoaui_disk_eject( specplus3_drive_number drive, int which );
-static int cocoaui_confirm( const char *message );
+int cocoaui_confirm( const char *message );
static int dockEject = 0;
static int if2Eject = 0;
@@ -1705,17 +1705,6 @@
return YES;
}
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
-{
- if( cocoaui_confirm( "Exit Fuse?" ) ) {
- int error = [[DisplayOpenGLView instance] checkMediaChanged];
- if( error ) return NSTerminateCancel;
-
- return NSTerminateNow;
- }
- return NSTerminateCancel;
-}
-
- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
{
utils_file file; libspectrum_id_t type;
@@ -2124,7 +2113,7 @@
return 0;
}
-static int
+int
cocoaui_confirm( const char *message )
{
int confirm = 0;
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib 2007-12-21 02:42:46 UTC (rev 467)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib 2008-02-10 20:47:11 UTC (rev 468)
@@ -7,7 +7,7 @@
<key>IBEditorPositions</key>
<dict>
<key>29</key>
- <string>202 691 392 44 0 0 1440 878 </string>
+ <string>201 691 392 44 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
@@ -17,6 +17,6 @@
<integer>877</integer>
</array>
<key>IBSystem Version</key>
- <string>9A581</string>
+ <string>9B18</string>
</dict>
</plist>
Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.h 2007-12-21 02:42:46 UTC (rev 467)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.h 2008-02-10 20:47:11 UTC (rev 468)
@@ -218,6 +218,7 @@
-(void) copyGLtoQuartz;
-(void) windowWillMiniaturize:(NSNotification *)aNotification;
-(void) windowDidMiniaturize:(NSNotification *)notification;
+-(BOOL) windowShouldClose:(id)window;
-(CVReturn) displayFrame:(const CVTimeStamp *)timeStamp;
-(void) windowChangedScreen:(NSNotification*)inNotification;
Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m 2007-12-21 02:42:46 UTC (rev 467)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m 2008-02-10 20:47:11 UTC (rev 468)
@@ -35,6 +35,7 @@
#include "fuse.h"
#include "fusepb/main.h"
#include "settings.h"
+#include "ui/cocoa/cocoaui.h"
#include "ui/cocoa/dirty.h"
const void *
@@ -1168,6 +1169,17 @@
[[self window] setOpaque:YES];
}
+-(BOOL) windowShouldClose:(id)window
+{
+ if( cocoaui_confirm( "Exit Fuse?" ) ) {
+ int error = [self checkMediaChanged];
+ if( error ) return NO;
+
+ return YES;
+ }
+ return NO;
+}
+
-(CVReturn) displayFrame:(const CVTimeStamp *)timeStamp
{
[self drawRect:NSZeroRect];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
