summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordynaflash <[email protected]>2009-01-26 21:34:59 +0000
committerdynaflash <[email protected]>2009-01-26 21:34:59 +0000
commitf1c3b0a71ede4b578481a980c1e69bf27ab0a2f4 (patch)
treeaf79ba12b3c3cb664e6fc2e332d09433273395b4
parenta1beb04d523c26c851e820572507cbff8b27e637 (diff)
MacGui: Picture Filters separate hud inspector initial implementation
- Separates the filters out from the picture settings inspector into their own inspector in preparation for more advanced filters - Gingerbread is shaky but wanted to get the functionality into the svn due the the number of files modified or added. - Adds a toggle action to Picture Settings, Picture Filters and the activity window git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2099 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/Controller.h6
-rw-r--r--macosx/Controller.mm160
-rw-r--r--macosx/English.lproj/MainMenu.xib30
-rw-r--r--macosx/English.lproj/PictureFilters.xib1277
-rw-r--r--macosx/English.lproj/PictureSettings.xib962
-rw-r--r--macosx/HBFilterController.h106
-rw-r--r--macosx/HBFilterController.mm281
-rw-r--r--macosx/HBOutputPanelController.m7
-rw-r--r--macosx/HBPreviewController.mm24
-rw-r--r--macosx/HandBrake.xcodeproj/project.pbxproj36
-rw-r--r--macosx/PictureController.h29
-rw-r--r--macosx/PictureController.mm170
12 files changed, 1983 insertions, 1105 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h
index 6ca336a36..453c54eba 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -11,6 +11,7 @@
#import "ChapterTitles.h"
#import "PictureController.h"
+#import "HBFilterController.h"
#import "HBPreviewController.h"
#import "HBQueueController.h"
#import "HBAdvancedController.h"
@@ -18,6 +19,7 @@
#import "HBPresets.h"
@class HBOutputPanelController;
+@class PictureFilterController;
/* We subclass NSView so that our drags show both the icon as well as PresetName columns */
@interface HBPresetsOutlineView : NSOutlineView
@@ -45,6 +47,8 @@ BOOL fIsDragging;
/* Picture Settings */
PictureController * fPictureController;
+ /* Picture Filters */
+ PictureFilterController * fPictureFilterController;
/* Picture Preview */
PreviewController * fPreviewController;
@@ -305,7 +309,7 @@ BOOL fIsDragging;
- (IBAction) showPicturePanel: (id) sender;
- (void) picturePanelFullScreen;
- (void) picturePanelWindowed;
-
+- (IBAction) showFiltersPanel: (id) sender;
- (IBAction) showPreviewWindow: (id) sender;
- (void)pictureSettingsDidChange;
- (IBAction) calculatePictureSizing: (id) sender;
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 18f21cef5..dfa73ed4b 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -10,6 +10,7 @@
#import "HBDVDDetector.h"
#import "HBPresets.h"
#import "HBPreviewController.h"
+#import "HBFilterController.h"
#define DragDropSimplePboardType @"MyCustomOutlineViewPboardType"
@@ -62,7 +63,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
}
outputPanel = [[HBOutputPanelController alloc] init];
fPictureController = [[PictureController alloc] init];
- //fPreviewController = [[PreviewController alloc] init];
+ fPictureFilterController = [[PictureFilterController alloc] init];
fQueueController = [[HBQueueController alloc] init];
fAdvancedOptions = [[HBAdvancedController alloc] init];
/* we init the HBPresets class which currently is only used
@@ -92,9 +93,9 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
/* Init others controllers */
[fPictureController SetHandle: fHandle];
[fPictureController setHBController: self];
- /* fPreviewController */
- //[fPreviewController SetHandle: fHandle];
- //[fPreviewController setHBController: self];
+ /* fPictureController */
+ [fPictureFilterController SetHandle: fHandle];
+ [fPictureFilterController setHBController: self];
[fQueueController setHandle: fQueueEncodeLibhb];
[fQueueController setHBController: self];
@@ -253,6 +254,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
[outputPanel release];
[fQueueController release];
[fPictureController release];
+ [fPictureFilterController release];
[fPreviewController release];
hb_close(&fHandle);
@@ -1547,7 +1549,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
/* lets set Denoise to index 0 or "None" since this is the first scan */
//[fPictureController setDenoise:0];
- [fPictureController setInitialPictureFilters];
+ [fPictureFilterController setInitialPictureFilters];
}
@@ -1916,11 +1918,11 @@ fWorkingCount = 0;
[queueFileJob setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
/* Picture Filters */
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController deinterlace]] forKey:@"PictureDeinterlace"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController detelecine]] forKey:@"PictureDetelecine"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
- [queueFileJob setObject:[NSString stringWithFormat:@"%d",[fPictureController deblock]] forKey:@"PictureDeblock"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController decomb]] forKey:@"PictureDecomb"];
+ [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController deinterlace]] forKey:@"PictureDeinterlace"];
+ [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController detelecine]] forKey:@"PictureDetelecine"];
+ [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController denoise]] forKey:@"PictureDenoise"];
+ [queueFileJob setObject:[NSString stringWithFormat:@"%d",[fPictureFilterController deblock]] forKey:@"PictureDeblock"];
+ [queueFileJob setObject:[NSNumber numberWithInt:[fPictureFilterController decomb]] forKey:@"PictureDecomb"];
/*Audio*/
if ([fAudLang1PopUp indexOfSelectedItem] > 0)
@@ -2439,16 +2441,16 @@ fWorkingCount = 0;
/* Filters */
/* Deinterlace */
- [fPictureController setDeinterlace:[[queueToApply objectForKey:@"PictureDeinterlace"] intValue]];
+ [fPictureFilterController setDeinterlace:[[queueToApply objectForKey:@"PictureDeinterlace"] intValue]];
/* Detelecine */
- [fPictureController setDetelecine:[[queueToApply objectForKey:@"PictureDetelecine"] intValue]];
+ [fPictureFilterController setDetelecine:[[queueToApply objectForKey:@"PictureDetelecine"] intValue]];
/* Denoise */
- [fPictureController setDenoise:[[queueToApply objectForKey:@"PictureDenoise"] intValue]];
+ [fPictureFilterController setDenoise:[[queueToApply objectForKey:@"PictureDenoise"] intValue]];
/* Deblock */
- [fPictureController setDeblock:[[queueToApply objectForKey:@"PictureDeblock"] intValue]];
+ [fPictureFilterController setDeblock:[[queueToApply objectForKey:@"PictureDeblock"] intValue]];
/* Decomb */
- [fPictureController setDecomb:[[queueToApply objectForKey:@"PictureDecomb"] intValue]];
+ [fPictureFilterController setDecomb:[[queueToApply objectForKey:@"PictureDecomb"] intValue]];
[self calculatePictureSizing:nil];
@@ -2706,7 +2708,7 @@ fWorkingCount = 0;
/* If we are same as source and we have detelecine on, we need to turn on
* job->vfr
*/
- if ([fPictureController detelecine] == 1)
+ if ([fPictureFilterController detelecine] == 1)
{
job->vfr = 1;
}
@@ -2822,13 +2824,13 @@ fWorkingCount = 0;
*/
/* Detelecine */
- if ([fPictureController detelecine])
+ if ([fPictureFilterController detelecine])
{
hb_list_add( job->filters, &hb_filter_detelecine );
}
/* Decomb */
- if ([fPictureController decomb] > 0)
+ if ([fPictureFilterController decomb] > 0)
{
/* Run old deinterlacer fd by default */
//hb_filter_decomb.settings = (char *) [[fPicSettingDecomb stringValue] UTF8String];
@@ -2837,19 +2839,19 @@ fWorkingCount = 0;
/* Deinterlace */
- if ([fPictureController deinterlace] == 1)
+ if ([fPictureFilterController deinterlace] == 1)
{
/* Run old deinterlacer fd by default */
hb_filter_deinterlace.settings = "-1";
hb_list_add( job->filters, &hb_filter_deinterlace );
}
- else if ([fPictureController deinterlace] == 2)
+ else if ([fPictureFilterController deinterlace] == 2)
{
/* Yadif mode 0 (without spatial deinterlacing.) */
hb_filter_deinterlace.settings = "2";
hb_list_add( job->filters, &hb_filter_deinterlace );
}
- else if ([fPictureController deinterlace] == 3)
+ else if ([fPictureFilterController deinterlace] == 3)
{
/* Yadif (with spatial deinterlacing) */
hb_filter_deinterlace.settings = "0";
@@ -2857,17 +2859,17 @@ fWorkingCount = 0;
}
/* Denoise */
- if ([fPictureController denoise] == 1) // Weak in popup
+ if ([fPictureFilterController denoise] == 1) // Weak in popup
{
hb_filter_denoise.settings = "2:1:2:3";
hb_list_add( job->filters, &hb_filter_denoise );
}
- else if ([fPictureController denoise] == 2) // Medium in popup
+ else if ([fPictureFilterController denoise] == 2) // Medium in popup
{
hb_filter_denoise.settings = "3:2:2:3";
hb_list_add( job->filters, &hb_filter_denoise );
}
- else if ([fPictureController denoise] == 3) // Strong in popup
+ else if ([fPictureFilterController denoise] == 3) // Strong in popup
{
hb_filter_denoise.settings = "7:7:5:5";
hb_list_add( job->filters, &hb_filter_denoise );
@@ -2878,9 +2880,9 @@ fWorkingCount = 0;
* the macgui's purposes a value of 0 actually means to not even use the filter
* current hb_filter_deblock.settings valid ranges are from 5 - 15
*/
- if ([fPictureController deblock] != 0)
+ if ([fPictureFilterController deblock] != 0)
{
- NSString *deblockStringValue = [NSString stringWithFormat: @"%d",[fPictureController deblock]];
+ NSString *deblockStringValue = [NSString stringWithFormat: @"%d",[fPictureFilterController deblock]];
hb_filter_deblock.settings = (char *) [deblockStringValue UTF8String];
hb_list_add( job->filters, &hb_filter_deblock );
}
@@ -3614,7 +3616,7 @@ fWorkingCount = 0;
/* Reset the new title in fPictureController && fPreviewController*/
[fPictureController SetTitle:title];
- //[fPreviewController SetTitle:title];
+ //[fPictureFilterController SetTitle:title];
/* Update subtitle popups */
hb_subtitle_t * subtitle;
[fSubPopUp removeAllItems];
@@ -4177,9 +4179,35 @@ the user is using "Custom" settings by determining the sender*/
{
[fPicSettingARkeep setStringValue: @"Off"];
}
+
+ if (fTitle->job->anamorphic.mode > 0)
+ {
+ [fPicSettingPAR setStringValue: @""];
+ }
+ else
+ {
+ [fPicSettingPAR setStringValue: @"Off"];
+ }
+
+ /* Set the display field for crop as per boolean */
+ if (![fPictureController autoCrop])
+ {
+ [fPicSettingAutoCrop setStringValue: @"Custom"];
+ }
+ else
+ {
+ [fPicSettingAutoCrop setStringValue: @"Auto"];
+ }
+
/* Detelecine */
- if ([fPictureController detelecine])
+
+ /*On Screen Notification*/
+ //int status;
+ //status = NSRunAlertPanel(@"Method Reached...",@"Click to Continue!", @"OK", nil, nil);
+ //[NSApp requestUserAttention:NSCriticalRequest];
+
+ if ([fPictureFilterController detelecine])
{
[fPicSettingDetelecine setStringValue: @"On"];
}
@@ -4189,7 +4217,7 @@ the user is using "Custom" settings by determining the sender*/
}
/* Decomb */
- if ([fPictureController decomb])
+ if ([fPictureFilterController decomb])
{
//[fPicSettingDecomb setStringValue: @"1:2:6:9:80:16:16"];
[fPicSettingDecomb setStringValue: @"On"];
@@ -4200,53 +4228,60 @@ the user is using "Custom" settings by determining the sender*/
}
- /* VFR (Variable Frame Rate) */
+ /* Deinterlace */
+ if ([fPictureFilterController deinterlace] > 0)
+ {
+ fTitle->job->deinterlace = 1;
+ }
+ else
+ {
+ fTitle->job->deinterlace = 0;
+ }
- /* Deinterlace */
- if ([fPictureController deinterlace] == 0)
+ if ([fPictureFilterController deinterlace] == 0)
{
[fPicSettingDeinterlace setStringValue: @"Off"];
}
- else if ([fPictureController deinterlace] == 1)
+ else if ([fPictureFilterController deinterlace] == 1)
{
[fPicSettingDeinterlace setStringValue: @"Fast"];
}
- else if ([fPictureController deinterlace] == 2)
+ else if ([fPictureFilterController deinterlace] == 2)
{
[fPicSettingDeinterlace setStringValue: @"Slow"];
}
- else if ([fPictureController deinterlace] == 3)
+ else if ([fPictureFilterController deinterlace] == 3)
{
[fPicSettingDeinterlace setStringValue: @"Slower"];
}
/* Denoise */
- if ([fPictureController denoise] == 0)
+ if ([fPictureFilterController denoise] == 0)
{
[fPicSettingDenoise setStringValue: @"Off"];
}
- else if ([fPictureController denoise] == 1)
+ else if ([fPictureFilterController denoise] == 1)
{
[fPicSettingDenoise setStringValue: @"Weak"];
}
- else if ([fPictureController denoise] == 2)
+ else if ([fPictureFilterController denoise] == 2)
{
[fPicSettingDenoise setStringValue: @"Medium"];
}
- else if ([fPictureController denoise] == 3)
+ else if ([fPictureFilterController denoise] == 3)
{
[fPicSettingDenoise setStringValue: @"Strong"];
}
/* Deblock */
- if ([fPictureController deblock] == 0)
+ if ([fPictureFilterController deblock] == 0)
{
[fPicSettingDeblock setStringValue: @"Off"];
}
else
{
- [fPicSettingDeblock setStringValue: [NSString stringWithFormat:@"%d",[fPictureController deblock]]];
+ [fPicSettingDeblock setStringValue: [NSString stringWithFormat:@"%d",[fPictureFilterController deblock]]];
}
if (fTitle->job->anamorphic.mode > 0)
@@ -4267,7 +4302,8 @@ the user is using "Custom" settings by determining the sender*/
{
[fPicSettingAutoCrop setStringValue: @"Auto"];
}
-
+
+ [fPictureController reloadStillPreview];
}
@@ -5188,6 +5224,11 @@ the user is using "Custom" settings by determining the sender*/
[fPictureController setToWindowedMode];
}
+- (IBAction) showFiltersPanel: (id) sender
+{
+ [fPictureFilterController showFilterWindow:sender];
+}
+
- (IBAction) showPreviewWindow: (id) sender
{
[fPictureController showPreviewWindow:sender];
@@ -5827,59 +5868,60 @@ return YES;
* since we no longer have a fourth "Slowest" deinterlacing due to the mcdeint bug */
if ([[chosenPreset objectForKey:@"PictureDeinterlace"] intValue] == 4)
{
- [fPictureController setDeinterlace:3];
+ [fPictureFilterController setDeinterlace:3];
}
else
{
- [fPictureController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
+ [fPictureFilterController setDeinterlace:[[chosenPreset objectForKey:@"PictureDeinterlace"] intValue]];
}
}
else
{
- [fPictureController setDeinterlace:0];
+ [fPictureFilterController setDeinterlace:0];
}
/* Detelecine */
if ([[chosenPreset objectForKey:@"PictureDetelecine"] intValue] == 1)
{
- [fPictureController setDetelecine:[[chosenPreset objectForKey:@"PictureDetelecine"] intValue]];
+ [fPictureFilterController setDetelecine:[[chosenPreset objectForKey:@"PictureDetelecine"] intValue]];
}
else
{
- [fPictureController setDetelecine:0];
+ [fPictureFilterController setDetelecine:0];
}
/* Denoise */
if ([chosenPreset objectForKey:@"PictureDenoise"])
{
- [fPictureController setDenoise:[[chosenPreset objectForKey:@"PictureDenoise"] intValue]];
+ [fPictureFilterController setDenoise:[[chosenPreset objectForKey:@"PictureDenoise"] intValue]];
}
else
{
- [fPictureController setDenoise:0];
+ [fPictureFilterController setDenoise:0];
}
/* Deblock */
if ([[chosenPreset objectForKey:@"PictureDeblock"] intValue] == 1)
{
/* if its a one, then its the old on/off deblock, set on to 5*/
- [fPictureController setDeblock:5];
+ [fPictureFilterController setDeblock:5];
}
else
{
/* use the settings intValue */
- [fPictureController setDeblock:[[chosenPreset objectForKey:@"PictureDeblock"] intValue]];
+ [fPictureFilterController setDeblock:[[chosenPreset objectForKey:@"PictureDeblock"] intValue]];
}
/* Decomb */
if ([[chosenPreset objectForKey:@"PictureDecomb"] intValue] == 1)
{
- [fPictureController setDecomb:1];
+ [fPictureFilterController setDecomb:1];
}
else
{
- [fPictureController setDecomb:0];
+ [fPictureFilterController setDecomb:0];
}
}
/* we call SetTitle: in fPictureController so we get an instant update in the Picture Settings window */
[fPictureController SetTitle:fTitle];
+ //[fPictureFilterController FilterSettingsChanged:nil];
[self calculatePictureSizing:nil];
}
}
@@ -6073,12 +6115,12 @@ return YES;
[preset setObject:[NSNumber numberWithInt:job->crop[3]] forKey:@"PictureRightCrop"];
/* Picture Filters */
- [preset setObject:[NSNumber numberWithInt:[fPictureController deinterlace]] forKey:@"PictureDeinterlace"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController detelecine]] forKey:@"PictureDetelecine"];
- //[preset setObject:[NSNumber numberWithInt:[fPictureController vfr]] forKey:@"VFR"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController deblock]] forKey:@"PictureDeblock"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController decomb]] forKey:@"PictureDecomb"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureFilterController deinterlace]] forKey:@"PictureDeinterlace"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureFilterController detelecine]] forKey:@"PictureDetelecine"];
+ //[preset setObject:[NSNumber numberWithInt:[fPictureFilterController vfr]] forKey:@"VFR"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureFilterController denoise]] forKey:@"PictureDenoise"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureFilterController deblock]] forKey:@"PictureDeblock"];
+ [preset setObject:[NSNumber numberWithInt:[fPictureFilterController decomb]] forKey:@"PictureDecomb"];
/*Audio*/
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index 6abcd884d..3292c51d1 100644
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -3835,6 +3835,14 @@
<reference key="NSOnImage" ref="447995298"/>
<reference key="NSMixedImage" ref="760317610"/>
</object>
+ <object class="NSMenuItem" id="74583158">
+ <reference key="NSMenu" ref="919178355"/>
+ <string key="NSTitle">Picture Filters</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="447995298"/>
+ <reference key="NSMixedImage" ref="760317610"/>
+ </object>
<object class="NSMenuItem" id="157409278">
<reference key="NSMenu" ref="919178355"/>
<string key="NSTitle">Preview Window</string>
@@ -6541,6 +6549,14 @@
</object>
<int key="connectionID">5158</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">showFiltersPanel:</string>
+ <reference key="source" ref="2258723"/>
+ <reference key="destination" ref="74583158"/>
+ </object>
+ <int key="connectionID">5160</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -7680,6 +7696,7 @@
<reference ref="849279674"/>
<reference ref="1034427275"/>
<reference ref="157409278"/>
+ <reference ref="74583158"/>
</object>
<reference key="parent" ref="610133626"/>
</object>
@@ -9955,6 +9972,11 @@
<reference key="object" ref="157409278"/>
<reference key="parent" ref="919178355"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5159</int>
+ <reference key="object" ref="74583158"/>
+ <reference key="parent" ref="919178355"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -10623,6 +10645,7 @@
<string>5153.IBPluginDependency</string>
<string>5153.ImportedFromIB2</string>
<string>5157.IBPluginDependency</string>
+ <string>5159.IBPluginDependency</string>
<string>56.IBPluginDependency</string>
<string>56.ImportedFromIB2</string>
<string>57.IBPluginDependency</string>
@@ -10651,7 +10674,7 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{262, 642}, {211, 183}}</string>
+ <string>{{262, 622}, {211, 203}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11330,6 +11353,7 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
@@ -11364,7 +11388,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">5158</int>
+ <int key="maxID">5160</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -11415,6 +11439,7 @@
<string>setEnabledStateOfAudioMixdownControls:</string>
<string>showAddPresetPanel:</string>
<string>showDebugOutputPanel:</string>
+ <string>showFiltersPanel:</string>
<string>showNewScan:</string>
<string>showPicturePanel:</string>
<string>showPreferencesWindow:</string>
@@ -11481,6 +11506,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
diff --git a/macosx/English.lproj/PictureFilters.xib b/macosx/English.lproj/PictureFilters.xib
new file mode 100644
index 000000000..1e961a16e
--- /dev/null
+++ b/macosx/English.lproj/PictureFilters.xib
@@ -0,0 +1,1277 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
+ <data>
+ <int key="IBDocument.SystemTarget">1050</int>
+ <string key="IBDocument.SystemVersion">9G55</string>
+ <string key="IBDocument.InterfaceBuilderVersion">670</string>
+ <string key="IBDocument.AppKitVersion">949.43</string>
+ <string key="IBDocument.HIToolboxVersion">353.00</string>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="6"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="273418435">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSCustomObject" id="355312334">
+ <string key="NSClassName">PictureFilterController</string>
+ </object>
+ <object class="NSCustomObject" id="844574444">
+ <string key="NSClassName">FirstResponder</string>
+ </object>
+ <object class="NSCustomObject" id="837220151">
+ <string key="NSClassName">NSApplication</string>
+ </object>
+ <object class="NSWindowTemplate" id="616825745">
+ <int key="NSWindowStyleMask">8215</int>
+ <int key="NSWindowBacking">2</int>
+ <string key="NSWindowRect">{{1211, 475}, {345, 400}}</string>
+ <int key="NSWTFlags">1886913536</int>
+ <string key="NSWindowTitle">Picture Filters</string>
+ <string key="NSWindowClass">NSPanel</string>
+ <object class="NSMutableString" key="NSViewClass">
+ <characters key="NS.bytes">View</characters>
+ </object>
+ <string key="NSWindowContentMaxSize">{10000, 10000}</string>
+ <string key="NSWindowContentMinSize">{230, 250}</string>
+ <object class="NSView" key="NSWindowView" id="49161063">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSBox" id="309105014">
+ <reference key="NSNextResponder" ref="49161063"/>
+ <int key="NSvFlags">265</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSView" id="628081139">
+ <reference key="NSNextResponder" ref="309105014"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSPopUpButton" id="346912008">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{85, 224}, {110, 15}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <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>
+ <real value="1.000000e+00" key="CI_inputIntensity" id="559925184"/>
+ <bool key="CIEnabled">YES</bool>
+ </object>
+ </object>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSPopUpButtonCell" key="NSCell" id="1034367716">
+ <int key="NSCellFlags">-2076049856</int>
+ <int key="NSCellFlags2">264192</int>
+ <object class="NSFont" key="NSSupport" id="22">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">9.000000e+00</double>
+ <int key="NSfFlags">3614</int>
+ </object>
+ <reference key="NSControlView" ref="346912008"/>
+ <int key="NSButtonFlags">109199615</int>
+ <int key="NSButtonFlags2">1</int>
+ <object class="NSFont" key="NSAlternateImage" id="826709342">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">9.000000e+00</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <string key="NSAlternateContents"/>
+ <object class="NSMutableString" key="NSKeyEquivalent">
+ <characters key="NS.bytes"/>
+ </object>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ <object class="NSMenuItem" key="NSMenuItem" id="937797455">
+ <reference key="NSMenu" ref="132523332"/>
+ <string key="NSTitle">Item1</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="39717236">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage" id="1010805506">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="1034367716"/>
+ </object>
+ <bool key="NSMenuItemRespectAlignment">YES</bool>
+ <object class="NSMenu" key="NSMenu" id="132523332">
+ <object class="NSMutableString" key="NSTitle">
+ <characters key="NS.bytes">OtherViews</characters>
+ </object>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="937797455"/>
+ <object class="NSMenuItem" id="71282261">
+ <reference key="NSMenu" ref="132523332"/>
+ <string key="NSTitle">Item2</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="39717236"/>
+ <reference key="NSMixedImage" ref="1010805506"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="1034367716"/>
+ </object>
+ <object class="NSMenuItem" id="542784764">
+ <reference key="NSMenu" ref="132523332"/>
+ <string key="NSTitle">Item3</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="39717236"/>
+ <reference key="NSMixedImage" ref="1010805506"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="1034367716"/>
+ </object>
+ </object>
+ </object>
+ <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="905607845">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{14, 222}, {68, 17}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="522867811">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">Deinterlace:</string>
+ <object class="NSFont" key="NSSupport" id="26">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">1.100000e+01</double>
+ <int key="NSfFlags">3100</int>
+ </object>
+ <reference key="NSControlView" ref="905607845"/>
+ <object class="NSColor" key="NSBackgroundColor" id="407686733">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlColor</string>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+ </object>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="852384715">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAxIDEAA</bytes>
+ </object>
+ </object>
+ </object>
+ <object class="NSTextField" id="57714806">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{14, 247}, {68, 17}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="456341790">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">Detelecine:</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="57714806"/>
+ <reference key="NSBackgroundColor" ref="407686733"/>
+ <reference key="NSTextColor" ref="852384715"/>
+ </object>
+ </object>
+ <object class="NSButton" id="407610327">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{83, 249}, {18, 18}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <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="NSButtonCell" key="NSCell" id="832714893">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">67239936</int>
+ <string key="NSContents">Detelecine:</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="407610327"/>
+ <int key="NSButtonFlags">1210864127</int>
+ <int key="NSButtonFlags2">2</int>
+ <object class="NSButtonImageSource" key="NSAlternateImage" id="931738615">
+ <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="NSButton" id="974850032">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{76, 149}, {22, 18}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <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="NSButtonCell" key="NSCell" id="464410464">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">67239936</int>
+ <string key="NSContents">Decomb:</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="974850032"/>
+ <int key="NSButtonFlags">1210864127</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSAlternateImage" ref="931738615"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSPopUpButton" id="243795165">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{86, 197}, {109, 15}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <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="NSPopUpButtonCell" key="NSCell" id="708528272">
+ <int key="NSCellFlags">-2076049856</int>
+ <int key="NSCellFlags2">264192</int>
+ <reference key="NSSupport" ref="22"/>
+ <reference key="NSControlView" ref="243795165"/>
+ <int key="NSButtonFlags">109199615</int>
+ <int key="NSButtonFlags2">1</int>
+ <reference key="NSAlternateImage" ref="826709342"/>
+ <string key="NSAlternateContents"/>
+ <object class="NSMutableString" key="NSKeyEquivalent">
+ <characters key="NS.bytes"/>
+ </object>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ <object class="NSMenuItem" key="NSMenuItem" id="114494573">
+ <reference key="NSMenu" ref="176321383"/>
+ <string key="NSTitle">Item1</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <int key="NSState">1</int>
+ <reference key="NSOnImage" ref="39717236"/>
+ <reference key="NSMixedImage" ref="1010805506"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="708528272"/>
+ </object>
+ <bool key="NSMenuItemRespectAlignment">YES</bool>
+ <object class="NSMenu" key="NSMenu" id="176321383">
+ <object class="NSMutableString" key="NSTitle">
+ <characters key="NS.bytes">OtherViews</characters>
+ </object>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="114494573"/>
+ <object class="NSMenuItem" id="750998660">
+ <reference key="NSMenu" ref="176321383"/>
+ <string key="NSTitle">Item2</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="39717236"/>
+ <reference key="NSMixedImage" ref="1010805506"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="708528272"/>
+ </object>
+ <object class="NSMenuItem" id="133285043">
+ <reference key="NSMenu" ref="176321383"/>
+ <string key="NSTitle">Item3</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="39717236"/>
+ <reference key="NSMixedImage" ref="1010805506"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="708528272"/>
+ </object>
+ </object>
+ </object>
+ <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="94419441">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{31, 196}, {51, 17}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="741873280">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">Denoise:</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="94419441"/>
+ <reference key="NSBackgroundColor" ref="407686733"/>
+ <reference key="NSTextColor" ref="852384715"/>
+ </object>
+ </object>
+ <object class="NSTextField" id="1069536323">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{22, 172}, {51, 17}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="728722104">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">Deblock:</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="1069536323"/>
+ <reference key="NSBackgroundColor" ref="407686733"/>
+ <reference key="NSTextColor" ref="852384715"/>
+ </object>
+ </object>
+ <object class="NSTextField" id="762149330">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{26, 151}, {55, 14}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="192583280">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">Decomb:</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="762149330"/>
+ <reference key="NSBackgroundColor" ref="407686733"/>
+ <reference key="NSTextColor" ref="852384715"/>
+ </object>
+ </object>
+ <object class="NSTextField" id="314638156">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{68, 174}, {31, 14}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="350598908">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">138543104</int>
+ <string key="NSContents">Off</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="314638156"/>
+ <reference key="NSBackgroundColor" ref="407686733"/>
+ <reference key="NSTextColor" ref="852384715"/>
+ </object>
+ </object>
+ <object class="NSSlider" id="581126685">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{100, 169}, {96, 16}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <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="NSSliderCell" key="NSCell" id="257047106">
+ <int key="NSCellFlags">-2079981824</int>
+ <int key="NSCellFlags2">262144</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="22"/>
+ <reference key="NSControlView" ref="581126685"/>
+ <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>
+ <string key="NSFrame">{{2, 18}, {228, 283}}</string>
+ <reference key="NSSuperview" ref="309105014"/>
+ </object>
+ </object>
+ <string key="NSFrame">{{62, 48}, {232, 303}}</string>
+ <reference key="NSSuperview" ref="49161063"/>
+ <string key="NSOffsets">{0, 0}</string>
+ <object class="NSTextFieldCell" key="NSTitleCell">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="26"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textBackgroundColor</string>
+ <object class="NSColor" key="NSColor">
+ <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="628081139"/>
+ <int key="NSBorderType">3</int>
+ <int key="NSBoxType">0</int>
+ <int key="NSTitlePosition">4</int>
+ <bool key="NSTransparent">NO</bool>
+ </object>
+ <object class="NSButton" id="892118626">
+ <reference key="NSNextResponder" ref="49161063"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{119, 372}, {57, 16}}</string>
+ <reference key="NSSuperview" ref="49161063"/>
+ <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="NSButtonCell" key="NSCell" id="533593716">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134479872</int>
+ <string key="NSContents">Preview</string>
+ <reference key="NSSupport" ref="22"/>
+ <reference key="NSControlView" ref="892118626"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="565292660">
+ <reference key="NSNextResponder" ref="49161063"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{229, 372}, {88, 16}}</string>
+ <reference key="NSSuperview" ref="49161063"/>
+ <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>
+ <real value="1.000000e+00" key="CI_inputIntensity"/>
+ <bool key="CIEnabled">YES</bool>
+ </object>
+ </object>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="297585337">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134479872</int>
+ <string key="NSContents">Picture Size</string>
+ <reference key="NSSupport" ref="22"/>
+ <reference key="NSControlView" ref="565292660"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{345, 400}</string>
+ <reference key="NSSuperview"/>
+ </object>
+ <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSMinSize">{230, 269}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fDeinterlacePopUp</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="346912008"/>
+ </object>
+ <int key="connectionID">62</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fDenoisePopUp</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="243795165"/>
+ </object>
+ <int key="connectionID">63</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fDetelecineCheck</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="407610327"/>
+ </object>
+ <int key="connectionID">64</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fDeblockSlider</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="581126685"/>
+ </object>
+ <int key="connectionID">202</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fDeblockField</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="314638156"/>
+ </object>
+ <int key="connectionID">206</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fDecombCheck</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="974850032"/>
+ </object>
+ <int key="connectionID">238</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fPictureFilterBox</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="309105014"/>
+ </object>
+ <int key="connectionID">243</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fPreviewOpenButton</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="892118626"/>
+ </object>
+ <int key="connectionID">272</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">showPreviewWindow:</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="892118626"/>
+ </object>
+ <int key="connectionID">273</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">FilterSettingsChanged:</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="407610327"/>
+ </object>
+ <int key="connectionID">275</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">FilterSettingsChanged:</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="346912008"/>
+ </object>
+ <int key="connectionID">276</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">FilterSettingsChanged:</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="243795165"/>
+ </object>
+ <int key="connectionID">277</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">deblockSliderChanged:</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="581126685"/>
+ </object>
+ <int key="connectionID">278</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">FilterSettingsChanged:</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="974850032"/>
+ </object>
+ <int key="connectionID">279</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fFilterWindow</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="616825745"/>
+ </object>
+ <int key="connectionID">280</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">window</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="616825745"/>
+ </object>
+ <int key="connectionID">281</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fPictureSizeOpenButton</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="565292660"/>
+ </object>
+ <int key="connectionID">284</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">showPictureSettingsWindow:</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="565292660"/>
+ </object>
+ <int key="connectionID">285</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <object class="NSArray" key="object" id="48079043">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="children" ref="273418435"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="355312334"/>
+ <reference key="parent" ref="48079043"/>
+ <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="844574444"/>
+ <reference key="parent" ref="48079043"/>
+ <string key="objectName">First Responder</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-3</int>
+ <reference key="object" ref="837220151"/>
+ <reference key="parent" ref="48079043"/>
+ <string key="objectName">Application</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="616825745"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="49161063"/>
+ </object>
+ <reference key="parent" ref="48079043"/>
+ <string key="objectName">PictureFiltersPanel</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6</int>
+ <reference key="object" ref="49161063"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="309105014"/>
+ <reference ref="565292660"/>
+ <reference ref="892118626"/>
+ </object>
+ <reference key="parent" ref="616825745"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">23</int>
+ <reference key="object" ref="309105014"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="243795165"/>
+ <reference ref="346912008"/>
+ <reference ref="905607845"/>
+ <reference ref="94419441"/>
+ <reference ref="581126685"/>
+ <reference ref="1069536323"/>
+ <reference ref="314638156"/>
+ <reference ref="974850032"/>
+ <reference ref="407610327"/>
+ <reference ref="57714806"/>
+ <reference ref="762149330"/>
+ </object>
+ <reference key="parent" ref="49161063"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">32</int>
+ <reference key="object" ref="346912008"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1034367716"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">161</int>
+ <reference key="object" ref="1034367716"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="132523332"/>
+ </object>
+ <reference key="parent" ref="346912008"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">33</int>
+ <reference key="object" ref="132523332"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="937797455"/>
+ <reference ref="71282261"/>
+ <reference ref="542784764"/>
+ </object>
+ <reference key="parent" ref="1034367716"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">34</int>
+ <reference key="object" ref="937797455"/>
+ <reference key="parent" ref="132523332"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">35</int>
+ <reference key="object" ref="71282261"/>
+ <reference key="parent" ref="132523332"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">36</int>
+ <reference key="object" ref="542784764"/>
+ <reference key="parent" ref="132523332"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">30</int>
+ <reference key="object" ref="905607845"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="522867811"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">159</int>
+ <reference key="object" ref="522867811"/>
+ <reference key="parent" ref="905607845"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">37</int>
+ <reference key="object" ref="407610327"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="832714893"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">162</int>
+ <reference key="object" ref="832714893"/>
+ <reference key="parent" ref="407610327"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">25</int>
+ <reference key="object" ref="243795165"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="708528272"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">158</int>
+ <reference key="object" ref="708528272"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="176321383"/>
+ </object>
+ <reference key="parent" ref="243795165"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">26</int>
+ <reference key="object" ref="176321383"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="114494573"/>
+ <reference ref="750998660"/>
+ <reference ref="133285043"/>
+ </object>
+ <reference key="parent" ref="708528272"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">27</int>
+ <reference key="object" ref="114494573"/>
+ <reference key="parent" ref="176321383"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">28</int>
+ <reference key="object" ref="750998660"/>
+ <reference key="parent" ref="176321383"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">29</int>
+ <reference key="object" ref="133285043"/>
+ <reference key="parent" ref="176321383"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">31</int>
+ <reference key="object" ref="94419441"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="741873280"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">160</int>
+ <reference key="object" ref="741873280"/>
+ <reference key="parent" ref="94419441"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">195</int>
+ <reference key="object" ref="581126685"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="257047106"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">196</int>
+ <reference key="object" ref="257047106"/>
+ <reference key="parent" ref="581126685"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">197</int>
+ <reference key="object" ref="1069536323"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="728722104"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">198</int>
+ <reference key="object" ref="728722104"/>
+ <reference key="parent" ref="1069536323"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">204</int>
+ <reference key="object" ref="314638156"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="350598908"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">205</int>
+ <reference key="object" ref="350598908"/>
+ <reference key="parent" ref="314638156"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">236</int>
+ <reference key="object" ref="974850032"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="464410464"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">237</int>
+ <reference key="object" ref="464410464"/>
+ <reference key="parent" ref="974850032"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">246</int>
+ <reference key="object" ref="57714806"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="456341790"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">247</int>
+ <reference key="object" ref="456341790"/>
+ <reference key="parent" ref="57714806"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">248</int>
+ <reference key="object" ref="762149330"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="192583280"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">249</int>
+ <reference key="object" ref="192583280"/>
+ <reference key="parent" ref="762149330"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">270</int>
+ <reference key="object" ref="892118626"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="533593716"/>
+ </object>
+ <reference key="parent" ref="49161063"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">271</int>
+ <reference key="object" ref="533593716"/>
+ <reference key="parent" ref="892118626"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">282</int>
+ <reference key="object" ref="565292660"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="297585337"/>
+ </object>
+ <reference key="parent" ref="49161063"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">283</int>
+ <reference key="object" ref="297585337"/>
+ <reference key="parent" ref="565292660"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.IBPluginDependency</string>
+ <string>-2.IBPluginDependency</string>
+ <string>-3.IBPluginDependency</string>
+ <string>-3.ImportedFromIB2</string>
+ <string>195.IBPluginDependency</string>
+ <string>195.IBViewIntegration.shadowBlurRadius</string>
+ <string>195.IBViewIntegration.shadowColor</string>
+ <string>195.IBViewIntegration.shadowOffsetHeight</string>
+ <string>195.IBViewIntegration.shadowOffsetWidth</string>
+ <string>196.IBPluginDependency</string>
+ <string>197.IBPluginDependency</string>
+ <string>197.ImportedFromIB2</string>
+ <string>204.IBPluginDependency</string>
+ <string>204.ImportedFromIB2</string>
+ <string>23.IBPluginDependency</string>
+ <string>23.ImportedFromIB2</string>
+ <string>236.IBPluginDependency</string>
+ <string>236.ImportedFromIB2</string>
+ <string>246.IBPluginDependency</string>
+ <string>246.ImportedFromIB2</string>
+ <string>248.IBPluginDependency</string>
+ <string>248.ImportedFromIB2</string>
+ <string>25.IBPluginDependency</string>
+ <string>25.ImportedFromIB2</string>
+ <string>26.IBPluginDependency</string>
+ <string>26.ImportedFromIB2</string>
+ <string>27.IBPluginDependency</string>
+ <string>27.ImportedFromIB2</string>
+ <string>270.IBPluginDependency</string>
+ <string>271.IBPluginDependency</string>
+ <string>28.IBPluginDependency</string>
+ <string>28.ImportedFromIB2</string>
+ <string>282.IBPluginDependency</string>
+ <string>283.IBPluginDependency</string>
+ <string>29.IBPluginDependency</string>
+ <string>29.ImportedFromIB2</string>
+ <string>30.IBPluginDependency</string>
+ <string>30.ImportedFromIB2</string>
+ <string>31.IBPluginDependency</string>
+ <string>31.ImportedFromIB2</string>
+ <string>32.IBPluginDependency</string>
+ <string>32.ImportedFromIB2</string>
+ <string>33.IBPluginDependency</string>
+ <string>33.ImportedFromIB2</string>
+ <string>34.IBPluginDependency</string>
+ <string>34.ImportedFromIB2</string>
+ <string>35.IBPluginDependency</string>
+ <string>35.ImportedFromIB2</string>
+ <string>36.IBPluginDependency</string>
+ <string>36.ImportedFromIB2</string>
+ <string>37.IBPluginDependency</string>
+ <string>37.ImportedFromIB2</string>
+ <string>5.IBEditorWindowLastContentRect</string>
+ <string>5.IBPluginDependency</string>
+ <string>5.IBViewEditorWindowController.showingLayoutRectangles</string>
+ <string>5.IBWindowTemplateEditedContentRect</string>
+ <string>5.ImportedFromIB2</string>
+ <string>5.editorWindowContentRectSynchronizationRect</string>
+ <string>5.windowTemplate.hasMaxSize</string>
+ <string>5.windowTemplate.hasMinSize</string>
+ <string>5.windowTemplate.maxSize</string>
+ <string>5.windowTemplate.minSize</string>
+ <string>6.IBPluginDependency</string>
+ <string>6.ImportedFromIB2</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <reference ref="559925184"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="0" id="8"/>
+ <object class="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
+ <reference ref="8"/>
+ <reference ref="8"/>
+ <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>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>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>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <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>
+ <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>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>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>{{654, 453}, {345, 400}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <reference ref="559925184"/>
+ <string>{{654, 453}, {345, 400}}</string>
+ <reference ref="559925184"/>
+ <string>{{221, 276}, {533, 580}}</string>
+ <reference ref="8"/>
+ <reference ref="559925184"/>
+ <string>{3.40282e+38, 3.40282e+38}</string>
+ <string>{230, 250}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <reference ref="559925184"/>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">285</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">FirstResponder</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">PictureFilterController</string>
+ <string key="superclassName">NSWindowController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>FilterSettingsChanged:</string>
+ <string>deblockSliderChanged:</string>
+ <string>showFilterWindow:</string>
+ <string>showPictureSettingsWindow:</string>
+ <string>showPreviewWindow:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>fAnamorphicPopUp</string>
+ <string>fDeblockCheck</string>
+ <string>fDeblockField</string>
+ <string>fDeblockSlider</string>
+ <string>fDecombCheck</string>
+ <string>fDeinterlacePopUp</string>
+ <string>fDenoisePopUp</string>
+ <string>fDetelecineCheck</string>
+ <string>fFilterWindow</string>
+ <string>fInfoField</string>
+ <string>fPictureFilterBox</string>
+ <string>fPictureSizeOpenButton</string>
+ <string>fPictureSlider</string>
+ <string>fPreviewOpenButton</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSPopUpButton</string>
+ <string>NSButton</string>
+ <string>NSTextField</string>
+ <string>NSSlider</string>
+ <string>NSButton</string>
+ <string>NSPopUpButton</string>
+ <string>NSPopUpButton</string>
+ <string>NSButton</string>
+ <string>NSWindow</string>
+ <string>NSTextField</string>
+ <string>NSBox</string>
+ <string>NSButton</string>
+ <string>NSSlider</string>
+ <string>NSButton</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">HBFilterController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../HandBrake.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ </data>
+</archive>
diff --git a/macosx/English.lproj/PictureSettings.xib b/macosx/English.lproj/PictureSettings.xib
index 74bfbec31..1d0ecf334 100644
--- a/macosx/English.lproj/PictureSettings.xib
+++ b/macosx/English.lproj/PictureSettings.xib
@@ -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="6"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -497,7 +497,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="NSSuperview" ref="1064912113"/>
</object>
</object>
- <string key="NSFrame">{{17, 183}, {193, 161}}</string>
+ <string key="NSFrame">{{17, 149}, {193, 161}}</string>
<reference key="NSSuperview" ref="49161063"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -615,7 +615,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="NSControlView" ref="302614967"/>
<int key="NSButtonFlags">1210864127</int>
<int key="NSButtonFlags2">2</int>
- <object class="NSButtonImageSource" key="NSAlternateImage" id="931738615">
+ <object class="NSButtonImageSource" key="NSAlternateImage">
<string key="NSImageName">NSSwitch</string>
</object>
<string key="NSAlternateContents"/>
@@ -815,7 +815,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="NSSuperview" ref="1011917013"/>
</object>
</object>
- <string key="NSFrame">{{19, 362}, {193, 130}}</string>
+ <string key="NSFrame">{{19, 328}, {193, 130}}</string>
<reference key="NSSuperview" ref="49161063"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -835,419 +835,10 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<int key="NSTitlePosition">4</int>
<bool key="NSTransparent">NO</bool>
</object>
- <object class="NSBox" id="309105014">
- <reference key="NSNextResponder" ref="49161063"/>
- <int key="NSvFlags">265</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSView" id="628081139">
- <reference key="NSNextResponder" ref="309105014"/>
- <int key="NSvFlags">256</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSPopUpButton" id="346912008">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{73, 74}, {110, 15}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <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="NSPopUpButtonCell" key="NSCell" id="1034367716">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">264192</int>
- <reference key="NSSupport" ref="22"/>
- <reference key="NSControlView" ref="346912008"/>
- <int key="NSButtonFlags">109199615</int>
- <int key="NSButtonFlags2">1</int>
- <object class="NSFont" key="NSAlternateImage" id="826709342">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">9.000000e+00</double>
- <int key="NSfFlags">16</int>
- </object>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="937797455">
- <reference key="NSMenu" ref="132523332"/>
- <string key="NSTitle">Item1</string>
- <string key="NSKeyEquiv"/>
- <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"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1034367716"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="132523332">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="937797455"/>
- <object class="NSMenuItem" id="71282261">
- <reference key="NSMenu" ref="132523332"/>
- <string key="NSTitle">Item2</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="1034367716"/>
- </object>
- <object class="NSMenuItem" id="542784764">
- <reference key="NSMenu" ref="132523332"/>
- <string key="NSTitle">Item3</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="1034367716"/>
- </object>
- </object>
- </object>
- <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="905607845">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{2, 72}, {68, 17}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="522867811">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Deinterlace:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="905607845"/>
- <reference key="NSBackgroundColor" ref="407686733"/>
- <reference key="NSTextColor" ref="852384715"/>
- </object>
- </object>
- <object class="NSTextField" id="57714806">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{2, 97}, {68, 17}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="456341790">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Detelecine:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="57714806"/>
- <reference key="NSBackgroundColor" ref="407686733"/>
- <reference key="NSTextColor" ref="852384715"/>
- </object>
- </object>
- <object class="NSButton" id="407610327">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{71, 99}, {18, 18}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <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="NSButtonCell" key="NSCell" id="832714893">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67239936</int>
- <string key="NSContents">Detelecine:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="407610327"/>
- <int key="NSButtonFlags">1210864127</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSAlternateImage" ref="931738615"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="974850032">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{64, -1}, {22, 18}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <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="NSButtonCell" key="NSCell" id="464410464">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67239936</int>
- <string key="NSContents">Decomb:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="974850032"/>
- <int key="NSButtonFlags">1210864127</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSAlternateImage" ref="931738615"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSPopUpButton" id="243795165">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{74, 47}, {109, 15}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <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="NSPopUpButtonCell" key="NSCell" id="708528272">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">264192</int>
- <reference key="NSSupport" ref="22"/>
- <reference key="NSControlView" ref="243795165"/>
- <int key="NSButtonFlags">109199615</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="826709342"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="114494573">
- <reference key="NSMenu" ref="176321383"/>
- <string key="NSTitle">Item1</string>
- <string key="NSKeyEquiv"/>
- <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"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="708528272"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="176321383">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="114494573"/>
- <object class="NSMenuItem" id="750998660">
- <reference key="NSMenu" ref="176321383"/>
- <string key="NSTitle">Item2</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="708528272"/>
- </object>
- <object class="NSMenuItem" id="133285043">
- <reference key="NSMenu" ref="176321383"/>
- <string key="NSTitle">Item3</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="708528272"/>
- </object>
- </object>
- </object>
- <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="94419441">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{19, 46}, {51, 17}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="741873280">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Denoise:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="94419441"/>
- <reference key="NSBackgroundColor" ref="407686733"/>
- <reference key="NSTextColor" ref="852384715"/>
- </object>
- </object>
- <object class="NSTextField" id="1069536323">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{10, 22}, {51, 17}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="728722104">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Deblock:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="1069536323"/>
- <reference key="NSBackgroundColor" ref="407686733"/>
- <reference key="NSTextColor" ref="852384715"/>
- </object>
- </object>
- <object class="NSTextField" id="762149330">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{14, 1}, {55, 14}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="192583280">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Decomb:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="762149330"/>
- <reference key="NSBackgroundColor" ref="407686733"/>
- <reference key="NSTextColor" ref="852384715"/>
- </object>
- </object>
- <object class="NSTextField" id="314638156">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{56, 24}, {31, 14}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="350598908">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">138543104</int>
- <string key="NSContents">Off</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="314638156"/>
- <reference key="NSBackgroundColor" ref="407686733"/>
- <reference key="NSTextColor" ref="852384715"/>
- </object>
- </object>
- <object class="NSSlider" id="581126685">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{88, 19}, {96, 16}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <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="NSSliderCell" key="NSCell" id="257047106">
- <int key="NSCellFlags">-2079981824</int>
- <int key="NSCellFlags2">262144</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="22"/>
- <reference key="NSControlView" ref="581126685"/>
- <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>
- <string key="NSFrame">{{2, 18}, {189, 133}}</string>
- <reference key="NSSuperview" ref="309105014"/>
- </object>
- </object>
- <string key="NSFrame">{{17, 10}, {193, 153}}</string>
- <reference key="NSSuperview" ref="49161063"/>
- <string key="NSOffsets">{0, 0}</string>
- <object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents"/>
- <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="628081139"/>
- <int key="NSBorderType">3</int>
- <int key="NSBoxType">0</int>
- <int key="NSTitlePosition">4</int>
- <bool key="NSTransparent">NO</bool>
- </object>
<object class="NSTextField" id="726326257">
<reference key="NSNextResponder" ref="49161063"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{17, 341}, {68, 17}}</string>
+ <string key="NSFrame">{{17, 307}, {68, 17}}</string>
<reference key="NSSuperview" ref="49161063"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="410204805">
@@ -1263,7 +854,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="922381307">
<reference key="NSNextResponder" ref="49161063"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{19, 489}, {55, 17}}</string>
+ <string key="NSFrame">{{19, 455}, {55, 17}}</string>
<reference key="NSSuperview" ref="49161063"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1037100053">
@@ -1279,22 +870,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
</object>
</object>
- <object class="NSTextField" id="258732701">
- <reference key="NSNextResponder" ref="49161063"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{19, 163}, {44, 14}}</string>
- <reference key="NSSuperview" ref="49161063"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="741867756">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Filters</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="258732701"/>
- <reference key="NSBackgroundColor" ref="407686733"/>
- <reference key="NSTextColor" ref="852384715"/>
- </object>
- </object>
<object class="NSButton" id="892118626">
<reference key="NSNextResponder" ref="49161063"/>
<int key="NSvFlags">268</int>
@@ -1329,6 +904,40 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
+ <object class="NSButton" id="91459209">
+ <reference key="NSNextResponder" ref="49161063"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{18, 490}, {84, 16}}</string>
+ <reference key="NSSuperview" ref="49161063"/>
+ <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>
+ <real value="1.000000e+00" key="CI_inputIntensity"/>
+ <bool key="CIEnabled">YES</bool>
+ </object>
+ </object>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="709813005">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134479872</int>
+ <string key="NSContents">Picture Filters</string>
+ <reference key="NSSupport" ref="22"/>
+ <reference key="NSControlView" ref="91459209"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
</object>
<string key="NSFrameSize">{229, 518}</string>
<reference key="NSSuperview"/>
@@ -1415,30 +1024,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">fDeinterlacePopUp</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="346912008"/>
- </object>
- <int key="connectionID">62</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">fDenoisePopUp</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="243795165"/>
- </object>
- <int key="connectionID">63</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">fDetelecineCheck</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="407610327"/>
- </object>
- <int key="connectionID">64</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">fHeightField</string>
<reference key="source" ref="355312334"/>
<reference key="destination" ref="443002022"/>
@@ -1489,30 +1074,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="IBActionConnection" key="connection">
<string key="label">SettingsChanged:</string>
<reference key="source" ref="355312334"/>
- <reference key="destination" ref="243795165"/>
- </object>
- <int key="connectionID">80</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">SettingsChanged:</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="346912008"/>
- </object>
- <int key="connectionID">81</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">SettingsChanged:</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="407610327"/>
- </object>
- <int key="connectionID">82</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">SettingsChanged:</string>
- <reference key="source" ref="355312334"/>
<reference key="destination" ref="133033963"/>
</object>
<int key="connectionID">83</int>
@@ -1591,46 +1152,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">fDeblockSlider</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="581126685"/>
- </object>
- <int key="connectionID">202</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">deblockSliderChanged:</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="581126685"/>
- </object>
- <int key="connectionID">203</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">fDeblockField</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="314638156"/>
- </object>
- <int key="connectionID">206</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">fDecombCheck</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="974850032"/>
- </object>
- <int key="connectionID">238</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">SettingsChanged:</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="974850032"/>
- </object>
- <int key="connectionID">239</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">fPictureWindow</string>
<reference key="source" ref="355312334"/>
<reference key="destination" ref="616825745"/>
@@ -1655,14 +1176,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">fPictureFilterBox</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="309105014"/>
- </object>
- <int key="connectionID">243</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">fPreviewOpenButton</string>
<reference key="source" ref="355312334"/>
<reference key="destination" ref="892118626"/>
@@ -1677,6 +1190,22 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
<int key="connectionID">273</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fPictureFiltersOpenButton</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="91459209"/>
+ </object>
+ <int key="connectionID">276</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">showFilterWindow:</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="91459209"/>
+ </object>
+ <int key="connectionID">277</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1724,11 +1253,10 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1011917013"/>
<reference ref="1064912113"/>
- <reference ref="309105014"/>
<reference ref="726326257"/>
<reference ref="922381307"/>
- <reference ref="258732701"/>
<reference ref="892118626"/>
+ <reference ref="91459209"/>
</object>
<reference key="parent" ref="616825745"/>
</object>
@@ -1752,25 +1280,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="parent" ref="49161063"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">23</int>
- <reference key="object" ref="309105014"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="243795165"/>
- <reference ref="346912008"/>
- <reference ref="905607845"/>
- <reference ref="94419441"/>
- <reference ref="581126685"/>
- <reference ref="1069536323"/>
- <reference ref="314638156"/>
- <reference ref="974850032"/>
- <reference ref="407610327"/>
- <reference ref="57714806"/>
- <reference ref="762149330"/>
- </object>
- <reference key="parent" ref="49161063"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">39</int>
<reference key="object" ref="1011917013"/>
<object class="NSMutableArray" key="children">
@@ -1927,136 +1436,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="parent" ref="133033963"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">32</int>
- <reference key="object" ref="346912008"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="1034367716"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">161</int>
- <reference key="object" ref="1034367716"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="132523332"/>
- </object>
- <reference key="parent" ref="346912008"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">33</int>
- <reference key="object" ref="132523332"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="937797455"/>
- <reference ref="71282261"/>
- <reference ref="542784764"/>
- </object>
- <reference key="parent" ref="1034367716"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">34</int>
- <reference key="object" ref="937797455"/>
- <reference key="parent" ref="132523332"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">35</int>
- <reference key="object" ref="71282261"/>
- <reference key="parent" ref="132523332"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">36</int>
- <reference key="object" ref="542784764"/>
- <reference key="parent" ref="132523332"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">30</int>
- <reference key="object" ref="905607845"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="522867811"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">159</int>
- <reference key="object" ref="522867811"/>
- <reference key="parent" ref="905607845"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">37</int>
- <reference key="object" ref="407610327"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="832714893"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">162</int>
- <reference key="object" ref="832714893"/>
- <reference key="parent" ref="407610327"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">25</int>
- <reference key="object" ref="243795165"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="708528272"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">158</int>
- <reference key="object" ref="708528272"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="176321383"/>
- </object>
- <reference key="parent" ref="243795165"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">26</int>
- <reference key="object" ref="176321383"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="114494573"/>
- <reference ref="750998660"/>
- <reference ref="133285043"/>
- </object>
- <reference key="parent" ref="708528272"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">27</int>
- <reference key="object" ref="114494573"/>
- <reference key="parent" ref="176321383"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">28</int>
- <reference key="object" ref="750998660"/>
- <reference key="parent" ref="176321383"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">29</int>
- <reference key="object" ref="133285043"/>
- <reference key="parent" ref="176321383"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">31</int>
- <reference key="object" ref="94419441"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="741873280"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">160</int>
- <reference key="object" ref="741873280"/>
- <reference key="parent" ref="94419441"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">41</int>
<reference key="object" ref="513894170"/>
<object class="NSMutableArray" key="children">
@@ -2213,62 +1592,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="parent" ref="301555397"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">195</int>
- <reference key="object" ref="581126685"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="257047106"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">196</int>
- <reference key="object" ref="257047106"/>
- <reference key="parent" ref="581126685"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">197</int>
- <reference key="object" ref="1069536323"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="728722104"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">198</int>
- <reference key="object" ref="728722104"/>
- <reference key="parent" ref="1069536323"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">204</int>
- <reference key="object" ref="314638156"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="350598908"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">205</int>
- <reference key="object" ref="350598908"/>
- <reference key="parent" ref="314638156"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">236</int>
- <reference key="object" ref="974850032"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="464410464"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">237</int>
- <reference key="object" ref="464410464"/>
- <reference key="parent" ref="974850032"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">244</int>
<reference key="object" ref="973216726"/>
<object class="NSMutableArray" key="children">
@@ -2283,34 +1606,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="parent" ref="973216726"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">246</int>
- <reference key="object" ref="57714806"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="456341790"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">247</int>
- <reference key="object" ref="456341790"/>
- <reference key="parent" ref="57714806"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">248</int>
- <reference key="object" ref="762149330"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="192583280"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">249</int>
- <reference key="object" ref="192583280"/>
- <reference key="parent" ref="762149330"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">250</int>
<reference key="object" ref="1021399174"/>
<object class="NSMutableArray" key="children">
@@ -2367,32 +1662,32 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="parent" ref="922381307"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">264</int>
- <reference key="object" ref="258732701"/>
+ <int key="objectID">270</int>
+ <reference key="object" ref="892118626"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="741867756"/>
+ <reference ref="533593716"/>
</object>
<reference key="parent" ref="49161063"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">265</int>
- <reference key="object" ref="741867756"/>
- <reference key="parent" ref="258732701"/>
+ <int key="objectID">271</int>
+ <reference key="object" ref="533593716"/>
+ <reference key="parent" ref="892118626"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">270</int>
- <reference key="object" ref="892118626"/>
+ <int key="objectID">274</int>
+ <reference key="object" ref="91459209"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="533593716"/>
+ <reference ref="709813005"/>
</object>
<reference key="parent" ref="49161063"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">271</int>
- <reference key="object" ref="533593716"/>
- <reference key="parent" ref="892118626"/>
+ <int key="objectID">275</int>
+ <reference key="object" ref="709813005"/>
+ <reference key="parent" ref="91459209"/>
</object>
</object>
</object>
@@ -2436,64 +1731,20 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>18.ImportedFromIB2</string>
<string>19.IBPluginDependency</string>
<string>19.ImportedFromIB2</string>
- <string>195.IBPluginDependency</string>
- <string>195.IBViewIntegration.shadowBlurRadius</string>
- <string>195.IBViewIntegration.shadowColor</string>
- <string>195.IBViewIntegration.shadowOffsetHeight</string>
- <string>195.IBViewIntegration.shadowOffsetWidth</string>
- <string>196.IBPluginDependency</string>
- <string>197.IBPluginDependency</string>
- <string>197.ImportedFromIB2</string>
- <string>204.IBPluginDependency</string>
- <string>204.ImportedFromIB2</string>
- <string>23.IBPluginDependency</string>
- <string>23.ImportedFromIB2</string>
- <string>236.IBPluginDependency</string>
- <string>236.ImportedFromIB2</string>
<string>244.IBPluginDependency</string>
<string>244.ImportedFromIB2</string>
- <string>246.IBPluginDependency</string>
- <string>246.ImportedFromIB2</string>
- <string>248.IBPluginDependency</string>
- <string>248.ImportedFromIB2</string>
- <string>25.IBPluginDependency</string>
- <string>25.ImportedFromIB2</string>
<string>250.IBPluginDependency</string>
<string>250.ImportedFromIB2</string>
<string>252.IBPluginDependency</string>
<string>252.ImportedFromIB2</string>
- <string>26.IBPluginDependency</string>
- <string>26.ImportedFromIB2</string>
<string>260.IBPluginDependency</string>
<string>260.ImportedFromIB2</string>
<string>262.IBPluginDependency</string>
<string>262.ImportedFromIB2</string>
- <string>264.IBPluginDependency</string>
- <string>264.ImportedFromIB2</string>
- <string>27.IBPluginDependency</string>
- <string>27.ImportedFromIB2</string>
<string>270.IBPluginDependency</string>
<string>271.IBPluginDependency</string>
- <string>28.IBPluginDependency</string>
- <string>28.ImportedFromIB2</string>
- <string>29.IBPluginDependency</string>
- <string>29.ImportedFromIB2</string>
- <string>30.IBPluginDependency</string>
- <string>30.ImportedFromIB2</string>
- <string>31.IBPluginDependency</string>
- <string>31.ImportedFromIB2</string>
- <string>32.IBPluginDependency</string>
- <string>32.ImportedFromIB2</string>
- <string>33.IBPluginDependency</string>
- <string>33.ImportedFromIB2</string>
- <string>34.IBPluginDependency</string>
- <string>34.ImportedFromIB2</string>
- <string>35.IBPluginDependency</string>
- <string>35.ImportedFromIB2</string>
- <string>36.IBPluginDependency</string>
- <string>36.ImportedFromIB2</string>
- <string>37.IBPluginDependency</string>
- <string>37.ImportedFromIB2</string>
+ <string>274.IBPluginDependency</string>
+ <string>275.IBPluginDependency</string>
<string>39.IBPluginDependency</string>
<string>39.ImportedFromIB2</string>
<string>41.IBPluginDependency</string>
@@ -2566,15 +1817,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="559925184"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="8"/>
- <object class="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- <reference ref="8"/>
- <reference ref="8"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="559925184"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="559925184"/>
@@ -2585,47 +1827,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<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>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>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>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>
- <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>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>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>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="559925184"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="559925184"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2680,7 +1884,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">273</int>
+ <int key="maxID">277</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2708,7 +1912,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>SettingsChanged:</string>
- <string>deblockSliderChanged:</string>
+ <string>showFilterWindow:</string>
<string>showPictureWindow:</string>
<string>showPreviewWindow:</string>
</object>
@@ -2734,20 +1938,12 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>fCropRightStepper</string>
<string>fCropTopField</string>
<string>fCropTopStepper</string>
- <string>fDeblockCheck</string>
- <string>fDeblockField</string>
- <string>fDeblockSlider</string>
- <string>fDecombCheck</string>
- <string>fDeinterlacePopUp</string>
- <string>fDenoisePopUp</string>
- <string>fDetelecineCheck</string>
<string>fHeightField</string>
<string>fHeightStepper</string>
<string>fInfoField</string>
<string>fPictureCropBox</string>
- <string>fPictureFilterBox</string>
+ <string>fPictureFiltersOpenButton</string>
<string>fPictureSizeBox</string>
- <string>fPictureSlider</string>
<string>fPictureWindow</string>
<string>fPreviewOpenButton</string>
<string>fRatioCheck</string>
@@ -2766,20 +1962,12 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>NSStepper</string>
<string>NSTextField</string>
<string>NSStepper</string>
- <string>NSButton</string>
- <string>NSTextField</string>
- <string>NSSlider</string>
- <string>NSButton</string>
- <string>NSPopUpButton</string>
- <string>NSPopUpButton</string>
- <string>NSButton</string>
<string>NSTextField</string>
<string>NSStepper</string>
<string>NSTextField</string>
<string>NSBox</string>
+ <string>NSButton</string>
<string>NSBox</string>
- <string>NSBox</string>
- <string>NSSlider</string>
<string>NSWindow</string>
<string>NSButton</string>
<string>NSButton</string>
diff --git a/macosx/HBFilterController.h b/macosx/HBFilterController.h
new file mode 100644
index 000000000..1bfde5be3
--- /dev/null
+++ b/macosx/HBFilterController.h
@@ -0,0 +1,106 @@
+/* $Id: PictureController.h,v 1.6 2005/04/14 20:40:05 titer Exp $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Cocoa/Cocoa.h>
+
+#include "hb.h"
+
+@class HBController;
+@class PreviewController;
+
+
+//#define HB_NUM_HBLIB_PICTURES 20 // # of preview pictures libhb should generate
+
+@interface PictureFilterController : NSWindowController
+{
+ hb_handle_t * fHandle;
+ hb_title_t * fTitle;
+
+ HBController *fHBController;
+ PreviewController *fPreviewController; // reference to HBController
+ IBOutlet NSWindow * fFilterWindow;
+
+ IBOutlet NSBox * fPictureFilterBox;
+
+ IBOutlet NSPopUpButton * fDeinterlacePopUp;
+ IBOutlet NSButton * fDecombCheck;
+ IBOutlet NSButton * fDetelecineCheck;
+ IBOutlet NSButton * fDeblockCheck;
+ IBOutlet NSTextField * fDeblockField;
+ IBOutlet NSSlider * fDeblockSlider;
+ IBOutlet NSPopUpButton * fDenoisePopUp;
+ IBOutlet NSPopUpButton * fAnamorphicPopUp;
+ IBOutlet NSSlider * fPictureSlider;
+ IBOutlet NSTextField * fInfoField;
+
+ IBOutlet NSButton * fPreviewOpenButton;
+ IBOutlet NSButton * fPictureSizeOpenButton;
+
+ int MaxOutputWidth;
+ int MaxOutputHeight;
+ BOOL autoCrop;
+ BOOL allowLooseAnamorphic;
+
+ int output_width, output_height, output_par_width, output_par_height;
+ int display_width;
+
+ /* 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
+ off */
+ BOOL keepAspectRatioPreviousState;
+
+ struct {
+ int detelecine;
+ int deinterlace;
+ int decomb;
+ int denoise;
+ int deblock;
+ } fPictureFilterSettings;
+
+
+}
+- (id)init;
+
+- (void) SetHandle: (hb_handle_t *) handle;
+- (void) SetTitle: (hb_title_t *) title;
+- (void)setHBController: (HBController *)controller;
+- (IBAction) showFilterWindow: (id)sender;
+- (IBAction) showPreviewWindow: (id)sender;
+
+- (void) setInitialPictureFilters;
+
+
+- (IBAction) FilterSettingsChanged: (id) sender;
+
+
+
+- (BOOL) autoCrop;
+- (void) setAutoCrop: (BOOL) setting;
+
+- (BOOL) allowLooseAnamorphic;
+- (void) setAllowLooseAnamorphic: (BOOL) setting;
+- (IBAction) deblockSliderChanged: (id) sender;
+- (int) detelecine;
+- (void) setDetelecine: (int) setting;
+- (int) deinterlace;
+- (void) setDeinterlace: (int) setting;
+- (int) decomb;
+- (void) setDecomb: (int) setting;
+- (int) denoise;
+- (void) setDenoise: (int) setting;
+- (int) deblock;
+- (void) setDeblock: (int) setting;
+
+- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title;
+- (IBAction) showPictureSettingsWindow: (id)sender;
+
+- (void) setToFullScreenMode;
+- (void) setToWindowedMode;
+
+
+@end
+
diff --git a/macosx/HBFilterController.mm b/macosx/HBFilterController.mm
new file mode 100644
index 000000000..c5ec6836f
--- /dev/null
+++ b/macosx/HBFilterController.mm
@@ -0,0 +1,281 @@
+/* $Id: PictureController.mm,v 1.11 2005/08/01 15:10:44 titer Exp $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBFilterController.h"
+#import "PictureController.h"
+#import "Controller.h"
+#import "HBPreviewController.h"
+
+
+
+@implementation PictureFilterController
+
+- (id)init
+{
+ if (self = [super initWithWindowNibName:@"PictureFilters"])
+ {
+ // NSWindowController likes to lazily load its window. However since
+ // this controller tries to set all sorts of outlets before the window
+ // is displayed, we need it to load immediately. The correct way to do
+ // this, according to the documentation, is simply to invoke the window
+ // getter once.
+ //
+ // If/when we switch a lot of this stuff to bindings, this can probably
+ // go away.
+ [self window];
+
+ fPreviewController = [[PreviewController alloc] init];
+ }
+ return self;
+}
+
+//------------------------------------------------------------------------------------
+// Displays and brings the picture window to the front
+//------------------------------------------------------------------------------------
+- (IBAction) showFilterWindow: (id)sender
+{
+
+ if ([[self window] isVisible])
+ {
+ [[self window] close];
+ }
+ else
+ {
+ [self showWindow:sender];
+ if ([fPreviewController fullScreen] == YES)
+ {
+ [self setToFullScreenMode];
+ }
+ else
+ {
+ [self setToWindowedMode];
+ }
+ }
+}
+
+- (IBAction) showPictureSettingsWindow: (id)sender
+{
+ [fHBController showPicturePanel:sender];
+}
+
+- (IBAction) showPreviewWindow: (id)sender
+{
+ [fHBController showPreviewWindow:sender];
+}
+
+- (void) setToFullScreenMode
+{
+ int32_t shieldLevel = CGShieldingWindowLevel();
+
+ [fFilterWindow setLevel:shieldLevel + 1];
+ // Show the window.
+ [fFilterWindow makeKeyAndOrderFront:self];
+}
+
+- (void) setToWindowedMode
+{
+ /* Set the window back to regular level */
+ [[self window] setLevel:NSNormalWindowLevel];
+}
+
+- (void)setHBController: (HBController *)controller
+{
+ fHBController = controller;
+ //[fPreviewController setHBController: controller];
+
+}
+
+- (void)awakeFromNib
+{
+ [fFilterWindow setDelegate:self];
+ [self setInitialPictureFilters];
+}
+
+
+- (void)windowWillClose:(NSNotification *)aNotification
+{
+
+}
+
+- (BOOL)windowShouldClose:(id)fPictureWindow
+{
+ return YES;
+}
+
+- (void) dealloc
+{
+ [fPreviewController release];
+ [super dealloc];
+}
+
+- (void) SetHandle: (hb_handle_t *) handle
+{
+ fHandle = handle;
+
+
+
+ //[fPreviewController SetHandle: fHandle];
+
+
+}
+
+/* we use this to setup the initial picture filters upon first launch, after that their states
+are maintained across different sources */
+- (void) setInitialPictureFilters
+{
+ /* we use a popup to show the deinterlace settings */
+ [fDeinterlacePopUp removeAllItems];
+ [fDeinterlacePopUp addItemWithTitle: @"None"];
+ [fDeinterlacePopUp addItemWithTitle: @"Fast"];
+ [fDeinterlacePopUp addItemWithTitle: @"Slow"];
+ [fDeinterlacePopUp addItemWithTitle: @"Slower"];
+
+ /* Set deinterlaces level according to the integer in the main window */
+ [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
+
+ /* we use a popup to show the denoise settings */
+ [fDenoisePopUp removeAllItems];
+ [fDenoisePopUp addItemWithTitle: @"None"];
+ [fDenoisePopUp addItemWithTitle: @"Weak"];
+ [fDenoisePopUp addItemWithTitle: @"Medium"];
+ [fDenoisePopUp addItemWithTitle: @"Strong"];
+ /* Set denoises level according to the integer in the main window */
+ [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
+
+
+}
+
+- (void) SetTitle: (hb_title_t *) title
+{
+ /* Set filters widgets according to the filters struct */
+ [fDetelecineCheck setState:fPictureFilterSettings.detelecine];
+ [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
+ [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
+ [fDeblockCheck setState: fPictureFilterSettings.deblock];
+
+
+
+ [self FilterSettingsChanged: nil];
+}
+
+- (IBAction) deblockSliderChanged: (id) sender
+{
+ if ([fDeblockSlider floatValue] == 4.0)
+ {
+ [fDeblockField setStringValue: [NSString stringWithFormat: @"Off"]];
+ }
+ else
+ {
+ [fDeblockField setStringValue: [NSString stringWithFormat: @"%.0f", [fDeblockSlider floatValue]]];
+ }
+ [self FilterSettingsChanged: sender];
+}
+
+- (IBAction) FilterSettingsChanged: (id) sender
+{
+ fPictureFilterSettings.deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
+
+ fPictureFilterSettings.denoise = [fDenoisePopUp indexOfSelectedItem];
+
+ fPictureFilterSettings.detelecine = [fDetelecineCheck state];
+
+ if ([fDeblockField stringValue] == @"Off")
+ {
+ fPictureFilterSettings.deblock = 0;
+ }
+ else
+ {
+ fPictureFilterSettings.deblock = [fDeblockField intValue];
+ }
+
+ fPictureFilterSettings.decomb = [fDecombCheck state];
+
+ if (sender != nil)
+ {
+ [fHBController pictureSettingsDidChange];
+
+ }
+
+}
+
+
+
+#pragma mark -
+
+- (BOOL) autoCrop
+{
+ return autoCrop;
+}
+- (void) setAutoCrop: (BOOL) setting
+{
+ autoCrop = setting;
+}
+
+- (BOOL) allowLooseAnamorphic
+{
+ return allowLooseAnamorphic;
+}
+
+- (void) setAllowLooseAnamorphic: (BOOL) setting
+{
+ allowLooseAnamorphic = setting;
+}
+
+- (int) detelecine
+{
+ return fPictureFilterSettings.detelecine;
+}
+
+- (void) setDetelecine: (int) setting
+{
+ fPictureFilterSettings.detelecine = setting;
+}
+
+- (int) deinterlace
+{
+ return fPictureFilterSettings.deinterlace;
+}
+
+- (void) setDeinterlace: (int) setting {
+ fPictureFilterSettings.deinterlace = setting;
+}
+- (int) decomb
+{
+ return fPictureFilterSettings.decomb;
+}
+
+- (void) setDecomb: (int) setting {
+ fPictureFilterSettings.decomb = setting;
+}
+- (int) denoise
+{
+ return fPictureFilterSettings.denoise;
+}
+
+- (void) setDenoise: (int) setting
+{
+ fPictureFilterSettings.denoise = setting;
+}
+
+- (int) deblock
+{
+ return fPictureFilterSettings.deblock;
+}
+
+- (void) setDeblock: (int) setting
+{
+ fPictureFilterSettings.deblock = setting;
+}
+
+- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
+{
+ [self SetTitle:title];
+ [self showWindow:sender];
+
+}
+
+@end
+
diff --git a/macosx/HBOutputPanelController.m b/macosx/HBOutputPanelController.m
index c22209c28..41506b9b2 100644
--- a/macosx/HBOutputPanelController.m
+++ b/macosx/HBOutputPanelController.m
@@ -91,10 +91,17 @@
*/
- (IBAction)showOutputPanel:(id)sender
{
+ if ([[self window] isVisible])
+ {
+ [[self window] close];
+ }
+ else
+ {
[textView scrollRangeToVisible:NSMakeRange([outputTextStorage length], 0)];
[self showWindow:sender];
[[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"OutputPanelIsOpen"];
+ }
}
- (void) startEncodeLog:(NSString *) logPath
diff --git a/macosx/HBPreviewController.mm b/macosx/HBPreviewController.mm
index dfcf554ac..8d78b945b 100644
--- a/macosx/HBPreviewController.mm
+++ b/macosx/HBPreviewController.mm
@@ -319,13 +319,23 @@ MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
{
[self SetTitle:title];
- [self showWindow:sender];
- [fPreviewWindow setAcceptsMouseMovedEvents:YES];
- isFullScreen = NO;
- scaleToScreen = NO;
- hudTimerSeconds = 0;
- [self startHudTimer];
-
+
+ if ([fPreviewWindow isVisible])
+ {
+
+ [fPreviewWindow close];
+
+ }
+ else
+ {
+ [self showWindow:sender];
+ [fPreviewWindow setAcceptsMouseMovedEvents:YES];
+ isFullScreen = NO;
+ scaleToScreen = NO;
+ hudTimerSeconds = 0;
+ [self startHudTimer];
+ }
+
}
- (IBAction)showPictureSettings:(id)sender
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 5af76b49b..cb2bed5de 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -96,6 +96,7 @@
A25289E60D87A27D00461D5B /* enctheora.c in Sources */ = {isa = PBXBuildFile; fileRef = A25289E50D87A27D00461D5B /* enctheora.c */; };
A25289E70D87A2CB00461D5B /* enctheora.c in Sources */ = {isa = PBXBuildFile; fileRef = A25289E50D87A27D00461D5B /* enctheora.c */; };
A25962E10F15077500B3BF4E /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A25962E00F15077500B3BF4E /* Quartz.framework */; };
+ A266019A0F2A1DC0007EA355 /* PictureFilters.xib in Resources */ = {isa = PBXBuildFile; fileRef = A26601980F2A1DC0007EA355 /* PictureFilters.xib */; };
A273E0510C57B39A00493A45 /* Pause.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04A0C57B39A00493A45 /* Pause.tiff */; };
A273E0520C57B39A00493A45 /* Play.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04B0C57B39A00493A45 /* Play.tiff */; };
A273E0530C57B39A00493A45 /* Stop.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A273E04C0C57B39A00493A45 /* Stop.tiff */; };
@@ -106,8 +107,10 @@
A29E058B0BE12889000533F5 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A29E057F0BE1283E000533F5 /* Growl.framework */; };
A2A1EC310C76C35E00827E0D /* HBDVDDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */; };
A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1EC390C76C58400827E0D /* HBDVDDetector.m */; };
- A2BF08050EFAB5D400C0E025 /* PictureController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BF08030EFAB5D400C0E025 /* PictureController.h */; };
- A2BF08060EFAB5D400C0E025 /* PictureController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2BF08040EFAB5D400C0E025 /* PictureController.mm */; };
+ A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */; };
+ A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */; };
+ A2BF08050EFAB5D400C0E025 /* HBFilterController.h in Headers */ = {isa = PBXBuildFile; fileRef = A2BF08030EFAB5D400C0E025 /* HBFilterController.h */; };
+ A2BF08060EFAB5D400C0E025 /* HBFilterController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */; };
A2D0A0AB0D3E5929002D57CB /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; };
A2D0A0BF0D3E596F002D57CB /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */; };
A2D7AD670C998AD30082CA33 /* ActivityWindow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */; };
@@ -265,6 +268,7 @@
A22C85EB0D05D35000C10E36 /* HBPresets.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresets.m; sourceTree = "<group>"; };
A25289E50D87A27D00461D5B /* enctheora.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = enctheora.c; path = ../libhb/enctheora.c; sourceTree = SOURCE_ROOT; };
A25962E00F15077500B3BF4E /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; };
+ A26601990F2A1DC0007EA355 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PictureFilters.xib; sourceTree = "<group>"; };
A273E04A0C57B39A00493A45 /* Pause.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Pause.tiff; sourceTree = "<group>"; };
A273E04B0C57B39A00493A45 /* Play.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Play.tiff; sourceTree = "<group>"; };
A273E04C0C57B39A00493A45 /* Stop.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Stop.tiff; sourceTree = "<group>"; };
@@ -273,8 +277,10 @@
A29E057F0BE1283E000533F5 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; };
A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBDVDDetector.h; sourceTree = "<group>"; };
A2A1EC390C76C58400827E0D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = "<group>"; };
- A2BF08030EFAB5D400C0E025 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
- A2BF08040EFAB5D400C0E025 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = "<group>"; };
+ A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
+ A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = "<group>"; };
+ A2BF08030EFAB5D400C0E025 /* HBFilterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBFilterController.h; sourceTree = "<group>"; };
+ A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HBFilterController.mm; sourceTree = "<group>"; };
A2D0A0AA0D3E5929002D57CB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = ActivityWindow.tiff; sourceTree = "<group>"; };
A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = AddToQueue.tiff; sourceTree = "<group>"; };
@@ -393,6 +399,7 @@
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
+ A26601980F2A1DC0007EA355 /* PictureFilters.xib */,
);
name = HandBrake;
sourceTree = "<group>";
@@ -498,9 +505,11 @@
526FBC930B4CAA260064E04C /* HandBrake Sources */ = {
isa = PBXGroup;
children = (
- A2BF08030EFAB5D400C0E025 /* PictureController.h */,
+ A2BF08030EFAB5D400C0E025 /* HBFilterController.h */,
4DF3C8CC052889CD00A80101 /* Controller.mm */,
- A2BF08040EFAB5D400C0E025 /* PictureController.mm */,
+ A2BF08040EFAB5D400C0E025 /* HBFilterController.mm */,
+ A2BEA5F90F2A1ED1001CE7A1 /* PictureController.h */,
+ A2BEA5FA0F2A1ED1001CE7A1 /* PictureController.mm */,
A22C85EA0D05D35000C10E36 /* HBPresets.h */,
A22C85EB0D05D35000C10E36 /* HBPresets.m */,
0DFA5D060B8DD9040020BC09 /* HandBrake.plist */,
@@ -598,7 +607,8 @@
A9AC41E00C918DB500DDF9B8 /* HBAdvancedController.h in Headers */,
E37172680C977D340072B384 /* HBImageAndTextCell.h in Headers */,
A22C85EC0D05D35000C10E36 /* HBPresets.h in Headers */,
- A2BF08050EFAB5D400C0E025 /* PictureController.h in Headers */,
+ A2BF08050EFAB5D400C0E025 /* HBFilterController.h in Headers */,
+ A2BEA5FB0F2A1ED1001CE7A1 /* PictureController.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -742,6 +752,7 @@
E39AA4EA0D32DC0B0007A415 /* AdvancedView.xib in Resources */,
E39AA4EB0D32DC0B0007A415 /* OutputPanel.xib in Resources */,
A27BB4EA0EFAB9310027CDF9 /* PicturePreview.xib in Resources */,
+ A266019A0F2A1DC0007EA355 /* PictureFilters.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -865,7 +876,8 @@
A9AC41DF0C918DB500DDF9B8 /* HBAdvancedController.m in Sources */,
E37172670C977D340072B384 /* HBImageAndTextCell.m in Sources */,
A22C85ED0D05D35100C10E36 /* HBPresets.m in Sources */,
- A2BF08060EFAB5D400C0E025 /* PictureController.mm in Sources */,
+ A2BF08060EFAB5D400C0E025 /* HBFilterController.mm in Sources */,
+ A2BEA5FC0F2A1ED1001CE7A1 /* PictureController.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -893,6 +905,14 @@
name = InfoPlist.strings;
sourceTree = "<group>";
};
+ A26601980F2A1DC0007EA355 /* PictureFilters.xib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ A26601990F2A1DC0007EA355 /* English */,
+ );
+ name = PictureFilters.xib;
+ sourceTree = "<group>";
+ };
A27BB4E80EFAB9310027CDF9 /* PicturePreview.xib */ = {
isa = PBXVariantGroup;
children = (
diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index b8af4be59..277fbfc25 100644
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -10,6 +10,7 @@
@class HBController;
@class PreviewController;
+@class PictureFilterController;
//#define HB_NUM_HBLIB_PICTURES 20 // # of preview pictures libhb should generate
@@ -21,6 +22,8 @@
HBController *fHBController;
PreviewController *fPreviewController; // reference to HBController
+ PictureFilterController *fPictureFilterController;
+
IBOutlet NSWindow * fPictureWindow;
NSMutableDictionary * fPicturePreviews; // NSImages, one for each preview libhb creates, created lazily
int fPicture;
@@ -28,7 +31,6 @@
IBOutlet NSBox * fPictureSizeBox;
IBOutlet NSBox * fPictureCropBox;
- IBOutlet NSBox * fPictureFilterBox;
IBOutlet NSTextField * fWidthField;
IBOutlet NSStepper * fWidthStepper;
IBOutlet NSTextField * fHeightField;
@@ -43,18 +45,12 @@
IBOutlet NSStepper * fCropLeftStepper;
IBOutlet NSTextField * fCropRightField;
IBOutlet NSStepper * fCropRightStepper;
- IBOutlet NSPopUpButton * fDeinterlacePopUp;
- IBOutlet NSButton * fDecombCheck;
- IBOutlet NSButton * fDetelecineCheck;
- IBOutlet NSButton * fDeblockCheck;
- IBOutlet NSTextField * fDeblockField;
- IBOutlet NSSlider * fDeblockSlider;
- IBOutlet NSPopUpButton * fDenoisePopUp;
+
IBOutlet NSPopUpButton * fAnamorphicPopUp;
- IBOutlet NSSlider * fPictureSlider;
IBOutlet NSTextField * fInfoField;
IBOutlet NSButton * fPreviewOpenButton;
+ IBOutlet NSButton * fPictureFiltersOpenButton;
int MaxOutputWidth;
int MaxOutputHeight;
@@ -87,30 +83,19 @@
- (void)setHBController: (HBController *)controller;
- (IBAction) showPictureWindow: (id)sender;
- (IBAction) showPreviewWindow: (id)sender;
+- (IBAction) showFilterWindow: (id)sender;
-- (void) setInitialPictureFilters;
- (IBAction) SettingsChanged: (id) sender;
-
+- (void)reloadStillPreview;
- (BOOL) autoCrop;
- (void) setAutoCrop: (BOOL) setting;
- (BOOL) allowLooseAnamorphic;
- (void) setAllowLooseAnamorphic: (BOOL) setting;
-- (IBAction) deblockSliderChanged: (id) sender;
-- (int) detelecine;
-- (void) setDetelecine: (int) setting;
-- (int) deinterlace;
-- (void) setDeinterlace: (int) setting;
-- (int) decomb;
-- (void) setDecomb: (int) setting;
-- (int) denoise;
-- (void) setDenoise: (int) setting;
-- (int) deblock;
-- (void) setDeblock: (int) setting;
- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title;
diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index e93840c46..1ffb3ae48 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -7,7 +7,7 @@
#import "PictureController.h"
#import "Controller.h"
#import "HBPreviewController.h"
-
+#import "HBFilterController.h"
@implementation PictureController
@@ -27,6 +27,7 @@
[self window];
fPreviewController = [[PreviewController alloc] init];
+ //fPictureFilterController = [[PictureFilterController alloc] init];
}
return self;
}
@@ -36,14 +37,21 @@
//------------------------------------------------------------------------------------
- (IBAction) showPictureWindow: (id)sender
{
- [self showWindow:sender];
- if ([fPreviewController fullScreen] == YES)
+ if ([[self window] isVisible])
{
- [self setToFullScreenMode];
+ [[self window] close];
}
else
{
- [self setToWindowedMode];
+ [self showWindow:sender];
+ if ([fPreviewController fullScreen] == YES)
+ {
+ [self setToFullScreenMode];
+ }
+ else
+ {
+ [self setToWindowedMode];
+ }
}
}
@@ -52,6 +60,12 @@
[fPreviewController showWindow:sender];
}
+- (IBAction) showFilterWindow: (id)sender
+{
+ [fHBController showFiltersPanel:sender];
+}
+
+
- (void) setToFullScreenMode
{
int32_t shieldLevel = CGShieldingWindowLevel();
@@ -70,6 +84,7 @@
- (void)setHBController: (HBController *)controller
{
fHBController = controller;
+ //[fPictureFilterController setHBController: controller];
[fPreviewController setHBController: controller];
}
@@ -92,6 +107,7 @@
- (void) dealloc
{
+ [fPictureFilterController release];
[fPreviewController release];
[super dealloc];
}
@@ -117,6 +133,7 @@
[fCropRightStepper setMinValue: 0];
[fPreviewController SetHandle: fHandle];
+ [fPictureFilterController SetHandle: fHandle];
}
@@ -172,11 +189,14 @@
}
/* Set filters widgets according to the filters struct */
+ /* this has now been movied to the filters controller */
+ /*
[fDetelecineCheck setState:fPictureFilterSettings.detelecine];
[fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
[fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
[fDeblockCheck setState: fPictureFilterSettings.deblock];
[fDecombCheck setState: fPictureFilterSettings.decomb];
+ */
fPicture = 0;
MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
@@ -185,48 +205,8 @@
[self SettingsChanged: nil];
}
-/* we use this to setup the initial picture filters upon first launch, after that their states
-are maintained across different sources */
-- (void) setInitialPictureFilters
-{
- /* we use a popup to show the deinterlace settings */
- [fDeinterlacePopUp removeAllItems];
- [fDeinterlacePopUp addItemWithTitle: @"None"];
- [fDeinterlacePopUp addItemWithTitle: @"Fast"];
- [fDeinterlacePopUp addItemWithTitle: @"Slow"];
- [fDeinterlacePopUp addItemWithTitle: @"Slower"];
-
- /* Set deinterlaces level according to the integer in the main window */
- [fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
-
- /* we use a popup to show the denoise settings */
- [fDenoisePopUp removeAllItems];
- [fDenoisePopUp addItemWithTitle: @"None"];
- [fDenoisePopUp addItemWithTitle: @"Weak"];
- [fDenoisePopUp addItemWithTitle: @"Medium"];
- [fDenoisePopUp addItemWithTitle: @"Strong"];
- /* Set denoises level according to the integer in the main window */
- [fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
-}
-
-
-
-
-- (IBAction) deblockSliderChanged: (id) sender
-{
- if ([fDeblockSlider floatValue] == 4.0)
- {
- [fDeblockField setStringValue: [NSString stringWithFormat: @"Off"]];
- }
- else
- {
- [fDeblockField setStringValue: [NSString stringWithFormat: @"%.0f", [fDeblockSlider floatValue]]];
- }
- [self SettingsChanged: sender];
-}
-
- (IBAction) SettingsChanged: (id) sender
{
hb_job_t * job = fTitle->job;
@@ -325,33 +305,6 @@ are maintained across different sources */
}
job->keep_ratio = ( [fRatioCheck state] == NSOnState );
-
- fPictureFilterSettings.deinterlace = [fDeinterlacePopUp indexOfSelectedItem];
- /* if the gui deinterlace settings are fast through slowest, the job->deinterlace
- value needs to be set to one, for the job as well as the previews showing deinterlacing
- otherwise set job->deinterlace to 0 or "off" */
- if (fPictureFilterSettings.deinterlace > 0)
- {
- job->deinterlace = 1;
- }
- else
- {
- job->deinterlace = 0;
- }
- fPictureFilterSettings.denoise = [fDenoisePopUp indexOfSelectedItem];
-
- fPictureFilterSettings.detelecine = [fDetelecineCheck state];
-
- if ([fDeblockField stringValue] == @"Off")
- {
- fPictureFilterSettings.deblock = 0;
- }
- else
- {
- fPictureFilterSettings.deblock = [fDeblockField intValue];
- }
-
- fPictureFilterSettings.decomb = [fDecombCheck state];
if( job->keep_ratio )
{
@@ -414,7 +367,9 @@ are maintained across different sources */
* our picture preview slider in sync with the previews being shown
*/
- [fPreviewController pictureSliderChanged:nil];
+ //[fPreviewController pictureSliderChanged:nil];
+ [self reloadStillPreview];
+
}
@@ -425,6 +380,29 @@ are maintained across different sources */
}
+- (void)reloadStillPreview
+{
+ hb_job_t * job = fTitle->job;
+
+ [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];
+ }
+
+}
#pragma mark -
@@ -448,52 +426,6 @@ are maintained across different sources */
allowLooseAnamorphic = setting;
}
-- (int) detelecine
-{
- return fPictureFilterSettings.detelecine;
-}
-
-- (void) setDetelecine: (int) setting
-{
- fPictureFilterSettings.detelecine = setting;
-}
-
-- (int) deinterlace
-{
- return fPictureFilterSettings.deinterlace;
-}
-
-- (void) setDeinterlace: (int) setting {
- fPictureFilterSettings.deinterlace = setting;
-}
-- (int) decomb
-{
- return fPictureFilterSettings.decomb;
-}
-
-- (void) setDecomb: (int) setting {
- fPictureFilterSettings.decomb = setting;
-}
-- (int) denoise
-{
- return fPictureFilterSettings.denoise;
-}
-
-- (void) setDenoise: (int) setting
-{
- fPictureFilterSettings.denoise = setting;
-}
-
-- (int) deblock
-{
- return fPictureFilterSettings.deblock;
-}
-
-- (void) setDeblock: (int) setting
-{
- fPictureFilterSettings.deblock = setting;
-}
-
- (IBAction)showPreviewPanel: (id)sender forTitle: (hb_title_t *)title
{
[self SetTitle:title];