More changes, bug fixes.

[MenuTunes.git] / PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index 0e8c372..89a0268 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -1,10 +1,10 @@
 #import "PreferencesController.h"
-#import "MenuTunes.h"
+#import "MainController.h"
 #import "HotKeyCenter.h"
 
 @implementation PreferencesController
 
-- (id)initWithMenuTunes:(MenuTunes *)tunes;
+- (id)initWithMenuTunes:(MainController *)tunes;
 {
     if ( (self = [super init]) ) {
         int i;
@@ -12,15 +12,9 @@
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         
         mt = [tunes retain];
-        [mt registerDefaultsIfNeeded];
+        [mt registerDefaults];
         
-        //Load the nib
-        [NSBundle loadNibNamed:@"Preferences" owner:self];
-        
-        //Show our window
-        [window setLevel:NSStatusWindowLevel];
-        [window center];
-        [window makeKeyAndOrderFront:nil];
+        [NSBundle loadNibNamed:@"Preferences" owner:self]; //Load the nib
         
         //Set the table view cells up
         [imgCell setImageScaling:NSScaleNone];
@@ -32,7 +26,7 @@
         [allTableView registerForDraggedTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", @"AllTableViewPboardType", nil]];
         
         //Set the list of items you can have.
-        availableItems = [[NSMutableArray alloc] initWithObjects:@"Current Track Info",  @"Upcoming Songs", @"Playlists", @"EQ Presets", @"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"<separator>", nil];
+        availableItems = [[NSMutableArray alloc] initWithObjects:@"Current Track Info",  @"Upcoming Songs", @"Playlists", @"EQ Presets", @"Song Rating", @"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"<separator>", nil];
         
         //Get our preferred menu
         myItems = [[[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"] mutableCopy];
@@ -47,7 +41,7 @@
         }
         
         //Items that show should a submenu image
-        submenuItems = [[NSArray alloc] initWithObjects:@"Upcoming Songs", @"Playlists", @"EQ Presets", nil];
+        submenuItems = [[NSArray alloc] initWithObjects:@"Upcoming Songs", @"Playlists", @"EQ Presets", @"Song Rating", nil];
         
         //Fill in the number of songs in advance to show field
         [songsInAdvance setIntValue:[defaults integerForKey:@"SongsInAdvance"]];
@@ -111,6 +105,12 @@
                 }
             }
         }
+        
+        //Show our window
+        [window setLevel:NSStatusWindowLevel];
+        [window center];
+        [window makeKeyAndOrderFront:nil];
+        [window setDelegate:self];
     }
     return self;
 }
@@ -209,7 +209,7 @@
         [defaults setInteger:5 forKey:@"SongsInAdvance"];
     }
     
-    {
+    /*{
         NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
         int i;
         
@@ -219,7 +219,7 @@
                 [mt rebuildMenu];
             }
         }
-    }
+    }*/
     [mt clearHotKeys];
 }
 
@@ -391,6 +391,14 @@
     [keyComboField setStringValue:string];
 }
 
+//
+//
+
+- (void)windowWillClose:(NSNotification *)note
+{
+    [mt closePreferences];
+}
+
 //
 //
 // Table View Datasource Methods