From b936ca5ffb6320a3febce6a7d0c2875b072ac6bc Mon Sep 17 00:00:00 2001 From: Kent Sutherland Date: Fri, 30 May 2003 11:43:24 +0000 Subject: [PATCH] Poked around a bit, added Show Player to MenuController --- MainController.m | 9 ++++++++- MenuController.m | 4 ++++ StatusWindowController.h | 1 + StatusWindowController.m | 9 ++++++--- TODO.rtf | 37 +++++++++++++++++++++++++++++-------- 5 files changed, 48 insertions(+), 12 deletions(-) diff --git a/MainController.m b/MainController.m index 0d34014..ea44696 100755 --- a/MainController.m +++ b/MainController.m @@ -458,6 +458,7 @@ static MainController *sharedController; [currentRemote setVolume:volume]; //Show volume status window + [statusWindowController showVolumeWindowWithLevel:volume]; } - (void)decrementVolume @@ -470,6 +471,7 @@ static MainController *sharedController; [currentRemote setVolume:volume]; //Show volume status window + [statusWindowController showVolumeWindowWithLevel:volume]; } - (void)incrementRating @@ -482,6 +484,7 @@ static MainController *sharedController; [currentRemote setCurrentSongRating:rating]; //Show rating status window + [statusWindowController showRatingWindowWithLevel:rating]; } - (void)decrementRating @@ -494,6 +497,7 @@ static MainController *sharedController; [currentRemote setCurrentSongRating:rating]; //Show rating status window + [statusWindowController showRatingWindowWithLevel:rating]; } - (void)toggleLoop @@ -514,12 +518,15 @@ static MainController *sharedController; [currentRemote setRepeatMode:repeatMode]; //Show loop status window + [statusWindowController showLoopWindowWithMode:repeatMode]; } - (void)toggleShuffle { - [currentRemote setShuffleEnabled:![currentRemote shuffleEnabled]]; + bool newShuffleEnabled = ![currentRemote shuffleEnabled]; + [currentRemote setShuffleEnabled:newShuffleEnabled]; //Show shuffle status window + [statusWindowController showLoopWindowWithMode:newShuffleEnabled]; } /*************************************************************************/ diff --git a/MenuController.m b/MenuController.m index 0d6cdb5..94dc8c8 100755 --- a/MenuController.m +++ b/MenuController.m @@ -135,6 +135,10 @@ [tempItem setTag:MTMenuRewindItem]; [tempItem setTarget:self]; } + } else if ([nextObject isEqualToString:@"Show Player"]) { + tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"Show %@", [[[MainController sharedController] currentRemote] playerSimpleName]] action:@selector(performMainMenuAction:) keyEquivalent:@""]; + [tempItem setTarget:self]; + [tempItem setTag:MTMenuShowPlayerItem]; } else if ([nextObject isEqualToString:@"Preferences"]) { tempItem = [menu addItemWithTitle:@"Preferences..." action:@selector(performMainMenuAction:) diff --git a/StatusWindowController.h b/StatusWindowController.h index 63364a6..9f474b5 100755 --- a/StatusWindowController.h +++ b/StatusWindowController.h @@ -45,6 +45,7 @@ typedef enum { - (void)showUpcomingSongsWithTitles:(NSArray *)titleStrings; - (void)showVolumeWindowWithLevel:(int)level; +- (void)showRatingWindowWithLevel:(int)level; - (void)showShuffleWindowWithMode:(MTStatusWindowShuffleMode)mode; - (void)showLoopWindowWithMode:(MTStatusWindowLoopMode)mode; diff --git a/StatusWindowController.m b/StatusWindowController.m index 649ca9c..c22e2a5 100755 --- a/StatusWindowController.m +++ b/StatusWindowController.m @@ -33,16 +33,19 @@ } -- (void)showShuffleWindowWithMode:(MTStatusWindowShuffleMode)mode +- (void)showRatingWindowWithLevel:(int)level { } -- (void)showLoopWindowWithMode:(MTStatusWindowLoopMode)mode +- (void)showShuffleWindowWithMode:(MTStatusWindowShuffleMode)mode { } +- (void)showLoopWindowWithMode:(MTStatusWindowLoopMode)mode +{ +} -@end +@end \ No newline at end of file diff --git a/TODO.rtf b/TODO.rtf index ae0b7a4..194e86f 100755 --- a/TODO.rtf +++ b/TODO.rtf @@ -1,6 +1,6 @@ {\rtf1\mac\ansicpg10000\cocoartf102 -{\fonttbl\f0\fnil\fcharset77 Futura-CondensedExtraBold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Bold; -\f3\fnil\fcharset77 Monaco;} +{\fonttbl\f0\fnil\fcharset77 Futura-CondensedExtraBold;\f1\fswiss\fcharset77 Helvetica;\f2\fnil\fcharset77 Monaco; +\f3\fswiss\fcharset77 Helvetica-Bold;} {\colortbl;\red255\green255\blue255;\red198\green198\blue198;} \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural @@ -8,11 +8,32 @@ \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.\ \ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural + +\f2\fs20 \cf0 MainController:\ +Hot keys need to work with FKeys and no modifier\ +Make status windows work\ +\ +MenuController:\ +Space key equivalent needs to show up\ +\ +iTunesRemote:\ +Toggling shuffle, loop and show player don't work.\ +\ +I need to add toggle visualier hotkey. I think we should change it to Show Player though +\f1\fs28 \ +\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural + +\fs24 \cf0 All the stuff below here is from the old to-do list. I'm making a quick new list above here...add stuff to it so I know what I should be doing +\fs28 \ +\ +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural -\f2\b \ul 1.0 FIRST CUSTOMER SHIP\ +\f3\b \cf0 \ul 1.0 FIRST CUSTOMER SHIP\ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural -\f3\b0\fs20 \cf0 \ulnone \ +\f2\b0\fs20 \cf0 \ulnone \ Priority: SHOWSTOPPER\ Owner: Joseph Spiros\ Status: Analyze\ @@ -109,20 +130,20 @@ \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural -\f2\b\fs28 \cf0 \ul 1.0.X FIRST BUGFIX UPDATE\ +\f3\b\fs28 \cf0 \ul 1.0.X FIRST BUGFIX UPDATE\ \pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\ql\qnatural -\f3\b0\fs20 \cf0 \ulnone \ +\f2\b0\fs20 \cf0 \ulnone \ No entries yet.\ \ \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural -\f2\b\fs28 \cf0 \ul 1.X.X FIRST FEATURE UPDATE +\f3\b\fs28 \cf0 \ul 1.X.X FIRST FEATURE UPDATE \f1\b0\fs24 \ulnone \ \pard\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\ql\qnatural -\f3\fs20 \cf0 \ +\f2\fs20 \cf0 \ \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural \cf0 Priority: IMPORTANT\ Status: Assigned\ -- 2.20.1