Update iTunesRemote to match the new API. MainController and

[MenuTunes.git] / PreferencesController.m

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

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

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


@@ -85,6 +85,10 @@ static PreferencesController *prefs = nil;
         [self setupMenuItems];  // Setup the arrays of menu items
         [self setupUI]; // Sets up additional UI
         [window setDelegate:self];
         [self setupMenuItems];  // Setup the arrays of menu items
         [self setupUI]; // Sets up additional UI
         [window setDelegate:self];

+        [menuTableView reloadData];
+        
+        //Change the launch player checkbox to the proper name
+        [launchPlayerAtLaunchCheckbox setTitle:[NSString stringWithFormat:@"Launch %@ when MenuTunes launches", [[controller currentRemote] playerSimpleName]]]; //This isn't localized...

     }
     
     [window setLevel:NSStatusWindowLevel];
     }
     
     [window setLevel:NSStatusWindowLevel];


@@ -630,7 +634,7 @@ static PreferencesController *prefs = nil;
     if ( flag ) {
         NSMutableDictionary *loginwindow;
         NSMutableArray *loginarray;
     if ( flag ) {
         NSMutableDictionary *loginwindow;
         NSMutableArray *loginarray;

-        ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);;
+        ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);

         int i;
         BOOL skip = NO;
 
         int i;
         BOOL skip = NO;
 


@@ -764,6 +768,7 @@ static PreferencesController *prefs = nil;
         dragData = [pb stringForType:@"MenuTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [myItems objectAtIndex:dragRow];
         dragData = [pb stringForType:@"MenuTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [myItems objectAtIndex:dragRow];

+        

         if (tableView == menuTableView) {
             [myItems insertObject:temp atIndex:row];
             if (row > dragRow) {
         if (tableView == menuTableView) {
             [myItems insertObject:temp atIndex:row];
             if (row > dragRow) {


@@ -774,8 +779,8 @@ static PreferencesController *prefs = nil;
         } else {
             if (![temp isEqualToString:@"separator"]) {
                 [availableItems addObject:temp];
         } else {
             if (![temp isEqualToString:@"separator"]) {
                 [availableItems addObject:temp];

-                [myItems removeObjectAtIndex:dragRow];

             }
             }

+            [myItems removeObjectAtIndex:dragRow];

         }
     } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
         dragData = [pb stringForType:@"AllTableViewPboardType"];
         }
     } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
         dragData = [pb stringForType:@"AllTableViewPboardType"];