MacGui: Add Chapter Marker Preference

- add a preference to default chapter markers on/off
- currently default is off.

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

6 files changed, 23 insertions, 6 deletions

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 98254baad..acfb82f83 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1181,6 +1181,10 @@ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow
                 _( @"AVC/H.264 Video / AAC Audio" )];
 			/* We enable the create chapters checkbox here since we are .mp4 */	
 		    [fCreateChapterMarkers setEnabled: YES];
+			if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultChapterMarkers"] > 0)
+	        {
+		    [fCreateChapterMarkers setState: NSOnState];
+	        }
 			break;
         case 1: 
             ext = "avi";
diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 60d576b6b..fb50aa48f 100644
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -191,11 +191,12 @@
                 fDefAdvancedx264FlagsView = NSButton; 
                 fDefAudioSurround = NSButton; 
                 fDefAutoNaming = NSButton; 
+                fDefChapterMarkers = NSButton; 
                 fDefCrf = NSButton; 
                 fDefDeinterlace = NSButton; 
                 fDefPicSizeAutoSetipod = NSButton; 
                 fDefPixelRatio = NSButton; 
-                fDefPresetDrawerShow = id; 
+                fDefPresetDrawerShow = NSButton; 
                 fFileExtItunes = NSButton; 
                 fPanel = NSPanel; 
                 fUpdateCheck = NSButton; 
diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 3d6e506bf..ef6423db6 100644
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>31 44 630 601 0 0 1440 878 </string>
+	<string>-6 259 630 601 0 0 1440 878 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1843</key>
@@ -19,10 +19,7 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>1867</integer>
-		<integer>1843</integer>
-		<integer>21</integer>
-		<integer>29</integer>
+		<integer>1438</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8P2137</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 0f0ede5be..39671d2b7 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index 84ccd542e..2b0c0c13c 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -15,6 +15,7 @@
 	IBOutlet NSButton * fDefAudioSurround;
 	IBOutlet NSButton * fDefPresetDrawerShow;
 	IBOutlet NSButton * fDefAutoNaming;
+	IBOutlet NSButton * fDefChapterMarkers;
 
 	IBOutlet NSTextView * fDefAdvancedx264FlagsView;
 }
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 8d058750e..8f5dd61d8 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -35,6 +35,8 @@
 	appDefaults = [NSDictionary dictionaryWithObject:defDestDirectory forKey:@"LastDestinationDirectory"];
 	appDefaults = [NSDictionary dictionaryWithObject:@"NO"
                    forKey:@"DefaultAutoNaming"];
+	appDefaults = [NSDictionary dictionaryWithObject:@"NO"
+                   forKey:@"DefaultChapterMarkers"];
     [defaults registerDefaults: appDefaults];
 
 	/* fUpdateCheck Check or uncheck according to the preferences */
@@ -255,6 +257,9 @@
 	/* fDefAutoNaming Check or uncheck according to the preferences*/
     [fDefAutoNaming setState: [defaults boolForKey:@"DefaultAutoNaming"] ?
 		   NSOnState : NSOffState];
+	/* fDefChapterMarkers Check or uncheck according to the preferences*/
+    [fDefChapterMarkers setState: [defaults boolForKey:@"DefaultChapterMarkers"] ?
+		   NSOnState : NSOffState];
 }
 
 
@@ -381,6 +386,15 @@
     {
         [defaults setObject:@"NO" forKey:@"DefaultAutoNaming"];
     }
+	/* Chapter Markers */
+	if( [fDefChapterMarkers state] == NSOnState )
+    {
+        [defaults setObject:@"YES" forKey:@"DefaultChapterMarkers"];
+    }
+    else
+    {
+        [defaults setObject:@"NO" forKey:@"DefaultChapterMarkers"];
+    }
 
 }