MacGui: In Preferences, Instead of the old "Use iTunes / iPod friendly file extension...

- Auto (Default): will use .mp4 unless any of the conditions are met for Apple devices to use .m4v such as AC3 audio or chapters, etc.
- .m4v: will set the extension to .m4v regardless of settings.
- .mp4: will set the extension to .mp4 regardless of settings.
Basically anything other than Auto forces either the .m4v or .mp4 file extension. Again "Auto" is default.
Note: This deprecates the old preferences plist key "DefaultMpegName" which was just a bool and adds "DefaultMpegExtension" which is a string. As a result users that had the old "Use iPod/iTunes friendly (.m4v) file extension for MP4" checkbox checked will need to select ".m4v" in the new preferences dialogue.

git-svn-id: svn://localhost/HandBrake/trunk@3758 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.m b/macosx/Controller.m
index aa0299b..a744ad2 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -4484,15 +4484,7 @@ bool one_burned = FALSE;
     switch( format )
     {
         case 0:
-                       /*Get Default MP4 File Extension*/
-                       if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultMpegName"] > 0)
-                       {
-                               ext = "m4v";
-                       }
-                       else
-                       {
-                               ext = "mp4";
-                       }
+                       [self autoSetM4vExtension: nil];
             /* Add additional video encoders here */
             menuItem = [[fVidEncoderPopUp menu] addItemWithTitle:@"H.264 (x264)" action: NULL keyEquivalent: @""];
             [menuItem setTag: HB_VCODEC_X264];
@@ -4570,22 +4562,23 @@ bool one_burned = FALSE;
 {
     if ( [fDstFormatPopUp indexOfSelectedItem] )
         return;
-
+    
     NSString * extension = @"mp4";
-
+    
        BOOL anyCodecAC3 = [fAudioDelegate anyCodecMatches: HB_ACODEC_AC3] || [fAudioDelegate anyCodecMatches: HB_ACODEC_AC3_PASS];
-       if (YES == anyCodecAC3 ||
-                                                        [fCreateChapterMarkers state] == NSOnState ||
-                                                        [[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultMpegName"] > 0 )
+       
+    if ([[[NSUserDefaults standardUserDefaults] objectForKey:@"DefaultMpegExtension"] isEqualToString: @".m4v"] || 
+        ((YES == anyCodecAC3 || [fCreateChapterMarkers state] == NSOnState) && 
+         [[[NSUserDefaults standardUserDefaults] objectForKey:@"DefaultMpegExtension"] isEqualToString: @"Auto"] ))
     {
         extension = @"m4v";
     }
-
+    
     if( [extension isEqualTo: [[fDstFile2Field stringValue] pathExtension]] )
         return;
     else
         [fDstFile2Field setStringValue: [NSString stringWithFormat:@"%@.%@",
-                                    [[fDstFile2Field stringValue] stringByDeletingPathExtension], extension]];
+                                         [[fDstFile2Field stringValue] stringByDeletingPathExtension], extension]];
 }
 
 /* Method to determine if we should change the UI

diff --git a/macosx/English.lproj/Preferences.xib b/macosx/English.lproj/Preferences.xib
index 2f877b5..4065216 100644 (file)
--- a/macosx/English.lproj/Preferences.xib
+++ b/macosx/English.lproj/Preferences.xib
@@ -2,17 +2,17 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
        <data>
                <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">10F569</string>
-               <string key="IBDocument.InterfaceBuilderVersion">788</string>
-               <string key="IBDocument.AppKitVersion">1038.29</string>
-               <string key="IBDocument.HIToolboxVersion">461.00</string>
+               <string key="IBDocument.SystemVersion">10J567</string>
+               <string key="IBDocument.InterfaceBuilderVersion">732</string>
+               <string key="IBDocument.AppKitVersion">1038.35</string>
+               <string key="IBDocument.HIToolboxVersion">462.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       <string key="NS.object.0">788</string>
+                       <string key="NS.object.0">732</string>
                </object>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="236"/>
+                       <integer value="233"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -62,7 +62,7 @@
                        <object class="NSUserDefaultsController" id="580534391">
                                <object class="NSMutableArray" key="NSDeclaredKeys">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <string>MinTitleScanSeconds</string>
+                                       <string>DefaultMpegExtension</string>
                                </object>
                                <bool key="NSSharedInstance">YES</bool>
                        </object>
@@ -76,7 +76,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{123, 90}, {313, 18}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="878201725">
                                                        <int key="NSCellFlags">-2080244224</int>
@@ -108,13 +107,12 @@
                                                <int key="NSvFlags">268</int>
                                                <string key="NSFrame">{{345, 71}, {96, 16}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="725806271">
                                                        <int key="NSCellFlags">67239424</int>
                                                        <int key="NSCellFlags2">134479872</int>
                                                        <string key="NSContents">Browse ...</string>
-                                                       <object class="NSFont" key="NSSupport">
+                                                       <object class="NSFont" key="NSSupport" id="22">
                                                                <string key="NSName">LucidaGrande</string>
                                                                <double key="NSSize">9</double>
                                                                <int key="NSfFlags">3614</int>
@@ -133,7 +131,6 @@
                                                <int key="NSvFlags">268</int>
                                                <string key="NSFrame">{{209, 73}, {125, 14}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="456853603">
                                                        <int key="NSCellFlags">68288064</int>
@@ -161,34 +158,11 @@
                                                        </object>
                                                </object>
                                        </object>
-                                       <object class="NSButton" id="906899216">
-                                               <reference key="NSNextResponder" ref="1048779201"/>
-                                               <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{125, 18}, {311, 18}}</string>
-                                               <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
-                                               <bool key="NSEnabled">YES</bool>
-                                               <object class="NSButtonCell" key="NSCell" id="36851657">
-                                                       <int key="NSCellFlags">67239424</int>
-                                                       <int key="NSCellFlags2">131072</int>
-                                                       <string key="NSContents">Use iPod/iTunes friendly (.m4v) file extension for MP4</string>
-                                                       <reference key="NSSupport" ref="26"/>
-                                                       <reference key="NSControlView" ref="906899216"/>
-                                                       <int key="NSButtonFlags">1211912703</int>
-                                                       <int key="NSButtonFlags2">2</int>
-                                                       <reference key="NSAlternateImage" ref="1056213191"/>
-                                                       <string key="NSAlternateContents"/>
-                                                       <string key="NSKeyEquivalent"/>
-                                                       <int key="NSPeriodicDelay">200</int>
-                                                       <int key="NSPeriodicInterval">25</int>
-                                               </object>
-                                       </object>
                                        <object class="NSButton" id="636306431">
                                                <reference key="NSNextResponder" ref="1048779201"/>
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{123, 220}, {133, 18}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="448858755">
                                                        <int key="NSCellFlags">67239424</int>
@@ -210,7 +184,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{125, 38}, {303, 18}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="419322096">
                                                        <int key="NSCellFlags">67239424</int>
@@ -232,7 +205,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{52, 117}, {69, 14}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="718672066">
                                                        <int key="NSCellFlags">67239424</int>
@@ -249,7 +221,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{123, 175}, {194, 18}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="824062726">
                                                        <int key="NSCellFlags">67239424</int>
@@ -271,7 +242,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{123, 71}, {86, 18}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="437495050">
                                                        <int key="NSCellFlags">67239424</int>
@@ -294,7 +264,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{62, 222}, {59, 14}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="404194395">
                                                        <int key="NSCellFlags">67239424</int>
@@ -306,12 +275,27 @@
                                                        <reference key="NSTextColor" ref="887152126"/>
                                                </object>
                                        </object>
+                                       <object class="NSTextField" id="854927877">
+                                               <reference key="NSNextResponder" ref="1048779201"/>
+                                               <int key="NSvFlags">256</int>
+                                               <string key="NSFrame">{{125, 20}, {134, 14}}</string>
+                                               <reference key="NSSuperview" ref="1048779201"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSTextFieldCell" key="NSCell" id="177949206">
+                                                       <int key="NSCellFlags">67239424</int>
+                                                       <int key="NSCellFlags2">71434240</int>
+                                                       <string key="NSContents">Default MP4 Extension:</string>
+                                                       <reference key="NSSupport" ref="26"/>
+                                                       <reference key="NSControlView" ref="854927877"/>
+                                                       <reference key="NSBackgroundColor" ref="525377782"/>
+                                                       <reference key="NSTextColor" ref="887152126"/>
+                                               </object>
+                                       </object>
                                        <object class="NSTextField" id="280291731">
                                                <reference key="NSNextResponder" ref="1048779201"/>
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{141, 199}, {95, 14}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="1049782015">
                                                        <int key="NSCellFlags">67239424</int>
@@ -328,7 +312,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{52, 40}, {71, 14}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="947435557">
                                                        <int key="NSCellFlags">67239424</int>
@@ -343,20 +326,19 @@
                                        <object class="NSPopUpButton" id="317169558">
                                                <reference key="NSNextResponder" ref="1048779201"/>
                                                <int key="NSvFlags">256</int>
-                                               <string key="NSFrame">{{123, 110}, {189, 22}}</string>
+                                               <string key="NSFrame">{{263, 19}, {66, 15}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSPopUpButtonCell" key="NSCell" id="792374025">
                                                        <int key="NSCellFlags">71433792</int>
-                                                       <int key="NSCellFlags2">133120</int>
-                                                       <reference key="NSSupport" ref="26"/>
+                                                       <int key="NSCellFlags2">264192</int>
+                                                       <reference key="NSSupport" ref="22"/>
                                                        <reference key="NSControlView" ref="317169558"/>
                                                        <int key="NSButtonFlags">109199615</int>
                                                        <int key="NSButtonFlags2">1</int>
-                                                       <object class="NSFont" key="NSAlternateImage" id="44722471">
+                                                       <object class="NSFont" key="NSAlternateImage">
                                                                <string key="NSName">LucidaGrande</string>
-                                                               <double key="NSSize">11</double>
+                                                               <double key="NSSize">9</double>
                                                                <int key="NSfFlags">16</int>
                                                        </object>
                                                        <string key="NSAlternateContents"/>
@@ -365,18 +347,18 @@
                                                        </object>
                                                        <int key="NSPeriodicDelay">400</int>
                                                        <int key="NSPeriodicInterval">75</int>
-                                                       <object class="NSMenuItem" key="NSMenuItem" id="40171696">
+                                                       <object class="NSMenuItem" key="NSMenuItem" id="197120751">
                                                                <reference key="NSMenu" ref="783755954"/>
-                                                               <string key="NSTitle">Alert Window</string>
+                                                               <string key="NSTitle">Auto</string>
                                                                <string key="NSKeyEquiv"/>
                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                <int key="NSState">1</int>
-                                                               <object class="NSCustomResource" key="NSOnImage" id="201515479">
+                                                               <object class="NSCustomResource" key="NSOnImage" id="47022448">
                                                                        <string key="NSClassName">NSImage</string>
                                                                        <string key="NSResourceName">NSMenuCheckmark</string>
                                                                </object>
-                                                               <object class="NSCustomResource" key="NSMixedImage" id="944085027">
+                                                               <object class="NSCustomResource" key="NSMixedImage" id="78651607">
                                                                        <string key="NSClassName">NSImage</string>
                                                                        <string key="NSResourceName">NSMenuMixedState</string>
                                                                </object>
@@ -390,65 +372,31 @@
                                                                </object>
                                                                <object class="NSMutableArray" key="NSMenuItems">
                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                       <object class="NSMenuItem" id="197120751">
-                                                                               <reference key="NSMenu" ref="783755954"/>
-                                                                               <string key="NSTitle">Do Nothing</string>
-                                                                               <string key="NSKeyEquiv"/>
-                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
-                                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                                               <reference key="NSTarget" ref="792374025"/>
-                                                                       </object>
-                                                                       <reference ref="40171696"/>
-                                                                       <object class="NSMenuItem" id="725464990">
+                                                                       <reference ref="197120751"/>
+                                                                       <object class="NSMenuItem" id="701819170">
                                                                                <reference key="NSMenu" ref="783755954"/>
-                                                                               <string key="NSTitle">Growl Notification</string>
+                                                                               <string key="NSTitle">.m4v</string>
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="792374025"/>
                                                                        </object>
-                                                                       <object class="NSMenuItem" id="564582398">
+                                                                       <object class="NSMenuItem" id="796707391">
                                                                                <reference key="NSMenu" ref="783755954"/>
-                                                                               <string key="NSTitle">Alert Window And Growl</string>
+                                                                               <string key="NSTitle">.mp4</string>
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
-                                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                                               <reference key="NSTarget" ref="792374025"/>
-                                                                       </object>
-                                                                       <object class="NSMenuItem" id="698601725">
-                                                                               <reference key="NSMenu" ref="783755954"/>
-                                                                               <string key="NSTitle">Put Computer To Sleep</string>
-                                                                               <string key="NSKeyEquiv"/>
-                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
-                                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                                               <reference key="NSTarget" ref="792374025"/>
-                                                                       </object>
-                                                                       <object class="NSMenuItem" id="449823126">
-                                                                               <reference key="NSMenu" ref="783755954"/>
-                                                                               <string key="NSTitle">Shut Down Computer</string>
-                                                                               <string key="NSKeyEquiv"/>
-                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="792374025"/>
                                                                        </object>
                                                                </object>
                                                        </object>
-                                                       <int key="NSSelectedIndex">1</int>
                                                        <int key="NSPreferredEdge">3</int>
                                                        <bool key="NSUsesItemFromMenu">YES</bool>
                                                        <bool key="NSAltersState">YES</bool>
@@ -460,7 +408,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{141, 148}, {102, 22}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSPopUpButtonCell" key="NSCell" id="841218599">
                                                        <int key="NSCellFlags">71433792</int>
@@ -469,7 +416,11 @@
                                                        <reference key="NSControlView" ref="954667708"/>
                                                        <int key="NSButtonFlags">109199615</int>
                                                        <int key="NSButtonFlags2">1</int>
-                                                       <reference key="NSAlternateImage" ref="44722471"/>
+                                                       <object class="NSFont" key="NSAlternateImage" id="44722471">
+                                                               <string key="NSName">LucidaGrande</string>
+                                                               <double key="NSSize">11</double>
+                                                               <int key="NSfFlags">16</int>
+                                                       </object>
                                                        <string key="NSAlternateContents"/>
                                                        <object class="NSMutableString" key="NSKeyEquivalent">
                                                                <characters key="NS.bytes"/>
@@ -483,8 +434,8 @@
                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                <int key="NSState">1</int>
-                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                <int key="NSTag">604800</int>
                                                                <reference key="NSTarget" ref="841218599"/>
@@ -502,8 +453,8 @@
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <int key="NSTag">86400</int>
                                                                                <reference key="NSTarget" ref="841218599"/>
@@ -515,8 +466,8 @@
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <int key="NSTag">2629800</int>
                                                                                <reference key="NSTarget" ref="841218599"/>
@@ -535,7 +486,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{238, 194}, {205, 22}}</string>
                                                <reference key="NSSuperview" ref="1048779201"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSPopUpButtonCell" key="NSCell" id="310956178">
                                                        <int key="NSCellFlags">71433792</int>
@@ -558,8 +508,8 @@
                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                <int key="NSState">1</int>
-                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                <reference key="NSTarget" ref="310956178"/>
                                                        </object>
@@ -576,8 +526,8 @@
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="310956178"/>
                                                                        </object>
@@ -588,8 +538,8 @@
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="310956178"/>
                                                                        </object>
@@ -605,12 +555,11 @@
                                </object>
                                <string key="NSFrameSize">{460, 256}</string>
                                <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <string key="NSClassName">NSView</string>
                                <string key="NSExtension">NSControl</string>
                        </object>
                        <object class="NSCustomView" id="520288288">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -619,7 +568,6 @@
                                                <int key="NSvFlags">268</int>
                                                <string key="NSFrame">{{34, 42}, {432, 17}}</string>
                                                <reference key="NSSuperview" ref="520288288"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="374363387">
                                                        <int key="NSCellFlags">67239488</int>
@@ -637,13 +585,11 @@
                                        </object>
                                </object>
                                <string key="NSFrameSize">{496, 82}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <string key="NSClassName">NSView</string>
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSCustomView" id="332598366">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -652,7 +598,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{30, 56}, {96, 14}}</string>
                                                <reference key="NSSuperview" ref="332598366"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="459708758">
                                                        <int key="NSCellFlags">67239424</int>
@@ -669,7 +614,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{95, 22}, {31, 14}}</string>
                                                <reference key="NSSuperview" ref="332598366"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSTextFieldCell" key="NSCell" id="954547948">
                                                        <int key="NSCellFlags">67239424</int>
@@ -686,7 +630,6 @@
                                                <int key="NSvFlags">256</int>
                                                <string key="NSFrame">{{131, 50}, {247, 22}}</string>
                                                <reference key="NSSuperview" ref="332598366"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSComboBoxCell" key="NSCell" id="210320026">
                                                        <int key="NSCellFlags">343014976</int>
@@ -957,7 +900,6 @@
                                                <int key="NSvFlags">-2147483392</int>
                                                <string key="NSFrame">{{18, -4}, {472, 18}}</string>
                                                <reference key="NSSuperview" ref="332598366"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="686321393">
                                                        <int key="NSCellFlags">604110336</int>
@@ -979,7 +921,6 @@
                                                <int key="NSvFlags">268</int>
                                                <string key="NSFrame">{{128, 20}, {333, 18}}</string>
                                                <reference key="NSSuperview" ref="332598366"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="787274685">
                                                        <int key="NSCellFlags">-2080244224</int>
@@ -999,15 +940,13 @@
                                        </object>
                                </object>
                                <string key="NSFrameSize">{492, 91}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <object class="NSMutableString" key="NSClassName">
                                        <characters key="NS.bytes">NSView</characters>
                                </object>
                                <string key="NSExtension">NSResponder</string>
                        </object>
                        <object class="NSCustomView" id="23728330">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <object class="NSMutableArray" key="NSSubviews">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -1216,8 +1155,8 @@
                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                <int key="NSState">1</int>
-                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                <reference key="NSTarget" ref="413609467"/>
                                                        </object>
@@ -1233,8 +1172,8 @@
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="413609467"/>
                                                                        </object>
@@ -1244,8 +1183,8 @@
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="413609467"/>
                                                                        </object>
@@ -1254,8 +1193,8 @@
                                                                                <string key="NSTitle">25</string>
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="413609467"/>
                                                                        </object>
@@ -1264,8 +1203,8 @@
                                                                                <string key="NSTitle">30</string>
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="413609467"/>
                                                                        </object>
@@ -1300,8 +1239,8 @@
                                                                <string key="NSKeyEquiv"/>
                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                <int key="NSState">1</int>
-                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                <reference key="NSTarget" ref="434430620"/>
                                                        </object>
@@ -1316,8 +1255,8 @@
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="434430620"/>
                                                                        </object>
@@ -1327,8 +1266,8 @@
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="434430620"/>
                                                                        </object>
@@ -1338,8 +1277,8 @@
                                                                                <string key="NSTitle">0.20</string>
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="434430620"/>
                                                                        </object>
@@ -1376,8 +1315,8 @@
                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                <int key="NSState">1</int>
-                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                <reference key="NSTarget" ref="290473288"/>
                                                        </object>
@@ -1392,8 +1331,8 @@
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="290473288"/>
                                                                        </object>
@@ -1404,8 +1343,8 @@
                                                                                <string key="NSKeyEquiv"/>
                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                               <reference key="NSOnImage" ref="201515479"/>
-                                                                               <reference key="NSMixedImage" ref="944085027"/>
+                                                                               <reference key="NSOnImage" ref="47022448"/>
+                                                                               <reference key="NSMixedImage" ref="78651607"/>
                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                <reference key="NSTarget" ref="290473288"/>
                                                                        </object>
@@ -1436,7 +1375,6 @@
                                        </object>
                                </object>
                                <string key="NSFrameSize">{495, 241}</string>
-                               <reference key="NSSuperview"/>
                                <object class="NSMutableString" key="NSClassName">
                                        <characters key="NS.bytes">NSView</characters>
                                </object>
@@ -1531,22 +1469,6 @@
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBBindingConnection" key="connection">
-                                               <string key="label">value: values.DefaultMpegName</string>
-                                               <reference key="source" ref="906899216"/>
-                                               <reference key="destination" ref="580534391"/>
-                                               <object class="NSNibBindingConnector" key="connector">
-                                                       <reference key="NSSource" ref="906899216"/>
-                                                       <reference key="NSDestination" ref="580534391"/>
-                                                       <string key="NSLabel">value: values.DefaultMpegName</string>
-                                                       <string key="NSBinding">value</string>
-                                                       <string key="NSKeyPath">values.DefaultMpegName</string>
-                                                       <int key="NSNibBindingConnectorVersion">2</int>
-                                               </object>
-                                       </object>
-                                       <int key="connectionID">264</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBBindingConnection" key="connection">
                                                <string key="label">value: values.sendToMetaX</string>
                                                <reference key="source" ref="597305137"/>
                                                <reference key="destination" ref="580534391"/>
@@ -1595,22 +1517,6 @@
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBBindingConnection" key="connection">
-                                               <string key="label">selectedValue: values.AlertWhenDone</string>
-                                               <reference key="source" ref="317169558"/>
-                                               <reference key="destination" ref="580534391"/>
-                                               <object class="NSNibBindingConnector" key="connector">
-                                                       <reference key="NSSource" ref="317169558"/>
-                                                       <reference key="NSDestination" ref="580534391"/>
-                                                       <string key="NSLabel">selectedValue: values.AlertWhenDone</string>
-                                                       <string key="NSBinding">selectedValue</string>
-                                                       <string key="NSKeyPath">values.AlertWhenDone</string>
-                                                       <int key="NSNibBindingConnectorVersion">2</int>
-                                               </object>
-                                       </object>
-                                       <int key="connectionID">298</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBBindingConnection" key="connection">
                                                <string key="label">value: values.EncodeLogLocation</string>
                                                <reference key="source" ref="907177043"/>
                                                <reference key="destination" ref="580534391"/>
@@ -1865,6 +1771,22 @@
                                        </object>
                                        <int key="connectionID">483</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBBindingConnection" key="connection">
+                                               <string key="label">selectedValue: values.DefaultMpegExtension</string>
+                                               <reference key="source" ref="317169558"/>
+                                               <reference key="destination" ref="580534391"/>
+                                               <object class="NSNibBindingConnector" key="connector">
+                                                       <reference key="NSSource" ref="317169558"/>
+                                                       <reference key="NSDestination" ref="580534391"/>
+                                                       <string key="NSLabel">selectedValue: values.DefaultMpegExtension</string>
+                                                       <string key="NSBinding">selectedValue</string>
+                                                       <string key="NSKeyPath">values.DefaultMpegExtension</string>
+                                                       <int key="NSNibBindingConnectorVersion">2</int>
+                                               </object>
+                                       </object>
+                                       <int key="connectionID">490</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -1919,7 +1841,6 @@
                                                        <reference ref="597305137"/>
                                                        <reference ref="576686737"/>
                                                        <reference ref="280291731"/>
-                                                       <reference ref="317169558"/>
                                                        <reference ref="954667708"/>
                                                        <reference ref="54712339"/>
                                                        <reference ref="842132572"/>
@@ -1927,21 +1848,13 @@
                                                        <reference ref="1009109497"/>
                                                        <reference ref="713240777"/>
                                                        <reference ref="965044526"/>
-                                                       <reference ref="906899216"/>
+                                                       <reference ref="854927877"/>
+                                                       <reference ref="317169558"/>
                                                </object>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">General</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">237</int>
-                                               <reference key="object" ref="906899216"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="36851657"/>
-                                               </object>
-                                               <reference key="parent" ref="1048779201"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
                                                <int key="objectID">238</int>
                                                <reference key="object" ref="636306431"/>
                                                <object class="NSMutableArray" key="children">
@@ -2088,11 +2001,6 @@
                                                <string key="objectName">Advanced</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">300</int>
-                                               <reference key="object" ref="36851657"/>
-                                               <reference key="parent" ref="906899216"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
                                                <int key="objectID">301</int>
                                                <reference key="object" ref="448858755"/>
                                                <reference key="parent" ref="636306431"/>
@@ -2156,46 +2064,18 @@
                                                <reference key="object" ref="783755954"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="698601725"/>
-                                                       <reference ref="449823126"/>
-                                                       <reference ref="564582398"/>
-                                                       <reference ref="40171696"/>
                                                        <reference ref="197120751"/>
-                                                       <reference ref="725464990"/>
+                                                       <reference ref="701819170"/>
+                                                       <reference ref="796707391"/>
                                                </object>
                                                <reference key="parent" ref="792374025"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">296</int>
-                                               <reference key="object" ref="698601725"/>
-                                               <reference key="parent" ref="783755954"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">295</int>
-                                               <reference key="object" ref="449823126"/>
-                                               <reference key="parent" ref="783755954"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">294</int>
-                                               <reference key="object" ref="564582398"/>
-                                               <reference key="parent" ref="783755954"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">293</int>
-                                               <reference key="object" ref="40171696"/>
-                                               <reference key="parent" ref="783755954"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
                                                <int key="objectID">292</int>
                                                <reference key="object" ref="197120751"/>
                                                <reference key="parent" ref="783755954"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">291</int>
-                                               <reference key="object" ref="725464990"/>
-                                               <reference key="parent" ref="783755954"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
                                                <int key="objectID">-3</int>
                                                <reference key="object" ref="559784606"/>
                                                <reference key="parent" ref="0"/>
@@ -2697,6 +2577,30 @@
                                                <reference key="object" ref="607341761"/>
                                                <reference key="parent" ref="62457548"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">484</int>
+                                               <reference key="object" ref="701819170"/>
+                                               <reference key="parent" ref="783755954"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">485</int>
+                                               <reference key="object" ref="796707391"/>
+                                               <reference key="parent" ref="783755954"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">486</int>
+                                               <reference key="object" ref="854927877"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="177949206"/>
+                                               </object>
+                                               <reference key="parent" ref="1048779201"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">487</int>
+                                               <reference key="object" ref="177949206"/>
+                                               <reference key="parent" ref="854927877"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
@@ -2720,8 +2624,6 @@
                                        <string>236.IBPluginDependency</string>
                                        <string>236.ImportedFromIB2</string>
                                        <string>236.editorWindowContentRectSynchronizationRect</string>
-                                       <string>237.IBPluginDependency</string>
-                                       <string>237.ImportedFromIB2</string>
                                        <string>238.IBPluginDependency</string>
                                        <string>238.ImportedFromIB2</string>
                                        <string>239.IBPluginDependency</string>
@@ -2747,19 +2649,8 @@
                                        <string>290.IBEditorWindowLastContentRect</string>
                                        <string>290.IBPluginDependency</string>
                                        <string>290.ImportedFromIB2</string>
-                                       <string>291.IBPluginDependency</string>
-                                       <string>291.ImportedFromIB2</string>
                                        <string>292.IBPluginDependency</string>
                                        <string>292.ImportedFromIB2</string>
-                                       <string>293.IBPluginDependency</string>
-                                       <string>293.ImportedFromIB2</string>
-                                       <string>294.IBPluginDependency</string>
-                                       <string>294.ImportedFromIB2</string>
-                                       <string>295.IBPluginDependency</string>
-                                       <string>295.ImportedFromIB2</string>
-                                       <string>296.IBPluginDependency</string>
-                                       <string>296.ImportedFromIB2</string>
-                                       <string>300.IBPluginDependency</string>
                                        <string>301.IBPluginDependency</string>
                                        <string>302.IBPluginDependency</string>
                                        <string>304.IBPluginDependency</string>
@@ -2868,6 +2759,13 @@
                                        <string>464.IBPluginDependency</string>
                                        <string>480.IBPluginDependency</string>
                                        <string>481.IBPluginDependency</string>
+                                       <string>484.IBPluginDependency</string>
+                                       <string>484.ImportedFromIB2</string>
+                                       <string>485.IBPluginDependency</string>
+                                       <string>485.ImportedFromIB2</string>
+                                       <string>486.IBPluginDependency</string>
+                                       <string>486.ImportedFromIB2</string>
+                                       <string>487.IBPluginDependency</string>
                                        <string>5.IBEditorWindowLastContentRect</string>
                                        <string>5.IBPluginDependency</string>
                                        <string>5.IBWindowTemplateEditedContentRect</string>
@@ -2884,7 +2782,7 @@
                                <object class="NSMutableArray" key="dict.values">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{275, 562}, {460, 256}}</string>
+                                       <string>{{96, 562}, {460, 256}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
                                        <integer value="1"/>
@@ -2896,7 +2794,7 @@
                                        <string>{{73, 765}, {492, 91}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
-                                       <string>{{229, 565}, {495, 241}}</string>
+                                       <string>{{134, 507}, {495, 241}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{0, 650}, {500, 184}}</string>
@@ -2922,25 +2820,12 @@
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
-                                       <string>{{314, 193}, {234, 123}}</string>
+                                       <string>{{348, 548}, {79, 48}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="1"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3048,6 +2933,13 @@
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <integer value="1"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <integer value="1"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <integer value="1"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{69, 656}, {500, 200}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{69, 656}, {500, 200}}</string>
@@ -3078,7 +2970,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">483</int>
+                       <int key="maxID">490</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3090,13 +2982,6 @@
                                                <string key="NS.key.0">browseSendToApp:</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">browseSendToApp:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">browseSendToApp:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
                                        <object class="NSMutableDictionary" key="outlets">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" key="dict.sortedKeys">
@@ -3116,40 +3001,6 @@
                                                        <string>NSTextField</string>
                                                </object>
                                        </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>fAdvancedView</string>
-                                                       <string>fAudioView</string>
-                                                       <string>fGeneralView</string>
-                                                       <string>fPictureView</string>
-                                                       <string>fSendEncodeToAppField</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">fAdvancedView</string>
-                                                               <string key="candidateClassName">NSView</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">fAudioView</string>
-                                                               <string key="candidateClassName">NSView</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">fGeneralView</string>
-                                                               <string key="candidateClassName">NSView</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">fPictureView</string>
-                                                               <string key="candidateClassName">NSView</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">fSendEncodeToAppField</string>
-                                                               <string key="candidateClassName">NSTextField</string>
-                                                       </object>
-                                               </object>
-                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
                                                <string key="minorKey">HBPreferencesController.h</string>
@@ -3162,13 +3013,6 @@
                                                <string key="NS.key.0">runModal:</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">runModal:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">runModal:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBUserSource</string>
                                                <string key="minorKey"/>
@@ -3198,24 +3042,10 @@
                                                <string key="NS.key.0">checkForUpdates:</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">checkForUpdates:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">checkForUpdates:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
                                        <object class="NSMutableDictionary" key="outlets">
                                                <string key="NS.key.0">delegate</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <string key="NS.key.0">delegate</string>
-                                               <object class="IBToOneOutletInfo" key="NS.object.0">
-                                                       <string key="name">delegate</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
                                        <reference key="sourceIdentifier" ref="606901004"/>
                                </object>
                        </object>
@@ -3852,13 +3682,6 @@
                                                <string key="NS.key.0">showWindow:</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">showWindow:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">showWindow:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBFrameworkSource</string>
                                                <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
@@ -3871,30 +3694,15 @@
                                                <string key="NS.key.0">checkForUpdates:</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">checkForUpdates:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">checkForUpdates:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
                                        <object class="NSMutableDictionary" key="outlets">
                                                <string key="NS.key.0">delegate</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <string key="NS.key.0">delegate</string>
-                                               <object class="IBToOneOutletInfo" key="NS.object.0">
-                                                       <string key="name">delegate</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </object>
                                        <reference key="sourceIdentifier" ref="568667533"/>
                                </object>
                        </object>
                </object>
                <int key="IBDocument.localizationMode">0</int>
-               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
                        <integer value="1050" key="NS.object.0"/>
@@ -3906,20 +3714,5 @@
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <string key="IBDocument.LastKnownRelativeProjectPath">../HandBrake.xcodeproj</string>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <object class="NSArray" key="dict.sortedKeys">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <string>NSMenuCheckmark</string>
-                               <string>NSMenuMixedState</string>
-                               <string>NSSwitch</string>
-                       </object>
-                       <object class="NSMutableArray" key="dict.values">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <string>{9, 8}</string>
-                               <string>{7, 2}</string>
-                               <string>{15, 15}</string>
-                       </object>
-               </object>
        </data>
 </archive>

diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index f829183..e8be922 100644 (file)
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -46,7 +46,7 @@
         @"Open Source",     @"LaunchSourceBehavior",
         @"English",         @"DefaultLanguage",
         @"YES",             @"UseCoreAudio",
-        @"YES",              @"DefaultMpegName",
+        @"Auto",            @"DefaultMpegExtension",
         @"YES",             @"UseDvdNav",
         @"",                @"DefAdvancedx264Flags",
         @"YES",             @"DefaultPresetsDrawerShow",