MacGui: main and queue window improvements.

Merge fPictureSizeField and fPictureCroppingField into fPictureSettingsField (fits on a single line).

Rename fVideoFiltersField to fPictureFiltersField.

Move the two text fields closer to each other now that there is more room.
Also align their contents using tabs.
This should look better overall.

Add pictureSettingsSummary and pictureFiltersSummary to generate the text summaries used in the fields above.



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

3 files changed, 182 insertions, 193 deletions

diff --git a/macosx/Controller.h b/macosx/Controller.h
index ad4ae349a..d69438d26 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -166,12 +166,9 @@ BOOL                        fIsDragging;
     IBOutlet NSButton            * fVidTwoPassCheck;
     IBOutlet NSButton            * fVidTurboPassCheck;
 	
-	/* Status read out fileds for picture sizing */
-    IBOutlet NSTextField         * fPictureSizeField;
-    IBOutlet NSTextField         * fPictureCroppingField;
-	
-    /* Status read out fileds for video filters */
-    IBOutlet NSTextField         * fVideoFiltersField;
+    /* Status read out fields for picture settings and video filters */
+    IBOutlet NSTextField         * fPictureSettingsField;
+    IBOutlet NSTextField         * fPictureFiltersField;
 	
 	/* Picture variables */
 	int                        PicOrigOutputWidth;
@@ -347,6 +344,10 @@ BOOL                        fIsDragging;
 - (IBAction) calculatePictureSizing: (id) sender;
 - (IBAction) openMainWindow: (id) sender;
 
+/* Text summaries of various settings */
+- (NSString*) pictureSettingsSummary;
+- (NSString*) pictureFiltersSummary;
+
 /* Add All titles to the queue */
 - (IBAction) addAllTitlesToQueue: (id) sender;
 - (void) addAllTitlesToQueueAlertDone: (NSWindow *) sheet
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 7f36778a1..f0b20f379 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -755,8 +755,8 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
         fSrcChapterEndPopUp, fSrcDuration1Field, fSrcDuration2Field,
         fDstFormatField, fDstFormatPopUp, fDstFile1Field, fDstFile2Field,
         fDstBrowseButton, fVidRateField, fVidRatePopUp, fVidEncoderField,
-        fVidEncoderPopUp, fVidQualityField, fPictureSizeField,
-        fPictureCroppingField, fVideoFiltersField, fVidQualityMatrix,
+        fVidEncoderPopUp, fVidQualityField, fVidQualityMatrix,
+        fPictureSettingsField, fPictureFiltersField,
         fSubField, fSubPopUp, fPresetsAdd, fPresetsDelete, fSrcAngleLabel,
         fSrcAnglePopUp, fCreateChapterMarkers, fVidTurboPassCheck,
         fDstMp4LargeFileCheck, fSubForcedCheck, fPresetsOutlineView,
@@ -2664,9 +2664,18 @@ fWorkingCount = 0;
         [queueFileJob setObject:[NSNumber numberWithFloat:fTitle->job->anamorphic.dar_height] forKey:@"PicturePARDisplayHeight"];
 
     }
-    NSString * pictureSummary;
-    pictureSummary = [fPictureSizeField stringValue];
-    [queueFileJob setObject:pictureSummary forKey:@"PictureSizingSummary"];                 
+    
+    /* Summary for the queue display */
+    NSString *pictureSizingSummary = [NSString stringWithFormat:@"%@",
+                                      [fPictureController getPictureSizeInfoString]];
+    if (fTitle->job->anamorphic.mode != 1)
+    {
+        pictureSizingSummary = [pictureSizingSummary
+                                stringByAppendingFormat:@", Modulus: %d",
+                                fTitle->job->modulus];
+    }
+    [queueFileJob setObject:pictureSizingSummary forKey:@"PictureSizingSummary"];
+    
     /* Set crop settings here */
 	[queueFileJob setObject:[NSNumber numberWithInt:[fPictureController autoCrop]] forKey:@"PictureAutoCrop"];
     [queueFileJob setObject:[NSNumber numberWithInt:job->crop[0]] forKey:@"PictureTopCrop"];
@@ -5714,140 +5723,172 @@ the user is using "Custom" settings by determining the sender*/
 /* Get and Display Current Pic Settings in main window */
 - (IBAction) calculatePictureSizing: (id) sender
 {
-	if (fTitle->job->anamorphic.mode > 0)
-	{
-        fTitle->job->keep_ratio = 0;
-	}
-    
-    if (fTitle->job->anamorphic.mode != 1) // we are not strict so show the modulus
-	{
-        [fPictureSizeField setStringValue: [NSString stringWithFormat:@"Picture Size: %@, Modulus: %d", [fPictureController getPictureSizeInfoString], fTitle->job->modulus]];
-    }
-    else
+    if (fTitle->job->anamorphic.mode > 0)
     {
-        [fPictureSizeField setStringValue: [NSString stringWithFormat:@"Picture Size: %@", [fPictureController getPictureSizeInfoString]]];
+        fTitle->job->keep_ratio = 0;
     }
-    NSString *picCropping;
-    /* Set the display field for crop as per boolean */
-	if (![fPictureController autoCrop])
-	{
-        picCropping =  @"Custom";
-	}
-	else
-	{
-		picCropping =  @"Auto";
-	}
-    picCropping = [picCropping stringByAppendingString:[NSString stringWithFormat:@" %d/%d/%d/%d",fTitle->job->crop[0],fTitle->job->crop[1],fTitle->job->crop[2],fTitle->job->crop[3]]];
     
-    [fPictureCroppingField setStringValue: [NSString stringWithFormat:@"Picture Cropping: %@",picCropping]];
+    // align picture settings and video filters in the UI using tabs
+    [fPictureSettingsField setStringValue:[NSString stringWithFormat:@"Picture Settings:  \t %@",
+                                           [self pictureSettingsSummary]]];
+    [fPictureFiltersField  setStringValue:[NSString stringWithFormat:@"Picture Filters: \t\t %@",
+                                           [self pictureFiltersSummary]]];
     
-    NSString *videoFilters;
-    videoFilters = @"";
-    /* Detelecine */
-    if ([fPictureController detelecine] == 2) 
-    {
-        videoFilters = [videoFilters stringByAppendingString:@" - Detelecine (Default)"];
-    }
-    else if ([fPictureController detelecine] == 1) 
-    {
-        videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Detelecine (%@)",[fPictureController detelecineCustomString]]];
-    }
+    /* Store storage resolution for unparse */
+    fX264PresetsWidthForUnparse  = fTitle->job->width;
+    fX264PresetsHeightForUnparse = fTitle->job->height;
+    // width or height may have changed, unparse
+    [self x264PresetsChangedDisplayExpandedOptions:nil];
     
-    if ([fPictureController useDecomb] == 1)
+    // reload still previews
+    // note: fTitle->job->deinterlace is set by fPictureController now
+    [fPictureController decombDeinterlacePreviewImage];
+}
+
+#pragma mark -
+#pragma mark - Text Summaries
+
+- (NSString*) pictureSettingsSummary
+{
+    NSMutableString *summary = [NSMutableString stringWithString:@""];
+    if (fPictureController && fTitle && fTitle->job)
     {
-        /* Decomb */
-        if ([fPictureController decomb] == 4)
-        {
-            videoFilters = [videoFilters stringByAppendingString:@" - Decomb (Bob)"];
-        }
-        else if ([fPictureController decomb] == 3)
-        {
-            videoFilters = [videoFilters stringByAppendingString:@" - Decomb (Fast)"];
-        }
-        else if ([fPictureController decomb] == 2)
+        [summary appendString:[fPictureController getPictureSizeInfoString]];
+        if (fTitle->job->anamorphic.mode != 1)
         {
-            videoFilters = [videoFilters stringByAppendingString:@" - Decomb (Default)"];
-        }
-        else if ([fPictureController decomb] == 1)
-        {
-            videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Decomb (%@)",[fPictureController decombCustomString]]];
+            // anamorphic is not Strict, show the modulus
+            [summary appendFormat:@", Modulus: %d", fTitle->job->modulus];
         }
+        [summary appendFormat:@", Crop: %s %d/%d/%d/%d",
+         [fPictureController autoCrop] ? "Auto" : "Custom",
+         fTitle->job->crop[0], fTitle->job->crop[1],
+         fTitle->job->crop[2], fTitle->job->crop[3]];
     }
-    else
+    return [NSString stringWithString:summary];
+}
+
+- (NSString*) pictureFiltersSummary
+{
+    NSMutableString *summary = [NSMutableString stringWithString:@""];
+    if (fPictureController)
     {
-        /* Deinterlace */
-        if ([fPictureController deinterlace] == 5)
+        /* Detelecine */
+        switch ([fPictureController detelecine])
         {
-            fTitle->job->deinterlace  = 1;
-            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Bob)"];
+            case 1:
+                [summary appendFormat:@" - Detelecine (%@)",
+                 [fPictureController detelecineCustomString]];
+                break;
+                
+            case 2:
+                [summary appendString:@" - Detelecine (Default)"];
+                break;
+                
+            default:
+                break;
         }
-        else if ([fPictureController deinterlace] == 4)
+        
+        if ([fPictureController useDecomb] == 1)
         {
-            fTitle->job->deinterlace  = 1;
-            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slower)"];
+            /* Decomb */
+            switch ([fPictureController decomb])
+            {
+                case 1:
+                    [summary appendFormat:@" - Decomb (%@)",
+                     [fPictureController decombCustomString]];
+                    break;
+                    
+                case 2:
+                    [summary appendString:@" - Decomb (Default)"];
+                    break;
+                    
+                case 3:
+                    [summary appendString:@" - Decomb (Fast)"];
+                    break;
+                    
+                case 4:
+                    [summary appendString:@" - Decomb (Bob)"];
+                    break;
+                    
+                default:
+                    break;
+            }
         }
-        else if ([fPictureController deinterlace] == 3)
+        else
         {
-            fTitle->job->deinterlace  = 1;
-            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Slow)"];
+            /* Deinterlace */
+            switch ([fPictureController deinterlace])
+            {
+                case 1:
+                    [summary appendFormat:@" - Deinterlace (%@)",
+                     [fPictureController deinterlaceCustomString]];
+                    break;
+                    
+                case 2:
+                    [summary appendString:@" - Deinterlace (Fast)"];
+                    break;
+                    
+                case 3:
+                    [summary appendString:@" - Deinterlace (Slow)"];
+                    break;
+                    
+                case 4:
+                    [summary appendString:@" - Deinterlace (Slower)"];
+                    break;
+                    
+                case 5:
+                    [summary appendString:@" - Deinterlace (Bob)"];
+                    break;
+                    
+                default:
+                    break;
+            }
         }
-        else if ([fPictureController deinterlace] == 2)
+        
+        /* Deblock */
+        if ([fPictureController deblock] > 0)
         {
-            fTitle->job->deinterlace  = 1;
-            videoFilters = [videoFilters stringByAppendingString:@" - Deinterlace (Fast)"];
+            [summary appendFormat:@" - Deblock (%d)",
+             [fPictureController deblock]];
         }
-        else if ([fPictureController deinterlace] == 1)
+        
+        /* Denoise */
+        switch ([fPictureController denoise])
         {
-            fTitle->job->deinterlace  = 1;
-            videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Deinterlace (%@)",[fPictureController deinterlaceCustomString]]];
+            case 1:
+                [summary appendFormat:@" - Denoise (%@)",
+                 [fPictureController denoiseCustomString]];
+                break;
+                
+            case 2:
+                [summary appendString:@" - Denoise (Weak)"];
+                break;
+                
+            case 3:
+                [summary appendString:@" - Denoise (Medium)"];
+                break;
+                
+            case 4:
+                [summary appendString:@" - Denoise (Strong)"];
+                break;
+                
+            default:
+                break;
         }
-        else
+        
+        /* Grayscale */
+        if ([fPictureController grayscale]) 
         {
-            fTitle->job->deinterlace  = 0;
+            [summary appendString:@" - Grayscale"];
         }
-	}
-    
-    /* Denoise */
-	if ([fPictureController denoise] == 2)
-	{
-		videoFilters = [videoFilters stringByAppendingString:@" - Denoise (Weak)"];
     }
-	else if ([fPictureController denoise] == 3)
-	{
-		videoFilters = [videoFilters stringByAppendingString:@" - Denoise (Medium)"];
-    }
-	else if ([fPictureController denoise] == 4)
-	{
-		videoFilters = [videoFilters stringByAppendingString:@" - Denoise (Strong)"];
-	}
-    else if ([fPictureController denoise] == 1)
-	{
-		videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Denoise (%@)",[fPictureController denoiseCustomString]]];
-	}
-    
-    /* Deblock */
-    if ([fPictureController deblock] > 0) 
-    {
-        videoFilters = [videoFilters stringByAppendingString:[NSString stringWithFormat:@" - Deblock (%d)",[fPictureController deblock]]];
-    }
-	
-    /* Grayscale */
-    if ([fPictureController grayscale]) 
+    if ([summary hasPrefix:@" - "])
     {
-        videoFilters = [videoFilters stringByAppendingString:@" - Grayscale"];
+        [summary deleteCharactersInRange:NSMakeRange(0, 3)];
     }
-    [fVideoFiltersField setStringValue: [NSString stringWithFormat:@"Video Filters: %@", videoFilters]];
-    
-    /* Store storage resolution for unparse */
-    fX264PresetsWidthForUnparse  = fTitle->job->width;
-    fX264PresetsHeightForUnparse = fTitle->job->height;
-    // width or height may have changed, unparse
-    [self x264PresetsChangedDisplayExpandedOptions:nil];
-    
-    [fPictureController decombDeinterlacePreviewImage];
+    return [NSString stringWithString:summary];
 }
 
-
 #pragma mark -
 #pragma mark - Audio and Subtitles
 
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index 24c36d764..0a7f82d5b 100644
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">12C60</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2844</string>
-		<string key="IBDocument.AppKitVersion">1187.34</string>
-		<string key="IBDocument.HIToolboxVersion">625.00</string>
+		<string key="IBDocument.SystemVersion">12D78</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.37</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2844</string>
+			<string key="NS.object.0">3084</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -233,15 +233,15 @@
 											<object class="NSTextField" id="987137669">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 30}, {892, 14}}</string>
+												<string key="NSFrame">{{16, 20}, {892, 14}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
 												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="690364175"/>
+												<reference key="NSNextKeyView" ref="503933842"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="537000521">
 													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Picture Size: </string>
+													<string key="NSContents">Picture Settings:</string>
 													<reference key="NSSupport" ref="26"/>
 													<reference key="NSControlView" ref="987137669"/>
 													<reference key="NSBackgroundColor" ref="242973447"/>
@@ -354,37 +354,18 @@
 												</object>
 												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 											</object>
-											<object class="NSTextField" id="690364175">
-												<reference key="NSNextResponder" ref="1053078401"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 17}, {892, 14}}</string>
-												<reference key="NSSuperview" ref="1053078401"/>
-												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="503933842"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="508148739">
-													<int key="NSCellFlags">67108864</int>
-													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Picture Cropping:</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="690364175"/>
-													<reference key="NSBackgroundColor" ref="242973447"/>
-													<reference key="NSTextColor" ref="701609070"/>
-												</object>
-												<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											</object>
 											<object class="NSTextField" id="503933842">
 												<reference key="NSNextResponder" ref="1053078401"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{14, 3}, {892, 14}}</string>
+												<string key="NSFrame">{{16, 4}, {892, 14}}</string>
 												<reference key="NSSuperview" ref="1053078401"/>
 												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="794651271"/>
+												<reference key="NSNextKeyView"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="109092334">
 													<int key="NSCellFlags">67108864</int>
 													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Video Filters:</string>
+													<string key="NSContents">Picture Filters:</string>
 													<reference key="NSSupport" ref="26"/>
 													<reference key="NSControlView" ref="503933842"/>
 													<reference key="NSBackgroundColor" ref="242973447"/>
@@ -1076,7 +1057,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<object class="NSTextFieldCell" key="NSCell" id="858212432">
 																	<int key="NSCellFlags">67108864</int>
 																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">h264 Profile:</string>
+																	<string key="NSContents">H.264 Profile:</string>
 																	<reference key="NSSupport" ref="26"/>
 																	<reference key="NSControlView" ref="102651997"/>
 																	<reference key="NSBackgroundColor" ref="242973447"/>
@@ -1095,7 +1076,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<object class="NSTextFieldCell" key="NSCell" id="248169798">
 																	<int key="NSCellFlags">67108864</int>
 																	<int key="NSCellFlags2">71303168</int>
-																	<string key="NSContents">h264 Level:</string>
+																	<string key="NSContents">H.264 Level:</string>
 																	<reference key="NSSupport" ref="26"/>
 																	<reference key="NSControlView" ref="8023338"/>
 																	<reference key="NSBackgroundColor" ref="242973447"/>
@@ -1437,7 +1418,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<string key="NSFrame">{{12, 6}, {863, 29}}</string>
 																<reference key="NSSuperview" ref="443817184"/>
 																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView" ref="987137669"/>
+																<reference key="NSNextKeyView"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSTextFieldCell" key="NSCell" id="812860538">
 																	<int key="NSCellFlags">67108864</int>
@@ -6679,7 +6660,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureSizeField</string>
+						<string key="label">fPictureSettingsField</string>
 						<reference key="source" ref="2258723"/>
 						<reference key="destination" ref="987137669"/>
 					</object>
@@ -6687,15 +6668,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">fPictureCroppingField</string>
-						<reference key="source" ref="2258723"/>
-						<reference key="destination" ref="690364175"/>
-					</object>
-					<int key="connectionID">5170</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fVideoFiltersField</string>
+						<string key="label">fPictureFiltersField</string>
 						<reference key="source" ref="2258723"/>
 						<reference key="destination" ref="503933842"/>
 					</object>
@@ -8033,7 +8006,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="222980245"/>
 							<reference ref="954159030"/>
 							<reference ref="888819828"/>
-							<reference ref="690364175"/>
 						</object>
 						<reference key="parent" ref="107038816"/>
 					</object>
@@ -8119,15 +8091,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="parent" ref="1053078401"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">2375</int>
-						<reference key="object" ref="690364175"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="508148739"/>
-						</object>
-						<reference key="parent" ref="1053078401"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">1989</int>
 						<reference key="object" ref="291470012"/>
 						<object class="NSMutableArray" key="children">
@@ -9349,11 +9312,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="parent" ref="447003158"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">4893</int>
-						<reference key="object" ref="508148739"/>
-						<reference key="parent" ref="690364175"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">4904</int>
 						<reference key="object" ref="719511430"/>
 						<reference key="parent" ref="262106913"/>
@@ -11341,7 +11299,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>2364.IBAttributePlaceholdersKey</string>
 					<string>2364.IBPluginDependency</string>
 					<string>2368.IBPluginDependency</string>
-					<string>2375.IBPluginDependency</string>
 					<string>240.IBPluginDependency</string>
 					<string>2421.IBPluginDependency</string>
 					<string>2443.IBPluginDependency</string>
@@ -11404,7 +11361,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>4879.IBPluginDependency</string>
 					<string>4880.IBPluginDependency</string>
 					<string>4892.IBPluginDependency</string>
-					<string>4893.IBPluginDependency</string>
 					<string>4904.IBPluginDependency</string>
 					<string>4905.IBPluginDependency</string>
 					<string>4906.IBPluginDependency</string>
@@ -11837,7 +11793,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{72, 712}, {392, 144}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11935,7 +11890,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
@@ -12655,8 +12609,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>fFramerateMatrix</string>
 							<string>fFramerateVfrPfrCell</string>
 							<string>fLoadChaptersButton</string>
-							<string>fPictureCroppingField</string>
-							<string>fPictureSizeField</string>
+							<string>fPictureSettingsField</string>
 							<string>fPresetDrawer</string>
 							<string>fPresetNewDesc</string>
 							<string>fPresetNewFolderCheck</string>
@@ -12716,7 +12669,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>fVidRatePopUp</string>
 							<string>fVidTurboPassCheck</string>
 							<string>fVidTwoPassCheck</string>
-							<string>fVideoFiltersField</string>
+							<string>fPictureFiltersField</string>
 							<string>fWindow</string>
 							<string>fX264FastDecodeCheck</string>
 							<string>fX264LevelPopUp</string>
@@ -12764,7 +12717,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>NSButtonCell</string>
 							<string>NSButton</string>
 							<string>NSTextField</string>
-							<string>NSTextField</string>
 							<string>NSDrawer</string>
 							<string>NSTextField</string>
 							<string>NSButton</string>
@@ -12874,8 +12826,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>fFramerateMatrix</string>
 							<string>fFramerateVfrPfrCell</string>
 							<string>fLoadChaptersButton</string>
-							<string>fPictureCroppingField</string>
-							<string>fPictureSizeField</string>
+							<string>fPictureSettingsField</string>
 							<string>fPresetDrawer</string>
 							<string>fPresetNewDesc</string>
 							<string>fPresetNewFolderCheck</string>
@@ -12935,7 +12886,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>fVidRatePopUp</string>
 							<string>fVidTurboPassCheck</string>
 							<string>fVidTwoPassCheck</string>
-							<string>fVideoFiltersField</string>
+							<string>fPictureFiltersField</string>
 							<string>fWindow</string>
 							<string>fX264FastDecodeCheck</string>
 							<string>fX264LevelPopUp</string>
@@ -13073,11 +13024,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">fPictureCroppingField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fPictureSizeField</string>
+								<string key="name">fPictureSettingsField</string>
 								<string key="candidateClassName">NSTextField</string>
 							</object>
 							<object class="IBToOneOutletInfo">
@@ -13317,7 +13264,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="candidateClassName">NSButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">fVideoFiltersField</string>
+								<string key="name">fPictureFiltersField</string>
 								<string key="candidateClassName">NSTextField</string>
 							</object>
 							<object class="IBToOneOutletInfo">