Fixed the toggle loop problem.

[MenuTunes.git] / PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index c8ac15b..327aa90 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -1,7 +1,7 @@
 #import "PreferencesController.h"
 #import "MainController.h"
 #import "StatusWindow.h"
-#import "MyTableView.h"
+#import "CustomMenuTableView.h"
 
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITKeyCombo.h>
@@ -429,12 +429,19 @@ static PreferencesController *prefs = nil;
         int selRow = [tableView selectedRow];
         if (selRow != - 1) {
             NSString *object = [myItems objectAtIndex:selRow];
+            
+            if ([object isEqualToString:@"preferences"]) {
+                NSBeep();
+                return;
+            }
+            
             if (![object isEqualToString:@"separator"])
                 [availableItems addObject:object];
             [myItems removeObjectAtIndex:selRow];
             [menuTableView reloadData];
             [allTableView reloadData];
         }
+        [self changeMenus:self];
     }
 }
 
@@ -751,14 +758,14 @@ static PreferencesController *prefs = nil;
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
 {
     if (aTableView == menuTableView) {
+        NSString *object = [myItems objectAtIndex:rowIndex];
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
-            NSString *object = [myItems objectAtIndex:rowIndex];
-            if ([object isEqualToString:@"Show Player"]) {
+            if ([object isEqualToString:@"showPlayer"]) {
                 return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
             }
             return NSLocalizedString(object, @"ERROR");
         } else {
-            if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
+            if ([submenuItems containsObject:object])
             {
                 return [NSImage imageNamed:@"submenu"];
             } else {
@@ -766,10 +773,14 @@ static PreferencesController *prefs = nil;
             }
         }
     } else {
+        NSString *object = [availableItems objectAtIndex:rowIndex];
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
-            return NSLocalizedString([availableItems objectAtIndex:rowIndex], @"ERROR");
+            if ([object isEqualToString:@"showPlayer"]) {
+                return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
+            }
+            return NSLocalizedString(object, @"ERROR");
         } else {
-            if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) {
+            if ([submenuItems containsObject:object]) {
                 return [NSImage imageNamed:@"submenu"];
             } else {
                 return nil;