MacGui: Default Presets Initial Implementation

- Allows user to set a given preset as a default which will be used upon launch. As well, if user has not specified a preset as the default, HB will use the "HB - Normal" Built-in Preset at launch.
- Added the "Make Default" button at the bottom of the Presets Drawer.
- Default Preset is shown in Bold in the Presets Drawer
- Added a Select Default Preset command to the "Presets" Menu in the Menu Bar.
-- Note: the buttons and other display stuff is not set in stone, once again, initial function over form on intitial implementation.

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

1 files changed, 10 insertions, 3 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 685e37ecd..24a2011c4 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -185,7 +185,7 @@
     IBOutlet NSTextField         * fX264optCabacLabel;
     IBOutlet NSButton            * fX264optCabacSwitch;
     
-	/* User Preset variables here fPresetNewDesc*/
+	/* User Preset variables here */
 	
 	IBOutlet NSDrawer            * fPresetDrawer;
 	IBOutlet NSTextField         * fPresetNewName;
@@ -201,17 +201,22 @@
 	NSMutableArray               * UserPresetssortedArray;
 	NSMutableDictionary          * chosenPreset;
     int                            curUserPresetChosenNum;
-	
+	 
+	int                            presetHbDefault; // this is 1 in "Default" preset key
+	int                            presetUserDefault;// this is 2 in "Default" preset key
     IBOutlet NSPanel             * fAddPresetPanel;
 	IBOutlet NSTableView         * tableView;
 	IBOutlet NSButton            * fPresetsAdd;
 	IBOutlet NSButton            * fPresetsDelete;
+	IBOutlet NSButton            * fPresetMakeDefault;
+	
     hb_handle_t                  * fHandle;
 	hb_title_t                   * fTitle;
     /* integer to set to determine the previous state
 		of encode 0==idle, 1==encoding, 2==cancelled*/
     int                            fEncodeState;
 	int                            currentScanCount;
+	int                            currentSuccessfulScanCount;
 	NSString                      * currentSource;
 	HBOutputPanelController *outputPanel;
 	
@@ -304,7 +309,8 @@
 - (NSDictionary *)CreateiPhonePreset;
 - (IBAction) RevertPictureSizeToMax:(id)sender;
 
-
+- (IBAction)SetDefaultPreset:(id)sender;
+- (IBAction)SelectDefaultPreset:(id)sender;
 - (void) savePreset;
 - (IBAction)AddFactoryPresets:(id)sender;
 - (IBAction)DeleteFactoryPresets:(id)sender;
@@ -312,6 +318,7 @@
 - (void)AddPreset;
 - (IBAction)InsertPreset:(id)sender;
 - (IBAction)DeletePreset:(id)sender;
+- (IBAction)GetDefaultPresets:(id)sender;
 - (IBAction)tableViewSelected:(id)sender;
 // NSTableDataSource methods
 - (int)numberOfRowsInTableView:(NSTableView *)aTableView;