Added the new keycombos in the prefs. Will go into MainController next.

[MenuTunes.git] / OldMainController.m

diff --git a/OldMainController.m b/OldMainController.m
index aec922d..27ca9d1 100755 (executable)
--- a/OldMainController.m
+++ b/OldMainController.m
@@ -11,7 +11,6 @@
 - (void)updateRatingMenu;
 - (void)setupHotKeys;
 - (void)timerUpdate;
 - (void)updateRatingMenu;
 - (void)setupHotKeys;
 - (void)timerUpdate;

-- (void)updateMenu;

 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
         onItem:(NSMenuItem *)item;
 
 - (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
         onItem:(NSMenuItem *)item;
 


@@ -48,6 +47,7 @@
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {
 
 - (void)applicationDidFinishLaunching:(NSNotification *)note
 {

+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];

     currentRemote = [self loadRemote];
     [currentRemote begin];
     
     currentRemote = [self loadRemote];
     [currentRemote begin];
     


@@ -63,8 +63,10 @@
             selector:@selector(applicationLaunched:)
             name:NSWorkspaceDidLaunchApplicationNotification
             object:nil];
             selector:@selector(applicationLaunched:)
             name:NSWorkspaceDidLaunchApplicationNotification
             object:nil];

-    
-    [self registerDefaults];
+
+    if ( ! [defaults objectForKey:@"menu"] ) {  // If this is nil, defaults have never been registered.
+        [[PreferencesController sharedPrefs] registerDefaults];
+    }

     
     statusItem = [[ITStatusItem alloc]
             initWithStatusBar:[NSStatusBar systemStatusBar]
     
     statusItem = [[ITStatusItem alloc]
             initWithStatusBar:[NSStatusBar systemStatusBar]


@@ -131,9 +133,7 @@
 {
     if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
         [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];
 {
     if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) {
         [NSThread detachNewThreadSelector:@selector(startTimerInNewThread) toTarget:self withObject:nil];

-        

         [self rebuildMenu];
         [self rebuildMenu];

-        [statusItem setMenu:menu];

         [self setupHotKeys];
         isAppRunning = ITMTRemotePlayerRunning;
         return;
         [self setupHotKeys];
         isAppRunning = ITMTRemotePlayerRunning;
         return;


@@ -166,89 +166,6 @@
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 

-- (void)registerDefaults
-{
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    if (![defaults objectForKey:@"menu"]) {
-        BOOL found = NO;
-        NSMutableDictionary *loginwindow;
-        NSMutableArray *loginarray;
-        int i;
-        
-        [defaults setObject:
-            [NSArray arrayWithObjects:
-                @"Play/Pause",
-                @"Next Track",
-                @"Previous Track",
-                @"Fast Forward",
-                @"Rewind",
-                @"<separator>",
-                @"Upcoming Songs",
-                @"Playlists",
-                @"Song Rating",
-                @"<separator>",
-                @"PreferencesÉ",
-                @"Quit",
-                @"<separator>",
-                @"Current Track Info",
-                nil] forKey:@"menu"];
-        
-        [defaults synchronize];
-        loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy];
-        loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-        
-        for (i = 0; i < [loginarray count]; i++) {
-            NSDictionary *tempDict = [loginarray objectAtIndex:i];
-            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:
-                [[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
-                found = YES;
-            }
-        }
-        
-        //
-        //This is teh sux
-        //We must fix it so it is no longer suxy
-        if (!found) {
-            if (NSRunInformationalAlertPanel(@"Auto-launch MenuTunes", @"Would you like MenuTunes to automatically launch at login?", @"Yes", @"No", nil) == NSOKButton) {
-                AEDesc scriptDesc, resultDesc;
-                NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]];
-                ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
-                
-                AECreateDesc(typeChar, [script cString], [script cStringLength], 
-            &scriptDesc);
-                
-                OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
-                
-                AEDisposeDesc(&scriptDesc);
-                AEDisposeDesc(&resultDesc);
-                
-                CloseComponent(asComponent);
-            }
-        }
-    }
-    
-    if (![defaults integerForKey:@"SongsInAdvance"])
-    {
-        [defaults setInteger:5 forKey:@"SongsInAdvance"];
-    }
-    
-    if (![defaults objectForKey:@"showName"]) {
-        [defaults setBool:YES forKey:@"showName"];
-    }
-    
-    if (![defaults objectForKey:@"showArtist"]) {
-        [defaults setBool:YES forKey:@"showArtist"];
-    }
-    
-    if (![defaults objectForKey:@"showAlbum"]) {
-        [defaults setBool:NO forKey:@"showAlbum"];
-    }
-    
-    if (![defaults objectForKey:@"showTime"]) {
-        [defaults setBool:NO forKey:@"showTime"];
-    }
-}
-

 - (void)startTimerInNewThread
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 - (void)startTimerInNewThread
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];


@@ -265,7 +182,9 @@
 //Recreate the status item menu
 - (void)rebuildMenu
 {
 //Recreate the status item menu
 - (void)rebuildMenu
 {

-    NSArray *myMenu = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSArray *myMenu = [defaults arrayForKey:@"menu"];
+    int playlist = [currentRemote currentPlaylistIndex];

     int i;
     
     trackInfoIndex = -1;
     int i;
     
     trackInfoIndex = -1;


@@ -276,10 +195,6 @@
     [menu autorelease];
     menu = [[NSMenu alloc] initWithTitle:@""];
     
     [menu autorelease];
     menu = [[NSMenu alloc] initWithTitle:@""];
     

-    /*while ([menu numberOfItems] > 0) {
-        [menu removeItemAtIndex:0];
-    }*/
-    

     playPauseItem = nil;
     lastSongIdentifier = @"0-0";
     
     playPauseItem = nil;
     lastSongIdentifier = @"0-0";
     


@@ -342,6 +257,10 @@
             [menu addItemWithTitle:@"Rewind"
                     action:@selector(rewind:)
                     keyEquivalent:@""];
             [menu addItemWithTitle:@"Rewind"
                     action:@selector(rewind:)
                     keyEquivalent:@""];

+        } else if ([item isEqualToString:@"Show Player"]) {
+            [menu addItemWithTitle:[NSString stringWithFormat:@"Show %@", [currentRemote playerSimpleName]]
+                    action:@selector(showPlayer:)
+                    keyEquivalent:@""];

         } else if ([item isEqualToString:@"Upcoming Songs"]) {
             upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"
                     action:nil
         } else if ([item isEqualToString:@"Upcoming Songs"]) {
             upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs"
                     action:nil


@@ -402,9 +321,84 @@
         }
     }
     
         }
     }
     

-    [statusItem setMenu:menu];
+    if ( (isAppRunning == ITMTRemotePlayerRunning) ) {
+        isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
+        
+        if (upcomingSongsItem) {
+            [self rebuildUpcomingSongsMenu];
+        }
+        
+        if (playlistItem) {
+            [self rebuildPlaylistMenu];
+        }
+        
+        if (eqItem) {
+            [self rebuildEQPresetsMenu];
+        }
+        
+        if (ratingItem) {
+            if (isPlayingRadio || !playlist) {
+                [ratingItem setEnabled:NO];
+                if ([ratingItem submenu]) {
+                    [ratingItem setSubmenu:nil];
+                }
+            } else {
+                int currentSongRating = ([currentRemote currentSongRating] * 5);
+                [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
+                lastSongRating = currentSongRating;
+                [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState];
+                [ratingItem setEnabled:YES];
+                [ratingItem setSubmenu:ratingMenu];
+            }
+        }
+        
+        //Set the new unique song identifier
+        lastSongIdentifier = [[currentRemote currentSongUniqueIdentifier] retain];
+        
+        //If we're in a playlist or radio mode
+        if ( (trackInfoIndex > -1) && (playlist || isPlayingRadio) ) {
+            NSString *title, *album, *artist;
+            
+            if ( (i = [menu indexOfItemWithTitle:@"No Song"]) && (i > -1) ) {
+                [menu removeItemAtIndex:i];
+                [menu insertItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@"" atIndex:i];
+            }
+            
+            title = [currentRemote currentSongTitle];
+            
+            if (!isPlayingRadio) {
+                ([defaults boolForKey:@"showAlbum"]) ? (album = [currentRemote currentSongAlbum]) :
+                                                    (album = @"");
+                ([defaults boolForKey:@"showArtist"]) ? (artist = [currentRemote currentSongArtist]) :
+                                                        (artist = @"");
+                if ([defaults boolForKey:@"showTime"]) {
+                    [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", [currentRemote currentSongLength]] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+                }
+                
+                if ([artist length] > 0) {
+                    [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", artist] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+                }
+                
+                if ([album length] > 0) {
+                    [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", album] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+                }
+                
+                if ([defaults boolForKey:@"showArtist"]) {
+                    didHaveArtistName = (([artist length] > 0) ? YES : NO);
+                }
+                
+                if ([defaults boolForKey:@"showAlbum"]) {
+                    didHaveAlbumName = (([album length] > 0) ? YES : NO);
+                }
+            }
+            
+            if ([title length] > 0) {
+                [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", title] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
+            }
+        }
+    }

     
     

-    [self updateMenu];
+    [statusItem setMenu:menu];

     
     [self clearHotKeys];
     [self setupHotKeys];
     
     [self clearHotKeys];
     [self setupHotKeys];


@@ -540,95 +534,6 @@
     }
 }
 
     }
 }
 

-- (void)updateMenu
-{
-    NSUserDefaults *defaults;
-    int playlist = [currentRemote currentPlaylistIndex];
-    int temp;
-    
-    if ( (isAppRunning == ITMTRemotePlayerNotRunning) ) {
-        return;
-    }
-    
-    defaults = [NSUserDefaults standardUserDefaults];
-    isPlayingRadio = ([currentRemote classOfPlaylistAtIndex:playlist] == ITMTRemotePlayerRadioPlaylist);
-    
-    if (upcomingSongsItem) {
-        [self rebuildUpcomingSongsMenu];
-    }
-    
-    if (playlistItem) {
-        [self rebuildPlaylistMenu];
-    }
-    
-    if (eqItem) {
-        [self rebuildEQPresetsMenu];
-    }
-    
-    if (ratingItem) {
-        if (isPlayingRadio || !playlist) {
-            [ratingItem setEnabled:NO];
-            if ([ratingItem submenu]) {
-                [ratingItem setSubmenu:nil];
-            }
-        } else {
-            int currentSongRating = ([currentRemote currentSongRating] * 5);
-            [[ratingMenu itemAtIndex:lastSongRating] setState:NSOffState];
-            lastSongRating = currentSongRating;
-            [[ratingMenu itemAtIndex:lastSongRating] setState:NSOnState];
-            [ratingItem setEnabled:YES];
-            [ratingItem setSubmenu:ratingMenu];
-        }
-    }
-    
-    //Set the new unique song identifier
-    lastSongIdentifier = [[currentRemote currentSongUniqueIdentifier] retain];
-    
-    //If we're in a playlist or radio mode
-    if ( (trackInfoIndex > -1) && (playlist || isPlayingRadio) ) {
-        NSString *title, *album, *artist;
-        
-        if ( (temp = [menu indexOfItemWithTitle:@"No Song"]) && (temp > -1) ) {
-            [menu removeItemAtIndex:temp];
-            [menu insertItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@"" atIndex:temp];
-        }
-        
-        title = [currentRemote currentSongTitle];
-        
-        if (!isPlayingRadio) {
-            ([defaults boolForKey:@"showAlbum"]) ? (album = [currentRemote currentSongAlbum]) :
-                                                   (album = @"");
-            ([defaults boolForKey:@"showArtist"]) ? (artist = [currentRemote currentSongArtist]) :
-                                                    (artist = @"");
-            if ([defaults boolForKey:@"showTime"]) {
-                [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", [currentRemote currentSongLength]] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
-            }
-            
-            if ([artist length] > 0) {
-                [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", artist] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
-            }
-            
-            if ([album length] > 0) {
-                [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", album] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
-            }
-            
-            if ([defaults boolForKey:@"showArtist"]) {
-                didHaveArtistName = (([artist length] > 0) ? YES : NO);
-            }
-            
-            if ([defaults boolForKey:@"showAlbum"]) {
-                didHaveAlbumName = (([album length] > 0) ? YES : NO);
-            }
-        }
-        
-        if ([title length] > 0) {
-            [menu insertItemWithTitle:[NSString stringWithFormat:@"  %@", title] action:nil keyEquivalent:@"" atIndex:trackInfoIndex + 1];
-        }
-    }
-    [menu update];
-}
-
-

 //
 //
 // Menu Selectors
 //
 //
 // Menu Selectors


@@ -839,12 +744,16 @@
             }
         }
         
             }
         }
         

-        [statusWindow setText:stringToShow];
+        //
+        //SHOW THE STATUS WINDOW HERE WITH STRING stringToShow
+        //
+        
+        /*[statusWindow setText:stringToShow];

         [NSTimer scheduledTimerWithTimeInterval:3.0
                     target:self
                     selector:@selector(fadeAndCloseStatusWindow)
                     userInfo:nil
         [NSTimer scheduledTimerWithTimeInterval:3.0
                     target:self
                     selector:@selector(fadeAndCloseStatusWindow)
                     userInfo:nil

-                    repeats:NO];
+                    repeats:NO];*/

     }
 }
 
     }
 }
 


@@ -860,7 +769,6 @@
             int i;
             NSString *songs = @"";
             
             int i;
             NSString *songs = @"";
             

-            statusWindow = [ITTransientStatusWindow sharedWindow];

             for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
                 if (i <= numSongs) {
                     NSString *curSong = [currentRemote songTitleAtIndex:i];
             for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) {
                 if (i <= numSongs) {
                     NSString *curSong = [currentRemote songTitleAtIndex:i];


@@ -868,12 +776,17 @@
                     songs = [songs stringByAppendingString:@"\n"];
                 }
             }
                     songs = [songs stringByAppendingString:@"\n"];
                 }
             }

-            [statusWindow setText:songs];
+            
+            //
+            //SHOW STATUS WINDOW HERE WITH STRING songs
+            //
+            
+            /*[statusWindow setText:songs];

             [NSTimer scheduledTimerWithTimeInterval:3.0
                         target:self
                         selector:@selector(fadeAndCloseStatusWindow)
                         userInfo:nil
             [NSTimer scheduledTimerWithTimeInterval:3.0
                         target:self
                         selector:@selector(fadeAndCloseStatusWindow)
                         userInfo:nil

-                        repeats:NO];
+                        repeats:NO];*/

         }
     }
 }
         }
     }
 }