Set SDK to MacOSX10.5. Fixed compiler warnings initializing "self". A…

…ctivate app when showing windows.
seifscape · Mar 20, 2011 · cf0283b · cf0283b
1 parent a460328
commit cf0283b
Show file tree

Hide file tree

Showing 8 changed files with 154 additions and 1,338 deletions.
diff --git a/DiskArbitrator.xcodeproj/project.pbxproj b/DiskArbitrator.xcodeproj/project.pbxproj
@@ -307,7 +307,11 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DiskArbitrator" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* DiskArbitrator */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -507,21 +511,27 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = macosx10.6;
+				SDKROOT = macosx10.5;
+				VALID_ARCHS = "ppc i386 x86_64";
 			};
 			name = Debug;
 		};
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				ARCHS = (
+					ppc,
+					i386,
+					x86_64,
+				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PREBINDING = NO;
-				SDKROOT = macosx10.6;
+				SDKROOT = macosx10.5;
+				VALID_ARCHS = "ppc i386 x86_64";
 			};
 			name = Release;
 		};

diff --git a/English.lproj/DiskInfo.xib b/English.lproj/DiskInfo.xib
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
diff --git a/Source/Arbitrator.m b/Source/Arbitrator.m
@@ -32,7 +32,8 @@ + (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key
 
 - (id)init
 {
-	if (self = [super init]) 
+	self = [super init];
+	if (self)
 	{
 		disks = [NSMutableSet new];
 		[self registerSession];

diff --git a/Source/AttachDiskImageController.h b/Source/AttachDiskImageController.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import "SheetController.h"
 
-@interface AttachDiskImageController : SheetController <NSOpenSavePanelDelegate>
+@interface AttachDiskImageController : SheetController // <NSOpenSavePanelDelegate>
 {
 	NSView *view;
 	NSTask *task;

diff --git a/Source/Disk.m b/Source/Disk.m
@@ -68,7 +68,8 @@ - (id)initWithDiskRef:(DADiskRef)diskRef
 		}
 	}
 
-	if (self = [super init]) 
+	self = [super init];
+	if (self) 
 	{
 		BSDName = [[NSString alloc] initWithUTF8String:DADiskGetBSDName(diskRef)];
 		CFRetain(diskRef);
@@ -161,7 +162,7 @@ - (void)unmountWithOptions:(NSUInteger)options
 
 - (void)eject
 {
-	NSAssert(self.isEjectable, @"Disk is not ejectable: %@", self);
+	NSAssert1(self.isEjectable, @"Disk is not ejectable: %@", self);
 
 	DADiskEject((DADiskRef) disk, kDADiskEjectOptionDefault, DiskEjectCallback, self);
 }

diff --git a/Source/DiskArbitratorAppController.h b/Source/DiskArbitratorAppController.h
@@ -11,7 +11,7 @@
 @class Arbitrator;
 @class Disk;
 
-@interface AppController : NSObject <NSApplicationDelegate> 
+@interface AppController : NSObject // <NSApplicationDelegate> 
 {
     NSPanel *window;
 	NSStatusItem *statusItem;
@@ -33,6 +33,7 @@
 @property (retain) NSStatusItem *statusItem;
 @property (retain) Arbitrator *arbitrator;
 
+- (IBAction)showAboutPanel:(id)sender;
 - (IBAction)showMainWindow:(id)sender;
 - (IBAction)showPreferences:(id)sender;
 - (IBAction)performActivation:(id)sender;

diff --git a/Source/DiskArbitratorAppController.m b/Source/DiskArbitratorAppController.m
@@ -108,9 +108,16 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 			[self refreshStatusItemIcon];
 }
 
+- (IBAction)showAboutPanel:(id)sender
+{
+	[NSApp orderFrontStandardAboutPanel:sender];
+	[NSApp activateIgnoringOtherApps:YES];
+}
+
 - (IBAction)showMainWindow:(id)sender
 {
-	[window orderFront:sender];
+	[window makeKeyAndOrderFront:sender];
+	[NSApp activateIgnoringOtherApps:YES];
 }
 
 - (IBAction)showPreferences:(id)sender
@@ -121,6 +128,7 @@ - (IBAction)showPreferences:(id)sender
 		controller = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
 
 	[[controller window] makeKeyAndOrderFront:self];
+	[NSApp activateIgnoringOtherApps:YES];
 }
 
 - (IBAction)performActivation:(id)sender
@@ -443,6 +451,13 @@ - (BOOL)tableView:(NSTableView *)aTableView acceptDrop:(id <NSDraggingInfo>)info
 	return YES;
 }
 
+#pragma mark Window Delegates
+
+- (void)windowWillClose:(NSNotification *)notification
+{
+	[NSApp deactivate];
+}
+
 #pragma mark Disk Notifications
 
 - (void)didPresentErrorWithRecovery:(BOOL)didRecover contextInfo:(void *)contextInfo