MacGui: Add description field and tooltips for Presets

- Add description NSTextField to the Add New Preset Panel
- Added descriptions for the Built-In Presets (be sure to use "Update Built-In Presets" in the Presets menu to get descriptions)
- Added Tooltips to the presets drawer which shows the description of the preset.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@643 b64f7644-9d1e-0410-96f1-a4d463321fa5

5 files changed, 40 insertions, 4 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 35b67ec3b..695fa98f6 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -175,10 +175,11 @@
     IBOutlet NSPopUpButton       * fX264optAlphaDeblockPopUp;
     IBOutlet NSPopUpButton       * fX264optBetaDeblockPopUp;
     
-	/* User Preset variables here fPresetNewPicSettingsApply*/
+	/* User Preset variables here fPresetNewDesc*/
 	
 	IBOutlet NSDrawer            * fPresetDrawer;
 	IBOutlet NSTextField         * fPresetNewName;
+	IBOutlet NSTextField         * fPresetNewDesc;
 	IBOutlet NSPopUpButton       * fPresetNewPicSettingsPopUp;
 	IBOutlet NSTextField         * fPresetSelectedDisplay;
 	
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 42f4ea534..2f2d1dabf 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -2868,8 +2868,9 @@ the user is using "Custom" settings by determining the sender*/
 	[fPresetNewPicSettingsPopUp addItemWithTitle:@"Source Maximum (post source scan)"];
 	[fPresetNewPicSettingsPopUp selectItemAtIndex: 0];	
 	
-		/* Erase info from the input fields */
+		/* Erase info from the input fields fPresetNewDesc*/
 	[fPresetNewName setStringValue: @""];
+	[fPresetNewDesc setStringValue: @""];
 	/* Show the panel */
 	[NSApp beginSheet: fAddPresetPanel modalForWindow: fWindow
         modalDelegate: NULL didEndSelector: NULL contextInfo: NULL];
@@ -2892,6 +2893,7 @@ the user is using "Custom" settings by determining the sender*/
 	[UserPresets addObject:[self CreatePreset]];
 	/* Erase info from the input fields */
 	[fPresetNewName setStringValue: @""];
+	[fPresetNewDesc setStringValue: @""];
 	/* We stop the modal window for the new preset */
 	[NSApp stopModal];
     [self AddPreset];
@@ -2938,6 +2940,8 @@ the user is using "Custom" settings by determining the sender*/
 	[preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
 	/*Get the whether or not to apply pic settings in the AddPresetPanel*/
 	[preset setObject:[NSNumber numberWithInt:[fPresetNewPicSettingsPopUp indexOfSelectedItem]] forKey:@"UsesPictureSettings"];
+	/* Get New Preset Description from the field in the AddPresetPanel*/
+	[preset setObject:[fPresetNewDesc stringValue] forKey:@"PresetDescription"];
 	/* File Format */
     [preset setObject:[fDstFormatPopUp titleOfSelectedItem] forKey:@"FileFormat"];
 	/* Chapter Markers fCreateChapterMarkers*/
@@ -3006,6 +3010,8 @@ the user is using "Custom" settings by determining the sender*/
 	[preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
 	/*Get the whether or not to apply pic settings in the AddPresetPanel*/
 	[preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
+	/* Get the New Preset Description from the field in the AddPresetPanel */
+    [preset setObject:@"HandBrakes Built in Low Resolution Preset for the iPod - Optimized for great playback on the iPod screen with smaller file size" forKey:@"PresetDescription"];
 	/* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
 	/* Chapter Markers*/
@@ -3072,6 +3078,8 @@ the user is using "Custom" settings by determining the sender*/
 	[preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
 	/*Get the whether or not to apply pic settings in the AddPresetPanel*/
 	[preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
+	/* Get the New Preset Description from the field in the AddPresetPanel */
+    [preset setObject:@"HandBrakes Built in High Resolution Preset for the iPod - Best iPod video quality, great for viewing on a tv using your iPod" forKey:@"PresetDescription"];
 	/* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
 	/* Chapter Markers*/
@@ -3137,6 +3145,8 @@ the user is using "Custom" settings by determining the sender*/
 	[preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
 	/*Get the whether or not to apply pic settings in the AddPresetPanel*/
 	[preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"];
+	/* Get the New Preset Description from the field in the AddPresetPanel */
+    [preset setObject:@"HandBrakes Built in Preset for the AppleTV - Provides a good balance between quality, file size, and optimizes performance whether synching or streaming" forKey:@"PresetDescription"];
 	/* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
 	/* Chapter Markers*/
@@ -3207,6 +3217,8 @@ the user is using "Custom" settings by determining the sender*/
 	[preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
 	/*Get the whether or not to apply pic settings in the AddPresetPanel*/
 	[preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"];
+	/* Get the New Preset Description from the field in the AddPresetPanel */
+    [preset setObject:@"HandBrakes Built in Preset for the Sony PS3" forKey:@"PresetDescription"];
 	/* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
 	/* Chapter Markers*/
@@ -3273,6 +3285,8 @@ the user is using "Custom" settings by determining the sender*/
 	[preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
 	/*Get the whether or not to apply pic settings in the AddPresetPanel*/
 	[preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
+	/* Get the New Preset Description from the field in the AddPresetPanel */
+    [preset setObject:@"HandBrakes Built in Preset for the Sony PSP" forKey:@"PresetDescription"];
 	/* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
 	/* Chapter Markers*/
@@ -3494,6 +3508,26 @@ show the built in presets in a blue font. */
 	}
 
 }
+/* Method to display tooltip with the description for each preset, if available */
+- (NSString *)tableView:(NSTableView *)aTableView toolTipForCell:(NSCell *)aCell 
+                   rect:(NSRectPointer)aRect tableColumn:(NSTableColumn *)aTableColumn
+                    row:(int)rowIndex mouseLocation:(NSPoint)aPos
+{
+     /* initialize the tooltip contents variable */
+	 NSString *loc_tip;
+     /* if there is a description for the preset, we show it in the tooltip */
+	 if ([[UserPresets objectAtIndex:rowIndex] valueForKey:@"PresetDescription"])
+	 {
+	 loc_tip = [NSString stringWithFormat: @"%@",[[UserPresets objectAtIndex:rowIndex] valueForKey:@"PresetDescription"]];
+	 return (loc_tip);
+	 }
+	 else
+	 {
+	 loc_tip = @"No description available";
+	 }
+	 return (loc_tip);
+
+}
 
 - (id)tableView:(NSTableView *)aTableView
       objectValueForTableColumn:(NSTableColumn *)aTableColumn
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index ecc18c019..e0a6c8585 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -102,6 +102,7 @@
                 fPictureController = PictureController; 
                 fPicturePanel = NSPanel; 
                 fPresetDrawer = NSDrawer; 
+                fPresetNewDesc = NSTextField; 
                 fPresetNewName = NSTextField; 
                 fPresetNewPicSettingsPopUp = NSPopUpButton; 
                 fPresetSelectedDisplay = NSTextField; 
@@ -179,7 +180,6 @@
                 fX264optViewTitleLabel = NSTextField; 
                 fX264optWeightBLabel = NSTextField; 
                 fX264optWeightBSwitch = NSButton; 
-                myOutlet = id; 
                 tableView = NSTableView; 
             }; 
             SUPERCLASS = NSObject; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index b1714dc72..d207af74b 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -20,10 +20,11 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>1162</integer>
+		<integer>1867</integer>
 		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8P2137</string>
+	<string>8R2218</string>
 	<key>IBUserGuides</key>
 	<dict>
 		<key>21</key>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index cc8e15e18..708eaf536 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib