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

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

CQTexperiment
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

16
Playlist/PlaylistController.m
View File

@ -668,17 +668,21 @@
- (IBAction)removeFromQueue:(id)sender - (IBAction)removeFromQueue:(id)sender
{ {
for (PlaylistEntry *queueItem in [self selectedObjects]) 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.status = kCogEntryNormal;
[queueItem setStatusMessage:nil]; [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]; [artistMenuItem release];
addedItems++; addedItems++;
} }
NSMenuItem *queueMenuItem = [NSMenuItem alloc]; NSMenuItem *queueMenuItem = [NSMenuItem alloc];
NSString *title = [NSString NSString *title = [NSString
stringWithFormat:@"Add to Queue (%d queued)", [[playlistController queueList] count]]; stringWithFormat:@"Add to Queue (%d queued)", [[playlistController queueList] count]];
@ -206,17 +207,19 @@
[queueMenuItem release]; [queueMenuItem release];
addedItems++; addedItems++;
NSMenuItem *queueRemoveMenuItem = [NSMenuItem alloc]; if (song.queuePosition > 0)
NSString *retitle = [NSString {
stringWithFormat:@"Remove from Queue"]; NSMenuItem *queueRemoveMenuItem = [NSMenuItem alloc];
[queueRemoveMenuItem initWithTitle:retitle NSString *retitle = [NSString
action:@selector(removeFromQueue:) stringWithFormat:@"Remove from Queue"];
keyEquivalent:@""]; [queueRemoveMenuItem initWithTitle:retitle
queueRemoveMenuItem.target = playlistController; action:@selector(removeFromQueue:)
[tableViewMenu insertItem:queueRemoveMenuItem atIndex:1]; keyEquivalent:@""];
[queueRemoveMenuItem release]; queueRemoveMenuItem.target = playlistController;
addedItems++; [tableViewMenu insertItem:queueRemoveMenuItem atIndex:1];
[queueRemoveMenuItem release];
addedItems++;
}
if(addedItems) if(addedItems)
{ {