From 00c8e4e1afd60071081d745182aef2b8aa0cc79c Mon Sep 17 00:00:00 2001 From: dynaflash Date: Fri, 23 Feb 2007 19:38:09 +0000 Subject: [PATCH] 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 --- macosx/Controller.h | 3 ++ macosx/Controller.mm | 29 +++++++++++++++--- macosx/English.lproj/MainMenu.nib/info.nib | 5 ++- .../MainMenu.nib/keyedobjects.nib | Bin 94358 -> 94358 bytes 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/macosx/Controller.h b/macosx/Controller.h index 829b26c82..828f22619 100644 --- 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 d319ee585..21f25be4b 100644 --- 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 1783ad859..1b37e00d8 100644 --- a/macosx/English.lproj/MainMenu.nib/info.nib +++ b/macosx/English.lproj/MainMenu.nib/info.nib @@ -7,7 +7,7 @@ IBEditorPositions 1843 - 610 276 220 592 0 0 1440 878 + 341 286 220 592 0 0 1440 878 29 102 834 300 44 0 0 1440 878 @@ -19,9 +19,8 @@ IBOpenObjects - 1843 - 21 29 + 1843 IBSystem Version 8L127 diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib index c265c3b8de5442a72d9ccc2f2c1aa1acc722ea4a..adee5d9d349ea58fbea5a0c3509c6fc88c96b8a1 100644 GIT binary patch delta 15904 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 Dp(X#a -- 2.40.0