chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed removing queued songs, hooked File Tree icon up to correct method toggleWindow.

Browse source
This commit is contained in:
areff 2008-02-23 20:08:27 +00:00
parent 7109dec4ad
commit 86f691b769
3 changed files with 2528 additions and 2428 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4915
English.lproj/MainMenu.xib
View file

File diff suppressed because it is too large Load diff

14
Playlist/PlaylistController.m
View file

@ -668,17 +668,21 @@
- (IBAction)removeFromQueue:(id)sender
{
for (PlaylistEntry *queueItem in [self selectedObjects])
{
// temporary hack until Remove from Queue menu item gets validation.
if (queueItem.queuePosition < 0)
break;
queueItem.status = kCogEntryNormal;
[queueItem setStatusMessage:nil];
[queueList removeObjectAtIndex:queueItem.queuePosition - 1];
[queueItem setQueuePosition:-1];
[queueList removeObject:queueItem];
}
int i = 1;
for (PlaylistEntry *cur in queueList)
{
[cur setQueuePosition:i++];
[cur setStatusMessage:[NSString stringWithFormat:@"Queued: %i", cur.queuePosition]];
}
}

25
Playlist/PlaylistView.m
View file

@ -195,6 +195,7 @@
[artistMenuItem release];
addedItems++;
}
NSMenuItem *queueMenuItem = [NSMenuItem alloc];
NSString *title = [NSString
stringWithFormat:@"Add to Queue (%d queued)", [[playlistController queueList] count]];
@ -206,17 +207,19 @@
[queueMenuItem release];
addedItems++;
NSMenuItem *queueRemoveMenuItem = [NSMenuItem alloc];
NSString *retitle = [NSString
stringWithFormat:@"Remove from Queue"];
[queueRemoveMenuItem initWithTitle:retitle
action:@selector(removeFromQueue:)
keyEquivalent:@""];
queueRemoveMenuItem.target = playlistController;
[tableViewMenu insertItem:queueRemoveMenuItem atIndex:1];
[queueRemoveMenuItem release];
addedItems++;
if (song.queuePosition > 0)
{
NSMenuItem *queueRemoveMenuItem = [NSMenuItem alloc];
NSString *retitle = [NSString
stringWithFormat:@"Remove from Queue"];
[queueRemoveMenuItem initWithTitle:retitle
action:@selector(removeFromQueue:)
keyEquivalent:@""];
queueRemoveMenuItem.target = playlistController;
[tableViewMenu insertItem:queueRemoveMenuItem atIndex:1];
[queueRemoveMenuItem release];
addedItems++;
}
if(addedItems)
{