diff --git a/Application/AppController.m b/Application/AppController.m index 4a6e4fb58..246cc427f 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -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:'R'] forKey:@"hotKeyPreviousCharacter"]; - [userDefaultsValuesDict setObject:[@"~/Music" stringByExpandingTildeInPath] forKey:@"fileDrawerRootPath"]; - [userDefaultsValuesDict setObject:[NSNumber numberWithBool:YES] forKey:@"remoteEnabled"]; [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.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]; diff --git a/FileTreeWindow/FileTreeDataSource.m b/FileTreeWindow/FileTreeDataSource.m index 9034bb502..15fad27e7 100644 --- a/FileTreeWindow/FileTreeDataSource.m +++ b/FileTreeWindow/FileTreeDataSource.m @@ -14,11 +14,35 @@ @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 { - [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 { return [[rootNode url] path]; diff --git a/KnownIssues b/KnownIssues index da4b95dd5..9d93606a2 100644 --- a/KnownIssues +++ b/KnownIssues @@ -7,5 +7,4 @@ Code for fading and seeking should be moved into the AudioPlayer, 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. \ No newline at end of file diff --git a/Preferences/General/English.lproj/Preferences.nib/classes.nib b/Preferences/General/English.lproj/Preferences.nib/classes.nib deleted file mode 100644 index d5982ce21..000000000 --- a/Preferences/General/English.lproj/Preferences.nib/classes.nib +++ /dev/null @@ -1,157 +0,0 @@ - - - - - IBClasses - - - CLASS - AppcastArrayController - LANGUAGE - ObjC - SUPERCLASS - NSArrayController - - - CLASS - HotKeyControl - LANGUAGE - ObjC - SUPERCLASS - NDHotKeyControl - - - ACTIONS - - grabNextHotKey - id - grabPlayHotKey - id - grabPrevHotKey - id - hotKeyChanged - id - - CLASS - HotKeyPane - LANGUAGE - ObjC - OUTLETS - - nextHotKeyControl - HotKeyControl - playHotKeyControl - HotKeyControl - prevHotKeyControl - HotKeyControl - - SUPERCLASS - PreferencePane - - - CLASS - PrefPaneController - LANGUAGE - ObjC - OUTLETS - - fileDrawerPane - FileDrawerPane - hotKeyPane - HotKeyPane - outputPane - OutputPane - remoteView - NSView - scrobblerView - NSView - updatesView - NSView - - SUPERCLASS - NSObject - - - CLASS - OutputsArrayController - LANGUAGE - ObjC - SUPERCLASS - NSArrayController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - ACTIONS - - openSheet - id - - CLASS - FileDrawerPane - LANGUAGE - ObjC - OUTLETS - - rootPathTextView - NSTextField - - SUPERCLASS - PreferencePane - - - CLASS - NDHotKeyControl - LANGUAGE - ObjC - SUPERCLASS - NSTextField - - - CLASS - PreferencePane - LANGUAGE - ObjC - OUTLETS - - view - NSView - - SUPERCLASS - NSObject - - - ACTIONS - - takeDeviceID - id - - CLASS - OutputPane - LANGUAGE - ObjC - OUTLETS - - outputDevices - OutputsArrayController - - SUPERCLASS - PreferencePane - - - IBVersion - 1 - - diff --git a/Preferences/General/English.lproj/Preferences.nib/info.nib b/Preferences/General/English.lproj/Preferences.nib/info.nib deleted file mode 100644 index ed1752370..000000000 --- a/Preferences/General/English.lproj/Preferences.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 629 - IBLastKnownRelativeProjectPath - ../../General.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 10 - - IBSystem Version - 9B18 - targetFramework - IBCocoaFramework - - diff --git a/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib b/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib deleted file mode 100644 index 64a4acf16..000000000 Binary files a/Preferences/General/English.lproj/Preferences.nib/keyedobjects.nib and /dev/null differ diff --git a/Preferences/General/English.lproj/Preferences.xib b/Preferences/General/English.lproj/Preferences.xib new file mode 100644 index 000000000..34eab9340 --- /dev/null +++ b/Preferences/General/English.lproj/Preferences.xib @@ -0,0 +1,2668 @@ + + + + 1050 + 9C31 + 629 + 949.26 + 352.00 + + YES + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + PrefPaneController + + + FirstResponder + + + NSApplication + + + FileTreePane + + + HotKeyPane + + + + 256 + + YES + + + 256 + {{20, 20}, {311, 19}} + + YES + + -1804468671 + 272761856 + + + LucidaGrande + 1.100000e+01 + 3100 + + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + + textColor + + 3 + MAA + + + + + + + 256 + {{333, 12}, {85, 32}} + + YES + + 67239424 + 134217728 + Browse + + + 1.300000e+01 + 1044 + + + -2038284033 + 1 + + + + + + 200 + 25 + + + + {432, 60} + NSView + NSResponder + + + + 256 + + YES + + + 256 + {{91, 70}, {82, 19}} + + YES + + -2075001280 + 4326400 + + + + YES + + + + + + + 256 + {{175, 62}, {64, 32}} + + YES + + 67239424 + 134217728 + Edit + + + -2038284033 + 1 + + + + + + 200 + 25 + + + + + 256 + {{45, 72}, {39, 17}} + + YES + + 67239424 + 272629760 + Play: + + + + 6 + + controlColor + + 3 + MC42NjY2NjY2OQA + + + + 6 + + controlTextColor + + + + + + + 256 + {{17, 47}, {69, 17}} + + YES + + 67239424 + 272629760 + Previous: + + + + + + + + + 256 + {{40, 22}, {44, 17}} + + YES + + 67239424 + 272629760 + Next: + + + + + + + + + 256 + {{91, 45}, {82, 19}} + + YES + + -2075001280 + 4326400 + + + + YES + + + + + + + 256 + {{91, 20}, {82, 19}} + + YES + + -2075001280 + 4326400 + + + + YES + + + + + + + 256 + {{175, 37}, {64, 32}} + + YES + + 67239424 + 134217728 + + + + -2038284033 + 1 + + + + + + 200 + 25 + + + + + 256 + {{175, 12}, {64, 32}} + + YES + + 67239424 + 134217728 + + + + -2038284033 + 1 + + + + + + 200 + 25 + + + + {432, 109} + + NSView + + + + + + 256 + + YES + + + 256 + {{18, 18}, {281, 18}} + + YES + + 67239424 + 0 + Only listen to remote when Cog is active. + + + 1211912703 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + + + 256 + {{18, 38}, {281, 18}} + + YES + + 67239424 + 0 + Enable remote control. + + + 1211912703 + 2 + + + + + 200 + 25 + + + + {432, 74} + + NSView + + + + + + 256 + + YES + + + 256 + {{18, 46}, {299, 18}} + + YES + + 67239424 + 0 + Automatically check for updates on startup. + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 256 + {{111, 16}, {207, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + + 1.300000e+01 + 16 + + + + + + 400 + 75 + + + Stable + + 1048576 + 2147483647 + 1 + + + NSMenuCheckmark + + + + NSMenuMixedState + + _popUpItemAction: + + + YES + + + OtherViews + + + YES + + + + Unstable + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Nightly + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 3 + YES + YES + 1 + + + + + 256 + {{17, 23}, {92, 17}} + + YES + + 67239424 + 272629760 + Update Feed: + + + + + + + + {432, 82} + + + + + YES + + + OutputPane + + + + 256 + + YES + + + 256 + {{122, 16}, {252, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + + + + + 400 + 75 + + + Item1 + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + + OtherViews + + + YES + + + + Item2 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Item3 + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + 3 + YES + YES + 1 + + + + + 256 + {{17, 22}, {103, 17}} + + YES + + 67239424 + 272629760 + Output Device: + + + + + + + + {432, 59} + + NSView + + + + + + YES + name + + YES + + YES + YES + YES + YES + YES + + + + 256 + + YES + + + 256 + {{18, 38}, {396, 18}} + + YES + + 67239424 + 0 + Enable Last.fm support. (Must have Last.fm client installed) + + + 1211912703 + 2 + + + + + 200 + 25 + + + + + 256 + {{18, 18}, {396, 18}} + + YES + + 67239424 + 0 + Automatically launch Last.fm client. + + + 1211912703 + 2 + + + + + 200 + 25 + + + + {432, 74} + + NSView + + + + + + YES + + url + + NSDictionary + + YES + YES + YES + YES + + + + + YES + + + view + + + + 12 + + + + hotKeyPane + + + + 14 + + + + hotKeyChanged: + + + + 20 + + + + nextKeyView + + + + 22 + + + + + + + + 23 + + + + grabPlayHotKey: + + + + 31 + + + + grabPrevHotKey: + + + + 32 + + + + grabNextHotKey: + + + + 33 + + + + playHotKeyControl + + + + 34 + + + + prevHotKeyControl + + + + 35 + + + + nextHotKeyControl + + + + 36 + + + + + + + + 37 + + + + + + + + 38 + + + + openSheet: + + + + 41 + + + + rootPathTextView + + + + 42 + + + + value: values.SUCheckAtStartup + + + + + + + value + values.SUCheckAtStartup + 2 + + + 53 + + + + content: arrangedObjects + + + + + + + content + arrangedObjects + 2 + + + 69 + + + + contentValues: arrangedObjects.name + + + + + + + contentValues + arrangedObjects.name + + 2 + + + 71 + + + + selectedIndex: selectionIndex + + + + + + + selectedIndex + selectionIndex + + 2 + + + 72 + + + + + + + + 73 + + + + takeDeviceID: + + + + 74 + + + + outputPane + + + + 75 + + + + outputDevices + + + + 76 + + + + value: values.remoteOnlyOnActive + + + + + + + + values.remoteOnlyOnActive + 2 + + + 79 + + + + value: values.enableAudioScrobbler + + + + + + + + values.enableAudioScrobbler + 2 + + + 90 + + + + enabled: values.enableAudioScrobbler + + + + + + + enabled + + 2 + + + 93 + + + + value: values.automaticallyLaunchLastFM + + + + + + + + values.automaticallyLaunchLastFM + 2 + + + 95 + + + + value: values.remoteEnabled + + + + + + + + values.remoteEnabled + 2 + + + 97 + + + + enabled: values.remoteEnabled + + + + + + + + + 2 + + + 98 + + + + updatesView + + + + 99 + + + + remoteView + + + + 100 + + + + scrobblerView + + + + 101 + + + + + + + + + + + + + 2 + + + 135 + + + + contentObjects: arrangedObjects.url + + + + + + + contentObjects + arrangedObjects.url + + 2 + + + 144 + + + + + + + + + + + + + + 2 + + + 145 + + + + selectedObject: values.SUFeedURL + + + + + + + selectedObject + values.SUFeedURL + + 2 + + + 147 + + + + + + + + 169 + + + + fileTreePane + + + + 192 + + + + + YES + + 0 + + YES + + + + + + -2 + + + RmlsZSdzIE93bmVyA + + + -1 + + + First Responder + + + -3 + + + Application + + + 5 + + + + + + 6 + + + + + + 10 + + + YES + + + + + FileTreeView + + + 39 + + + YES + + + + + + 40 + + + YES + + + + + + 11 + + + YES + + + + + + + + + + + + HotKeyView + + + 16 + + + YES + + + + + + 17 + + + YES + + + + + + 24 + + + YES + + + + + + 25 + + + YES + + + + + + 26 + + + YES + + + + + + 27 + + + YES + + + + + + 28 + + + YES + + + + + + 29 + + + YES + + + + + + 30 + + + YES + + + + + + 43 + + + YES + + + + + RemoteView + + + 44 + + + YES + + + + + + 77 + + + YES + + + + + + 50 + + + YES + + + + + + UpdatesView + + + 51 + + + YES + + + + + + 106 + + + YES + + + + + + 111 + + + YES + + + + + + 52 + + + Shared Defaults + + + 57 + + + + + + 58 + + + YES + + + + + OutputView + + + 60 + + + YES + + + + + + 65 + + + YES + + + + + + 59 + + + OutputDevices + + + 85 + + + YES + + + + + ScrobblerView + + + 87 + + + YES + + + + + + 88 + + + YES + + + + + + 115 + + + Appcasts + + + 194 + + + + + 195 + + + + + 196 + + + + + 197 + + + + + 198 + + + + + 199 + + + + + 200 + + + + + 201 + + + + + 202 + + + + + 203 + + + + + 204 + + + + + 205 + + + + + 206 + + + + + 207 + + + + + 208 + + + YES + + + + + + 209 + + + + + 210 + + + YES + + + + + + 211 + + + + + 212 + + + + + 213 + + + + + 107 + + + YES + + + + + + + + 110 + + + + + 109 + + + + + 108 + + + + + 61 + + + YES + + + + + + + + 64 + + + + + 63 + + + + + 62 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + -3.ImportedFromIB2 + 10.IBPluginDependency + 10.ImportedFromIB2 + 106.IBPluginDependency + 106.ImportedFromIB2 + 107.IBPluginDependency + 107.ImportedFromIB2 + 108.IBPluginDependency + 108.ImportedFromIB2 + 109.IBPluginDependency + 109.ImportedFromIB2 + 11.IBPluginDependency + 11.ImportedFromIB2 + 110.IBPluginDependency + 110.ImportedFromIB2 + 111.IBPluginDependency + 111.ImportedFromIB2 + 115.CustomClassName + 115.IBPluginDependency + 115.ImportedFromIB2 + 16.CustomClassName + 16.IBPluginDependency + 16.ImportedFromIB2 + 17.IBPluginDependency + 17.ImportedFromIB2 + 24.IBPluginDependency + 24.ImportedFromIB2 + 25.IBPluginDependency + 25.ImportedFromIB2 + 26.IBPluginDependency + 26.ImportedFromIB2 + 27.CustomClassName + 27.IBPluginDependency + 27.ImportedFromIB2 + 28.CustomClassName + 28.IBPluginDependency + 28.ImportedFromIB2 + 29.IBPluginDependency + 29.ImportedFromIB2 + 30.IBPluginDependency + 30.ImportedFromIB2 + 39.IBPluginDependency + 39.ImportedFromIB2 + 40.IBPluginDependency + 40.ImportedFromIB2 + 43.IBPluginDependency + 43.ImportedFromIB2 + 44.IBPluginDependency + 44.ImportedFromIB2 + 5.IBPluginDependency + 5.ImportedFromIB2 + 50.IBPluginDependency + 50.ImportedFromIB2 + 51.IBPluginDependency + 51.ImportedFromIB2 + 52.IBPluginDependency + 52.ImportedFromIB2 + 57.IBPluginDependency + 57.ImportedFromIB2 + 58.IBPluginDependency + 58.ImportedFromIB2 + 59.CustomClassName + 59.IBPluginDependency + 59.ImportedFromIB2 + 6.IBPluginDependency + 6.ImportedFromIB2 + 60.IBPluginDependency + 60.ImportedFromIB2 + 61.IBPluginDependency + 61.ImportedFromIB2 + 62.IBPluginDependency + 62.ImportedFromIB2 + 63.IBPluginDependency + 63.ImportedFromIB2 + 64.IBPluginDependency + 64.ImportedFromIB2 + 65.IBPluginDependency + 65.ImportedFromIB2 + 77.IBPluginDependency + 77.ImportedFromIB2 + 85.IBPluginDependency + 85.ImportedFromIB2 + 87.IBPluginDependency + 87.ImportedFromIB2 + 88.IBPluginDependency + 88.ImportedFromIB2 + + + YES + + + + + + + + + + + + + + + + + + + + + AppcastArrayController + + + HotKeyControl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OutputsArrayController + + + + + + + + + + + + + + + + + + + + + + + + + + + + YES + + YES + + + YES + + + + + YES + + YES + + + YES + + + + 213 + + + + YES + + NDHotKeyControl + NSTextField + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + IBProjectSource + NDHotKeyControl.h + + + + NDHotKeyControl + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + IBUserSource + + + + + PreferencePane + NSObject + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + + + + + PreferencePane + + + YES + + YES + + + YES + + + + view + + + + + PreferencePane.h + + + + PrefPaneController + + + YES + + YES + + + YES + + + + fileDrawerPane + FileDrawerPane + + + + + + + + PrefPaneController + + + YES + + YES + + + YES + + + + YES + + YES + fileTreePane + hotKeyPane + outputPane + remoteView + scrobblerView + updatesView + + + YES + FileTreePane + HotKeyPane + OutputPane + + + + + + + + PrefPaneController.h + + + + OutputPane + PreferencePane + + takeDeviceID: + id + + + outputDevices + OutputsArrayController + + + + OutputPane.h + + + + OutputPane + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + + + + + OutputsArrayController + NSArrayController + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + OutputsArrayController.h + + + + OutputsArrayController + NSArrayController + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + + + + + + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + + + + + + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + NDHotKeyEvent.h + + + + FirstResponder + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + + + + + HotKeyPane + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + + + + + HotKeyPane + PreferencePane + + YES + + YES + grabNextHotKey: + grabPlayHotKey: + grabPrevHotKey: + hotKeyChanged: + + + YES + + + + + + + + YES + + YES + nextHotKeyControl + playHotKeyControl + prevHotKeyControl + + + YES + HotKeyControl + HotKeyControl + HotKeyControl + + + + + HotKeyPane.h + + + + + + + openSheet: + id + + + rootPathTextView + + + + + + + + + AppcastArrayController + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + + + + + AppcastArrayController + NSArrayController + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + AppcastArrayController.h + + + + FileTreePane + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + + + + + FileTreePane + PreferencePane + + openSheet: + + + + rootPathTextView + + + + + FileTreePane.h + + + + HotKeyControl + NDHotKeyControl + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + HotKeyControl.h + + + + HotKeyControl + + + YES + + YES + + + YES + + + + YES + + YES + + + YES + + + + + + + + + + 0 + ../../General.xcodeproj + 3 + + YnBsaXN0MDDUAAEAAgADAAQABQAGAAkAClgkdmVyc2lvblQkdG9wWSRhcmNoaXZlclgkb2JqZWN0cxIA +AYag0QAHAAhdSUIub2JqZWN0ZGF0YYABXxAPTlNLZXllZEFyY2hpdmVyrxEB0AALAAwAMQA1ADYAPAA9 +AEEARQBuAHYAgwCIAJMAlACwALEAuQC6AL0AwgDDAMQAxwDDAMsAzgDPANMA2QDgAOEA6gDrAO8A8ADz +ANgA9wD6APsA/wEEAQcBCAEPARYBFwEkASkBMwE0ATUBOgE8AUEBQgFFAUgBSwFMAVEBVAFVAV8BSgFg +AWcBaAFyAXUBdgF7AXwBfwGEAYsBjAGXAZgBmgGbAaABqQGqAbIBswG4Ab0BxAHFAc0BzgHQANcB0QHS +AdcB2gHbAe8B8AHxAfUB9gH4AfoB+wIAAgwCEwIUAhwCHgIlAiYCLgIvAjQCNQI4Aj0CPgJFAkYCTQJO +AlUCVgJdAl4CZwJoAnACdwJ4AoACggKDAoUCigKLApAClwKcAqMCpAKtAq4CtQK2Ar8A7wLAAsICwwLI +As0C0gLZAt8C5gLnAvAC8QL4AvkDEQMVAxcDKwMwAzEDNQM2AzoDOwM8Az4DQQNHA1ADOwNRA1oDOwNb +A10DYQNkA2sDbANzA3QDdQN2A3sDfAOBA4gDjwOQA5wDngOnA6sDOwOsA64DtAO9AzsDvgPHAzsDyAPJ +A84DzwPUA9UD2gPfA+YD5wPuA+8D8APyA/cD+AP9A/4EAwQIBAkEDgQPBBkEHQQhBCIEIwQkBCcELgQv +BDAEMQQ4BDkEOgRBBEIESQRVAfAEVgRbBFwEXQRfBGAEYQRiBGsEbARtBG4EdgR3BHgEeQSBBIIEgwSE +BIsEkwSbBJwEnQSeBKUEpgSnBK4ErwS2BLcEuAT4BPsE/AT+BT4FfwXABcEFwgXDBcQFxQXGBccFyAXJ +BcoFywXMBc0FzgXPBdAF0QXSBdMF1AXVBdYF1wXYBdkF2gXbBdwF3QXeBd8F4AXhBeIF4wXkBeUF5gXn +BegF6QXqBesF7AXtBe4F7wXwBfEF8gXzBfQF9QX2BfcF+AX5BfoF+wYDBgsGcgbZBtoG2wbcBt0G3gbf +BuAG4QbiBuMArQbkBuUG5gbnBugG6QMUBuoG6wbsBu0G7gbvBvAG8QbyBvMG9Ab1BvYG9wb4BvkG+gb7 +BvwG/Qb+Bv8HAAcBAKYHAgcDBwQHBQcGBwcHCAcJBwoHCwcMBw0HDgcPBxAHEQcSBxMHFAcVBxYHFwcY +BxkHGgcbBxwHHQceBx8HIAMEByEHIgcjATAHJAclByYHJwcoBykHKgcrBywHLQcuBy8HMAcxBzIHMwc0 +BzUHNgc3BzgHOwc+B0FVJG51bGzfEBIADQAOAA8AEAARABIAEwAUABUAFgAXABgAGQAaABsAHAAdAB4A +HwAgACEAIgAjACQAJQAmACcAKAApACoAKwAsAC0ALgAvADBWTlNSb290ViRjbGFzc11OU09iamVjdHNL +ZXlzXxAPTlNDbGFzc2VzVmFsdWVzXxAZTlNBY2Nlc3NpYmlsaXR5T2lkc1ZhbHVlc11OU0Nvbm5lY3Rp +b25zW05TTmFtZXNLZXlzW05TRnJhbWV3b3JrXU5TQ2xhc3Nlc0tleXNaTlNPaWRzS2V5c11OU05hbWVz +VmFsdWVzXxAZTlNBY2Nlc3NpYmlsaXR5Q29ubmVjdG9yc11OU0ZvbnRNYW5hZ2VyXxAQTlNWaXNpYmxl +V2luZG93c18QD05TT2JqZWN0c1ZhbHVlc18QF05TQWNjZXNzaWJpbGl0eU9pZHNLZXlzWU5TTmV4dE9p +ZFxOU09pZHNWYWx1ZXOAAoEBz4EBIoEBZYEBzoAIgQEngAWBAWSBAWaBASiBAcyAAIAGgQEmgQHNENaB +AWfSAA4AMgAzADRbTlNDbGFzc05hbWWABIADXxASUHJlZlBhbmVDb250cm9sbGVy0gA3ADgAOQA6WCRj +bGFzc2VzWiRjbGFzc25hbWWiADoAO15OU0N1c3RvbU9iamVjdFhOU09iamVjdF8QEElCQ29jb2FGcmFt +ZXdvcmvSAA4APgA/AEBaTlMub2JqZWN0c4AHoNIANwA4AEIAQ6MAQwBEADtcTlNNdXRhYmxlU2V0VU5T +U2V00gAOAD4ARgBHgCGvECYASABJAEoASwBMAE0ATgBPAFAAUQBSAFMAVABVAFYAVwBYAFkAWgBbAFwA +XQBeAF8AYABhAGIAYwBkAGUAZgBnAGgAaQBqAGsAbABtgAmAKYA8gEeASoBRgFaAYIBrgIuAjYCbgJyA +nYDDgMWA2IDagNyA5IDmgOiA6YDrgO2A9ID4gPuA/YEBCIEBDIEBEIEBFIEBFYEBFoEBGoEBHYEBH9QA +DgBvAHAAcQByAHMAHwB1XU5TRGVzdGluYXRpb25YTlNTb3VyY2VXTlNMYWJlbIAogAqAAoAn1wB3AA4A +eAB5AHoAMgB7ACsAfQB+AH8AgACBAIJfEA9OU05leHRSZXNwb25kZXJaTlNTdWJ2aWV3c1hOU3ZGbGFn +c1tOU0ZyYW1lU2l6ZVtOU0V4dGVuc2lvboAAgCaACxEBAIAigCOAJdIADgA+AEYAhYAhogCGAIeADIAd +1wB3AA4AiQCKAHkAiwCMAHMAjgCPAJAAfwCRAHNXTlNGcmFtZVZOU0NlbGxZTlNFbmFibGVkW05TU3Vw +ZXJ2aWV3gAqAHIANgA4JgApfEBV7ezE4LCAxOH0sIHsyODEsIDE4fX3eAJUADgCWAJcAmACZAJoAmwCc +AJ0AngCfAKAAoQCiAKMApAClAKYApwCoAKQAqgCrAIYArQCuAK9bTlNDZWxsRmxhZ3NfEBNOU0FsdGVy +bmF0ZUNvbnRlbnRzXU5TTm9ybWFsSW1hZ2VfEBJOU1BlcmlvZGljSW50ZXJ2YWxeTlNCdXR0b25GbGFn +czJfEBBOU0FsdGVybmF0ZUltYWdlXxAPTlNLZXlFcXVpdmFsZW50Wk5TQ29udGVudHNZTlNTdXBwb3J0 +XU5TQ29udHJvbFZpZXdfEA9OU1BlcmlvZGljRGVsYXlcTlNDZWxsRmxhZ3MyXU5TQnV0dG9uRmxhZ3MS +BAH+AIAbgBqAExAZEAKAF4AagA+AEIAMEMgQABJIPFH/XxApT25seSBsaXN0ZW4gdG8gcmVtb3RlIHdo +ZW4gQ29nIGlzIGFjdGl2ZS7UAA4AsgCzALQAtQC2ALcAuFZOU1NpemVWTlNOYW1lWE5TZkZsYWdzgBIj +QCoAAAAAAACAEREEFFxMdWNpZGFHcmFuZGXSADcAOAC7ALyiALwAO1ZOU0ZvbnTTAA4AMgC+AL8AwADB +Xk5TUmVzb3VyY2VOYW1lgBaAFIAVV05TSW1hZ2VYTlNTd2l0Y2jSADcAOADFAMaiAMYAO18QEE5TQ3Vz +dG9tUmVzb3VyY2XSAA4AyADJAMpbTlNJbWFnZU5hbWWAGYAY0gA3ADgAzADNogDNADtfEBNOU0J1dHRv +bkltYWdlU291cmNlUNIANwA4ANAA0aQA0QDSAIoAO1xOU0J1dHRvbkNlbGxcTlNBY3Rpb25DZWxs0gA3 +ADgA1ADVpQDVANYA1wDYADtYTlNCdXR0b25ZTlNDb250cm9sVk5TVmlld1tOU1Jlc3BvbmRlctcAdwAO +AIkAigB5AIsAjABzAI4A3ADdAH8AkQBzgAqAHIAegB8JgApfEBV7ezE4LCAzOH0sIHsyODEsIDE4fX3e +AJUADgCWAJcAmACZAJoAmwCcAJ0AngCfAKAAoQCiAKMApAClAKYApwCoAKQA5wCrAIcArQCuAK+AG4Aa +gBOAF4AagCCAEIAdXxAWRW5hYmxlIHJlbW90ZSBjb250cm9sLtIANwA4AOwA7aMA7QDuADteTlNNdXRh +YmxlQXJyYXlXTlNBcnJheVl7NDMyLCA3NH3SAA4A8QDyANdZTlMuc3RyaW5ngCTSADcAOAD0APWjAPUA +9gA7XxAPTlNNdXRhYmxlU3RyaW5nWE5TU3RyaW5n0gA3ADgA+AD5pAD5ANcA2AA7XE5TQ3VzdG9tVmll +d1pyZW1vdGVWaWV30gA3ADgA/AD9owD9AP4AO18QFE5TTmliT3V0bGV0Q29ubmVjdG9yXk5TTmliQ29u +bmVjdG9y1AAOAG8AcABxAHIBAQECAQOAKIAsgCqAO9IADgAyADMBBoAEgCtcRmlsZVRyZWVQYW5l1wB3 +AA4AiQCKAHkAiwCMAQkBCgELAQwAfwCRAQmALYA6gC6ALwmALdcAdwAOAHgAeQB6ADIAewArAH0BEgB/ +ARMBFACCgACAJoBXgF2AXoAlXxAVe3syMCwgMjB9LCB7MzExLCAxOX192QCVAA4BGACcAJ0AngCgARkB +GgEbARwBHQCkAR8BAQEhAJEBI18QEU5TQmFja2dyb3VuZENvbG9yXxARTlNEcmF3c0JhY2tncm91bmRb +TlNUZXh0Q29sb3IT/////5Rx/kGAOYAxgBqAMIAsEhBCBAAJgDbUAA4AsgCzALQAtQEmALcBKIASI0Am +AAAAAAAAgBERDBzVAA4BKgErASwBLQEuAS8BMAExATJXTlNDb2xvclxOU0NvbG9yU3BhY2VbTlNDb2xv +ck5hbWVdTlNDYXRhbG9nTmFtZYA1gDQQBoAzgDJWU3lzdGVtXxATdGV4dEJhY2tncm91bmRDb2xvctMA +DgErATYBLgE4ATlXTlNXaGl0ZYA1EANCMQDSADcAOAE7ASqiASoAO9UADgEqASsBLAEtAS4BPgEwAT8B +MoA1gDiAN4AyWXRleHRDb2xvctMADgErATYBLgE4AUSANUIwANIANwA4AUYBR6QBRwDSAIoAO18QD05T +VGV4dEZpZWxkQ2VsbNIANwA4AUkBSqUBSgDWANcA2AA7W05TVGV4dEZpZWxkXxAQcm9vdFBhdGhUZXh0 +Vmlld9QADgBvAHAAcQByAU4BTwFQgCiAP4A9gEbSAA4AMgAzAVOABIA+WkhvdEtleVBhbmXZAHcADgCJ +AVYAigB5AIsAMgCMAVcBWAFZAVoBWwB/AJEBXQFXXxATTlNPcmlnaW5hbENsYXNzTmFtZYBCgEWAQ4BB +gEQJgECAQl1Ib3RLZXlDb250cm9s1wB3AA4AeAB5AHoAMgB7ACsAfQFjAH8BZAFlAIKAAIAmgGyAiYCK +gCVfEBR7ezkxLCA3MH0sIHs4MiwgMTl9fdkAlQAOARgAnACdAJ4AoAEZARoBaQEcAR0ApAEfAU4BbwCR +ASMT/////4RR/kCAOYAxgBqAMIA/EgBCBAAJgDbSADcAOAFzAXSiAXQAO15OU0NsYXNzU3dhcHBlcl8Q +EXBsYXlIb3RLZXlDb250cm9s1AAOAG8AcABxAXcBTwFOAXqASYA9gD+ASF5ob3RLZXlDaGFuZ2VkOtIA +NwA4AX0BfqMBfgD+ADtfEBVOU05pYkNvbnRyb2xDb25uZWN0b3LUAA4AbwBwAHEBdwFPAYIBg4BJgD2A +S4BQ1wB3AA4AiQCKAHkAiwCMAVcAjgGHAYgAfwCRAVeAQoAcgEyATQmAQl8QFXt7MTc1LCAxMn0sIHs2 +NCwgMzJ9fd0AlQAOAJYAmACZAJoAmwCcAJ0AngCfAKAAoQCiAKMApACmAY8AqwGRAZIAqwGCAK0BlQGW +gBuAGhABgBCAT4BOgBCASxIIAAAAE/////+GgkD/VEVkaXTSAA4A8QDyAM6AJF8QD2dyYWJOZXh0SG90 +S2V5OtQADgBvAHAAcQByAZ0BTwGfgCiAUoA9gFXZAHcADgCJAVYAigB5AIsAMgCMAVcBWAGjAVoBpQB/ +AJEBXQFXgEKARYBTgEGAVAmAQIBCXxAUe3s5MSwgMjB9LCB7ODIsIDE5fX3ZAJUADgEYAJwAnQCeAKAB +GQEaAWkBHAEdAKQBHwGdAW8AkQEjgDmAMYAagDCAUgmANl8QEW5leHRIb3RLZXlDb250cm9s1AAOAG8A +cABxAHIBCQECAbeAKIAtgCqAX9IADgA+AEYBuoAhogEBAbyALIBY1wB3AA4AiQCKAHkAiwCMAQkAjgHA +AcEAfwCRAQmALYAcgFmAWgmALV8QFXt7MzMzLCAxMn0sIHs4NSwgMzJ9fd0AlQAOAJYAmACZAJoAmwCc +AJ0AngCfAKAAoQCiAKMApACmAY8AqwHJAcoAqwG8AK0BlQGWgBuAGoAQgFyAW4AQgFhWQnJvd3Nl0gAO +APEA8gDOgCRZezQzMiwgNjB9VHZpZXfUAA4AbwBwAHEAcgHUAdUB1oAogGOAYYBq0gAOADIAMwHZgASA +YlpPdXRwdXRQYW5l2wHcAA4B3QFWAd4B3wHgAeEAMgHiAeMAkQFYAJEB5wCRAekB6gCRAewAkQCRXxAa +TlNGaWx0ZXJSZXN0cmljdHNJbnNlcnRpb25fEBROU1ByZXNlcnZlc1NlbGVjdGlvblpOU0VkaXRhYmxl +XxAPX05TTWFuYWdlZFByb3h5Xk5TRGVjbGFyZWRLZXlzXxAiTlNDbGVhcnNGaWx0ZXJQcmVkaWNhdGVP +bkluc2VydGlvbl8QGE5TU2VsZWN0c0luc2VydGVkT2JqZWN0c18QFk5TQXZvaWRzRW1wdHlTZWxlY3Rp +b24JgEUJgGUJgGiAZgmAZAkJXxAWT3V0cHV0c0FycmF5Q29udHJvbGxlcl8QEU5TQXJyYXlDb250cm9s +bGVy0gAOAD4ARgHzgCGhAfSAZ1RuYW1l0QAOAfeAadIANwA4AfkB36IB3wA7XW91dHB1dERldmljZXPU +AA4AbwBwAHEAcgFXAU8Bt4AogEKAPYBf0gAOAD4ARgICgCGpAU4CBAIFAgYCBwIIAZ0CCgGCgD+AbYBx +gHqAfoCCgFKAhYBL1wB3AA4AiQCKAHkAiwCMAVcAjgIPAhAAfwCRAVeAQoAcgG6AbwmAQl8QFXt7MTc1 +LCA2Mn0sIHs2NCwgMzJ9fd0AlQAOAJYAmACZAJoAmwCcAJ0AngCfAKAAoQCiAKMApACmAY8AqwIYAZIA +qwIEAK0BlQGWgBuAGoAQgHCAToAQgG3SAA4A8QDyAM6AJNcAdwAOAIkAigB5AIsAjAFXAQoCIQIiAH8A +kQFXgEKAOoBygHMJgEJfEBR7ezQ1LCA3Mn0sIHszOSwgMTd9fdgAlQAOARgAnACdAJ4AoAEaAKIBHAIo +AikAqwIFAiwCLYA5gHWAdIAQgHESEEAAAIB4VVBsYXk61QAOASoBKwEsAS0BLgIxATACMgEygDWAd4B2 +gDJcY29udHJvbENvbG9y0wAOASsBNgEuATgCN4A1SzAuNjY2NjY2NjkA1QAOASoBKwEsAS0BLgE+ATAC +OwEygDWAOIB5gDJfEBBjb250cm9sVGV4dENvbG9y1wB3AA4AiQCKAHkAiwCMAVcBCgJBAkIAfwCRAVeA +QoA6gHuAfAmAQl8QFHt7MTcsIDQ3fSwgezY5LCAxN3192ACVAA4BGACcAJ0AngCgARoAogEcAigCSQCr +AgYCLAItgDmAdYB9gBCAeoB4WVByZXZpb3VzOtcAdwAOAIkAigB5AIsAjAFXAQoCUQJSAH8AkQFXgEKA +OoB/gIAJgEJfEBR7ezQwLCAyMn0sIHs0NCwgMTd9fdgAlQAOARgAnACdAJ4AoAEaAKIBHAIoAlkAqwIH +AiwCLYA5gHWAgYAQgH6AeFVOZXh0OtkAdwAOAIkBVgCKAHkAiwAyAIwBVwFYAmEBWgJjAH8AkQFdAVeA +QoBFgIOAQYCECYBAgEJfEBR7ezkxLCA0NX0sIHs4MiwgMTl9fdkAlQAOARgAnACdAJ4AoAEZARoBaQEc +AR0ApAEfAggBbwCRASOAOYAxgBqAMICCCYA21wB3AA4AiQCKAHkAiwCMAVcAjgJzAnQAfwCRAVeAQoAc +gIaAhwmAQl8QFXt7MTc1LCAzN30sIHs2NCwgMzJ9fd0AlQAOAJYAmACZAJoAmwCcAJ0AngCfAKAAoQCi +AKMApACmAY8AqwJ8AZIAqwIKAK0BlQGWgBuAGoAQgIiAToAQgIXSAA4A8QDyAM6AJFp7NDMyLCAxMDl9 +0gAOAPEA8gDXgCTUAA4AbwBwAHEAcgFOAgQCiYAogD+AbYCMW25leHRLZXlWaWV31AAOAG8AcABxAHIC +jQAfAo+AKICOgAKAmtcAdwAOAHgAeQB6ADIAewArAH0CkwB/ApQClQCCgACAJoCPgJiAmYAl0gAOAD4A +RgKZgCGiApoCm4CQgJTXAHcADgCJAIoAeQCLAIwCjQCOAp8CoAB/AJECjYCOgByAkYCSCYCOXxAVe3sx +OCwgMzh9LCB7Mzk2LCAxOH193gCVAA4AlgCXAJgAmQCaAJsAnACdAJ4AnwCgAKEAogCjAKQApQCmAKcA +qACkAqoAqwKaAK0ArgCvgBuAGoATgBeAGoCTgBCAkF8QPEVuYWJsZSBMYXN0LmZtIHN1cHBvcnQuIChN +dXN0IGhhdmUgTGFzdC5mbSBjbGllbnQgaW5zdGFsbGVkKdcAdwAOAIkAigB5AIsAjAKNAI4CsQKyAH8A +kQKNgI6AHICVgJYJgI5fEBV7ezE4LCAxOH0sIHszOTYsIDE4fX3eAJUADgCWAJcAmACZAJoAmwCcAJ0A +ngCfAKAAoQCiAKMApAClAKYApwCoAKQCvACrApsArQCuAK+AG4AagBOAF4AagJeAEICUXxAkQXV0b21h +dGljYWxseSBsYXVuY2ggTGFzdC5mbSBjbGllbnQu0gAOAPEA8gDXgCRdc2Nyb2JibGVyVmlld9QADgBv +AHAAcQF3AU8CCAF6gEmAPYCCgEjUAA4AbwBwAHEAcgIEAU4CiYAogG2AP4CM1AAOAG8AcABxAHICzwAf +AtGAKICegAKAwtcAdwAOAHgAeQB6ADIAewArAH0C1QB/AtYBFACCgACAJoCfgMGAXoAl0gAOAD4ARgLb +gCGjAtwC3QLegKCApIC91wB3AA4AiQCKAHkAiwCMAs8AjgLiAuMAfwCRAs+AnoAcgKGAogmAnl8QFXt7 +MTgsIDQ2fSwgezI5OSwgMTh9fd4AlQAOAJYAlwCYAJkAmgCbAJwAnQCeAJ8AoAChAKIAowCkAKUApgCn +AKgApALtAKsC3ACtAK4Ar4AbgBqAE4AXgBqAo4AQgKBfECtBdXRvbWF0aWNhbGx5IGNoZWNrIGZvciB1 +cGRhdGVzIG9uIHN0YXJ0dXAu1wB3AA4AiQCKAHkAiwCMAs8C8wL0AvUAfwCRAs+AnoC8gKWApgmAnl8Q +Fnt7MTExLCAxNn0sIHsyMDcsIDI2fX3fEBMAlQL6AvsAlgCYAA4AmQCaAJsAnQL8AJ4C/QL+Av8AnwCg +AwAAoQMBAJEBjwCkAwQDBQGPAwYDBwCrAwkC3QE4AJEAkQMNAw4DDwMQXxAaTlNNZW51SXRlbVJlc3Bl +Y3RBbGlnbm1lbnRfEA9OU0Fycm93UG9zaXRpb25aTlNNZW51SXRlbV8QD05TUHJlZmVycmVkRWRnZV8Q +Ek5TVXNlc0l0ZW1Gcm9tTWVudV1OU0FsdGVyc1N0YXRlVk5TTWVudRP/////hEH+QAmAGhBLgLuAp4Co +gBCAqYCkCQkRAZARCACAqhIGgkD/1AAOALIAswC0ALUAtgC3AxSAEoAREBDSAA4A8QDyAM6AJNsDGAAO +AxkDGgMbAxwDHQMeAwADHwMgAvUDIgMjAyQApAMmAycDKAMPAyoBj1hOU1RhcmdldFdOU1RpdGxlXxAR +TlNLZXlFcXVpdk1vZE1hc2taTlNLZXlFcXVpdl1OU01uZW1vbmljTG9jWU5TT25JbWFnZVxOU01peGVk +SW1hZ2VYTlNBY3Rpb25XTlNTdGF0ZYCmgLGAqxIAEAAAgBoSf////4CsgK6AqoCw0wAOAxkDLAMtAy4D +L1tOU01lbnVJdGVtc4C6gLKAs1ZTdGFibGXTAA4AMgC+AL8AwAM0gBaAFICtXxAPTlNNZW51Q2hlY2tt +YXJr0wAOADIAvgC/AMADOYAWgBSAr18QEE5TTWVudU1peGVkU3RhdGVfEBFfcG9wVXBJdGVtQWN0aW9u +OtIANwA4Az0C/KIC/AA70gAOAPEA8gNAgCRaT3RoZXJWaWV3c9IADgA+AEYDQ4AhowMJA0UDRoCpgLSA +t9oDGAAOAxkDGgMbAxwDHQMeAwADHwL1AyIDSgMkAKQDJgMnAygDDwNPgKaAsYC1gBqArICugKqAtlhV +bnN0YWJsZdoDGAAOAxkDGgMbAxwDHQMeAwADHwL1AyIDVAMkAKQDJgMnAygDDwNZgKaAsYC4gBqArICu +gKqAuVdOaWdodGx50gA3ADgDXAMAogMAADvSADcAOANeA1+mA18DYADRANIAigA7XxARTlNQb3BVcEJ1 +dHRvbkNlbGxeTlNNZW51SXRlbUNlbGzSADcAOANiA2OmA2MA1QDWANcA2AA7XU5TUG9wVXBCdXR0b27X +AHcADgCJAIoAeQCLAIwCzwEKA2cDaAB/AJECz4CegDqAvoC/CYCeXxAUe3sxNywgMjN9LCB7OTIsIDE3 +fX3YAJUADgEYAJwAnQCeAKABGgCiARwCKANvAKsC3gIsAi2AOYB1gMCAEIC9gHhcVXBkYXRlIEZlZWQ6 +WXs0MzIsIDgyfVt1cGRhdGVzVmlld9QADgBvAHAAcQByAggBTwN6gCiAgoA9gMRfEBFwcmV2SG90S2V5 +Q29udHJvbNQADgBvAHAAcQF3AdUDfwOAgEmAYYDGgNfXAHcADgCJAIoAeQCLAIwDggLzA4QDhQB/AJED +goDHgLyAyIDJCYDH1wB3AA4AeAB5AHoAMgB7ACsAfQOLAH8DjAONAIKAAIAmgN2A4oDjgCVfEBZ7ezEy +MiwgMTZ9LCB7MjUyLCAyNn193xATAJUC+gL7AJYAmAAOAJkAmgCbAJ0C/ACeAv0C/gL/AJ8AoAMAAKED +AQCRAY8ApAMEAwUBjwMGA5UAqwOXA38BOACRAJEDDQMOA5sDEAmAGoC7gKeAyoAQgMuAxgkJgMzSAA4A +8QDyAM6AJNsDGAAOAxkDGgMbAxwDHQMeAwADHwMgA4UDIgOhAyQApAMmAycDKAObA6YBj4DJgLGAzYAa +gKyAroDMgM7TAA4DGQMsAy0DqQOqgLqAz4DQVUl0ZW0x0gAOAPEA8gNAgCTSAA4APgBGA7CAIaMDlwOy +A7OAy4DRgNTaAxgADgMZAxoDGwMcAx0DHgMAAx8DhQMiA7cDJACkAyYDJwMoA5sDvIDJgLGA0oAagKyA +roDMgNNVSXRlbTLaAxgADgMZAxoDGwMcAx0DHgMAAx8DhQMiA8EDJACkAyYDJwMoA5sDxoDJgLGA1YAa +gKyAroDMgNZVSXRlbTNddGFrZURldmljZUlEOtQADgBvAHAAcQF3AQIBvAPNgEmAKoBYgNlab3BlblNo +ZWV0OtQADgBvAHAAcQF3AU8CCgPTgEmAPYCFgNtfEA9ncmFiUHJldkhvdEtleTrUAA4AbwBwAHEAcgOC +AdUBt4AogMeAYYBf0gAOAD4ARgPcgCGiA38D3oDGgN7XAHcADgCJAIoAeQCLAIwDggEKA+ID4wB/AJED +goDHgDqA34DgCYDHXxAVe3sxNywgMjJ9LCB7MTAzLCAxN3192ACVAA4BGACcAJ0AngCgARoAogEcAigD +6gCrA94CLAItgDmAdYDhgBCA3oB4XxAPT3V0cHV0IERldmljZTogWXs0MzIsIDU5fdIADgDxAPIA14Ak +1AAOAG8AcABxAHIBTwAfA/aAKIA9gAKA5Vpob3RLZXlQYW5l1AAOAG8AcABxAXcBTwIEA/yASYA9gG2A +518QD2dyYWJQbGF5SG90S2V5OtQADgBvAHAAcQF3AU8BnQF6gEmAPYBSgEjUAA4AbwBwAHEAcgECAB8E +B4AogCqAAoDqXGZpbGVUcmVlUGFuZdQADgBvAHAAcQByAdUAHwQNgCiAYYACgOxab3V0cHV0UGFuZdcA +DgBvBBAEEQBwAHEEEgQTBBQEFQQWApsEGACnWU5TS2V5UGF0aFlOU0JpbmRpbmdfEBxOU05pYkJpbmRp +bmdDb25uZWN0b3JWZXJzaW9ugPOA7oDygPGAlIDw0gAOBBoEGwCRXxAQTlNTaGFyZWRJbnN0YW5jZYDv +CdIANwA4BB4EH6MEHwQgADtfEBhOU1VzZXJEZWZhdWx0c0NvbnRyb2xsZXJcTlNDb250cm9sbGVyXxAn +dmFsdWU6IHZhbHVlcy5hdXRvbWF0aWNhbGx5TGF1bmNoTGFzdEZNVXZhbHVlXxAgdmFsdWVzLmF1dG9t +YXRpY2FsbHlMYXVuY2hMYXN0Rk3SADcAOAQlBCajBCYA/gA7XxAVTlNOaWJCaW5kaW5nQ29ubmVjdG9y +1wAOAG8EEAQRAHAAcQQSBBMEFAQqBCsCmwQtAKeA84DugPeA9oCUgPVfECRlbmFibGVkOiB2YWx1ZXMu +ZW5hYmxlQXVkaW9TY3JvYmJsZXJXZW5hYmxlZF8QG3ZhbHVlcy5lbmFibGVBdWRpb1Njcm9iYmxlctcA +DgBvBBAEEQBwAHEEEgQTBBQENAQrAIYENwCngPOA7oD6gPaADID5XxAdZW5hYmxlZDogdmFsdWVzLnJl +bW90ZUVuYWJsZWRfEBR2YWx1ZXMucmVtb3RlRW5hYmxlZNcADgBvBBAEEQBwAHEEEgQTBBQEKgQWApoE +QACngPOA7oD3gPGAkID8XxAidmFsdWU6IHZhbHVlcy5lbmFibGVBdWRpb1Njcm9iYmxlctcADgBvBBAE +EQBwAHEEEgQTBEQERQRGAt0ESACngPOA/oEBB4EBBoCkgQEF2gHcAA4B3QFWAd8ESgHgAeEAMgHjAJEB +WACRBE4ETwRQBFEAkQRTAJFfEBFOU09iamVjdENsYXNzTmFtZQmARQmBAQCBAQSBAQOBAQEJgP8JXxAW +QXBwY2FzdEFycmF5Q29udHJvbGxlctIADgA+AEYEWIAhogH0BFqAZ4EBAlN1cmxcTlNEaWN0aW9uYXJ5 +0QAOAfeAaV8QGGNvbnRlbnQ6IGFycmFuZ2VkT2JqZWN0c1djb250ZW50XxAPYXJyYW5nZWRPYmplY3Rz +2AAOAG8EEAQRBGMAcABxBBIEEwREBGYEZwBkAt0EagCnXxATTlNQcmV2aW91c0Nvbm5lY3RvcoDzgP6B +AQuBAQqA/YCkgQEJXxAjY29udGVudE9iamVjdHM6IGFycmFuZ2VkT2JqZWN0cy51cmxeY29udGVudE9i +amVjdHNfEBNhcnJhbmdlZE9iamVjdHMudXJs2AAOAG8EEAQRBGMAcABxBBIEEwREBHEEcgBlAt0EdQCn +gPOA/oEBD4EBDoEBCICkgQENXxAjY29udGVudFZhbHVlczogYXJyYW5nZWRPYmplY3RzLm5hbWVdY29u +dGVudFZhbHVlc18QFGFycmFuZ2VkT2JqZWN0cy5uYW1l2AAOAG8EEAQRBGMAcABxBBIEEwQUBHwEfQBm +At0EgACngPOA7oEBE4EBEoEBDICkgQERXxAgc2VsZWN0ZWRPYmplY3Q6IHZhbHVlcy5TVUZlZWRVUkxe +c2VsZWN0ZWRPYmplY3RfEBB2YWx1ZXMuU1VGZWVkVVJM1wAOAG8EEAQRAHAAcQQSBBMB1ARFBEYDfwRI +AKeA84BjgQEHgQEGgMaBAQXYAA4AbwQQBBEEYwBwAHEEEgQTAdQEcQRyAGgDfwR1AKeA84BjgQEPgQEO +gQEUgMaBAQ3YAA4AbwQQBBEEYwBwAHEEEgQTAdQElgSXAGkDfwSaAKeA84BjgQEZgQEYgQEVgMaBARdf +EB1zZWxlY3RlZEluZGV4OiBzZWxlY3Rpb25JbmRleF1zZWxlY3RlZEluZGV4XnNlbGVjdGlvbkluZGV4 +1wAOAG8EEAQRAHAAcQQSBBMEFAShBBYAhgSkAKeA84DugQEcgPGADIEBG18QIHZhbHVlOiB2YWx1ZXMu +cmVtb3RlT25seU9uQWN0aXZlXxAZdmFsdWVzLnJlbW90ZU9ubHlPbkFjdGl2ZdcADgBvBBAEEQBwAHEE +EgQTBBQENAQWAIcErQCngPOA7oD6gPGAHYEBHl8QG3ZhbHVlOiB2YWx1ZXMucmVtb3RlRW5hYmxlZNcA +DgBvBBAEEQBwAHEEEgQTBBQEsgQWAtwEtQCngPOA7oEBIYDxgKCBASBfEB52YWx1ZTogdmFsdWVzLlNV +Q2hlY2tBdFN0YXJ0dXBfEBd2YWx1ZXMuU1VDaGVja0F0U3RhcnR1cNIADgA+BLkEuoEBJa8QPQEBA7MC +sgLPAYIDggJCAJACoAIIAIYBVwGlBMgCUgECAcEBDANFApoERAFbA7IDlwLdBBQBTgDdAZ0CBQJjAnQB +1ANGAwkDaAEJA+MBTwPeA38C9QMPApsC3AOFAgoCEAIiAt4CBgCHAdUDmwG8Ao0C4wBzAgcCBAGIgCyA +1ICWgJ6AS4DHgHyADoCSgIKADIBCgFSBASOAgIAqgFqAL4C0gJCA/oBEgNGAy4CkgO6AP4AfgFKAcYCE +gIeAY4C3gKmAv4AtgOCAPYDegMaApoCqgJSAoIDJgIWAb4BzgL2AeoAdgGGAzIBYgI6AooAKgH6AbYBN +0gAOADIAMwT6gASBASRdTlNBcHBsaWNhdGlvbtIANwA4BP0A7qIA7gA70gAOAD4EuQUAgQElrxA9AQkD +mwKbAB8BVwAfAgYAhgKaAVcAcwAfAZ0AHwIHAB8BvAEBAw8CjQAfAU4DmwObAs8AHwFXAIcBVwFXAggC +CgAfAw8DDwLeAB8D3gAfA4IDggLdAvUCjQLPA38BVwIEAgUCzwFXAHMAHwOFAQkAHwLcAB8BVwFXAYKA +LYDMgJSAAoBCgAKAeoAMgJCAQoAKgAKAUoACgH6AAoBYgCyAqoCOgAKAP4DMgMyAnoACgEKAHYBCgEKA +goCFgAKAqoCqgL2AAoDegAKAx4DHgKSApoCOgJ6AxoBCgG2AcYCegEKACoACgMmALYACgKCAAoBCgEKA +S9IADgA+BLkFQIEBJa8QPgAfAQEDswKyAs8DggGCAkIAkAKgAggAhgFXAaUEyAJSAQIBwQREApoBDANF +AVsDsgOXAt0EFAFOAN0BnQIFAmMCdAHUA0YBCQNoA+MDCQFPA94DfwKbAvUDDwLcA4UCCgIQAiIC3gIG +AdUAhwKNAbwDmwLjAHMCBwIEAYiAAoAsgNSAloCegMeAS4B8gA6AkoCCgAyAQoBUgQEjgICAKoBagP6A +kIAvgLSARIDRgMuApIDugD+AH4BSgHGAhICHgGOAt4AtgL+A4ICpgD2A3oDGgJSApoCqgKCAyYCFgG+A +c4C9gHqAYYAdgI6AWIDMgKKACoB+gG2ATdIADgA+BLkFgYEBJa8QPgWCBYMFhAWFBYYFhwWIBYkFigWL +BYwFjQWOBY8FkAWRAQYFkwWUBZUFlgWXBZgFmQWaBZsFnAWdBZ4FnwWgBaEFogWjBaQFpQWmBacFqAFT +BaoFqwWsBa0FrgWvBbAFsQWyBbMFtAW1AdkFtwW4BbkFugW7BbwFvQW+Bb+BASmBASqBASuBASyBAS2B +AS6BAS+BATCBATGBATKBATOBATSBATWBATaBATeBATiAK4EBOYEBOoEBO4EBPIEBPYEBPoEBP4EBQIEB +QYEBQoEBQ4EBRIEBRYEBRoEBR4EBSIEBSYEBSoEBS4EBTIEBTYEBToA+gQFPgQFQgQFRgQFSgQFTgQFU +gQFVgQFWgQFXgQFYgQFZgQFagGKBAVuBAVyBAV2BAV6BAV+BAWCBAWGBAWKBAWNcRmlsZSdzIE93bmVy +WlRleHQgRmllbGRfEBFNZW51IEl0ZW0gKEl0ZW0zKV8QMkJ1dHRvbiBDZWxsIChBdXRvbWF0aWNhbGx5 +IGxhdW5jaCBMYXN0LmZtIGNsaWVudC4pW1VwZGF0ZXNWaWV3Wk91dHB1dFZpZXdfEBJQdXNoIEJ1dHRv +biAoRWRpdClfEBtUZXh0IEZpZWxkIENlbGwgKFByZXZpb3VzOilfEDdCdXR0b24gQ2VsbCAoT25seSBs +aXN0ZW4gdG8gcmVtb3RlIHdoZW4gQ29nIGlzIGFjdGl2ZS4pXxBKQnV0dG9uIENlbGwgKEVuYWJsZSBM +YXN0LmZtIHN1cHBvcnQuIChNdXN0IGhhdmUgTGFzdC5mbSBjbGllbnQgaW5zdGFsbGVkKSlfEA9Ib3Qg +S2V5IENvbnRyb2xfEDVDaGVjayBCb3ggKE9ubHkgbGlzdGVuIHRvIHJlbW90ZSB3aGVuIENvZyBpcyBh +Y3RpdmUuKVpIb3RLZXlWaWV3XxARVGV4dCBGaWVsZCBDZWxsLTNbQXBwbGljYXRpb25fEBdUZXh0IEZp +ZWxkIENlbGwgKE5leHQ6KV8QFEJ1dHRvbiBDZWxsIChCcm93c2UpWEFwcGNhc3RzXxBIQ2hlY2sgQm94 +IChFbmFibGUgTGFzdC5mbSBzdXBwb3J0LiAoTXVzdCBoYXZlIExhc3QuZm0gY2xpZW50IGluc3RhbGxl +ZCkpXxAPVGV4dCBGaWVsZCBDZWxsXxAUTWVudSBJdGVtIChVbnN0YWJsZSlfEBFUZXh0IEZpZWxkIENl +bGwtMl8QEU1lbnUgSXRlbSAoSXRlbTIpXxARTWVudSBJdGVtIChJdGVtMSlfEBVQb3B1cCBCdXR0b24g +KFN0YWJsZSlfEA9TaGFyZWQgRGVmYXVsdHNfEBFIb3QgS2V5IENvbnRyb2wtMV8QJEJ1dHRvbiBDZWxs +IChFbmFibGUgcmVtb3RlIGNvbnRyb2wuKV8QEUhvdCBLZXkgQ29udHJvbC0yXxATU3RhdGljIFRleHQg +KFBsYXk6KV8QEVRleHQgRmllbGQgQ2VsbC0xXxAUQnV0dG9uIENlbGwgKEVkaXQpLTFdT3V0cHV0RGV2 +aWNlc18QE01lbnUgSXRlbSAoTmlnaHRseSlcRmlsZVRyZWVWaWV3XxAeVGV4dCBGaWVsZCBDZWxsIChV +cGRhdGUgRmVlZDopXxAhVGV4dCBGaWVsZCBDZWxsIChPdXRwdXQgRGV2aWNlOiApXxASTWVudSBJdGVt +IChTdGFibGUpXxAdU3RhdGljIFRleHQgKE91dHB1dCBEZXZpY2U6IClfEBRQb3B1cCBCdXR0b24gKEl0 +ZW0xKV8QMENoZWNrIEJveCAoQXV0b21hdGljYWxseSBsYXVuY2ggTGFzdC5mbSBjbGllbnQuKV8QG1Bv +cCBVcCBCdXR0b24gQ2VsbCAoU3RhYmxlKV8QEU1lbnUgKE90aGVyVmlld3MpXxA3Q2hlY2sgQm94IChB +dXRvbWF0aWNhbGx5IGNoZWNrIGZvciB1cGRhdGVzIG9uIHN0YXJ0dXAuKV8QGlBvcCBVcCBCdXR0b24g +Q2VsbCAoSXRlbTEpXxAUUHVzaCBCdXR0b24gKEVkaXQpLTFfEBRCdXR0b24gQ2VsbCAoRWRpdCktMl8Q +F1RleHQgRmllbGQgQ2VsbCAoUGxheTopXxAaU3RhdGljIFRleHQgKFVwZGF0ZSBGZWVkOilfEBdTdGF0 +aWMgVGV4dCAoUHJldmlvdXM6KV8QIkNoZWNrIEJveCAoRW5hYmxlIHJlbW90ZSBjb250cm9sLildU2Ny +b2JibGVyVmlld18QFFB1c2ggQnV0dG9uIChCcm93c2UpXxATTWVudSAoT3RoZXJWaWV3cyktMV8QOUJ1 +dHRvbiBDZWxsIChBdXRvbWF0aWNhbGx5IGNoZWNrIGZvciB1cGRhdGVzIG9uIHN0YXJ0dXAuKVpSZW1v +dGVWaWV3XxATU3RhdGljIFRleHQgKE5leHQ6KV8QFFB1c2ggQnV0dG9uIChFZGl0KS0yXxASQnV0dG9u +IENlbGwgKEVkaXQp0gAOAD4EuQX9gQElpQFOAggBnQREAdSAP4CCgFKA/oBj0gAOAD4EuQYFgQElpQFd +AV0BXQRTAeyAQIBAgECA/4Bk0gAOAD4EuQYNgQElrxBkAB8ATQGCA4ICQgCQAqABVwBIAaUEyAJSAFkC +mgBKA7IDlwLdAU4A3QBrAGcCYwJ0AFwB1ABqA0YAYQMJAQkAbQBPAFAAVABeAFMDDwLcA4UCCgBRAhAC +BgHVA5sAZQBkAGIBiAEBA7MCsgLPAggAhgBLAFsAYAECAcEBDANFBEQBWwQUAZ0CBQBjAFgAZgBOAGgD +aAPjAF8AXQBaAGwBTwPeA38C9QKbAEwASQBWAGkCIgLeAFUAhwBXAo0BvALjAHMAUgIHAgSAAoBRgEuA +x4B8gA6AkoBCgAmAVIEBI4CAgNqAkIA8gNGAy4CkgD+AH4EBGoEBEICEgIeA5oBjgQEWgLeA9ICpgC2B +AR+AYIBrgJyA6YCbgKqAoIDJgIWAi4BvgHqAYYDMgQEIgP2A+IBNgCyA1ICWgJ6AgoAMgEeA5IDtgCqA +WoAvgLSA/oBEgO6AUoBxgPuA2IEBDIBWgQEUgL+A4IDrgOiA3IEBHYA9gN6AxoCmgJSASoApgMOBARWA +c4C9gJ2AHYDFgI6AWICigAqAjYB+gG3SAA4APgS5BnSBASWvEGQGdQZ2BncGeAZ5BnoGewZ8Bn0GfgZ/ +BoAGgQaCBoMGhAaFBoYGhwaIBokGigaLBowGjQaOBo8GkAaRBpIGkwaUBpUGlgaXBpgGmQaaBpsGnAad +Bp4GnwagBqEGogajBqQGpQamBqcGqAapBqoGqwasBq0GrgavBrAGsQayBrMGtAa1BrYGtwa4BrkGuga7 +BrwGvQa+Br8GwAbBBsIGwwbEBsUGxgbHBsgGyQbKBssGzAbNBs4GzwbQBtEG0gbTBtQG1QbWBtcG2IEB +aIEBaYEBaoEBa4EBbIEBbYEBboEBb4EBcIEBcYEBcoEBc4EBdIEBdYEBdoEBd4EBeIEBeYEBeoEBe4EB +fIEBfYEBfoEBf4EBgIEBgYEBgoEBg4EBhIEBhYEBhoEBh4EBiIEBiYEBioEBi4EBjIEBjYEBjoEBj4EB +kIEBkYEBkoEBk4EBlIEBlYEBloEBl4EBmIEBmYEBmoEBm4EBnIEBnYEBnoEBn4EBoIEBoYEBooEBo4EB +pIEBpYEBpoEBp4EBqIEBqYEBqoEBq4EBrIEBrYEBroEBr4EBsIEBsYEBsoEBs4EBtIEBtYEBtoEBt4EB +uIEBuYEBuoEBu4EBvIEBvYEBvoEBv4EBwIEBwYEBwoEBw4EBxIEBxYEBxoEBx4EByIEByYEByoEByxCq +ECQQHhA6EMcQzRDUEAsQZBDKE//////////9ECAQVxAiED8QPhBqEM4QTxCTEMkQyxAfEDsQSBBuEF0Q +bBAKEDUQTBAMEBYQwBAlEGsQMxDSEB0QFxDFEDkQPRCQEIcQYhDMECcQQBDVEDIQGxAsEBQQDhBfEAUQ +wxDCEG0QcxDEEDQQHBAYEFoQKRCREKkQRRDRENMQJhBJEGEQQRA8ENAQWBAhECoQIxBHEMYQbxBjEE0Q +ShBVECgQzxArEGUQGhAR0gAOAD4ARgc6gCGg0gAOAD4EuQc9gQEloNIADgA+BLkHQIEBJaDSADcAOAdC +B0OiB0MAO15OU0lCT2JqZWN0RGF0YQAIABkAIgAnADEAOgA/AEQAUgBUAGYECgQQBFsEYgRpBHcEiQSl +BLMEvwTLBNkE5ATyBQ4FHAUvBUEFWwVlBXIFdAV3BXoFfQWABYIFhQWHBYoFjQWQBZMFlQWXBZoFnQWf +BaIFqwW3BbkFuwXQBdkF4gXtBfIGAQYKBh0GJgYxBjMGNAY9BkQGUQZXBmAGYgaxBrMGtQa3BrkGuwa9 +Br8GwQbDBsUGxwbJBssGzQbPBtEG0wbVBtcG2QbbBt0G3wbhBuMG5QbnBukG6wbuBvEG9Ab3BvoG/QcA +BwMHBgcXByUHLgc2BzgHOgc8Bz4HWwdtB3gHgQeNB5kHmwedB58HogekB6YHqAexB7MHuAe6B7wH2Qfh +B+gH8gf+CAAIAggECAYIBwgJCCEIWghmCHwIigifCK4IwQjTCN4I6Aj2CQgJFQkjCSgJKgksCS4JMAky +CTQJNgk4CToJPAk+CUAJRQlxCYIJiQmQCZkJmwmkCaYJqQm2Cb8JxAnLCdgJ5wnpCesJ7Qn1Cf4KBwoM +Ch8KKAo0CjYKOApBCkYKXApdCmYKbwp8CokKkgqdCqYKsAq3CsMK4AriCuQK5groCukK6wsDCzwLPgtA +C0ILRAtGC0gLSgtMC2ULbgt1C4QLjAuWC58LqQurC7QLuwvNC9YL3wvoC/UMAAwJDBAMJww2DEcMSQxL +DE0MTwxYDFoMXAxpDIYMiAyKDIwMjgyPDJEMrgywDLIMtAy2DLgMugzSDPcNCw0fDSsNNA02DTgNOg08 +DT4NQw1EDUYNVw1ZDWINZA1nDXwNhA2RDZ0Nqw2tDa8NsQ2zDbUNvA3SDd8N5w3pDesN7g33DfwOEQ4T +DhUOFw4ZDiMOMA4yDjUOPg5HDlkOYg5tDnkOjA6dDp8OoQ6jDqUOrg6wDrIOvQ7iDvgO+g78Dv4PAA8C +DwMPBQ8HDxUPMg80DzYPOA86DzwPPg9VD3oPgw+FD4cPiQ+LD40Pkg+TD5UPng+jD7IPxg/XD9kP2w/d +D98P7g/3D/4QFhAnECkQKxAtEC8QTBBOEFAQUhBUEFUQVxBvEKQQphCoEKoQrBCuELAQshC0ELkQwhDH +ENAQ0hDkEPUQ9xD5EPsQ/REiESQRJhEoESoRLBEtES8RMRFIEW0RbxFxEXMRdRF3EXgRehGOEZ8RoRGj +EaURpxGwEbIRtxG5EbsR2BHaEdwR3hHgEeER4xH7EjASMhI0EjYSOBI6EjwSPhJFEk4SUBJaEl8ScBJy +EnQSdhJ4EoESgxKFEpASvRLaEvES/BMOEx0TQhNdE3YTdxN5E3oTfBN9E38TgROCE4QThROGE58TsxO8 +E74TwRPDE8gTzRPPE9gT3RPrE/wT/hQAFAIUBBQNFA8UIhQkFCYUKBQqFCwULhQwFDIUNBRRFFMUVRRX +FFkUWhRcFHQUqRSrFK0UrxSxFLMUtRS3FMAUwhTfFOEU4xTlFOcU6BTqFQEVIhUkFSYVKBUqFSwVMRUz +FTkVThVQFVIVVBVWFWMVcBVyFX4VkxWVFZcVmRWbFa4VyxXNFc8V0RXTFdQV1hXtFg4WEBYSFhQWFhYY +FhoWJBZBFkMWRRZHFkkWShZMFmMWhBaGFogWihaMFo4WkBaWFrsWvRa/FsEWwxbFFsYWyBbKFuEXBhcI +FwoXDBcOFxAXERcTFzAXMhc0FzYXOBc5FzsXUxeIF4oXjBeOF5AXkheUF5YXnxehF6wXtRe3F8gXyhfM +F84X0BfcF+0X7xfxF/MX9RgSGBQYFhgYGBoYHBgeGCcYKRguGDAYMhhPGFEYUxhVGFcYWBhaGHIYqxit +GK8YsRizGLUYtxi5GLsY+hkXGRkZGxkdGR8ZIBkiGToZcxl1GXcZeRl7GX0ZfxmBGYMZqhmzGbUZwxnU +GdYZ2BnaGdwZ7RnvGfEZ8xn1GgYaCBoKGgwaDhorGi0aLxoxGjMaNRo3GkAaQhpJGksaTRpPGmwabhpw +GnIadBp1GncajxrIGsoazBrOGtAa0hrUGtYa2BsGGyMbJRsnGykbKxssGy4bRxuWG7MbxRvQG+Ib9xwF +HAwcFRwWHBgcGhwcHB4cIBwiHCQcJhwnHCgcKxwuHDAcNRxGHEgcShxMHFUcVxyEHI0clRypHLQcwhzM +HNkc4hzqHOwc7hzwHPUc9xz8HP4dAB0CHQQdER0dHR8dIR0jHSodNx05HTsdPR1PHVwdXh1gHWIddR2J +HZIdlx2gHaIdrR22Hbgdvx3BHcMdxR3uHfAd8h30HfYd+B36Hfwd/h4HHjAeMh40HjYeOB46HjwePh5A +HkgeUR5WHl8ebB6AHo8emB6lHrMe0B7SHtQe1h7YHtke2x7yHxMfFR8XHxkfGx8dHx8fLB82H0IfUx9V +H1cfWR9bH28fgB+CH4Qfhh+IH6Ufpx+pH6sfrR+uH7AfzR/PH9Ef0x/VH9cf2R/yIEEgQiBEIEYgSCBK +IEwgTiBQIFEgUiBUIF0gXyCMII4gkCCSIJQgliCYIJognCCpIKsgrSCvILUgviDAIMkgyyDSINQg1iDY +IQEhAyEFIQchCSELIQ0hDyERIRchQCFCIUQhRiFIIUohTCFOIVAhViFkIXUhdyF5IXshfSGIIZkhmyGd +IZ8hoSGzIcQhxiHIIcohzCHVIdch3CHeIeAh/SH/IgEiAyIFIgYiCCIgIkEiQyJFIkciSSJLIk0iXyJp +InIidCKFIociiSKLIo0imCKpIqsirSKvIrEiwyLUItYi2CLaItwi7SLvIvEi8yL1IwIjEyMVIxcjGSMb +IyYjQyNNI1cjdiN4I3ojfCN+I4AjgiOLI54joCOhI6ojsSPMI9kkAyQJJCwkNSQ8JFQkcSRzJHUkdyR5 +JHskfSSkJKwkyiTnJOkk6yTtJO8k8STzJRMlKiVHJUklSyVNJU8lUSVTJXgllSWXJZklnCWfJaElpCXN +JeEl4iXkJeUl6CXrJe4l8SXyJfQl9SYOJhcmGSYeJiAmIyYnJjQmOSY7JlYmXiZwJpEmpyapJqsmriax +JrMmtSa4Jt4m7ScDJyQnJicoJysnLicxJzMnNidcJ2ongSeiJ6QnpiepJ6wnryexJ7Qn1yfmJ/koFigY +KBooHSggKCIoJShGKEgoSihNKFAoUyhVKFgoeSh7KH0ogCiDKIYoiCiLKKsouSjIKOUo5yjpKOwo7ijw +KPMpFikyKU8pUSlTKVUpVylZKVwpeimXKZkpmymeKaApoimlKcYp4CnpKewqaSprKm0qbypxKnMqdSp3 +Knkqeyp9Kn8qgSqDKoYqiCqKKowqjiqQKpIqlCqWKpgqmiqcKp4qoCqiKqQqpiqoKqoqrCquKrAqsiq0 +KrYquCq6KrwqvirAKsIqxCrGKsgqyirMKs4q0CrSKtQq1irYKtoq3CreKuAq4irkKu0q7yryKwArCSsO +KxcrGiuXK5krmyudK58roSujK6UrpyupK6srrSuvK7Ersyu1K7cruSu7K70rvyvBK8MrxSvHK8kryyvN +K88r0SvTK9Ur1yvZK9sr3SvfK+Er4yvlK+cr6SvrK+0r7yvxK/Mr9Sv3K/kr+yv9K/8sASwDLAUsBywJ +LAssDSwPLBEsGiwdLJwsniygLKIspCymLKgsqiysLK4ssCyyLLQstiy4LLssvSy/LMEswyzFLMcsySzL +LM0szyzRLNMs1SzXLNks2yzdLN8s4SzjLOUs5yzpLOss7SzvLPEs8yz1LPcs+Sz7LP0s/y0BLQMtBS0H +LQktCy0NLQ8tES0TLRUtFy0ZLSItJS2kLactqi2tLbAtsy22LbktvC2/LcItxS3ILcstzi3RLdQt1i3Z +Ldwt3y3iLeUt6C3rLe4t8S30Lfct+i39LgAuAy4GLgkuDC4PLhIuFS4YLhouHS4gLiMuJi4pLiwuLy4y +LjUuOC47Lj4uQC5DLkYuSS5MLk8uUi5VLlguWy5oLnMuhy68Lsgu0y7oLwYvQC+NL58v1y/iL/YwAjAc +MDMwPDCHMJkwsDDEMNgw7DEEMRYxKjFRMWUxezGPMaYxtDHKMdcx+DIcMjEyUTJoMpsyuTLNMwczJDM7 +M1IzbDOJM6MzyDPWM+00AzQ/NEo0YDR3NIw0lTSYNKM0pTSnNKk0qzStNLY0uTTENMY0yDTKNMw0zjTX +NNo1pTWnNak1qzWtNa81sTWzNbU1tzW5Nbw1vjXANcI1xDXGNcg1yjXMNc410TXUNdY12DXaNdw13zXh +NeM15TXnNeo17DXuNfA18jX0NfY1+DX6Nfw1/jYANgI2BDYGNgk2CzYNNg82ETYTNhU2FzYZNhs2HTYf +NiE2IzYlNic2KTYrNi02LzYxNjM2NTY3Njo2PDY/NkE2QzZFNkc2STZMNk42UDZSNlQ2VjZYNlo2XDZf +NmE2YzZlNmc2aTZrNm02bzZxNnM2dTZ3NoA2gzdON1E3VDdXN1o3XTdgN2M3ZjdpN2w3bzdyN3U3eDd7 +N343gTeEN4c3ijeNN5A3kzeWN5k3nDefN6I3pTeoN6s3rjexN7Q3tze6N703wDfDN8Y3yTfMN8830jfV +N9g32zfeN+E35DfnN+o37TfwN/M39jf5N/w3/zgCOAU4CDgLOA44ETgUOBc4GjgdOCA4IzgmOCk4LDgv +ODI4NTg4ODs4PjhBOEQ4RzhKOE04UDhTOFY4WThcOF84YjhlOGg4azhuOHE4dDh3OHo4fDh+OIA4gjiE +OIY4iDiKOIw4jjiXOJk4mzidOJ84oTijOKU4pzipOKs4rTivOLE4szi1OLc4uTi7OL04vzjBOMM4xTjH +OMk4yzjNOM840TjTONU41zjZONs43TjfOOE44zjlOOc46TjrOO047zjxOPM49Tj3OPk4+zj9OP85ATkD +OQU5BzkJOQs5DTkPORE5EzkVORc5GTkbOR05HzkhOSM5JTknOSk5KzktOS85MTkzOTU5Nzk5OTs5PTk/ +OUg5SjlLOVQ5VzlYOWE5ZDllOW45cwAAAAAAAAICAAAAAAAAB0QAAAAAAAAAAAAAAAAAADmCA + + + diff --git a/Preferences/General/FileDrawerPane.h b/Preferences/General/FileTreePane.h similarity index 79% rename from Preferences/General/FileDrawerPane.h rename to Preferences/General/FileTreePane.h index eb7ed19cf..076ced405 100644 --- a/Preferences/General/FileDrawerPane.h +++ b/Preferences/General/FileTreePane.h @@ -1,5 +1,5 @@ // -// FileDrawerPane.h +// FileTreePane.h // Preferences // // Created by Vincent Spader on 9/4/06. @@ -10,7 +10,7 @@ #import "PreferencePane.h" -@interface FileDrawerPane : PreferencePane { +@interface FileTreePane : PreferencePane { IBOutlet NSTextField *rootPathTextView; } diff --git a/Preferences/General/FileDrawerPane.m b/Preferences/General/FileTreePane.m similarity index 71% rename from Preferences/General/FileDrawerPane.m rename to Preferences/General/FileTreePane.m index fb0f4a461..6829e2f9c 100644 --- a/Preferences/General/FileDrawerPane.m +++ b/Preferences/General/FileTreePane.m @@ -1,22 +1,22 @@ // -// FileDrawerPane.m +// FileTreePane.m // Preferences // // Created by Vincent Spader on 9/4/06. // Copyright 2006 Vincent Spader. All rights reserved. // -#import "FileDrawerPane.h" +#import "FileTreePane.h" -@implementation FileDrawerPane +@implementation FileTreePane - (void)awakeFromNib { - [self setName:NSLocalizedStringFromTableInBundle(@"File Drawer", nil, [NSBundle bundleForClass:[self class]], @"") ]; - [self setIcon:@"file_drawer"]; + [self setName:NSLocalizedStringFromTableInBundle(@"File Tree", nil, [NSBundle bundleForClass:[self class]], @"") ]; + [self setIcon:@"file_tree"]; - [rootPathTextView setStringValue:[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileDrawerRootPath"]]; + [rootPathTextView setStringValue:[[[NSUserDefaultsController sharedUserDefaultsController] defaults] objectForKey:@"fileTreeRootPath"]]; } - (IBAction)openSheet:(id)sender @@ -38,7 +38,7 @@ if (returnCode == NSOKButton) { [rootPathTextView setStringValue:[panel filename]]; - [[NSUserDefaults standardUserDefaults] setObject:[panel filename] forKey:@"fileDrawerRootPath"]; + [[NSUserDefaults standardUserDefaults] setObject:[panel filename] forKey:@"fileTreeRootPath"]; } } diff --git a/Preferences/General/General.xcodeproj/project.pbxproj b/Preferences/General/General.xcodeproj/project.pbxproj index 9f11c9dc8..d1fb5ae3e 100644 --- a/Preferences/General/General.xcodeproj/project.pbxproj +++ b/Preferences/General/General.xcodeproj/project.pbxproj @@ -16,14 +16,14 @@ 17C643690B8A788000C53518 /* output.png in Resources */ = {isa = PBXBuildFile; fileRef = 17C643680B8A788000C53518 /* output.png */; }; 17C644330B8A791D00C53518 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C644310B8A791D00C53518 /* CoreAudio.framework */; }; 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 */; }; - 8E07AA870AAC8EA200A4B32F /* FileDrawerPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AA7F0AAC8EA200A4B32F /* FileDrawerPane.m */; }; 8E07AA880AAC8EA200A4B32F /* HotKeyPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */; }; 8E07AA890AAC8EA200A4B32F /* PreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E07AA830AAC8EA200A4B32F /* PreferencePane.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 */; }; - 8E07AC050AAC968C00A4B32F /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 8E07AC030AAC968C00A4B32F /* Preferences.nib */; }; 8E15A86C0B894768006DC802 /* updates.png in Resources */ = {isa = PBXBuildFile; fileRef = 8E15A86B0B894768006DC802 /* updates.png */; }; 8E6C12160AACAE4100819171 /* NDHotKeyControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E6C12130AACAE4100819171 /* NDHotKeyControl.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 = ""; }; 17C644310B8A791D00C53518 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; 17E41DB50C130A9D00AC744D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; + 17E78A790D68BE1E005C5A59 /* FileTreePane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileTreePane.h; sourceTree = ""; }; + 17E78A7A0D68BE1E005C5A59 /* FileTreePane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileTreePane.m; sourceTree = ""; }; + 17E78A7D0D68BE3C005C5A59 /* file_tree.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = file_tree.png; path = Icons/file_tree.png; sourceTree = ""; }; + 17E78B690D68C1E3005C5A59 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preferences.xib; sourceTree = ""; }; 32DBCF630370AF2F00C91783 /* General_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = General_Prefix.pch; sourceTree = ""; }; 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 = ""; }; - 8E07AA7E0AAC8EA200A4B32F /* FileDrawerPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FileDrawerPane.h; sourceTree = ""; }; - 8E07AA7F0AAC8EA200A4B32F /* FileDrawerPane.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FileDrawerPane.m; sourceTree = ""; }; 8E07AA800AAC8EA200A4B32F /* HotKeyPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HotKeyPane.h; sourceTree = ""; }; 8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HotKeyPane.m; sourceTree = ""; }; 8E07AA820AAC8EA200A4B32F /* PreferencePane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencePane.h; sourceTree = ""; }; @@ -59,9 +61,7 @@ 8E07AA840AAC8EA200A4B32F /* PrefPaneController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PrefPaneController.h; sourceTree = ""; }; 8E07AA850AAC8EA200A4B32F /* PrefPaneController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PrefPaneController.m; sourceTree = ""; }; 8E07AA860AAC8EA200A4B32F /* SS_PreferencePaneProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SS_PreferencePaneProtocol.h; sourceTree = ""; }; - 8E07ABDA0AAC95BC00A4B32F /* file_drawer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = file_drawer.png; path = Icons/file_drawer.png; sourceTree = ""; }; 8E07ABDB0AAC95BC00A4B32F /* hot_keys.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = hot_keys.png; path = Icons/hot_keys.png; sourceTree = ""; }; - 8E07AC040AAC968C00A4B32F /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = ""; }; 8E15A86B0B894768006DC802 /* updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = updates.png; path = Icons/updates.png; sourceTree = ""; }; 8E6C12120AACAE4100819171 /* NDHotKeyControl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NDHotKeyControl.h; sourceTree = ""; }; 8E6C12130AACAE4100819171 /* NDHotKeyControl.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NDHotKeyControl.m; sourceTree = ""; }; @@ -110,10 +110,10 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + 17E78B680D68C1E3005C5A59 /* Preferences.xib */, 8E07ABD90AAC95AF00A4B32F /* Icons */, 8D5B49B7048680CD000E48DA /* Info.plist */, 178E386D0C3DA64500EE6711 /* InfoPlist.strings */, - 8E07AC030AAC968C00A4B32F /* Preferences.nib */, 17E41DB70C130AA500AC744D /* Localizable.strings */, ); name = Resources; @@ -153,10 +153,10 @@ 17D5033F0ABDB1570022D1E8 /* Panes */ = { isa = PBXGroup; children = ( + 17E78A790D68BE1E005C5A59 /* FileTreePane.h */, + 17E78A7A0D68BE1E005C5A59 /* FileTreePane.m */, 8E07AA820AAC8EA200A4B32F /* PreferencePane.h */, 8E07AA830AAC8EA200A4B32F /* PreferencePane.m */, - 8E07AA7E0AAC8EA200A4B32F /* FileDrawerPane.h */, - 8E07AA7F0AAC8EA200A4B32F /* FileDrawerPane.m */, 8E07AA800AAC8EA200A4B32F /* HotKeyPane.h */, 8E07AA810AAC8EA200A4B32F /* HotKeyPane.m */, 17C6433D0B8A783F00C53518 /* OutputPane.h */, @@ -201,11 +201,11 @@ 8E07ABD90AAC95AF00A4B32F /* Icons */ = { isa = PBXGroup; children = ( + 17E78A7D0D68BE3C005C5A59 /* file_tree.png */, 1766C7A70B912A71004A7AE4 /* lastfm.png */, 17C643680B8A788000C53518 /* output.png */, 8E15A86B0B894768006DC802 /* updates.png */, 172D72AC0B8926CA00D095BB /* apple_remote.png */, - 8E07ABDA0AAC95BC00A4B32F /* file_drawer.png */, 8E07ABDB0AAC95BC00A4B32F /* hot_keys.png */, ); name = Icons; @@ -265,14 +265,14 @@ buildActionMask = 2147483647; files = ( 178E386E0C3DA64500EE6711 /* InfoPlist.strings in Resources */, - 8E07ABDC0AAC95BC00A4B32F /* file_drawer.png in Resources */, 8E07ABDD0AAC95BC00A4B32F /* hot_keys.png in Resources */, - 8E07AC050AAC968C00A4B32F /* Preferences.nib in Resources */, 172D72AD0B8926CA00D095BB /* apple_remote.png in Resources */, 8E15A86C0B894768006DC802 /* updates.png in Resources */, 17C643690B8A788000C53518 /* output.png in Resources */, 1766C7A80B912A71004A7AE4 /* lastfm.png in Resources */, 17E41DB80C130AA500AC744D /* Localizable.strings in Resources */, + 17E78A7E0D68BE3C005C5A59 /* file_tree.png in Resources */, + 17E78B6A0D68C1E3005C5A59 /* Preferences.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -283,7 +283,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8E07AA870AAC8EA200A4B32F /* FileDrawerPane.m in Sources */, 8E07AA880AAC8EA200A4B32F /* HotKeyPane.m in Sources */, 8E07AA890AAC8EA200A4B32F /* PreferencePane.m in Sources */, 8E07AA8A0AAC8EA200A4B32F /* PrefPaneController.m in Sources */, @@ -293,6 +292,7 @@ 17C643380B8A77CC00C53518 /* OutputsArrayController.m in Sources */, 17C6433F0B8A783F00C53518 /* OutputPane.m in Sources */, 170744AD0BFF3938002475C9 /* AppcastArrayController.m in Sources */, + 17E78A7B0D68BE1E005C5A59 /* FileTreePane.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -315,12 +315,12 @@ name = Localizable.strings; sourceTree = ""; }; - 8E07AC030AAC968C00A4B32F /* Preferences.nib */ = { + 17E78B680D68C1E3005C5A59 /* Preferences.xib */ = { isa = PBXVariantGroup; children = ( - 8E07AC040AAC968C00A4B32F /* English */, + 17E78B690D68C1E3005C5A59 /* English */, ); - name = Preferences.nib; + name = Preferences.xib; sourceTree = ""; }; /* End PBXVariantGroup section */ diff --git a/Preferences/General/Icons/file_drawer.png b/Preferences/General/Icons/file_tree.png similarity index 100% rename from Preferences/General/Icons/file_drawer.png rename to Preferences/General/Icons/file_tree.png diff --git a/Preferences/General/PrefPaneController.h b/Preferences/General/PrefPaneController.h index 4fd8e7488..c6f67e72b 100644 --- a/Preferences/General/PrefPaneController.h +++ b/Preferences/General/PrefPaneController.h @@ -10,12 +10,12 @@ #import "SS_PreferencePaneProtocol.h" #import "HotKeyPane.h" -#import "FileDrawerPane.h" +#import "FileTreePane.h" #import "OutputPane.h" @interface PrefPaneController : NSObject { IBOutlet HotKeyPane *hotKeyPane; - IBOutlet FileDrawerPane *fileDrawerPane; + IBOutlet FileTreePane *fileTreePane; IBOutlet OutputPane *outputPane; IBOutlet NSView *scrobblerView; @@ -24,7 +24,7 @@ } - (HotKeyPane *)hotKeyPane; -- (FileDrawerPane *)fileDrawerPane; +- (FileTreePane *)fileTreePane; - (OutputPane *)outputPane; - (PreferencePane *)remotePane; diff --git a/Preferences/General/PrefPaneController.m b/Preferences/General/PrefPaneController.m index 017464788..4ad488be8 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], [prefPaneController scrobblerPane], nil]; + return [NSArray arrayWithObjects: [prefPaneController hotKeyPane], [prefPaneController fileTreePane], [prefPaneController remotePane], [prefPaneController updatesPane], [prefPaneController outputPane], [prefPaneController scrobblerPane], nil]; } - (HotKeyPane *)hotKeyPane @@ -26,9 +26,9 @@ return hotKeyPane; } -- (FileDrawerPane *)fileDrawerPane +- (FileTreePane *)fileTreePane { - return fileDrawerPane; + return fileTreePane; } - (OutputPane *)outputPane