diff --git a/Preferences/General/English.lproj/Preferences.nib/classes.nib b/Preferences/General/English.lproj/Preferences.nib/classes.nib index 0d1b71b3f..82ae8a94b 100644 --- a/Preferences/General/English.lproj/Preferences.nib/classes.nib +++ b/Preferences/General/English.lproj/Preferences.nib/classes.nib @@ -46,6 +46,7 @@ hotKeyPane = HotKeyPane; outputPane = OutputPane; remotePane = RemotePane; + scrobblerPane = ScrobblerPane; updatesPane = UpdatesPane; }; SUPERCLASS = NSObject; @@ -63,6 +64,7 @@ OUTLETS = {onlyOnActive = NSButton; }; SUPERCLASS = PreferencePane; }, + {CLASS = ScrobblerPane; LANGUAGE = ObjC; SUPERCLASS = PreferencePane; }, {CLASS = UpdatesPane; LANGUAGE = ObjC; SUPERCLASS = PreferencePane; } ); IBVersion = 1; diff --git a/Preferences/General/English.lproj/Preferences.nib/info.nib b/Preferences/General/English.lproj/Preferences.nib/info.nib index 5b8344bba..62aa141ab 100644 --- a/Preferences/General/English.lproj/Preferences.nib/info.nib +++ b/Preferences/General/English.lproj/Preferences.nib/info.nib @@ -11,21 +11,24 @@ 11 703 634 273 151 0 0 1680 1028 43 - 671 662 337 96 0 0 1680 1028 + 516 528 337 116 0 0 1680 1028 50 662 662 355 96 0 0 1680 1028 58 634 659 411 101 0 0 1680 1028 + 85 + 614 652 452 116 0 0 1680 1028 IBFramework Version 446.1 IBOpenObjects - 11 10 58 - 50 + 85 43 + 50 + 11 IBSystem Version 8L2127 diff --git a/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib b/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib index 144cb21c9..347df1791 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 aa2ec3f8f..14c271e5f 100644 --- a/Preferences/General/General.xcodeproj/project.pbxproj +++ b/Preferences/General/General.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXBuildFile section */ 172D72480B891FEF00D095BB /* RemotePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 172D72470B891FEF00D095BB /* RemotePane.m */; }; 172D72AD0B8926CA00D095BB /* apple_remote.png in Resources */ = {isa = PBXBuildFile; fileRef = 172D72AC0B8926CA00D095BB /* apple_remote.png */; }; + 1766C73D0B9126E7004A7AE4 /* ScrobblerPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 1766C73C0B9126E7004A7AE4 /* ScrobblerPane.m */; }; + 1766C7A80B912A71004A7AE4 /* lastfm.png in Resources */ = {isa = PBXBuildFile; fileRef = 1766C7A70B912A71004A7AE4 /* lastfm.png */; }; 17C643380B8A77CC00C53518 /* OutputsArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C643360B8A77CC00C53518 /* OutputsArrayController.m */; }; 17C6433F0B8A783F00C53518 /* OutputPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C6433E0B8A783F00C53518 /* OutputPane.m */; }; 17C643690B8A788000C53518 /* output.png in Resources */ = {isa = PBXBuildFile; fileRef = 17C643680B8A788000C53518 /* output.png */; }; @@ -38,6 +40,9 @@ 172D72460B891FEF00D095BB /* RemotePane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RemotePane.h; sourceTree = ""; }; 172D72470B891FEF00D095BB /* RemotePane.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = RemotePane.m; sourceTree = ""; }; 172D72AC0B8926CA00D095BB /* apple_remote.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = apple_remote.png; path = Icons/apple_remote.png; sourceTree = ""; }; + 1766C73B0B9126E7004A7AE4 /* ScrobblerPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScrobblerPane.h; sourceTree = ""; }; + 1766C73C0B9126E7004A7AE4 /* ScrobblerPane.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ScrobblerPane.m; 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 = ""; }; 17C643370B8A77CC00C53518 /* OutputsArrayController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OutputsArrayController.h; sourceTree = ""; }; 17C6433D0B8A783F00C53518 /* OutputPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OutputPane.h; sourceTree = ""; }; @@ -163,6 +168,8 @@ 8E15A8350B8944C4006DC802 /* UpdatesPane.m */, 17C6433D0B8A783F00C53518 /* OutputPane.h */, 17C6433E0B8A783F00C53518 /* OutputPane.m */, + 1766C73B0B9126E7004A7AE4 /* ScrobblerPane.h */, + 1766C73C0B9126E7004A7AE4 /* ScrobblerPane.m */, ); name = Panes; sourceTree = ""; @@ -201,6 +208,7 @@ 8E07ABD90AAC95AF00A4B32F /* Icons */ = { isa = PBXGroup; children = ( + 1766C7A70B912A71004A7AE4 /* lastfm.png */, 17C643680B8A788000C53518 /* output.png */, 8E15A86B0B894768006DC802 /* updates.png */, 172D72AC0B8926CA00D095BB /* apple_remote.png */, @@ -258,6 +266,7 @@ 172D72AD0B8926CA00D095BB /* apple_remote.png in Resources */, 8E15A86C0B894768006DC802 /* updates.png in Resources */, 17C643690B8A788000C53518 /* output.png in Resources */, + 1766C7A80B912A71004A7AE4 /* lastfm.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -279,6 +288,7 @@ 8E15A8360B8944C4006DC802 /* UpdatesPane.m in Sources */, 17C643380B8A77CC00C53518 /* OutputsArrayController.m in Sources */, 17C6433F0B8A783F00C53518 /* OutputPane.m in Sources */, + 1766C73D0B9126E7004A7AE4 /* ScrobblerPane.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Preferences/General/Icons/lastfm.png b/Preferences/General/Icons/lastfm.png new file mode 100644 index 000000000..473ee4d44 Binary files /dev/null and b/Preferences/General/Icons/lastfm.png differ diff --git a/Preferences/General/PrefPaneController.h b/Preferences/General/PrefPaneController.h index 38d3407fa..967ded1cb 100644 --- a/Preferences/General/PrefPaneController.h +++ b/Preferences/General/PrefPaneController.h @@ -14,6 +14,7 @@ #import "RemotePane.h" #import "UpdatesPane.h" #import "OutputPane.h" +#import "ScrobblerPane.h" @interface PrefPaneController : NSObject { IBOutlet HotKeyPane *hotKeyPane; @@ -21,12 +22,14 @@ IBOutlet RemotePane *remotePane; IBOutlet UpdatesPane *updatesPane; IBOutlet OutputPane *outputPane; + IBOutlet ScrobblerPane *scrobblerPane; } - (HotKeyPane *)hotKeyPane; - (FileDrawerPane *)fileDrawerPane; - (RemotePane *)remotePane; - (UpdatesPane *)updatesPane; -- (UpdatesPane *)outputPane; +- (OutputPane *)outputPane; +- (ScrobblerPane *)scrobblerPane; @end diff --git a/Preferences/General/PrefPaneController.m b/Preferences/General/PrefPaneController.m index 65a49d3a1..481e5a6a7 100644 --- a/Preferences/General/PrefPaneController.m +++ b/Preferences/General/PrefPaneController.m @@ -18,7 +18,7 @@ PrefPaneController *prefPaneController = [[PrefPaneController alloc] init]; loaded = [NSBundle loadNibNamed:@"Preferences" owner:prefPaneController]; - return [NSArray arrayWithObjects: [prefPaneController hotKeyPane], [prefPaneController fileDrawerPane], [prefPaneController remotePane], [prefPaneController updatesPane], [prefPaneController outputPane], nil]; + return [NSArray arrayWithObjects: [prefPaneController hotKeyPane], [prefPaneController fileDrawerPane], [prefPaneController remotePane], [prefPaneController updatesPane], [prefPaneController outputPane], [prefPaneController scrobblerPane], nil]; } - (HotKeyPane *)hotKeyPane @@ -46,4 +46,9 @@ return outputPane; } +- (ScrobblerPane *)scrobblerPane +{ + return scrobblerPane; +} + @end diff --git a/Preferences/General/RemotePane.h b/Preferences/General/RemotePane.h index edf0b1f95..afbd62675 100644 --- a/Preferences/General/RemotePane.h +++ b/Preferences/General/RemotePane.h @@ -11,9 +11,7 @@ @interface RemotePane : PreferencePane { - IBOutlet NSButton *onlyOnActive; + } -- (IBAction)takeBool:(id)sender; - @end diff --git a/Preferences/General/RemotePane.m b/Preferences/General/RemotePane.m index 095a6eabd..98688dc53 100644 --- a/Preferences/General/RemotePane.m +++ b/Preferences/General/RemotePane.m @@ -15,13 +15,6 @@ { [self setName:@"Remote"]; [self setIcon:@"apple_remote"]; - - [onlyOnActive setState:[[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"remoteOnlyOnActive"] boolValue]]; -} - -- (IBAction)takeBool:(id)sender -{ - [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:[onlyOnActive state]] forKey:@"remoteOnlyOnActive"]; } @end diff --git a/Preferences/General/ScrobblerPane.h b/Preferences/General/ScrobblerPane.h new file mode 100644 index 000000000..4f64cc7de --- /dev/null +++ b/Preferences/General/ScrobblerPane.h @@ -0,0 +1,17 @@ +// +// FileDrawerPane.h +// Preferences +// +// Created by Vincent Spader on 9/4/06. +// Copyright 2006 Vincent Spader. All rights reserved. +// + +#import +#import "PreferencePane.h" + + +@interface ScrobblerPane : PreferencePane { + +} + +@end diff --git a/Preferences/General/ScrobblerPane.m b/Preferences/General/ScrobblerPane.m new file mode 100644 index 000000000..c52c7cec0 --- /dev/null +++ b/Preferences/General/ScrobblerPane.m @@ -0,0 +1,20 @@ +// +// FileDrawerPane.m +// Preferences +// +// Created by Vincent Spader on 9/4/06. +// Copyright 2006 Vincent Spader. All rights reserved. +// + +#import "ScrobblerPane.h" + + +@implementation ScrobblerPane + +- (void)awakeFromNib +{ + [self setName:@"Last.fm"]; + [self setIcon:@"lastfm"]; +} + +@end