From: Kent Sutherland <ksuther@ithinksw.com>
Date: Sun, 13 Jul 2003 19:12:38 +0000 (+0000)
Subject: Made the scrollbars work in the menu prefs tab.
X-Git-Tag: v1.0~91
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/cb8ff99465a0d5d790ce221363bfd47de23d16d7

Made the scrollbars work in the menu prefs tab.
Made Launch iTunes at MenuTunes launch show the player name now.
Change something else, I don't remember what it was though. :(
---

diff --git a/English.lproj/Preferences.nib/classes.nib b/English.lproj/Preferences.nib/classes.nib
index 2f70038..46331a0 100755
--- a/English.lproj/Preferences.nib/classes.nib
+++ b/English.lproj/Preferences.nib/classes.nib
@@ -21,6 +21,7 @@
                 keyComboField = NSTextField; 
                 keyComboPanel = NSPanel; 
                 launchAtLoginCheckbox = NSButton; 
+                launchPlayerAtLaunchCheckbox = NSButton; 
                 menuTableView = NSTableView; 
                 nameCheckbox = NSButton; 
                 nextTrackButton = NSButton; 
diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib
index 8ed99ef..6f3aeef 100755
--- a/English.lproj/Preferences.nib/info.nib
+++ b/English.lproj/Preferences.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>5 3 356 240 0 0 1152 746 </string>
+	<string>4 45 356 240 0 0 1152 746 </string>
 	<key>IBFramework Version</key>
 	<string>291.0</string>
 	<key>IBGroupedObjects</key>
diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib
index 8464e8c..ec86e79 100755
Binary files a/English.lproj/Preferences.nib/keyedobjects.nib and b/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/PreferencesController.h b/PreferencesController.h
index 53c843d..98519f3 100755
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -24,6 +24,7 @@
     IBOutlet NSTextField *keyComboField;
     IBOutlet NSPanel *keyComboPanel;
     IBOutlet NSButton *launchAtLoginCheckbox;
+    IBOutlet NSButton *launchPlayerAtLaunchCheckbox;
     IBOutlet NSTableView *menuTableView;
     IBOutlet NSButton *nameCheckbox;
     IBOutlet NSButton *nextTrackButton;
diff --git a/PreferencesController.m b/PreferencesController.m
index ea1831f..a7c909e 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -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];
+        [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];
@@ -764,6 +768,7 @@ static PreferencesController *prefs = nil;
         dragData = [pb stringForType:@"MenuTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [myItems objectAtIndex: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];
-                [myItems removeObjectAtIndex:dragRow];
             }
+            [myItems removeObjectAtIndex:dragRow];
         }
     } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
         dragData = [pb stringForType:@"AllTableViewPboardType"];