Lots of rewritten code. Not yet working because the status item doesn't

[MenuTunes.git] / PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index 0df78f7..82b7f82 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -12,16 +12,11 @@
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         
         mt = [tunes retain];
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
         
         mt = [tunes retain];

-        [mt registerDefaultsIfNeeded];
-
+        [mt registerDefaults];
+        

         //Load the nib
         [NSBundle loadNibNamed:@"Preferences" owner:self];
         
         //Load the nib
         [NSBundle loadNibNamed:@"Preferences" owner:self];
         

-        //Show our window
-        [window setLevel:NSStatusWindowLevel];
-        [window center];
-        [window makeKeyAndOrderFront:nil];
-        

         //Set the table view cells up
         [imgCell setImageScaling:NSScaleNone];
         [[menuTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];
         //Set the table view cells up
         [imgCell setImageScaling:NSScaleNone];
         [[menuTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];


@@ -111,6 +106,12 @@
                 }
             }
         }
                 }
             }
         }

+        
+        //Show our window
+        [window setLevel:NSStatusWindowLevel];
+        [window center];
+        [window makeKeyAndOrderFront:nil];
+        [window setDelegate:self];

     }
     return self;
 }
     }
     return self;
 }


@@ -209,7 +210,7 @@
         [defaults setInteger:5 forKey:@"SongsInAdvance"];
     }
     
         [defaults setInteger:5 forKey:@"SongsInAdvance"];
     }
     

-    {
+    /*{

         NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
         int i;
         
         NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
         int i;
         


@@ -219,7 +220,7 @@
                 [mt rebuildMenu];
             }
         }
                 [mt rebuildMenu];
             }
         }

-    }
+    }*/

     [mt clearHotKeys];
 }
 
     [mt clearHotKeys];
 }
 


@@ -391,6 +392,14 @@
     [keyComboField setStringValue:string];
 }
 
     [keyComboField setStringValue:string];
 }
 

+//
+//
+
+- (void)windowWillClose:(NSNotification *)note
+{
+    [mt closePreferences];
+}
+

 //
 //
 // Table View Datasource Methods
 //
 //
 // Table View Datasource Methods