Added localizability. Gotta delete you prefs for it to work. Some

[MenuTunes.git] / PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index 9305492..e1c47d1 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -1,5 +1,5 @@
 #import "PreferencesController.h"
 #import "PreferencesController.h"

-#import "MainController.h"
+#import "NewMainController.h"

 #import "HotKeyCenter.h"
 #import <ITKit/ITWindowPositioning.h>
 
 #import "HotKeyCenter.h"
 #import <ITKit/ITWindowPositioning.h>
 


@@ -95,41 +95,27 @@ static PreferencesController *prefs = nil;
 
 - (IBAction)changeGeneralSetting:(id)sender
 {
 
 - (IBAction)changeGeneralSetting:(id)sender
 {

-    BOOL rebuildRequired = NO;
-

     if ( [sender tag] == 1010) {
         [self setLaunchesAtLogin:SENDER_STATE];
     } else if ( [sender tag] == 1020) {
         [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"];
     } else if ( [sender tag] == 1030) {
         [df setInteger:[sender intValue] forKey:@"SongsInAdvance"];
     if ( [sender tag] == 1010) {
         [self setLaunchesAtLogin:SENDER_STATE];
     } else if ( [sender tag] == 1020) {
         [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"];
     } else if ( [sender tag] == 1030) {
         [df setInteger:[sender intValue] forKey:@"SongsInAdvance"];

-        rebuildRequired = YES;
+

     } else if ( [sender tag] == 1040) {
         // This will not be executed.  Song info always shows the title of the song.
         // [df setBool:SENDER_STATE forKey:@"showName"];
     } else if ( [sender tag] == 1040) {
         // This will not be executed.  Song info always shows the title of the song.
         // [df setBool:SENDER_STATE forKey:@"showName"];

-        // rebuildRequired = YES;

     } else if ( [sender tag] == 1050) {
         [df setBool:SENDER_STATE forKey:@"showArtist"];
     } else if ( [sender tag] == 1050) {
         [df setBool:SENDER_STATE forKey:@"showArtist"];

-        rebuildRequired = YES;

     } else if ( [sender tag] == 1060) {
         [df setBool:SENDER_STATE forKey:@"showAlbum"];
     } else if ( [sender tag] == 1060) {
         [df setBool:SENDER_STATE forKey:@"showAlbum"];

-        rebuildRequired = YES;

     } else if ( [sender tag] == 1070) {
         [df setBool:SENDER_STATE forKey:@"showTime"];
     } else if ( [sender tag] == 1070) {
         [df setBool:SENDER_STATE forKey:@"showTime"];

-        rebuildRequired = YES;

     } else if ( [sender tag] == 1080) {
         [df setBool:SENDER_STATE forKey:@"showTrackNumber"];
     } else if ( [sender tag] == 1080) {
         [df setBool:SENDER_STATE forKey:@"showTrackNumber"];

-        rebuildRequired = YES;

     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];
     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];

-        rebuildRequired = YES;
-    }
-
-    if ( rebuildRequired ) {
-        [controller rebuildMenu];
-        // redraw song info status window, or upcoming songs here

     }
     }

-

     [df synchronize];
 }
 
     [df synchronize];
 }
 


@@ -174,8 +160,8 @@ static PreferencesController *prefs = nil;
             [self setCurrentHotKey:@"PrevTrack"];
             break;
         case 4035:
             [self setCurrentHotKey:@"PrevTrack"];
             break;
         case 4035:

-            [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleVisualizer"]];
-            [self setCurrentHotKey:@"ToggleVisualizer"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"ShowPlayer"]];
+            [self setCurrentHotKey:@"ShowPlayer"];

             break;
         case 4040:
             [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleLoop"]];
             break;
         case 4040:
             [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleLoop"]];


@@ -221,21 +207,22 @@ static PreferencesController *prefs = nil;
     id anItem;
 
     [df setObject:[NSArray arrayWithObjects:
     id anItem;
 
     [df setObject:[NSArray arrayWithObjects:

-        @"Play/Pause",
-        @"Next Track",
-        @"Previous Track",
-        @"Fast Forward",
-        @"Rewind",
-        @"Show Player",
-        @"<separator>",
-        @"Upcoming Songs",
-        @"Playlists",
-        @"Song Rating",
-        @"<separator>",
-        @"PreferencesÉ",
-        @"Quit",
-        @"<separator>",
-        @"Current Track Info",
+        @"playPause",
+        @"nextTrack",
+        @"prevTrack",
+        @"fastForward",
+        @"rewind",
+        @"showPlayer",
+        @"separator",
+        @"songRating",
+        @"eqPresets",
+        @"playlists",
+        @"upcomingSongs",
+        @"separator",
+        @"preferences",
+        @"quit",
+        @"separator",
+        @"trackInfo",

         nil] forKey:@"menu"];
 
     [df setInteger:5 forKey:@"SongsInAdvance"];
         nil] forKey:@"menu"];
 
     [df setInteger:5 forKey:@"SongsInAdvance"];


@@ -261,7 +248,7 @@ static PreferencesController *prefs = nil;
     // This is teh sux
     // We must fix it so it is no longer suxy
     if (!found) {
     // 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) {
+        if (NSRunInformationalAlertPanel(NSLocalizedString(@"autolaunch", @"Auto-launch MenuTunes"), NSLocalizedString(@"autolaunch_msg", @"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);
             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);


@@ -296,7 +283,6 @@ static PreferencesController *prefs = nil;
     NSString *string = [combo userDisplayRep];
     NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator];
     NSString *enumKey;
     NSString *string = [combo userDisplayRep];
     NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator];
     NSString *enumKey;

-    BOOL duplicateCombo = NO;

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


@@ -307,7 +293,7 @@ static PreferencesController *prefs = nil;
             if (![combo isEqual:[KeyCombo clearKeyCombo]] &&
                  [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
                 [window setLevel:NSNormalWindowLevel];
             if (![combo isEqual:[KeyCombo clearKeyCombo]] &&
                  [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
                 [window setLevel:NSNormalWindowLevel];

-                if ( NSRunAlertPanel(@"Duplicate Key Combo", @"The specified key combo is already in use...", @"Replace", @"Cancel", nil) ) {
+                if ( NSRunAlertPanel(NSLocalizedString(@"duplicateCombo", @"Duplicate Key Combo") , NSLocalizedString(@"duplicateCombo_msg", @"The specified key combo is already in use..."), NSLocalizedString(@"replace", @"Replace"), NSLocalizedString(@"cancel", @"Cancel"), nil) ) {

                     [hotKeysDictionary setObject:[KeyCombo clearKeyCombo] forKey:currentHotKey];
                     if ([enumKey isEqualToString:@"PlayPause"]) {
                         [playPauseButton setTitle:@""];
                     [hotKeysDictionary setObject:[KeyCombo clearKeyCombo] forKey:currentHotKey];
                     if ([enumKey isEqualToString:@"PlayPause"]) {
                         [playPauseButton setTitle:@""];


@@ -315,8 +301,8 @@ static PreferencesController *prefs = nil;
                         [nextTrackButton setTitle:@""];
                     } else if ([enumKey isEqualToString:@"PrevTrack"]) {
                         [previousTrackButton setTitle:@""];
                         [nextTrackButton setTitle:@""];
                     } else if ([enumKey isEqualToString:@"PrevTrack"]) {
                         [previousTrackButton setTitle:@""];

-                    } else if ([enumKey isEqualToString:@"ToggleVisualizer"]) {
-                        [visualizerButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"ShowPlayer"]) {
+                        [showPlayerButton setTitle:@""];

                     } else if ([enumKey isEqualToString:@"TrackInfo"]) {
                         [trackInfoButton setTitle:@""];
                     } else if ([enumKey isEqualToString:@"UpcomingSongs"]) {
                     } else if ([enumKey isEqualToString:@"TrackInfo"]) {
                         [trackInfoButton setTitle:@""];
                     } else if ([enumKey isEqualToString:@"UpcomingSongs"]) {


@@ -343,36 +329,45 @@ static PreferencesController *prefs = nil;
         }
     }
     
         }
     }
     

-    if (!duplicateCombo) {
-        [hotKeysDictionary setObject:combo forKey:currentHotKey];
-        [df setKeyCombo:combo forKey:currentHotKey];
-        
-        if ([currentHotKey isEqualToString:@"PlayPause"]) {
-            [playPauseButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"NextTrack"]) {
-            [nextTrackButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"PrevTrack"]) {
-            [previousTrackButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"ToggleVisualizer"]) {
-            [visualizerButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"TrackInfo"]) {
-            [trackInfoButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"UpcomingSongs"]) {
-            [upcomingSongsButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) {
-            [volumeIncrementButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) {
-            [volumeDecrementButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"IncrementRating"]) {
-            [ratingIncrementButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"DecrementRating"]) {
-            [ratingDecrementButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"ToggleShuffle"]) {
-            [toggleShuffleButton setTitle:string];
-        } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) {
-            [toggleLoopButton setTitle:string];
-        }
-        //[controller rebuildMenu];
+    [hotKeysDictionary setObject:combo forKey:currentHotKey];
+    [df setKeyCombo:combo forKey:currentHotKey];
+    
+    if ([currentHotKey isEqualToString:@"PlayPause"]) {
+        [playPauseButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause" combo:combo target:[MainController sharedController] action:@selector(playPause)];
+    } else if ([currentHotKey isEqualToString:@"NextTrack"]) {
+        [nextTrackButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack" combo:combo target:[MainController sharedController] action:@selector(nextSong)];
+    } else if ([currentHotKey isEqualToString:@"PrevTrack"]) {
+        [previousTrackButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack" combo:combo target:[MainController sharedController] action:@selector(prevSong)];
+    } else if ([currentHotKey isEqualToString:@"ShowPlayer"]) {
+        [showPlayerButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"ShowPlayer" combo:combo target:[MainController sharedController] action:@selector(showPlayer)];
+    } else if ([currentHotKey isEqualToString:@"TrackInfo"]) {
+        [trackInfoButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo" combo:combo target:[MainController sharedController] action:@selector(showCurrentTrackInfo)];
+    } else if ([currentHotKey isEqualToString:@"UpcomingSongs"]) {
+        [upcomingSongsButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs" combo:combo target:[MainController sharedController] action:@selector(showUpcomingSongs)];
+    } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) {
+        [volumeIncrementButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume" combo:combo target:[MainController sharedController] action:@selector(incrementVolume)];
+    } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) {
+        [volumeDecrementButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume" combo:combo target:[MainController sharedController] action:@selector(decrementVolume)];
+    } else if ([currentHotKey isEqualToString:@"IncrementRating"]) {
+        [ratingIncrementButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating" combo:combo target:[MainController sharedController] action:@selector(incrementRating)];
+    } else if ([currentHotKey isEqualToString:@"DecrementRating"]) {
+        [ratingDecrementButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating" combo:combo target:[MainController sharedController] action:@selector(decrementRating)];
+    } else if ([currentHotKey isEqualToString:@"ToggleShuffle"]) {
+        [toggleShuffleButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle" combo:combo target:[MainController sharedController] action:@selector(toggleShuffle)];
+    } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) {
+        [toggleLoopButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop" combo:combo target:[MainController sharedController] action:@selector(toggleLoop)];

     }
     [self cancelHotKey:sender];
 }
     }
     [self cancelHotKey:sender];
 }


@@ -427,8 +422,8 @@ static PreferencesController *prefs = nil;
 
 - (void)setupWindow
 {
 
 - (void)setupWindow
 {

-    if ( ! [NSBundle loadNibNamed:@"Preferences" owner:self] ) {
-        NSLog( @"Failed to load Preferences.nib" );
+    if (![NSBundle loadNibNamed:@"Preferences" owner:self]) {
+        NSLog(@"MenuTunes: Failed to load Preferences.nib");

         NSBeep();
         return;
     }
         NSBeep();
         return;
     }


@@ -460,18 +455,18 @@ static PreferencesController *prefs = nil;
     id            anItem;
     // Set the list of items you can have.
     availableItems = [[NSMutableArray alloc] initWithObjects:
     id            anItem;
     // Set the list of items you can have.
     availableItems = [[NSMutableArray alloc] initWithObjects:

-        @"Current Track Info",
-        @"Upcoming Songs",
-        @"Playlists",
-        @"EQ Presets",
-        @"Song Rating",
-        @"Play/Pause",
-        @"Next Track",
-        @"Previous Track",
-        @"Fast Forward",
-        @"Rewind",
-        @"Show Player",
-        @"<separator>",
+        @"trackInfo",
+        @"upcomingSongs",
+        @"playlists",
+        @"eqPresets",
+        @"songRating",
+        @"playPause",
+        @"nextTrack",
+        @"prevTrack",
+        @"fastForward",
+        @"rewind",
+        @"showPlayer",
+        @"separator",

         nil];
     
     // Get our preferred menu
         nil];
     
     // Get our preferred menu


@@ -480,17 +475,17 @@ static PreferencesController *prefs = nil;
     // Delete items in the availableItems array that are already part of the menu
     itemEnum = [myItems objectEnumerator];
     while ( (anItem = [itemEnum nextObject]) ) {
     // Delete items in the availableItems array that are already part of the menu
     itemEnum = [myItems objectEnumerator];
     while ( (anItem = [itemEnum nextObject]) ) {

-        if ( ! [anItem isEqualToString:@"<separator>"] ) {
+        if (![anItem isEqualToString:@"separator"]) {

             [availableItems removeObject:anItem];
         }
     }
     
     // Items that show should a submenu image
     submenuItems = [[NSArray alloc] initWithObjects:
             [availableItems removeObject:anItem];
         }
     }
     
     // Items that show should a submenu image
     submenuItems = [[NSArray alloc] initWithObjects:

-        @"Upcoming Songs",
-        @"Playlists",
-        @"EQ Presets",
-        @"Song Rating",
+        @"upcomingSongs",
+        @"playlists",
+        @"eqPresets",
+        @"songRating",

         nil];
 }
 
         nil];
 }
 


@@ -505,7 +500,7 @@ static PreferencesController *prefs = nil;
     [songsInAdvance setIntValue:[df integerForKey:@"SongsInAdvance"]];
     
     // Fill in hot key buttons
     [songsInAdvance setIntValue:[df integerForKey:@"SongsInAdvance"]];
     
     // Fill in hot key buttons

-    if ([df objectForKey:@"PlayPause"]){
+    if ([df objectForKey:@"PlayPause"]) {

         anItem = [df keyComboForKey:@"PlayPause"];
         [hotKeysDictionary setObject:anItem forKey:@"PlayPause"];
         [playPauseButton setTitle:[anItem userDisplayRep]];
         anItem = [df keyComboForKey:@"PlayPause"];
         [hotKeysDictionary setObject:anItem forKey:@"PlayPause"];
         [playPauseButton setTitle:[anItem userDisplayRep]];


@@ -529,12 +524,12 @@ static PreferencesController *prefs = nil;
         [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"PrevTrack"];
     }
     
         [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"PrevTrack"];
     }
     

-    if ([df objectForKey:@"ToggleVisualizer"]) {
-        anItem = [df keyComboForKey:@"ToggleVisualizer"];
-        [hotKeysDictionary setObject:anItem forKey:@"ToggleVisualizer"];
-        [visualizerButton setTitle:[anItem userDisplayRep]];
+    if ([df objectForKey:@"ShowPlayer"]) {
+        anItem = [df keyComboForKey:@"ShowPlayer"];
+        [hotKeysDictionary setObject:anItem forKey:@"ShowPlayer"];
+        [showPlayerButton setTitle:[anItem userDisplayRep]];

     } else {
     } else {

-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleVisualizer"];
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ShowPlayer"];

     }
     
     if ([df objectForKey:@"TrackInfo"]) {
     }
     
     if ([df objectForKey:@"TrackInfo"]) {


@@ -607,6 +602,7 @@ static PreferencesController *prefs = nil;
     [nameCheckbox setEnabled:NO];  // Song info will ALWAYS show song title.
     [artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState];
     [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState];
     [nameCheckbox setEnabled:NO];  // Song info will ALWAYS show song title.
     [artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState];
     [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState];

+    [trackNumberCheckbox setState:[df boolForKey:@"showTrackNumber"] ? NSOnState : NSOffState];

     
     // Set the launch at login checkbox state
     [df synchronize];
     
     // Set the launch at login checkbox state
     [df synchronize];


@@ -625,7 +621,6 @@ static PreferencesController *prefs = nil;
 {
     [df setObject:myItems forKey:@"menu"];
     [df synchronize];
 {
     [df setObject:myItems forKey:@"menu"];
     [df synchronize];

-    [controller rebuildMenu];

 }
 
 - (void)setLaunchesAtLogin:(BOOL)flag
 }
 
 - (void)setLaunchesAtLogin:(BOOL)flag


@@ -715,9 +710,9 @@ static PreferencesController *prefs = nil;
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
             NSString *object = [myItems objectAtIndex:rowIndex];
             if ([object isEqualToString:@"Show Player"]) {
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
             NSString *object = [myItems objectAtIndex:rowIndex];
             if ([object isEqualToString:@"Show Player"]) {

-                return [NSString stringWithFormat:@"Show %@", [[controller currentRemote] playerSimpleName]];
+                return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];

             }
             }

-            return object;
+            return NSLocalizedString(object, @"ERROR");

         } else {
             if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
             {
         } else {
             if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
             {


@@ -728,7 +723,7 @@ static PreferencesController *prefs = nil;
         }
     } else {
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
         }
     } else {
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {

-            return [availableItems objectAtIndex:rowIndex];
+            return NSLocalizedString([availableItems objectAtIndex:rowIndex], @"ERROR");

         } else {
             if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) {
                 return [NSImage imageNamed:@"submenu"];
         } else {
             if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) {
                 return [NSImage imageNamed:@"submenu"];


@@ -776,7 +771,7 @@ static PreferencesController *prefs = nil;
                 [myItems insertObject:temp atIndex:row];
             }
         } else {
                 [myItems insertObject:temp atIndex:row];
             }
         } else {

-            if (![temp isEqualToString:@"<separator>"]) {
+            if (![temp isEqualToString:@"separator"]) {

                 [availableItems addObject:temp];
             }
         }
                 [availableItems addObject:temp];
             }
         }


@@ -785,7 +780,7 @@ static PreferencesController *prefs = nil;
         dragRow = [dragData intValue];
         temp = [availableItems objectAtIndex:dragRow];
         
         dragRow = [dragData intValue];
         temp = [availableItems objectAtIndex:dragRow];
         

-        if (![temp isEqualToString:@"<separator>"]) {
+        if (![temp isEqualToString:@"separator"]) {

             [availableItems removeObjectAtIndex:dragRow];
         }
         [myItems insertObject:temp atIndex:row];
             [availableItems removeObjectAtIndex:dragRow];
         }
         [myItems insertObject:temp atIndex:row];


@@ -806,7 +801,7 @@ static PreferencesController *prefs = nil;
         
         if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) {
             NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]];
         
         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;
             }
         }
                 return NSDragOperationNone;
             }
         }