@@ -1,3 +1,14 @@ +*1.11* (March 26th, 2009) + +* the schedule menu has been updated to + correctly display what broadcast you are + listening to, live or listen again. Also + if you are listening to a show again + the schedule will indicate this as well + as letting you see and select what is + currently playing live on that particular + network + *1.10* (March 25th, 2009) * Fix memory leak CHANGELOG @@ -1,6 +1,6 @@ RadioAunty -A simple Mac app that allows you to listen to Live and Catchup BBC Radio +A Mac app that allows you to listen to Live and Catchup BBC Radio Requires: README @@ -991,13 +991,17 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>changeStation:</string> <string>fetchAOD:</string> + <string>fetchNewSchedule:</string> <string>refreshStation:</string> + <string>tweet:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> Radio/English.lproj/MainMenu.xib @@ -19,7 +19,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.10</string> + <string>1.11</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> Radio/Info.plist @@ -55,7 +55,7 @@ twitterEngine = [[MGTwitterEngine alloc] initWithDelegate:self]; [twitterEngine setUsername:username password:password]; [twitterEngine setClientName:@"RadioAunty" - version:@"1.9" + version:@"1.11" URL:@"http://whomwah.github.com/radioaunty" token:@"radioaunty"]; } @@ -84,8 +84,9 @@ BBCBroadcast *broadcast = [[currentSchedule broadcasts] objectAtIndex:[sender tag]]; currentBroadcast = broadcast; self.windowTitle = [currentSchedule broadcastDisplayTitleForIndex:[sender tag]]; - [self changeDockNetworkIconTo:[currentStation objectForKey:@"key"]]; [empViewController fetchAOD:[broadcast pid]]; + [self changeDockNetworkIconTo:[currentStation objectForKey:@"key"]]; + [self buildScheduleMenu]; [self growl]; } @@ -166,7 +167,7 @@ if ([newTweet isEqualToString:oldTweet] && ((currentBroadcast && [empViewController isLive]) || ![empViewController isLive])) { [twitterEngine sendUpdate:newTweet]; NSImage *twitter_logo = [NSImage imageNamed:@"robot"]; - [GrowlApplicationBridge notifyWithTitle:@"Sending to @radioandtvbot" + [GrowlApplicationBridge notifyWithTitle:@"Sending to @radioandtvbot on Twitter.com" description:newTweet notificationName:@"Send to Twitter" iconData:[twitter_logo TIFFRepresentation] @@ -238,8 +239,9 @@ newItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[station valueForKey:@"label"] action:@selector(changeStation:) keyEquivalent:@""]; - if ([currentStation isEqualTo:station] == YES) + if ([currentStation isEqualTo:station] == YES) { [newItem setState:NSOnState]; + } [newItem setEnabled:YES]; NSImage *img = [[NSImage imageNamed:[station valueForKey:@"key"]] copyWithZone:NULL]; @@ -266,39 +268,56 @@ { NSMenuItem *newItem; NSString *start; - NSMutableString *label; NSMenu *scheduleMenu = [[[NSApp mainMenu] itemWithTitle:@"Schedule"] submenu]; - NSFont *font = [NSFont userFontOfSize:13.0]; - NSDictionary *attrsDictionary = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; [self clearMenu:scheduleMenu]; int count = 0; for (BBCBroadcast *broadcast in [currentSchedule broadcasts]) { 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 radioAvailability]) { - [label appendFormat:@" (%@)", [broadcast radioAvailability]]; - [newItem setAction:@selector(fetchAOD:)]; + NSMutableString *str = [NSMutableString stringWithFormat:@"%@ %@", start, [broadcast displayTitle]]; + NSString *state = @""; + + if ([broadcast isEqual:currentBroadcast] == YES) { + state = @" NOW PLAYING"; + [newItem setState:NSOnState]; + } else if ([broadcast radioAvailability]) { + [newItem setAction:@selector(fetchAOD:)]; + } else if ([broadcast isEqual:[currentSchedule currBroadcast]] == YES) { + state = @" LIVE"; + [newItem setAction:@selector(refreshStation:)]; } - NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:label - attributes:attrsDictionary]; + [str appendString:state]; + NSMutableAttributedString *string = [[NSMutableAttributedString alloc] initWithString:str]; + + [string addAttribute:NSFontAttributeName + value:[NSFont userFontOfSize:13.6] + range:NSMakeRange(0,[start length])]; - [newItem setAttributedTitle:attrString]; + [string addAttribute:NSFontAttributeName + value:[NSFont userFontOfSize:13.6] + range:NSMakeRange([start length]+1,[[broadcast displayTitle] length])]; + + [string addAttribute:NSForegroundColorAttributeName + value:[NSColor lightGrayColor] + range:NSMakeRange(1+[start length]+[[broadcast displayTitle] length],[state length])]; + + [string addAttribute:NSFontAttributeName + value:[NSFont userFontOfSize:9] + range:NSMakeRange(1+[start length]+[[broadcast displayTitle] length],[state length])]; + + [newItem setAttributedTitle:string]; [newItem setEnabled:YES]; [newItem setTag:count]; - if ([broadcast isEqual:currentBroadcast] == YES) { - [newItem setState:NSOnState]; - } [newItem setEnabled:YES]; [newItem setTarget:self]; [scheduleMenu addItem:newItem]; [newItem release]; - [attrString release]; + [string release]; count++; } } Radio/MainWindowController.m 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.10 (Simpler interface view, fixes)</title> + <title>Version 1.11 (Cleverize Schedule)</title> <sparkle:releaseNotesLink> http://github.com/whomwah/radioaunty/raw/master/CHANGELOG </sparkle:releaseNotesLink> - <pubDate>Wed, 25 Mar 2009 10:00:00 +0000</pubDate> - <enclosure url="http://cloud.github.com/downloads/whomwah/radioaunty/RadioAunty_1.10.dmg" sparkle:version="1.10" length="922532" type="application/octet-stream" sparkle:dsaSignature="MCwCFD8EKOeptAh4IfY6peZmShdizwUSAhRBHvYAYdbDEmSk7YBWMfrAPQDsGQ==" /> + <pubDate>Wed, 26 Mar 2009 10:00:00 +0000</pubDate> + <enclosure url="http://cloud.github.com/downloads/whomwah/radioaunty/RadioAunty_1.11.dmg" sparkle:version="1.11" length="924360" type="application/octet-stream" sparkle:dsaSignature="MCwCFDmHbuy0dE5Et4p8Q+T0s3jf11yBAhRqZR0mpcLRkYD9r4a1+MCX/k7E1g==" /> </item> </channel> </rss> radioaunty.xml 8cb08da7beb39ce233fc458cbb16f358f1df5579 Duncan Robertson duncan@whomwah.com http://github.com/whomwah/radioaunty/commit/cc84c04b12f4cd299b3d142a2d5c2ac677dfdded cc84c04b12f4cd299b3d142a2d5c2ac677dfdded 2009-03-26T01:20:40-07:00 2009-03-26T01:20:40-07:00 the schedule menu has been updated to correctly display what broadcast you are listening to, live or listen again. Also if you are listening to a show again the schedule will indicate this as well as letting you see and select what is currently playing live on that particular network 2214e20fc8447b1da3f744b84bf69bc081cae806 Duncan Robertson duncan@whomwah.com