Radio/radio_icon.icns @@ -1,3 +1,8 @@ +*1.6* (Jan 9th, 2009) + +* new icon thanks to Tim Broom +* more code tweaking + *1.5* (Jan 9th, 2009) * move links into menu bar CHANGELOG @@ -14,14 +14,14 @@ @interface EmpViewController : NSViewController { IBOutlet WebView *empView; IBOutlet Preloader *preloaderView; - NSString *title; + NSString *displayTitle; NSString *serviceKey; NSString *playbackFormat; NSString *playbackKey; NSString *streamUrl; } -@property (copy) NSString *title; +@property (copy) NSString *displayTitle; @property (copy) NSString *serviceKey; @property (copy) NSString *playbackFormat; @property (copy) NSString *playbackKey; Radio/EmpViewController.h @@ -11,7 +11,7 @@ @implementation EmpViewController -@synthesize title, serviceKey, playbackFormat, playbackKey, streamUrl; +@synthesize displayTitle, serviceKey, playbackFormat, playbackKey, streamUrl; - (void)fetchEmp:(NSString *)keyString { @@ -79,7 +79,7 @@ NSAlert *alert = [[NSAlert alloc] init]; [alert addButtonWithTitle:@"Try again?"]; [alert addButtonWithTitle:@"Quit"]; - [alert setMessageText:[NSString stringWithFormat:@"Error fetching %@", title]]; + [alert setMessageText:[NSString stringWithFormat:@"Error fetching %@", displayTitle]]; [alert setInformativeText:@"Check you are connected to the Internet? \nand try again..."]; [alert setAlertStyle:NSWarningAlertStyle]; [alert setIcon:[NSImage imageNamed:serviceKey]]; Radio/EmpViewController.m Radio/English.lproj/InfoPlist.strings @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="24"/> + <integer value="29"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -215,40 +215,6 @@ </object> </object> </object> - <object class="NSMenuItem" id="586577488"> - <reference key="NSMenu" ref="649796088"/> - <string key="NSTitle">View</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="35465992"/> - <reference key="NSMixedImage" ref="502551668"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="466310130"> - <string key="NSTitle">View</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="102151532"> - <reference key="NSMenu" ref="466310130"/> - <string key="NSTitle">Show Toolbar</string> - <string key="NSKeyEquiv">t</string> - <int key="NSKeyEquivModMask">1572864</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="35465992"/> - <reference key="NSMixedImage" ref="502551668"/> - </object> - <object class="NSMenuItem" id="237841660"> - <reference key="NSMenu" ref="466310130"/> - <string type="base64-UTF8" key="NSTitle">Q3VzdG9taXplIFRvb2xiYXLigKY</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="35465992"/> - <reference key="NSMixedImage" ref="502551668"/> - </object> - </object> - </object> - </object> <object class="NSMenuItem" id="713487014"> <reference key="NSMenu" ref="649796088"/> <string key="NSTitle">Window</string> @@ -364,10 +330,13 @@ </object> <object class="NSMenuItem" id="356823119"> <reference key="NSMenu" ref="374024848"/> - <string type="base64-UTF8" key="NSTitle">VGVybXMgJiBDb25kaXRpb25zA</string> + <string type="base64-UTF8" key="NSTitle">aVBsYXllciBUZXJtcyAmIENvbmRpdGlvbnM</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="35465992"/> + <object class="NSCustomResource" key="NSOnImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSIChatTheaterTemplate</string> + </object> <reference key="NSMixedImage" ref="502551668"/> </object> </object> @@ -412,22 +381,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">runToolbarCustomizationPalette:</string> - <reference key="source" ref="1014"/> - <reference key="destination" ref="237841660"/> - </object> - <int key="connectionID">365</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">toggleToolbarShown:</string> - <reference key="source" ref="1014"/> - <reference key="destination" ref="102151532"/> - </object> - <int key="connectionID">366</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">hideOtherApplications:</string> <reference key="source" ref="1014"/> <reference key="destination" ref="342932134"/> @@ -576,7 +529,6 @@ <reference ref="713487014"/> <reference ref="694149608"/> <reference ref="391199113"/> - <reference ref="586577488"/> <reference ref="474576541"/> <reference ref="628461968"/> </object> @@ -714,41 +666,12 @@ <reference key="parent" ref="835318025"/> </object> <object class="IBObjectRecord"> - <int key="objectID">295</int> - <reference key="object" ref="586577488"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="466310130"/> - </object> - <reference key="parent" ref="649796088"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">450</int> <reference key="object" ref="436405642"/> <reference key="parent" ref="1049"/> <string key="objectName">AppController</string> </object> <object class="IBObjectRecord"> - <int key="objectID">296</int> - <reference key="object" ref="466310130"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="237841660"/> - <reference ref="102151532"/> - </object> - <reference key="parent" ref="586577488"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">298</int> - <reference key="object" ref="237841660"/> - <reference key="parent" ref="466310130"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">297</int> - <reference key="object" ref="102151532"/> - <reference key="parent" ref="466310130"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">459</int> <reference key="object" ref="474576541"/> <object class="NSMutableArray" key="children"> @@ -894,12 +817,6 @@ <string>29.ImportedFromIB2</string> <string>29.WindowOrigin</string> <string>29.editorWindowContentRectSynchronizationRect</string> - <string>295.IBPluginDependency</string> - <string>296.IBEditorWindowLastContentRect</string> - <string>296.IBPluginDependency</string> - <string>296.editorWindowContentRectSynchronizationRect</string> - <string>297.IBPluginDependency</string> - <string>298.IBPluginDependency</string> <string>450.IBPluginDependency</string> <string>459.IBPluginDependency</string> <string>460.IBEditorWindowLastContentRect</string> @@ -940,7 +857,7 @@ <string>com.apple.InterfaceBuilderKit</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1" id="9"/> - <string>{{409, 291}, {210, 103}}</string> + <string>{{409, 291}, {258, 103}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{596, 852}, {216, 23}}</string> @@ -968,18 +885,12 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{525, 802}, {197, 73}}</string> - <string>{{79, 394}, {391, 20}}</string> + <string>{{79, 394}, {341, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{74, 862}</string> <string>{{6, 978}, {478, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{362, 576}, {234, 43}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{475, 832}, {234, 43}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{224, 586}, {175, 33}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> Radio/English.lproj/MainMenu.xib @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIconFile</key> - <string>radio</string> + <string>radio_icon</string> <key>CFBundleIdentifier</key> <string>com.whomwah.RadioAunty</string> <key>CFBundleInfoDictionaryVersion</key> @@ -19,7 +19,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.5</string> + <string>1.6</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> Radio/Info.plist @@ -96,15 +96,15 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">displayPatternTitle1: currentSchedule.service.displayTitle</string> + <string key="label">displayPatternTitle1: drEmpViewController.displayTitle</string> <reference key="source" ref="1005"/> <reference key="destination" ref="1001"/> <object class="NSNibBindingConnector" key="connector"> <reference key="NSSource" ref="1005"/> <reference key="NSDestination" ref="1001"/> - <string key="NSLabel">displayPatternTitle1: currentSchedule.service.displayTitle</string> + <string key="NSLabel">displayPatternTitle1: drEmpViewController.displayTitle</string> <string key="NSBinding">displayPatternTitle1</string> - <string key="NSKeyPath">currentSchedule.service.displayTitle</string> + <string key="NSKeyPath">drEmpViewController.displayTitle</string> <object class="NSDictionary" key="NSOptions"> <string key="NS.key.0">NSDisplayPattern</string> <string key="NS.object.0">%{title1}@</string> @@ -112,7 +112,7 @@ <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">99</int> + <int key="connectionID">102</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -225,7 +225,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">99</int> + <int key="maxID">102</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> Radio/MainWindow.xib @@ -17,7 +17,7 @@ extern NSString * const DSRStations; @interface MainWindowController : NSWindowController { NSDockTile *dockTile; - NSImageView *dockView; + NSView *dockView; IBOutlet NSView *drMainView; NSDictionary *currentStation; NSArray *stations; @@ -25,8 +25,9 @@ extern NSString * const DSRStations; EmpViewController *drEmpViewController; } -@property (retain) NSImageView *dockView; +@property (retain) NSView *dockView; @property (retain) NSDictionary *currentStation; +@property (retain) EmpViewController *drEmpViewController; @property (retain) Schedule *currentSchedule; @property (retain) NSArray *stations; Radio/MainWindowController.h @@ -21,11 +21,12 @@ NSString * const DSRStations = @"Stations"; @synthesize currentStation, currentSchedule; @synthesize stations; @synthesize dockView; +@synthesize drEmpViewController; - (void)windowDidLoad { dockTile = [NSApp dockTile]; - drEmpViewController = [[EmpViewController alloc] initWithNibName:@"EmpView" bundle:nil]; + self.drEmpViewController = [[EmpViewController alloc] initWithNibName:@"EmpView" bundle:nil]; [self setStations:[[NSUserDefaults standardUserDefaults] arrayForKey:DSRStations]]; [self setCurrentStation:[stations objectAtIndex:[[NSUserDefaults standardUserDefaults] integerForKey:DSRDefaultStation]]]; [self resizeEmpTo:NSMakeSize(EMP_WIDTH, EMP_HEIGHT)]; @@ -69,7 +70,7 @@ NSString * const DSRStations = @"Stations"; NSLog(@"setAndLoadStation:%@", station); [self setCurrentStation:station]; [self resizeEmpTo:NSMakeSize(EMP_WIDTH, EMP_HEIGHT)]; - [drEmpViewController setTitle:[station valueForKey:@"label"]]; + [drEmpViewController setDisplayTitle:@"BBC Radio"]; [drEmpViewController setServiceKey:[station valueForKey:@"key"]]; [drEmpViewController setPlaybackFormat:@"live"]; [drEmpViewController setStreamUrl:[station valueForKey:@"realStreamUrl"]]; @@ -77,7 +78,6 @@ NSString * const DSRStations = @"Stations"; [self buildDockTileForKey:[currentStation valueForKey:@"key"]]; [dockTile setContentView:dockView]; - [dockTile setBadgeLabel:@"live"]; [dockTile display]; [self unregisterCurrentScheduleForChangeNotificationForKey:@"currentBroadcast"]; @@ -91,15 +91,29 @@ NSString * const DSRStations = @"Stations"; - (void)buildDockTileForKey:(NSString *)key { - NSRect frame = NSMakeRect(0, 0, dockTile.size.width, dockTile.size.height); - NSImageView *dockImageView = [[NSImageView alloc] initWithFrame: frame]; - NSImage *img = [[NSImage alloc] initWithData: - [NSData dataWithData:[[NSImage imageNamed:key] TIFFRepresentation]]]; - [img setSize:NSMakeSize(dockTile.size.width/1.5, dockTile.size.height/1.5)]; - [dockImageView setImage:img]; - [self setDockView:dockImageView]; - [img release]; - [dockImageView release]; + NSRect dockFrame = NSMakeRect(0, 0, dockTile.size.width, dockTile.size.height); + NSView *dockIconView = [[NSView alloc] initWithFrame:dockFrame]; + + NSImageView *serviceIconView = [[NSImageView alloc] initWithFrame: + NSMakeRect(15, 0, dockTile.size.width, dockTile.size.height-10.0)]; + NSImage *serviceImg = [[NSImage alloc] initWithData: + [NSData dataWithData:[[NSImage imageNamed:key] TIFFRepresentation]]]; + [serviceIconView setImage:serviceImg]; + [serviceIconView setImageAlignment:NSImageAlignTopLeft]; + + NSImageView *appIconView = [[NSImageView alloc] initWithFrame:dockFrame]; + NSImage *appIcon = [[NSImage alloc] initWithData: + [NSData dataWithData:[[NSImage imageNamed:@"radio_icon"] TIFFRepresentation]]]; + [appIconView setImage:appIcon]; + + [dockIconView addSubview:appIconView]; + [dockIconView addSubview:serviceIconView]; + [self setDockView:dockIconView]; + + [dockIconView release]; + [serviceImg release]; + [appIcon release]; + [appIconView release]; } - (void)changeStation:(id)sender @@ -128,7 +142,9 @@ NSString * const DSRStations = @"Stations"; { [self buildScheduleMenu]; if ([currentSchedule currentBroadcast]) { - [GrowlApplicationBridge notifyWithTitle:[[currentSchedule service] displayTitle] + NSString *stitle = [[currentSchedule service] displayTitle]; + [drEmpViewController setDisplayTitle:stitle]; + [GrowlApplicationBridge notifyWithTitle:stitle description:[[currentSchedule currentBroadcast] displayTitle] notificationName:@"Station about to play" iconData:[NSData dataWithData: @@ -152,14 +168,12 @@ NSString * const DSRStations = @"Stations"; newItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[station valueForKey:@"label"] action:@selector(changeStation:) keyEquivalent:@""]; - - //[self setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; - if ([currentStation isEqualTo:station] == YES) [newItem setState:NSOnState]; + [newItem setEnabled:YES]; NSImage *img = [[NSImage alloc] initWithData:[NSData dataWithData: - [[NSImage imageNamed:[station valueForKey:@"key"]] TIFFRepresentation]]]; + [[NSImage imageNamed:[station valueForKey:@"key"]] TIFFRepresentation]]]; [img setSize:NSMakeSize(20.0, 20.0)]; [newItem setImage:img]; [newItem setTag:count]; @@ -187,36 +201,37 @@ NSString * const DSRStations = @"Stations"; NSMutableString *label; NSMenu *scheduleMenu = [[[NSApp mainMenu] itemWithTitle:@"Schedule"] submenu]; NSEnumerator *enumerator = [[currentSchedule broadcasts] objectEnumerator]; + NSFont *font = [NSFont userFontOfSize:13.0]; + NSDictionary *attrsDictionary = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; [self clearMenu:scheduleMenu]; int count = 0; for (Broadcast *broadcast in enumerator) { - start = [[broadcast bStart] descriptionWithCalendarFormat:@"%H:%M" - timeZone:nil - locale:nil]; + start = [[broadcast bStart] descriptionWithCalendarFormat:@"%H:%M" timeZone:nil locale:nil]; label = [NSMutableString stringWithFormat:@"%@ %@", start, [broadcast displayTitle]]; + newItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"" + action:NULL + keyEquivalent:@""]; if ([broadcast availableText]) { [label appendFormat:@" (%@)", [broadcast availableText]]; - newItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:label - action:@selector(fetchAOD:) - keyEquivalent:@""]; - } else { - newItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:label - action:NULL - keyEquivalent:@""]; + [newItem setAction:@selector(fetchAOD:)]; } + NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:label + attributes:attrsDictionary]; + + [newItem setAttributedTitle:attrString]; [newItem setEnabled:YES]; [newItem setTag:count]; - if ([broadcast isEqual:[currentSchedule currentBroadcast]] == YES) { + if ([broadcast isEqual:[currentSchedule currentBroadcast]] == YES) [newItem setState:NSOnState]; - } [newItem setEnabled:YES]; [newItem setTarget:self]; [scheduleMenu addItem:newItem]; [newItem release]; + [attrString release]; count++; } } @@ -225,9 +240,8 @@ NSString * const DSRStations = @"Stations"; { Broadcast *broadcast = [[currentSchedule broadcasts] objectAtIndex:[sender tag]]; [self resizeEmpTo:NSMakeSize(EMP_WIDTH, 233.0)]; - [dockTile setBadgeLabel:@"replay"]; [dockTile display]; - [drEmpViewController setTitle:[broadcast displayTitle]]; + [drEmpViewController setDisplayTitle:[broadcast displayTitle]]; [drEmpViewController setServiceKey:[[currentSchedule service] key]]; [drEmpViewController setPlaybackFormat:@"emp"]; [drEmpViewController setStreamUrl:nil]; Radio/MainWindowController.m @@ -2,9 +2,9 @@ { 089C165DFE840E0CC02AAC07 /* English */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {887, 396}}"; - sepNavSelRange = "{209, 0}"; - sepNavVisRange = "{0, 209}"; + sepNavIntBoundsRect = "{{0, 0}, {1124, 84}}"; + sepNavSelRange = "{198, 0}"; + sepNavVisRange = "{0, 0}"; }; }; 1DDD58150DA1D0A300B32029 /* English */ = { @@ -46,7 +46,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 659, + 711, 20, 48, 43, @@ -80,7 +80,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 862, + 683, 60, 20, 48, @@ -97,8 +97,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 253224058; - PBXWorkspaceStateSaveDate = 253224058; + PBXPerProjectTemplateStateSaveDate = 253572915; + PBXWorkspaceStateSaveDate = 253572915; }; perUserProjectItems = { AE00C1DF0F0B96A500174E0B /* PlistBookmark */ = AE00C1DF0F0B96A500174E0B /* PlistBookmark */; @@ -106,20 +106,18 @@ AE0E9C320EFA3D150024215E /* PBXTextBookmark */ = AE0E9C320EFA3D150024215E /* PBXTextBookmark */; AE0E9C330EFA3D150024215E /* PBXTextBookmark */ = AE0E9C330EFA3D150024215E /* PBXTextBookmark */; AE1BFBBA0F173E30006ED3DF /* PBXTextBookmark */ = AE1BFBBA0F173E30006ED3DF /* PBXTextBookmark */; - AE474BC90F17D82500D0603C /* PBXTextBookmark */ = AE474BC90F17D82500D0603C /* PBXTextBookmark */; + AE34A7A20F1D09D1005BF9AB /* PBXTextBookmark */ = AE34A7A20F1D09D1005BF9AB /* PBXTextBookmark */; + AE34A7CB0F1D0B73005BF9AB /* PBXTextBookmark */ = AE34A7CB0F1D0B73005BF9AB /* PBXTextBookmark */; + AE34A7FF0F1D0E28005BF9AB /* PBXTextBookmark */ = AE34A7FF0F1D0E28005BF9AB /* PBXTextBookmark */; AE474BF60F17DE8700D0603C /* PBXTextBookmark */ = AE474BF60F17DE8700D0603C /* PBXTextBookmark */; - AE474BF70F17DE8700D0603C /* PBXTextBookmark */ = AE474BF70F17DE8700D0603C /* PBXTextBookmark */; - AE474BF80F17DE8700D0603C /* PBXTextBookmark */ = AE474BF80F17DE8700D0603C /* PBXTextBookmark */; AE5B3B470F0BF2B0000F736D /* PBXTextBookmark */ = AE5B3B470F0BF2B0000F736D /* PBXTextBookmark */; AE5B3B4A0F0BF2B0000F736D /* PBXTextBookmark */ = AE5B3B4A0F0BF2B0000F736D /* PBXTextBookmark */; + AE630BDA0F1CDEAE00905968 /* PBXTextBookmark */ = AE630BDA0F1CDEAE00905968 /* PBXTextBookmark */; AE63FDCC0F166F79009EADBC /* PBXTextBookmark */ = AE63FDCC0F166F79009EADBC /* PBXTextBookmark */; AE63FDCD0F166F79009EADBC /* PBXTextBookmark */ = AE63FDCD0F166F79009EADBC /* PBXTextBookmark */; AE63FDCF0F166F79009EADBC /* PBXBookmark */ = AE63FDCF0F166F79009EADBC /* PBXBookmark */; - AE63FDD00F166F79009EADBC /* PBXBookmark */ = AE63FDD00F166F79009EADBC /* PBXBookmark */; AE63FDD20F166F79009EADBC /* PBXTextBookmark */ = AE63FDD20F166F79009EADBC /* PBXTextBookmark */; - AE63FDD90F166F79009EADBC /* PBXBookmark */ = AE63FDD90F166F79009EADBC /* PBXBookmark */; AE63FDDA0F166F79009EADBC /* PBXTextBookmark */ = AE63FDDA0F166F79009EADBC /* PBXTextBookmark */; - AE63FE280F1672D2009EADBC /* PBXTextBookmark */ = AE63FE280F1672D2009EADBC /* PBXTextBookmark */; AE63FE290F1672D2009EADBC /* PBXTextBookmark */ = AE63FE290F1672D2009EADBC /* PBXTextBookmark */; AE6966670EF6AD0200B029FE /* PBXTextBookmark */ = AE6966670EF6AD0200B029FE /* PBXTextBookmark */; AE6966680EF6AD0200B029FE /* PBXTextBookmark */ = AE6966680EF6AD0200B029FE /* PBXTextBookmark */; @@ -128,13 +126,6 @@ AE6966DB0EF6B2E700B029FE /* PBXTextBookmark */ = AE6966DB0EF6B2E700B029FE /* PBXTextBookmark */; AE73A00D0EF9549D00AB9578 /* PlistBookmark */ = AE73A00D0EF9549D00AB9578 /* PlistBookmark */; AE73A0A70EF95C3000AB9578 /* PlistBookmark */ = AE73A0A70EF95C3000AB9578 /* PlistBookmark */; - AE8D896F0F17E4970015B2E8 /* PBXTextBookmark */ = AE8D896F0F17E4970015B2E8 /* PBXTextBookmark */; - AE8D89710F17E4970015B2E8 /* PBXTextBookmark */ = AE8D89710F17E4970015B2E8 /* PBXTextBookmark */; - AE8D898B0F17E6030015B2E8 /* PlistBookmark */ = AE8D898B0F17E6030015B2E8 /* PlistBookmark */; - AE8D89A40F17EB140015B2E8 /* PlistBookmark */ = AE8D89A40F17EB140015B2E8 /* PlistBookmark */; - AE8D89A50F17EB140015B2E8 /* PlistBookmark */ = AE8D89A50F17EB140015B2E8 /* PlistBookmark */; - AE8D89A60F17EB140015B2E8 /* PlistBookmark */ = AE8D89A60F17EB140015B2E8 /* PlistBookmark */; - AE8D89AA0F17EB6E0015B2E8 /* PlistBookmark */ = AE8D89AA0F17EB6E0015B2E8 /* PlistBookmark */; AEA0B45D0EF7F13200137DAA /* PBXTextBookmark */ = AEA0B45D0EF7F13200137DAA /* PBXTextBookmark */; AEA0B45E0EF7F13200137DAA /* PBXTextBookmark */ = AEA0B45E0EF7F13200137DAA /* PBXTextBookmark */; AEA0B48F0EF7F42500137DAA /* PlistBookmark */ = AEA0B48F0EF7F42500137DAA /* PlistBookmark */; @@ -157,16 +148,21 @@ AEC796CD0F1611DF000098B1 /* PBXTextBookmark */ = AEC796CD0F1611DF000098B1 /* PBXTextBookmark */; AEC796DF0F161C61000098B1 /* PBXBookmark */ = AEC796DF0F161C61000098B1 /* PBXBookmark */; AEC796E10F161C61000098B1 /* PBXBookmark */ = AEC796E10F161C61000098B1 /* PBXBookmark */; + AEC868FC0F1D0F26005ABE4D /* PBXTextBookmark */ = AEC868FC0F1D0F26005ABE4D /* PBXTextBookmark */; + AED8451B0F1B30C3005438BB /* PlistBookmark */ = AED8451B0F1B30C3005438BB /* PlistBookmark */; + AEDCE26B0F1D378D007DEDF7 /* PBXTextBookmark */ = AEDCE26B0F1D378D007DEDF7 /* PBXTextBookmark */; + AEDCE26C0F1D378D007DEDF7 /* PlistBookmark */ = AEDCE26C0F1D378D007DEDF7 /* PlistBookmark */; + AEDCE26D0F1D378D007DEDF7 /* PBXTextBookmark */ = AEDCE26D0F1D378D007DEDF7 /* PBXTextBookmark */; + AEDCE2730F1D37D2007DEDF7 /* PlistBookmark */ = AEDCE2730F1D37D2007DEDF7 /* PlistBookmark */; AEDCF76E0F173EFF00B0585B /* PBXTextBookmark */ = AEDCF76E0F173EFF00B0585B /* PBXTextBookmark */; AEDCF76F0F173EFF00B0585B /* PBXTextBookmark */ = AEDCF76F0F173EFF00B0585B /* PBXTextBookmark */; AEDCF8790F17532400B0585B /* PBXTextBookmark */ = AEDCF8790F17532400B0585B /* PBXTextBookmark */; - AEDCF9590F176D0000B0585B /* PBXTextBookmark */ = AEDCF9590F176D0000B0585B /* PBXTextBookmark */; - AEDCF9780F176E5700B0585B /* PBXTextBookmark */ = AEDCF9780F176E5700B0585B /* PBXTextBookmark */; AEDD16D60F0BF0B6009F81AD /* PBXBookmark */ = AEDD16D60F0BF0B6009F81AD /* PBXBookmark */; AEED00000EFD5D520022205D /* PBXTextBookmark */ = AEED00000EFD5D520022205D /* PBXTextBookmark */; AEED01450F0670880022205D /* PBXTextBookmark */ = AEED01450F0670880022205D /* PBXTextBookmark */; AEED01460F0670880022205D /* PBXTextBookmark */ = AEED01460F0670880022205D /* PBXTextBookmark */; AEEDFFF70EFD5D520022205D /* PBXTextBookmark */ = AEEDFFF70EFD5D520022205D /* PBXTextBookmark */; + AEF26EF30F1C0560005826A8 /* PBXTextBookmark */ = AEF26EF30F1C0560005826A8 /* PBXTextBookmark */; }; sourceControlManager = AE69664B0EF6ABC400B029FE /* Source Control */; userBuildSettings = { @@ -237,9 +233,9 @@ }; AE1BFB920F173B8A006ED3DF /* live.html */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {2749, 624}}"; - sepNavSelRange = "{803, 32}"; - sepNavVisRange = "{0, 1193}"; + sepNavIntBoundsRect = "{{0, 0}, {2749, 476}}"; + sepNavSelRange = "{926, 0}"; + sepNavVisRange = "{0, 0}"; }; }; AE1BFB930F173B8A006ED3DF /* emp.html */ = { @@ -259,45 +255,45 @@ vrLen = 250; vrLoc = 0; }; - AE474BC90F17D82500D0603C /* PBXTextBookmark */ = { + AE34A7A20F1D09D1005BF9AB /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = AE1BFB920F173B8A006ED3DF /* live.html */; - name = "live.html: 18"; - rLen = 32; - rLoc = 803; + fRef = 089C165DFE840E0CC02AAC07 /* English */; + name = "InfoPlist.strings: 3"; + rLen = 74; + rLoc = 124; rType = 0; - vrLen = 1193; + vrLen = 283; vrLoc = 0; }; - AE474BF60F17DE8700D0603C /* PBXTextBookmark */ = { + AE34A7CB0F1D0B73005BF9AB /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = AE1BFB930F173B8A006ED3DF /* emp.html */; - name = "emp.html: 9"; + fRef = AE6966590EF6AC0300B029FE /* MainWindowController.h */; + name = "MainWindowController.h: 28"; rLen = 0; - rLoc = 275; + rLoc = 638; rType = 0; - vrLen = 793; - vrLoc = 0; + vrLen = 1379; + vrLoc = 43; }; - AE474BF70F17DE8700D0603C /* PBXTextBookmark */ = { + AE34A7FF0F1D0E28005BF9AB /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = AE6966590EF6AC0300B029FE /* MainWindowController.h */; - name = "MainWindowController.h: 36"; + fRef = AE1BFB920F173B8A006ED3DF /* live.html */; + name = "live.html: 29"; rLen = 0; - rLoc = 925; + rLoc = 1101; rType = 0; - vrLen = 1365; - vrLoc = 3; + vrLen = 1193; + vrLoc = 0; }; - AE474BF80F17DE8700D0603C /* PBXTextBookmark */ = { + AE474BF60F17DE8700D0603C /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = AE69665A0EF6AC0300B029FE /* MainWindowController.m */; - name = "MainWindowController.m: 249"; + fRef = AE1BFB930F173B8A006ED3DF /* emp.html */; + name = "emp.html: 9"; rLen = 0; - rLoc = 8994; + rLoc = 275; rType = 0; - vrLen = 1532; - vrLoc = 7469; + vrLen = 793; + vrLoc = 0; }; AE5B3B470F0BF2B0000F736D /* PBXTextBookmark */ = { isa = PBXTextBookmark; @@ -319,6 +315,16 @@ vrLen = 1516; vrLoc = 10823; }; + AE630BDA0F1CDEAE00905968 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = AE6966700EF6AD1800B029FE /* EmpViewController.m */; + name = "EmpViewController.m: 26"; + rLen = 0; + rLoc = 503; + rType = 0; + vrLen = 1409; + vrLoc = 193; + }; AE63FDCC0F166F79009EADBC /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = AEC793E90F13A2CB000098B1 /* Broadcast.h */; @@ -343,10 +349,6 @@ isa = PBXBookmark; fRef = AEDD16960F0BEFF3009F81AD /* 1xtra.png */; }; - AE63FDD00F166F79009EADBC /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = AEA0B4890EF7F3D200137DAA /* radio.icns */; - }; AE63FDD20F166F79009EADBC /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = AEA0B4870EF7F3C900137DAA /* dsa_pub.pem */; @@ -357,10 +359,6 @@ vrLen = 1178; vrLoc = 0; }; - AE63FDD90F166F79009EADBC /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = AEA0B4890EF7F3D200137DAA /* radio.icns */; - }; AE63FDDA0F166F79009EADBC /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = AEA0B4870EF7F3C900137DAA /* dsa_pub.pem */; @@ -371,16 +369,6 @@ vrLen = 1178; vrLoc = 0; }; - AE63FE280F1672D2009EADBC /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 089C165DFE840E0CC02AAC07 /* English */; - name = "InfoPlist.strings: 5"; - rLen = 0; - rLoc = 209; - rType = 0; - vrLen = 209; - vrLoc = 0; - }; AE63FE290F1672D2009EADBC /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = AEED013A0F066FD30022205D /* NSString-Utilities.h */; @@ -439,23 +427,23 @@ }; AE6966570EF6ABF200B029FE /* AppController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {837, 1246}}"; - sepNavSelRange = "{1906, 0}"; - sepNavVisRange = "{1598, 1069}"; + sepNavIntBoundsRect = "{{0, 0}, {1124, 1176}}"; + sepNavSelRange = "{1093, 0}"; + sepNavVisRange = "{0, 0}"; }; }; AE6966590EF6AC0300B029FE /* MainWindowController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {887, 658}}"; - sepNavSelRange = "{925, 0}"; - sepNavVisRange = "{3, 1365}"; + sepNavIntBoundsRect = "{{0, 0}, {1124, 658}}"; + sepNavSelRange = "{638, 0}"; + sepNavVisRange = "{0, 0}"; }; }; AE69665A0EF6AC0300B029FE /* MainWindowController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {880, 3626}}"; - sepNavSelRange = "{8994, 0}"; - sepNavVisRange = "{7469, 1532}"; + sepNavIntBoundsRect = "{{0, 0}, {889, 3878}}"; + sepNavSelRange = "{1223, 0}"; + sepNavVisRange = "{560, 1345}"; }; }; AE6966670EF6AD0200B029FE /* PBXTextBookmark */ = { @@ -480,16 +468,16 @@ }; AE69666F0EF6AD1800B029FE /* EmpViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1127, 560}}"; - sepNavSelRange = "{563, 9}"; - sepNavVisRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {901, 615}}"; + sepNavSelRange = "{395, 0}"; + sepNavVisRange = "{0, 1393}"; }; }; AE6966700EF6AD1800B029FE /* EmpViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1127, 1428}}"; - sepNavSelRange = "{1130, 0}"; - sepNavVisRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {901, 1526}}"; + sepNavSelRange = "{503, 0}"; + sepNavVisRange = "{193, 1409}"; }; }; AE6966780EF6ADEF00B029FE /* PBXTextBookmark */ = { @@ -497,7 +485,7 @@ fRef = AE6966590EF6AC0300B029FE /* MainWindowController.h */; name = "MainWindowController.h: 13"; rLen = 0; - rLoc = 1361; + rLoc = 1415; rType = 0; vrLen = 285; vrLoc = 0; @@ -544,90 +532,6 @@ rLen = 0; rLoc = 2147483647; }; - AE8D896F0F17E4970015B2E8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = AE6966570EF6ABF200B029FE /* AppController.m */; - name = "AppController.m: 60"; - rLen = 0; - rLoc = 1906; - rType = 0; - vrLen = 1069; - vrLoc = 1598; - }; - AE8D89710F17E4970015B2E8 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = AE6966570EF6ABF200B029FE /* AppController.m */; - name = "AppController.m: 60"; - rLen = 0; - rLoc = 1906; - rType = 0; - vrLen = 1069; - vrLoc = 1598; - }; - AE8D898B0F17E6030015B2E8 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - CFBundleVersion, - ); - name = /Users/duncan/_checkouts/git/radioaunty/Radio/Info.plist; - rLen = 0; - rLoc = 2147483647; - }; - AE8D89A40F17EB140015B2E8 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = AE333BDB0EF79B4B0077A647 /* Stations.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - Stations, - 10, - realStreamUrl, - ); - name = /Users/duncan/_checkouts/git/radioaunty/Radio/Stations.plist; - rLen = 0; - rLoc = 2147483647; - }; - AE8D89A50F17EB140015B2E8 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - CFBundleVersion, - ); - name = /Users/duncan/_checkouts/git/radioaunty/Radio/Info.plist; - rLen = 3; - rLoc = 0; - }; - AE8D89A60F17EB140015B2E8 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = AE333BDB0EF79B4B0077A647 /* Stations.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - Stations, - 10, - realStreamUrl, - ); - name = /Users/duncan/_checkouts/git/radioaunty/Radio/Stations.plist; - rLen = 0; - rLoc = 2147483647; - }; - AE8D89AA0F17EB6E0015B2E8 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - CFBundleVersion, - ); - name = /Users/duncan/_checkouts/git/radioaunty/Radio/Info.plist; - rLen = 3; - rLoc = 0; - }; AEA0B4500EF7F09400137DAA /* PreferencesWindowController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {887, 579}}"; @@ -686,7 +590,7 @@ fRef = 089C165DFE840E0CC02AAC07 /* English */; name = "InfoPlist.strings: 5"; rLen = 0; - rLoc = 209; + rLoc = 283; rType = 0; vrLen = 209; vrLoc = 0; @@ -730,7 +634,7 @@ fRef = AE69665A0EF6AC0300B029FE /* MainWindowController.m */; name = "MainWindowController.m: 27"; rLen = 0; - rLoc = 673; + rLoc = 711; rType = 0; vrLen = 1455; vrLoc = 43; @@ -915,6 +819,69 @@ isa = PBXBookmark; fRef = AEDD169A0F0BEFF4009F81AD /* radio7.png */; }; + AEC868FC0F1D0F26005ABE4D /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = AE69665A0EF6AC0300B029FE /* MainWindowController.m */; + name = "MainWindowController.m: 46"; + rLen = 0; + rLoc = 1223; + rType = 0; + vrLen = 1345; + vrLoc = 560; + }; + AED8451B0F1B30C3005438BB /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = AE333BDB0EF79B4B0077A647 /* Stations.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + ); + name = /Users/duncan/_checkouts/git/radioaunty/Radio/Stations.plist; + rLen = 0; + rLoc = 2147483647; + }; + AEDCE26B0F1D378D007DEDF7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = AE6966570EF6ABF200B029FE /* AppController.m */; + name = "AppController.m: 31"; + rLen = 0; + rLoc = 1093; + rType = 0; + vrLen = 1540; + vrLoc = 135; + }; + AEDCE26C0F1D378D007DEDF7 /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + ); + name = /Users/duncan/_checkouts/git/radioaunty/Radio/Info.plist; + rLen = 0; + rLoc = 2147483647; + }; + AEDCE26D0F1D378D007DEDF7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = AE6966570EF6ABF200B029FE /* AppController.m */; + name = "AppController.m: 31"; + rLen = 0; + rLoc = 1093; + rType = 0; + vrLen = 1540; + vrLoc = 135; + }; + AEDCE2730F1D37D2007DEDF7 /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + ); + name = /Users/duncan/_checkouts/git/radioaunty/Radio/Info.plist; + rLen = 0; + rLoc = 2147483647; + }; AEDCF76E0F173EFF00B0585B /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = AE1BFB920F173B8A006ED3DF /* live.html */; @@ -945,26 +912,6 @@ vrLen = 650; vrLoc = 0; }; - AEDCF9590F176D0000B0585B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = AE69666F0EF6AD1800B029FE /* EmpViewController.h */; - name = "EmpViewController.h: 21"; - rLen = 9; - rLoc = 563; - rType = 0; - vrLen = 1379; - vrLoc = 0; - }; - AEDCF9780F176E5700B0585B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = AE6966700EF6AD1800B029FE /* EmpViewController.m */; - name = "EmpViewController.m: 40"; - rLen = 0; - rLoc = 1130; - rType = 0; - vrLen = 1296; - vrLoc = 300; - }; AEDD16D60F0BF0B6009F81AD /* PBXBookmark */ = { isa = PBXBookmark; fRef = AEDD16960F0BEFF3009F81AD /* 1xtra.png */; @@ -1044,4 +991,14 @@ path = /Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/AppKit.framework/Versions/C/Headers/NSWindowController.h; sourceTree = "<absolute>"; }; + AEF26EF30F1C0560005826A8 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = AE69666F0EF6AD1800B029FE /* EmpViewController.h */; + name = "EmpViewController.h: 17"; + rLen = 0; + rLoc = 395; + rType = 0; + vrLen = 1393; + vrLoc = 0; + }; } Radio/Radio.xcodeproj/duncan.pbxuser @@ -257,6 +257,8 @@ <key>Layout</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXBottomSmartGroupGIDs</key> @@ -282,7 +284,7 @@ <dict> <key>PBXSmartGroupTreeModuleColumnWidthsKey</key> <array> - <real>265</real> + <real>213</real> </array> <key>PBXSmartGroupTreeModuleColumnsKey_v4</key> <array> @@ -304,7 +306,7 @@ </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> - <string>{{0, 0}, {265, 643}}</string> + <string>{{0, 0}, {213, 632}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> <array/> @@ -314,19 +316,19 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {282, 661}}</string> + <string>{{0, 0}, {230, 650}}</string> <key>GroupTreeTableConfiguration</key> <array> <string>MainColumn</string> - <real>265</real> + <real>213</real> </array> <key>RubberWindowFrame</key> - <string>22 76 1185 702 0 0 1280 778 </string> + <string>22 87 1185 691 0 0 1280 778 </string> </dict> <key>Module</key> <string>PBXSmartGroupTreeModule</string> <key>Proportion</key> - <string>282pt</string> + <string>230pt</string> </dict> <dict> <key>Dock</key> @@ -349,7 +351,7 @@ <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>AE8D89AA0F17EB6E0015B2E8</string> + <string>AEDCE2730F1D37D2007DEDF7</string> <key>history</key> <array> <string>AE73A0A70EF95C3000AB9578</string> @@ -368,21 +370,20 @@ <string>AE63FDCC0F166F79009EADBC</string> <string>AE63FDCD0F166F79009EADBC</string> <string>AE63FDCF0F166F79009EADBC</string> - <string>AE63FDD00F166F79009EADBC</string> <string>AE63FDD20F166F79009EADBC</string> - <string>AE63FE280F1672D2009EADBC</string> <string>AE63FE290F1672D2009EADBC</string> <string>AE1BFBBA0F173E30006ED3DF</string> <string>AEDCF8790F17532400B0585B</string> - <string>AEDCF9590F176D0000B0585B</string> - <string>AEDCF9780F176E5700B0585B</string> - <string>AE474BC90F17D82500D0603C</string> <string>AE474BF60F17DE8700D0603C</string> - <string>AE474BF70F17DE8700D0603C</string> - <string>AE474BF80F17DE8700D0603C</string> - <string>AE8D896F0F17E4970015B2E8</string> - <string>AE8D89A40F17EB140015B2E8</string> - <string>AE8D89A50F17EB140015B2E8</string> + <string>AED8451B0F1B30C3005438BB</string> + <string>AEF26EF30F1C0560005826A8</string> + <string>AE630BDA0F1CDEAE00905968</string> + <string>AE34A7A20F1D09D1005BF9AB</string> + <string>AE34A7CB0F1D0B73005BF9AB</string> + <string>AE34A7FF0F1D0E28005BF9AB</string> + <string>AEC868FC0F1D0F26005ABE4D</string> + <string>AEDCE26B0F1D378D007DEDF7</string> + <string>AEDCE26C0F1D378D007DEDF7</string> </array> <key>prevStack</key> <array> @@ -413,13 +414,10 @@ <string>AEC793FB0F13D9BA000098B1</string> <string>AEC794D60F13EC22000098B1</string> <string>AEC796E10F161C61000098B1</string> - <string>AE63FDD90F166F79009EADBC</string> <string>AE63FDDA0F166F79009EADBC</string> <string>AEDCF76E0F173EFF00B0585B</string> <string>AEDCF76F0F173EFF00B0585B</string> - <string>AE8D89710F17E4970015B2E8</string> - <string>AE8D898B0F17E6030015B2E8</string> - <string>AE8D89A60F17EB140015B2E8</string> + <string>AEDCE26D0F1D378D007DEDF7</string> </array> </dict> <key>SplitCount</key> @@ -433,14 +431,14 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {898, 656}}</string> + <string>{{0, 0}, {950, 645}}</string> <key>RubberWindowFrame</key> - <string>22 76 1185 702 0 0 1280 778 </string> + <string>22 87 1185 691 0 0 1280 778 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>656pt</string> + <string>645pt</string> </dict> <dict> <key>Proportion</key> @@ -458,9 +456,9 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{10, 27}, {898, -27}}</string> + <string>{{10, 27}, {950, -27}}</string> <key>RubberWindowFrame</key> - <string>22 76 1185 702 0 0 1280 778 </string> + <string>22 87 1185 691 0 0 1280 778 </string> </dict> <key>Module</key> <string>XCDetailModule</string> @@ -514,7 +512,7 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{10, 27}, {901, -27}}</string> + <string>{{10, 27}, {962, -27}}</string> </dict> <key>Module</key> <string>PBXBuildResultsModule</string> @@ -523,7 +521,7 @@ </dict> </array> <key>Proportion</key> - <string>898pt</string> + <string>950pt</string> </dict> </array> <key>Name</key> @@ -542,11 +540,11 @@ </array> <key>TableOfContents</key> <array> - <string>AE8D89730F17E4970015B2E8</string> + <string>AEDCE25F0F1D3742007DEDF7</string> <string>1CA23ED40692098700951B8B</string> - <string>AE8D89740F17E4970015B2E8</string> + <string>AEDCE2600F1D3742007DEDF7</string> <string>AE6966620EF6AD0200B029FE</string> - <string>AE8D89750F17E4970015B2E8</string> + <string>AEDCE2610F1D3742007DEDF7</string> <string>1CA23EDF0692099D00951B8B</string> <string>1CA23EE00692099D00951B8B</string> <string>1CA23EE10692099D00951B8B</string> @@ -593,12 +591,12 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1185, 656}}</string> + <string>{{0, 0}, {1185, 645}}</string> </dict> <key>Module</key> <string>PBXDebugCLIModule</string> <key>Proportion</key> - <string>656pt</string> + <string>645pt</string> </dict> <dict> <key>ContentConfiguration</key> @@ -654,7 +652,7 @@ <key>DebugSTDIOWindowFrame</key> <string>{{200, 200}, {500, 300}}</string> <key>Frame</key> - <string>{{0, 661}, {1185, 0}}</string> + <string>{{0, 650}, {1185, 0}}</string> <key>PBXDebugSessionStackFrameViewKey</key> <dict> <key>DebugVariablesTableConfiguration</key> @@ -691,13 +689,13 @@ </array> <key>TableOfContents</key> <array> - <string>AE8D89790F17E4B10015B2E8</string> + <string>AEDCE2620F1D3742007DEDF7</string> <string>1CCC7628064C1048000F2A68</string> <string>1CCC7629064C1048000F2A68</string> - <string>AE8D897A0F17E4B10015B2E8</string> - <string>AE8D897B0F17E4B10015B2E8</string> - <string>AE8D897C0F17E4B10015B2E8</string> - <string>AE8D897D0F17E4B10015B2E8</string> + <string>AEDCE2630F1D3742007DEDF7</string> + <string>AEDCE2640F1D3742007DEDF7</string> + <string>AEDCE2650F1D3742007DEDF7</string> + <string>AEDCE2660F1D3742007DEDF7</string> <string>AE6966620EF6AD0200B029FE</string> </array> <key>ToolbarConfiguration</key> @@ -713,7 +711,7 @@ <key>StatusbarIsVisible</key> <true/> <key>TimeStamp</key> - <real>253225838.66780901</real> + <real>253573074.04833001</real> <key>ToolbarDisplayMode</key> <integer>1</integer> <key>ToolbarIsVisible</key> @@ -731,7 +729,7 @@ <string>/Users/duncan/_checkouts/git/radioaunty/Radio/Radio.xcodeproj</string> </array> <key>WindowString</key> - <string>22 76 1185 702 0 0 1280 778 </string> + <string>22 87 1185 691 0 0 1280 778 </string> <key>WindowToolsV3</key> <array> <dict> Radio/Radio.xcodeproj/duncan.perspectivev3 @@ -16,6 +16,7 @@ AE1BFB950F173B8A006ED3DF /* emp.html in Resources */ = {isa = PBXBuildFile; fileRef = AE1BFB930F173B8A006ED3DF /* emp.html */; }; AE333BBB0EF798740077A647 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE333BBA0EF798740077A647 /* WebKit.framework */; }; AE333BDC0EF79B4B0077A647 /* Stations.plist in Resources */ = {isa = PBXBuildFile; fileRef = AE333BDB0EF79B4B0077A647 /* Stations.plist */; }; + AE630BAC0F1CDC7200905968 /* radio_icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = AE630BAB0F1CDC7200905968 /* radio_icon.icns */; }; AE6966580EF6ABF200B029FE /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6966570EF6ABF200B029FE /* AppController.m */; }; AE69665B0EF6AC0300B029FE /* MainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = AE69665A0EF6AC0300B029FE /* MainWindowController.m */; }; AE6966710EF6AD1800B029FE /* EmpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AE6966700EF6AD1800B029FE /* EmpViewController.m */; }; @@ -28,7 +29,6 @@ AEA0B4410EF7F01600137DAA /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEA0B4400EF7F01600137DAA /* Sparkle.framework */; }; AEA0B4520EF7F09400137DAA /* PreferencesWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA0B4510EF7F09400137DAA /* PreferencesWindowController.m */; }; AEA0B4880EF7F3C900137DAA /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = AEA0B4870EF7F3C900137DAA /* dsa_pub.pem */; }; - AEA0B48A0EF7F3D200137DAA /* radio.icns in Resources */ = {isa = PBXBuildFile; fileRef = AEA0B4890EF7F3D200137DAA /* radio.icns */; }; AEA0B5530EF8055B00137DAA /* Preloader.m in Sources */ = {isa = PBXBuildFile; fileRef = AEA0B5520EF8055B00137DAA /* Preloader.m */; }; AEB914C30EFBF7C90074754A /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AEA0B4400EF7F01600137DAA /* Sparkle.framework */; }; AEC7925D0F1346B8000098B1 /* Service.m in Sources */ = {isa = PBXBuildFile; fileRef = AEC7925C0F1346B8000098B1 /* Service.m */; }; @@ -86,6 +86,7 @@ AE1BFB930F173B8A006ED3DF /* emp.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = emp.html; sourceTree = "<group>"; }; AE333BBA0EF798740077A647 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; }; AE333BDB0EF79B4B0077A647 /* Stations.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Stations.plist; sourceTree = "<group>"; }; + AE630BAB0F1CDC7200905968 /* radio_icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = radio_icon.icns; sourceTree = "<group>"; }; AE6966560EF6ABF200B029FE /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; }; AE6966570EF6ABF200B029FE /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppController.m; sourceTree = "<group>"; }; AE6966590EF6AC0300B029FE /* MainWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainWindowController.h; sourceTree = "<group>"; }; @@ -101,7 +102,6 @@ AEA0B4500EF7F09400137DAA /* PreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesWindowController.h; sourceTree = "<group>"; }; AEA0B4510EF7F09400137DAA /* PreferencesWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PreferencesWindowController.m; sourceTree = "<group>"; }; AEA0B4870EF7F3C900137DAA /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; }; - AEA0B4890EF7F3D200137DAA /* radio.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = radio.icns; sourceTree = "<group>"; }; AEA0B5510EF8055B00137DAA /* Preloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Preloader.h; sourceTree = "<group>"; }; AEA0B5520EF8055B00137DAA /* Preloader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Preloader.m; sourceTree = "<group>"; }; AEC7925B0F1346B8000098B1 /* Service.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Service.h; sourceTree = "<group>"; }; @@ -209,9 +209,9 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + AE630BAB0F1CDC7200905968 /* radio_icon.icns */, AE1BFB920F173B8A006ED3DF /* live.html */, AE1BFB930F173B8A006ED3DF /* emp.html */, - AEA0B4890EF7F3D200137DAA /* radio.icns */, AEA0B4870EF7F3C900137DAA /* dsa_pub.pem */, AE333BDB0EF79B4B0077A647 /* Stations.plist */, 8D1107310486CEB800E47090 /* Info.plist */, @@ -335,7 +335,6 @@ AE333BDC0EF79B4B0077A647 /* Stations.plist in Resources */, AEA0B43D0EF7EFCE00137DAA /* Preferences.xib in Resources */, AEA0B4880EF7F3C900137DAA /* dsa_pub.pem in Resources */, - AEA0B48A0EF7F3D200137DAA /* radio.icns in Resources */, AE73A0030EF950EA00AB9578 /* Growl Registration Ticket.growlRegDict in Resources */, AEDD16A10F0BEFF4009F81AD /* 1xtra.png in Resources */, AEDD16A20F0BEFF4009F81AD /* 5livesportsextra.png in Resources */, @@ -350,6 +349,7 @@ AEDD16AB0F0BEFF4009F81AD /* worldservice.png in Resources */, AE1BFB940F173B8A006ED3DF /* live.html in Resources */, AE1BFB950F173B8A006ED3DF /* emp.html in Resources */, + AE630BAC0F1CDC7200905968 /* radio_icon.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; Radio/Radio.xcodeproj/project.pbxproj Radio/build/Radio.build/Radio.pbxindex/categories.pbxbtree Radio/build/Radio.build/Radio.pbxindex/cdecls.pbxbtree Radio/build/Radio.build/Radio.pbxindex/decls.pbxbtree Radio/build/Radio.build/Radio.pbxindex/files.pbxbtree Radio/build/Radio.build/Radio.pbxindex/imports.pbxbtree Radio/build/Radio.build/Radio.pbxindex/pbxindex.header Radio/build/Radio.build/Radio.pbxindex/protocols.pbxbtree Radio/build/Radio.build/Radio.pbxindex/refs.pbxbtree Radio/build/Radio.build/Radio.pbxindex/strings.pbxstrings/control Radio/build/Radio.build/Radio.pbxindex/strings.pbxstrings/strings Radio/build/Radio.build/Radio.pbxindex/subclasses.pbxbtree Radio/build/Radio.build/Radio.pbxindex/symbols0.pbxsymbols @@ -6,12 +6,12 @@ <description>Most recent changes with links to updates.</description> <language>en</language> <item> - <title>Version 1.5 (Application tweaks)</title> + <title>Version 1.6 (Cosmetic tweaks)</title> <sparkle:releaseNotesLink> http://github.com/whomwah/radioaunty/raw/master/CHANGELOG </sparkle:releaseNotesLink> - <pubDate>Fri, 9 Jan 2009 20:24:00 +0000</pubDate> - <enclosure url="http://github.com/whomwah/radioaunty/raw/master/releases/1.0/RadioAunty.dmg" sparkle:version="1.5" length="907178" type="application/octet-stream" sparkle:dsaSignature="MC0CFFGf5DJUzp+3CncY8RyLcdp6J9bdAhUAkuYqKZISkZglh761XCOTEfrPF3k=" /> + <pubDate>Tue, 13 Jan 2009 21:00:00 +0000</pubDate> + <enclosure url="http://github.com/whomwah/radioaunty/raw/1.6/releases/1.0/RadioAunty.dmg" sparkle:version="1.6" length="791678" type="application/octet-stream" sparkle:dsaSignature="MC0CFQCB6e2DxPwNklPyEdMKt90bCHYkswIUKtlbo3NdCVgbB3OO8yjtNCJAfNE=" /> </item> </channel> </rss> radioaunty.xml releases/1.0/RadioAunty.dmg Radio/radio.icns 7a8278ca7456dd327c0743dcd3049908e9c7d79f Duncan Robertson duncan@whomwah.com http://github.com/whomwah/radioaunty/commit/4ca97bf79de3e6f4e946048e03e1dcda6bd57a2b 4ca97bf79de3e6f4e946048e03e1dcda6bd57a2b 2009-01-13T13:02:33-08:00 2009-01-13T13:02:33-08:00 prepared for 1.6 release updated icon and added about text bc470bcbb020797b8e3539f00b3a2ab0e8bf56d4 Duncan Robertson duncan@whomwah.com