git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Modified the keycombo class to return nil if there is no key in user
[MenuTunes.git] / MenuTunes.m
diff --git a/MenuTunes.m b/MenuTunes.m
index 7df098f..aa4296c 100755 (executable)
--- a/MenuTunes.m
+++ b/MenuTunes.m
@@ -3,6 +3,8 @@ Things to do:
 ¥ Make preferences window pretty
 ¥ Optimize
 ¥ Apple Events! Apple Events! Apple Events!
 ¥ Make preferences window pretty
 ¥ Optimize
 ¥ Apple Events! Apple Events! Apple Events!
+¥ Manual and webpage
+¥ Finish up registration frontend
 */
 
 #import "MenuTunes.h"
 */
 
 #import "MenuTunes.h"
@@ -11,7 +13,6 @@ Things to do:
 #import "StatusWindowController.h"
 
 @interface MenuTunes(Private)
 #import "StatusWindowController.h"
 
 @interface MenuTunes(Private)
-- (void)registerDefaultsIfNeeded;
 - (void)updateMenu;
 - (void)rebuildUpcomingSongsMenu;
 - (void)rebuildPlaylistMenu;
 - (void)updateMenu;
 - (void)rebuildUpcomingSongsMenu;
 - (void)rebuildPlaylistMenu;
@@ -20,6 +21,8 @@ Things to do:
 - (NSString *)runScriptAndReturnResult:(NSString *)script;
 - (void)timerUpdate;
 - (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID;
 - (NSString *)runScriptAndReturnResult:(NSString *)script;
 - (void)timerUpdate;
 - (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID;
+- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
+        onItem:(NSMenuItem *)item;
 
 @end
 
 
 @end
 
@@ -43,10 +46,10 @@ Things to do:
     {
         [self rebuildMenu];
         refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5
     {
         [self rebuildMenu];
         refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5
-                                                        target:self
-                                                      selector:@selector(timerUpdate)
-                                                      userInfo:nil
-                                                       repeats:YES];
+                                                    target:self
+                                                    selector:@selector(timerUpdate)
+                                                    userInfo:nil
+                                                    repeats:YES];
     }
     else
     {
     }
     else
     {
@@ -59,13 +62,13 @@ Things to do:
     }
 
     statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar]
     }
 
     statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar]
-                                              withLength:NSVariableStatusItemLength];
+                                              withLength:NSSquareStatusItemLength];
     
     [statusItem setImage:[NSImage imageNamed:@"menu"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
     [statusItem setMenu:menu];
     // Below line of code is for creating builds for Beta Testers
     
     [statusItem setImage:[NSImage imageNamed:@"menu"]];
     [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]];
     [statusItem setMenu:menu];
     // Below line of code is for creating builds for Beta Testers
-    // [statusItem setToolTip:@"This Nontransferable Beta (Built on __DATE__) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com)."];
+    // [statusItem setToolTip:@[NSString stringWithFormat:@"This Nontransferable Beta (Built on %s) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com).",__DATE__]];
 }
 
 
 }
 
 
@@ -78,6 +81,11 @@ Things to do:
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     if (![defaults objectForKey:@"menu"]) {
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     if (![defaults objectForKey:@"menu"]) {
+        bool found = NO;
+        NSMutableDictionary *loginwindow;
+        NSMutableArray *loginarray;
+        int i;
+        
         [defaults setObject:
             [NSArray arrayWithObjects:
                 @"Play/Pause",
         [defaults setObject:
             [NSArray arrayWithObjects:
                 @"Play/Pause",
@@ -94,6 +102,37 @@ Things to do:
                 @"<separator>",
                 @"Current Track Info",
                 nil] forKey:@"menu"];
                 @"<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;
+            }
+        }
+        
+        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]];
+                
+                AECreateDesc(typeChar, [script cString], [script cStringLength], 
+            &scriptDesc);
+                
+                OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
+                
+                AEDisposeDesc(&scriptDesc);
+                AEDisposeDesc(&resultDesc);
+            }
+        }
+    }
+    
+    if (![defaults integerForKey:@"SongsInAdvance"])
+    {
+        [defaults setInteger:5 forKey:@"SongsInAdvance"];
     }
     
     if (![defaults objectForKey:@"showName"]) {
     }
     
     if (![defaults objectForKey:@"showName"]) {
@@ -140,18 +179,44 @@ Things to do:
     for (i = 0; i < [myMenu count]; i++) {
         NSString *item = [myMenu objectAtIndex:i];
         if ([item isEqualToString:@"Play/Pause"]) {
     for (i = 0; i < [myMenu count]; i++) {
         NSString *item = [myMenu objectAtIndex:i];
         if ([item isEqualToString:@"Play/Pause"]) {
+            KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PlayPause"];
             playPauseMenuItem = [menu addItemWithTitle:@"Play"
             playPauseMenuItem = [menu addItemWithTitle:@"Play"
-                                                action:@selector(playPause:)
-                                         keyEquivalent:@""];
+                                    action:@selector(playPause:)
+                                    keyEquivalent:@""];
             [playPauseMenuItem setTarget:self];
             [playPauseMenuItem setTarget:self];
+            
+            if (tempCombo)
+            {
+                [self setKeyEquivalentForCode:[tempCombo keyCode]
+                    andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem];
+                [tempCombo release];
+            }
         } else if ([item isEqualToString:@"Next Track"]) {
         } else if ([item isEqualToString:@"Next Track"]) {
-            [[menu addItemWithTitle:@"Next Track"
-                             action:@selector(nextSong:)
-                      keyEquivalent:@""] setTarget:self];
+            KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"NextTrack"];
+            NSMenuItem *nextTrack = [menu addItemWithTitle:@"Next Track"
+                                        action:@selector(nextSong:)
+                                        keyEquivalent:@""];
+            
+            [nextTrack setTarget:self];
+            if (tempCombo)
+            {
+                [self setKeyEquivalentForCode:[tempCombo keyCode]
+                    andModifiers:[tempCombo modifiers] onItem:nextTrack];
+                [tempCombo release];
+            }
         } else if ([item isEqualToString:@"Previous Track"]) {
         } else if ([item isEqualToString:@"Previous Track"]) {
-            [[menu addItemWithTitle:@"Previous Track"
-                             action:@selector(prevSong:)
-                      keyEquivalent:@""] setTarget:self];
+            KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PrevTrack"];
+            NSMenuItem *prevTrack = [menu addItemWithTitle:@"Previous Track"
+                                        action:@selector(prevSong:)
+                                        keyEquivalent:@""];
+            
+            [prevTrack setTarget:self];
+            if (tempCombo)
+            {
+                [self setKeyEquivalentForCode:[tempCombo keyCode]
+                    andModifiers:[tempCombo modifiers] onItem:prevTrack];
+                [tempCombo release];
+            }
         } else if ([item isEqualToString:@"Fast Forward"]) {
             [[menu addItemWithTitle:@"Fast Forward"
                              action:@selector(fastForward:)
         } else if ([item isEqualToString:@"Fast Forward"]) {
             [[menu addItemWithTitle:@"Fast Forward"
                              action:@selector(fastForward:)
@@ -224,31 +289,31 @@ Things to do:
         NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
         curSongName = [self runScriptAndReturnResult:@"return name of current track"];
         
         NSString *curSongName, *curAlbumName = @"", *curArtistName = @"";
         curSongName = [self runScriptAndReturnResult:@"return name of current track"];
         
-        if ([defaults boolForKey:@"showArtist"]) {
+        if ([defaults boolForKey:@"showAlbum"]) {
             curAlbumName = [self runScriptAndReturnResult:@"return album of current track"];
         }
         
             curAlbumName = [self runScriptAndReturnResult:@"return album of current track"];
         }
         
-        if ([defaults boolForKey:@"showAlbum"]) {
+        if ([defaults boolForKey:@"showArtist"]) {
             curArtistName = [self runScriptAndReturnResult:@"return artist of current track"];
         }
         
         if ([curSongName length] > 0) {
             int index = [menu indexOfItemWithTitle:@"Now Playing"];
             curArtistName = [self runScriptAndReturnResult:@"return artist of current track"];
         }
         
         if ([curSongName length] > 0) {
             int index = [menu indexOfItemWithTitle:@"Now Playing"];
-            
             if (index > -1) {
                 if ([defaults boolForKey:@"showName"]) {
                     [menu removeItemAtIndex:index + 1];
                 }
             if (index > -1) {
                 if ([defaults boolForKey:@"showName"]) {
                     [menu removeItemAtIndex:index + 1];
                 }
-                if (didHaveAlbumName) {
+                if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) {
                     [menu removeItemAtIndex:index + 1];
                 }
                     [menu removeItemAtIndex:index + 1];
                 }
-                if (didHaveArtistName) {
+                if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) {
                     [menu removeItemAtIndex:index + 1];
                 }
                 if ([defaults boolForKey:@"showTime"]) {
                     [menu removeItemAtIndex:index + 1];
                 }
             }
                     [menu removeItemAtIndex:index + 1];
                 }
                 if ([defaults boolForKey:@"showTime"]) {
                     [menu removeItemAtIndex:index + 1];
                 }
             }
+            
             if (!isPlayingRadio) {
                 if ([defaults boolForKey:@"showTime"]) {
                     menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", [self runScriptAndReturnResult:@"return time of current track"]]
             if (!isPlayingRadio) {
                 if ([defaults boolForKey:@"showTime"]) {
                     menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", [self runScriptAndReturnResult:@"return time of current track"]]
@@ -274,11 +339,14 @@ Things to do:
                     [menuItem release];
                 }
             }
                     [menuItem release];
                 }
             }
-            menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"  %@", curSongName]
-                                                action:nil
-                                                keyEquivalent:@""];
-            [menu insertItem:menuItem atIndex:trackInfoIndex + 1];
-            [menuItem release];
+            
+            if ([defaults boolForKey:@"showName"]) {
+                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:nil keyEquivalent:@""];
             
             if (index == -1) {
                 menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:nil keyEquivalent:@""];
@@ -286,7 +354,6 @@ Things to do:
                 [menu insertItem:menuItem atIndex:trackInfoIndex];
                 [menuItem release];
             }
                 [menu insertItem:menuItem atIndex:trackInfoIndex];
                 [menuItem release];
             }
-            
         } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
             [menu removeItemAtIndex:trackInfoIndex];
             
         } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) {
             [menu removeItemAtIndex:trackInfoIndex];
             
@@ -312,12 +379,12 @@ Things to do:
         }
         
         if ([defaults boolForKey:@"showArtist"]) {
         }
         
         if ([defaults boolForKey:@"showArtist"]) {
-                didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
-            }
+            didHaveArtistName = (([curArtistName length] > 0) ? YES : NO);
+        }
             
             
-            if ([defaults boolForKey:@"showAlbum"]) {
-                didHaveArtistName = (([curArtistName length] > 0) ? YES : NO);
-            }
+        if ([defaults boolForKey:@"showAlbum"]) {
+            didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
+        }
     }
 }
 
     }
 }
 
@@ -589,7 +656,7 @@ Things to do:
             if ([(NSString *)procName isEqualToString:@"iTunes"]) {
                 return procNum;
             }
             if ([(NSString *)procName isEqualToString:@"iTunes"]) {
                 return procNum;
             }
-            [(NSString *)procName release];
+            CFRelease(procName);
         }
     }
     return procNum;
         }
     }
     return procNum;
@@ -716,7 +783,6 @@ isEqualToString:@"rewinding"]) {
     if (!statusController && [trackName length]) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         NSString *stringToShow = @"";
     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"]) {
@@ -725,10 +791,6 @@ isEqualToString:@"rewinding"]) {
             }
             stringToShow = [stringToShow stringByAppendingString:trackName];
             stringToShow = [stringToShow stringByAppendingString:@"\n"];
             }
             stringToShow = [stringToShow stringByAppendingString:trackName];
             stringToShow = [stringToShow stringByAppendingString:@"\n"];
-            if ([trackName length] > 38) {
-                lines++;
-            }
-            lines++;
         }
         
         if ([defaults boolForKey:@"showAlbum"]) {
         }
         
         if ([defaults boolForKey:@"showAlbum"]) {
@@ -736,7 +798,6 @@ isEqualToString:@"rewinding"]) {
             if ([trackAlbum length]) {
                 stringToShow = [stringToShow stringByAppendingString:trackAlbum];
                 stringToShow = [stringToShow stringByAppendingString:@"\n"];
             if ([trackAlbum length]) {
                 stringToShow = [stringToShow stringByAppendingString:trackAlbum];
                 stringToShow = [stringToShow stringByAppendingString:@"\n"];
-                lines++;
             }
         }
         
             }
         }
         
@@ -744,7 +805,6 @@ isEqualToString:@"rewinding"]) {
             NSString *trackTime = [self runScriptAndReturnResult:@"return time of current track"];
             if ([trackTime length]) {
                 stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];
             NSString *trackTime = [self runScriptAndReturnResult:@"return time of current track"];
             if ([trackTime length]) {
                 stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];
-                lines++;
             }
         }
         
             }
         }
         
@@ -761,12 +821,12 @@ isEqualToString:@"rewinding"]) {
         }
         
         statusController = [[StatusWindowController alloc] init];
         }
         
         statusController = [[StatusWindowController alloc] init];
-        [statusController setTrackInfo:stringToShow lines:lines];
+        [statusController setTrackInfo:stringToShow];
         [NSTimer scheduledTimerWithTimeInterval:3.0
         [NSTimer scheduledTimerWithTimeInterval:3.0
-                                         target:self
-                                       selector:@selector(fadeAndCloseStatusWindow)
-                                       userInfo:nil
-                                        repeats:NO];
+                                    target:self
+                                    selector:@selector(fadeAndCloseStatusWindow)
+                                    userInfo:nil
+                                    repeats:NO];
     }
 }
 
     }
 }
 
@@ -790,12 +850,12 @@ isEqualToString:@"rewinding"]) {
                     songs = [songs stringByAppendingString:@"\n"];
                 }
             }
                     songs = [songs stringByAppendingString:@"\n"];
                 }
             }
-            [statusController setUpcomingSongs:songs numSongs:numSongsInAdvance];
+            [statusController setUpcomingSongs:songs];
             [NSTimer scheduledTimerWithTimeInterval:3.0
             [NSTimer scheduledTimerWithTimeInterval:3.0
-                                             target:self
-                                           selector:@selector(fadeAndCloseStatusWindow)
-                                           userInfo:nil
-                                            repeats:NO];
+                        target:self
+                        selector:@selector(fadeAndCloseStatusWindow)
+                        userInfo:nil
+                        repeats:NO];
         }
     }
 }
         }
     }
 }
@@ -807,6 +867,168 @@ isEqualToString:@"rewinding"]) {
     statusController = nil;
 }
 
     statusController = nil;
 }
 
+- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
+        onItem:(NSMenuItem *)item
+{
+    unichar charcode = 'a';
+    int i;
+    long cocoaModifiers = 0;
+    static long carbonToCocoa[6][2] = 
+    {
+        { cmdKey, NSCommandKeyMask },
+        { optionKey, NSAlternateKeyMask },
+        { controlKey, NSControlKeyMask },
+        { shiftKey, NSShiftKeyMask },
+    };
+    
+    for (i = 0; i < 6; i++)
+    {
+        if (modifiers & carbonToCocoa[i][0])
+        {
+            cocoaModifiers += carbonToCocoa[i][1];
+        }
+    }
+    [item setKeyEquivalentModifierMask:cocoaModifiers];
+    
+    //Missing key combos for some keys. Must find them later.
+    switch (code)
+    {
+        case 36:
+        break;
+        
+        case 48:
+        break;
+        
+        case 49:
+        break;
+        
+        case 51:
+            charcode = NSDeleteFunctionKey;
+        break;        
+        case 53:
+        break;
+                
+        case 71:
+        break;
+        
+        case 76:
+        break;
+        
+        case 96:
+            charcode = NSF5FunctionKey;
+        break;
+        
+        case 97:
+            charcode = NSF6FunctionKey;
+        break;
+        
+        case 98:
+            charcode = NSF7FunctionKey;
+        break;
+        
+        case 99:
+            charcode = NSF3FunctionKey;
+        break;
+        
+        case 100:
+            charcode = NSF8FunctionKey;
+        break;
+        
+        case 101:
+            charcode = NSF9FunctionKey;
+        break;
+        
+        case 103:
+            charcode = NSF11FunctionKey;
+        break;
+        
+        case 105:
+            charcode = NSF3FunctionKey;
+        break;
+        
+        case 107:
+            charcode = NSF14FunctionKey;
+        break;
+        
+        case 109:
+            charcode = NSF10FunctionKey;
+        break;
+        
+        case 111:
+            charcode = NSF12FunctionKey;
+        break;
+        
+        case 113:
+            charcode = NSF13FunctionKey;
+        break;
+        
+        case 114:
+            charcode = NSInsertFunctionKey;
+        break;
+        
+        case 115:
+        break;
+        
+        case 116:
+            charcode = NSPageUpFunctionKey;
+        break;
+        
+        case 117:
+            charcode = NSDeleteFunctionKey;
+        break;
+        
+        case 118:
+            charcode = NSF4FunctionKey;
+        break;
+        
+        case 119:
+            charcode = NSEndFunctionKey;
+        break;
+        
+        case 120:
+            charcode = NSF2FunctionKey;
+        break;
+        
+        case 121:
+            charcode = NSPageDownFunctionKey;
+        break;
+        
+        case 122:
+            charcode = NSF1FunctionKey;
+        break;
+        
+        case 123:
+            charcode = NSLeftArrowFunctionKey;
+        break;
+        
+        case 124:
+            charcode = NSRightArrowFunctionKey;
+        break;
+        
+        case 125:
+            charcode = NSDownArrowFunctionKey;
+        break;
+        
+        case 126:
+            charcode = NSUpArrowFunctionKey;
+        break;
+    }
+    
+    if (charcode == 'a') {
+        unsigned long state;
+        long keyTrans;
+        char charCode;
+        Ptr kchr;
+        state = 0;
+        kchr = (Ptr) GetScriptVariable(smCurrentScript, smKCHRCache);
+        keyTrans = KeyTranslate(kchr, code, &state);
+        charCode = keyTrans;
+        [item setKeyEquivalent:[NSString stringWithCString:&charCode length:1]];
+    } else {
+        [item setKeyEquivalent:[NSString stringWithCharacters:&charcode length:1]];
+    }
+}
+
 /*************************************************************************/
 #pragma mark -
 #pragma mark NSApplication DELEGATE METHODS
 /*************************************************************************/
 #pragma mark -
 #pragma mark NSApplication DELEGATE METHODS
@@ -837,5 +1059,4 @@ isEqualToString:@"rewinding"]) {
     [super dealloc];
 }
 
     [super dealloc];
 }
 
-
-@end
+@end
\ No newline at end of file
Menu-based iTunes controller.