colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-29 15:07:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Notification Center was suppressing notifications.

Browse Source 
By default, Notification Center may suppress notifications if the application is frontmost. This commit ensures that all notifications are displayed.
This commit is contained in:
Aparajita Fishman
2013-04-24 11:39:57 -04:00
parent 0ec218a599
commit 01920e674d
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/XcodeCapp/XcodeCapp/TNXCodeCapp.h
+1 -1
View File
@@ -31,7 +31,7 @@ extern NSString * const XCCConversionDidStopNotification;
extern NSString * const XCCListeningDidStartNotification;
@interface TNXcodeCapp : NSObject <NSTableViewDelegate, GrowlApplicationBridgeDelegate>
@interface TNXcodeCapp : NSObject <NSTableViewDelegate, NSUserNotificationCenterDelegate, GrowlApplicationBridgeDelegate>
@property NSURL* XcodeSupportProjectURL;
@property NSString* currentProjectPath;
Tools/XcodeCapp/XcodeCapp/TNXcodeCapp.m
+16 -9
View File
@@ -134,6 +134,7 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
[self configureFileAPI];
[self getShellProfilePath];
NSUserNotificationCenter.defaultUserNotificationCenter.delegate = self;
[GrowlApplicationBridge setGrowlDelegate:self];
}
@@ -223,7 +224,7 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
- (void)populateXcodeProject:(BOOL)shouldNotify
{
if (shouldNotify)
[self growlWithTitle:@"Loading project" message:self.currentProjectPath.lastPathComponent];
[self notifyUserWithTitle:@"Loading project" message:self.currentProjectPath.lastPathComponent];
// First populate with all non-framework code
[self populateXcodeProjectWithProjectRelativePath:@""];
@@ -240,7 +241,7 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
if (shouldNotify)
{
[[NSNotificationCenter defaultCenter] postNotificationName:XCCDidPopulateProjectNotification object:self userInfo:nil];
[self growlWithTitle:@"Project loaded" message:self.currentProjectPath.lastPathComponent];
[self notifyUserWithTitle:@"Project loaded" message:self.currentProjectPath.lastPathComponent];
}
}
@@ -343,7 +344,7 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
[[NSUserDefaults standardUserDefaults] setObject:self.currentProjectPath forKey:kDefaultLastOpenedPath];
[self growlWithTitle:@"Listening to project" message:self.currentProjectPath.lastPathComponent];
[self notifyUserWithTitle:@"Listening to project" message:self.currentProjectPath.lastPathComponent];
}
@@ -613,7 +614,7 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
BOOL success = [self processModifiedFileAtPath:path projectSourcePath:projectPath notify:shouldNotify];
if (success)
[self growlWithTitle:@"File successfully processed" message:path.lastPathComponent];
[self notifyUserWithTitle:@"File successfully processed" message:path.lastPathComponent];
}
- (BOOL)processModifiedFileAtPath:(NSString *)realSourcePath projectSourcePath:(NSString *)projectSourcePath notify:(BOOL)shouldNotify
@@ -690,7 +691,7 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
{
DLog(@"%@ Running conversion task...", NSStringFromSelector(_cmd));
[self growlWithTitle:growlTitle message:growlMessage];
[self notifyUserWithTitle:growlTitle message:growlMessage];
NSDictionary *taskResult = [self runTaskWithLaunchPath:self.shellPath
arguments:arguments
@@ -728,7 +729,7 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
if ([[NSUserDefaults standardUserDefaults] boolForKey:kDefaultXCCAutoOpenErrorsPanel])
[self openErrorsPanel:self];
[self growlWithTitle:@"Error processing file" message:projectRelativePath.lastPathComponent];
[self notifyUserWithTitle:@"Error processing file" message:projectRelativePath.lastPathComponent];
}
}
@@ -761,7 +762,7 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
if ([self isObjjFile:path])
{
[self removeReferencesToSourcePath:path];
[self growlWithTitle:@"Removed Objective-J file" message:path.lastPathComponent];
[self notifyUserWithTitle:@"Removed Objective-J file" message:path.lastPathComponent];
}
else if ([self isXCCIgnoreFile:path])
[self computeIgnoredPaths];
@@ -1071,14 +1072,14 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
self.errorListController.content = self.errorList;
}
#pragma mark - Growl
#pragma mark - User notifications
- (NSString *)applicationNameForGrowl
{
return @"XcodeCapp";
}
- (void)growlWithTitle:(NSString *)aTitle message:(NSString *)aMessage
- (void)notifyUserWithTitle:(NSString *)aTitle message:(NSString *)aMessage
{
if ([NSUserNotificationCenter class])
{
@@ -1100,6 +1101,12 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
}
}
- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification
{
// Notification Center may decide not to show a notification. We always want them to show.
return YES;
}
@end