From 125022b4978306b778938397e8050371508bafaf Mon Sep 17 00:00:00 2001 From: Kent Sutherland Date: Sat, 7 Jun 2003 16:14:33 +0000 Subject: [PATCH] Changed some stuff so it works right now. --- MenuController.m | 44 +++++++++++++++++++++----------------------- TODO.rtf | 9 +++------ 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/MenuController.m b/MenuController.m index 43a1a65..801e5ed 100755 --- a/MenuController.m +++ b/MenuController.m @@ -211,6 +211,9 @@ keyEquivalent:@""]; [tempItem setSubmenu:_ratingMenu]; [tempItem setTag:1]; + if (_playingRadio || !_currentPlaylist) { + [tempItem setEnabled:NO]; + } itemEnum = [[_ratingMenu itemArray] objectEnumerator]; while ( (tempItem = [itemEnum nextObject]) ) { @@ -218,9 +221,6 @@ } [[_ratingMenu itemAtIndex:([currentRemote currentSongRating] * 5)] setState:NSOnState]; - if (_playingRadio || !_currentPlaylist) { - [tempItem setEnabled:NO]; - } } else if ([nextObject isEqualToString:@"Upcoming Songs"]) { tempItem = [menu addItemWithTitle:@"Upcoming Songs" action:nil @@ -292,26 +292,24 @@ - (NSMenu *)ratingMenu { NSMenu *ratingMenu = [[NSMenu alloc] initWithTitle:@""]; - if (_currentPlaylist && !_playingRadio) { - NSEnumerator *itemEnum; - id anItem; - int itemTag = 0; - SEL itemSelector = @selector(performRatingMenuAction:); - - [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"☆☆☆☆☆"] action:nil keyEquivalent:@""]; - [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★☆☆☆☆"] action:nil keyEquivalent:@""]; - [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★☆☆☆"] action:nil keyEquivalent:@""]; - [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★☆☆"] action:nil keyEquivalent:@""]; - [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★★☆"] action:nil keyEquivalent:@""]; - [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★★★"] action:nil keyEquivalent:@""]; - - itemEnum = [[ratingMenu itemArray] objectEnumerator]; - while ( (anItem = [itemEnum nextObject]) ) { - [anItem setAction:itemSelector]; - [anItem setTarget:self]; - [anItem setTag:itemTag]; - itemTag += 20; - } + NSEnumerator *itemEnum; + id anItem; + int itemTag = 0; + SEL itemSelector = @selector(performRatingMenuAction:); + + [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"☆☆☆☆☆"] action:nil keyEquivalent:@""]; + [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★☆☆☆☆"] action:nil keyEquivalent:@""]; + [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★☆☆☆"] action:nil keyEquivalent:@""]; + [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★☆☆"] action:nil keyEquivalent:@""]; + [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★★☆"] action:nil keyEquivalent:@""]; + [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★★★"] action:nil keyEquivalent:@""]; + + itemEnum = [[ratingMenu itemArray] objectEnumerator]; + while ( (anItem = [itemEnum nextObject]) ) { + [anItem setAction:itemSelector]; + [anItem setTarget:self]; + [anItem setTag:itemTag]; + itemTag += 20; } return ratingMenu; } diff --git a/TODO.rtf b/TODO.rtf index 0c7bc71..eaac4d1 100755 --- a/TODO.rtf +++ b/TODO.rtf @@ -6,18 +6,15 @@ \f0\b\fs72 \cf0 MenuTunes Issues\ -\f1\b0\fs28 In lieu of BugZilla, this file has been added to the MenuTunes project, at its root level, above all groups. It will be treated like a bug list. Do not modify without authorization from Matt.\ +\f1\b0\fs28 In lieu of BugZilla, this file has been added to the MenuTunes project, at its root level, above all groups. It will be treated like a bug list. Do not modify without authorization from Matt. +\f2\fs20 \ \ -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural - -\f2\fs20 \cf0 MainController:\ -We now run on only one thread so that we don't have rebuild timing problems\ +MainController:\ Hot keys need to work with FKeys and no modifier\ Make status windows work\ \ MenuController:\ Space key equivalent needs to show up\ -If you try to open iTunes, and then build the menu, it breaks waiting for iTunes to respond to AEs.\ \ PreferencesController:\ Do we want that preferences checkbox "Launch iTunes When MenuTunes Launches"? It isn't very pluginesque and I think our menu saying launch player is good enough.\ -- 2.20.1