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 6b536a2..27ca9d1 100755 (executable)
--- a/OldMainController.m
+++ b/OldMainController.m
@@ -195,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";
     


@@ -261,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


@@ -744,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];*/

     }
 }
 
     }
 }
 


@@ -765,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];


@@ -773,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];*/

         }
     }
 }
         }
     }
 }