diff --git a/ChangeLog b/ChangeLog index 81cc043..40abe01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ * Framework/PCProjectWindow.m Use centerScanRect to avoid strange problems with AA text in editor. + * Headers/PCAppController.h + * PCAppController.m + Update applicationShouldTerminate signature. + 2012-04-20 Riccardo Mottola * Modules/Debuggers/ProjectCenter/PTYView.m diff --git a/English.lproj/Info.gorm/objects.gorm b/English.lproj/Info.gorm/objects.gorm index 53e1344..9156ded 100644 Binary files a/English.lproj/Info.gorm/objects.gorm and b/English.lproj/Info.gorm/objects.gorm differ diff --git a/GNUmakefile b/GNUmakefile index 84f7343..890c34e 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,7 +16,7 @@ include $(GNUSTEP_MAKEFILES)/common.make # # Main application # -VERSION = 0.6.0 +VERSION = 0.6.1 APP_NAME = ProjectCenter ProjectCenter_APPLICATION_ICON = Images/ProjectCenter.tiff diff --git a/Headers/PCAppController.h b/Headers/PCAppController.h index 1d49827..3adcfea 100644 --- a/Headers/PCAppController.h +++ b/Headers/PCAppController.h @@ -1,7 +1,7 @@ /* GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html - Copyright (C) 2001 Free Software Foundation + Copyright (C) 2001-2012 Free Software Foundation This file is part of GNUstep. @@ -72,7 +72,7 @@ - (void)applicationWillFinishLaunching:(NSNotification *)notification; - (void)applicationDidFinishLaunching:(NSNotification *)notification; -- (BOOL)applicationShouldTerminate:(id)sender; +- (NSApplicationTerminateReply)applicationShouldTerminate:(id)sender; - (void)applicationWillTerminate:(NSNotification *)notification; @end diff --git a/PCAppController.m b/PCAppController.m index 9bbb0b2..bbf8de4 100644 --- a/PCAppController.m +++ b/PCAppController.m @@ -1,7 +1,7 @@ /* GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html - Copyright (C) 2001 Free Software Foundation + Copyright (C) 2001-2012 Free Software Foundation This file is part of GNUstep. @@ -145,9 +145,9 @@ object:nil]; } -- (BOOL)applicationShouldTerminate:(id)sender +- (NSApplicationTerminateReply)applicationShouldTerminate:(id)sender { - BOOL quit = YES; + NSApplicationTerminateReply quit = NSTerminateNow; if ([prefController boolForKey:PromptOnQuit]) { @@ -155,7 +155,7 @@ @"Do you really want to quit ProjectCenter?", @"Cancel", @"Quit", nil)) { - return NO; + return NSTerminateLater; } } @@ -163,20 +163,21 @@ // Save projects unconditionally if preferences tells that if ([prefController boolForKey:SaveOnQuit]) { - quit = [projectManager saveAllProjects]; + if(![projectManager saveAllProjects]) + quit = NSTerminateLater; } // Close ProjectManager (projects, editors, etc.) if ((quit == NO) || ([projectManager close] == NO)) { - return NO; + return NSTerminateLater; } [[NSNotificationCenter defaultCenter] postNotificationName:PCAppWillTerminateNotification object:nil]; - return YES; + return NSTerminateNow; } - (void)applicationWillTerminate:(NSNotification *)notification diff --git a/Resources/Info-gnustep.plist b/Resources/Info-gnustep.plist index 709d85e..5621102 100644 --- a/Resources/Info-gnustep.plist +++ b/Resources/Info-gnustep.plist @@ -3,7 +3,7 @@ ApplicationName = "ProjectCenter"; ApplicationDescription = "GNUstep Integrated Development Environment"; ApplicationIcon = "ProjectCenter.tiff"; - ApplicationRelease = "0.6.0"; + ApplicationRelease = "0.6.1"; FullVersionID = "HEAD"; Authors = ( "Philippe C.D. Robert", @@ -63,6 +63,6 @@ } ); URL = "See http://www.gnustep.org/"; - Copyright = "Copyright (C) 1999 - 2008 Free Software Foundation"; + Copyright = "Copyright (C) 1999 - 2012 Free Software Foundation"; CopyrightDescription = "Released under the GNU General Public License 3.0 or later"; }