Um, yeah. Started working on this and did some work getting everything on the same...

diff --git a/MenuTunes.h b/MenuTunes.h
index 2eb3ed4..a45d814 100755 (executable)
--- a/MenuTunes.h
+++ b/MenuTunes.h
@@ -1,4 +1,16 @@
-/* MenuTunes */
+/*
+ *     MenuTunes
+ *  MenuTunes
+ *    App Controller Class
+ *
+ *  Original Author : Kent Sutherland <ksuther@ithinksw.com>
+ *   Responsibility : Kent Sutherland <ksuther@ithinksw.com>
+ *
+ *  Copyright (c) 2002 The iThink Group.
+ *  All Rights Reserved
+ *
+ */
+
 
 #import <Cocoa/Cocoa.h>
 #import <Carbon/Carbon.h>
@@ -39,21 +51,8 @@
 }
 
 - (void)rebuildMenu;
-- (void)updateMenu;
-- (void)rebuildUpcomingSongsMenu;
-- (void)rebuildPlaylistMenu;
-- (void)rebuildEQPresetsMenu;
-
 - (void)clearHotKeys;
-- (void)setupHotKeys;
-
-- (NSString *)runScriptAndReturnResult:(NSString *)script;
-- (void)timerUpdate;
-
 - (ProcessSerialNumber)iTunesPSN;
-
-- (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID;
-
 - (void)closePreferences;
 
 @end

diff --git a/MenuTunes.m b/MenuTunes.m
index 81055ed..18565b9 100755 (executable)
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -1,10 +1,3 @@
-//
-//  MenuTunes.m
-//
-//  iThink Software, Copyright 2002
-//
-//
-
 /*
 Things to do:
 ¥ Radio mode makes things act oddly
@@ -24,15 +17,31 @@ Things to do:
 #import "HotKeyCenter.h"
 #import "StatusWindowController.h"
 
+@interface MenuTunes(Private)
+- (void)registerDefaultsIfNeeded;
+- (void)updateMenu;
+- (void)rebuildUpcomingSongsMenu;
+- (void)rebuildPlaylistMenu;
+- (void)rebuildEQPresetsMenu;
+- (void)setupHotKeys;
+- (NSString *)runScriptAndReturnResult:(NSString *)script;
+- (void)timerUpdate;
+- (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID;
+
+@end
+
 @implementation MenuTunes
 
+/*************************************************************************/
+#pragma mark -
+#pragma mark INITIALIZATION METHODS
+/*************************************************************************/
+
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
     asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
-    if (![[NSUserDefaults standardUserDefaults] objectForKey:@"menu"])
-    {
-        [[NSUserDefaults standardUserDefaults] setObject:[NSArray arrayWithObjects:@"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"<separator>", @"Upcoming Songs", @"Playlists", @"<separator>", @"PreferencesÉ", @"Quit", @"<separator>", @"Current Track Info", nil] forKey:@"menu"];
-    }
+
+    [self registerDefaultsIfNeeded];
     
     menu = [[NSMenu alloc] initWithTitle:@""];
     iTunesPSN = [self iTunesPSN]; //Get PSN of iTunes if it's running
@@ -40,8 +49,11 @@ Things to do:
     if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)))
     {
         [self rebuildMenu];
-        refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 
-target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
+        refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5
+                                                        target:self
+                                                      selector:@selector(timerUpdate)
+                                                      userInfo:nil
+                                                       repeats:YES];
     }
     else
     {
@@ -62,23 +74,32 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     //[statusItem setView:view];
 }
 
-- (void)applicationWillTerminate:(NSNotification *)note
-{
-    [self clearHotKeys];
-    [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
-}
 
-- (void)dealloc
+/*************************************************************************/
+#pragma mark -
+#pragma mark INSTANCE METHODS
+/*************************************************************************/
+
+- (void)registerDefaultsIfNeeded
 {
-    if (refreshTimer)
-    {
-        [refreshTimer invalidate];
+    if (![[NSUserDefaults standardUserDefaults] objectForKey:@"menu"]) {
+        [[NSUserDefaults standardUserDefaults] setObject:
+            [NSArray arrayWithObjects:
+                @"Play/Pause",
+                @"Next Track",
+                @"Previous Track",
+                @"Fast Forward",
+                @"Rewind",
+                @"<separator>",
+                @"Upcoming Songs",
+                @"Playlists",
+                @"<separator>",
+                @"PreferencesÉ",
+                @"Quit",
+                @"<separator>",
+                @"Current Track Info",
+                nil] forKey:@"menu"];
     }
-    CloseComponent(asComponent);
-    [statusItem release];
-    [menu release];
-    [view release];
-    [super dealloc];
 }
 
 //Recreate the status item menu
@@ -86,12 +107,11 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
 {
     NSArray *myMenu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];
     int i;
-    trackInfoIndex = -1;
     
-    didHaveAlbumName = (([[self runScriptAndReturnResult:@"return album of current track"] length] > 0) ? YES : NO);
-    
-    while ([menu numberOfItems] > 0)
-    {
+    trackInfoIndex = -1;
+    didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0);
+
+    while ([menu numberOfItems] > 0) {
         [menu removeItemAtIndex:0];
     }
     
@@ -104,57 +124,55 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     [eqMenu release];
     eqMenu = nil;
     
-    for (i = 0; i < [myMenu count]; i++)
-    {
+    for (i = 0; i < [myMenu count]; i++) {
         NSString *item = [myMenu objectAtIndex:i];
-        if ([item isEqualToString:@"Play/Pause"])
-        {
-            playPauseMenuItem = [menu addItemWithTitle:@"Play" action:@selector(playPause:) keyEquivalent:@""];
+        if ([item isEqualToString:@"Play/Pause"]) {
+            playPauseMenuItem = [menu addItemWithTitle:@"Play"
+                                                action:@selector(playPause:)
+                                         keyEquivalent:@""];
             [playPauseMenuItem setTarget:self];
-        }
-        else if ([item isEqualToString:@"Next Track"])
-        {
-            [[menu addItemWithTitle:@"Next Track" action:@selector(nextSong:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Previous Track"])
-        {
-            [[menu addItemWithTitle:@"Previous Track" action:@selector(prevSong:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Fast Forward"])
-        {
-            [[menu addItemWithTitle:@"Fast Forward" action:@selector(fastForward:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Rewind"])
-        {
-            [[menu addItemWithTitle:@"Rewind" action:@selector(rewind:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Upcoming Songs"])
-        {
-            upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs" action:NULL keyEquivalent:@""];
-        }
-        else if ([item isEqualToString:@"Playlists"])
-        {
-            playlistItem = [menu addItemWithTitle:@"Playlists" action:NULL keyEquivalent:@""];
-        }
-        else if ([item isEqualToString:@"EQ Presets"])
-        {
-            eqItem = [menu addItemWithTitle:@"EQ Presets" action:NULL keyEquivalent:@""];
-        }
-        else if ([item isEqualToString:@"PreferencesÉ"])
-        {
-            [[menu addItemWithTitle:@"PreferencesÉ" action:@selector(showPreferences:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Quit"])
-        {
-            [[menu addItemWithTitle:@"Quit" action:@selector(quitMenuTunes:) keyEquivalent:@""] setTarget:self];
-        }
-        else if ([item isEqualToString:@"Current Track Info"])
-        {
+        } else if ([item isEqualToString:@"Next Track"]) {
+            [[menu addItemWithTitle:@"Next Track"
+                             action:@selector(nextSong:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Previous Track"]) {
+            [[menu addItemWithTitle:@"Previous Track"
+                             action:@selector(prevSong:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Fast Forward"]) {
+            [[menu addItemWithTitle:@"Fast Forward"
+                             action:@selector(fastForward:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Rewind"]) {
+            [[menu addItemWithTitle:@"Rewind"
+                             action:@selector(rewind:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Upcoming Songs"]) {
+            upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"
+                                                action:nil
+                                         keyEquivalent:@""];
+        } else if ([item isEqualToString:@"Playlists"]) {
+            playlistItem = [menu addItemWithTitle:@"Playlists"
+                                           action:nil
+                                    keyEquivalent:@""];
+        } else if ([item isEqualToString:@"EQ Presets"]) {
+            eqItem = [menu addItemWithTitle:@"EQ Presets"
+                                     action:nil
+                              keyEquivalent:@""];
+        } else if ([item isEqualToString:@"PreferencesÉ"]) {
+            [[menu addItemWithTitle:@"PreferencesÉ"
+                             action:@selector(showPreferences:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Quit"]) {
+            [[menu addItemWithTitle:@"Quit"
+                             action:@selector(quitMenuTunes:)
+                      keyEquivalent:@""] setTarget:self];
+        } else if ([item isEqualToString:@"Current Track Info"]) {
             trackInfoIndex = [menu numberOfItems];
-            [menu addItemWithTitle:@"No Song" action:NULL keyEquivalent:@""];
-        }
-        else if ([item isEqualToString:@"<separator>"])
-        {
+            [menu addItemWithTitle:@"No Song"
+                            action:nil
+                     keyEquivalent:@""];
+        } else if ([item isEqualToString:@"<separator>"]) {
             [menu addItem:[NSMenuItem separatorItem]];
         }
     }
@@ -172,8 +190,7 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     NSString *curSongName, *curAlbumName;
     NSMenuItem *menuItem;
     
-    if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))
-    {
+    if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) {
         return;
     }
     
@@ -181,60 +198,57 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     curSongName = [self runScriptAndReturnResult:@"return name of current track"];
     curAlbumName = [self runScriptAndReturnResult:@"return album of current track"];
     
-    if (upcomingSongsItem)
-    {
+    if (upcomingSongsItem) {
         [self rebuildUpcomingSongsMenu];
     }
-    if (playlistItem)
-    {
+    if (playlistItem) {
         [self rebuildPlaylistMenu];
     }
-    if (eqItem)
-    {
+    if (eqItem) {
         [self rebuildEQPresetsMenu];
     }
     
-    if ([curSongName length] > 0)
-    {
+    if ([curSongName length] > 0) {
         int index = [menu indexOfItemWithTitle:@"Now Playing"];
         
-        if (index > -1)
-        {
+        if (index > -1) {
             [menu removeItemAtIndex:index + 1];
-            if (didHaveAlbumName)
-            {
+            
+            if (didHaveAlbumName) {
                 [menu removeItemAtIndex:index + 1];
             }
         }
         
-        if ([curAlbumName length] > 0)
-        {
-            menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curAlbumName] action:NULL keyEquivalent:@""];
+        if ([curAlbumName length] > 0) {
+            menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curAlbumName]
+                                                  action:nil
+                                                  keyEquivalent:@""];
             [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
             [menuItem release];
         }
         
-        menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curSongName] action:NULL keyEquivalent:@""];
+        menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curSongName]
+                                              action:nil
+                                              keyEquivalent:@""];
         [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
         [menuItem release];
         
-        if (index == -1)
-        {
-            menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:NULL keyEquivalent:@""];
+        if (index == -1) {
+            menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:nil keyEquivalent:@""];
             [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]];
             [menu insertItem:menuItem atIndex:trackInfoIndex];
             [menuItem release];
         }
-    }
-    else if ([menu indexOfItemWithTitle:@"No Song"] == -1)
-    {
+        
+    } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
         [menu removeItemAtIndex:trackInfoIndex];
         [menu removeItemAtIndex:trackInfoIndex];
-        if (didHaveAlbumName)
-        {
+        
+        if (didHaveAlbumName) {
             [menu removeItemAtIndex:trackInfoIndex];
         }
-        menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:NULL keyEquivalent:@""];
+        
+        menuItem = [[NSMenuItem alloc] initWithTitle:@"No Song" action:nil keyEquivalent:@""];
         [menu insertItem:menuItem atIndex:trackInfoIndex];
         [menuItem release];
     }
@@ -248,18 +262,15 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue];
     int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
     
-    if (numSongs > 0)
-    {
+    if (numSongs > 0) {
         int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
         int i;
         
         [upcomingSongsMenu release];
         upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""];
         
-        for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++)
-        {
-            if (i <= numSongs)
-            {
+        for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
+            if (i <= numSongs) {
                 NSString *curSong = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of track %i of current playlist", i]];
                 NSMenuItem *songItem;
                 songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""];
@@ -267,10 +278,8 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
                 [songItem setRepresentedObject:[NSNumber numberWithInt:i]];
                 [upcomingSongsMenu addItem:songItem];
                 [songItem release];
-            }
-            else
-            {
-                [upcomingSongsMenu addItemWithTitle:@"End of playlist." action:NULL keyEquivalent:@""];
+            } else {
+                [upcomingSongsMenu addItemWithTitle:@"End of playlist." action:nil keyEquivalent:@""];
                 break;
             }
         }
@@ -290,8 +299,7 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     [playlistMenu release];
     playlistMenu = [[NSMenu alloc] initWithTitle:@""];
     
-    for (i = 1; i <= numPlaylists; i++)
-    {
+    for (i = 1; i <= numPlaylists; i++) {
         NSString *playlistName = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of playlist %i", i]];
         NSMenuItem *tempItem;
         tempItem = [[NSMenuItem alloc] initWithTitle:playlistName action:@selector(selectPlaylist:) keyEquivalent:@""];
@@ -302,8 +310,7 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     }
     [playlistItem setSubmenu:playlistMenu];
     
-    if (curPlaylist)
-    {
+    if (curPlaylist) {
         [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOnState];
     }
 }
@@ -320,8 +327,7 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     [eqMenu release];
     eqMenu = [[NSMenu alloc] initWithTitle:@""];
     
-    for (i = 1; i <= numSets; i++)
-    {
+    for (i = 1; i <= numSets; i++) {
         NSString *setName = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of EQ preset %i", i]];
         NSMenuItem *tempItem;
         tempItem = [[NSMenuItem alloc] initWithTitle:setName action:@selector(selectEQPreset:) keyEquivalent:@""];
@@ -348,36 +354,31 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
-    if ([defaults objectForKey:@"PlayPause"] != nil)
-    {
+    if ([defaults objectForKey:@"PlayPause"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause"
                 combo:[defaults keyComboForKey:@"PlayPause"]
                 target:self action:@selector(playPause:)];
     }
     
-    if ([defaults objectForKey:@"NextTrack"] != nil)
-    {
+    if ([defaults objectForKey:@"NextTrack"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack"
                 combo:[defaults keyComboForKey:@"NextTrack"]
                 target:self action:@selector(nextSong:)];
     }
     
-    if ([defaults objectForKey:@"PrevTrack"] != nil)
-    {
+    if ([defaults objectForKey:@"PrevTrack"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack"
                 combo:[defaults keyComboForKey:@"PrevTrack"]
                 target:self action:@selector(prevSong:)];
     }
     
-    if ([defaults objectForKey:@"TrackInfo"] != nil)
-    {
+    if ([defaults objectForKey:@"TrackInfo"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
                 combo:[defaults keyComboForKey:@"TrackInfo"]
                 target:self action:@selector(showCurrentTrackInfo)];
     }
     
-    if ([defaults objectForKey:@"UpcomingSongs"] != nil)
-    {
+    if ([defaults objectForKey:@"UpcomingSongs"] != nil) {
         [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
                combo:[defaults keyComboForKey:@"UpcomingSongs"]
                target:self action:@selector(showUpcomingSongs)];
@@ -406,14 +407,13 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     AEDisposeDesc(&scriptDesc);
     AEDisposeDesc(&resultDesc);
     result = [NSString stringWithCString:buffer length:length];
-    if (![result isEqualToString:@""] &&
-        ([result characterAtIndex:0] == '\"') &&
-        ([result characterAtIndex:[result length] - 1] == '\"'))
-    {
+    if ( (! [result isEqualToString:@""])      &&
+         ([result characterAtIndex:0] == '\"') &&
+         ([result characterAtIndex:[result length] - 1] == '\"') ) {
         result = [result substringWithRange:NSMakeRange(1, [result length] - 2)];
     }
     free(buffer);
-    buffer = NULL;
+    buffer = nil;
     return result;
 }
 
@@ -422,31 +422,23 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
 {
     int pid;
     
-    if (GetProcessPID(&iTunesPSN, &pid) == noErr)
-    {
+    if (GetProcessPID(&iTunesPSN, &pid) == noErr) {
         int trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
         
-        if (trackPlayingIndex != curTrackIndex)
-        {
+        if (trackPlayingIndex != curTrackIndex) {
             [self updateMenu];
             curTrackIndex = trackPlayingIndex;
         }
                
         //Update Play/Pause menu item
-        if (playPauseMenuItem)
-        {
-            if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"])
-            {
+        if (playPauseMenuItem){
+            if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) {
                 [playPauseMenuItem setTitle:@"Pause"];
-            }
-            else
-            {
+            } else {
                 [playPauseMenuItem setTitle:@"Play"];
             }
         }
-    }
-    else
-    {
+    } else {
         [menu release];
         menu = [[NSMenu alloc] initWithTitle:@""];
         [[menu addItemWithTitle:@"Open iTunes" action:@selector(openiTunes:) keyEquivalent:@""] setTarget:self];
@@ -483,13 +475,10 @@ target:self selector:@selector(timerUpdate) userInfo:nil repeats:YES];
     procNum.highLongOfPSN = kNoProcess;
     procNum.lowLongOfPSN = 0;
     
-    while ( (GetNextProcess(&procNum) == noErr) ) 
-    {
+    while ( (GetNextProcess(&procNum) == noErr) ) {
         CFStringRef procName;
-        if ( (CopyProcessName(&procNum, &procName) == noErr) )
-        {
-            if ([(NSString *)procName isEqualToString:@"iTunes"])
-            {
+        if ( (CopyProcessName(&procNum, &procName) == noErr) ) {
+            if ([(NSString *)procName isEqualToString:@"iTunes"]) {
                 return procNum;
             }
             [(NSString *)procName release];
@@ -505,7 +494,7 @@ andEventID:(AEEventID)eventID
     OSType iTunesType = 'hook';
     AppleEvent event, reply;
     
-    AEBuildAppleEvent(eventClass, eventID, typeApplSignature, &iTunesType, sizeof(iTunesType), kAutoGenerateReturnID, kAnyTransactionID, &event, NULL, "");
+    AEBuildAppleEvent(eventClass, eventID, typeApplSignature, &iTunesType, sizeof(iTunesType), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
     
     AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, nil, nil);
     AEDisposeDesc(&event);
@@ -543,19 +532,14 @@ andEventID:(AEEventID)eventID
 - (void)playPause:(id)sender
 {
     NSString *state = [self runScriptAndReturnResult:@"return player state"];
-    if ([state isEqualToString:@"playing"])
-    {
+    if ([state isEqualToString:@"playing"]) {
         [self sendAEWithEventClass:'hook' andEventID:'Paus'];
         [playPauseMenuItem setTitle:@"Play"];
-    }
-    else if ([state isEqualToString:@"fast forwarding"] || [state 
-isEqualToString:@"rewinding"])
-    {
+    } else if ([state isEqualToString:@"fast forwarding"] || [state 
+isEqualToString:@"rewinding"]) {
         [self sendAEWithEventClass:'hook' andEventID:'Paus'];
         [self sendAEWithEventClass:'hook' andEventID:'Play'];
-    }
-    else
-    {
+    } else {
         [self sendAEWithEventClass:'hook' andEventID:'Play'];
         [playPauseMenuItem setTitle:@"Pause"];
     }
@@ -593,8 +577,7 @@ isEqualToString:@"rewinding"])
 
 - (void)showPreferences:(id)sender
 {
-    if (!prefsController)
-    {
+    if (!prefsController) {
         prefsController = [[PreferencesController alloc] initWithMenuTunes:self];
         [self clearHotKeys];
     }
@@ -603,8 +586,7 @@ isEqualToString:@"rewinding"])
 
 - (void)closePreferences
 {
-    if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)))
-    {
+    if (!((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0))) {
         [self setupHotKeys];
     }
     [prefsController release];
@@ -620,44 +602,36 @@ isEqualToString:@"rewinding"])
 - (void)showCurrentTrackInfo
 {
     NSString *trackName = [self runScriptAndReturnResult:@"return name of current track"];
-    if (!statusController && [trackName length])
-    {
+    if (!statusController && [trackName length]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         NSString *stringToShow = @"";
         int lines = 1;
         
-        if ([defaults boolForKey:@"showName"])
-        {
-            if ([defaults boolForKey:@"showArtist"])
-            {
+        if ([defaults boolForKey:@"showName"]) {
+            if ([defaults boolForKey:@"showArtist"]) {
                 NSString *trackArtist = [self runScriptAndReturnResult:@"return artist of current track"];
                 trackName = [NSString stringWithFormat:@"%@ - %@", trackArtist, trackName];
             }
             stringToShow = [stringToShow stringByAppendingString:trackName];
             stringToShow = [stringToShow stringByAppendingString:@"\n"];
-            if ([trackName length] > 38)
-            {
+            if ([trackName length] > 38) {
                 lines++;
             }
             lines++;
         }
         
-        if ([defaults boolForKey:@"showAlbum"])
-        {
+        if ([defaults boolForKey:@"showAlbum"]) {
             NSString *trackAlbum = [self runScriptAndReturnResult:@"return album of current track"];
-            if ([trackAlbum length])
-            {
+            if ([trackAlbum length]) {
                 stringToShow = [stringToShow stringByAppendingString:trackAlbum];
                 stringToShow = [stringToShow stringByAppendingString:@"\n"];
                 lines++;
             }
         }
         
-        if ([defaults boolForKey:@"showTime"])
-        {
+        if ([defaults boolForKey:@"showTime"]) {
             NSString *trackTime = [self runScriptAndReturnResult:@"return time of current track"];
-            if ([trackTime length])
-            {
+            if ([trackTime length]) {
                 stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];
                 lines++;
             }
@@ -666,13 +640,10 @@ isEqualToString:@"rewinding"])
         {
             int trackTimeLeft = [[self runScriptAndReturnResult:@"return (duration of current track) - player position"] intValue];
             int minutes = trackTimeLeft / 60, seconds = trackTimeLeft % 60;
-            if (seconds < 10)
-            {
+            if (seconds < 10) {
                 stringToShow = [stringToShow stringByAppendingString:
                             [NSString stringWithFormat:@"Time Remaining: %i:0%i", minutes, seconds]];
-            }
-            else
-            {
+            } else {
                 stringToShow = [stringToShow stringByAppendingString:
                             [NSString stringWithFormat:@"Time Remaining: %i:%i", minutes, seconds]];
             }
@@ -680,35 +651,40 @@ isEqualToString:@"rewinding"])
         
         statusController = [[StatusWindowController alloc] init];
         [statusController setTrackInfo:stringToShow lines:lines];
-        [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil repeats:NO];
+        [NSTimer scheduledTimerWithTimeInterval:3.0
+                                         target:self
+                                       selector:@selector(fadeAndCloseStatusWindow)
+                                       userInfo:nil
+                                        repeats:NO];
     }
 }
 
 - (void)showUpcomingSongs
 {
-    if (!statusController)
-    {
+    if (!statusController) {
         int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue];
         
-        if (numSongs > 0)
-        {
+        if (numSongs > 0) {
             int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"];
             int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue];
             int i;
             NSString *songs = @"";
             
             statusController = [[StatusWindowController alloc] init];
-            for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++)
-            {
-                if (i <= numSongs)
-                {
-                    NSString *curSong = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of track %i of current playlist", i]];
+            for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
+                if (i <= numSongs) {
+                    NSString *curSong = [self runScriptAndReturnResult:
+                        [NSString stringWithFormat:@"return name of track %i of current playlist", i]];
                     songs = [songs stringByAppendingString:curSong];
                     songs = [songs stringByAppendingString:@"\n"];
                 }
             }
             [statusController setUpcomingSongs:songs numSongs:numSongsInAdvance];
-            [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil repeats:NO];
+            [NSTimer scheduledTimerWithTimeInterval:3.0
+                                             target:self
+                                           selector:@selector(fadeAndCloseStatusWindow)
+                                           userInfo:nil
+                                            repeats:NO];
         }
     }
 }
@@ -720,4 +696,35 @@ isEqualToString:@"rewinding"])
     statusController = nil;
 }
 
+/*************************************************************************/
+#pragma mark -
+#pragma mark NSApplication DELEGATE METHODS
+/*************************************************************************/
+
+- (void)applicationWillTerminate:(NSNotification *)note
+{
+    [self clearHotKeys];
+    [[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
+}
+
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark DEALLOCATION METHODS
+/*************************************************************************/
+
+- (void)dealloc
+{
+    if (refreshTimer) {
+        [refreshTimer invalidate];
+        refreshTimer = nil;
+    }
+    CloseComponent(asComponent);
+    [statusItem release];
+    [menu release];
+    [view release];
+    [super dealloc];
+}
+
+
 @end

diff --git a/MenuTunesView.h b/MenuTunesView.h
index 1eeb4f4..81bdf60 100755 (executable)
--- a/MenuTunesView.h
+++ b/MenuTunesView.h
@@ -1,16 +1,23 @@
-//
-//  MenuTunesView.h
-//  MenuTunes
-//
-//  Created by Kent Sutherland on Tue Nov 19 2002.
-//  Copyright (c) 2002 Kent Sutherland. All rights reserved.
-//
+/*
+ *     MenuTunes
+ *  MenuTunesView
+ *    NSStatusItem Menu View
+ *
+ *  Original Author : Kent Sutherland <ksuther@ithinksw.com>
+ *   Responsibility : Kent Sutherland <ksuther@ithinksw.com>
+ *     Contributors : Matt Judy <matt@nibfile.com>
+ *
+ *  Copyright (c) 2002 The iThink Group.
+ *  All Rights Reserved
+ *
+ */
+
 
 #import <AppKit/AppKit.h>
 
 @interface MenuTunesView : NSView
 {
-    NSImage *image, *altImage, *curImage;
+    NSDictionary *images;
 }
 
 @end

diff --git a/MenuTunesView.m b/MenuTunesView.m
index 824683b..05af9af 100755 (executable)
--- a/MenuTunesView.m
+++ b/MenuTunesView.m
@@ -1,11 +1,3 @@
-//
-//  MenuTunesView.m
-//  MenuTunes
-//
-//  Created by Kent Sutherland on Tue Nov 19 2002.
-//  Copyright (c) 2002 Kent Sutherland. All rights reserved.
-//
-
 #import "MenuTunesView.h"
 
 
@@ -15,15 +7,17 @@
 {
     if ( (self = [super initWithFrame:frame]) )
     {
-        image = [NSImage imageNamed:@"menu"];
-        altImage = [NSImage imageNamed:@"selected_image"];
-       curImage = image;
+        images = [[NSDictionary alloc] initWithObjectsAndKeys:
+            [NSImage imageNamed:@"menu"], @"normal",
+            [NSImage imageNamed:@"selected_image"],    @"selected",
+            nil];
     }
     return self;
 }
 
 - (void)drawRect:(NSRect)rect
 {
+    NSImage *image
     [curImage compositeToPoint:NSMakePoint(0, 0) operation:NSCompositeSourceOver];
 }
 

diff --git a/PreferencesController.h b/PreferencesController.h
index faf4ad1..de0955c 100755 (executable)
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -1,4 +1,16 @@
-/* PreferencesController */
+/*
+ *     MenuTunes
+ *  PreferencesController
+ *    Preferences window controller
+ *
+ *  Original Author : Kent Sutherland <ksuther@ithinksw.com>
+ *   Responsibility : Kent Sutherland <ksuther@ithinksw.com>
+ *
+ *  Copyright (c) 2002 The iThink Group.
+ *  All Rights Reserved
+ *
+ */
+
 
 #import <Cocoa/Cocoa.h>
 

diff --git a/PreferencesController.m b/PreferencesController.m
index 7384be5..187398f 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -6,8 +6,7 @@
 
 - (id)initWithMenuTunes:(MenuTunes *)tunes;
 {
-    if ( (self = [super init]) )
-    {
+    if ( (self = [super init]) ) {
         int i;
         NSImageCell *imgCell = [[[NSImageCell alloc] init] autorelease];
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -44,8 +43,7 @@
         }
         
         //Delete items in the availableItems array that are already part of the menu
-        for (i = 0; i < [myItems count]; i++)
-        {
+        for (i = 0; i < [myItems count]; i++) {
             NSString *item = [myItems objectAtIndex:i];
             if (![item isEqualToString:@"<separator>"])
             {
@@ -57,89 +55,63 @@
         submenuItems = [[NSArray alloc] initWithObjects:@"Upcoming Songs", @"Playlists", @"EQ Presets", nil];
         
         //Fill in the number of songs in advance to show field
-        if ([defaults integerForKey:@"SongsInAdvance"])
-        {
+        if ([defaults integerForKey:@"SongsInAdvance"]) {
             [songsInAdvance setIntValue:[defaults integerForKey:@"SongsInAdvance"]];
-        }
-        else
-        {
+        } else {
             [songsInAdvance setIntValue:5];
         }
         
         //Fill in hot key buttons
-        if ([defaults objectForKey:@"PlayPause"])
-        {
+        if ([defaults objectForKey:@"PlayPause"]){
             playPauseCombo = [defaults keyComboForKey:@"PlayPause"];
             [playPauseButton setTitle:[playPauseCombo userDisplayRep]];
-        }
-        else
-        {
+        } else {
             playPauseCombo = [[KeyCombo alloc] init];
         }
         
-        if ([defaults objectForKey:@"NextTrack"])
-        {
+        if ([defaults objectForKey:@"NextTrack"]) {
             nextTrackCombo = [defaults keyComboForKey:@"NextTrack"];
             [nextTrackButton setTitle:[nextTrackCombo userDisplayRep]];
-        }
-        else
-        {
+        } else {
             nextTrackCombo = [[KeyCombo alloc] init];
         }
         
-        if ([defaults objectForKey:@"PrevTrack"])
-        {
+        if ([defaults objectForKey:@"PrevTrack"]) {
             prevTrackCombo = [defaults keyComboForKey:@"PrevTrack"];
             [previousTrackButton setTitle:[prevTrackCombo userDisplayRep]];
-        }
-        else
-        {
+        } else {
             prevTrackCombo = [[KeyCombo alloc] init];
         }
         
-        if ([defaults objectForKey:@"TrackInfo"])
-        {
+        if ([defaults objectForKey:@"TrackInfo"]) {
             trackInfoCombo = [defaults keyComboForKey:@"TrackInfo"];
             [trackInfoButton setTitle:[trackInfoCombo userDisplayRep]];
-        }
-        else
-        {
+        } else {
             trackInfoCombo = [[KeyCombo alloc] init];
         }
         
-        if ([defaults objectForKey:@"UpcomingSongs"])
-        {
+        if ([defaults objectForKey:@"UpcomingSongs"]) {
             upcomingSongsCombo = [defaults keyComboForKey:@"UpcomingSongs"];
             [upcomingSongsButton setTitle:[upcomingSongsCombo userDisplayRep]];
-        }
-        else
-        {
+        } else {
             upcomingSongsCombo = [[KeyCombo alloc] init];
         }
         
         //Check current track info buttons
         
         //Album and name get special treatment because they are defaults
-        if ( (temp = [defaults stringForKey:@"showAlbum"]) )
-        {
-            if ((temp == nil) || [temp isEqualToString:@"1"])
-            {
+        if ( (temp = [defaults stringForKey:@"showAlbum"]) ) {
+            if ((temp == nil) || [temp isEqualToString:@"1"]) {
                 [albumCheckbox setState:NSOnState];
-            }
-            else
-            {
+            } else {
                 [albumCheckbox setState:NSOffState];
             }
         }
         
-        if ( (temp = [defaults stringForKey:@"showName"]) )
-        {
-            if ((temp == nil) || [temp isEqualToString:@"1"])
-            {
+        if ( (temp = [defaults stringForKey:@"showName"]) ) {
+            if ((temp == nil) || [temp isEqualToString:@"1"]) {
                 [nameCheckbox setState:NSOnState];
-            }
-            else
-            {
+            } else {
                 [nameCheckbox setState:NSOffState];
             }
         }
@@ -157,15 +129,13 @@
             loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy];
             loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
             
-            for (i = 0; i < [loginarray count]; i++)
-            {
+            for (i = 0; i < [loginarray count]; i++) {
                 NSDictionary *tempDict = [loginarray objectAtIndex:i];
                 
                 //Here we are seeing if our program is already in loginwindow.plist.
                 //See the problem below for this problem here. We will do the same thing.
                 
-                if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"])
-                {
+                if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"]) {
                     [launchAtLoginCheckbox setState:NSOnState];
                 }
             }
@@ -211,8 +181,7 @@
     [defaults setBool:[trackTimeCheckbox state] forKey:@"showTime"];
     
     //Here we set whether we will launch at login by modifying loginwindow.plist
-    if ([launchAtLoginCheckbox state] == NSOnState)
-    {
+    if ([launchAtLoginCheckbox state] == NSOnState) {
         NSMutableDictionary *loginwindow;
         NSMutableArray *loginarray;
         int i;
@@ -222,29 +191,24 @@
         loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy];
         loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
         
-        for (i = 0; i < [loginarray count]; i++)
-        {
+        for (i = 0; i < [loginarray count]; i++) {
             NSDictionary *tempDict = [loginarray objectAtIndex:i];
             
             //Here we are seeing if our program is already in loginwindow.plist.
             //See the problem below for this problem here. We will do the same thing.
             
-            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"])
-            {
+            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"]) {
                 skip = YES;
             }
         }
         
-        if (!skip)
-        {
+        if (!skip) {
             [loginarray addObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], @"Hide", [[NSBundle mainBundle] bundlePath], @"Path", nil]];
             
             [defaults setPersistentDomain:loginwindow forName:@"loginwindow"];
             [defaults synchronize];
         }
-    }
-    else
-    {
+    } else {
         NSMutableDictionary *loginwindow;
         NSMutableArray *loginarray;
         int i;
@@ -253,12 +217,10 @@
         loginwindow = [[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"loginwindow"] mutableCopy];
         loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
         
-        for (i = 0; i < [loginarray count]; i++)
-        {
+        for (i = 0; i < [loginarray count]; i++) {
             NSDictionary *tempDict = [loginarray objectAtIndex:i];
             
-            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"])
-            {
+            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"]) {
                 [loginarray removeObjectAtIndex:i];
                 [defaults setPersistentDomain:loginwindow forName:@"loginwindow"];
                 [defaults synchronize];
@@ -268,18 +230,14 @@
     }
     
     //Set songs in advance
-    if ([songsInAdvance intValue])
-    {
+    if ([songsInAdvance intValue]) {
         [defaults setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"];
-    }
-    else
-    {
+    } else {
         [defaults setInteger:5 forKey:@"SongsInAdvance"];
     }
     
     psn = [mt iTunesPSN];
-    if (!((psn.highLongOfPSN == kNoProcess) && (psn.lowLongOfPSN == 0)))
-    {
+    if (!((psn.highLongOfPSN == kNoProcess) && (psn.lowLongOfPSN == 0))) {
         [mt rebuildMenu];
     }
     [mt clearHotKeys];
@@ -306,8 +264,7 @@
 - (IBAction)okHotKey:(id)sender
 {
     NSString *string;
-    if (([combo modifiers] <= 0) && ([combo keyCode] >= 0))
-    {
+    if (([combo modifiers] <= 0) && ([combo keyCode] >= 0)) {
         [window setLevel:NSNormalWindowLevel];
         NSRunAlertPanel(@"Bad Key Combo", @"Please enter a valid key combo. A valid combo must have a modifier key in it. (Command, option, shift, control).", @"OK", nil, nil, nil);
         [window setLevel:NSStatusWindowLevel];
@@ -316,16 +273,14 @@
     
     string = [combo userDisplayRep];
     
-    if (string == nil)
-    {
+    if (string == nil) {
         string = @"None";
     }
-    if ([setHotKey isEqualToString:@"PlayPause"])
-    {
+    if ([setHotKey isEqualToString:@"PlayPause"]) {
         if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1)))
-        {
+            [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) &&
+            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
+            
             [window setLevel:NSNormalWindowLevel];
             NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
             [window setLevel:NSStatusWindowLevel];
@@ -338,8 +293,8 @@
     {
         if (([combo isEqual:playPauseCombo] || [combo isEqual:prevTrackCombo] ||
             [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1)))
-        {
+            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
+            
             [window setLevel:NSNormalWindowLevel];
             NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
             [window setLevel:NSStatusWindowLevel];
@@ -352,8 +307,8 @@
     {
         if (([combo isEqual:nextTrackCombo] || [combo isEqual:playPauseCombo] ||
             [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1)))
-        {
+            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
+            
             [window setLevel:NSNormalWindowLevel];
             NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
             [window setLevel:NSStatusWindowLevel];
@@ -366,8 +321,8 @@
     {
         if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
             [combo isEqual:playPauseCombo] || [combo isEqual:upcomingSongsCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1)))
-        {
+            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
+            
             [window setLevel:NSNormalWindowLevel];
             NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
             [window setLevel:NSStatusWindowLevel];
@@ -380,8 +335,8 @@
     {
         if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
             [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1)))
-        {
+            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
+            
             [window setLevel:NSNormalWindowLevel];
             NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
             [window setLevel:NSStatusWindowLevel];
@@ -458,8 +413,7 @@
     combo = [newCombo copy];
     
     string = [combo userDisplayRep];
-    if (string == nil)
-    {
+    if (string == nil) {
         string = @"";
     }
     [keyComboField setStringValue:string];
@@ -484,50 +438,33 @@
 
 - (int)numberOfRowsInTableView:(NSTableView *)aTableView
 {
-    if (aTableView == menuTableView)
-    {
+    if (aTableView == menuTableView) {
         return [myItems count];
-    }
-    else
-    {
+    } else {
         return [availableItems count];
     }
 }
 
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
 {
-    if (aTableView == menuTableView)
-    {
-        if ([[aTableColumn identifier] isEqualToString:@"name"])
-        {
+    if (aTableView == menuTableView) {
+        if ([[aTableColumn identifier] isEqualToString:@"name"]) {
             return [myItems objectAtIndex:rowIndex];
-        }
-        else
-        {
+        } else {
             if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
             {
                 return [NSImage imageNamed:@"submenu"];
-            }
-            else
-            {
+            } else {
                 return nil;
             }
         }
-    }
-    else
-    {
-        if ([[aTableColumn identifier] isEqualToString:@"name"])
-        {
+    } else {
+        if ([[aTableColumn identifier] isEqualToString:@"name"]) {
             return [availableItems objectAtIndex:rowIndex];
-        }
-        else
-        {
-            if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]])
-            {
+        } else {
+            if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) {
                 return [NSImage imageNamed:@"submenu"];
-            }
-            else
-            {
+            } else {
                 return nil;
             }
         }
@@ -536,15 +473,13 @@
 
 - (BOOL)tableView:(NSTableView *)tableView writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard
 {
-    if (tableView == menuTableView)
-    {
+    if (tableView == menuTableView) {
         [pboard declareTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", nil] owner:self];
         [pboard setString:[[rows objectAtIndex:0] stringValue] forType:@"MenuTableViewPboardType"];
         return YES;
     }
     
-    if (tableView == allTableView)
-    {
+    if (tableView == allTableView) {
         [pboard declareTypes:[NSArray arrayWithObjects:@"AllTableViewPboardType", nil] owner:self];
         [pboard setString:[[rows objectAtIndex:0] stringValue] forType:@"AllTableViewPboardType"];
         return YES;
@@ -560,40 +495,29 @@
     
     pb = [info draggingPasteboard];
     
-    if ([[pb types] containsObject:@"MenuTableViewPboardType"])
-    {
+    if ([[pb types] containsObject:@"MenuTableViewPboardType"]) {
         dragData = [pb stringForType:@"MenuTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [myItems objectAtIndex:dragRow];
         [myItems removeObjectAtIndex:dragRow];
         
-        if (tableView == menuTableView)
-        {
-            if (row > dragRow)
-            {
+        if (tableView == menuTableView) {
+            if (row > dragRow) {
                 [myItems insertObject:temp atIndex:row - 1];
-            }
-            else
-            {
+            } else {
                 [myItems insertObject:temp atIndex:row];
             }
-        }
-        else
-        {
-            if (![temp isEqualToString:@"<separator>"])
-            {
+        } else {
+            if (![temp isEqualToString:@"<separator>"]) {
                 [availableItems addObject:temp];
             }
         }
-    }
-    else if ([[pb types] containsObject:@"AllTableViewPboardType"])
-    {
+    } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
         dragData = [pb stringForType:@"AllTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [availableItems objectAtIndex:dragRow];
         
-        if (![temp isEqualToString:@"<separator>"])
-        {
+        if (![temp isEqualToString:@"<separator>"]) {
             [availableItems removeObjectAtIndex:dragRow];
         }
         [myItems insertObject:temp atIndex:row];
@@ -606,18 +530,14 @@
 
 - (NSDragOperation)tableView:(NSTableView*)tableView validateDrop:(id <NSDraggingInfo>)info proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)operation
 {
-    if (tableView == allTableView)
-    {
-        if ([[[info draggingPasteboard] types] containsObject:@"AllTableViewPboardType"])
-        {
+    if (tableView == allTableView) {
+        if ([[[info draggingPasteboard] types] containsObject:@"AllTableViewPboardType"]) {
             return NSDragOperationNone;
         }
         
-        if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"])
-        {
+        if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) {
             NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]];
-            if ([item isEqualToString:@"PreferencesÉ"] || [item isEqualToString:@"Quit"])
-            {
+            if ([item isEqualToString:@"PreferencesÉ"] || [item isEqualToString:@"Quit"]) {
                 return NSDragOperationNone;
             }
         }

diff --git a/StatusWindow.h b/StatusWindow.h
index c97566c..d5dfb6e 100755 (executable)
--- a/StatusWindow.h
+++ b/StatusWindow.h
@@ -1,4 +1,16 @@
-/* StatusWindow */
+/*
+ *     MenuTunes
+ *  StatusWindow
+ *    ...
+ *
+ *  Original Author : Kent Sutherland <ksuther@ithinksw.com>
+ *   Responsibility : Kent Sutherland <ksuther@ithinksw.com>
+ *
+ *  Copyright (c) 2002 The iThink Group.
+ *  All Rights Reserved
+ *
+ */
+
 
 #import <Cocoa/Cocoa.h>
 

diff --git a/StatusWindow.m b/StatusWindow.m
index 946e544..ea9f406 100755 (executable)
--- a/StatusWindow.m
+++ b/StatusWindow.m
@@ -4,8 +4,7 @@
 
 - (id)initWithContentRect:(NSRect)rect styleMask:(unsigned int)mask backing:(NSBackingStoreType)type defer:(BOOL)flag
 {
-    if ( (self = [super initWithContentRect:rect styleMask:NSBorderlessWindowMask backing:type defer:flag]) )
-    {
+    if ( (self = [super initWithContentRect:rect styleMask:NSBorderlessWindowMask backing:type defer:flag]) ) {
         [self setHasShadow:NO];
         [self setOpaque:NO];
         [self setLevel:NSStatusWindowLevel];

diff --git a/StatusWindowController.h b/StatusWindowController.h
index ccf3d8a..ba70600 100755 (executable)
--- a/StatusWindowController.h
+++ b/StatusWindowController.h
@@ -1,4 +1,16 @@
-/* StatusWindowController */
+/*
+ *     MenuTunes
+ *  StatusWindowController
+ *    ...
+ *
+ *  Original Author : Kent Sutherland <ksuther@ithinksw.com>
+ *   Responsibility : Kent Sutherland <ksuther@ithinksw.com>
+ *
+ *  Copyright (c) 2002 The iThink Group.
+ *  All Rights Reserved
+ *
+ */
+
 
 #import <Cocoa/Cocoa.h>
 

diff --git a/StatusWindowController.m b/StatusWindowController.m
index 807e89c..c6a2397 100755 (executable)
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -5,8 +5,7 @@
 
 - (id)init
 {
-    if ( (self = [super init]) )
-    {
+    if ( (self = [super init]) ) {
         [NSBundle loadNibNamed:@"StatusWindow" owner:self];
         [statusWindow center];
     }
@@ -38,8 +37,7 @@
 {
     NSAutoreleasePool *p00l = [[NSAutoreleasePool alloc] init];
     float i;
-    for (i = 1.0; i > 0; i -= .003)
-    {
+    for (i = 1.0; i > 0; i -= .003) {
         [statusWindow setAlphaValue:i];
     }
     [statusWindow close];