MacGui: Prefs

- Implemented Preset name editing right in drawer
- Alphabetic preset name sorting is now case insensitive

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2_5.1@406 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 829b26c8295b0e1c8dc6f0b84f55d3d05405c0be..828f2261945af11865f57274adc600899373ed00 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -200,6 +200,7 @@
 
 - (void) savePreset;
 - (IBAction)addPreset:(id)sender;
+- (IBAction)insertPreset:(id)sender;
 - (IBAction)deletePreset:(id)sender;
 - (IBAction)tableViewSelected:(id)sender;
 // NSTableDataSource methods
@@ -212,5 +213,7 @@
         forTableColumn:(NSTableColumn *)aTableColumn
         row:(int)rowIndex;
 
+
+
 @end
 

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index d319ee5858841751905453670b25d5bdc8d0ec28..21f25be4b24d8e986b5be4f0bd1b553c36489e4b 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1434,7 +1434,7 @@ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow
     [UserPresets addObject:[self CreatePreset]];
        /* We Sort the Presets Alphabetically by name */
        NSSortDescriptor * lastNameDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"PresetName" 
-                                                    ascending:YES] autorelease];
+                                                    ascending:YES selector:@selector(caseInsensitiveCompare:)] autorelease];
        NSArray *sortDescriptors=[NSArray arrayWithObject:lastNameDescriptor];
        NSArray *sortedArray=[UserPresets sortedArrayUsingDescriptors:sortDescriptors];
        [UserPresets setArray:sortedArray];
@@ -1447,6 +1447,15 @@ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow
    /* We save all of the preset data here */
     [self savePreset];
 }
+
+- (IBAction)insertPreset:(id)sender
+{
+    int index = [tableView selectedRow];
+    [UserPresets insertObject:[self CreatePreset] atIndex:index];
+    [tableView reloadData];
+    [self savePreset];
+}
+
 - (NSDictionary *)CreatePreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
@@ -1573,6 +1582,8 @@ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow
        /*Subtitles*/
        [fSubPopUp selectItemWithTitle: [NSString stringWithFormat:[chosenPreset valueForKey:@"Subtitles"]]];
        
+       // Deselect the currently selected table //
+       //[tableView deselectRow:[tableView selectedRow]];
 }
 
 - (int)numberOfRowsInTableView:(NSTableView *)aTableView
@@ -1584,8 +1595,7 @@ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow
       objectValueForTableColumn:(NSTableColumn *)aTableColumn
       row:(int)rowIndex
 {
-    
-       //Lets sort UserPresets here if we can
+
        
        
        id theRecord, theValue;
@@ -1607,8 +1617,16 @@ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow
     theRecord = [UserPresets objectAtIndex:rowIndex];
     [theRecord setObject:anObject forKey:[aTableColumn identifier]];
     
-    // Don't forget to save the changes
-    //[self savePreset];
+               /* We Sort the Presets Alphabetically by name */
+       NSSortDescriptor * lastNameDescriptor=[[[NSSortDescriptor alloc] initWithKey:@"PresetName" 
+                                                    ascending:YES selector:@selector(caseInsensitiveCompare:)] autorelease];
+       NSArray *sortDescriptors=[NSArray arrayWithObject:lastNameDescriptor];
+       NSArray *sortedArray=[UserPresets sortedArrayUsingDescriptors:sortDescriptors];
+       [UserPresets setArray:sortedArray];
+       /* We Reload the New Table data for presets */
+    [tableView reloadData];
+   /* We save all of the preset data here */
+    [self savePreset];
 }
 
 
@@ -1619,6 +1637,7 @@ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow
 }
 
 
+
 - (void) controlTextDidBeginEditing: (NSNotification *) notification
 {
     [self CalculateBitrate: NULL];

diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 1783ad8596816ef78030cc195fd4a9d3051e73cb..1b37e00d8ef591147bfa531c59e20beb1683c90e 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -7,7 +7,7 @@
        <key>IBEditorPositions</key>
        <dict>
                <key>1843</key>
-               <string>610 276 220 592 0 0 1440 878 </string>
+               <string>341 286 220 592 0 0 1440 878 </string>
                <key>29</key>
                <string>102 834 300 44 0 0 1440 878 </string>
        </dict>
@@ -19,9 +19,8 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>1843</integer>
-               <integer>21</integer>
                <integer>29</integer>
+               <integer>1843</integer>
        </array>
        <key>IBSystem Version</key>
        <string>8L127</string>

diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index c265c3b8de5442a72d9ccc2f2c1aa1acc722ea4a..adee5d9d349ea58fbea5a0c3509c6fc88c96b8a1 100644 (file)
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ