Stripped out older stuff. It's better now :)

[MenuTunes.git] / PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index b4cba9e..0e8c372 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -134,7 +134,6 @@
 
 - (IBAction)apply:(id)sender
 {
 
 - (IBAction)apply:(id)sender
 {

-    ProcessSerialNumber psn;

     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     [defaults setObject:myItems forKey:@"menu"];
     
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     [defaults setObject:myItems forKey:@"menu"];
     


@@ -210,9 +209,16 @@
         [defaults setInteger:5 forKey:@"SongsInAdvance"];
     }
     
         [defaults setInteger:5 forKey:@"SongsInAdvance"];
     }
     

-    psn = [mt iTunesPSN];
-    if (!((psn.highLongOfPSN == kNoProcess) && (psn.lowLongOfPSN == 0))) {
-        [mt rebuildMenu];
+    {
+        NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
+        int i;
+        
+        for (i = 0; i < [apps count]; i++) {
+            if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"]
+                    isEqualToString:@"iTunes"]) {
+                [mt rebuildMenu];
+            }
+        }

     }
     [mt clearHotKeys];
 }
     }
     [mt clearHotKeys];
 }


@@ -237,15 +243,7 @@
 
 - (IBAction)okHotKey:(id)sender
 {
 
 - (IBAction)okHotKey:(id)sender
 {

-    NSString *string;
-    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];
-        return;
-    }
-    
-    string = [combo userDisplayRep];
+    NSString *string = [combo userDisplayRep];

     
     if (string == nil) {
         string = @"None";
     
     if (string == nil) {
         string = @"None";