OSDN Git Service

MacGui: Custom Anamorphic initial implementation (experimental) and pic settings...
authordynaflash <dynaflash@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Fri, 1 May 2009 19:54:18 +0000 (19:54 +0000)
committerdynaflash <dynaflash@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Fri, 1 May 2009 19:54:18 +0000 (19:54 +0000)
- Custom Anamorphic mode allows more customization of pixel and display dimensions.
-- NOTE: The layout and even functionality are considered very experimental and not ready for prime time yet.
-- Change to hb_get_preview allowing a preview size > title->width and height courtesy of jbjake.
-- Allows setting the modulus to 16 (default), 8, 4, 2, or 1.
-- Adds display height, pixel width and pixel height fields.
- Picture Inspector:
-- Changes shape and size according to the size/filter tab and anamorphic and filter settings.
- Picture Preview:
-- Now crops the gray borders from around the image returned from hb_get_preview and recreates cropping and resizing itself.
-- Add size and scale information to the preview window title bar so you can see it without activating the hud controls.
-- Attempt to fix the intermittent aliasing problem with the hud control overlay by making sure the hud origin is a whole int (fix courtesy of KonaB1end).
- Known Issues:
-- Scale to Screen mode is currently borked. The actual image does not scale yet.
-- Depending on how far you upscale the display dimensions in custom anamorphic, the preview image can get a bit wonky. Returning to one of the standard modes clears it up.

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

libhb/hb.c
macosx/Controller.mm
macosx/English.lproj/PicturePreview.xib
macosx/English.lproj/PictureSettings.xib
macosx/HBPreviewController.mm
macosx/PictureController.h
macosx/PictureController.mm

index d688eed..ff85249 100644 (file)
@@ -465,31 +465,34 @@ void hb_get_preview( hb_handle_t * h, hb_title_t * title, int picture,
     // Free context
     sws_freeContext( context );
 
-    /* Gray background */
-    p32 = (uint32_t *) buffer;
-    for( i = 0; i < ( title->width + 2 ) * ( title->height + 2 ); i++ )
+    if( job->height < title->height || job->width < title->width )
     {
-        p32[i] = 0xFF808080;
-    }
+        /* Gray background */
+        p32 = (uint32_t *) buffer;
+        for( i = 0; i < ( title->width + 2 ) * ( title->height + 2 ); i++ )
+        {
+            p32[i] = 0xFF808080;
+        }
 
-    /* Draw the picture, centered, and draw the cropping zone */
-    preview_size = pic_preview.linesize[0];
-    pen = buffer + ( title->height - job->height ) *
-        ( title->width + 2 ) * 2 + ( title->width - job->width ) * 2;
-    memset( pen, 0xFF, 4 * ( job->width + 2 ) );
-    pen += 4 * ( title->width + 2 );
-    for( i = 0; i < job->height; i++ )
-    {
-        uint8_t * nextLine;
-        nextLine = pen + 4 * ( title->width + 2 );
-        memset( pen, 0xFF, 4 );
-        pen += 4;
-        memcpy( pen, buf4 + preview_size * i, 4 * job->width );
-        pen += 4 * job->width;
-        memset( pen, 0xFF, 4 );
-        pen = nextLine;
+        /* Draw the picture, centered, and draw the cropping zone */
+        preview_size = pic_preview.linesize[0];
+        pen = buffer + ( title->height - job->height ) *
+            ( title->width + 2 ) * 2 + ( title->width - job->width ) * 2;
+        memset( pen, 0xFF, 4 * ( job->width + 2 ) );
+        pen += 4 * ( title->width + 2 );
+        for( i = 0; i < job->height; i++ )
+        {
+            uint8_t * nextLine;
+            nextLine = pen + 4 * ( title->width + 2 );
+            memset( pen, 0xFF, 4 );
+            pen += 4;
+            memcpy( pen, buf4 + preview_size * i, 4 * job->width );
+            pen += 4 * job->width;
+            memset( pen, 0xFF, 4 );
+            pen = nextLine;
+        }
+        memset( pen, 0xFF, 4 * ( job->width + 2 ) );
     }
-    memset( pen, 0xFF, 4 * ( job->width + 2 ) );
 
     // Clean up
     avpicture_free( &pic_preview );
index b836368..6d929a0 100644 (file)
@@ -651,8 +651,6 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
                                             NSLocalizedString( @"Scanning title %d of %d...", @"" ),
                                             p.title_cur, p.title_count]];
             [fScanIndicator setHidden: NO];
-            double scanProgress = ( p.title_cur - 1 ) / p.title_count;
-            //[fScanIndicator setDoubleValue: 100.0 * scanProgress];
             [fScanIndicator setDoubleValue: 100.0 * ((double)( p.title_cur - 1 ) / p.title_count)];
             break;
                }
@@ -1974,6 +1972,19 @@ fWorkingCount = 0;
        [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->height] forKey:@"PictureHeight"];
        [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->keep_ratio] forKey:@"PictureKeepRatio"];
        [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.mode] forKey:@"PicturePAR"];
+    /* if we are custom anamorphic, store the exact storage, par and display dims */
+    if (fTitle->job->anamorphic.mode == 3)
+    {
+        [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->width] forKey:@"PicturePARStorageWidth"];
+        [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->height] forKey:@"PicturePARStorageHeight"];
+        
+        [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.par_width] forKey:@"PicturePARPixelWidth"];
+        [queueFileJob setObject:[NSNumber numberWithInt:fTitle->job->anamorphic.par_height] forKey:@"PicturePARPixelHeight"];
+        
+        [queueFileJob setObject:[NSNumber numberWithFloat:fTitle->job->anamorphic.dar_width] forKey:@"PicturePARDisplayWidth"];
+        [queueFileJob setObject:[NSNumber numberWithFloat:fTitle->job->anamorphic.dar_height] forKey:@"PicturePARDisplayHeight"];
+
+    }
     NSString * pictureSummary;
     pictureSummary = [fPictureSizeField stringValue];
     [queueFileJob setObject:pictureSummary forKey:@"PictureSizingSummary"];                 
@@ -3090,7 +3101,18 @@ fWorkingCount = 0;
     
     job->keep_ratio = [[queueToApply objectForKey:@"PictureKeepRatio"]  intValue];
     job->anamorphic.mode = [[queueToApply objectForKey:@"PicturePAR"]  intValue];
-    
+    if ([[queueToApply objectForKey:@"PicturePAR"]  intValue] == 3)
+    {
+        /* insert our custom values here for capuj */
+        job->width = [[queueToApply objectForKey:@"PicturePARStorageWidth"]  intValue];
+        job->height = [[queueToApply objectForKey:@"PicturePARStorageHeight"]  intValue];
+        
+        job->anamorphic.par_width = [[queueToApply objectForKey:@"PicturePARPixelWidth"]  intValue];
+        job->anamorphic.par_height = [[queueToApply objectForKey:@"PicturePARPixelHeight"]  intValue];
+        
+        job->anamorphic.dar_width = [[queueToApply objectForKey:@"PicturePARDisplayWidth"]  floatValue];
+        job->anamorphic.dar_height = [[queueToApply objectForKey:@"PicturePARDisplayHeight"]  floatValue];
+    }
     
     /* Here we use the crop values saved at the time the preset was saved */
     job->crop[0] = [[queueToApply objectForKey:@"PictureTopCrop"]  intValue];
@@ -3740,7 +3762,7 @@ fWorkingCount = 0;
 
        /* Reset the new title in fPictureController &&  fPreviewController*/
     [fPictureController SetTitle:title];
-    //[fPictureController SetTitle:title];
+
     /* Update subtitle popups */
     hb_subtitle_t * subtitle;
     [fSubPopUp removeAllItems];
@@ -3796,7 +3818,7 @@ fWorkingCount = 0;
        [self calculatePictureSizing:nil];
 
    /* lets call tableViewSelected to make sure that any preset we have selected is enforced after a title change */
-       [self selectPreset:nil];
+    [self selectPreset:nil];
 }
 
 - (IBAction) chapterPopUpChanged: (id) sender
@@ -4429,7 +4451,7 @@ the user is using "Custom" settings by determining the sender*/
     }
     [fVideoFiltersField setStringValue: [NSString stringWithFormat:@"Video Filters: %@", videoFilters]];
     
-    [fPictureController reloadStillPreview]; 
+    //[fPictureController reloadStillPreview]; 
 }
 
 
index 95df9d2..359a7ca 100644 (file)
@@ -8,7 +8,7 @@
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="257"/>
+                       <integer value="5"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -38,7 +38,7 @@
                        <object class="NSWindowTemplate" id="616825745">
                                <int key="NSWindowStyleMask">7</int>
                                <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{482, 423}, {475, 433}}</string>
+                               <string key="NSWindowRect">{{482, 422}, {573, 434}}</string>
                                <int key="NSWTFlags">1886913536</int>
                                <string key="NSWindowTitle">HandBrake Preview</string>
                                <string key="NSWindowClass">NSPanel</string>
                                                                                                        <string>NeXT TIFF v4.0 pasteboard type</string>
                                                                                                </object>
                                                                                        </object>
-                                                                                       <string key="NSFrame">{{-1, -2}, {475, 450}}</string>
+                                                                                       <string key="NSFrame">{{6, 29}, {535, 315}}</string>
                                                                                        <reference key="NSSuperview" ref="353606868"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSImageCell" key="NSCell" id="955430771">
                                                                                                <int key="NSCellFlags">130560</int>
                                                                                                <int key="NSCellFlags2">33554432</int>
                                                                                                <int key="NSAlign">0</int>
-                                                                                               <int key="NSScale">1</int>
+                                                                                               <int key="NSScale">0</int>
                                                                                                <int key="NSStyle">0</int>
-                                                                                               <bool key="NSAnimates">NO</bool>
+                                                                                               <bool key="NSAnimates">YES</bool>
                                                                                        </object>
                                                                                        <bool key="NSEditable">YES</bool>
                                                                                </object>
                                                                                                        <string>QTMoviePasteboardType</string>
                                                                                                </object>
                                                                                        </object>
-                                                                                       <string key="NSFrame">{{-10, -2}, {484, 450}}</string>
+                                                                                       <string key="NSFrame">{{-10, -1}, {460, 450}}</string>
                                                                                        <reference key="NSSuperview" ref="353606868"/>
                                                                                        <object class="NSColor" key="kCoderFillColor">
                                                                                                <int key="NSColorSpace">1</int>
                                                                                                        <reference key="NSSuperview" ref="92351498"/>
                                                                                                </object>
                                                                                        </object>
-                                                                                       <string key="NSFrame">{{30, 114}, {420, 100}}</string>
+                                                                                       <string key="NSFrame">{{14, 114}, {420, 100}}</string>
                                                                                        <reference key="NSSuperview" ref="353606868"/>
                                                                                        <string key="NSOffsets">{0, 0}</string>
                                                                                        <object class="NSTextFieldCell" key="NSTitleCell">
                                                                                                        <reference key="NSSuperview" ref="768906858"/>
                                                                                                </object>
                                                                                        </object>
-                                                                                       <string key="NSFrame">{{29, 266}, {420, 100}}</string>
+                                                                                       <string key="NSFrame">{{13, 266}, {420, 100}}</string>
                                                                                        <reference key="NSSuperview" ref="353606868"/>
                                                                                        <string key="NSOffsets">{0, 0}</string>
                                                                                        <object class="NSTextFieldCell" key="NSTitleCell">
                                                                                        </object>
                                                                                </object>
                                                                        </object>
-                                                                       <string key="NSFrame">{{1, 1}, {473, 431}}</string>
+                                                                       <string key="NSFrame">{{1, 1}, {571, 432}}</string>
                                                                        <reference key="NSSuperview" ref="289177107"/>
                                                                </object>
                                                        </object>
-                                                       <string key="NSFrameSize">{475, 433}</string>
+                                                       <string key="NSFrameSize">{573, 434}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <string key="NSOffsets">{0, 0}</string>
                                                        <object class="NSTextFieldCell" key="NSTitleCell">
                                                        <bool key="NSTransparent">NO</bool>
                                                </object>
                                        </object>
-                                       <string key="NSFrameSize">{475, 433}</string>
+                                       <string key="NSFrameSize">{573, 434}</string>
                                        <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
                                                <reference key="object" ref="289177107"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="48693112"/>
                                                        <reference ref="768906858"/>
                                                        <reference ref="92351498"/>
+                                                       <reference ref="48693112"/>
                                                        <reference ref="844127024"/>
                                                </object>
                                                <reference key="parent" ref="49161063"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">179</int>
-                                               <reference key="object" ref="844127024"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="955430771"/>
-                                               </object>
-                                               <reference key="parent" ref="289177107"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">180</int>
-                                               <reference key="object" ref="955430771"/>
-                                               <reference key="parent" ref="844127024"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
                                                <int key="objectID">207</int>
                                                <reference key="object" ref="48693112"/>
                                                <reference key="parent" ref="289177107"/>
                                                <reference key="object" ref="1032360651"/>
                                                <reference key="parent" ref="245200984"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">179</int>
+                                               <reference key="object" ref="844127024"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="955430771"/>
+                                               </object>
+                                               <reference key="parent" ref="289177107"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">180</int>
+                                               <reference key="object" ref="955430771"/>
+                                               <reference key="parent" ref="844127024"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="9"/>
-                                       <string>{{34, 423}, {475, 433}}</string>
+                                       <string>{{33, 422}, {573, 434}}</string>
                                        <reference ref="9"/>
-                                       <string>{{34, 423}, {475, 433}}</string>
+                                       <string>{{33, 422}, {573, 434}}</string>
                                        <reference ref="9"/>
                                        <string>{{221, 276}, {533, 580}}</string>
                                        <reference ref="6"/>
index 90a8a15..2630cee 100644 (file)
@@ -8,7 +8,7 @@
                <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="5"/>
+                       <integer value="436"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -37,7 +37,7 @@
                        <object class="NSWindowTemplate" id="616825745">
                                <int key="NSWindowStyleMask">8215</int>
                                <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{1211, 290}, {311, 447}}</string>
+                               <string key="NSWindowRect">{{63, 414}, {849, 399}}</string>
                                <int key="NSWTFlags">-260570112</int>
                                <string key="NSWindowTitle">Picture Settings</string>
                                <string key="NSWindowClass">NSPanel</string>
@@ -53,7 +53,7 @@
                                                <object class="NSTextField" id="922381307">
                                                        <reference key="NSNextResponder" ref="49161063"/>
                                                        <int key="NSvFlags">256</int>
-                                                       <string key="NSFrame">{{19, 522}, {55, 17}}</string>
+                                                       <string key="NSFrame">{{19, 474}, {55, 17}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="1037100053">
@@ -84,7 +84,7 @@
                                                <object class="NSButton" id="892118626">
                                                        <reference key="NSNextResponder" ref="49161063"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{19, 421}, {57, 25}}</string>
+                                                       <string key="NSFrame">{{19, 373}, {57, 25}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                        <object class="NSArray" key="NSViewContentFilters">
                                                <object class="NSTextField" id="154029488">
                                                        <reference key="NSNextResponder" ref="49161063"/>
                                                        <int key="NSvFlags">292</int>
-                                                       <string key="NSFrame">{{19, 20}, {275, 19}}</string>
+                                                       <string key="NSFrame">{{18, 6}, {425, 19}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="63504302">
                                                </object>
                                                <object class="NSTabView" id="570027662">
                                                        <reference key="NSNextResponder" ref="49161063"/>
-                                                       <int key="NSvFlags">12</int>
-                                                       <string key="NSFrame">{{15, 40}, {283, 373}}</string>
+                                                       <int key="NSvFlags">18</int>
+                                                       <string key="NSFrame">{{15, 19}, {821, 362}}</string>
                                                        <reference key="NSSuperview" ref="49161063"/>
                                                        <object class="NSArray" key="NSViewContentFilters">
                                                                <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                <int key="NSvFlags">256</int>
                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                       <object class="NSBox" id="1064912113">
+                                                                                       <object class="NSBox" id="291242569">
                                                                                                <reference key="NSNextResponder" ref="490590002"/>
-                                                                                               <int key="NSvFlags">265</int>
+                                                                                               <int key="NSvFlags">268</int>
                                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                       <object class="NSView" id="114416973">
-                                                                                                               <reference key="NSNextResponder" ref="1064912113"/>
+                                                                                                       <object class="NSView" id="93103015">
+                                                                                                               <reference key="NSNextResponder" ref="291242569"/>
                                                                                                                <int key="NSvFlags">256</int>
                                                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                       <object class="NSStepper" id="580805308">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                       <object class="NSTextField" id="84657333">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">256</int>
+                                                                                                                               <string key="NSFrame">{{203, 93}, {82, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="752977354">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">71434240</int>
+                                                                                                                                       <string key="NSContents">Display Width:</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="84657333"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="924352608">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
                                                                                                                                <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{146, 62}, {19, 28}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <string key="NSFrame">{{289, 93}, {61, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="617679053">
+                                                                                                                                       <int key="NSCellFlags">-1804468671</int>
+                                                                                                                                       <int key="NSCellFlags2">4457472</int>
+                                                                                                                                       <string key="NSContents"/>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="924352608"/>
+                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
+                                                                                                                                       <object class="NSColor" key="NSBackgroundColor">
+                                                                                                                                               <int key="NSColorSpace">1</int>
+                                                                                                                                               <bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
+                                                                                                                                       </object>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="998049160">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">292</int>
+                                                                                                                               <string key="NSFrame">{{446, 94}, {37, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="564975975">
+                                                                                                                                       <int key="NSCellFlags">-1804468671</int>
+                                                                                                                                       <int key="NSCellFlags2">4457472</int>
+                                                                                                                                       <string key="NSContents"/>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="998049160"/>
+                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
+                                                                                                                                       <object class="NSColor" key="NSBackgroundColor">
+                                                                                                                                               <int key="NSColorSpace">1</int>
+                                                                                                                                               <bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
+                                                                                                                                       </object>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="601215307">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">292</int>
+                                                                                                                               <string key="NSFrame">{{446, 52}, {37, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="119145016">
+                                                                                                                                       <int key="NSCellFlags">-1804468671</int>
+                                                                                                                                       <int key="NSCellFlags2">4457472</int>
+                                                                                                                                       <string key="NSContents"/>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="601215307"/>
+                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
+                                                                                                                                       <object class="NSColor" key="NSBackgroundColor">
+                                                                                                                                               <int key="NSColorSpace">1</int>
+                                                                                                                                               <bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
+                                                                                                                                       </object>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="122509689">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">256</int>
+                                                                                                                               <string key="NSFrame">{{375, 94}, {67, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="486553162">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">71434240</int>
+                                                                                                                                       <string key="NSContents">PAR Width:</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="122509689"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="810439401">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">256</int>
+                                                                                                                               <string key="NSFrame">{{370, 52}, {71, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="134407475">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">71434240</int>
+                                                                                                                                       <string key="NSContents">PAR Height:</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="810439401"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSStepper" id="221469578">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">292</int>
+                                                                                                                               <string key="NSFrame">{{155, 90}, {15, 22}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
                                                                                                                                <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                                                                <object class="NSArray" key="NSViewContentFilters">
                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                                                                                <bool key="CIEnabled">YES</bool>
                                                                                                                                        </object>
                                                                                                                                </object>
-                                                                                                                               <object class="NSArray" key="NSViewBackgroundFilters">
-                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                                       <object class="CIColorMonochrome">
-                                                                                                                                               <object class="CIColor" key="CI_inputColor">
-                                                                                                                                                       <float key="red">6.000000e-01</float>
-                                                                                                                                                       <float key="green">4.500000e-01</float>
-                                                                                                                                                       <float key="blue">3.000000e-01</float>
-                                                                                                                                                       <float key="alpha">1.000000e+00</float>
-                                                                                                                                               </object>
-                                                                                                                                               <reference key="CI_inputIntensity" ref="559925184"/>
-                                                                                                                                               <bool key="CIEnabled">YES</bool>
-                                                                                                                                       </object>
-                                                                                                                               </object>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSStepperCell" key="NSCell" id="44321990">
-                                                                                                                                       <int key="NSCellFlags">917024</int>
-                                                                                                                                       <int key="NSCellFlags2">0</int>
-                                                                                                                                       <reference key="NSControlView" ref="580805308"/>
+                                                                                                                               <object class="NSStepperCell" key="NSCell" id="714433793">
+                                                                                                                                       <int key="NSCellFlags">68025888</int>
+                                                                                                                                       <int key="NSCellFlags2">131072</int>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="221469578"/>
+                                                                                                                                       <double key="NSValue">6.400000e+01</double>
+                                                                                                                                       <double key="NSMinValue">6.400000e+01</double>
                                                                                                                                        <double key="NSMaxValue">5.900000e+01</double>
-                                                                                                                                       <double key="NSIncrement">2.000000e+00</double>
+                                                                                                                                       <double key="NSIncrement">1.600000e+01</double>
                                                                                                                                        <bool key="NSAutorepeat">YES</bool>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSStepper" id="510144318">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                       <object class="NSPopUpButton" id="387637584">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
                                                                                                                                <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{189, 32}, {19, 28}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <string key="NSFrame">{{91, 9}, {46, 15}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
                                                                                                                                <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                                                                <object class="NSArray" key="NSViewContentFilters">
                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                                                                                        <float key="blue">7.019608e-01</float>
                                                                                                                                                        <float key="alpha">1.000000e+00</float>
                                                                                                                                                </object>
-                                                                                                                                               <reference key="CI_inputIntensity" ref="559925184"/>
+                                                                                                                                               <real value="1.000000e+00" key="CI_inputIntensity" id="484376035"/>
                                                                                                                                                <bool key="CIEnabled">YES</bool>
                                                                                                                                        </object>
                                                                                                                                </object>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSStepperCell" key="NSCell" id="759792686">
-                                                                                                                                       <int key="NSCellFlags">917024</int>
-                                                                                                                                       <int key="NSCellFlags2">0</int>
-                                                                                                                                       <reference key="NSControlView" ref="510144318"/>
+                                                                                                                               <object class="NSPopUpButtonCell" key="NSCell" id="800808932">
+                                                                                                                                       <int key="NSCellFlags">-2076049856</int>
+                                                                                                                                       <int key="NSCellFlags2">264192</int>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="387637584"/>
+                                                                                                                                       <int key="NSButtonFlags">109199615</int>
+                                                                                                                                       <int key="NSButtonFlags2">1</int>
+                                                                                                                                       <string key="NSAlternateContents"/>
+                                                                                                                                       <string key="NSKeyEquivalent"/>
+                                                                                                                                       <int key="NSPeriodicDelay">400</int>
+                                                                                                                                       <int key="NSPeriodicInterval">75</int>
+                                                                                                                                       <object class="NSMenuItem" key="NSMenuItem" id="588147075">
+                                                                                                                                               <reference key="NSMenu" ref="246883325"/>
+                                                                                                                                               <string key="NSTitle">16</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="279874594">
+                                                                                                                                                       <string key="NSClassName">NSImage</string>
+                                                                                                                                                       <string key="NSResourceName">NSMenuCheckmark</string>
+                                                                                                                                               </object>
+                                                                                                                                               <object class="NSCustomResource" key="NSMixedImage" id="300720659">
+                                                                                                                                                       <string key="NSClassName">NSImage</string>
+                                                                                                                                                       <string key="NSResourceName">NSMenuMixedState</string>
+                                                                                                                                               </object>
+                                                                                                                                               <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                               <reference key="NSTarget" ref="800808932"/>
+                                                                                                                                       </object>
+                                                                                                                                       <bool key="NSMenuItemRespectAlignment">YES</bool>
+                                                                                                                                       <object class="NSMenu" key="NSMenu" id="246883325">
+                                                                                                                                               <string key="NSTitle">OtherViews</string>
+                                                                                                                                               <object class="NSMutableArray" key="NSMenuItems">
+                                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                                       <reference ref="588147075"/>
+                                                                                                                                                       <object class="NSMenuItem" id="940982828">
+                                                                                                                                                               <reference key="NSMenu" ref="246883325"/>
+                                                                                                                                                               <string key="NSTitle">8</string>
+                                                                                                                                                               <string key="NSKeyEquiv"/>
+                                                                                                                                                               <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                                               <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
+                                                                                                                                                               <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                                               <reference key="NSTarget" ref="800808932"/>
+                                                                                                                                                       </object>
+                                                                                                                                                       <object class="NSMenuItem" id="765075061">
+                                                                                                                                                               <reference key="NSMenu" ref="246883325"/>
+                                                                                                                                                               <string key="NSTitle">4</string>
+                                                                                                                                                               <string key="NSKeyEquiv"/>
+                                                                                                                                                               <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                                               <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
+                                                                                                                                                               <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                                               <reference key="NSTarget" ref="800808932"/>
+                                                                                                                                                       </object>
+                                                                                                                                               </object>
+                                                                                                                                       </object>
+                                                                                                                                       <int key="NSPreferredEdge">1</int>
+                                                                                                                                       <bool key="NSUsesItemFromMenu">YES</bool>
+                                                                                                                                       <bool key="NSAltersState">YES</bool>
+                                                                                                                                       <int key="NSArrowPosition">2</int>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="232869468">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">292</int>
+                                                                                                                               <string key="NSFrame">{{91, 95}, {62, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="96315080">
+                                                                                                                                       <int key="NSCellFlags">-2075001280</int>
+                                                                                                                                       <int key="NSCellFlags2">4457472</int>
+                                                                                                                                       <string key="NSContents"/>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="232869468"/>
+                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
+                                                                                                                                       <object class="NSColor" key="NSBackgroundColor" id="501609908">
+                                                                                                                                               <int key="NSColorSpace">1</int>
+                                                                                                                                               <bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
+                                                                                                                                       </object>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSStepper" id="667015191">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">292</int>
+                                                                                                                               <string key="NSFrame">{{155, 49}, {15, 22}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSStepperCell" key="NSCell" id="634499157">
+                                                                                                                                       <int key="NSCellFlags">68025888</int>
+                                                                                                                                       <int key="NSCellFlags2">131072</int>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="667015191"/>
+                                                                                                                                       <double key="NSValue">5.900000e+01</double>
+                                                                                                                                       <double key="NSMinValue">6.400000e+01</double>
                                                                                                                                        <double key="NSMaxValue">5.900000e+01</double>
-                                                                                                                                       <double key="NSIncrement">2.000000e+00</double>
+                                                                                                                                       <double key="NSIncrement">1.600000e+01</double>
                                                                                                                                        <bool key="NSAutorepeat">YES</bool>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSMatrix" id="1032624817">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
-                                                                                                                               <int key="NSvFlags">256</int>
-                                                                                                                               <string key="NSFrame">{{52, 93}, {20, 40}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
-                                                                                                                               <bool key="NSViewIsLayerTreeHost">YES</bool>
+                                                                                                                       <object class="NSTextField" id="301555397">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">292</int>
+                                                                                                                               <string key="NSFrame">{{10, 31}, {73, 14}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="926890760">
+                                                                                                                                       <int key="NSCellFlags">67239488</int>
+                                                                                                                                       <int key="NSCellFlags2">71435264</int>
+                                                                                                                                       <string key="NSContents">Anamorphic:</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="301555397"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="513894170">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">292</int>
+                                                                                                                               <string key="NSFrame">{{28, 55}, {55, 14}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="863668536">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">71434240</int>
+                                                                                                                                       <string key="NSContents">Height:</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="513894170"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSPopUpButton" id="147098438">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">292</int>
+                                                                                                                               <string key="NSFrame">{{90, 30}, {80, 15}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
                                                                                                                                <object class="NSArray" key="NSViewContentFilters">
                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                                                                        <object class="CIColorMonochrome">
                                                                                                                                        </object>
                                                                                                                                </object>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <int key="NSNumRows">2</int>
-                                                                                                                               <int key="NSNumCols">1</int>
-                                                                                                                               <object class="NSMutableArray" key="NSCells">
-                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                                       <object class="NSButtonCell" id="660067650">
-                                                                                                                                               <int key="NSCellFlags">-2080244224</int>
-                                                                                                                                               <int key="NSCellFlags2">131072</int>
-                                                                                                                                               <string key="NSContents">Automatic</string>
-                                                                                                                                               <reference key="NSSupport" ref="26"/>
-                                                                                                                                               <reference key="NSControlView" ref="1032624817"/>
-                                                                                                                                               <int key="NSButtonFlags">1211912703</int>
-                                                                                                                                               <int key="NSButtonFlags2">0</int>
-                                                                                                                                               <object class="NSButtonImageSource" key="NSAlternateImage" id="216523553">
-                                                                                                                                                       <string key="NSImageName">NSRadioButton</string>
-                                                                                                                                               </object>
-                                                                                                                                               <string key="NSAlternateContents"/>
-                                                                                                                                               <object class="NSMutableString" key="NSKeyEquivalent">
-                                                                                                                                                       <characters key="NS.bytes"/>
-                                                                                                                                               </object>
-                                                                                                                                               <int key="NSPeriodicDelay">200</int>
-                                                                                                                                               <int key="NSPeriodicInterval">25</int>
-                                                                                                                                       </object>
-                                                                                                                                       <object class="NSButtonCell" id="288116155">
-                                                                                                                                               <int key="NSCellFlags">67239424</int>
-                                                                                                                                               <int key="NSCellFlags2">131072</int>
-                                                                                                                                               <string key="NSContents">Custom:</string>
-                                                                                                                                               <reference key="NSSupport" ref="26"/>
-                                                                                                                                               <reference key="NSControlView" ref="1032624817"/>
-                                                                                                                                               <int key="NSButtonFlags">1211912703</int>
-                                                                                                                                               <int key="NSButtonFlags2">0</int>
-                                                                                                                                               <reference key="NSAlternateImage" ref="216523553"/>
-                                                                                                                                               <string key="NSAlternateContents"/>
-                                                                                                                                               <string key="NSKeyEquivalent"/>
-                                                                                                                                               <int key="NSPeriodicDelay">400</int>
-                                                                                                                                               <int key="NSPeriodicInterval">75</int>
+                                                                                                                               <object class="NSPopUpButtonCell" key="NSCell" id="261514411">
+                                                                                                                                       <int key="NSCellFlags">-2076049856</int>
+                                                                                                                                       <int key="NSCellFlags2">264192</int>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="147098438"/>
+                                                                                                                                       <int key="NSButtonFlags">109199615</int>
+                                                                                                                                       <int key="NSButtonFlags2">1</int>
+                                                                                                                                       <string key="NSAlternateContents"/>
+                                                                                                                                       <string key="NSKeyEquivalent"/>
+                                                                                                                                       <int key="NSPeriodicDelay">400</int>
+                                                                                                                                       <int key="NSPeriodicInterval">75</int>
+                                                                                                                                       <object class="NSMenuItem" key="NSMenuItem" id="85032843">
+                                                                                                                                               <reference key="NSMenu" ref="577969360"/>
+                                                                                                                                               <string key="NSTitle">Item 1</string>
+                                                                                                                                               <string key="NSKeyEquiv"/>
+                                                                                                                                               <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                               <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                               <int key="NSState">1</int>
+                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
+                                                                                                                                               <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                               <reference key="NSTarget" ref="261514411"/>
                                                                                                                                        </object>
-                                                                                                                               </object>
-                                                                                                                               <string key="NSCellSize">{20, 18}</string>
-                                                                                                                               <string key="NSIntercellSpacing">{4, 4}</string>
-                                                                                                                               <int key="NSMatrixFlags">1143480320</int>
-                                                                                                                               <string key="NSCellClass">NSActionCell</string>
-                                                                                                                               <object class="NSButtonCell" key="NSProtoCell" id="643930266">
-                                                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                                                       <int key="NSCellFlags2">0</int>
-                                                                                                                                       <string key="NSContents">Radio</string>
-                                                                                                                                       <object class="NSFont" key="NSSupport" id="1003998324">
-                                                                                                                                               <string key="NSName">LucidaGrande</string>
-                                                                                                                                               <double key="NSSize">1.300000e+01</double>
-                                                                                                                                               <int key="NSfFlags">1044</int>
-                                                                                                                                       </object>
-                                                                                                                                       <int key="NSButtonFlags">1211912703</int>
-                                                                                                                                       <int key="NSButtonFlags2">0</int>
-                                                                                                                                       <object class="NSImage" key="NSNormalImage">
-                                                                                                                                               <int key="NSImageFlags">549453824</int>
-                                                                                                                                               <string key="NSSize">{18, 18}</string>
-                                                                                                                                               <object class="NSMutableArray" key="NSReps">
+                                                                                                                                       <bool key="NSMenuItemRespectAlignment">YES</bool>
+                                                                                                                                       <object class="NSMenu" key="NSMenu" id="577969360">
+                                                                                                                                               <string key="NSTitle">OtherViews</string>
+                                                                                                                                               <object class="NSMutableArray" key="NSMenuItems">
                                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                                                       <object class="NSArray">
-                                                                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                                                               <integer value="0" id="8"/>
-                                                                                                                                                               <object class="NSBitmapImageRep">
-                                                                                                                                                                       <object class="NSData" key="NSTIFFRepresentation">
-                                                                                                                                                                               <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
-IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
-29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
-dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
-AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
-AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
-0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
-7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
-5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
-3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
-AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
-AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
-6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
-/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
-///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
-YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
-AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
-AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
-AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
-AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAA84AAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAPOGFw
-cGwCAAAAbW50clJHQiBYWVogB9cABwADAA8ANwAZYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAPbWAAEAAAAA0y1hcHBsmsww2rSgmexFz3DEbSSvVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA
-AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAYSbmRpbgAA
-B+wAAAY+ZGVzYwAADiwAAABkZHNjbQAADpAAAABObW1vZAAADuAAAAAoY3BydAAADwgAAAAtWFlaIAAA
-AAAAAGB8AAA5DAAABbxYWVogAAAAAAAAb3IAALBfAAAciVhZWiAAAAAAAAAm6AAAFq8AALDfWFlaIAAA
-AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1
-cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD
-AQAAAgAAAB4AaQDaAV8B/ALQA9sFIAbTCNMLPA4EEJ8THxVuF6EZnxt9HT8e4CBzIf8jfCT7JnUn5ilV
-KsIsKS2QLvkwYjHTM0g0wTY3N544/TpWO6Y88D41P3ZAt0H6Qz1Eg0XERvhIIklLSmpLhUycTbBOxE/Z
-UPBSC1MpVFJVfFasV9tZClo1W1lcc12AXoVfgGBzYZJivGPrZR1mVGeIaMJp+msvbGJtj26qb5NwZ3FE
-citzGnQRdRF2F3cfeCh5L3o0ezx8Q31HfkZ/QoA4gSqCG4MMg/yE7oXihtaHyYi5iaaKkIt5jGGNS444
-jyiQG5EQkgWS9JPflMiVrJaPl22YS5krmgya8JvXnL6dnp52n0ugHqDuobuihqNSpB+k7qXAppKndKhb
-qUWqMasdrAes7q3RrquvfLBFsROx77Lcs860wbW6tq+3pbiauYu6e7tkvD+9Bb25vnO/NL/8wMvBo8KA
-w2DEQcUixgPG48fGyKPJfMpRyyPL8sy8zYbOTs8Wz97QpdFn0ifS59Oj1F7VGtXV1pTXVNgX2N3Zo9pj
-2yHb3tyV3U3eBN6733TgMODv4bLic+My4+/kpuVa5gzmuudo6BboxOl16ifq3euc7FTtA+2a7iXuoe8Y
-74bv+fCc8WLyRfMM84/0EfSM9Qr1lfYq9tb3qfiu+f78YP//AAAAFwBQAKcBGQGsAmkDWQR+BdsHiQl9
-C7gOGxCeExsVbReKGX8bQxzZHjsfkSDjIjwjmST8JlknvCkmKo0r8y1aLsEwJTGEMuA0PjWRNuM4NDl4
-Ors79D0sPls/i0C3Qd5DBEQgRUBGVkdqSHpJhkqPS5hMn02kTqhPqVCrUbJSxVPdVPJWBlcYWChZM1o+
-W0dcT11WXl5fY2BuYXZigWOQZJ9lr2bDZ85ox2m0ap9riWx0bWJuUG8+cC1xHnIQcwNz93TudeZ233fa
-eNh513rUe818u32dfnp/WoA9gSOCC4L0g9+EzIW5hqWHj4h6iWeKT4s3jByM/43gjsCPnpCKkW6SVpM7
-lB+VAJXflr2XmJhxmUiaHprzm8WclZ1mnjWfAp/PoJ+hcaJVoz2kJaUOpfam3afDqKipjKpwq1SsOK0b
-rfyu3q+/sKKxgrJks0W0I7T6tcu2mbdsuD+5E7npusG7nbx6vVm+Or8ewAPA6cHNwrjDnsSIxXPGWsc5
-yA/I48m3ypPLb8xNzSzODc7uz9DQr9GN0mfTPtQS1OTVr9Z31zvX/NjC2a3amtuH3HHdV9473xrf9ODP
-4aPic+M/5Ank0uWW5lnnHOfd6J3pXOoh6vTryeyS7VfuGu7X75TwT/EH8cTygfNB9AT00vWq9o/3hviV
-+cn7Tv1t//8AAAAOADAAYwCnAPkBYwHcAoUDXgR4BdEHjQlsCzoM7g6KEA0RbBK7E/0VKRZMF2sYexmC
-GoYbjRyWHaIerR+5IMMhyyLPI9EkyiW8JqonlSh8KWEqRSsqLBEs+y3nLtQvvjCfMXkyUTMiM+40tzV/
-NkY3CzfUOJ85bjpFOyE8AjzlPcg+qj+HQGBBMEH3QrhDe0RSRTdGHkcIR/NI30nMSrhLoEyGTWdORE7p
-T41QM1DhUZZSUFMUU9tUpFVuVjdXAFfMWJpZZlowWvZbulx7XT1d/l7BX4VgTGETYdlinWNeZBxk2WWW
-ZlJnEmfUaJdpXWogat9rnGxXbQ9txm5+bzdv8nCwcXFyNnL4c7Z0cHUkddd2hncyd914iHk0eeJ6kntF
-fAZ8z32bfmp/O4ALgNmBo4JmgyGD14SJhVmGMIcNh+yIzomxipSLeIxXjTWOD47Yj42QJJC9kV6SB5K0
-k2qUJJThlaCWX5cfl+SYrJlzmjea+Zu5nHedNZ30nrSfdaA5oP6hxaKLo1GkFqTbpaGmaac2qAao2qmy
-qo6raqxErR6t967Tr7CwkLF4smSzV7RPtUi2PrcxuCC5CrnwutS7trycvYC+Z79SwEHBOMI0wzTENsU5
-xjrHOMgyySbKFMr6y+DNLc6p0EjSDtQN1mPZFtxo4Ijlxuzn933//wAAbmRpbgAAAAAAAAY2AACX6QAA
-W1AAAFSbAACOVgAAJ6QAABVgAABQDQAAVDkAAlwoAAIhRwABRR4AAwEAAAIAAAAaADgAUgBpAH8AkQCj
-ALQAxADTAOIA8AD+AQwBGwEsATwBTgFgAXQBiAGeAbQBzAHmAgICHwI+Al8CggKoAs8C+AMiA08DfAOr
-A9sEDQRBBHYErATkBR4FWQWUBdEGDwZNBosGygcJB0oHjAfRCBkIYwivCP4JTwmjCfkKUQqrCwULYQu+
-DBsMegzdDUYNsg4gDpMPCQ+CD/8QfRD9EX4SABKBEwMTgRQBFIAVABWCFgUWjBcYF6kYQhjiGYoaPRrV
-G2kb/ByOHSEdsx5IHtsfcCAHIKEhPSHdIoAjTiQ4JRol9CbHJ5UoXikmKe4qtyuFLFUtJC32Ls0vqTCL
-MXQyYjNTNEY1OzYuNyQ4GzkYOho7IjwtPTs+ST9UQF5BZ0JuQ31ElUWxRtZIAEkxSmVLmEzKTfpPKVBl
-Ua9TAFRaVbxXJliQWfpbYFzGXhVfXmClYexjNmSHZd9nS2jIalxr1G0sbn5v0HEccm5zwHUWdnR31nlF
-ett8uX6LgEWB7oOGhRaGoogwicCLVIzljoOQK5Hfk5+VbJc+mRWa8JzPnsGgt6K7pMOmz6jSqtOsyq7E
-sNSy7bUXt0O5drugvcG/2cH4xCfGaMi8yyPNjM/60l/Uutb22V/cOt/A47bmauhQ6mLtyfFy9LX3XPlz
-+xH8Yf0t/fj+iv8G/4P//wAAACIAQgBdAHYAjQCjALcAygDdAO4BAAERASIBNAFFAVcBaQF8AY8BpAG5
-AdAB6QIDAh8CPQJeAoICqQLXAwYDOANrA54D0gQHBDwEdASsBOUFHgVZBZQF0gYQBk8GkAbSBxYHXAej
-B+sINgiDCNEJIQl1CcoKIgp+CtsLPAueDAIMagzUDUANsg4jDpoPEw+QEBAQlBEaEaISLhK7E00T4BR1
-FQQVkBYfFrEXRRfbGHUZExmyGlUa+huhHEkc9R2fHk0e+h+nIFUhBSGzImMjIiPyJMYlniZ3J08oKSkG
-KeMqwCufLH4tXi49Lx4v/zDfMb8yojOINHk1fjaMN5c4ojmpOrM7vDzDPc0+2j/rQP1CDkMqREVFaEaQ
-R7xI70oQSz1MZ02YTs1QClFJUpFT3VUwVoZX5FlIWq5cGl2NXv1gaWG1YwVkVGWnZvxoVmm0axVsd23d
-b0RwsXIfc5F1A3Z6d/B5a3rzfI9+Mn/OgWyDCYSjhjmHzIleiu2Meo4Hj5mRIZK0lEKVzpdomR2a3Zyf
-nlGgBaG3o2qlGqbNqIaqRawQreSvwrGys621v7fGuXK7Jrzbvp3AY8I3xBnF/sf0yfnMC84k0E7Se9Sw
-1u3ZLNs63UXfduGy5AXmXOjF6yTtfu/S8gT0F/YK99H5b/rf/Bb9Bv3d/p3/Tv//AAAAOQBtAJQAtADQ
-AOoBAAEWASwBQwFcAXcBkwGxAdIB9QIcAkYCcwKjAtgDEANKA4kDzQQVBF4EqQT1BUMFkwXlBjoGkgbt
-B0sHsAgZCIcI+QlvCekKZQriC2AL3wxgDOcNeA4ODqwPUQ/9EK0RYRIVEsoTeRQmFNEVfhYtFuIXnhhl
-GTkaHBrnG6ccZx0nHegeqx9vIDkhByHcIrgj5yUVJjQnSChRKVgqXitqLHgtgi6RL6cwxjHtMxg0RTVz
-Np43zTkAOj47gzzOPh0/aECyQfpDSESmRgpHd0joSlpLx00wTpRQAVGCUw9UqlZTWAJZslteXQNegl/6
-YW5i4WRbZdxnc2kfauVsa23gb1FwvnIsc5p1CnaDeAF5jHtmfaV/wIG+g6SFfYdRiSeK+oy/jouQYZJB
-lCqWFpgAmeqbz52wn5WhfaNspVmnQqkgqvesxK6MsFSyJLP3tci3l7lhux280L55wBzBwsNwxSbG6Mi0
-yorMZM460BTR59O21XnXL9jg2o/cO93p35/hW+Mk5Pnm4ujf6kPrfOyh7bnuwu+/8Kjxi/JV8xjzzvR2
-9R/1r/Y59sT3QPev+B/4jvjz+Ur5ovn5+lD6pPrk+yT7Zful++b8Jvxm/JH8vfzo/RP9P/1q/ZX9wf3s
-/hj+SP5//rb+7P8j/1r/kf/I//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AABtbHVjAAAAAAAAAAIAAAAMZW5VUwAAABIAAAAoaXRJVAAAABQAAAA6AEMAbwBsAG8AcgAgAEwAQwBE
-AEwAQwBEACAAYwBvAGwAbwByAGkAAG1tb2QAAAAAAAAGEAAAnGgAAAAAwhEOAAAAAAAAAAAAAAAAAAAA
-AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
-                                                                                                                                                                       </object>
-                                                                                                                                                               </object>
+                                                                                                                                                       <reference ref="85032843"/>
+                                                                                                                                                       <object class="NSMenuItem" id="804424712">
+                                                                                                                                                               <reference key="NSMenu" ref="577969360"/>
+                                                                                                                                                               <string key="NSTitle">Item 2</string>
+                                                                                                                                                               <string key="NSKeyEquiv"/>
+                                                                                                                                                               <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                                               <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
+                                                                                                                                                               <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                                               <reference key="NSTarget" ref="261514411"/>
+                                                                                                                                                       </object>
+                                                                                                                                                       <object class="NSMenuItem" id="1018195923">
+                                                                                                                                                               <reference key="NSMenu" ref="577969360"/>
+                                                                                                                                                               <string key="NSTitle">Item 3</string>
+                                                                                                                                                               <string key="NSKeyEquiv"/>
+                                                                                                                                                               <int key="NSKeyEquivModMask">1048576</int>
+                                                                                                                                                               <int key="NSMnemonicLoc">2147483647</int>
+                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
+                                                                                                                                                               <string key="NSAction">_popUpItemAction:</string>
+                                                                                                                                                               <reference key="NSTarget" ref="261514411"/>
                                                                                                                                                        </object>
-                                                                                                                                               </object>
-                                                                                                                                               <object class="NSColor" key="NSColor">
-                                                                                                                                                       <int key="NSColorSpace">3</int>
-                                                                                                                                                       <bytes key="NSWhite">MCAwAA</bytes>
                                                                                                                                                </object>
                                                                                                                                        </object>
-                                                                                                                                       <reference key="NSAlternateImage" ref="216523553"/>
-                                                                                                                                       <int key="NSPeriodicDelay">400</int>
-                                                                                                                                       <int key="NSPeriodicInterval">75</int>
+                                                                                                                                       <int key="NSPreferredEdge">1</int>
+                                                                                                                                       <bool key="NSUsesItemFromMenu">YES</bool>
+                                                                                                                                       <bool key="NSAltersState">YES</bool>
+                                                                                                                                       <int key="NSArrowPosition">2</int>
                                                                                                                                </object>
-                                                                                                                               <reference key="NSSelectedCell" ref="660067650"/>
-                                                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                                                               <object class="NSColor" key="NSCellBackgroundColor" id="45357611">
-                                                                                                                                       <int key="NSColorSpace">3</int>
-                                                                                                                                       <bytes key="NSWhite">MQA</bytes>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="902766107">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
+                                                                                                                               <int key="NSvFlags">292</int>
+                                                                                                                               <string key="NSFrame">{{10, 10}, {73, 14}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="377264474">
+                                                                                                                                       <int key="NSCellFlags">67239488</int>
+                                                                                                                                       <int key="NSCellFlags2">71435264</int>
+                                                                                                                                       <string key="NSContents">Modulus:</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="902766107"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
                                                                                                                                </object>
-                                                                                                                               <reference key="NSFont" ref="1003998324"/>
                                                                                                                        </object>
-                                                                                                                       <object class="NSTextField" id="897162141">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                       <object class="NSTextField" id="569671425">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
                                                                                                                                <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{88, 66}, {56, 19}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <string key="NSFrame">{{0, 95}, {82, 14}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="936113070">
-                                                                                                                                       <int key="NSCellFlags">-2075001280</int>
-                                                                                                                                       <int key="NSCellFlags2">4195328</int>
-                                                                                                                                       <string key="NSContents"/>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="412868245">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">71434240</int>
+                                                                                                                                       <string key="NSContents">Width:</string>
                                                                                                                                        <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="897162141"/>
-                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
-                                                                                                                                       <object class="NSColor" key="NSBackgroundColor" id="501609908">
-                                                                                                                                               <int key="NSColorSpace">1</int>
-                                                                                                                                               <bytes key="NSRGB">MC4yIDAuMiAwLjIAA</bytes>
-                                                                                                                                       </object>
+                                                                                                                                       <reference key="NSControlView" ref="569671425"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
                                                                                                                                        <reference key="NSTextColor" ref="852384715"/>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSTextField" id="773085513">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                       <object class="NSTextField" id="443002022">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
                                                                                                                                <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{88, 7}, {56, 19}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <string key="NSFrame">{{91, 52}, {62, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="634956024">
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="649389918">
                                                                                                                                        <int key="NSCellFlags">-2075001280</int>
-                                                                                                                                       <int key="NSCellFlags2">4195328</int>
+                                                                                                                                       <int key="NSCellFlags2">4457472</int>
                                                                                                                                        <string key="NSContents"/>
-                                                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="773085513"/>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="443002022"/>
                                                                                                                                        <bool key="NSDrawsBackground">YES</bool>
                                                                                                                                        <reference key="NSBackgroundColor" ref="501609908"/>
                                                                                                                                        <reference key="NSTextColor" ref="852384715"/>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSStepper" id="1067684983">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                       <object class="NSButton" id="302614967">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
                                                                                                                                <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{110, 32}, {19, 28}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <string key="NSFrame">{{153, 71}, {18, 18}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
                                                                                                                                <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                                                                <object class="NSArray" key="NSViewContentFilters">
                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -499,210 +620,146 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                        </object>
                                                                                                                                </object>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSStepperCell" key="NSCell" id="996643427">
-                                                                                                                                       <int key="NSCellFlags">917024</int>
-                                                                                                                                       <int key="NSCellFlags2">0</int>
-                                                                                                                                       <reference key="NSControlView" ref="1067684983"/>
-                                                                                                                                       <double key="NSMaxValue">5.900000e+01</double>
-                                                                                                                                       <double key="NSIncrement">2.000000e+00</double>
-                                                                                                                                       <bool key="NSAutorepeat">YES</bool>
+                                                                                                                               <object class="NSButtonCell" key="NSCell" id="595088069">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">67239936</int>
+                                                                                                                                       <string key="NSContents">Keep aspect ratio:</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="302614967"/>
+                                                                                                                                       <int key="NSButtonFlags">1210864127</int>
+                                                                                                                                       <int key="NSButtonFlags2">2</int>
+                                                                                                                                       <object class="NSButtonImageSource" key="NSAlternateImage" id="998385597">
+                                                                                                                                               <string key="NSImageName">NSSwitch</string>
+                                                                                                                                       </object>
+                                                                                                                                       <string key="NSAlternateContents"/>
+                                                                                                                                       <string key="NSKeyEquivalent"/>
+                                                                                                                                       <int key="NSPeriodicDelay">200</int>
+                                                                                                                                       <int key="NSPeriodicInterval">25</int>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSTextField" id="411931143">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                       <object class="NSTextField" id="973216726">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
                                                                                                                                <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{131, 37}, {56, 19}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <string key="NSFrame">{{32, 73}, {123, 14}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="1050606643">
-                                                                                                                                       <int key="NSCellFlags">-2075001280</int>
-                                                                                                                                       <int key="NSCellFlags2">4195328</int>
-                                                                                                                                       <string key="NSContents"/>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="910777593">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">71434240</int>
+                                                                                                                                       <string key="NSContents">Keep Aspect Ratio:</string>
                                                                                                                                        <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="411931143"/>
-                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
-                                                                                                                                       <reference key="NSBackgroundColor" ref="501609908"/>
+                                                                                                                                       <reference key="NSControlView" ref="973216726"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
                                                                                                                                        <reference key="NSTextColor" ref="852384715"/>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSTextField" id="842452881">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                       <object class="NSTextField" id="231562326">
+                                                                                                                               <reference key="NSNextResponder" ref="93103015"/>
                                                                                                                                <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{52, 37}, {56, 19}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <string key="NSFrame">{{173, 53}, {112, 14}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="93103015"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="904241294">
-                                                                                                                                       <int key="NSCellFlags">-2075001280</int>
-                                                                                                                                       <int key="NSCellFlags2">4195328</int>
-                                                                                                                                       <string key="NSContents"/>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="87951024">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">71434240</int>
+                                                                                                                                       <string key="NSContents">Keep Aspect Ratio:</string>
                                                                                                                                        <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="842452881"/>
-                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
-                                                                                                                                       <reference key="NSBackgroundColor" ref="501609908"/>
-                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
-                                                                                                                               </object>
-                                                                                                                       </object>
-                                                                                                                       <object class="NSStepper" id="133033963">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
-                                                                                                                               <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{147, 2}, {19, 28}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
-                                                                                                                               <bool key="NSViewIsLayerTreeHost">YES</bool>
-                                                                                                                               <object class="NSArray" key="NSViewContentFilters">
-                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                                       <object class="CIColorMonochrome">
-                                                                                                                                               <object class="CIColor" key="CI_inputColor">
-                                                                                                                                                       <float key="red">7.019608e-01</float>
-                                                                                                                                                       <float key="green">7.019608e-01</float>
-                                                                                                                                                       <float key="blue">7.019608e-01</float>
-                                                                                                                                                       <float key="alpha">1.000000e+00</float>
-                                                                                                                                               </object>
-                                                                                                                                               <reference key="CI_inputIntensity" ref="559925184"/>
-                                                                                                                                               <bool key="CIEnabled">YES</bool>
-                                                                                                                                       </object>
-                                                                                                                               </object>
-                                                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSStepperCell" key="NSCell" id="71578223">
-                                                                                                                                       <int key="NSCellFlags">917024</int>
-                                                                                                                                       <int key="NSCellFlags2">0</int>
-                                                                                                                                       <reference key="NSControlView" ref="133033963"/>
-                                                                                                                                       <double key="NSMaxValue">5.900000e+01</double>
-                                                                                                                                       <double key="NSIncrement">2.000000e+00</double>
-                                                                                                                                       <bool key="NSAutorepeat">YES</bool>
-                                                                                                                               </object>
-                                                                                                                       </object>
-                                                                                                                       <object class="NSTextField" id="1021399174">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
-                                                                                                                               <int key="NSvFlags">256</int>
-                                                                                                                               <string key="NSFrame">{{77, 116}, {68, 17}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
-                                                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="215687429">
-                                                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                                                       <int key="NSCellFlags2">4194304</int>
-                                                                                                                                       <string key="NSContents">Automatic</string>
-                                                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="1021399174"/>
-                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
-                                                                                                                               </object>
-                                                                                                                       </object>
-                                                                                                                       <object class="NSTextField" id="194145642">
-                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
-                                                                                                                               <int key="NSvFlags">256</int>
-                                                                                                                               <string key="NSFrame">{{77, 93}, {68, 17}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
-                                                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="664940567">
-                                                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                                                       <int key="NSCellFlags2">4194304</int>
-                                                                                                                                       <string key="NSContents">Custom</string>
-                                                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="194145642"/>
-                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSControlView" ref="231562326"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
                                                                                                                                        <reference key="NSTextColor" ref="852384715"/>
                                                                                                                                </object>
                                                                                                                        </object>
                                                                                                                </object>
-                                                                                                               <string key="NSFrame">{{2, 15}, {228, 144}}</string>
-                                                                                                               <reference key="NSSuperview" ref="1064912113"/>
+                                                                                                               <string key="NSFrame">{{1, 1}, {511, 124}}</string>
+                                                                                                               <reference key="NSSuperview" ref="291242569"/>
                                                                                                        </object>
                                                                                                </object>
-                                                                                               <string key="NSFrame">{{14, 12}, {232, 161}}</string>
+                                                                                               <string key="NSFrame">{{0, 202}, {513, 126}}</string>
                                                                                                <reference key="NSSuperview" ref="490590002"/>
                                                                                                <string key="NSOffsets">{0, 0}</string>
                                                                                                <object class="NSTextFieldCell" key="NSTitleCell">
                                                                                                        <int key="NSCellFlags">67239424</int>
                                                                                                        <int key="NSCellFlags2">0</int>
-                                                                                                       <string key="NSContents"/>
+                                                                                                       <string key="NSContents">Box</string>
                                                                                                        <reference key="NSSupport" ref="26"/>
                                                                                                        <object class="NSColor" key="NSBackgroundColor" id="406287577">
                                                                                                                <int key="NSColorSpace">6</int>
                                                                                                                <string key="NSCatalogName">System</string>
                                                                                                                <string key="NSColorName">textBackgroundColor</string>
-                                                                                                               <reference key="NSColor" ref="45357611"/>
+                                                                                                               <object class="NSColor" key="NSColor" id="45357611">
+                                                                                                                       <int key="NSColorSpace">3</int>
+                                                                                                                       <bytes key="NSWhite">MQA</bytes>
+                                                                                                               </object>
                                                                                                        </object>
                                                                                                        <object class="NSColor" key="NSTextColor">
                                                                                                                <int key="NSColorSpace">3</int>
                                                                                                                <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
                                                                                                        </object>
                                                                                                </object>
-                                                                                               <reference key="NSContentView" ref="114416973"/>
-                                                                                               <int key="NSBorderType">3</int>
+                                                                                               <reference key="NSContentView" ref="93103015"/>
+                                                                                               <int key="NSBorderType">1</int>
                                                                                                <int key="NSBoxType">0</int>
-                                                                                               <int key="NSTitlePosition">5</int>
+                                                                                               <int key="NSTitlePosition">0</int>
                                                                                                <bool key="NSTransparent">NO</bool>
                                                                                        </object>
-                                                                                       <object class="NSBox" id="1011917013">
+                                                                                       <object class="NSBox" id="1064912113">
                                                                                                <reference key="NSNextResponder" ref="490590002"/>
                                                                                                <int key="NSvFlags">268</int>
                                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                       <object class="NSView" id="278260513">
-                                                                                                               <reference key="NSNextResponder" ref="1011917013"/>
+                                                                                                       <object class="NSView" id="114416973">
+                                                                                                               <reference key="NSNextResponder" ref="1064912113"/>
                                                                                                                <int key="NSvFlags">256</int>
                                                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                       <object class="NSTextField" id="513894170">
-                                                                                                                               <reference key="NSNextResponder" ref="278260513"/>
-                                                                                                                               <int key="NSvFlags">256</int>
-                                                                                                                               <string key="NSFrame">{{30, 60}, {55, 14}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="278260513"/>
-                                                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="863668536">
-                                                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                                                       <string key="NSContents">Height:</string>
-                                                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="513894170"/>
-                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                                                                       <object class="NSColor" key="NSTextColor" id="607671536">
-                                                                                                                                               <int key="NSColorSpace">1</int>
-                                                                                                                                               <bytes key="NSRGB">MC44MDAwMDAwMSAwLjgwMDAwMDAxIDAuODAwMDAwMDEAA</bytes>
+                                                                                                                       <object class="NSStepper" id="580805308">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{165, 53}, {15, 22}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <bool key="NSViewIsLayerTreeHost">YES</bool>
+                                                                                                                               <object class="NSArray" key="NSViewContentFilters">
+                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                       <object class="CIColorMonochrome">
+                                                                                                                                               <object class="CIColor" key="CI_inputColor">
+                                                                                                                                                       <float key="red">7.019608e-01</float>
+                                                                                                                                                       <float key="green">7.019608e-01</float>
+                                                                                                                                                       <float key="blue">7.019608e-01</float>
+                                                                                                                                                       <float key="alpha">1.000000e+00</float>
+                                                                                                                                               </object>
+                                                                                                                                               <reference key="CI_inputIntensity" ref="559925184"/>
+                                                                                                                                               <bool key="CIEnabled">YES</bool>
                                                                                                                                        </object>
                                                                                                                                </object>
-                                                                                                                       </object>
-                                                                                                                       <object class="NSTextField" id="973216726">
-                                                                                                                               <reference key="NSNextResponder" ref="278260513"/>
-                                                                                                                               <int key="NSvFlags">256</int>
-                                                                                                                               <string key="NSFrame">{{32, 31}, {123, 17}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="278260513"/>
-                                                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="910777593">
-                                                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                                                       <string key="NSContents">Keep Aspect Ratio:</string>
-                                                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="973216726"/>
-                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                                                                       <object class="NSColor" key="NSTextColor">
-                                                                                                                                               <int key="NSColorSpace">1</int>
-                                                                                                                                               <bytes key="NSRGB">MC44MDAwMDAwMSAwLjgwMDAwMDAxIDAuODAwMDAwMDEAA</bytes>
+                                                                                                                               <object class="NSArray" key="NSViewBackgroundFilters">
+                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                       <object class="CIColorMonochrome">
+                                                                                                                                               <object class="CIColor" key="CI_inputColor">
+                                                                                                                                                       <float key="red">6.000000e-01</float>
+                                                                                                                                                       <float key="green">4.500000e-01</float>
+                                                                                                                                                       <float key="blue">3.000000e-01</float>
+                                                                                                                                                       <float key="alpha">1.000000e+00</float>
+                                                                                                                                               </object>
+                                                                                                                                               <reference key="CI_inputIntensity" ref="559925184"/>
+                                                                                                                                               <bool key="CIEnabled">YES</bool>
                                                                                                                                        </object>
                                                                                                                                </object>
-                                                                                                                       </object>
-                                                                                                                       <object class="NSTextField" id="443002022">
-                                                                                                                               <reference key="NSNextResponder" ref="278260513"/>
-                                                                                                                               <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{93, 58}, {62, 19}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="278260513"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="649389918">
-                                                                                                                                       <int key="NSCellFlags">-2075001280</int>
-                                                                                                                                       <int key="NSCellFlags2">4195328</int>
-                                                                                                                                       <string key="NSContents"/>
+                                                                                                                               <object class="NSStepperCell" key="NSCell" id="44321990">
+                                                                                                                                       <int key="NSCellFlags">68025888</int>
+                                                                                                                                       <int key="NSCellFlags2">131072</int>
                                                                                                                                        <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="443002022"/>
-                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
-                                                                                                                                       <reference key="NSBackgroundColor" ref="501609908"/>
-                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                                       <reference key="NSControlView" ref="580805308"/>
+                                                                                                                                       <double key="NSMaxValue">5.900000e+01</double>
+                                                                                                                                       <double key="NSIncrement">2.000000e+00</double>
+                                                                                                                                       <bool key="NSAutorepeat">YES</bool>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSButton" id="302614967">
-                                                                                                                               <reference key="NSNextResponder" ref="278260513"/>
-                                                                                                                               <int key="NSvFlags">256</int>
-                                                                                                                               <string key="NSFrame">{{157, 32}, {18, 18}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="278260513"/>
+                                                                                                                       <object class="NSStepper" id="510144318">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{251, 41}, {15, 22}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
                                                                                                                                <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                                                                <object class="NSArray" key="NSViewContentFilters">
                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -718,78 +775,244 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                        </object>
                                                                                                                                </object>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSButtonCell" key="NSCell" id="595088069">
-                                                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                                                       <int key="NSCellFlags2">67239936</int>
-                                                                                                                                       <string key="NSContents">Keep aspect ratio:</string>
+                                                                                                                               <object class="NSStepperCell" key="NSCell" id="759792686">
+                                                                                                                                       <int key="NSCellFlags">68025888</int>
+                                                                                                                                       <int key="NSCellFlags2">131072</int>
                                                                                                                                        <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="302614967"/>
-                                                                                                                                       <int key="NSButtonFlags">1210864127</int>
-                                                                                                                                       <int key="NSButtonFlags2">2</int>
-                                                                                                                                       <object class="NSButtonImageSource" key="NSAlternateImage" id="998385597">
-                                                                                                                                               <string key="NSImageName">NSSwitch</string>
-                                                                                                                                       </object>
-                                                                                                                                       <string key="NSAlternateContents"/>
-                                                                                                                                       <string key="NSKeyEquivalent"/>
-                                                                                                                                       <int key="NSPeriodicDelay">200</int>
-                                                                                                                                       <int key="NSPeriodicInterval">25</int>
-                                                                                                                               </object>
-                                                                                                                       </object>
-                                                                                                                       <object class="NSStepper" id="667015191">
-                                                                                                                               <reference key="NSNextResponder" ref="278260513"/>
-                                                                                                                               <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{157, 53}, {19, 28}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="278260513"/>
-                                                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSStepperCell" key="NSCell" id="634499157">
-                                                                                                                                       <int key="NSCellFlags">917024</int>
-                                                                                                                                       <int key="NSCellFlags2">0</int>
-                                                                                                                                       <reference key="NSControlView" ref="667015191"/>
-                                                                                                                                       <double key="NSValue">5.900000e+01</double>
-                                                                                                                                       <double key="NSMinValue">6.400000e+01</double>
+                                                                                                                                       <reference key="NSControlView" ref="510144318"/>
                                                                                                                                        <double key="NSMaxValue">5.900000e+01</double>
-                                                                                                                                       <double key="NSIncrement">1.600000e+01</double>
+                                                                                                                                       <double key="NSIncrement">2.000000e+00</double>
                                                                                                                                        <bool key="NSAutorepeat">YES</bool>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSTextField" id="569671425">
-                                                                                                                               <reference key="NSNextResponder" ref="278260513"/>
-                                                                                                                               <int key="NSvFlags">256</int>
-                                                                                                                               <string key="NSFrame">{{30, 87}, {55, 14}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="278260513"/>
+                                                                                                                       <object class="NSMatrix" id="1032624817">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{76, 88}, {20, 24}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <object class="NSArray" key="NSViewContentFilters">
+                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                       <object class="CIColorMonochrome">
+                                                                                                                                               <object class="CIColor" key="CI_inputColor">
+                                                                                                                                                       <float key="red">7.019608e-01</float>
+                                                                                                                                                       <float key="green">7.019608e-01</float>
+                                                                                                                                                       <float key="blue">7.019608e-01</float>
+                                                                                                                                                       <float key="alpha">1.000000e+00</float>
+                                                                                                                                               </object>
+                                                                                                                                               <reference key="CI_inputIntensity" ref="559925184"/>
+                                                                                                                                               <bool key="CIEnabled">YES</bool>
+                                                                                                                                       </object>
+                                                                                                                               </object>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="412868245">
+                                                                                                                               <int key="NSNumRows">2</int>
+                                                                                                                               <int key="NSNumCols">1</int>
+                                                                                                                               <object class="NSMutableArray" key="NSCells">
+                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                       <object class="NSButtonCell" id="660067650">
+                                                                                                                                               <int key="NSCellFlags">-2080244224</int>
+                                                                                                                                               <int key="NSCellFlags2">262144</int>
+                                                                                                                                               <string key="NSContents">Automatic</string>
+                                                                                                                                               <reference key="NSSupport" ref="22"/>
+                                                                                                                                               <reference key="NSControlView" ref="1032624817"/>
+                                                                                                                                               <int key="NSButtonFlags">1211912703</int>
+                                                                                                                                               <int key="NSButtonFlags2">0</int>
+                                                                                                                                               <object class="NSButtonImageSource" key="NSAlternateImage" id="216523553">
+                                                                                                                                                       <string key="NSImageName">NSRadioButton</string>
+                                                                                                                                               </object>
+                                                                                                                                               <string key="NSAlternateContents"/>
+                                                                                                                                               <object class="NSMutableString" key="NSKeyEquivalent">
+                                                                                                                                                       <characters key="NS.bytes"/>
+                                                                                                                                               </object>
+                                                                                                                                               <int key="NSPeriodicDelay">200</int>
+                                                                                                                                               <int key="NSPeriodicInterval">25</int>
+                                                                                                                                       </object>
+                                                                                                                                       <object class="NSButtonCell" id="288116155">
+                                                                                                                                               <int key="NSCellFlags">67239424</int>
+                                                                                                                                               <int key="NSCellFlags2">262144</int>
+                                                                                                                                               <string key="NSContents">Custom:</string>
+                                                                                                                                               <reference key="NSSupport" ref="22"/>
+                                                                                                                                               <reference key="NSControlView" ref="1032624817"/>
+                                                                                                                                               <int key="NSButtonFlags">1211912703</int>
+                                                                                                                                               <int key="NSButtonFlags2">0</int>
+                                                                                                                                               <reference key="NSAlternateImage" ref="216523553"/>
+                                                                                                                                               <string key="NSAlternateContents"/>
+                                                                                                                                               <string key="NSKeyEquivalent"/>
+                                                                                                                                               <int key="NSPeriodicDelay">400</int>
+                                                                                                                                               <int key="NSPeriodicInterval">75</int>
+                                                                                                                                       </object>
+                                                                                                                               </object>
+                                                                                                                               <string key="NSCellSize">{20, 11}</string>
+                                                                                                                               <string key="NSIntercellSpacing">{4, 2}</string>
+                                                                                                                               <int key="NSMatrixFlags">1143480320</int>
+                                                                                                                               <string key="NSCellClass">NSActionCell</string>
+                                                                                                                               <object class="NSButtonCell" key="NSProtoCell" id="643930266">
                                                                                                                                        <int key="NSCellFlags">67239424</int>
-                                                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                                                       <string key="NSContents">Width:</string>
-                                                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="569671425"/>
-                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                                                                       <reference key="NSTextColor" ref="607671536"/>
+                                                                                                                                       <int key="NSCellFlags2">262144</int>
+                                                                                                                                       <string key="NSContents">Radio</string>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <int key="NSButtonFlags">1211912703</int>
+                                                                                                                                       <int key="NSButtonFlags2">0</int>
+                                                                                                                                       <object class="NSImage" key="NSNormalImage">
+                                                                                                                                               <int key="NSImageFlags">549453824</int>
+                                                                                                                                               <string key="NSSize">{18, 18}</string>
+                                                                                                                                               <object class="NSMutableArray" key="NSReps">
+                                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                                       <object class="NSArray">
+                                                                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                                               <integer value="0" id="8"/>
+                                                                                                                                                               <object class="NSBitmapImageRep">
+                                                                                                                                                                       <object class="NSData" key="NSTIFFRepresentation">
+                                                                                                                                                                               <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
+IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
+29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
+dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
+AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
+AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
+0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
+7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
+5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
+3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
+AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
+AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
+6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
+/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
+///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
+YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
+AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
+AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
+AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAA84AAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAPOGFw
+cGwCAAAAbW50clJHQiBYWVogB9cABwADAA8ANwAZYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAPbWAAEAAAAA0y1hcHBsmsww2rSgmexFz3DEbSSvVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA
+AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAYSbmRpbgAA
+B+wAAAY+ZGVzYwAADiwAAABkZHNjbQAADpAAAABObW1vZAAADuAAAAAoY3BydAAADwgAAAAtWFlaIAAA
+AAAAAGB8AAA5DAAABbxYWVogAAAAAAAAb3IAALBfAAAciVhZWiAAAAAAAAAm6AAAFq8AALDfWFlaIAAA
+AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1
+cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD
+AQAAAgAAAB4AaQDaAV8B/ALQA9sFIAbTCNMLPA4EEJ8THxVuF6EZnxt9HT8e4CBzIf8jfCT7JnUn5ilV
+KsIsKS2QLvkwYjHTM0g0wTY3N544/TpWO6Y88D41P3ZAt0H6Qz1Eg0XERvhIIklLSmpLhUycTbBOxE/Z
+UPBSC1MpVFJVfFasV9tZClo1W1lcc12AXoVfgGBzYZJivGPrZR1mVGeIaMJp+msvbGJtj26qb5NwZ3FE
+citzGnQRdRF2F3cfeCh5L3o0ezx8Q31HfkZ/QoA4gSqCG4MMg/yE7oXihtaHyYi5iaaKkIt5jGGNS444
+jyiQG5EQkgWS9JPflMiVrJaPl22YS5krmgya8JvXnL6dnp52n0ugHqDuobuihqNSpB+k7qXAppKndKhb
+qUWqMasdrAes7q3RrquvfLBFsROx77Lcs860wbW6tq+3pbiauYu6e7tkvD+9Bb25vnO/NL/8wMvBo8KA
+w2DEQcUixgPG48fGyKPJfMpRyyPL8sy8zYbOTs8Wz97QpdFn0ifS59Oj1F7VGtXV1pTXVNgX2N3Zo9pj
+2yHb3tyV3U3eBN6733TgMODv4bLic+My4+/kpuVa5gzmuudo6BboxOl16ifq3euc7FTtA+2a7iXuoe8Y
+74bv+fCc8WLyRfMM84/0EfSM9Qr1lfYq9tb3qfiu+f78YP//AAAAFwBQAKcBGQGsAmkDWQR+BdsHiQl9
+C7gOGxCeExsVbReKGX8bQxzZHjsfkSDjIjwjmST8JlknvCkmKo0r8y1aLsEwJTGEMuA0PjWRNuM4NDl4
+Ors79D0sPls/i0C3Qd5DBEQgRUBGVkdqSHpJhkqPS5hMn02kTqhPqVCrUbJSxVPdVPJWBlcYWChZM1o+
+W0dcT11WXl5fY2BuYXZigWOQZJ9lr2bDZ85ox2m0ap9riWx0bWJuUG8+cC1xHnIQcwNz93TudeZ233fa
+eNh513rUe818u32dfnp/WoA9gSOCC4L0g9+EzIW5hqWHj4h6iWeKT4s3jByM/43gjsCPnpCKkW6SVpM7
+lB+VAJXflr2XmJhxmUiaHprzm8WclZ1mnjWfAp/PoJ+hcaJVoz2kJaUOpfam3afDqKipjKpwq1SsOK0b
+rfyu3q+/sKKxgrJks0W0I7T6tcu2mbdsuD+5E7npusG7nbx6vVm+Or8ewAPA6cHNwrjDnsSIxXPGWsc5
+yA/I48m3ypPLb8xNzSzODc7uz9DQr9GN0mfTPtQS1OTVr9Z31zvX/NjC2a3amtuH3HHdV9473xrf9ODP
+4aPic+M/5Ank0uWW5lnnHOfd6J3pXOoh6vTryeyS7VfuGu7X75TwT/EH8cTygfNB9AT00vWq9o/3hviV
++cn7Tv1t//8AAAAOADAAYwCnAPkBYwHcAoUDXgR4BdEHjQlsCzoM7g6KEA0RbBK7E/0VKRZMF2sYexmC
+GoYbjRyWHaIerR+5IMMhyyLPI9EkyiW8JqonlSh8KWEqRSsqLBEs+y3nLtQvvjCfMXkyUTMiM+40tzV/
+NkY3CzfUOJ85bjpFOyE8AjzlPcg+qj+HQGBBMEH3QrhDe0RSRTdGHkcIR/NI30nMSrhLoEyGTWdORE7p
+T41QM1DhUZZSUFMUU9tUpFVuVjdXAFfMWJpZZlowWvZbulx7XT1d/l7BX4VgTGETYdlinWNeZBxk2WWW
+ZlJnEmfUaJdpXWogat9rnGxXbQ9txm5+bzdv8nCwcXFyNnL4c7Z0cHUkddd2hncyd914iHk0eeJ6kntF
+fAZ8z32bfmp/O4ALgNmBo4JmgyGD14SJhVmGMIcNh+yIzomxipSLeIxXjTWOD47Yj42QJJC9kV6SB5K0
+k2qUJJThlaCWX5cfl+SYrJlzmjea+Zu5nHedNZ30nrSfdaA5oP6hxaKLo1GkFqTbpaGmaac2qAao2qmy
+qo6raqxErR6t967Tr7CwkLF4smSzV7RPtUi2PrcxuCC5CrnwutS7trycvYC+Z79SwEHBOMI0wzTENsU5
+xjrHOMgyySbKFMr6y+DNLc6p0EjSDtQN1mPZFtxo4Ijlxuzn933//wAAbmRpbgAAAAAAAAY2AACX6QAA
+W1AAAFSbAACOVgAAJ6QAABVgAABQDQAAVDkAAlwoAAIhRwABRR4AAwEAAAIAAAAaADgAUgBpAH8AkQCj
+ALQAxADTAOIA8AD+AQwBGwEsATwBTgFgAXQBiAGeAbQBzAHmAgICHwI+Al8CggKoAs8C+AMiA08DfAOr
+A9sEDQRBBHYErATkBR4FWQWUBdEGDwZNBosGygcJB0oHjAfRCBkIYwivCP4JTwmjCfkKUQqrCwULYQu+
+DBsMegzdDUYNsg4gDpMPCQ+CD/8QfRD9EX4SABKBEwMTgRQBFIAVABWCFgUWjBcYF6kYQhjiGYoaPRrV
+G2kb/ByOHSEdsx5IHtsfcCAHIKEhPSHdIoAjTiQ4JRol9CbHJ5UoXikmKe4qtyuFLFUtJC32Ls0vqTCL
+MXQyYjNTNEY1OzYuNyQ4GzkYOho7IjwtPTs+ST9UQF5BZ0JuQ31ElUWxRtZIAEkxSmVLmEzKTfpPKVBl
+Ua9TAFRaVbxXJliQWfpbYFzGXhVfXmClYexjNmSHZd9nS2jIalxr1G0sbn5v0HEccm5zwHUWdnR31nlF
+ett8uX6LgEWB7oOGhRaGoogwicCLVIzljoOQK5Hfk5+VbJc+mRWa8JzPnsGgt6K7pMOmz6jSqtOsyq7E
+sNSy7bUXt0O5drugvcG/2cH4xCfGaMi8yyPNjM/60l/Uutb22V/cOt/A47bmauhQ6mLtyfFy9LX3XPlz
++xH8Yf0t/fj+iv8G/4P//wAAACIAQgBdAHYAjQCjALcAygDdAO4BAAERASIBNAFFAVcBaQF8AY8BpAG5
+AdAB6QIDAh8CPQJeAoICqQLXAwYDOANrA54D0gQHBDwEdASsBOUFHgVZBZQF0gYQBk8GkAbSBxYHXAej
+B+sINgiDCNEJIQl1CcoKIgp+CtsLPAueDAIMagzUDUANsg4jDpoPEw+QEBAQlBEaEaISLhK7E00T4BR1
+FQQVkBYfFrEXRRfbGHUZExmyGlUa+huhHEkc9R2fHk0e+h+nIFUhBSGzImMjIiPyJMYlniZ3J08oKSkG
+KeMqwCufLH4tXi49Lx4v/zDfMb8yojOINHk1fjaMN5c4ojmpOrM7vDzDPc0+2j/rQP1CDkMqREVFaEaQ
+R7xI70oQSz1MZ02YTs1QClFJUpFT3VUwVoZX5FlIWq5cGl2NXv1gaWG1YwVkVGWnZvxoVmm0axVsd23d
+b0RwsXIfc5F1A3Z6d/B5a3rzfI9+Mn/OgWyDCYSjhjmHzIleiu2Meo4Hj5mRIZK0lEKVzpdomR2a3Zyf
+nlGgBaG3o2qlGqbNqIaqRawQreSvwrGys621v7fGuXK7Jrzbvp3AY8I3xBnF/sf0yfnMC84k0E7Se9Sw
+1u3ZLNs63UXfduGy5AXmXOjF6yTtfu/S8gT0F/YK99H5b/rf/Bb9Bv3d/p3/Tv//AAAAOQBtAJQAtADQ
+AOoBAAEWASwBQwFcAXcBkwGxAdIB9QIcAkYCcwKjAtgDEANKA4kDzQQVBF4EqQT1BUMFkwXlBjoGkgbt
+B0sHsAgZCIcI+QlvCekKZQriC2AL3wxgDOcNeA4ODqwPUQ/9EK0RYRIVEsoTeRQmFNEVfhYtFuIXnhhl
+GTkaHBrnG6ccZx0nHegeqx9vIDkhByHcIrgj5yUVJjQnSChRKVgqXitqLHgtgi6RL6cwxjHtMxg0RTVz
+Np43zTkAOj47gzzOPh0/aECyQfpDSESmRgpHd0joSlpLx00wTpRQAVGCUw9UqlZTWAJZslteXQNegl/6
+YW5i4WRbZdxnc2kfauVsa23gb1FwvnIsc5p1CnaDeAF5jHtmfaV/wIG+g6SFfYdRiSeK+oy/jouQYZJB
+lCqWFpgAmeqbz52wn5WhfaNspVmnQqkgqvesxK6MsFSyJLP3tci3l7lhux280L55wBzBwsNwxSbG6Mi0
+yorMZM460BTR59O21XnXL9jg2o/cO93p35/hW+Mk5Pnm4ujf6kPrfOyh7bnuwu+/8Kjxi/JV8xjzzvR2
+9R/1r/Y59sT3QPev+B/4jvjz+Ur5ovn5+lD6pPrk+yT7Zful++b8Jvxm/JH8vfzo/RP9P/1q/ZX9wf3s
+/hj+SP5//rb+7P8j/1r/kf/I//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABtbHVjAAAAAAAAAAIAAAAMZW5VUwAAABIAAAAoaXRJVAAAABQAAAA6AEMAbwBsAG8AcgAgAEwAQwBE
+AEwAQwBEACAAYwBvAGwAbwByAGkAAG1tb2QAAAAAAAAGEAAAnGgAAAAAwhEOAAAAAAAAAAAAAAAAAAAA
+AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
+                                                                                                                                                                       </object>
+                                                                                                                                                               </object>
+                                                                                                                                                       </object>
+                                                                                                                                               </object>
+                                                                                                                                               <object class="NSColor" key="NSColor">
+                                                                                                                                                       <int key="NSColorSpace">3</int>
+                                                                                                                                                       <bytes key="NSWhite">MCAwAA</bytes>
+                                                                                                                                               </object>
+                                                                                                                                       </object>
+                                                                                                                                       <reference key="NSAlternateImage" ref="216523553"/>
+                                                                                                                                       <int key="NSPeriodicDelay">400</int>
+                                                                                                                                       <int key="NSPeriodicInterval">75</int>
+                                                                                                                               </object>
+                                                                                                                               <reference key="NSSelectedCell" ref="660067650"/>
+                                                                                                                               <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                               <reference key="NSCellBackgroundColor" ref="45357611"/>
+                                                                                                                               <object class="NSFont" key="NSFont">
+                                                                                                                                       <string key="NSName">LucidaGrande</string>
+                                                                                                                                       <double key="NSSize">1.300000e+01</double>
+                                                                                                                                       <int key="NSfFlags">1044</int>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSTextField" id="232869468">
-                                                                                                                               <reference key="NSNextResponder" ref="278260513"/>
-                                                                                                                               <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{93, 85}, {62, 19}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="278260513"/>
+                                                                                                                       <object class="NSTextField" id="897162141">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{107, 54}, {56, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="96315080">
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="936113070">
                                                                                                                                        <int key="NSCellFlags">-2075001280</int>
-                                                                                                                                       <int key="NSCellFlags2">4195328</int>
+                                                                                                                                       <int key="NSCellFlags2">4457472</int>
                                                                                                                                        <string key="NSContents"/>
-                                                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="232869468"/>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="897162141"/>
+                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="501609908"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="773085513">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{107, 27}, {56, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="634956024">
+                                                                                                                                       <int key="NSCellFlags">-2075001280</int>
+                                                                                                                                       <int key="NSCellFlags2">4457472</int>
+                                                                                                                                       <string key="NSContents"/>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="773085513"/>
                                                                                                                                        <bool key="NSDrawsBackground">YES</bool>
                                                                                                                                        <reference key="NSBackgroundColor" ref="501609908"/>
                                                                                                                                        <reference key="NSTextColor" ref="852384715"/>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSStepper" id="221469578">
-                                                                                                                               <reference key="NSNextResponder" ref="278260513"/>
-                                                                                                                               <int key="NSvFlags">292</int>
-                                                                                                                               <string key="NSFrame">{{157, 80}, {19, 28}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="278260513"/>
+                                                                                                                       <object class="NSStepper" id="1067684983">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{79, 38}, {15, 22}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
                                                                                                                                <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                                                                <object class="NSArray" key="NSViewContentFilters">
                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -805,22 +1028,55 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                        </object>
                                                                                                                                </object>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSStepperCell" key="NSCell" id="714433793">
-                                                                                                                                       <int key="NSCellFlags">917024</int>
-                                                                                                                                       <int key="NSCellFlags2">0</int>
-                                                                                                                                       <reference key="NSControlView" ref="221469578"/>
-                                                                                                                                       <double key="NSValue">6.400000e+01</double>
-                                                                                                                                       <double key="NSMinValue">6.400000e+01</double>
+                                                                                                                               <object class="NSStepperCell" key="NSCell" id="996643427">
+                                                                                                                                       <int key="NSCellFlags">68025888</int>
+                                                                                                                                       <int key="NSCellFlags2">131072</int>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="1067684983"/>
                                                                                                                                        <double key="NSMaxValue">5.900000e+01</double>
-                                                                                                                                       <double key="NSIncrement">1.600000e+01</double>
+                                                                                                                                       <double key="NSIncrement">2.000000e+00</double>
                                                                                                                                        <bool key="NSAutorepeat">YES</bool>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSPopUpButton" id="147098438">
-                                                                                                                               <reference key="NSNextResponder" ref="278260513"/>
+                                                                                                                       <object class="NSTextField" id="411931143">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{189, 44}, {56, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="1050606643">
+                                                                                                                                       <int key="NSCellFlags">-2075001280</int>
+                                                                                                                                       <int key="NSCellFlags2">4457472</int>
+                                                                                                                                       <string key="NSContents"/>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="411931143"/>
+                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="501609908"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="842452881">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{18, 41}, {56, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="904241294">
+                                                                                                                                       <int key="NSCellFlags">-2075001280</int>
+                                                                                                                                       <int key="NSCellFlags2">4457472</int>
+                                                                                                                                       <string key="NSContents"/>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="842452881"/>
+                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="501609908"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSStepper" id="133033963">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
                                                                                                                                <int key="NSvFlags">268</int>
-                                                                                                                               <string key="NSFrame">{{98, 7}, {100, 15}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="278260513"/>
+                                                                                                                               <string key="NSFrame">{{166, 25}, {15, 22}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
                                                                                                                                <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                                                                <object class="NSArray" key="NSViewContentFilters">
                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -836,93 +1092,70 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                        </object>
                                                                                                                                </object>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSPopUpButtonCell" key="NSCell" id="261514411">
-                                                                                                                                       <int key="NSCellFlags">-2076049856</int>
-                                                                                                                                       <int key="NSCellFlags2">264192</int>
+                                                                                                                               <object class="NSStepperCell" key="NSCell" id="71578223">
+                                                                                                                                       <int key="NSCellFlags">68025888</int>
+                                                                                                                                       <int key="NSCellFlags2">131072</int>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="133033963"/>
+                                                                                                                                       <double key="NSMaxValue">5.900000e+01</double>
+                                                                                                                                       <double key="NSIncrement">2.000000e+00</double>
+                                                                                                                                       <bool key="NSAutorepeat">YES</bool>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="1021399174">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{97, 102}, {68, 11}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="215687429">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">4456448</int>
+                                                                                                                                       <string key="NSContents">Automatic</string>
                                                                                                                                        <reference key="NSSupport" ref="22"/>
-                                                                                                                                       <reference key="NSControlView" ref="147098438"/>
-                                                                                                                                       <int key="NSButtonFlags">109199615</int>
-                                                                                                                                       <int key="NSButtonFlags2">1</int>
-                                                                                                                                       <string key="NSAlternateContents"/>
-                                                                                                                                       <string key="NSKeyEquivalent"/>
-                                                                                                                                       <int key="NSPeriodicDelay">400</int>
-                                                                                                                                       <int key="NSPeriodicInterval">75</int>
-                                                                                                                                       <object class="NSMenuItem" key="NSMenuItem" id="85032843">
-                                                                                                                                               <reference key="NSMenu" ref="577969360"/>
-                                                                                                                                               <string key="NSTitle">Item 1</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="315488983">
-                                                                                                                                                       <string key="NSClassName">NSImage</string>
-                                                                                                                                                       <string key="NSResourceName">NSMenuCheckmark</string>
-                                                                                                                                               </object>
-                                                                                                                                               <object class="NSCustomResource" key="NSMixedImage" id="216289096">
-                                                                                                                                                       <string key="NSClassName">NSImage</string>
-                                                                                                                                                       <string key="NSResourceName">NSMenuMixedState</string>
-                                                                                                                                               </object>
-                                                                                                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                                                                                                               <reference key="NSTarget" ref="261514411"/>
-                                                                                                                                       </object>
-                                                                                                                                       <bool key="NSMenuItemRespectAlignment">YES</bool>
-                                                                                                                                       <object class="NSMenu" key="NSMenu" id="577969360">
-                                                                                                                                               <string key="NSTitle">OtherViews</string>
-                                                                                                                                               <object class="NSMutableArray" key="NSMenuItems">
-                                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                                                                       <reference ref="85032843"/>
-                                                                                                                                                       <object class="NSMenuItem" id="804424712">
-                                                                                                                                                               <reference key="NSMenu" ref="577969360"/>
-                                                                                                                                                               <string key="NSTitle">Item 2</string>
-                                                                                                                                                               <string key="NSKeyEquiv"/>
-                                                                                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
-                                                                                                                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                                                                                                                               <reference key="NSTarget" ref="261514411"/>
-                                                                                                                                                       </object>
-                                                                                                                                                       <object class="NSMenuItem" id="1018195923">
-                                                                                                                                                               <reference key="NSMenu" ref="577969360"/>
-                                                                                                                                                               <string key="NSTitle">Item 3</string>
-                                                                                                                                                               <string key="NSKeyEquiv"/>
-                                                                                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
-                                                                                                                                                               <string key="NSAction">_popUpItemAction:</string>
-                                                                                                                                                               <reference key="NSTarget" ref="261514411"/>
-                                                                                                                                                       </object>
-                                                                                                                                               </object>
-                                                                                                                                       </object>
-                                                                                                                                       <int key="NSPreferredEdge">1</int>
-                                                                                                                                       <bool key="NSUsesItemFromMenu">YES</bool>
-                                                                                                                                       <bool key="NSAltersState">YES</bool>
-                                                                                                                                       <int key="NSArrowPosition">2</int>
+                                                                                                                                       <reference key="NSControlView" ref="1021399174"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
                                                                                                                                </object>
                                                                                                                        </object>
-                                                                                                                       <object class="NSTextField" id="301555397">
-                                                                                                                               <reference key="NSNextResponder" ref="278260513"/>
+                                                                                                                       <object class="NSTextField" id="194145642">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
                                                                                                                                <int key="NSvFlags">268</int>
-                                                                                                                               <string key="NSFrame">{{23, 9}, {73, 14}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="278260513"/>
+                                                                                                                               <string key="NSFrame">{{97, 88}, {68, 11}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="926890760">
-                                                                                                                                       <int key="NSCellFlags">67239488</int>
-                                                                                                                                       <int key="NSCellFlags2">272761856</int>
-                                                                                                                                       <string key="NSContents">Anamorphic:</string>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="664940567">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">4456448</int>
+                                                                                                                                       <string key="NSContents">Custom</string>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="194145642"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="294892452">
+                                                                                                                               <reference key="NSNextResponder" ref="114416973"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{12, 98}, {59, 17}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="114416973"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="511041238">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">71303168</int>
+                                                                                                                                       <string key="NSContents">Cropping:</string>
                                                                                                                                        <reference key="NSSupport" ref="26"/>
-                                                                                                                                       <reference key="NSControlView" ref="301555397"/>
+                                                                                                                                       <reference key="NSControlView" ref="294892452"/>
                                                                                                                                        <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                                                                       <reference key="NSTextColor" ref="607671536"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
                                                                                                                                </object>
                                                                                                                        </object>
                                                                                                                </object>
-                                                                                                               <string key="NSFrame">{{2, 18}, {228, 110}}</string>
-                                                                                                               <reference key="NSSuperview" ref="1011917013"/>
+                                                                                                               <string key="NSFrame">{{1, 1}, {282, 124}}</string>
+                                                                                                               <reference key="NSSuperview" ref="1064912113"/>
                                                                                                        </object>
                                                                                                </object>
-                                                                                               <string key="NSFrame">{{14, 205}, {232, 130}}</string>
+                                                                                               <string key="NSFrame">{{515, 202}, {284, 126}}</string>
                                                                                                <reference key="NSSuperview" ref="490590002"/>
                                                                                                <string key="NSOffsets">{0, 0}</string>
                                                                                                <object class="NSTextFieldCell" key="NSTitleCell">
@@ -936,30 +1169,14 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
                                                                                                        </object>
                                                                                                </object>
-                                                                                               <reference key="NSContentView" ref="278260513"/>
-                                                                                               <int key="NSBorderType">3</int>
+                                                                                               <reference key="NSContentView" ref="114416973"/>
+                                                                                               <int key="NSBorderType">1</int>
                                                                                                <int key="NSBoxType">0</int>
-                                                                                               <int key="NSTitlePosition">4</int>
+                                                                                               <int key="NSTitlePosition">0</int>
                                                                                                <bool key="NSTransparent">NO</bool>
                                                                                        </object>
-                                                                                       <object class="NSTextField" id="294892452">
-                                                                                               <reference key="NSNextResponder" ref="490590002"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{14, 175}, {68, 17}}</string>
-                                                                                               <reference key="NSSuperview" ref="490590002"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="511041238">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">4194304</int>
-                                                                                                       <string key="NSContents">Cropping</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="294892452"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                                       <reference key="NSTextColor" ref="852384715"/>
-                                                                                               </object>
-                                                                                       </object>
                                                                                </object>
-                                                                               <string key="NSFrame">{{10, 19}, {263, 341}}</string>
+                                                                               <string key="NSFrame">{{10, 19}, {801, 330}}</string>
                                                                                <reference key="NSSuperview" ref="570027662"/>
                                                                        </object>
                                                                        <string key="NSLabel">Size</string>
@@ -975,7 +1192,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                        <object class="NSBox" id="123709997">
                                                                                                <reference key="NSNextResponder" ref="49700183"/>
-                                                                                               <int key="NSvFlags">18</int>
+                                                                                               <int key="NSvFlags">12</int>
                                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                                        <object class="NSView" id="614431874">
@@ -1060,8 +1277,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                                                                                                <int key="NSState">1</int>
-                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                <reference key="NSTarget" ref="225659946"/>
                                                                                                                                        </object>
@@ -1079,8 +1296,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                                <string key="NSKeyEquiv"/>
                                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                                <reference key="NSTarget" ref="225659946"/>
                                                                                                                                                        </object>
@@ -1090,8 +1307,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                                <string key="NSKeyEquiv"/>
                                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                                <reference key="NSTarget" ref="225659946"/>
                                                                                                                                                        </object>
@@ -1133,7 +1350,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                <reference key="NSSuperview" ref="123709997"/>
                                                                                                        </object>
                                                                                                </object>
-                                                                                               <string key="NSFrame">{{15, 261}, {232, 73}}</string>
+                                                                                               <string key="NSFrame">{{15, 255}, {232, 73}}</string>
                                                                                                <reference key="NSSuperview" ref="49700183"/>
                                                                                                <string key="NSOffsets">{0, 0}</string>
                                                                                                <object class="NSTextFieldCell" key="NSTitleCell">
@@ -1166,16 +1383,16 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                        <object class="NSSlider" id="985124611">
                                                                                                                                <reference key="NSNextResponder" ref="769476491"/>
                                                                                                                                <int key="NSvFlags">268</int>
-                                                                                                                               <string key="NSFrame">{{59, 64}, {37, 16}}</string>
+                                                                                                                               <string key="NSFrame">{{59, 65}, {37, 15}}</string>
                                                                                                                                <reference key="NSSuperview" ref="769476491"/>
                                                                                                                                <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                                                                <object class="NSArray" key="NSViewContentFilters">
                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                                                                        <object class="CIColorMonochrome">
                                                                                                                                                <object class="CIColor" key="CI_inputColor">
-                                                                                                                                                       <float key="red">7.019608e-01</float>
-                                                                                                                                                       <float key="green">7.019608e-01</float>
-                                                                                                                                                       <float key="blue">7.019608e-01</float>
+                                                                                                                                                       <float key="red">1.000000e+00</float>
+                                                                                                                                                       <float key="green">1.000000e+00</float>
+                                                                                                                                                       <float key="blue">1.000000e+00</float>
                                                                                                                                                        <float key="alpha">1.000000e+00</float>
                                                                                                                                                </object>
                                                                                                                                                <reference key="CI_inputIntensity" ref="172944286"/>
@@ -1184,16 +1401,16 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                </object>
                                                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                                                <object class="NSSliderCell" key="NSCell" id="288804516">
-                                                                                                                                       <int key="NSCellFlags">-2079981824</int>
-                                                                                                                                       <int key="NSCellFlags2">262144</int>
+                                                                                                                                       <int key="NSCellFlags">-2080244224</int>
+                                                                                                                                       <int key="NSCellFlags2">131072</int>
                                                                                                                                        <string key="NSContents"/>
-                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
                                                                                                                                        <reference key="NSControlView" ref="985124611"/>
                                                                                                                                        <double key="NSMaxValue">1.000000e+00</double>
                                                                                                                                        <double key="NSMinValue">0.000000e+00</double>
                                                                                                                                        <double key="NSValue">0.000000e+00</double>
                                                                                                                                        <double key="NSAltIncValue">0.000000e+00</double>
-                                                                                                                                       <int key="NSNumberOfTickMarks">2</int>
+                                                                                                                                       <int key="NSNumberOfTickMarks">0</int>
                                                                                                                                        <int key="NSTickMarkPosition">1</int>
                                                                                                                                        <bool key="NSAllowsTickMarkValuesOnly">YES</bool>
                                                                                                                                        <bool key="NSVertical">NO</bool>
@@ -1233,7 +1450,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                        </object>
                                                                                                                        <object class="NSBox" id="889994612">
                                                                                                                                <reference key="NSNextResponder" ref="769476491"/>
-                                                                                                                               <int key="NSvFlags">18</int>
+                                                                                                                               <int key="NSvFlags">12</int>
                                                                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                                                                        <object class="NSView" id="277740026">
@@ -1314,8 +1531,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                                                                                                                                <int key="NSState">1</int>
-                                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                                                <reference key="NSTarget" ref="454070103"/>
                                                                                                                                                                        </object>
@@ -1333,8 +1550,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                                                                <string key="NSKeyEquiv"/>
                                                                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                                                                <reference key="NSTarget" ref="454070103"/>
                                                                                                                                                                                        </object>
@@ -1344,8 +1561,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                                                                <string key="NSKeyEquiv"/>
                                                                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                                                                <reference key="NSTarget" ref="454070103"/>
                                                                                                                                                                                        </object>
@@ -1401,7 +1618,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                        </object>
                                                                                                                        <object class="NSBox" id="136990045">
                                                                                                                                <reference key="NSNextResponder" ref="769476491"/>
-                                                                                                                               <int key="NSvFlags">18</int>
+                                                                                                                               <int key="NSvFlags">12</int>
                                                                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                                                                        <object class="NSView" id="800728459">
@@ -1482,8 +1699,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                                                                                                                                <int key="NSState">1</int>
-                                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                                                <reference key="NSTarget" ref="247704759"/>
                                                                                                                                                                        </object>
@@ -1501,8 +1718,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                                                                <string key="NSKeyEquiv"/>
                                                                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                                                                <reference key="NSTarget" ref="247704759"/>
                                                                                                                                                                                        </object>
@@ -1512,8 +1729,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                                                                <string key="NSKeyEquiv"/>
                                                                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                                                                <reference key="NSTarget" ref="247704759"/>
                                                                                                                                                                                        </object>
@@ -1572,7 +1789,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                <reference key="NSSuperview" ref="211309117"/>
                                                                                                        </object>
                                                                                                </object>
-                                                                                               <string key="NSFrame">{{15, 153}, {232, 112}}</string>
+                                                                                               <string key="NSFrame">{{15, 140}, {232, 112}}</string>
                                                                                                <reference key="NSSuperview" ref="49700183"/>
                                                                                                <string key="NSOffsets">{0, 0}</string>
                                                                                                <object class="NSTextFieldCell" key="NSTitleCell">
@@ -1594,7 +1811,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                        </object>
                                                                                        <object class="NSBox" id="691710132">
                                                                                                <reference key="NSNextResponder" ref="49700183"/>
-                                                                                               <int key="NSvFlags">18</int>
+                                                                                               <int key="NSvFlags">12</int>
                                                                                                <object class="NSMutableArray" key="NSSubviews">
                                                                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                                        <object class="NSView" id="432503529">
@@ -1605,7 +1822,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                        <object class="NSTextField" id="407034984">
                                                                                                                                <reference key="NSNextResponder" ref="432503529"/>
                                                                                                                                <int key="NSvFlags">268</int>
-                                                                                                                               <string key="NSFrame">{{15, 45}, {68, 17}}</string>
+                                                                                                                               <string key="NSFrame">{{15, 37}, {68, 17}}</string>
                                                                                                                                <reference key="NSSuperview" ref="432503529"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                                                <object class="NSTextFieldCell" key="NSCell" id="15366198">
@@ -1621,7 +1838,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                        <object class="NSTextField" id="929586587">
                                                                                                                                <reference key="NSNextResponder" ref="432503529"/>
                                                                                                                                <int key="NSvFlags">268</int>
-                                                                                                                               <string key="NSFrame">{{15, 22}, {68, 17}}</string>
+                                                                                                                               <string key="NSFrame">{{15, 14}, {68, 17}}</string>
                                                                                                                                <reference key="NSSuperview" ref="432503529"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
                                                                                                                                <object class="NSTextFieldCell" key="NSCell" id="601710816">
@@ -1637,7 +1854,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                        <object class="NSPopUpButton" id="362740356">
                                                                                                                                <reference key="NSNextResponder" ref="432503529"/>
                                                                                                                                <int key="NSvFlags">268</int>
-                                                                                                                               <string key="NSFrame">{{103, 46}, {110, 15}}</string>
+                                                                                                                               <string key="NSFrame">{{103, 38}, {110, 15}}</string>
                                                                                                                                <reference key="NSSuperview" ref="432503529"/>
                                                                                                                                <bool key="NSViewIsLayerTreeHost">YES</bool>
                                                                                                                                <object class="NSArray" key="NSViewContentFilters">
@@ -1675,8 +1892,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                                                                                                <int key="NSState">1</int>
-                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                <reference key="NSTarget" ref="625319255"/>
                                                                                                                                        </object>
@@ -1694,8 +1911,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                                <string key="NSKeyEquiv"/>
                                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                                <reference key="NSTarget" ref="625319255"/>
                                                                                                                                                        </object>
@@ -1705,42 +1922,200 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                                                                <string key="NSKeyEquiv"/>
                                                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                                                               <reference key="NSOnImage" ref="315488983"/>
-                                                                                                                                                               <reference key="NSMixedImage" ref="216289096"/>
+                                                                                                                                                               <reference key="NSOnImage" ref="279874594"/>
+                                                                                                                                                               <reference key="NSMixedImage" ref="300720659"/>
                                                                                                                                                                <string key="NSAction">_popUpItemAction:</string>
                                                                                                                                                                <reference key="NSTarget" ref="625319255"/>
                                                                                                                                                        </object>
                                                                                                                                                </object>
                                                                                                                                        </object>
-                                                                                                                                       <int key="NSPreferredEdge">3</int>
-                                                                                                                                       <bool key="NSUsesItemFromMenu">YES</bool>
-                                                                                                                                       <bool key="NSAltersState">YES</bool>
-                                                                                                                                       <int key="NSArrowPosition">1</int>
+                                                                                                                                       <int key="NSPreferredEdge">3</int>
+                                                                                                                                       <bool key="NSUsesItemFromMenu">YES</bool>
+                                                                                                                                       <bool key="NSAltersState">YES</bool>
+                                                                                                                                       <int key="NSArrowPosition">1</int>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="529723890">
+                                                                                                                               <reference key="NSNextResponder" ref="432503529"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{104, 16}, {108, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="432503529"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="692527149">
+                                                                                                                                       <int key="NSCellFlags">-1804468671</int>
+                                                                                                                                       <int key="NSCellFlags2">272892928</int>
+                                                                                                                                       <string key="NSContents"/>
+                                                                                                                                       <reference key="NSSupport" ref="22"/>
+                                                                                                                                       <reference key="NSControlView" ref="529723890"/>
+                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="406287577"/>
+                                                                                                                                       <reference key="NSTextColor" ref="779569028"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                               </object>
+                                                                                                               <string key="NSFrame">{{1, 1}, {230, 63}}</string>
+                                                                                                               <reference key="NSSuperview" ref="691710132"/>
+                                                                                                       </object>
+                                                                                               </object>
+                                                                                               <string key="NSFrame">{{14, 73}, {232, 65}}</string>
+                                                                                               <reference key="NSSuperview" ref="49700183"/>
+                                                                                               <string key="NSOffsets">{0, 0}</string>
+                                                                                               <object class="NSTextFieldCell" key="NSTitleCell">
+                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                       <int key="NSCellFlags2">0</int>
+                                                                                                       <string key="NSContents">Box</string>
+                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                       <reference key="NSBackgroundColor" ref="406287577"/>
+                                                                                                       <object class="NSColor" key="NSTextColor">
+                                                                                                               <int key="NSColorSpace">3</int>
+                                                                                                               <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+                                                                                                       </object>
+                                                                                               </object>
+                                                                                               <reference key="NSContentView" ref="432503529"/>
+                                                                                               <int key="NSBorderType">1</int>
+                                                                                               <int key="NSBoxType">0</int>
+                                                                                               <int key="NSTitlePosition">0</int>
+                                                                                               <bool key="NSTransparent">NO</bool>
+                                                                                       </object>
+                                                                                       <object class="NSBox" id="825796162">
+                                                                                               <reference key="NSNextResponder" ref="49700183"/>
+                                                                                               <int key="NSvFlags">12</int>
+                                                                                               <object class="NSMutableArray" key="NSSubviews">
+                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                       <object class="NSView" id="487196162">
+                                                                                                               <reference key="NSNextResponder" ref="825796162"/>
+                                                                                                               <int key="NSvFlags">256</int>
+                                                                                                               <object class="NSMutableArray" key="NSSubviews">
+                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                       <object class="NSTextField" id="425499167">
+                                                                                                                               <reference key="NSNextResponder" ref="487196162"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{29, 39}, {51, 17}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="487196162"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="440135121">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">71303168</int>
+                                                                                                                                       <string key="NSContents">Deblock:</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="425499167"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="1014567695">
+                                                                                                                               <reference key="NSNextResponder" ref="487196162"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{17, 8}, {63, 14}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="487196162"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="922265218">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">71303168</int>
+                                                                                                                                       <string key="NSContents">Grayscale:</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="1014567695"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSTextField" id="345974679">
+                                                                                                                               <reference key="NSNextResponder" ref="487196162"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{79, 41}, {31, 14}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="487196162"/>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="288379564">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">138543104</int>
+                                                                                                                                       <string key="NSContents">Off</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="345974679"/>
+                                                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
+                                                                                                                                       <reference key="NSTextColor" ref="852384715"/>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSSlider" id="703236195">
+                                                                                                                               <reference key="NSNextResponder" ref="487196162"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{108, 40}, {104, 16}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="487196162"/>
+                                                                                                                               <bool key="NSViewIsLayerTreeHost">YES</bool>
+                                                                                                                               <object class="NSArray" key="NSViewContentFilters">
+                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                       <object class="CIColorMonochrome">
+                                                                                                                                               <object class="CIColor" key="CI_inputColor">
+                                                                                                                                                       <float key="red">7.019608e-01</float>
+                                                                                                                                                       <float key="green">7.019608e-01</float>
+                                                                                                                                                       <float key="blue">7.019608e-01</float>
+                                                                                                                                                       <float key="alpha">1.000000e+00</float>
+                                                                                                                                               </object>
+                                                                                                                                               <reference key="CI_inputIntensity" ref="172944286"/>
+                                                                                                                                               <bool key="CIEnabled">YES</bool>
+                                                                                                                                       </object>
                                                                                                                                </object>
-                                                                                                                       </object>
-                                                                                                                       <object class="NSTextField" id="529723890">
-                                                                                                                               <reference key="NSNextResponder" ref="432503529"/>
-                                                                                                                               <int key="NSvFlags">268</int>
-                                                                                                                               <string key="NSFrame">{{104, 24}, {108, 16}}</string>
-                                                                                                                               <reference key="NSSuperview" ref="432503529"/>
                                                                                                                                <bool key="NSEnabled">YES</bool>
-                                                                                                                               <object class="NSTextFieldCell" key="NSCell" id="692527149">
-                                                                                                                                       <int key="NSCellFlags">-1804468671</int>
-                                                                                                                                       <int key="NSCellFlags2">272892928</int>
+                                                                                                                               <object class="NSSliderCell" key="NSCell" id="145960326">
+                                                                                                                                       <int key="NSCellFlags">-2079981824</int>
+                                                                                                                                       <int key="NSCellFlags2">262144</int>
                                                                                                                                        <string key="NSContents"/>
                                                                                                                                        <reference key="NSSupport" ref="22"/>
-                                                                                                                                       <reference key="NSControlView" ref="529723890"/>
-                                                                                                                                       <bool key="NSDrawsBackground">YES</bool>
-                                                                                                                                       <reference key="NSBackgroundColor" ref="406287577"/>
-                                                                                                                                       <reference key="NSTextColor" ref="779569028"/>
+                                                                                                                                       <reference key="NSControlView" ref="703236195"/>
+                                                                                                                                       <double key="NSMaxValue">1.500000e+01</double>
+                                                                                                                                       <double key="NSMinValue">4.000000e+00</double>
+                                                                                                                                       <double key="NSValue">4.000000e+00</double>
+                                                                                                                                       <double key="NSAltIncValue">0.000000e+00</double>
+                                                                                                                                       <int key="NSNumberOfTickMarks">12</int>
+                                                                                                                                       <int key="NSTickMarkPosition">0</int>
+                                                                                                                                       <bool key="NSAllowsTickMarkValuesOnly">YES</bool>
+                                                                                                                                       <bool key="NSVertical">NO</bool>
+                                                                                                                               </object>
+                                                                                                                       </object>
+                                                                                                                       <object class="NSButton" id="1021739901">
+                                                                                                                               <reference key="NSNextResponder" ref="487196162"/>
+                                                                                                                               <int key="NSvFlags">268</int>
+                                                                                                                               <string key="NSFrame">{{84, 6}, {19, 18}}</string>
+                                                                                                                               <reference key="NSSuperview" ref="487196162"/>
+                                                                                                                               <bool key="NSViewIsLayerTreeHost">YES</bool>
+                                                                                                                               <object class="NSArray" key="NSViewContentFilters">
+                                                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                                                                                       <object class="CIColorMonochrome">
+                                                                                                                                               <object class="CIColor" key="CI_inputColor">
+                                                                                                                                                       <float key="red">7.019608e-01</float>
+                                                                                                                                                       <float key="green">7.019608e-01</float>
+                                                                                                                                                       <float key="blue">7.019608e-01</float>
+                                                                                                                                                       <float key="alpha">1.000000e+00</float>
+                                                                                                                                               </object>
+                                                                                                                                               <reference key="CI_inputIntensity" ref="172944286"/>
+                                                                                                                                               <bool key="CIEnabled">YES</bool>
+                                                                                                                                       </object>
+                                                                                                                               </object>
+                                                                                                                               <bool key="NSEnabled">YES</bool>
+                                                                                                                               <object class="NSButtonCell" key="NSCell" id="1059254264">
+                                                                                                                                       <int key="NSCellFlags">67239424</int>
+                                                                                                                                       <int key="NSCellFlags2">131072</int>
+                                                                                                                                       <string key="NSContents">Check</string>
+                                                                                                                                       <reference key="NSSupport" ref="26"/>
+                                                                                                                                       <reference key="NSControlView" ref="1021739901"/>
+                                                                                                                                       <int key="NSButtonFlags">1211912703</int>
+                                                                                                                                       <int key="NSButtonFlags2">130</int>
+                                                                                                                                       <object class="NSCustomResource" key="NSNormalImage">
+                                                                                                                                               <string key="NSClassName">NSImage</string>
+                                                                                                                                               <string key="NSResourceName">NSSwitch</string>
+                                                                                                                                       </object>
+                                                                                                                                       <reference key="NSAlternateImage" ref="998385597"/>
+                                                                                                                                       <string key="NSAlternateContents"/>
+                                                                                                                                       <string key="NSKeyEquivalent"/>
+                                                                                                                                       <int key="NSPeriodicDelay">200</int>
+                                                                                                                                       <int key="NSPeriodicInterval">25</int>
                                                                                                                                </object>
                                                                                                                        </object>
                                                                                                                </object>
-                                                                                                               <string key="NSFrame">{{1, 1}, {230, 71}}</string>
-                                                                                                               <reference key="NSSuperview" ref="691710132"/>
+                                                                                                               <string key="NSFrame">{{1, 1}, {230, 63}}</string>
+                                                                                                               <reference key="NSSuperview" ref="825796162"/>
                                                                                                        </object>
                                                                                                </object>
-                                                                                               <string key="NSFrame">{{14, 78}, {232, 73}}</string>
+                                                                                               <string key="NSFrame">{{15, 5}, {232, 65}}</string>
                                                                                                <reference key="NSSuperview" ref="49700183"/>
                                                                                                <string key="NSOffsets">{0, 0}</string>
                                                                                                <object class="NSTextFieldCell" key="NSTitleCell">
@@ -1754,137 +2129,14 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                                                                                <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
                                                                                                        </object>
                                                                                                </object>
-                                                                                               <reference key="NSContentView" ref="432503529"/>
+                                                                                               <reference key="NSContentView" ref="487196162"/>
                                                                                                <int key="NSBorderType">1</int>
                                                                                                <int key="NSBoxType">0</int>
                                                                                                <int key="NSTitlePosition">0</int>
                                                                                                <bool key="NSTransparent">NO</bool>
                                                                                        </object>
-                                                                                       <object class="NSTextField" id="425499167">
-                                                                                               <reference key="NSNextResponder" ref="49700183"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{44, 55}, {51, 17}}</string>
-                                                                                               <reference key="NSSuperview" ref="49700183"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="440135121">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Deblock:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="425499167"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                                       <reference key="NSTextColor" ref="852384715"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="1014567695">
-                                                                                               <reference key="NSNextResponder" ref="49700183"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{32, 29}, {63, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="49700183"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="922265218">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">71303168</int>
-                                                                                                       <string key="NSContents">Grayscale:</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="1014567695"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                                       <reference key="NSTextColor" ref="852384715"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSTextField" id="345974679">
-                                                                                               <reference key="NSNextResponder" ref="49700183"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{94, 57}, {31, 14}}</string>
-                                                                                               <reference key="NSSuperview" ref="49700183"/>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSTextFieldCell" key="NSCell" id="288379564">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">138543104</int>
-                                                                                                       <string key="NSContents">Off</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="345974679"/>
-                                                                                                       <reference key="NSBackgroundColor" ref="407686733"/>
-                                                                                                       <reference key="NSTextColor" ref="852384715"/>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSSlider" id="703236195">
-                                                                                               <reference key="NSNextResponder" ref="49700183"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{123, 57}, {104, 16}}</string>
-                                                                                               <reference key="NSSuperview" ref="49700183"/>
-                                                                                               <bool key="NSViewIsLayerTreeHost">YES</bool>
-                                                                                               <object class="NSArray" key="NSViewContentFilters">
-                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                       <object class="CIColorMonochrome">
-                                                                                                               <object class="CIColor" key="CI_inputColor">
-                                                                                                                       <float key="red">7.019608e-01</float>
-                                                                                                                       <float key="green">7.019608e-01</float>
-                                                                                                                       <float key="blue">7.019608e-01</float>
-                                                                                                                       <float key="alpha">1.000000e+00</float>
-                                                                                                               </object>
-                                                                                                               <reference key="CI_inputIntensity" ref="172944286"/>
-                                                                                                               <bool key="CIEnabled">YES</bool>
-                                                                                                       </object>
-                                                                                               </object>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSSliderCell" key="NSCell" id="145960326">
-                                                                                                       <int key="NSCellFlags">-2079981824</int>
-                                                                                                       <int key="NSCellFlags2">262144</int>
-                                                                                                       <string key="NSContents"/>
-                                                                                                       <reference key="NSSupport" ref="22"/>
-                                                                                                       <reference key="NSControlView" ref="703236195"/>
-                                                                                                       <double key="NSMaxValue">1.500000e+01</double>
-                                                                                                       <double key="NSMinValue">4.000000e+00</double>
-                                                                                                       <double key="NSValue">4.000000e+00</double>
-                                                                                                       <double key="NSAltIncValue">0.000000e+00</double>
-                                                                                                       <int key="NSNumberOfTickMarks">12</int>
-                                                                                                       <int key="NSTickMarkPosition">0</int>
-                                                                                                       <bool key="NSAllowsTickMarkValuesOnly">YES</bool>
-                                                                                                       <bool key="NSVertical">NO</bool>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSButton" id="1021739901">
-                                                                                               <reference key="NSNextResponder" ref="49700183"/>
-                                                                                               <int key="NSvFlags">256</int>
-                                                                                               <string key="NSFrame">{{99, 27}, {19, 18}}</string>
-                                                                                               <reference key="NSSuperview" ref="49700183"/>
-                                                                                               <bool key="NSViewIsLayerTreeHost">YES</bool>
-                                                                                               <object class="NSArray" key="NSViewContentFilters">
-                                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                       <object class="CIColorMonochrome">
-                                                                                                               <object class="CIColor" key="CI_inputColor">
-                                                                                                                       <float key="red">7.019608e-01</float>
-                                                                                                                       <float key="green">7.019608e-01</float>
-                                                                                                                       <float key="blue">7.019608e-01</float>
-                                                                                                                       <float key="alpha">1.000000e+00</float>
-                                                                                                               </object>
-                                                                                                               <reference key="CI_inputIntensity" ref="172944286"/>
-                                                                                                               <bool key="CIEnabled">YES</bool>
-                                                                                                       </object>
-                                                                                               </object>
-                                                                                               <bool key="NSEnabled">YES</bool>
-                                                                                               <object class="NSButtonCell" key="NSCell" id="1059254264">
-                                                                                                       <int key="NSCellFlags">67239424</int>
-                                                                                                       <int key="NSCellFlags2">131072</int>
-                                                                                                       <string key="NSContents">Check</string>
-                                                                                                       <reference key="NSSupport" ref="26"/>
-                                                                                                       <reference key="NSControlView" ref="1021739901"/>
-                                                                                                       <int key="NSButtonFlags">1211912703</int>
-                                                                                                       <int key="NSButtonFlags2">130</int>
-                                                                                                       <object class="NSCustomResource" key="NSNormalImage">
-                                                                                                               <string key="NSClassName">NSImage</string>
-                                                                                                               <string key="NSResourceName">NSSwitch</string>
-                                                                                                       </object>
-                                                                                                       <reference key="NSAlternateImage" ref="998385597"/>
-                                                                                                       <string key="NSAlternateContents"/>
-                                                                                                       <string key="NSKeyEquivalent"/>
-                                                                                                       <int key="NSPeriodicDelay">200</int>
-                                                                                                       <int key="NSPeriodicInterval">25</int>
-                                                                                               </object>
-                                                                                       </object>
                                                                                </object>
-                                                                               <string key="NSFrame">{{10, 19}, {263, 341}}</string>
+                                                                               <string key="NSFrame">{{10, 19}, {801, 330}}</string>
                                                                        </object>
                                                                        <string key="NSLabel">Filters</string>
                                                                        <reference key="NSColor" ref="407686733"/>
@@ -1902,7 +2154,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        </object>
                                                </object>
                                        </object>
-                                       <string key="NSFrameSize">{311, 447}</string>
+                                       <string key="NSFrameSize">{849, 399}</string>
                                        <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -2122,14 +2374,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fPictureSizeBox</string>
-                                               <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="1011917013"/>
-                                       </object>
-                                       <int key="connectionID">241</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
                                                <string key="label">fPictureCropBox</string>
                                                <reference key="source" ref="355312334"/>
                                                <reference key="destination" ref="1064912113"/>
@@ -2162,14 +2406,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fSizeFilterView</string>
-                                               <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="570027662"/>
-                                       </object>
-                                       <int key="connectionID">355</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
                                                <string key="label">fDetelecineBox</string>
                                                <reference key="source" ref="355312334"/>
                                                <reference key="destination" ref="123709997"/>
@@ -2226,139 +2462,291 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDecombBox</string>
+                                               <string key="label">fDecombBox</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="889994612"/>
+                                       </object>
+                                       <int key="connectionID">364</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDeinterlaceBox</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="136990045"/>
+                                       </object>
+                                       <int key="connectionID">365</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDeinterlacePopUp</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="850427642"/>
+                                       </object>
+                                       <int key="connectionID">366</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDeinterlaceField</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="181376038"/>
+                                       </object>
+                                       <int key="connectionID">367</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDenoiseBox</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="691710132"/>
+                                       </object>
+                                       <int key="connectionID">368</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDenoisePopUp</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="362740356"/>
+                                       </object>
+                                       <int key="connectionID">369</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDenoiseField</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="529723890"/>
+                                       </object>
+                                       <int key="connectionID">370</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDeblockSlider</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="703236195"/>
+                                       </object>
+                                       <int key="connectionID">371</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDeblockField</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="345974679"/>
+                                       </object>
+                                       <int key="connectionID">372</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fGrayscaleCheck</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="1021739901"/>
+                                       </object>
+                                       <int key="connectionID">373</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">FilterSettingsChanged:</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="444006373"/>
+                                       </object>
+                                       <int key="connectionID">374</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">FilterSettingsChanged:</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="356573645"/>
+                                       </object>
+                                       <int key="connectionID">375</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">FilterSettingsChanged:</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="850427642"/>
+                                       </object>
+                                       <int key="connectionID">377</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">FilterSettingsChanged:</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="362740356"/>
+                                       </object>
+                                       <int key="connectionID">378</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">deblockSliderChanged:</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="703236195"/>
+                                       </object>
+                                       <int key="connectionID">379</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">FilterSettingsChanged:</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="1021739901"/>
+                                       </object>
+                                       <int key="connectionID">380</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">modeDecombDeinterlaceSliderChanged:</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="985124611"/>
+                                       </object>
+                                       <int key="connectionID">381</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fModulusPopUp</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="387637584"/>
+                                       </object>
+                                       <int key="connectionID">392</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">SettingsChanged:</string>
+                                               <reference key="source" ref="355312334"/>
+                                               <reference key="destination" ref="387637584"/>
+                                       </object>
+                                       <int key="connectionID">393</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDisplayWidthField</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="889994612"/>
+                                               <reference key="destination" ref="924352608"/>
                                        </object>
-                                       <int key="connectionID">364</int>
+                                       <int key="connectionID">407</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDeinterlaceBox</string>
+                                               <string key="label">fSizeFilterView</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="136990045"/>
+                                               <reference key="destination" ref="570027662"/>
                                        </object>
-                                       <int key="connectionID">365</int>
+                                       <int key="connectionID">419</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDeinterlacePopUp</string>
-                                               <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="850427642"/>
+                                               <string key="label">delegate</string>
+                                               <reference key="source" ref="570027662"/>
+                                               <reference key="destination" ref="355312334"/>
                                        </object>
-                                       <int key="connectionID">366</int>
+                                       <int key="connectionID">420</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDeinterlaceField</string>
+                                               <string key="label">fDeblockBox</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="181376038"/>
+                                               <reference key="destination" ref="825796162"/>
                                        </object>
-                                       <int key="connectionID">367</int>
+                                       <int key="connectionID">434</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDenoiseBox</string>
+                                               <string key="label">fPictureSizeBox</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="691710132"/>
+                                               <reference key="destination" ref="291242569"/>
                                        </object>
-                                       <int key="connectionID">368</int>
+                                       <int key="connectionID">437</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDenoisePopUp</string>
+                                               <string key="label">fParWidthField</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="362740356"/>
+                                               <reference key="destination" ref="998049160"/>
                                        </object>
-                                       <int key="connectionID">369</int>
+                                       <int key="connectionID">448</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDenoiseField</string>
+                                               <string key="label">fParHeightField</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="529723890"/>
+                                               <reference key="destination" ref="601215307"/>
                                        </object>
-                                       <int key="connectionID">370</int>
+                                       <int key="connectionID">449</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDeblockSlider</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">SettingsChanged:</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="703236195"/>
+                                               <reference key="destination" ref="998049160"/>
                                        </object>
-                                       <int key="connectionID">371</int>
+                                       <int key="connectionID">453</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fDeblockField</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">SettingsChanged:</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="345974679"/>
+                                               <reference key="destination" ref="924352608"/>
                                        </object>
-                                       <int key="connectionID">372</int>
+                                       <int key="connectionID">454</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fGrayscaleCheck</string>
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">SettingsChanged:</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="1021739901"/>
+                                               <reference key="destination" ref="601215307"/>
                                        </object>
-                                       <int key="connectionID">373</int>
+                                       <int key="connectionID">456</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">FilterSettingsChanged:</string>
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fRatioLabel</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="444006373"/>
+                                               <reference key="destination" ref="973216726"/>
                                        </object>
-                                       <int key="connectionID">374</int>
+                                       <int key="connectionID">522</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">FilterSettingsChanged:</string>
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fParWidthLabel</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="356573645"/>
+                                               <reference key="destination" ref="122509689"/>
                                        </object>
-                                       <int key="connectionID">375</int>
+                                       <int key="connectionID">524</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">FilterSettingsChanged:</string>
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fParHeightLabel</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="850427642"/>
+                                               <reference key="destination" ref="810439401"/>
                                        </object>
-                                       <int key="connectionID">377</int>
+                                       <int key="connectionID">525</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">FilterSettingsChanged:</string>
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fDisplayWidthLabel</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="362740356"/>
+                                               <reference key="destination" ref="84657333"/>
                                        </object>
-                                       <int key="connectionID">378</int>
+                                       <int key="connectionID">526</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">deblockSliderChanged:</string>
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fRatioLabel2</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="703236195"/>
+                                               <reference key="destination" ref="231562326"/>
                                        </object>
-                                       <int key="connectionID">379</int>
+                                       <int key="connectionID">531</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">FilterSettingsChanged:</string>
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fModulusLabel</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="1021739901"/>
+                                               <reference key="destination" ref="902766107"/>
                                        </object>
-                                       <int key="connectionID">380</int>
+                                       <int key="connectionID">532</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">modeDecombDeinterlaceSliderChanged:</string>
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">fWidthLabel</string>
                                                <reference key="source" ref="355312334"/>
-                                               <reference key="destination" ref="985124611"/>
+                                               <reference key="destination" ref="569671425"/>
                                        </object>
-                                       <int key="connectionID">381</int>
+                                       <int key="connectionID">533</int>
                                </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
@@ -2407,8 +2795,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="922381307"/>
                                                        <reference ref="892118626"/>
-                                                       <reference ref="570027662"/>
                                                        <reference ref="154029488"/>
+                                                       <reference ref="570027662"/>
                                                </object>
                                                <reference key="parent" ref="616825745"/>
                                        </object>
@@ -2489,12 +2877,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="123709997"/>
                                                        <reference ref="691710132"/>
-                                                       <reference ref="425499167"/>
-                                                       <reference ref="345974679"/>
-                                                       <reference ref="703236195"/>
-                                                       <reference ref="1021739901"/>
                                                        <reference ref="211309117"/>
-                                                       <reference ref="1014567695"/>
+                                                       <reference ref="825796162"/>
                                                </object>
                                                <reference key="parent" ref="1059808840"/>
                                        </object>
@@ -2503,9 +2887,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <reference key="object" ref="490590002"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1011917013"/>
+                                                       <reference ref="291242569"/>
                                                        <reference ref="1064912113"/>
-                                                       <reference ref="294892452"/>
                                                </object>
                                                <reference key="parent" ref="184512336"/>
                                        </object>
@@ -2515,16 +2898,17 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="194145642"/>
-                                                       <reference ref="1021399174"/>
                                                        <reference ref="133033963"/>
                                                        <reference ref="842452881"/>
-                                                       <reference ref="411931143"/>
                                                        <reference ref="1067684983"/>
                                                        <reference ref="773085513"/>
                                                        <reference ref="897162141"/>
                                                        <reference ref="1032624817"/>
                                                        <reference ref="510144318"/>
                                                        <reference ref="580805308"/>
+                                                       <reference ref="411931143"/>
+                                                       <reference ref="294892452"/>
+                                                       <reference ref="1021399174"/>
                                                </object>
                                                <reference key="parent" ref="490590002"/>
                                        </object>
@@ -2695,723 +3079,901 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                <reference key="parent" ref="194145642"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">39</int>
-                                               <reference key="object" ref="1011917013"/>
+                                               <int key="objectID">286</int>
+                                               <reference key="object" ref="123709997"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="973216726"/>
-                                                       <reference ref="301555397"/>
-                                                       <reference ref="147098438"/>
-                                                       <reference ref="667015191"/>
-                                                       <reference ref="302614967"/>
-                                                       <reference ref="443002022"/>
-                                                       <reference ref="513894170"/>
-                                                       <reference ref="569671425"/>
-                                                       <reference ref="232869468"/>
-                                                       <reference ref="221469578"/>
+                                                       <reference ref="1003980650"/>
+                                                       <reference ref="675657376"/>
+                                                       <reference ref="444006373"/>
+                                                       <reference ref="907249437"/>
                                                </object>
-                                               <reference key="parent" ref="490590002"/>
+                                               <reference key="parent" ref="49700183"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">244</int>
-                                               <reference key="object" ref="973216726"/>
+                                               <int key="objectID">287</int>
+                                               <reference key="object" ref="211309117"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="910777593"/>
+                                                       <reference ref="478887050"/>
+                                                       <reference ref="873921736"/>
+                                                       <reference ref="985124611"/>
+                                                       <reference ref="889994612"/>
+                                                       <reference ref="136990045"/>
                                                </object>
-                                               <reference key="parent" ref="1011917013"/>
+                                               <reference key="parent" ref="49700183"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">138</int>
-                                               <reference key="object" ref="301555397"/>
+                                               <int key="objectID">288</int>
+                                               <reference key="object" ref="691710132"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="926890760"/>
+                                                       <reference ref="407034984"/>
+                                                       <reference ref="929586587"/>
+                                                       <reference ref="529723890"/>
+                                                       <reference ref="362740356"/>
                                                </object>
-                                               <reference key="parent" ref="1011917013"/>
+                                               <reference key="parent" ref="49700183"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">132</int>
-                                               <reference key="object" ref="147098438"/>
+                                               <int key="objectID">299</int>
+                                               <reference key="object" ref="407034984"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="261514411"/>
+                                                       <reference ref="15366198"/>
                                                </object>
-                                               <reference key="parent" ref="1011917013"/>
+                                               <reference key="parent" ref="691710132"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">44</int>
-                                               <reference key="object" ref="221469578"/>
+                                               <int key="objectID">300</int>
+                                               <reference key="object" ref="362740356"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="714433793"/>
+                                                       <reference ref="625319255"/>
+                                               </object>
+                                               <reference key="parent" ref="691710132"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">301</int>
+                                               <reference key="object" ref="929586587"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="601710816"/>
                                                </object>
-                                               <reference key="parent" ref="1011917013"/>
+                                               <reference key="parent" ref="691710132"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">42</int>
-                                               <reference key="object" ref="232869468"/>
+                                               <int key="objectID">302</int>
+                                               <reference key="object" ref="529723890"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="96315080"/>
+                                                       <reference ref="692527149"/>
+                                               </object>
+                                               <reference key="parent" ref="691710132"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">303</int>
+                                               <reference key="object" ref="692527149"/>
+                                               <reference key="parent" ref="529723890"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">304</int>
+                                               <reference key="object" ref="601710816"/>
+                                               <reference key="parent" ref="929586587"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">305</int>
+                                               <reference key="object" ref="625319255"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="618343102"/>
+                                               </object>
+                                               <reference key="parent" ref="362740356"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">306</int>
+                                               <reference key="object" ref="618343102"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="865792840"/>
+                                                       <reference ref="107429478"/>
+                                                       <reference ref="535683643"/>
+                                               </object>
+                                               <reference key="parent" ref="625319255"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">307</int>
+                                               <reference key="object" ref="865792840"/>
+                                               <reference key="parent" ref="618343102"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">308</int>
+                                               <reference key="object" ref="107429478"/>
+                                               <reference key="parent" ref="618343102"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">309</int>
+                                               <reference key="object" ref="535683643"/>
+                                               <reference key="parent" ref="618343102"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">310</int>
+                                               <reference key="object" ref="15366198"/>
+                                               <reference key="parent" ref="407034984"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">311</int>
+                                               <reference key="object" ref="478887050"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="940230908"/>
+                                               </object>
+                                               <reference key="parent" ref="211309117"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">312</int>
+                                               <reference key="object" ref="873921736"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="475982274"/>
+                                               </object>
+                                               <reference key="parent" ref="211309117"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">313</int>
+                                               <reference key="object" ref="985124611"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="288804516"/>
+                                               </object>
+                                               <reference key="parent" ref="211309117"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">315</int>
+                                               <reference key="object" ref="889994612"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="103870225"/>
+                                                       <reference ref="652411918"/>
+                                                       <reference ref="356573645"/>
+                                                       <reference ref="7173206"/>
+                                               </object>
+                                               <reference key="parent" ref="211309117"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">316</int>
+                                               <reference key="object" ref="103870225"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="558197217"/>
                                                </object>
-                                               <reference key="parent" ref="1011917013"/>
+                                               <reference key="parent" ref="889994612"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">47</int>
-                                               <reference key="object" ref="569671425"/>
+                                               <int key="objectID">317</int>
+                                               <reference key="object" ref="652411918"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="412868245"/>
+                                                       <reference ref="908484803"/>
                                                </object>
-                                               <reference key="parent" ref="1011917013"/>
+                                               <reference key="parent" ref="889994612"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">46</int>
-                                               <reference key="object" ref="667015191"/>
+                                               <int key="objectID">318</int>
+                                               <reference key="object" ref="356573645"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="634499157"/>
+                                                       <reference ref="454070103"/>
                                                </object>
-                                               <reference key="parent" ref="1011917013"/>
+                                               <reference key="parent" ref="889994612"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">45</int>
-                                               <reference key="object" ref="302614967"/>
+                                               <int key="objectID">319</int>
+                                               <reference key="object" ref="7173206"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="595088069"/>
+                                                       <reference ref="695838500"/>
                                                </object>
-                                               <reference key="parent" ref="1011917013"/>
+                                               <reference key="parent" ref="889994612"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">43</int>
-                                               <reference key="object" ref="443002022"/>
+                                               <int key="objectID">320</int>
+                                               <reference key="object" ref="695838500"/>
+                                               <reference key="parent" ref="7173206"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">321</int>
+                                               <reference key="object" ref="454070103"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="649389918"/>
+                                                       <reference ref="259868564"/>
                                                </object>
-                                               <reference key="parent" ref="1011917013"/>
+                                               <reference key="parent" ref="356573645"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">41</int>
-                                               <reference key="object" ref="513894170"/>
+                                               <int key="objectID">322</int>
+                                               <reference key="object" ref="259868564"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="863668536"/>
+                                                       <reference ref="720143866"/>
+                                                       <reference ref="414039981"/>
+                                                       <reference ref="197481337"/>
                                                </object>
-                                               <reference key="parent" ref="1011917013"/>
+                                               <reference key="parent" ref="454070103"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">166</int>
-                                               <reference key="object" ref="863668536"/>
-                                               <reference key="parent" ref="513894170"/>
+                                               <int key="objectID">323</int>
+                                               <reference key="object" ref="720143866"/>
+                                               <reference key="parent" ref="259868564"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">168</int>
-                                               <reference key="object" ref="649389918"/>
-                                               <reference key="parent" ref="443002022"/>
+                                               <int key="objectID">324</int>
+                                               <reference key="object" ref="414039981"/>
+                                               <reference key="parent" ref="259868564"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">170</int>
-                                               <reference key="object" ref="595088069"/>
-                                               <reference key="parent" ref="302614967"/>
+                                               <int key="objectID">325</int>
+                                               <reference key="object" ref="197481337"/>
+                                               <reference key="parent" ref="259868564"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">171</int>
-                                               <reference key="object" ref="634499157"/>
-                                               <reference key="parent" ref="667015191"/>
+                                               <int key="objectID">326</int>
+                                               <reference key="object" ref="908484803"/>
+                                               <reference key="parent" ref="652411918"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">172</int>
-                                               <reference key="object" ref="412868245"/>
-                                               <reference key="parent" ref="569671425"/>
+                                               <int key="objectID">327</int>
+                                               <reference key="object" ref="558197217"/>
+                                               <reference key="parent" ref="103870225"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">167</int>
-                                               <reference key="object" ref="96315080"/>
-                                               <reference key="parent" ref="232869468"/>
+                                               <int key="objectID">340</int>
+                                               <reference key="object" ref="288804516"/>
+                                               <reference key="parent" ref="985124611"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">169</int>
-                                               <reference key="object" ref="714433793"/>
-                                               <reference key="parent" ref="221469578"/>
+                                               <int key="objectID">341</int>
+                                               <reference key="object" ref="475982274"/>
+                                               <reference key="parent" ref="873921736"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">173</int>
-                                               <reference key="object" ref="261514411"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="577969360"/>
-                                               </object>
-                                               <reference key="parent" ref="147098438"/>
+                                               <int key="objectID">342</int>
+                                               <reference key="object" ref="940230908"/>
+                                               <reference key="parent" ref="478887050"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">134</int>
-                                               <reference key="object" ref="577969360"/>
+                                               <int key="objectID">343</int>
+                                               <reference key="object" ref="1003980650"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1018195923"/>
-                                                       <reference ref="804424712"/>
-                                                       <reference ref="85032843"/>
+                                                       <reference ref="673987852"/>
                                                </object>
-                                               <reference key="parent" ref="261514411"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">137</int>
-                                               <reference key="object" ref="1018195923"/>
-                                               <reference key="parent" ref="577969360"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">136</int>
-                                               <reference key="object" ref="804424712"/>
-                                               <reference key="parent" ref="577969360"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">135</int>
-                                               <reference key="object" ref="85032843"/>
-                                               <reference key="parent" ref="577969360"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">174</int>
-                                               <reference key="object" ref="926890760"/>
-                                               <reference key="parent" ref="301555397"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">245</int>
-                                               <reference key="object" ref="910777593"/>
-                                               <reference key="parent" ref="973216726"/>
+                                               <reference key="parent" ref="123709997"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">286</int>
-                                               <reference key="object" ref="123709997"/>
+                                               <int key="objectID">344</int>
+                                               <reference key="object" ref="675657376"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1003980650"/>
-                                                       <reference ref="675657376"/>
-                                                       <reference ref="444006373"/>
-                                                       <reference ref="907249437"/>
+                                                       <reference ref="42393523"/>
                                                </object>
-                                               <reference key="parent" ref="49700183"/>
+                                               <reference key="parent" ref="123709997"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">287</int>
-                                               <reference key="object" ref="211309117"/>
+                                               <int key="objectID">345</int>
+                                               <reference key="object" ref="444006373"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="478887050"/>
-                                                       <reference ref="873921736"/>
-                                                       <reference ref="985124611"/>
-                                                       <reference ref="136990045"/>
-                                                       <reference ref="889994612"/>
+                                                       <reference ref="225659946"/>
                                                </object>
-                                               <reference key="parent" ref="49700183"/>
+                                               <reference key="parent" ref="123709997"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">288</int>
-                                               <reference key="object" ref="691710132"/>
+                                               <int key="objectID">346</int>
+                                               <reference key="object" ref="907249437"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="407034984"/>
-                                                       <reference ref="929586587"/>
-                                                       <reference ref="529723890"/>
-                                                       <reference ref="362740356"/>
+                                                       <reference ref="20607951"/>
                                                </object>
-                                               <reference key="parent" ref="49700183"/>
+                                               <reference key="parent" ref="123709997"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">289</int>
-                                               <reference key="object" ref="425499167"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="440135121"/>
-                                               </object>
-                                               <reference key="parent" ref="49700183"/>
+                                               <int key="objectID">347</int>
+                                               <reference key="object" ref="20607951"/>
+                                               <reference key="parent" ref="907249437"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">290</int>
-                                               <reference key="object" ref="1014567695"/>
+                                               <int key="objectID">348</int>
+                                               <reference key="object" ref="225659946"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="922265218"/>
+                                                       <reference ref="822312097"/>
                                                </object>
-                                               <reference key="parent" ref="49700183"/>
+                                               <reference key="parent" ref="444006373"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">291</int>
-                                               <reference key="object" ref="345974679"/>
+                                               <int key="objectID">349</int>
+                                               <reference key="object" ref="822312097"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="288379564"/>
+                                                       <reference ref="237877455"/>
+                                                       <reference ref="621985928"/>
+                                                       <reference ref="1040778121"/>
                                                </object>
-                                               <reference key="parent" ref="49700183"/>
+                                               <reference key="parent" ref="225659946"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">292</int>
-                                               <reference key="object" ref="703236195"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="145960326"/>
-                                               </object>
-                                               <reference key="parent" ref="49700183"/>
+                                               <int key="objectID">350</int>
+                                               <reference key="object" ref="237877455"/>
+                                               <reference key="parent" ref="822312097"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">293</int>
-                                               <reference key="object" ref="1021739901"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1059254264"/>
-                                               </object>
-                                               <reference key="parent" ref="49700183"/>
+                                               <int key="objectID">351</int>
+                                               <reference key="object" ref="621985928"/>
+                                               <reference key="parent" ref="822312097"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">294</int>
-                                               <reference key="object" ref="1059254264"/>
-                                               <reference key="parent" ref="1021739901"/>
+                                               <int key="objectID">352</int>
+                                               <reference key="object" ref="1040778121"/>
+                                               <reference key="parent" ref="822312097"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">295</int>
-                                               <reference key="object" ref="145960326"/>
-                                               <reference key="parent" ref="703236195"/>
+                                               <int key="objectID">353</int>
+                                               <reference key="object" ref="42393523"/>
+                                               <reference key="parent" ref="675657376"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">296</int>
-                                               <reference key="object" ref="288379564"/>
-                                               <reference key="parent" ref="345974679"/>
+                                               <int key="objectID">354</int>
+                                               <reference key="object" ref="673987852"/>
+                                               <reference key="parent" ref="1003980650"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">297</int>
-                                               <reference key="object" ref="922265218"/>
-                                               <reference key="parent" ref="1014567695"/>
+                                               <int key="objectID">382</int>
+                                               <reference key="object" ref="294892452"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="511041238"/>
+                                               </object>
+                                               <reference key="parent" ref="1064912113"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">298</int>
-                                               <reference key="object" ref="440135121"/>
-                                               <reference key="parent" ref="425499167"/>
+                                               <int key="objectID">383</int>
+                                               <reference key="object" ref="511041238"/>
+                                               <reference key="parent" ref="294892452"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">314</int>
+                                               <reference key="object" ref="136990045"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="181376038"/>
+                                                       <reference ref="455753488"/>
+                                                       <reference ref="707016708"/>
+                                                       <reference ref="850427642"/>
+                                               </object>
+                                               <reference key="parent" ref="211309117"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">299</int>
-                                               <reference key="object" ref="407034984"/>
+                                               <int key="objectID">329</int>
+                                               <reference key="object" ref="181376038"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="15366198"/>
+                                                       <reference ref="240437779"/>
                                                </object>
-                                               <reference key="parent" ref="691710132"/>
+                                               <reference key="parent" ref="136990045"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">300</int>
-                                               <reference key="object" ref="362740356"/>
+                                               <int key="objectID">331</int>
+                                               <reference key="object" ref="455753488"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="625319255"/>
+                                                       <reference ref="733163980"/>
                                                </object>
-                                               <reference key="parent" ref="691710132"/>
+                                               <reference key="parent" ref="136990045"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">301</int>
-                                               <reference key="object" ref="929586587"/>
+                                               <int key="objectID">330</int>
+                                               <reference key="object" ref="707016708"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="601710816"/>
+                                                       <reference ref="1039358237"/>
                                                </object>
-                                               <reference key="parent" ref="691710132"/>
+                                               <reference key="parent" ref="136990045"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">302</int>
-                                               <reference key="object" ref="529723890"/>
+                                               <int key="objectID">328</int>
+                                               <reference key="object" ref="850427642"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="692527149"/>
+                                                       <reference ref="247704759"/>
                                                </object>
-                                               <reference key="parent" ref="691710132"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">303</int>
-                                               <reference key="object" ref="692527149"/>
-                                               <reference key="parent" ref="529723890"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">304</int>
-                                               <reference key="object" ref="601710816"/>
-                                               <reference key="parent" ref="929586587"/>
+                                               <reference key="parent" ref="136990045"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">305</int>
-                                               <reference key="object" ref="625319255"/>
+                                               <int key="objectID">335</int>
+                                               <reference key="object" ref="247704759"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="618343102"/>
+                                                       <reference ref="579462485"/>
                                                </object>
-                                               <reference key="parent" ref="362740356"/>
+                                               <reference key="parent" ref="850427642"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">306</int>
-                                               <reference key="object" ref="618343102"/>
+                                               <int key="objectID">336</int>
+                                               <reference key="object" ref="579462485"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="865792840"/>
-                                                       <reference ref="107429478"/>
-                                                       <reference ref="535683643"/>
+                                                       <reference ref="391113581"/>
+                                                       <reference ref="770160669"/>
+                                                       <reference ref="683933257"/>
                                                </object>
-                                               <reference key="parent" ref="625319255"/>
+                                               <reference key="parent" ref="247704759"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">307</int>
-                                               <reference key="object" ref="865792840"/>
-                                               <reference key="parent" ref="618343102"/>
+                                               <int key="objectID">339</int>
+                                               <reference key="object" ref="391113581"/>
+                                               <reference key="parent" ref="579462485"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">308</int>
-                                               <reference key="object" ref="107429478"/>
-                                               <reference key="parent" ref="618343102"/>
+                                               <int key="objectID">338</int>
+                                               <reference key="object" ref="770160669"/>
+                                               <reference key="parent" ref="579462485"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">309</int>
-                                               <reference key="object" ref="535683643"/>
-                                               <reference key="parent" ref="618343102"/>
+                                               <int key="objectID">337</int>
+                                               <reference key="object" ref="683933257"/>
+                                               <reference key="parent" ref="579462485"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">310</int>
-                                               <reference key="object" ref="15366198"/>
-                                               <reference key="parent" ref="407034984"/>
+                                               <int key="objectID">333</int>
+                                               <reference key="object" ref="1039358237"/>
+                                               <reference key="parent" ref="707016708"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">311</int>
-                                               <reference key="object" ref="478887050"/>
+                                               <int key="objectID">332</int>
+                                               <reference key="object" ref="733163980"/>
+                                               <reference key="parent" ref="455753488"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">334</int>
+                                               <reference key="object" ref="240437779"/>
+                                               <reference key="parent" ref="181376038"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">421</int>
+                                               <reference key="object" ref="825796162"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="940230908"/>
+                                                       <reference ref="1021739901"/>
+                                                       <reference ref="703236195"/>
+                                                       <reference ref="345974679"/>
+                                                       <reference ref="1014567695"/>
+                                                       <reference ref="425499167"/>
                                                </object>
-                                               <reference key="parent" ref="211309117"/>
+                                               <reference key="parent" ref="49700183"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">312</int>
-                                               <reference key="object" ref="873921736"/>
+                                               <int key="objectID">289</int>
+                                               <reference key="object" ref="425499167"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="475982274"/>
+                                                       <reference ref="440135121"/>
                                                </object>
-                                               <reference key="parent" ref="211309117"/>
+                                               <reference key="parent" ref="825796162"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">313</int>
-                                               <reference key="object" ref="985124611"/>
+                                               <int key="objectID">298</int>
+                                               <reference key="object" ref="440135121"/>
+                                               <reference key="parent" ref="425499167"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">290</int>
+                                               <reference key="object" ref="1014567695"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="288804516"/>
+                                                       <reference ref="922265218"/>
                                                </object>
-                                               <reference key="parent" ref="211309117"/>
+                                               <reference key="parent" ref="825796162"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">314</int>
-                                               <reference key="object" ref="136990045"/>
+                                               <int key="objectID">297</int>
+                                               <reference key="object" ref="922265218"/>
+                                               <reference key="parent" ref="1014567695"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">291</int>
+                                               <reference key="object" ref="345974679"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="850427642"/>
-                                                       <reference ref="707016708"/>
-                                                       <reference ref="455753488"/>
-                                                       <reference ref="181376038"/>
+                                                       <reference ref="288379564"/>
                                                </object>
-                                               <reference key="parent" ref="211309117"/>
+                                               <reference key="parent" ref="825796162"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">315</int>
-                                               <reference key="object" ref="889994612"/>
+                                               <int key="objectID">296</int>
+                                               <reference key="object" ref="288379564"/>
+                                               <reference key="parent" ref="345974679"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">292</int>
+                                               <reference key="object" ref="703236195"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="103870225"/>
-                                                       <reference ref="652411918"/>
-                                                       <reference ref="356573645"/>
-                                                       <reference ref="7173206"/>
+                                                       <reference ref="145960326"/>
                                                </object>
-                                               <reference key="parent" ref="211309117"/>
+                                               <reference key="parent" ref="825796162"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">316</int>
-                                               <reference key="object" ref="103870225"/>
+                                               <int key="objectID">295</int>
+                                               <reference key="object" ref="145960326"/>
+                                               <reference key="parent" ref="703236195"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">293</int>
+                                               <reference key="object" ref="1021739901"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="558197217"/>
+                                                       <reference ref="1059254264"/>
                                                </object>
-                                               <reference key="parent" ref="889994612"/>
+                                               <reference key="parent" ref="825796162"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">317</int>
-                                               <reference key="object" ref="652411918"/>
+                                               <int key="objectID">294</int>
+                                               <reference key="object" ref="1059254264"/>
+                                               <reference key="parent" ref="1021739901"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">436</int>
+                                               <reference key="object" ref="291242569"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="908484803"/>
+                                                       <reference ref="667015191"/>
+                                                       <reference ref="513894170"/>
+                                                       <reference ref="301555397"/>
+                                                       <reference ref="443002022"/>
+                                                       <reference ref="221469578"/>
+                                                       <reference ref="232869468"/>
+                                                       <reference ref="569671425"/>
+                                                       <reference ref="387637584"/>
+                                                       <reference ref="902766107"/>
+                                                       <reference ref="147098438"/>
+                                                       <reference ref="302614967"/>
+                                                       <reference ref="973216726"/>
+                                                       <reference ref="998049160"/>
+                                                       <reference ref="122509689"/>
+                                                       <reference ref="601215307"/>
+                                                       <reference ref="810439401"/>
+                                                       <reference ref="231562326"/>
+                                                       <reference ref="84657333"/>
+                                                       <reference ref="924352608"/>
                                                </object>
-                                               <reference key="parent" ref="889994612"/>
+                                               <reference key="parent" ref="490590002"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">318</int>
-                                               <reference key="object" ref="356573645"/>
+                                               <int key="objectID">44</int>
+                                               <reference key="object" ref="221469578"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="454070103"/>
+                                                       <reference ref="714433793"/>
                                                </object>
-                                               <reference key="parent" ref="889994612"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">319</int>
-                                               <reference key="object" ref="7173206"/>
+                                               <int key="objectID">169</int>
+                                               <reference key="object" ref="714433793"/>
+                                               <reference key="parent" ref="221469578"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">384</int>
+                                               <reference key="object" ref="387637584"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="695838500"/>
+                                                       <reference ref="800808932"/>
                                                </object>
-                                               <reference key="parent" ref="889994612"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">320</int>
-                                               <reference key="object" ref="695838500"/>
-                                               <reference key="parent" ref="7173206"/>
+                                               <int key="objectID">385</int>
+                                               <reference key="object" ref="800808932"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="246883325"/>
+                                               </object>
+                                               <reference key="parent" ref="387637584"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">321</int>
-                                               <reference key="object" ref="454070103"/>
+                                               <int key="objectID">386</int>
+                                               <reference key="object" ref="246883325"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="259868564"/>
+                                                       <reference ref="765075061"/>
+                                                       <reference ref="940982828"/>
+                                                       <reference ref="588147075"/>
                                                </object>
-                                               <reference key="parent" ref="356573645"/>
+                                               <reference key="parent" ref="800808932"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">322</int>
-                                               <reference key="object" ref="259868564"/>
+                                               <int key="objectID">389</int>
+                                               <reference key="object" ref="765075061"/>
+                                               <reference key="parent" ref="246883325"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">388</int>
+                                               <reference key="object" ref="940982828"/>
+                                               <reference key="parent" ref="246883325"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">387</int>
+                                               <reference key="object" ref="588147075"/>
+                                               <reference key="parent" ref="246883325"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">42</int>
+                                               <reference key="object" ref="232869468"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="720143866"/>
-                                                       <reference ref="414039981"/>
-                                                       <reference ref="197481337"/>
+                                                       <reference ref="96315080"/>
                                                </object>
-                                               <reference key="parent" ref="454070103"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">323</int>
-                                               <reference key="object" ref="720143866"/>
-                                               <reference key="parent" ref="259868564"/>
+                                               <int key="objectID">167</int>
+                                               <reference key="object" ref="96315080"/>
+                                               <reference key="parent" ref="232869468"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">324</int>
-                                               <reference key="object" ref="414039981"/>
-                                               <reference key="parent" ref="259868564"/>
+                                               <int key="objectID">46</int>
+                                               <reference key="object" ref="667015191"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="634499157"/>
+                                               </object>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">325</int>
-                                               <reference key="object" ref="197481337"/>
-                                               <reference key="parent" ref="259868564"/>
+                                               <int key="objectID">171</int>
+                                               <reference key="object" ref="634499157"/>
+                                               <reference key="parent" ref="667015191"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">326</int>
-                                               <reference key="object" ref="908484803"/>
-                                               <reference key="parent" ref="652411918"/>
+                                               <int key="objectID">138</int>
+                                               <reference key="object" ref="301555397"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="926890760"/>
+                                               </object>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">327</int>
-                                               <reference key="object" ref="558197217"/>
-                                               <reference key="parent" ref="103870225"/>
+                                               <int key="objectID">174</int>
+                                               <reference key="object" ref="926890760"/>
+                                               <reference key="parent" ref="301555397"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">328</int>
-                                               <reference key="object" ref="850427642"/>
+                                               <int key="objectID">41</int>
+                                               <reference key="object" ref="513894170"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="247704759"/>
+                                                       <reference ref="863668536"/>
                                                </object>
-                                               <reference key="parent" ref="136990045"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">329</int>
-                                               <reference key="object" ref="181376038"/>
+                                               <int key="objectID">166</int>
+                                               <reference key="object" ref="863668536"/>
+                                               <reference key="parent" ref="513894170"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">132</int>
+                                               <reference key="object" ref="147098438"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="240437779"/>
+                                                       <reference ref="261514411"/>
                                                </object>
-                                               <reference key="parent" ref="136990045"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">330</int>
-                                               <reference key="object" ref="707016708"/>
+                                               <int key="objectID">173</int>
+                                               <reference key="object" ref="261514411"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1039358237"/>
+                                                       <reference ref="577969360"/>
                                                </object>
-                                               <reference key="parent" ref="136990045"/>
+                                               <reference key="parent" ref="147098438"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">331</int>
-                                               <reference key="object" ref="455753488"/>
+                                               <int key="objectID">134</int>
+                                               <reference key="object" ref="577969360"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="733163980"/>
+                                                       <reference ref="85032843"/>
+                                                       <reference ref="804424712"/>
+                                                       <reference ref="1018195923"/>
                                                </object>
-                                               <reference key="parent" ref="136990045"/>
+                                               <reference key="parent" ref="261514411"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">332</int>
-                                               <reference key="object" ref="733163980"/>
-                                               <reference key="parent" ref="455753488"/>
+                                               <int key="objectID">135</int>
+                                               <reference key="object" ref="85032843"/>
+                                               <reference key="parent" ref="577969360"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">333</int>
-                                               <reference key="object" ref="1039358237"/>
-                                               <reference key="parent" ref="707016708"/>
+                                               <int key="objectID">136</int>
+                                               <reference key="object" ref="804424712"/>
+                                               <reference key="parent" ref="577969360"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">334</int>
-                                               <reference key="object" ref="240437779"/>
-                                               <reference key="parent" ref="181376038"/>
+                                               <int key="objectID">137</int>
+                                               <reference key="object" ref="1018195923"/>
+                                               <reference key="parent" ref="577969360"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">335</int>
-                                               <reference key="object" ref="247704759"/>
+                                               <int key="objectID">390</int>
+                                               <reference key="object" ref="902766107"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="579462485"/>
+                                                       <reference ref="377264474"/>
                                                </object>
-                                               <reference key="parent" ref="850427642"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">336</int>
-                                               <reference key="object" ref="579462485"/>
+                                               <int key="objectID">391</int>
+                                               <reference key="object" ref="377264474"/>
+                                               <reference key="parent" ref="902766107"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">47</int>
+                                               <reference key="object" ref="569671425"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="683933257"/>
-                                                       <reference ref="770160669"/>
-                                                       <reference ref="391113581"/>
+                                                       <reference ref="412868245"/>
                                                </object>
-                                               <reference key="parent" ref="247704759"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">337</int>
-                                               <reference key="object" ref="683933257"/>
-                                               <reference key="parent" ref="579462485"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">338</int>
-                                               <reference key="object" ref="770160669"/>
-                                               <reference key="parent" ref="579462485"/>
+                                               <int key="objectID">172</int>
+                                               <reference key="object" ref="412868245"/>
+                                               <reference key="parent" ref="569671425"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">339</int>
-                                               <reference key="object" ref="391113581"/>
-                                               <reference key="parent" ref="579462485"/>
+                                               <int key="objectID">43</int>
+                                               <reference key="object" ref="443002022"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="649389918"/>
+                                               </object>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">340</int>
-                                               <reference key="object" ref="288804516"/>
-                                               <reference key="parent" ref="985124611"/>
+                                               <int key="objectID">168</int>
+                                               <reference key="object" ref="649389918"/>
+                                               <reference key="parent" ref="443002022"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">341</int>
-                                               <reference key="object" ref="475982274"/>
-                                               <reference key="parent" ref="873921736"/>
+                                               <int key="objectID">45</int>
+                                               <reference key="object" ref="302614967"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="595088069"/>
+                                               </object>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">342</int>
-                                               <reference key="object" ref="940230908"/>
-                                               <reference key="parent" ref="478887050"/>
+                                               <int key="objectID">170</int>
+                                               <reference key="object" ref="595088069"/>
+                                               <reference key="parent" ref="302614967"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">343</int>
-                                               <reference key="object" ref="1003980650"/>
+                                               <int key="objectID">244</int>
+                                               <reference key="object" ref="973216726"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="673987852"/>
+                                                       <reference ref="910777593"/>
                                                </object>
-                                               <reference key="parent" ref="123709997"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">344</int>
-                                               <reference key="object" ref="675657376"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="42393523"/>
-                                               </object>
-                                               <reference key="parent" ref="123709997"/>
+                                               <int key="objectID">245</int>
+                                               <reference key="object" ref="910777593"/>
+                                               <reference key="parent" ref="973216726"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">345</int>
-                                               <reference key="object" ref="444006373"/>
+                                               <int key="objectID">402</int>
+                                               <reference key="object" ref="84657333"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="225659946"/>
+                                                       <reference ref="752977354"/>
                                                </object>
-                                               <reference key="parent" ref="123709997"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">346</int>
-                                               <reference key="object" ref="907249437"/>
+                                               <int key="objectID">403</int>
+                                               <reference key="object" ref="752977354"/>
+                                               <reference key="parent" ref="84657333"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">440</int>
+                                               <reference key="object" ref="998049160"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="20607951"/>
+                                                       <reference ref="564975975"/>
                                                </object>
-                                               <reference key="parent" ref="123709997"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">347</int>
-                                               <reference key="object" ref="20607951"/>
-                                               <reference key="parent" ref="907249437"/>
+                                               <int key="objectID">441</int>
+                                               <reference key="object" ref="564975975"/>
+                                               <reference key="parent" ref="998049160"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">348</int>
-                                               <reference key="object" ref="225659946"/>
+                                               <int key="objectID">442</int>
+                                               <reference key="object" ref="601215307"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="822312097"/>
+                                                       <reference ref="119145016"/>
                                                </object>
-                                               <reference key="parent" ref="444006373"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">349</int>
-                                               <reference key="object" ref="822312097"/>
+                                               <int key="objectID">443</int>
+                                               <reference key="object" ref="119145016"/>
+                                               <reference key="parent" ref="601215307"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">444</int>
+                                               <reference key="object" ref="122509689"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="237877455"/>
-                                                       <reference ref="621985928"/>
-                                                       <reference ref="1040778121"/>
+                                                       <reference ref="486553162"/>
                                                </object>
-                                               <reference key="parent" ref="225659946"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">350</int>
-                                               <reference key="object" ref="237877455"/>
-                                               <reference key="parent" ref="822312097"/>
+                                               <int key="objectID">445</int>
+                                               <reference key="object" ref="486553162"/>
+                                               <reference key="parent" ref="122509689"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">351</int>
-                                               <reference key="object" ref="621985928"/>
-                                               <reference key="parent" ref="822312097"/>
+                                               <int key="objectID">446</int>
+                                               <reference key="object" ref="810439401"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="134407475"/>
+                                               </object>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">352</int>
-                                               <reference key="object" ref="1040778121"/>
-                                               <reference key="parent" ref="822312097"/>
+                                               <int key="objectID">447</int>
+                                               <reference key="object" ref="134407475"/>
+                                               <reference key="parent" ref="810439401"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">353</int>
-                                               <reference key="object" ref="42393523"/>
-                                               <reference key="parent" ref="675657376"/>
+                                               <int key="objectID">529</int>
+                                               <reference key="object" ref="231562326"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="87951024"/>
+                                               </object>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">354</int>
-                                               <reference key="object" ref="673987852"/>
-                                               <reference key="parent" ref="1003980650"/>
+                                               <int key="objectID">530</int>
+                                               <reference key="object" ref="87951024"/>
+                                               <reference key="parent" ref="231562326"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">382</int>
-                                               <reference key="object" ref="294892452"/>
+                                               <int key="objectID">396</int>
+                                               <reference key="object" ref="924352608"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="511041238"/>
+                                                       <reference ref="617679053"/>
                                                </object>
-                                               <reference key="parent" ref="490590002"/>
+                                               <reference key="parent" ref="291242569"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">383</int>
-                                               <reference key="object" ref="511041238"/>
-                                               <reference key="parent" ref="294892452"/>
+                                               <int key="objectID">397</int>
+                                               <reference key="object" ref="617679053"/>
+                                               <reference key="parent" ref="924352608"/>
                                        </object>
                                </object>
                        </object>
@@ -3612,16 +4174,49 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <string>382.IBPluginDependency</string>
                                        <string>382.ImportedFromIB2</string>
                                        <string>383.IBPluginDependency</string>
-                                       <string>39.IBPluginDependency</string>
-                                       <string>39.ImportedFromIB2</string>
+                                       <string>384.IBPluginDependency</string>
+                                       <string>384.ImportedFromIB2</string>
+                                       <string>385.IBPluginDependency</string>
+                                       <string>386.IBEditorWindowLastContentRect</string>
+                                       <string>386.IBPluginDependency</string>
+                                       <string>386.ImportedFromIB2</string>
+                                       <string>387.IBPluginDependency</string>
+                                       <string>387.ImportedFromIB2</string>
+                                       <string>388.IBPluginDependency</string>
+                                       <string>388.ImportedFromIB2</string>
+                                       <string>389.IBPluginDependency</string>
+                                       <string>389.ImportedFromIB2</string>
+                                       <string>390.IBPluginDependency</string>
+                                       <string>390.ImportedFromIB2</string>
+                                       <string>391.IBPluginDependency</string>
+                                       <string>396.IBPluginDependency</string>
+                                       <string>396.ImportedFromIB2</string>
+                                       <string>397.IBPluginDependency</string>
+                                       <string>402.IBPluginDependency</string>
+                                       <string>402.ImportedFromIB2</string>
+                                       <string>403.IBPluginDependency</string>
                                        <string>41.IBPluginDependency</string>
                                        <string>41.ImportedFromIB2</string>
                                        <string>42.IBPluginDependency</string>
                                        <string>42.ImportedFromIB2</string>
+                                       <string>421.IBPluginDependency</string>
                                        <string>43.IBPluginDependency</string>
                                        <string>43.ImportedFromIB2</string>
+                                       <string>436.IBPluginDependency</string>
                                        <string>44.IBPluginDependency</string>
                                        <string>44.ImportedFromIB2</string>
+                                       <string>440.IBPluginDependency</string>
+                                       <string>440.ImportedFromIB2</string>
+                                       <string>441.IBPluginDependency</string>
+                                       <string>442.IBPluginDependency</string>
+                                       <string>442.ImportedFromIB2</string>
+                                       <string>443.IBPluginDependency</string>
+                                       <string>444.IBPluginDependency</string>
+                                       <string>444.ImportedFromIB2</string>
+                                       <string>445.IBPluginDependency</string>
+                                       <string>446.IBPluginDependency</string>
+                                       <string>446.ImportedFromIB2</string>
+                                       <string>447.IBPluginDependency</string>
                                        <string>45.IBPluginDependency</string>
                                        <string>45.ImportedFromIB2</string>
                                        <string>46.IBPluginDependency</string>
@@ -3629,6 +4224,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <string>47.IBPluginDependency</string>
                                        <string>47.ImportedFromIB2</string>
                                        <string>5.IBEditorWindowLastContentRect</string>
+                                       <string>5.IBViewEditorWindowController.showingBoundsRectangles</string>
                                        <string>5.IBViewEditorWindowController.showingLayoutRectangles</string>
                                        <string>5.IBWindowTemplateEditedContentRect</string>
                                        <string>5.ImportedFromIB2</string>
@@ -3637,7 +4233,11 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <string>5.windowTemplate.hasMinSize</string>
                                        <string>5.windowTemplate.maxSize</string>
                                        <string>5.windowTemplate.minSize</string>
+                                       <string>529.IBPluginDependency</string>
+                                       <string>529.ImportedFromIB2</string>
+                                       <string>530.IBPluginDependency</string>
                                        <string>6.IBPluginDependency</string>
+                                       <string>6.IBUserGuides</string>
                                        <string>6.ImportedFromIB2</string>
                                        <string>7.IBPluginDependency</string>
                                        <string>7.ImportedFromIB2</string>
@@ -3847,31 +4447,81 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                        <real value="1.000000e+00"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="559925184"/>
+                                       <reference ref="484376035"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{772, 644}, {100, 48}}</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="484376035"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="484376035"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="484376035"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <reference ref="484376035"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
-                                       <string>{{644, 412}, {311, 447}}</string>
+                                       <string>{{-1077, 352}, {849, 399}}</string>
+                                       <boolean value="NO" id="6"/>
                                        <reference ref="559925184"/>
-                                       <string>{{644, 412}, {311, 447}}</string>
+                                       <string>{{-1077, 352}, {849, 399}}</string>
                                        <reference ref="559925184"/>
                                        <string>{{221, 276}, {533, 580}}</string>
                                        <reference ref="8"/>
-                                       <boolean value="NO"/>
+                                       <reference ref="6"/>
                                        <string>{3.40282e+38, 3.40282e+38}</string>
                                        <string>{230, 500}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <real value="1.000000e+00"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <object class="NSMutableArray">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="IBUserGuide">
+                                                       <reference key="view" ref="49161063"/>
+                                                       <float key="location">0.000000e+00</float>
+                                                       <int key="affinity">1</int>
+                                               </object>
+                                               <object class="IBUserGuide">
+                                                       <reference key="view" ref="49161063"/>
+                                                       <float key="location">2.420000e+02</float>
+                                                       <int key="affinity">0</int>
+                                               </object>
+                                       </object>
                                        <reference ref="559925184"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="559925184"/>
@@ -3899,7 +4549,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">383</int>
+                       <int key="maxID">533</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3929,11 +4579,16 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>FilterSettingsChanged:</string>
                                                        <string>SettingsChanged:</string>
                                                        <string>adjustFilterDisplay:</string>
+                                                       <string>adjustSizingDisplay:</string>
                                                        <string>deblockSliderChanged:</string>
+                                                       <string>displayLinkChanged:</string>
                                                        <string>modeDecombDeinterlaceSliderChanged:</string>
+                                                       <string>parLinkChanged:</string>
                                                        <string>previewGoWindowed:</string>
+                                                       <string>resizeInspectorForTab:</string>
                                                        <string>showPictureWindow:</string>
                                                        <string>showPreviewWindow:</string>
+                                                       <string>storageLinkChanged:</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3945,6 +4600,11 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">
@@ -3961,6 +4621,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>fCropRightStepper</string>
                                                        <string>fCropTopField</string>
                                                        <string>fCropTopStepper</string>
+                                                       <string>fDeblockBox</string>
                                                        <string>fDeblockCheck</string>
                                                        <string>fDeblockField</string>
                                                        <string>fDeblockSlider</string>
@@ -3978,10 +4639,25 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>fDetelecineBox</string>
                                                        <string>fDetelecineField</string>
                                                        <string>fDetelecinePopUp</string>
+                                                       <string>fDisplayLinkParLabel</string>
+                                                       <string>fDisplayLinkSlider</string>
+                                                       <string>fDisplayLinkStorageLabel</string>
+                                                       <string>fDisplayWidthField</string>
+                                                       <string>fDisplayWidthLabel</string>
+                                                       <string>fFilterTabView</string>
                                                        <string>fGrayscaleCheck</string>
                                                        <string>fHeightField</string>
                                                        <string>fHeightStepper</string>
                                                        <string>fInfoField</string>
+                                                       <string>fModulusLabel</string>
+                                                       <string>fModulusPopUp</string>
+                                                       <string>fParHeightField</string>
+                                                       <string>fParHeightLabel</string>
+                                                       <string>fParLinkDisplayLabel</string>
+                                                       <string>fParLinkSlider</string>
+                                                       <string>fParLinkStorageLabel</string>
+                                                       <string>fParWidthField</string>
+                                                       <string>fParWidthLabel</string>
                                                        <string>fPictureCropBox</string>
                                                        <string>fPictureFilterBox</string>
                                                        <string>fPictureFiltersOpenButton</string>
@@ -3989,9 +4665,18 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>fPictureWindow</string>
                                                        <string>fPreviewOpenButton</string>
                                                        <string>fRatioCheck</string>
+                                                       <string>fRatioLabel</string>
+                                                       <string>fRatioLabel2</string>
+                                                       <string>fResetParDarButton</string>
                                                        <string>fSizeFilterView</string>
                                                        <string>fSizeInfoField</string>
+                                                       <string>fSizeTabView</string>
+                                                       <string>fStorageLinkBox</string>
+                                                       <string>fStorageLinkDisplayLabel</string>
+                                                       <string>fStorageLinkParLabel</string>
+                                                       <string>fStorageLinkSlider</string>
                                                        <string>fWidthField</string>
+                                                       <string>fWidthLabel</string>
                                                        <string>fWidthStepper</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
@@ -4006,6 +4691,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>NSStepper</string>
                                                        <string>NSTextField</string>
                                                        <string>NSStepper</string>
+                                                       <string>NSBox</string>
                                                        <string>NSButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSSlider</string>
@@ -4023,10 +4709,25 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>NSBox</string>
                                                        <string>NSTextField</string>
                                                        <string>NSPopUpButton</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSSlider</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTabViewItem</string>
                                                        <string>NSButton</string>
                                                        <string>NSTextField</string>
                                                        <string>NSStepper</string>
                                                        <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSPopUpButton</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSSlider</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
                                                        <string>NSBox</string>
                                                        <string>NSBox</string>
                                                        <string>NSButton</string>
@@ -4034,8 +4735,17 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
                                                        <string>NSWindow</string>
                                                        <string>NSButton</string>
                                                        <string>NSButton</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSButton</string>
                                                        <string>NSTabView</string>
                                                        <string>NSTextField</string>
+                                                       <string>NSTabViewItem</string>
+                                                       <string>NSBox</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSSlider</string>
+                                                       <string>NSTextField</string>
                                                        <string>NSTextField</string>
                                                        <string>NSStepper</string>
                                                </object>
index 2e979d9..46522db 100644 (file)
     
     [fShowPreviewMovieButton setWantsLayer:YES];
     
+    /* Since the xib has everything off center for easy acess
+     * we align our views and windows here we an align to anything
+     * since it will actually change later upon source load, but
+     * for convenience we will use the fPictureViewArea
+     */
+     
+     /* Align the still preview image view to the picture box */
+     [fPictureView setFrameSize:[fPictureViewArea frame].size];
+     [fMovieView setFrameSize:[fPictureViewArea frame].size];
+     //[fPreviewWindow setFrameSize:[fPictureViewArea frame].size];
+    
     
 }
 - (BOOL)acceptsMouseMovedEvents
@@ -212,7 +223,7 @@ return YES;
 // necessary to display as much of the picture as possible.
 - (void) displayPreview
 {
-     hb_job_t * job = fTitle->job;
+    hb_job_t * job = fTitle->job;
     /* lets make sure that the still picture view is not hidden and that 
      * the movie preview is 
      */
@@ -222,71 +233,138 @@ return YES;
     [fMovieCreationProgressIndicator setHidden: YES];
     
     [fPictureView setHidden:NO];
-    [fPictureView setImage: [self imageForPicture: fPicture]];
+    
+    //[fHBController writeToActivityLog: "displayPreview called"];
+    
+    NSImage *fPreviewImage = [self imageForPicture: fPicture];
+    NSSize imageScaledSize = [fPreviewImage size];
+    
     
     NSSize displaySize = NSMakeSize( ( CGFloat )fTitle->width, ( CGFloat )fTitle->height );
+    NSString *sizeInfoString;
     /* Set the picture size display fields below the Preview Picture*/
     if( fTitle->job->anamorphic.mode == 1 ) // Original PAR Implementation
     {
         output_width = fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3];
         output_height = fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1];
         display_width = output_width * fTitle->job->anamorphic.par_width / fTitle->job->anamorphic.par_height;
-        [fInfoField setStringValue:[NSString stringWithFormat:
-                                    @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Strict",
-                                    fTitle->width, fTitle->height, output_width, output_height, display_width, output_height]];
-        displaySize.width *= ( ( CGFloat )fTitle->job->anamorphic.par_width ) / ( ( CGFloat )fTitle->job->anamorphic.par_height );   
+        sizeInfoString = [NSString stringWithFormat:
+                          @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Strict",
+                          fTitle->width, fTitle->height, output_width, output_height, display_width, output_height];
+        
+        displaySize.width = display_width;
+        displaySize.height = fTitle->height;
+        imageScaledSize.width = display_width;
+        imageScaledSize.height = output_height;   
     }
     else if (fTitle->job->anamorphic.mode == 2) // Loose Anamorphic
     {
-    hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
+        hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
         display_width = output_width * output_par_width / output_par_height;
-        [fInfoField setStringValue:[NSString stringWithFormat:
-                                    @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Loose",
-                                    fTitle->width, fTitle->height, output_width, output_height, display_width, output_height]];
+        sizeInfoString = [NSString stringWithFormat:
+                          @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Loose",
+                          fTitle->width, fTitle->height, output_width, output_height, display_width, output_height];
         
         displaySize.width = display_width;
+        displaySize.height = fTitle->height;
+        imageScaledSize.width = display_width;
+        imageScaledSize.height = output_height;
     }
+    else if (fTitle->job->anamorphic.mode == 3) // Custom Anamorphic
+    {
+        hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
+        display_width = output_width * output_par_width / output_par_height;
+        sizeInfoString = [NSString stringWithFormat:
+                          @"Source: %dx%d, Output: %dx%d, Anamorphic: %dx%d Custom",
+                          fTitle->width, fTitle->height, output_width, output_height, fTitle->job->anamorphic.dar_width, fTitle->job->anamorphic.dar_height];
+        
+        displaySize.width = fTitle->job->anamorphic.dar_width + fTitle->job->crop[2] + fTitle->job->crop[3];
+        displaySize.height = fTitle->job->anamorphic.dar_height + fTitle->job->crop[0] + fTitle->job->crop[1];
+        imageScaledSize.width = (int)fTitle->job->anamorphic.dar_width;
+        imageScaledSize.height = (int)fTitle->job->height;   
+    } 
     else // No Anamorphic
     {
-        [fInfoField setStringValue: [NSString stringWithFormat:
-                                     @"Source: %dx%d, Output: %dx%d", fTitle->width, fTitle->height,
-                                     fTitle->job->width, fTitle->job->height]];
+        sizeInfoString = [NSString stringWithFormat:
+                          @"Source: %dx%d, Output: %dx%d", fTitle->width, fTitle->height,
+                          fTitle->job->width, fTitle->job->height];
+        
+        displaySize.width = fTitle->width;
+        displaySize.height = fTitle->height;
+        imageScaledSize.width = fTitle->job->width;
+        imageScaledSize.height = fTitle->job->height;
     }
     
-    
     NSSize viewSize = [self optimalViewSizeForImageSize:displaySize];
+    
+    /* Initially set our preview image here */
+    
+    [fPreviewImage setSize: imageScaledSize];
+    [fPictureView setFrameSize: imageScaledSize];
+    [fPictureView setImage: fPreviewImage];
+    // center it vertically and horizontally
+    NSPoint origin = [fPictureViewArea frame].origin;
+    origin.y += ([fPictureViewArea frame].size.height -
+                 [fPictureView frame].size.height) / 2.0;
+    
+    origin.x += ([fPictureViewArea frame].size.width -
+                 [fPictureView frame].size.width) / 2.0;
+    
+    [fPictureView setFrameOrigin:origin]; 
+    
     /* we also need to take into account scaling to full screen to activate switching the view size */
     if( [self viewNeedsToResizeToSize:viewSize])
     {
+        /* if we have no anamorphic. */
+        if (!fTitle->job->anamorphic.mode || fTitle->job->anamorphic.mode == 0)
+        {
+            [self resizeSheetForViewSize:viewSize];
+            [self setViewSize:viewSize];
+        }
+        /* Strict anamorphic. */
+        else if (fTitle->job->anamorphic.mode == 1)
+        {
+            [self resizeSheetForViewSize:viewSize];
+            [self setViewSize:viewSize];   
+        }
         /* In the case of loose anamorphic, do not resize the window when scaling down */
-        // FIX ME: we need a new way to do this as we do not havefWidthField anymore
-        //if (fTitle->job->anamorphic.mode != 2 || [fWidthField intValue] == fTitle->width)
-        if (fTitle->job->anamorphic.mode != 2 || (fTitle->job->anamorphic.mode == 2 && output_width == fTitle->width))
+        else if (fTitle->job->anamorphic.mode == 2 && fTitle->width == fTitle->job->width)
         {
             [self resizeSheetForViewSize:viewSize];
             [self setViewSize:viewSize];
         }
-    }
-    
+        
+        /* custom anamorphic */
+        else if (fTitle->job->anamorphic.mode == 3)
+        {
+            [self resizeSheetForViewSize:viewSize];
+            [self setViewSize:viewSize];   
+        }
+    }   
     
     // Show the scaled text (use the height to check since the width can vary
     // with anamorphic video).
-    if( ( ( int )viewSize.height ) != fTitle->height )
+    NSString *scaleString;
+    
+    if( imageScaledSize.height > [fPictureView frame].size.height)
     {
-        CGFloat scale = viewSize.width / ( ( CGFloat ) fTitle->width );
-        NSString *scaleString = [NSString stringWithFormat:
-                                 NSLocalizedString( @" (Preview scaled to %.0f%% actual size)",
-                                                   @"String shown when a preview is scaled" ),
-                                 scale * 100.0];
-        [fscaleInfoField setStringValue: [NSString stringWithFormat:
-                                          @"%@", scaleString]];
-        
+        CGFloat scale = ( ( CGFloat )[fPictureView frame].size.width) / ( ( CGFloat )imageScaledSize.width);        
+        scaleString = [NSString stringWithFormat:
+                       NSLocalizedString( @" (Scaled to %.0f%% actual size)",
+                                         @"String shown when a preview is scaled" ), scale * 100.0];
     }
     else
     {
-        [fscaleInfoField setStringValue: @""];
+        scaleString = @"";
     }
-
+    /* Set the info fields in the hud controller */
+    [fInfoField setStringValue: [NSString stringWithFormat:
+                                 @"%@", sizeInfoString]];
+    
+    [fscaleInfoField setStringValue: [NSString stringWithFormat:
+                                      @"%@", scaleString]];
+    /* Set the info field in the window title bar */
+    [[self window] setTitle:[NSString stringWithFormat: @"Preview - %@ %@",sizeInfoString, scaleString]];
 }
 
 - (IBAction) previewDurationPopUpChanged: (id) sender
@@ -301,10 +379,6 @@ return YES;
          // Purge the existing picture previews so they get recreated the next time
         // they are needed.
         [self purgeImageCache];
-        /* We actually call displayPreview now from pictureSliderChanged which keeps
-         * our picture preview slider in sync with the previews being shown
-         */
-        //[self displayPreview];
         [self pictureSliderChanged:nil];
 }
 
@@ -327,7 +401,7 @@ return YES;
 
 - (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
 {
-    [self SetTitle:title];
+    //[self SetTitle:title];
     
     if ([fPreviewWindow isVisible])
     {
@@ -345,7 +419,6 @@ return YES;
         hudTimerSeconds = 0;
         [self pictureSliderChanged:nil];
         [self startHudTimer];
-        
     }
     
 }
@@ -720,8 +793,26 @@ return YES;
         // Make sure we have a big enough buffer to receive the image from libhb. libhb
         // creates images with a one-pixel border around the original content. Hence we
         // add 2 pixels horizontally and vertically to the buffer size.
-        int srcWidth = title->width + 2;
-        int srcHeight= title->height + 2;
+        int srcWidth;
+        int srcHeight;
+        if (title->width > title->job->width)
+        {
+            srcWidth = title->width + 2;
+        }
+        else
+        {
+            srcWidth = title->job->width + 2;
+        }
+        
+        if (title->height > title->job->height)
+        {
+            srcHeight = title->height + 2;
+        }
+        else
+        {
+            srcHeight = title->job->height + 2;
+        }
+        
         int newSize;
         newSize = srcWidth * srcHeight * 4;
         if( bufferSize < newSize )
@@ -829,7 +920,6 @@ return YES;
         return img;
     }
 }
-
 // Returns the preview image for the specified index, retrieving it from its internal
 // cache or by calling makeImageForPicture if it is not cached. Generally, you should
 // use imageForPicture so that images are cached. Calling makeImageForPicture will
@@ -842,7 +932,7 @@ return YES;
     NSImage * theImage = [fPicturePreviews objectForKey:key];
     if (!theImage)
     {
-        theImage = [PreviewController makeImageForPicture:pictureIndex libhb:fHandle title:fTitle removeBorders: NO];
+        theImage = [PreviewController makeImageForPicture:pictureIndex libhb:fHandle title:fTitle removeBorders: YES];
         [fPicturePreviews setObject:theImage forKey:key];
     }
     return theImage;
@@ -1109,7 +1199,7 @@ return YES;
         /* We need to find out if the preview movie needs to be scaled down so
          * that it doesn't overflow our available viewing container (just like for image
          * in -displayPreview) for HD sources, etc. [fPictureViewArea frame].size.height*/
-        if( ((int)movieBounds.size.height) > [fPictureView frame].size.height || scaleToScreen == YES)
+        if( ((int)movieBounds.size.height) > [fPictureViewArea frame].size.height || scaleToScreen == YES)
         {
             /* The preview movie would be larger than the available viewing area
              * in the preview movie, so we go ahead and scale it down to the same size
@@ -1240,8 +1330,6 @@ return YES;
     
     if (scaleToScreen == YES)
     {
-        //CGFloat scaleToScreenWidth;
-        //CGFloat scaleToScreenHeight;
         CGFloat screenAspect;
         CGFloat viewAreaAspect; 
         //note, a mbp 15" at 1440 x 900 is a 1.6 ar
@@ -1353,10 +1441,14 @@ return YES;
 {
     [fPictureView setFrameSize:viewSize];
     
-    // center it vertically
+    // center it vertically and horizontally
     NSPoint origin = [fPictureViewArea frame].origin;
     origin.y += ([fPictureViewArea frame].size.height -
                  [fPictureView frame].size.height) / 2.0;
+                 
+   origin.x += ([fPictureViewArea frame].size.width -
+                 [fPictureView frame].size.width) / 2.0;
+    
     [fPictureView setFrameOrigin:origin];
     
     NSPoint controlboxorigin = [fPictureView frame].origin;
@@ -1366,6 +1458,14 @@ return YES;
     
     controlboxorigin.x += ([fPictureViewArea frame].size.width -
                  [fPictureControlBox frame].size.width) / 2.0;
+                 
+    
+    /* origin should be rounded to integer otherwise font/antialiasing
+     * may be blurry.
+     */
+    controlboxorigin.x = floor( controlboxorigin.x );
+    controlboxorigin.y = floor( controlboxorigin.y );
+    
     /* requires that thefPictureControlBox and the fEncodingControlBox
      * are the same width to line up.
      */
@@ -1377,7 +1477,7 @@ return YES;
 
 - (BOOL)viewNeedsToResizeToSize: (NSSize)newSize
 {
-    NSSize viewSize = [fPictureView frame].size;
+    NSSize viewSize = [fPictureViewArea frame].size;
     return (newSize.width != viewSize.width || newSize.height != viewSize.height);
 }
 
index fe6552d..7a3d96e 100644 (file)
@@ -26,6 +26,8 @@
     IBOutlet NSWindow        * fPictureWindow;
     
     IBOutlet NSTabView       * fSizeFilterView;
+    IBOutlet NSTabViewItem   * fSizeTabView;
+    IBOutlet NSTabViewItem   * fFilterTabView;
     
     /* Picture Sizing */
     
 
     IBOutlet NSBox           * fPictureSizeBox;
     IBOutlet NSBox           * fPictureCropBox;
+    
+    IBOutlet NSTextField     * fWidthLabel;
     IBOutlet NSTextField     * fWidthField;
     IBOutlet NSStepper       * fWidthStepper;
     IBOutlet NSTextField     * fHeightField;
     IBOutlet NSStepper       * fHeightStepper;
+    IBOutlet NSTextField     * fRatioLabel;
+    IBOutlet NSTextField     * fRatioLabel2; // shown for capuj
     IBOutlet NSButton        * fRatioCheck;
     IBOutlet NSMatrix        * fCropMatrix;
     IBOutlet NSTextField     * fCropTopField;
     IBOutlet NSStepper       * fCropLeftStepper;
     IBOutlet NSTextField     * fCropRightField;
     IBOutlet NSStepper       * fCropRightStepper;
-
+    
+    IBOutlet NSTextField     * fModulusLabel;
+    IBOutlet NSPopUpButton   * fModulusPopUp;
+    /* linkers for capuj */
+    IBOutlet NSBox           * fStorageLinkBox;
+    IBOutlet NSSlider        * fStorageLinkSlider;
+    IBOutlet NSTextField     * fStorageLinkParLabel;
+    IBOutlet NSTextField     * fStorageLinkDisplayLabel;
+    
+    IBOutlet NSSlider        * fParLinkSlider;
+    IBOutlet NSTextField     * fParLinkStorageLabel;
+    IBOutlet NSTextField     * fParLinkDisplayLabel;
+    
+    IBOutlet NSSlider        * fDisplayLinkSlider;
+    IBOutlet NSTextField     * fDisplayLinkStorageLabel;
+    IBOutlet NSTextField     * fDisplayLinkParLabel;
+    
+    
+    IBOutlet NSTextField     * fDisplayWidthField;
+    IBOutlet NSTextField     * fDisplayWidthLabel;
+    
+    IBOutlet NSTextField     * fParWidthField;
+    IBOutlet NSTextField     * fParHeightField;
+    IBOutlet NSTextField     * fParWidthLabel;
+    IBOutlet NSTextField     * fParHeightLabel;
+
+    /* for now we setup some values to remember our pars and dars
+     * from scan
+    */
+    float titleDarWidth;
+    float titleDarHeight;
+    
+    int titleParWidth;
+    int titleParHeight;
+    float dar;
+    IBOutlet NSButton        * fResetParDarButton;
+    
        IBOutlet NSPopUpButton   * fAnamorphicPopUp;
     IBOutlet NSTextField     * fSizeInfoField;
        
     int output_width, output_height, output_par_width, output_par_height;
     int display_width;
     
+    int modulus;
+    
     /* used to track the previous state of the keep aspect
     ratio checkbox when turning anamorphic on, so it can be
     returned to the previous state when anamorphic is turned
     IBOutlet NSPopUpButton   * fDenoisePopUp;
     IBOutlet NSTextField     * fDenoiseField;
        
+    
+    IBOutlet NSBox           * fDeblockBox; // also holds the grayscale box
     IBOutlet NSButton        * fDeblockCheck;
     IBOutlet NSTextField     * fDeblockField;
     IBOutlet NSSlider        * fDeblockSlider;
 - (void) SetTitle:  (hb_title_t *)  title;
 - (void)setHBController: (HBController *)controller;
 - (IBAction) showPictureWindow: (id)sender;
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem;
+- (IBAction) resizeInspectorForTab: (id)sender;
 - (IBAction) showPreviewWindow: (id)sender;
 - (BOOL) previewFullScreenMode;
 - (IBAction) previewGoWindowed: (id)sender;
 
-
+- (IBAction) adjustSizingDisplay: (id) sender;
 
 
 - (IBAction) SettingsChanged: (id) sender;
 - (void) setAllowLooseAnamorphic: (BOOL) setting;
 
 - (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title;
-
-
+- (IBAction) storageLinkChanged: (id) sender;
+- (IBAction) parLinkChanged: (id) sender;
+- (IBAction) displayLinkChanged: (id) sender;
 - (void) setToFullScreenMode;
 - (void) setToWindowedMode;
 
 /* Filter Actions */
 - (void) setInitialPictureFilters;
 - (IBAction) FilterSettingsChanged: (id) sender;
-- (void) adjustFilterDisplay: (id) sender;
+- (IBAction) adjustFilterDisplay: (id) sender;
 - (IBAction) modeDecombDeinterlaceSliderChanged: (id) sender;
 - (IBAction) deblockSliderChanged: (id) sender;
 
index 5dae523..338bd27 100644 (file)
@@ -55,6 +55,8 @@
             [self setToWindowedMode];
         }
     }
+    [self adjustFilterDisplay:nil];
+    [self adjustSizingDisplay:nil];
 }
 
 - (BOOL) previewFullScreenMode
     return [fPreviewController fullScreen];
 }
 
+/* this method is used to detect clicking on a tab in fSizeFilterView */
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
+{
+
+[self resizeInspectorForTab:nil];
+
+}
+
+#pragma mark -
+
+/* resizeInspectorForTab is called at launch, and each time either the 
+ * Size or Filters tab is clicked. Size gives a horizontally oriented
+ * inspector and Filters is a vertically aligned inspector.
+ */
+- (IBAction) resizeInspectorForTab: (id)sender
+{
+    NSRect frame = [[self window] frame];
+    NSPoint windowOrigin = [[self window] frame].origin;
+    NSSize screenSize = [[[self window] screen] frame].size;
+    NSPoint screenOrigin = [[[self window] screen] frame].origin;
+    
+    /* We base our inspector size/layout on which tab is active for fSizeFilterView */
+    /* we are 1 which is Filters*/
+    if ([fSizeFilterView indexOfTabViewItem: [fSizeFilterView selectedTabViewItem]] == 1)
+    {
+        frame.size.width = 314;
+        /* we glean the height from the size of the boxes plus the extra window space
+         * needed for non boxed display
+         */
+        frame.size.height = 110.0 + [fDetelecineBox frame].size.height + [fDecombDeinterlaceBox frame].size.height + [fDenoiseBox frame].size.height + [fDeblockBox frame].size.height;
+        /* Hide the size readout at the bottom as the vertical inspector is not wide enough */
+        [fSizeInfoField setHidden:YES];
+    }
+    else // we are Tab index 0 which is size
+    {
+        frame.size.width = 50.0 + [fPictureSizeBox frame].size.width + [fPictureCropBox frame].size.width;
+        frame.size.height = [fPictureSizeBox frame].size.height + 85;
+        /* hide the size summary field at the bottom */
+        [fSizeInfoField setHidden:NO];      
+    }
+    /* get delta's for the change in window size */
+    CGFloat deltaX = frame.size.width - [[self window] frame].size.width;
+    CGFloat deltaY = frame.size.height - [[self window] frame].size.height;
+    
+    /* Check to see if we have changed the height from current */
+    //if (frame.size.height != [[self window] frame].size.height)
+    //{
+        /* change the inspector origin via the deltaY */
+        frame.origin.y -= deltaY;
+        /* keep the inspector centered so the tabs stay in place */
+        frame.origin.x -= deltaX / 2.0;
+    //}
+    
+     /* we make sure we are not horizontally off of our screen.
+     * this would be the case if we are on the vertical filter tab
+     * and we hit the size tab and the inspector grows horizontally
+     * off the screen to the right
+    */
+    if ((frame.origin.x + frame.size.width) > (screenOrigin.x + screenSize.width))
+    {
+        /* the right side of the preview is off the screen, so shift to the left */
+        frame.origin.x = (screenOrigin.x + screenSize.width) - frame.size.width;
+    }
+    
+    [[self window] setFrame:frame display:YES animate:YES];
+}
+
+- (IBAction) adjustSizingDisplay: (id) sender
+{
+    NSSize pictureSizingBoxSize = [fPictureSizeBox frame].size;
+    
+    NSPoint fPictureSizeBoxOrigin = [fPictureSizeBox frame].origin;
+    NSSize pictureCropBoxSize = [fPictureCropBox frame].size;
+    NSPoint fPictureCropBoxOrigin = [fPictureCropBox frame].origin;
+    
+    if ([fAnamorphicPopUp indexOfSelectedItem] == 3) // custom / power user jamboree
+    {
+        pictureSizingBoxSize.width = 530;
+        
+        /* Set visibility of capuj widgets */
+        [fParWidthField setHidden: NO];
+        [fParHeightField setHidden: NO];
+        [fParWidthLabel setHidden: NO];
+        [fParHeightLabel setHidden: NO];
+        [fDisplayWidthField setHidden: NO];
+        [fDisplayWidthLabel setHidden: NO];
+        [fModulusLabel setHidden: NO];
+        [fModulusPopUp setHidden: NO];
+        /* adjust/move keep ar checkbox */
+        [fRatioLabel setHidden: YES];
+        [fRatioLabel2 setHidden: NO];
+        
+        /* Optionally swith the Storage and Display width positions*/
+         /*
+         NSPoint fWidthLabelOrigin = [fWidthLabel frame].origin;
+         NSPoint fWidthFieldOrigin = [fWidthField frame].origin;
+         NSPoint fWidthStepperOrigin = [fWidthStepper frame].origin;
+         fWidthFieldOrigin.x = [fRatioLabel2 frame].origin.x + [fRatioLabel2 frame].size.width + 4;
+         [fWidthField setFrameOrigin:fWidthFieldOrigin];
+
+         fWidthStepperOrigin.x = [fWidthField frame].origin.x + [fWidthField frame].size.width + 4;
+         [fWidthStepper setFrameOrigin:fWidthStepperOrigin];
+         
+         fWidthLabelOrigin.x = [fWidthField frame].origin.x - [fWidthLabel frame].size.width - 4;
+         [fWidthLabel setFrameOrigin:fWidthLabelOrigin];
+         [fWidthLabel setStringValue:@"Storage Width:"];
+         */
+        
+        /* set the origin for fRatioCheck so origin.y == fRatioLabel2
+         * and origin.x == fDisplayWidthField
+         */
+         NSPoint fRatioCheckOrigin = [fRatioCheck frame].origin;
+         fRatioCheckOrigin.y = [fRatioLabel2 frame].origin.y - 2;
+         fRatioCheckOrigin.x = [fRatioLabel2 frame].origin.x + [fRatioLabel2 frame].size.width + 4;
+         [fRatioCheck setFrameOrigin:fRatioCheckOrigin];
+         
+    }
+    else
+    {
+        pictureSizingBoxSize.width = 200;
+        
+        /* Set visibility of capuj widgets */
+        [fParWidthField setHidden: YES];
+        [fParHeightField setHidden: YES];
+        [fParWidthLabel setHidden: YES];
+        [fParHeightLabel setHidden: YES];
+        [fDisplayWidthField setHidden: YES];
+        [fDisplayWidthLabel setHidden: YES];
+        [fModulusLabel setHidden: YES];
+        [fModulusPopUp setHidden: YES];
+        /* adjust/move keep ar checkbox */
+        [fRatioLabel setHidden: NO];
+        [fRatioLabel2 setHidden: YES];
+        
+         /* Optionally swith the Storage and Display width positions*/
+         
+         /*
+         NSPoint fWidthLabelOrigin = [fWidthLabel frame].origin;
+         NSPoint fWidthFieldOrigin = [fWidthField frame].origin;
+         NSPoint fWidthStepperOrigin = [fWidthStepper frame].origin;
+         
+         fWidthFieldOrigin.x = [fHeightField frame].origin.x;
+         [fWidthField setFrameOrigin:fWidthFieldOrigin];
+         
+         fWidthStepperOrigin.x = [fHeightStepper frame].origin.x;
+         [fWidthStepper setFrameOrigin:fWidthStepperOrigin];
+         
+         fWidthLabelOrigin.x = [fWidthField frame].origin.x - [fWidthLabel frame].size.width -4;
+         [fWidthLabel setFrameOrigin:fWidthLabelOrigin];
+         [fWidthLabel setStringValue:@"Width:"];
+         */
+        
+        
+        /* set the origin for fRatioCheck so origin.y == fRatioLabel
+         * and origin.x == fWidthStepper
+         */
+         NSPoint fRatioCheckOrigin = [fRatioCheck frame].origin;
+         fRatioCheckOrigin.y = [fRatioLabel frame].origin.y - 2;
+         fRatioCheckOrigin.x = [fWidthStepper frame].origin.x - 2;
+         [fRatioCheck setFrameOrigin:fRatioCheckOrigin];
+        
+    }
+    
+    /* Check to see if we have changed the size from current */
+    if (pictureSizingBoxSize.height != [fPictureSizeBox frame].size.height || pictureSizingBoxSize.width != [fPictureSizeBox frame].size.width)
+    {
+        /* Get our delta for the change in picture size box height */
+        CGFloat deltaYSizeBoxShift = pictureSizingBoxSize.height - [fPictureSizeBox frame].size.height;
+        fPictureSizeBoxOrigin.y -= deltaYSizeBoxShift;
+        /* Get our delta for the change in picture size box width */
+        CGFloat deltaXSizeBoxShift = pictureSizingBoxSize.width - [fPictureSizeBox frame].size.width;
+        //fPictureSizeBoxOrigin.x += deltaXSizeBoxShift;
+        /* set our new Picture size box size */
+        [fPictureSizeBox setFrameSize:pictureSizingBoxSize];
+        [fPictureSizeBox setFrameOrigin:fPictureSizeBoxOrigin];
+        
+        pictureCropBoxSize.height += deltaYSizeBoxShift;
+        fPictureCropBoxOrigin.y -= deltaYSizeBoxShift;
+        fPictureCropBoxOrigin.x += deltaXSizeBoxShift;
+        
+        [fPictureCropBox setFrameSize:pictureCropBoxSize];
+        [[fPictureCropBox animator] setFrameOrigin:fPictureCropBoxOrigin];
+    }
+
+    
+    /* now we call to resize the entire inspector window */
+   [self resizeInspectorForTab:nil];
+}
+
+- (IBAction) adjustFilterDisplay: (id) sender
+{
+    
+    NSBox * filterBox = nil;
+    NSTextField * filterField;
+    if (sender == fDetelecinePopUp)
+    {
+        filterBox = fDetelecineBox;
+        filterField = fDetelecineField;
+    }
+    
+    if (sender == fDecombDeinterlaceSlider)
+    {
+        if ([fDecombDeinterlaceSlider floatValue] == 0.0)
+        {
+            filterBox = fDecombBox;
+            filterField = fDecombField;
+        }
+        else
+        {
+            filterBox = fDeinterlaceBox;
+            filterField = fDeinterlaceField;
+        }
+    }
+    
+    if (sender == fDecombPopUp)
+    {
+        filterBox = fDecombBox;
+        filterField = fDecombField;
+    }
+    if (sender == fDeinterlacePopUp)
+    {
+        filterBox = fDeinterlaceBox;
+        filterField = fDeinterlaceField;
+    }
+    
+    if (sender == fDenoisePopUp)
+    {
+        filterBox = fDenoiseBox;
+        filterField = fDenoiseField;
+    }
+    
+    NSSize currentSize = [filterBox frame].size;
+    NSRect boxFrame = [filterBox frame];
+    
+    if ([sender titleOfSelectedItem] == @"Custom")
+    {
+        
+        currentSize.height = 60;
+        
+    }
+    else
+    {
+        currentSize.height = 30;
+        
+    }
+    /* Check to see if we have changed the size from current */
+    if (currentSize.height != [filterBox frame].size.height)
+    {
+        /* We are changing the size of the box, so recalc the origin */
+        NSPoint boxOrigin = [filterBox frame].origin;
+        /* We get the deltaY here for how much we are expanding/contracting the box vertically */
+        CGFloat deltaYBoxShift = currentSize.height - [filterBox frame].size.height;
+        boxOrigin.y -= deltaYBoxShift;
+        
+        boxFrame.size.height = currentSize.height;
+        boxFrame.origin.y = boxOrigin.y;
+        [filterBox setFrame:boxFrame];
+        
+        /* go ahead and resize the box */
+        //[[filterBox animator] setFrameSize:currentSize];
+        //[[filterBox animator] setFrameOrigin:origin];
+    
+        if (filterBox == fDecombBox || filterBox == fDeinterlaceBox)
+        {
+            /* fDecombDeinterlaceBox*/
+            NSSize decombDeinterlaceBoxSize = [fDecombDeinterlaceBox frame].size;
+            NSPoint decombDeinterlaceBoxOrigin = [fDecombDeinterlaceBox frame].origin;
+            
+            //decombDeinterlaceBoxSize.height = [filterBox frame].size.height + 50;
+            if (sender == fDecombDeinterlaceSlider)
+            {
+                [fHBController writeToActivityLog: "Sender is deinterlace decomb slider"];
+            }
+            
+            if ([fDeinterlaceBox isHidden] == YES)
+            {
+                decombDeinterlaceBoxSize.height = [fDecombBox frame].size.height + 50;
+                [fHBController writeToActivityLog: "Resize by Decomb box"];
+            }
+            else
+            {
+                decombDeinterlaceBoxSize.height = [fDeinterlaceBox frame].size.height + 50;
+                [fHBController writeToActivityLog: "Resize by Deinterlace box"];
+            }
+            /* get delta's for the change in window size */
+            
+            CGFloat deltaYdecombDeinterlace = decombDeinterlaceBoxSize.height - [fDecombDeinterlaceBox frame].size.height;
+            
+            deltaYBoxShift = deltaYdecombDeinterlace;
+            
+            decombDeinterlaceBoxOrigin.y -= deltaYdecombDeinterlace;
+            
+            [fDecombDeinterlaceBox setFrameSize:decombDeinterlaceBoxSize];
+            [fDecombDeinterlaceBox setFrameOrigin:decombDeinterlaceBoxOrigin];
+        }
+
+        /* now we must reset the origin of each box below the adjusted box*/
+        NSPoint decombDeintOrigin = [fDecombDeinterlaceBox frame].origin;
+        NSPoint denoiseOrigin = [fDenoiseBox frame].origin;
+        NSPoint deblockOrigin = [fDeblockBox frame].origin;
+        if (sender == fDetelecinePopUp)
+        {
+            decombDeintOrigin.y -= deltaYBoxShift;
+            [fDecombDeinterlaceBox setFrameOrigin:decombDeintOrigin];
+            
+            denoiseOrigin.y -= deltaYBoxShift;
+            [fDenoiseBox setFrameOrigin:denoiseOrigin];
+            
+            deblockOrigin.y -= deltaYBoxShift;
+            [fDeblockBox setFrameOrigin:deblockOrigin];
+        }
+        if (sender == fDecombPopUp || sender == fDeinterlacePopUp)
+        {
+            denoiseOrigin.y -= deltaYBoxShift;
+            [fDenoiseBox setFrameOrigin:denoiseOrigin];
+            
+            deblockOrigin.y -= deltaYBoxShift;
+            [fDeblockBox setFrameOrigin:deblockOrigin];
+        }
+        
+        if (sender == fDenoisePopUp)
+        {
+            deblockOrigin.y -= deltaYBoxShift;
+            [fDeblockBox setFrameOrigin:deblockOrigin];
+        }
+        
+        /* now we call to resize the entire inspector window */
+        [self resizeInspectorForTab:nil];
+    }
+    
+}
+
+
+#pragma mark -
+
 - (IBAction) previewGoWindowed: (id)sender
 {
     [fPreviewController goWindowedScreen:self];
     
     /* Setup our layers for core animation */
     [fSizeFilterView setWantsLayer:YES];
+    [fPictureSizeBox setWantsLayer:YES];
+    [fPictureCropBox setWantsLayer:YES];
+    
 }
 
 
 {
     fHandle = handle;
     
+    [fPreviewController SetHandle: fHandle];
+}
+
+- (void) SetTitle: (hb_title_t *) title
+{
+    hb_job_t * job = title->job;
+
+    fTitle = title;
+    
+     modulus = 8; //modulus value of 16, 8 or 4
     [fWidthStepper  setValueWraps: NO];
-    [fWidthStepper  setIncrement: 16];
+    [fWidthStepper  setIncrement: [[fModulusPopUp titleOfSelectedItem] intValue]];
     [fWidthStepper  setMinValue: 64];
     [fHeightStepper setValueWraps: NO];
-    [fHeightStepper setIncrement: 16];
+    [fHeightStepper setIncrement: [[fModulusPopUp titleOfSelectedItem] intValue]];
     [fHeightStepper setMinValue: 64];
     
     [fCropTopStepper    setIncrement: 2];
     [fCropRightStepper  setIncrement: 2];
     [fCropRightStepper  setMinValue:  0];
     
-    [fPreviewController SetHandle: fHandle];
-}
-
-- (void) SetTitle: (hb_title_t *) title
-{
-    hb_job_t * job = title->job;
-
-    fTitle = title;
-    
-    
-    
     [fWidthStepper      setMaxValue: title->width];
     [fWidthStepper      setIntValue: job->width];
     [fWidthField        setIntValue: job->width];
     {
     [fAnamorphicPopUp addItemWithTitle: @"Loose"];
     }
+    [fAnamorphicPopUp addItemWithTitle: @"Custom"];
     [fAnamorphicPopUp selectItemAtIndex: job->anamorphic.mode];
     
+    //[self adjustSizingDisplay:nil];
+    
+    /* populate the modulus popup here */
+    [fModulusPopUp removeAllItems];
+    [fModulusPopUp addItemWithTitle: @"16"];
+    [fModulusPopUp addItemWithTitle: @"8"];
+    [fModulusPopUp addItemWithTitle: @"4"];
+    [fModulusPopUp addItemWithTitle: @"2"];
+    [fModulusPopUp addItemWithTitle: @"1"];
+    if (job->anamorphic.mode == 3)
+    {
+        [fModulusPopUp selectItemWithTitle: [NSString stringWithFormat:@"%d",job->anamorphic.modulus]];
+    }
+    else
+    {
+        [fModulusPopUp selectItemWithTitle: @"16"];
+    }
+    
     /* We initially set the previous state of keep ar to on */
     keepAspectRatioPreviousState = 1;
        if (!autoCrop)
     MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
     MaxOutputHeight = title->height - job->crop[0] - job->crop[1];
     
+    titleDarWidth = job->anamorphic.dar_width;
+    titleDarHeight = job->anamorphic.dar_height;
+    
+    titleParWidth = job->anamorphic.par_width;
+    titleParHeight = job->anamorphic.par_height;
+    
     [self SettingsChanged: nil];
 }
 
+- (IBAction) storageLinkChanged: (id) sender
+{
+    /* since we have a tickless slider, make sure we are at 0.0 or 1.0 */
+    if ([fStorageLinkSlider floatValue] < 0.50)
+    {
+        [fStorageLinkSlider setFloatValue:0.0];
+        /* set slider labels to reflect choice */
+        [fStorageLinkParLabel setEnabled:YES];
+        [fStorageLinkDisplayLabel setEnabled:NO];
+
+    }
+    else
+    {
+        [fStorageLinkSlider setFloatValue:1.0];
+        /* set slider labels to reflect choice */
+        [fStorageLinkParLabel setEnabled:NO];
+        [fStorageLinkDisplayLabel setEnabled:YES];
+    }
     
+}
+
+- (IBAction) parLinkChanged: (id) sender
+{
+    /* since we have a tickless slider, make sure we are at 0.0 or 1.0 */
+    if ([fParLinkSlider floatValue] < 0.50)
+    {
+        [fParLinkSlider setFloatValue:0.0];
+        /* set slider labels to reflect choice */
+        [fParLinkStorageLabel setEnabled:YES];
+        [fParLinkDisplayLabel setEnabled:NO];
+    }
+    else
+    {
+        [fParLinkSlider setFloatValue:1.0];
+        /* set slider labels to reflect choice */
+        [fParLinkStorageLabel setEnabled:NO];
+        [fParLinkDisplayLabel setEnabled:YES];
+    }
+    
+}
+
+- (IBAction) displayLinkChanged: (id) sender
+{
+    /* since we have a tickless slider, make sure we are at 0.0 or 1.0 */
+    if ([fDisplayLinkSlider floatValue] < 0.50)
+    {
+        [fDisplayLinkSlider setFloatValue:0.0];
+        /* set slider labels to reflect choice */
+        [fDisplayLinkStorageLabel setEnabled:YES];
+        [fDisplayLinkParLabel setEnabled:NO];
+    }
+    else
+    {
+        [fDisplayLinkSlider setFloatValue:1.0];
+        /* set slider labels to reflect choice */
+        [fDisplayLinkStorageLabel setEnabled:NO];
+        [fDisplayLinkParLabel setEnabled:YES];
+    }
+    
+}    
 
 - (IBAction) SettingsChanged: (id) sender
 {
     hb_job_t * job = fTitle->job;
     
+    [fWidthStepper  setIncrement: [[fModulusPopUp titleOfSelectedItem] intValue]];
+    [fHeightStepper setIncrement: [[fModulusPopUp titleOfSelectedItem] intValue]];
+    /* Since custom anamorphic allows for a height setting > fTitle->height
+     * check to make sure it is returned to fTitle->height for all other modes
+     */
+     [fHeightStepper setMaxValue: fTitle->height];
+    
     autoCrop = ( [fCropMatrix selectedRow] == 0 );
     [fCropTopStepper    setEnabled: !autoCrop];
     [fCropBottomStepper setEnabled: !autoCrop];
     [fCropLeftStepper   setEnabled: !autoCrop];
     [fCropRightStepper  setEnabled: !autoCrop];
-
+    
     if( autoCrop )
     {
         memcpy( job->crop, fTitle->crop, 4 * sizeof( int ) );
         job->crop[2] = [fCropLeftStepper   intValue];
         job->crop[3] = [fCropRightStepper  intValue];
     }
+    /* Initially we set modulus widgets to 16 and disabled since we
+     * only use it for Custom Anamorphic below
+     */
+    [fModulusPopUp setEnabled:NO];
+    job->anamorphic.modulus = 16;
+    
+    [fRatioCheck setEnabled: YES];
+
+    
+    [fParWidthField setEnabled: NO];
+    [fParHeightField setEnabled: NO];
+    [fDisplayWidthField setEnabled: NO];
+    
+    /* If we are not custom anamorphic, make sure we retain the orginal par */
+    if( [fAnamorphicPopUp indexOfSelectedItem] != 3 )
+       {
+        job->anamorphic.par_width = titleParWidth;
+        job->anamorphic.par_height = titleParHeight;
+        [fRatioLabel setHidden: NO];
+    }
     
        if( [fAnamorphicPopUp indexOfSelectedItem] > 0 )
        {
-        if ([fAnamorphicPopUp indexOfSelectedItem] == 2) // Loose anamorphic
+        if ([fAnamorphicPopUp indexOfSelectedItem] == 1) // strict
+        {
+            [fWidthStepper      setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
+            [fWidthField        setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
+            
+            /* This will show correct anamorphic height values, but
+             show distorted preview picture ratio */
+            [fHeightStepper      setIntValue: fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1]];
+            [fHeightField        setIntValue: fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1]];
+            job->width       = [fWidthStepper  intValue];
+            job->height      = [fHeightStepper intValue];
+            
+            job->anamorphic.mode = 1;
+            [fWidthStepper setEnabled: NO];
+            [fWidthField setEnabled: NO];
+            [fHeightStepper setEnabled: NO];
+            [fHeightField setEnabled: NO];
+        }
+        else if ([fAnamorphicPopUp indexOfSelectedItem] == 2) // Loose anamorphic
         {
             job->anamorphic.mode = 2;
             [fWidthStepper setEnabled: YES];
             [fWidthField setEnabled: YES];
+            [fRatioCheck setEnabled: NO];
+            [fHeightStepper setEnabled: NO];
+            [fHeightField setEnabled: NO];
             /* We set job->width and call hb_set_anamorphic_size in libhb to do a "dry run" to get
              * the values to be used by libhb for loose anamorphic
              */
             job->height      = [fHeightStepper intValue];
             
         }
-        else // must be "1" or strict anamorphic
+        else if ([fAnamorphicPopUp indexOfSelectedItem] == 3) // custom / power user jamboree
         {
-            [fWidthStepper      setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
-            [fWidthField        setIntValue: fTitle->width-fTitle->job->crop[2]-fTitle->job->crop[3]];
+
+#pragma mark - STARTCapuj
+
+            job->anamorphic.mode = 3;
             
-            /* This will show correct anamorphic height values, but
-             show distorted preview picture ratio */
-            [fHeightStepper      setIntValue: fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1]];
-            [fHeightField        setIntValue: fTitle->height-fTitle->job->crop[0]-fTitle->job->crop[1]];
-            job->width       = [fWidthStepper  intValue];
-            job->height      = [fHeightStepper intValue];
+            /* Set the status of our custom ana only widgets accordingly */
+            /* for mod 3 we can use modulus other than 16 */
+            [fModulusPopUp setEnabled:YES];
+            job->anamorphic.modulus = [[fModulusPopUp titleOfSelectedItem] intValue];
             
-            job->anamorphic.mode = 1;
-            [fWidthStepper setEnabled: NO];
-            [fWidthField setEnabled: NO];
+            [fWidthStepper setEnabled: YES];
+            [fWidthField setEnabled: YES];
+            
+            [fHeightStepper setEnabled: YES];
+            /* for capuj the storage field is immaterial */
+            [fHeightField setEnabled: YES];
+            
+            [fRatioCheck setEnabled: YES];
+            if (sender == fRatioCheck)
+            {
+                if ([fRatioCheck  state] == NSOnState)
+                {
+                    [fParWidthField setEnabled: NO];
+                    [fParHeightField setEnabled: NO];   
+                }
+                else
+                {
+                    [fParWidthField setEnabled: YES];
+                    [fParHeightField setEnabled: YES];
+                }
+            }
+            
+            [fParWidthField setEnabled: YES];
+            [fParHeightField setEnabled: YES];
+            
+            [fDisplayWidthField setEnabled: YES];
+            
+            
+            /* If we are coming into custom ana or if in custom ana and the 
+             * keep ar checkbox is checked, we reset the par to original
+             * which gives us a way back if things are hosed up
+             */
+             
+            if (sender == fAnamorphicPopUp || (sender == fRatioCheck && [fRatioCheck  state] == NSOnState))
+            {
+                if (sender == fAnamorphicPopUp)
+                {
+                    [fRatioCheck  setState: NSOnState];
+                }
+                
+                /*
+                 KEEPING ASPECT RATIO
+                 Disable editing: PIXEL WIDTH, PIXEL HEIGHT
+                 */
+                [fParWidthField setEnabled: NO];
+                [fParHeightField setEnabled: NO];
+                
+                job->width = [fWidthStepper intValue];
+                job->height = [fHeightStepper intValue];
+
+                /* make sure our par is set back to original */
+                job->anamorphic.par_width = titleParWidth;
+                job->anamorphic.par_height = titleParHeight;
+                
+                [fParWidthField   setIntValue: titleParWidth];
+                [fParHeightField   setIntValue: titleParHeight];
+                
+                /* modify our par dims from our storage dims */
+                hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
+                float par_display_width = (float)output_width * (float)output_par_width / (float)output_par_height;
+                
+                /* go ahead and mod the display dims */
+                [fDisplayWidthField   setStringValue: [NSString stringWithFormat:@"%.2f", par_display_width]];
+                
+                job->anamorphic.dar_width = [fDisplayWidthField floatValue];
+                job->anamorphic.dar_height = (float)[fHeightStepper intValue];
+                
+                /* Set our dar here assuming we are just coming into capuj mode */
+                dar = [fDisplayWidthField floatValue] / (float)[fHeightField intValue];
+                
+            }
+
+            /* For capuj we disable these fields if we are keeping the dispay aspect */
+            if ([fRatioCheck  state] == NSOnState)
+            {
+                /*
+                 KEEPING ASPECT RATIO
+                 DAR = DISPLAY WIDTH / DISPLAY HEIGHT (cache after every modification) */
+                 /*Disable editing: PIXEL WIDTH, PIXEL HEIGHT */
+                
+                [fParWidthField setEnabled: NO];
+                [fParHeightField setEnabled: NO];
+                
+                /* Changing DISPLAY WIDTH: */
+                if (sender == fDisplayWidthField)
+                {
+                    job->anamorphic.dar_width = [fDisplayWidthField floatValue];
+                    /* Changes HEIGHT to keep DAR */
+                     /* calculate the height to retain the dar  */
+                    int raw_calulated_height = (int)((int)[fDisplayWidthField floatValue] / dar);
+                    /*  now use the modulus to go lower if there is a remainder  */
+                    /* Note to me, raw_calulated_height % [[fModulusPopUp titleOfSelectedItem] intValue]
+                     * gives me the remainder we are not mod (whatever our modulus is) subtract that from
+                     * the actual calculated value derived from the dar to round down to the nearest mod value.
+                     * This should be desireable over rounding up to the next mod value
+                     */
+                    int modulus_height = raw_calulated_height - (raw_calulated_height % [[fModulusPopUp titleOfSelectedItem] intValue]);
+                    if (modulus_height > fTitle->height)
+                    {
+                        [fHeightStepper setMaxValue: modulus_height];
+                    }
+                    [fHeightStepper setIntValue: modulus_height];
+                    job->anamorphic.dar_height = (float)[fHeightStepper intValue];
+                    job->height = [fHeightStepper intValue];
+                    
+                    /* Changes PIXEL WIDTH to new DISPLAY WIDTH */
+                    [fParWidthField setIntValue: [fDisplayWidthField intValue]];
+                    job->anamorphic.par_width = [fParWidthField intValue];
+                    /* Changes PIXEL HEIGHT to STORAGE WIDTH */
+                    [fParHeightField  setIntValue: [fWidthField intValue]];
+                    job->anamorphic.par_height = [fParHeightField intValue];
+                    
+                }
+                /* Changing HEIGHT: */
+                if (sender == fHeightStepper)
+                {
+                   job->anamorphic.dar_height = (float)[fHeightStepper intValue];
+                   job->height = [fHeightStepper intValue];
+                   
+                    /* Changes DISPLAY WIDTH to keep DAR*/
+                    [fDisplayWidthField setStringValue: [NSString stringWithFormat: @"%.2f",[fHeightStepper intValue] * dar]];
+                    job->anamorphic.dar_width = [fDisplayWidthField floatValue];
+                    /* Changes PIXEL WIDTH to new DISPLAY WIDTH */
+                    [fParWidthField setIntValue: [fDisplayWidthField intValue]];
+                    job->anamorphic.par_width = [fParWidthField intValue];
+                    /* Changes PIXEL HEIGHT to STORAGE WIDTH */
+                    [fParHeightField  setIntValue: [fWidthField intValue]];
+                    job->anamorphic.par_height = [fParHeightField intValue];
+                }
+                /* Changing STORAGE_WIDTH: */
+                if (sender == fWidthStepper)
+                {
+                    job->width = [fWidthStepper intValue];
+                    
+                    job->anamorphic.dar_width = [fDisplayWidthField floatValue];
+                    job->anamorphic.dar_height = [fHeightStepper floatValue];
+                     
+                    /* Changes PIXEL WIDTH to DISPLAY WIDTH */
+                    [fParWidthField setIntValue: [fDisplayWidthField intValue]];
+                    job->anamorphic.par_width = [fParWidthField intValue];
+                    /* Changes PIXEL HEIGHT to new STORAGE WIDTH */
+                    [fParHeightField  setIntValue: [fWidthStepper intValue]];
+                    job->anamorphic.par_height = [fParHeightField intValue];
+                }
+            }
+            else if ([fRatioCheck  state] == NSOffState)
+            {
+                /* Changing STORAGE_WIDTH: */
+                if (sender == fWidthStepper)
+                {
+                    job->width = [fWidthStepper intValue];
+                    /* changes DISPLAY WIDTH to STORAGE WIDTH * PIXEL WIDTH / PIXEL HEIGHT */
+                    [fDisplayWidthField setStringValue: [NSString stringWithFormat: @"%.2f",(float)[fWidthStepper intValue] * [fParWidthField intValue] / [fParHeightField intValue]]];
+                    job->anamorphic.dar_width = [fDisplayWidthField floatValue];
+                }
+                /* Changing PIXEL dimensions */
+                if (sender == fParWidthField || sender == fParHeightField)
+                {
+                    job->anamorphic.par_width = [fParWidthField intValue];
+                    job->anamorphic.par_height = [fParHeightField intValue];
+                    /* changes DISPLAY WIDTH to STORAGE WIDTH * PIXEL WIDTH / PIXEL HEIGHT */
+                    [fDisplayWidthField setStringValue: [NSString stringWithFormat: @"%.2f",(float)[fWidthStepper intValue] * [fParWidthField intValue] / [fParHeightField intValue]]];
+                    job->anamorphic.dar_width = [fDisplayWidthField floatValue];
+                }
+                /* Changing DISPLAY WIDTH: */
+                if (sender == fDisplayWidthField)
+                {
+                    job->anamorphic.dar_width = [fDisplayWidthField floatValue];
+                    job->anamorphic.dar_height = (float)[fHeightStepper intValue];
+                    /* changes PIXEL WIDTH to DISPLAY WIDTH and PIXEL HEIGHT to STORAGE WIDTH */
+                    [fParWidthField setIntValue: [fDisplayWidthField intValue]];
+                    job->anamorphic.par_width = [fParWidthField intValue];
+                    
+                    [fParHeightField  setIntValue: [fWidthField intValue]];
+                    job->anamorphic.par_height = [fParHeightField intValue];
+                    hb_set_anamorphic_size(job, &output_width, &output_height, &output_par_width, &output_par_height);
+                }
+                /* Changing HEIGHT: */
+                if (sender == fHeightStepper)
+                {
+                    /* just....changes the height.*/
+                    job->anamorphic.dar_height = [fHeightStepper intValue];
+                    job->height = [fHeightStepper intValue];
+                }
+                
+            }
+            
+#pragma mark - END Capuj                       
         }
         
         /* if the sender is the Anamorphic checkbox, record the state
         {
             keepAspectRatioPreviousState = [fRatioCheck state];
         }
-        [fRatioCheck setState:NSOffState];
-        [fRatioCheck setEnabled: NO];
-        
-        
-        [fHeightStepper setEnabled: NO];
-        [fHeightField setEnabled: NO];
+        if ([fAnamorphicPopUp indexOfSelectedItem] != 3)
+        {
+            [fRatioCheck setState:NSOffState];
+        }
         
     }
     else
         
        }
        
-    job->keep_ratio  = ( [fRatioCheck state] == NSOnState );
-
-    if( job->keep_ratio )
+    //job->keep_ratio  = ( [fRatioCheck state] == NSOnState );
+    
+    if ([fAnamorphicPopUp indexOfSelectedItem] != 3)
     {
-        if( sender == fWidthStepper || sender == fRatioCheck ||
-           sender == fCropTopStepper || sender == fCropBottomStepper )
+    job->keep_ratio  = ( [fRatioCheck state] == NSOnState );
+            if( job->keep_ratio )
         {
-            hb_fix_aspect( job, HB_KEEP_WIDTH );
-            if( job->height > fTitle->height )
+            if( sender == fWidthStepper || sender == fRatioCheck ||
+               sender == fCropTopStepper || sender == fCropBottomStepper )
             {
-                job->height = fTitle->height;
-                hb_fix_aspect( job, HB_KEEP_HEIGHT );
+                hb_fix_aspect( job, HB_KEEP_WIDTH );
+                if( job->height > fTitle->height )
+                {
+                    job->height = fTitle->height;
+                    hb_fix_aspect( job, HB_KEEP_HEIGHT );
+                }
             }
-        }
-        else
-        {
-            hb_fix_aspect( job, HB_KEEP_HEIGHT );
-            if( job->width > fTitle->width )
+            else
             {
-                job->width = fTitle->width;
-                hb_fix_aspect( job, HB_KEEP_WIDTH );
+                hb_fix_aspect( job, HB_KEEP_HEIGHT );
+                if( job->width > fTitle->width )
+                {
+                    job->width = fTitle->width;
+                    hb_fix_aspect( job, HB_KEEP_WIDTH );
+                }
             }
+            
         }
-        // hb_get_preview can't handle sizes that are larger than the original title
+    }
+    
+    // hb_get_preview can't handle sizes that are larger than the original title
+    if ([fAnamorphicPopUp indexOfSelectedItem] != 3)
+    {
         // dimensions
         if( job->width > fTitle->width )
+        {
             job->width = fTitle->width;
-
+        }
+        
         if( job->height > fTitle->height )
+        {
             job->height = fTitle->height;
+        }
     }
-
+    
     [fWidthStepper      setIntValue: job->width];
     [fWidthField        setIntValue: job->width];
-    if( [fAnamorphicPopUp indexOfSelectedItem] < 2 )
-       {
+    if( [fAnamorphicPopUp indexOfSelectedItem] != 2) // if we are not loose or custom
+    {
         [fHeightStepper     setIntValue: job->height];
         [fHeightField       setIntValue: job->height];
     }
+    
     [fCropTopStepper    setIntValue: job->crop[0]];
     [fCropTopField      setIntValue: job->crop[0]];
     [fCropBottomStepper setIntValue: job->crop[1]];
     [fCropRightStepper  setIntValue: job->crop[3]];
     [fCropRightField    setIntValue: job->crop[3]];
     
-    [fPreviewController SetTitle:fTitle];
+    //[fPreviewController SetTitle:fTitle];
+    
     /* Sanity Check Here for < 16 px preview to avoid
      crashing hb_get_preview. In fact, just for kicks
      lets getting previews at a min limit of 32, since
      no human can see any meaningful detail below that */
     if (job->width >= 64 && job->height >= 64)
     {
-       
-         // Purge the existing picture previews so they get recreated the next time
-        // they are needed.
-        [fPreviewController purgeImageCache];
-        /* We actually call displayPreview now from pictureSliderChanged which keeps
-         * our picture preview slider in sync with the previews being shown
-         */
-
-    //[fPreviewController pictureSliderChanged:nil];
-    [self reloadStillPreview];
+        [self reloadStillPreview];
     }
-
+    
     /* we get the sizing info to display from fPreviewController */
     [fSizeInfoField setStringValue: [fPreviewController pictureSizeInfoString]];
-
+    
     if (sender != nil)
     {
         [fHBController pictureSettingsDidChange];
     }   
     
+    if ([[self window] isVisible])
+    { 
+        [self adjustSizingDisplay:nil];
+    }
+    
 }
 
 - (NSString*) getPictureSizeInfoString
        
          // Purge the existing picture previews so they get recreated the next time
         // they are needed.
-        [fPreviewController purgeImageCache];
+      //  [fPreviewController purgeImageCache];
         /* We actually call displayPreview now from pictureSliderChanged which keeps
          * our picture preview slider in sync with the previews being shown
          */
 
-    [fPreviewController pictureSliderChanged:nil];
+    //[fPreviewController pictureSliderChanged:nil];
     }
     
 }
 
 - (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
 {
-    [self SetTitle:title];
+    //[self SetTitle:title];
     [self showWindow:sender];
+    //[self adjustSizingDisplay:nil];
+    //[self adjustFilterDisplay:nil];
 
 }
 
@@ -508,33 +1176,45 @@ are maintained across different sources */
 
 - (IBAction) modeDecombDeinterlaceSliderChanged: (id) sender
 {
+    
+    /* since its a tickless slider, we have to  make sure we are on or off */
+    if ([fDecombDeinterlaceSlider floatValue] < 0.50)
+    {
+        [fDecombDeinterlaceSlider setFloatValue:0.0];
+    }
+    else
+    {
+        [fDecombDeinterlaceSlider setFloatValue:1.0];
+    }
+    
+    
     /* Decomb selected*/
     if ([fDecombDeinterlaceSlider floatValue] == 0.0)
     {
-    [fDecombBox setHidden:NO];
-    [fDeinterlaceBox setHidden:YES];
-    fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
-    fPictureFilterSettings.usedecomb = 1;
-    fPictureFilterSettings.deinterlace = 0;
-    [self adjustFilterDisplay:fDecombPopUp];
-    [fDecombPopUp selectItemAtIndex:fPictureFilterSettings.decomb];
+        [fDecombBox setHidden:NO];
+        [fDeinterlaceBox setHidden:YES];
+        fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
+        fPictureFilterSettings.usedecomb = 1;
+        fPictureFilterSettings.deinterlace = 0;
+        [fDecombPopUp selectItemAtIndex:fPictureFilterSettings.decomb];
+        [self adjustFilterDisplay:fDecombPopUp];
     }
     else
     {
-    [fDecombBox setHidden:YES];
-    [fDeinterlaceBox setHidden:NO];
-    fPictureFilterSettings.usedecomb = 0;
-    fPictureFilterSettings.decomb = 0;
-    [self adjustFilterDisplay:fDeinterlacePopUp];
-    [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
+        [fDecombBox setHidden:YES];
+        [fDeinterlaceBox setHidden:NO];
+        fPictureFilterSettings.usedecomb = 0;
+        fPictureFilterSettings.decomb = 0;
+        [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
+        [self adjustFilterDisplay:fDeinterlacePopUp];
     }
-       [self FilterSettingsChanged: sender];
+    [self FilterSettingsChanged: fDecombDeinterlaceSlider];
 }
 
 
 - (IBAction) FilterSettingsChanged: (id) sender
 {
-
+    
     fPictureFilterSettings.detelecine  = [fDetelecinePopUp indexOfSelectedItem];
     [self adjustFilterDisplay:fDetelecinePopUp];
     
@@ -566,62 +1246,6 @@ are maintained across different sources */
 
 }
 
-- (void) adjustFilterDisplay: (id) sender
-{
-    
-    NSBox * filterBox = nil;
-    NSTextField * filterField;
-    if (sender == fDetelecinePopUp)
-    {
-        filterBox = fDetelecineBox;
-        filterField = fDetelecineField;
-    }
-    if (sender == fDecombPopUp)
-    {
-        filterBox = fDecombBox;
-        filterField = fDecombField;
-    }
-    if (sender == fDeinterlacePopUp)
-    {
-        filterBox = fDeinterlaceBox;
-        filterField = fDeinterlaceField;
-    }
-    
-    if (sender == fDenoisePopUp)
-    {
-        filterBox = fDenoiseBox;
-        filterField = fDenoiseField;
-    }
-    
-    NSSize currentSize = [filterBox frame].size;
-    if ([sender titleOfSelectedItem] == @"Custom")
-    {
-        currentSize.height = 60;
-    }
-    else
-    {
-        currentSize.height = 30;
-    }
-    /* Check to see if we have changed the size from current */
-    if (currentSize.height != [filterBox frame].size.height)
-    {
-        /* We are changing the size of the box, so recalc the origin */
-        NSPoint origin = [filterBox frame].origin;
-        /* See if we are expanding the box downwards */
-        if (currentSize.height > [filterBox frame].size.height)
-        {
-            origin.y = origin.y - currentSize.height / 2;
-        }
-        else
-        {
-            origin.y = origin.y + currentSize.height;
-        }
-        /* go ahead and resize the box */
-        [filterBox setFrameSize:currentSize];
-        [filterBox setFrameOrigin:origin];
-    }
-    
-}
 
 #pragma mark -