diff --git a/Application/PlaybackController.m b/Application/PlaybackController.m index 14e6cd54b..62c25c27d 100644 --- a/Application/PlaybackController.m +++ b/Application/PlaybackController.m @@ -31,7 +31,6 @@ NSDictionary *defaultsDictionary = [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:YES], @"enableAudioScrobbler", [NSNumber numberWithBool:NO], @"automaticallyLaunchLastFM", - [NSNumber numberWithBool:YES], @"enableGrowlNotifications", nil]; [[NSUserDefaults standardUserDefaults] registerDefaults:defaultsDictionary]; @@ -140,15 +139,13 @@ [scrobbler start:pe]; } - if([[NSUserDefaults standardUserDefaults] boolForKey:@"enableGrowlNotifications"]) { - [GrowlApplicationBridge notifyWithTitle:[pe title] - description:[pe artist] - notificationName:@"Stream Changed" - iconData:nil - priority:0 - isSticky:NO - clickContext:nil]; - } + [GrowlApplicationBridge notifyWithTitle:[pe title] + description:[pe artist] + notificationName:@"Stream Changed" + iconData:nil + priority:0 + isSticky:NO + clickContext:nil]; } - (IBAction)next:(id)sender @@ -322,15 +319,13 @@ [scrobbler start:pe]; } - if([[NSUserDefaults standardUserDefaults] boolForKey:@"enableGrowlNotifications"]) { - [GrowlApplicationBridge notifyWithTitle:[pe title] - description:[pe artist] - notificationName:@"Stream Changed" - iconData:nil - priority:0 - isSticky:NO - clickContext:nil]; - } + [GrowlApplicationBridge notifyWithTitle:[pe title] + description:[pe artist] + notificationName:@"Stream Changed" + iconData:nil + priority:0 + isSticky:NO + clickContext:nil]; } - (void)updatePosition:(id)sender diff --git a/Preferences/General/English.lproj/Preferences.nib/info.nib b/Preferences/General/English.lproj/Preferences.nib/info.nib index bd734612b..6d1e88c5c 100644 --- a/Preferences/General/English.lproj/Preferences.nib/info.nib +++ b/Preferences/General/English.lproj/Preferences.nib/info.nib @@ -7,9 +7,7 @@ IBEditorPositions 10 - 562 607 506 102 0 0 1680 1028 - 102 - 762 667 248 96 0 0 1680 1028 + 587 659 506 102 0 0 1680 1028 11 640 634 400 151 0 0 1680 1028 43 @@ -17,7 +15,7 @@ 50 640 662 400 96 0 0 1680 1028 58 - 614 441 411 101 0 0 1680 1028 + 634 659 411 101 0 0 1680 1028 85 614 652 452 116 0 0 1680 1028 @@ -25,13 +23,12 @@ 446.1 IBOpenObjects - 58 - 102 - 85 - 43 - 50 - 11 10 + 43 + 58 + 11 + 50 + 85 IBSystem Version 8L2127 diff --git a/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib b/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib index 9aa2b7207..bcd44182d 100644 Binary files a/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib and b/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib differ diff --git a/Preferences/General/General.xcodeproj/project.pbxproj b/Preferences/General/General.xcodeproj/project.pbxproj index d3018c76c..f11ddc217 100644 --- a/Preferences/General/General.xcodeproj/project.pbxproj +++ b/Preferences/General/General.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 1706814C0B9519A5006BA573 /* growl.png in Resources */ = {isa = PBXBuildFile; fileRef = 1706814B0B9519A5006BA573 /* growl.png */; }; 172D72AD0B8926CA00D095BB /* apple_remote.png in Resources */ = {isa = PBXBuildFile; fileRef = 172D72AC0B8926CA00D095BB /* apple_remote.png */; }; 1766C7A80B912A71004A7AE4 /* lastfm.png in Resources */ = {isa = PBXBuildFile; fileRef = 1766C7A70B912A71004A7AE4 /* lastfm.png */; }; 17C643380B8A77CC00C53518 /* OutputsArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C643360B8A77CC00C53518 /* OutputsArrayController.m */; }; @@ -34,6 +35,7 @@ 089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 1706814B0B9519A5006BA573 /* growl.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = growl.png; path = Icons/growl.png; sourceTree = ""; }; 172D72AC0B8926CA00D095BB /* apple_remote.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = apple_remote.png; path = Icons/apple_remote.png; sourceTree = ""; }; 1766C7A70B912A71004A7AE4 /* lastfm.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lastfm.png; path = Icons/lastfm.png; sourceTree = ""; }; 17C643360B8A77CC00C53518 /* OutputsArrayController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = OutputsArrayController.m; sourceTree = ""; }; @@ -193,6 +195,7 @@ 8E07ABD90AAC95AF00A4B32F /* Icons */ = { isa = PBXGroup; children = ( + 1706814B0B9519A5006BA573 /* growl.png */, 1766C7A70B912A71004A7AE4 /* lastfm.png */, 17C643680B8A788000C53518 /* output.png */, 8E15A86B0B894768006DC802 /* updates.png */, @@ -252,6 +255,7 @@ 8E15A86C0B894768006DC802 /* updates.png in Resources */, 17C643690B8A788000C53518 /* output.png in Resources */, 1766C7A80B912A71004A7AE4 /* lastfm.png in Resources */, + 1706814C0B9519A5006BA573 /* growl.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };