kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed File Tree preferences.

CQTexperiment
vspader 2008-02-17 19:27:29 +00:00
parent fabb91d691
commit 1503c2868f
13 changed files with 2725 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Application/AppController.m
View File

@ -349,8 +349,6 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
[userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSControlKeyMask|NSCommandKeyMask)] forKey:@"hotKeyPreviousModifiers"]; [userDefaultsValuesDict setObject:[NSNumber numberWithInt:(NSControlKeyMask|NSCommandKeyMask)] forKey:@"hotKeyPreviousModifiers"];
[userDefaultsValuesDict setObject:[NSNumber numberWithInt:'R'] forKey:@"hotKeyPreviousCharacter"]; [userDefaultsValuesDict setObject:[NSNumber numberWithInt:'R'] forKey:@"hotKeyPreviousCharacter"];
[userDefaultsValuesDict setObject:[@"~/Music" stringByExpandingTildeInPath] forKey:@"fileDrawerRootPath"];
[userDefaultsValuesDict setObject:[NSNumber numberWithBool:YES] forKey:@"remoteEnabled"]; [userDefaultsValuesDict setObject:[NSNumber numberWithBool:YES] forKey:@"remoteEnabled"];
[userDefaultsValuesDict setObject:[NSNumber numberWithBool:YES] forKey:@"remoteOnlyOnActive"]; [userDefaultsValuesDict setObject:[NSNumber numberWithBool:YES] forKey:@"remoteOnlyOnActive"];
@ -365,8 +363,6 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.hotKeyPreviousKeyCode" options:0 context:nil]; [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.hotKeyPreviousKeyCode" options:0 context:nil];
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.hotKeyNextKeyCode" options:0 context:nil]; [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.hotKeyNextKeyCode" options:0 context:nil];
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.fileDrawerRootPath" options:0 context:nil];
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.fileDrawerRootPath" options:0 context:nil]; [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.fileDrawerRootPath" options:0 context:nil];
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.fileDrawerRootPath" options:0 context:nil]; [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.fileDrawerRootPath" options:0 context:nil];
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.fileDrawerRootPath" options:0 context:nil]; [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.fileDrawerRootPath" options:0 context:nil];

26
FileTreeWindow/FileTreeDataSource.m
View File

@ -14,11 +14,35 @@
@implementation FileTreeDataSource @implementation FileTreeDataSource
- (void)initDefaults
{
NSMutableDictionary *userDefaultsValuesDict = [NSMutableDictionary dictionary];
[userDefaultsValuesDict setObject:[@"~/Music" stringByExpandingTildeInPath] forKey:@"fileTreeRootPath"];
[[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict];
[[NSUserDefaults standardUserDefaults] synchronize];
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.fileTreeRootPath" options:0 context:nil];
}
- (void)awakeFromNib - (void)awakeFromNib
{ {
[self setRootPath: [[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileDrawerRootPath"] ]; [self initDefaults];
[self setRootPath: [[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootPath"] ];
} }
- (void) observeValueForKeyPath:(NSString *)keyPath
ofObject:(id)object
change:(NSDictionary *)change
context:(void *)context
{
if ([keyPath isEqualToString:@"values.fileTreeRootPath"]) {
[self setRootPath:[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootPath"]];
}
}
- (NSString *)rootPath - (NSString *)rootPath
{ {
return [[rootNode url] path]; return [[rootNode url] path];

1
KnownIssues
View File

@ -7,5 +7,4 @@ Code for fading and seeking should be moved into the AudioPlayer,
so we can escape ugly event* functions so we can escape ugly event* functions
File tree window root path user setting needs to be watched for changes.
File tree window no longer changes text size. File tree window no longer changes text size.

157
Preferences/General/English.lproj/Preferences.nib/classes.nib generated
View File

@ -1,157 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBClasses</key>
<array>
<dict>
<key>CLASS</key>
<string>AppcastArrayController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSArrayController</string>
</dict>
<dict>
<key>CLASS</key>
<string>HotKeyControl</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NDHotKeyControl</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>grabNextHotKey</key>
<string>id</string>
<key>grabPlayHotKey</key>
<string>id</string>
<key>grabPrevHotKey</key>
<string>id</string>
<key>hotKeyChanged</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>HotKeyPane</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>nextHotKeyControl</key>
<string>HotKeyControl</string>
<key>playHotKeyControl</key>
<string>HotKeyControl</string>
<key>prevHotKeyControl</key>
<string>HotKeyControl</string>
</dict>
<key>SUPERCLASS</key>
<string>PreferencePane</string>
</dict>
<dict>
<key>CLASS</key>
<string>PrefPaneController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>fileDrawerPane</key>
<string>FileDrawerPane</string>
<key>hotKeyPane</key>
<string>HotKeyPane</string>
<key>outputPane</key>
<string>OutputPane</string>
<key>remoteView</key>
<string>NSView</string>
<key>scrobblerView</key>
<string>NSView</string>
<key>updatesView</key>
<string>NSView</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>OutputsArrayController</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSArrayController</string>
</dict>
<dict>
<key>CLASS</key>
<string>FirstResponder</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSObject</string>
<key>LANGUAGE</key>
<string>ObjC</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>openSheet</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>FileDrawerPane</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>rootPathTextView</key>
<string>NSTextField</string>
</dict>
<key>SUPERCLASS</key>
<string>PreferencePane</string>
</dict>
<dict>
<key>CLASS</key>
<string>NDHotKeyControl</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSTextField</string>
</dict>
<dict>
<key>CLASS</key>
<string>PreferencePane</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>view</key>
<string>NSView</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>takeDeviceID</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>OutputPane</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>outputDevices</key>
<string>OutputsArrayController</string>
</dict>
<key>SUPERCLASS</key>
<string>PreferencePane</string>
</dict>
</array>
<key>IBVersion</key>
<string>1</string>
</dict>
</plist>

20
Preferences/General/English.lproj/Preferences.nib/info.nib generated
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBFramework Version</key>
<string>629</string>
<key>IBLastKnownRelativeProjectPath</key>
<string>../../General.xcodeproj</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
<integer>10</integer>
</array>
<key>IBSystem Version</key>
<string>9B18</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
</plist>

BIN
Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib generated
View File

Binary file not shown.

2668
Preferences/General/English.lproj/Preferences.xib Normal file
View File

File diff suppressed because it is too large Load Diff

4
Preferences/General/FileDrawerPane.h → Preferences/General/FileTreePane.h
View File

@ -1,5 +1,5 @@
// //
// FileDrawerPane.h // FileTreePane.h
// Preferences // Preferences
// //
// Created by Vincent Spader on 9/4/06. // Created by Vincent Spader on 9/4/06.
@ -10,7 +10,7 @@
#import "PreferencePane.h" #import "PreferencePane.h"
@interface FileDrawerPane : PreferencePane { @interface FileTreePane : PreferencePane {
IBOutlet NSTextField *rootPathTextView; IBOutlet NSTextField *rootPathTextView;
} }

14
Preferences/General/FileDrawerPane.m → Preferences/General/FileTreePane.m
View File

@ -1,22 +1,22 @@
// //
// FileDrawerPane.m // FileTreePane.m
// Preferences // Preferences
// //
// Created by Vincent Spader on 9/4/06. // Created by Vincent Spader on 9/4/06.
// Copyright 2006 Vincent Spader. All rights reserved. // Copyright 2006 Vincent Spader. All rights reserved.
// //
#import "FileDrawerPane.h" #import "FileTreePane.h"
@implementation FileDrawerPane @implementation FileTreePane
- (void)awakeFromNib - (void)awakeFromNib
{ {
[self setName:NSLocalizedStringFromTableInBundle(@"File Drawer", nil, [NSBundle bundleForClass:[self class]], @"") ]; [self setName:NSLocalizedStringFromTableInBundle(@"File Tree", nil, [NSBundle bundleForClass:[self class]], @"") ];
[self setIcon:@"file_drawer"]; [self setIcon:@"file_tree"];
[rootPathTextView setStringValue:[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileDrawerRootPath"]]; [rootPathTextView setStringValue:[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootPath"]];
} }
- (IBAction)openSheet:(id)sender - (IBAction)openSheet:(id)sender
@ -38,7 +38,7 @@
if (returnCode == NSOKButton) if (returnCode == NSOKButton)
{ {
[rootPathTextView setStringValue:[panel filename]]; [rootPathTextView setStringValue:[panel filename]];
[[NSUserDefaults standardUserDefaults] setObject:[panel filename] forKey:@"fileDrawerRootPath"]; [[NSUserDefaults standardUserDefaults] setObject:[panel filename] forKey:@"fileTreeRootPath"];
} }
} }

34
Preferences/General/General.xcodeproj/project.pbxproj
View File

@ -16,14 +16,14 @@
17C643690B8A788000C53518 /* output.png in Resources */ = {isa = PBXBuildFile; fileRef = 17C643680B8A788000C53518 /* output.png */; }; 17C643690B8A788000C53518 /* output.png in Resources */ = {isa = PBXBuildFile; fileRef = 17C643680B8A788000C53518 /* output.png */; };
17C644330B8A791D00C53518 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C644310B8A791D00C53518 /* CoreAudio.framework */; }; 17C644330B8A791D00C53518 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C644310B8A791D00C53518 /* CoreAudio.framework */; };
17E41DB80C130AA500AC744D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 17E41DB70C130AA500AC744D /* Localizable.strings */; }; 17E41DB80C130AA500AC744D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 17E41DB70C130AA500AC744D /* Localizable.strings */; };
17E78A7B0D68BE1E005C5A59 /* FileTreePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E78A7A0D68BE1E005C5A59 /* FileTreePane.m */; };
17E78A7E0D68BE3C005C5A59 /* file_tree.png in Resources */ = {isa = PBXBuildFile; fileRef = 17E78A7D0D68BE3C005C5A59 /* file_tree.png */; };
17E78B6A0D68C1E3005C5A59 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17E78B680D68C1E3005C5A59 /* Preferences.xib */; };
8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
8E07AA870AAC8EA200A4B32F /* FileDrawerPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AA7F0AAC8EA200A4B32F /* FileDrawerPane.m */; };
8E07AA880AAC8EA200A4B32F /* HotKeyPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */; }; 8E07AA880AAC8EA200A4B32F /* HotKeyPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */; };
8E07AA890AAC8EA200A4B32F /* PreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AA830AAC8EA200A4B32F /* PreferencePane.m */; }; 8E07AA890AAC8EA200A4B32F /* PreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AA830AAC8EA200A4B32F /* PreferencePane.m */; };
8E07AA8A0AAC8EA200A4B32F /* PrefPaneController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AA850AAC8EA200A4B32F /* PrefPaneController.m */; }; 8E07AA8A0AAC8EA200A4B32F /* PrefPaneController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AA850AAC8EA200A4B32F /* PrefPaneController.m */; };
8E07ABDC0AAC95BC00A4B32F /* file_drawer.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E07ABDA0AAC95BC00A4B32F /* file_drawer.png */; };
8E07ABDD0AAC95BC00A4B32F /* hot_keys.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E07ABDB0AAC95BC00A4B32F /* hot_keys.png */; }; 8E07ABDD0AAC95BC00A4B32F /* hot_keys.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E07ABDB0AAC95BC00A4B32F /* hot_keys.png */; };
8E07AC050AAC968C00A4B32F /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 8E07AC030AAC968C00A4B32F /* Preferences.nib */; };
8E15A86C0B894768006DC802 /* updates.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E15A86B0B894768006DC802 /* updates.png */; }; 8E15A86C0B894768006DC802 /* updates.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E15A86B0B894768006DC802 /* updates.png */; };
8E6C12160AACAE4100819171 /* NDHotKeyControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6C12130AACAE4100819171 /* NDHotKeyControl.m */; }; 8E6C12160AACAE4100819171 /* NDHotKeyControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6C12130AACAE4100819171 /* NDHotKeyControl.m */; };
8E6C12170AACAE4100819171 /* NDHotKeyEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6C12150AACAE4100819171 /* NDHotKeyEvent.m */; }; 8E6C12170AACAE4100819171 /* NDHotKeyEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6C12150AACAE4100819171 /* NDHotKeyEvent.m */; };
@ -47,11 +47,13 @@
17C643680B8A788000C53518 /* output.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = output.png; path = Icons/output.png; sourceTree = "<group>"; }; 17C643680B8A788000C53518 /* output.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = output.png; path = Icons/output.png; sourceTree = "<group>"; };
17C644310B8A791D00C53518 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; }; 17C644310B8A791D00C53518 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
17E41DB50C130A9D00AC744D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; 17E41DB50C130A9D00AC744D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
17E78A790D68BE1E005C5A59 /* FileTreePane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileTreePane.h; sourceTree = "<group>"; };
17E78A7A0D68BE1E005C5A59 /* FileTreePane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileTreePane.m; sourceTree = "<group>"; };
17E78A7D0D68BE3C005C5A59 /* file_tree.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = file_tree.png; path = Icons/file_tree.png; sourceTree = "<group>"; };
17E78B690D68C1E3005C5A59 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preferences.xib; sourceTree = "<group>"; };
32DBCF630370AF2F00C91783 /* General_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = General_Prefix.pch; sourceTree = "<group>"; }; 32DBCF630370AF2F00C91783 /* General_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = General_Prefix.pch; sourceTree = "<group>"; };
8D5B49B6048680CD000E48DA /* General.preferencePane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = General.preferencePane; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B6048680CD000E48DA /* General.preferencePane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = General.preferencePane; sourceTree = BUILT_PRODUCTS_DIR; };
8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
8E07AA7E0AAC8EA200A4B32F /* FileDrawerPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FileDrawerPane.h; sourceTree = "<group>"; };
8E07AA7F0AAC8EA200A4B32F /* FileDrawerPane.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FileDrawerPane.m; sourceTree = "<group>"; };
8E07AA800AAC8EA200A4B32F /* HotKeyPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HotKeyPane.h; sourceTree = "<group>"; }; 8E07AA800AAC8EA200A4B32F /* HotKeyPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HotKeyPane.h; sourceTree = "<group>"; };
8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HotKeyPane.m; sourceTree = "<group>"; }; 8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HotKeyPane.m; sourceTree = "<group>"; };
8E07AA820AAC8EA200A4B32F /* PreferencePane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencePane.h; sourceTree = "<group>"; }; 8E07AA820AAC8EA200A4B32F /* PreferencePane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencePane.h; sourceTree = "<group>"; };
@ -59,9 +61,7 @@
8E07AA840AAC8EA200A4B32F /* PrefPaneController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PrefPaneController.h; sourceTree = "<group>"; }; 8E07AA840AAC8EA200A4B32F /* PrefPaneController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PrefPaneController.h; sourceTree = "<group>"; };
8E07AA850AAC8EA200A4B32F /* PrefPaneController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PrefPaneController.m; sourceTree = "<group>"; }; 8E07AA850AAC8EA200A4B32F /* PrefPaneController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PrefPaneController.m; sourceTree = "<group>"; };
8E07AA860AAC8EA200A4B32F /* SS_PreferencePaneProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SS_PreferencePaneProtocol.h; sourceTree = "<group>"; }; 8E07AA860AAC8EA200A4B32F /* SS_PreferencePaneProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SS_PreferencePaneProtocol.h; sourceTree = "<group>"; };
8E07ABDA0AAC95BC00A4B32F /* file_drawer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = file_drawer.png; path = Icons/file_drawer.png; sourceTree = "<group>"; };
8E07ABDB0AAC95BC00A4B32F /* hot_keys.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = hot_keys.png; path = Icons/hot_keys.png; sourceTree = "<group>"; }; 8E07ABDB0AAC95BC00A4B32F /* hot_keys.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = hot_keys.png; path = Icons/hot_keys.png; sourceTree = "<group>"; };
8E07AC040AAC968C00A4B32F /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; };
8E15A86B0B894768006DC802 /* updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = updates.png; path = Icons/updates.png; sourceTree = "<group>"; }; 8E15A86B0B894768006DC802 /* updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = updates.png; path = Icons/updates.png; sourceTree = "<group>"; };
8E6C12120AACAE4100819171 /* NDHotKeyControl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NDHotKeyControl.h; sourceTree = "<group>"; }; 8E6C12120AACAE4100819171 /* NDHotKeyControl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NDHotKeyControl.h; sourceTree = "<group>"; };
8E6C12130AACAE4100819171 /* NDHotKeyControl.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NDHotKeyControl.m; sourceTree = "<group>"; }; 8E6C12130AACAE4100819171 /* NDHotKeyControl.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NDHotKeyControl.m; sourceTree = "<group>"; };
@ -110,10 +110,10 @@
089C167CFE841241C02AAC07 /* Resources */ = { 089C167CFE841241C02AAC07 /* Resources */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
17E78B680D68C1E3005C5A59 /* Preferences.xib */,
8E07ABD90AAC95AF00A4B32F /* Icons */, 8E07ABD90AAC95AF00A4B32F /* Icons */,
8D5B49B7048680CD000E48DA /* Info.plist */, 8D5B49B7048680CD000E48DA /* Info.plist */,
178E386D0C3DA64500EE6711 /* InfoPlist.strings */, 178E386D0C3DA64500EE6711 /* InfoPlist.strings */,
8E07AC030AAC968C00A4B32F /* Preferences.nib */,
17E41DB70C130AA500AC744D /* Localizable.strings */, 17E41DB70C130AA500AC744D /* Localizable.strings */,
); );
name = Resources; name = Resources;
@ -153,10 +153,10 @@
17D5033F0ABDB1570022D1E8 /* Panes */ = { 17D5033F0ABDB1570022D1E8 /* Panes */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
17E78A790D68BE1E005C5A59 /* FileTreePane.h */,
17E78A7A0D68BE1E005C5A59 /* FileTreePane.m */,
8E07AA820AAC8EA200A4B32F /* PreferencePane.h */, 8E07AA820AAC8EA200A4B32F /* PreferencePane.h */,
8E07AA830AAC8EA200A4B32F /* PreferencePane.m */, 8E07AA830AAC8EA200A4B32F /* PreferencePane.m */,
8E07AA7E0AAC8EA200A4B32F /* FileDrawerPane.h */,
8E07AA7F0AAC8EA200A4B32F /* FileDrawerPane.m */,
8E07AA800AAC8EA200A4B32F /* HotKeyPane.h */, 8E07AA800AAC8EA200A4B32F /* HotKeyPane.h */,
8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */, 8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */,
17C6433D0B8A783F00C53518 /* OutputPane.h */, 17C6433D0B8A783F00C53518 /* OutputPane.h */,
@ -201,11 +201,11 @@
8E07ABD90AAC95AF00A4B32F /* Icons */ = { 8E07ABD90AAC95AF00A4B32F /* Icons */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
17E78A7D0D68BE3C005C5A59 /* file_tree.png */,
1766C7A70B912A71004A7AE4 /* lastfm.png */, 1766C7A70B912A71004A7AE4 /* lastfm.png */,
17C643680B8A788000C53518 /* output.png */, 17C643680B8A788000C53518 /* output.png */,
8E15A86B0B894768006DC802 /* updates.png */, 8E15A86B0B894768006DC802 /* updates.png */,
172D72AC0B8926CA00D095BB /* apple_remote.png */, 172D72AC0B8926CA00D095BB /* apple_remote.png */,
8E07ABDA0AAC95BC00A4B32F /* file_drawer.png */,
8E07ABDB0AAC95BC00A4B32F /* hot_keys.png */, 8E07ABDB0AAC95BC00A4B32F /* hot_keys.png */,
); );
name = Icons; name = Icons;
@ -265,14 +265,14 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
178E386E0C3DA64500EE6711 /* InfoPlist.strings in Resources */, 178E386E0C3DA64500EE6711 /* InfoPlist.strings in Resources */,
8E07ABDC0AAC95BC00A4B32F /* file_drawer.png in Resources */,
8E07ABDD0AAC95BC00A4B32F /* hot_keys.png in Resources */, 8E07ABDD0AAC95BC00A4B32F /* hot_keys.png in Resources */,
8E07AC050AAC968C00A4B32F /* Preferences.nib in Resources */,
172D72AD0B8926CA00D095BB /* apple_remote.png in Resources */, 172D72AD0B8926CA00D095BB /* apple_remote.png in Resources */,
8E15A86C0B894768006DC802 /* updates.png in Resources */, 8E15A86C0B894768006DC802 /* updates.png in Resources */,
17C643690B8A788000C53518 /* output.png in Resources */, 17C643690B8A788000C53518 /* output.png in Resources */,
1766C7A80B912A71004A7AE4 /* lastfm.png in Resources */, 1766C7A80B912A71004A7AE4 /* lastfm.png in Resources */,
17E41DB80C130AA500AC744D /* Localizable.strings in Resources */, 17E41DB80C130AA500AC744D /* Localizable.strings in Resources */,
17E78A7E0D68BE3C005C5A59 /* file_tree.png in Resources */,
17E78B6A0D68C1E3005C5A59 /* Preferences.xib in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -283,7 +283,6 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
8E07AA870AAC8EA200A4B32F /* FileDrawerPane.m in Sources */,
8E07AA880AAC8EA200A4B32F /* HotKeyPane.m in Sources */, 8E07AA880AAC8EA200A4B32F /* HotKeyPane.m in Sources */,
8E07AA890AAC8EA200A4B32F /* PreferencePane.m in Sources */, 8E07AA890AAC8EA200A4B32F /* PreferencePane.m in Sources */,
8E07AA8A0AAC8EA200A4B32F /* PrefPaneController.m in Sources */, 8E07AA8A0AAC8EA200A4B32F /* PrefPaneController.m in Sources */,
@ -293,6 +292,7 @@
17C643380B8A77CC00C53518 /* OutputsArrayController.m in Sources */, 17C643380B8A77CC00C53518 /* OutputsArrayController.m in Sources */,
17C6433F0B8A783F00C53518 /* OutputPane.m in Sources */, 17C6433F0B8A783F00C53518 /* OutputPane.m in Sources */,
170744AD0BFF3938002475C9 /* AppcastArrayController.m in Sources */, 170744AD0BFF3938002475C9 /* AppcastArrayController.m in Sources */,
17E78A7B0D68BE1E005C5A59 /* FileTreePane.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -315,12 +315,12 @@
name = Localizable.strings; name = Localizable.strings;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
8E07AC030AAC968C00A4B32F /* Preferences.nib */ = { 17E78B680D68C1E3005C5A59 /* Preferences.xib */ = {
isa = PBXVariantGroup; isa = PBXVariantGroup;
children = ( children = (
8E07AC040AAC968C00A4B32F /* English */, 17E78B690D68C1E3005C5A59 /* English */,
); );
name = Preferences.nib; name = Preferences.xib;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
/* End PBXVariantGroup section */ /* End PBXVariantGroup section */

0
Preferences/General/Icons/file_drawer.png → Preferences/General/Icons/file_tree.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

6
Preferences/General/PrefPaneController.h
View File

@ -10,12 +10,12 @@
#import "SS_PreferencePaneProtocol.h" #import "SS_PreferencePaneProtocol.h"
#import "HotKeyPane.h" #import "HotKeyPane.h"
#import "FileDrawerPane.h" #import "FileTreePane.h"
#import "OutputPane.h" #import "OutputPane.h"
@interface PrefPaneController : NSObject <SS_PreferencePaneProtocol> { @interface PrefPaneController : NSObject <SS_PreferencePaneProtocol> {
IBOutlet HotKeyPane *hotKeyPane; IBOutlet HotKeyPane *hotKeyPane;
IBOutlet FileDrawerPane *fileDrawerPane; IBOutlet FileTreePane *fileTreePane;
IBOutlet OutputPane *outputPane; IBOutlet OutputPane *outputPane;
IBOutlet NSView *scrobblerView; IBOutlet NSView *scrobblerView;
@ -24,7 +24,7 @@
} }
- (HotKeyPane *)hotKeyPane; - (HotKeyPane *)hotKeyPane;
- (FileDrawerPane *)fileDrawerPane; - (FileTreePane *)fileTreePane;
- (OutputPane *)outputPane; - (OutputPane *)outputPane;
- (PreferencePane *)remotePane; - (PreferencePane *)remotePane;

6
Preferences/General/PrefPaneController.m
View File

@ -18,7 +18,7 @@
PrefPaneController *prefPaneController = [[PrefPaneController alloc] init]; PrefPaneController *prefPaneController = [[PrefPaneController alloc] init];
loaded = [NSBundle loadNibNamed:@"Preferences" owner:prefPaneController]; loaded = [NSBundle loadNibNamed:@"Preferences" owner:prefPaneController];
return [NSArray arrayWithObjects: [prefPaneController hotKeyPane], [prefPaneController fileDrawerPane], [prefPaneController remotePane], [prefPaneController updatesPane], [prefPaneController outputPane], [prefPaneController scrobblerPane], nil]; return [NSArray arrayWithObjects: [prefPaneController hotKeyPane], [prefPaneController fileTreePane], [prefPaneController remotePane], [prefPaneController updatesPane], [prefPaneController outputPane], [prefPaneController scrobblerPane], nil];
} }
- (HotKeyPane *)hotKeyPane - (HotKeyPane *)hotKeyPane
@ -26,9 +26,9 @@
return hotKeyPane; return hotKeyPane;
} }
- (FileDrawerPane *)fileDrawerPane - (FileTreePane *)fileTreePane
{ {
return fileDrawerPane; return fileTreePane;
} }
- (OutputPane *)outputPane - (OutputPane *)outputPane