diff options
| -rw-r--r-- | macosx/Controller.m | 48 | ||||
| -rw-r--r-- | macosx/English.lproj/AdvancedView.xib | 1324 | ||||
| -rw-r--r-- | macosx/HBAdvancedController.h | 5 | ||||
| -rw-r--r-- | macosx/HBAdvancedController.m | 12 | ||||
| -rw-r--r-- | macosx/HBQueueController.mm | 22 |
5 files changed, 343 insertions, 1068 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index 86b949d05..dbecb9018 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -2348,6 +2348,8 @@ fWorkingCount = 0; [queueFileJob setObject:[fVidEncoderPopUp titleOfSelectedItem] forKey:@"VideoEncoder"]; /* x264 Option String */ [queueFileJob setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"]; + /* FFMpeg (lavc) Option String */ + [queueFileJob setObject:[fAdvancedOptions optionsStringLavc] forKey:@"lavcOption"]; [queueFileJob setObject:[NSNumber numberWithInt:[[fVidQualityMatrix selectedCell] tag] + 1] forKey:@"VideoQualityType"]; [queueFileJob setObject:[fVidBitrateField stringValue] forKey:@"VideoAvgBitrate"]; @@ -3087,6 +3089,11 @@ fWorkingCount = 0; } + else + { + job->advanced_opts = (char *)calloc(1024, 1); /* Fixme, this just leaks */ + strcpy(job->advanced_opts, [[fAdvancedOptions optionsStringLavc] UTF8String]); + } /* Video settings */ @@ -3583,6 +3590,14 @@ bool one_burned = FALSE; } } + else + { + if ([queueToApply objectForKey:@"lavcOption"]) + { + job->advanced_opts = (char *)calloc(1024, 1); /* Fixme, this just leaks */ + strcpy(job->advanced_opts, [[queueToApply objectForKey:@"lavcOption"] UTF8String]); + } + } /* Picture Size Settings */ @@ -4778,6 +4793,11 @@ the user is using "Custom" settings by determining the sender*/ [fAdvancedOptions setHidden:NO]; [self autoSetM4vExtension: sender]; } + else // we are FFmpeg (lavc) + { + [fAdvancedOptions setHidden:YES]; + } + if (videoEncoder != HB_VCODEC_X264) { @@ -5663,11 +5683,34 @@ return YES; /* Video encoder */ [fVidEncoderPopUp selectItemWithTitle:[chosenPreset objectForKey:@"VideoEncoder"]]; + [self videoEncoderPopUpChanged:nil]; /* We set the advanced opt string here if applicable*/ - [fAdvancedOptions setOptions:[chosenPreset objectForKey:@"x264Option"]]; + if ([[fVidEncoderPopUp selectedItem] tag] == HB_VCODEC_X264) + { + if ([chosenPreset objectForKey:@"x264Option"]) + { + [fAdvancedOptions setOptions:[chosenPreset objectForKey:@"x264Option"]]; + } + else + { + [fAdvancedOptions setOptions:@""]; + } + + } + else // we are ffmpeg encoder + { + if ([chosenPreset objectForKey:@"lavcOption"]) + { + [fAdvancedOptions setLavcOptions:[chosenPreset objectForKey:@"lavcOption"]]; + } + else + { + [fAdvancedOptions setLavcOptions:@""]; + } + } /* Lets run through the following functions to get variables set there */ - [self videoEncoderPopUpChanged:nil]; + //[self videoEncoderPopUpChanged:nil]; /* Set the state of ipod compatible with Mp4iPodCompatible. Only for x264*/ [fDstMp4iPodFileCheck setState:[[chosenPreset objectForKey:@"Mp4iPodCompatible"] intValue]]; [self calculateBitrate:nil]; @@ -6242,6 +6285,7 @@ return YES; [preset setObject:[fVidEncoderPopUp titleOfSelectedItem] forKey:@"VideoEncoder"]; /* x264 Option String */ [preset setObject:[fAdvancedOptions optionsString] forKey:@"x264Option"]; + [preset setObject:[fAdvancedOptions optionsStringLavc] forKey:@"lavcOption"]; /* though there are actually only 0 - 1 types available in the ui we need to map to the old 0 - 2 * set of indexes from when we had 0 == Target , 1 == Abr and 2 == Constant Quality for presets diff --git a/macosx/English.lproj/AdvancedView.xib b/macosx/English.lproj/AdvancedView.xib index 6ce828731..1cc653dbe 100644 --- a/macosx/English.lproj/AdvancedView.xib +++ b/macosx/English.lproj/AdvancedView.xib @@ -2,30 +2,36 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10J869</string> - <string key="IBDocument.InterfaceBuilderVersion">732</string> - <string key="IBDocument.AppKitVersion">1038.35</string> - <string key="IBDocument.HIToolboxVersion">461.00</string> + <string key="IBDocument.SystemVersion">11C74</string> + <string key="IBDocument.InterfaceBuilderVersion">1938</string> + <string key="IBDocument.AppKitVersion">1138.23</string> + <string key="IBDocument.HIToolboxVersion">567.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">732</string> + <string key="NS.object.0">1938</string> </object> - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> + <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="5"/> + <string>NSPopUpButton</string> + <string>NSMenuItem</string> + <string>NSMenu</string> + <string>NSTextFieldCell</string> + <string>NSButtonCell</string> + <string>NSButton</string> + <string>NSSlider</string> + <string>NSSliderCell</string> + <string>NSCustomView</string> + <string>NSCustomObject</string> + <string>NSPopUpButtonCell</string> + <string>NSTextField</string> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys" id="0"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <string key="NS.key.0">PluginDependencyRecalculationVersion</string> + <integer value="1" key="NS.object.0"/> </object> <object class="NSMutableArray" key="IBDocument.RootObjects" id="658768339"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -48,6 +54,8 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{298, 275}, {61, 14}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="496835891"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="225631881"> <int key="NSCellFlags">68288064</int> @@ -84,6 +92,8 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{1, 275}, {66, 14}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="297485972"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="571635509"> <int key="NSCellFlags">68288064</int> @@ -100,6 +110,8 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{1, 128}, {91, 14}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="677509567"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="236903504"> <int key="NSCellFlags">68288064</int> @@ -116,6 +128,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{124, 151}, {97, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="933060176"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="821448906"> <int key="NSCellFlags">-2076049856</int> @@ -196,6 +210,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{333, 107}, {116, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="938870755"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="316938196"> <int key="NSCellFlags">67239424</int> @@ -216,6 +232,8 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{454, 105}, {146, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="529644976"/> <bool key="NSEnabled">YES</bool> <object class="NSSliderCell" key="NSCell" id="152220780"> <int key="NSCellFlags">-2079981824</int> @@ -238,6 +256,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{18, 170}, {102, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="390676982"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="790451247"> <int key="NSCellFlags">67239424</int> @@ -254,6 +274,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{122, 172}, {22, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="9309938"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="528921925"> <int key="NSCellFlags">67239424</int> @@ -281,6 +303,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{124, 256}, {97, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="965170034"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="928228060"> <int key="NSCellFlags">-2076049856</int> @@ -351,6 +375,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{26, 254}, {94, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="502806021"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="621289166"> <int key="NSCellFlags">67239424</int> @@ -367,6 +393,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{15, 233}, {105, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="463613064"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="660394934"> <int key="NSCellFlags">67239424</int> @@ -383,6 +411,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{349, 254}, {100, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="646401135"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="517356884"> <int key="NSCellFlags">67239424</int> @@ -399,6 +429,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{124, 235}, {97, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="751714853"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="67902101"> <int key="NSCellFlags">-2076049856</int> @@ -469,6 +501,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{453, 256}, {149, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="516451639"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="468935027"> <int key="NSCellFlags">-2076049856</int> @@ -543,6 +577,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{453, 193}, {149, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="594030759"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="597433555"> <int key="NSCellFlags">-2076049856</int> @@ -613,6 +649,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{720, 233}, {37, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="907540673"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="368733355"> <int key="NSCellFlags">67239424</int> @@ -629,6 +667,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{17, 107}, {103, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="140207359"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="652898624"> <int key="NSCellFlags">67239424</int> @@ -645,6 +685,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{4, 0}, {882, 34}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="456227852"> <int key="NSCellFlags">-1805517311</int> @@ -653,7 +695,7 @@ <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="862092551"/> <bool key="NSDrawsBackground">YES</bool> - <object class="NSColor" key="NSBackgroundColor"> + <object class="NSColor" key="NSBackgroundColor" id="649660579"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">textBackgroundColor</string> @@ -662,7 +704,7 @@ <bytes key="NSWhite">MQA</bytes> </object> </object> - <object class="NSColor" key="NSTextColor"> + <object class="NSColor" key="NSTextColor" id="726854009"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">textColor</string> @@ -675,6 +717,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{453, 214}, {149, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="180296347"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="1015322159"> <int key="NSCellFlags">-2076049856</int> @@ -745,6 +789,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{314, 212}, {135, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="463632258"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="523579964"> <int key="NSCellFlags">67239424</int> @@ -761,6 +807,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{320, 170}, {129, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="108597901"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="625397549"> <int key="NSCellFlags">67239424</int> @@ -777,6 +825,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{453, 172}, {149, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="34260806"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="1015445713"> <int key="NSCellFlags">-2076049856</int> @@ -847,6 +897,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{298, 191}, {151, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="1012635724"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="492298910"> <int key="NSCellFlags">67239424</int> @@ -863,6 +915,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{15, 149}, {105, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="742215576"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="124098371"> <int key="NSCellFlags">67239424</int> @@ -879,6 +933,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{304, 86}, {145, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="734910001"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="996811218"> <int key="NSCellFlags">67239424</int> @@ -895,6 +951,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{337, 233}, {112, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="1028233887"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="651032081"> <int key="NSCellFlags">67239424</int> @@ -911,6 +969,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{453, 235}, {149, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="34095372"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="96368274"> <int key="NSCellFlags">-2076049856</int> @@ -981,6 +1041,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{1, 42}, {221, 17}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="862092551"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="492969921"> <int key="NSCellFlags">67239424</int> @@ -997,6 +1059,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{758, 109}, {130, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="777985871"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="1069442299"> <int key="NSCellFlags">-2076049856</int> @@ -1067,6 +1131,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{758, 88}, {130, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="149148764"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="691127886"> <int key="NSCellFlags">-2076049856</int> @@ -1137,6 +1203,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{695, 107}, {62, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="130462646"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="343844477"> <int key="NSCellFlags">67239424</int> @@ -1153,6 +1221,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{122, 109}, {22, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="500710129"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="401971973"> <int key="NSCellFlags">67239424</int> @@ -1174,6 +1244,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{758, 235}, {130, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="5114506"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="804220802"> <int key="NSCellFlags">-2076049856</int> @@ -1244,6 +1316,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{758, 256}, {130, 15}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="444018704"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="572444645"> <int key="NSCellFlags">-2076049856</int> @@ -1314,6 +1388,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{674, 254}, {83, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="473093704"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="562573539"> <int key="NSCellFlags">67239424</int> @@ -1330,6 +1406,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{122, 193}, {22, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="335373847"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="273314683"> <int key="NSCellFlags">67239424</int> @@ -1351,6 +1429,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{40, 191}, {80, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="526934709"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="495611013"> <int key="NSCellFlags">67239424</int> @@ -1367,6 +1447,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{122, 214}, {22, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="501486901"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="12489527"> <int key="NSCellFlags">67239424</int> @@ -1388,6 +1470,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{1, 212}, {119, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="612818913"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="894602850"> <int key="NSCellFlags">67239424</int> @@ -1404,6 +1488,8 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{454, 84}, {146, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="497968468"/> <bool key="NSEnabled">YES</bool> <object class="NSSliderCell" key="NSCell" id="737375773"> <int key="NSCellFlags">-2079981824</int> @@ -1426,6 +1512,8 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{347, 65}, {102, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="747005200"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="950560055"> <int key="NSCellFlags">67239424</int> @@ -1442,6 +1530,8 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{454, 63}, {146, 16}}</string> <reference key="NSSuperview" ref="738514360"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="498769415"/> <bool key="NSEnabled">YES</bool> <object class="NSSliderCell" key="NSCell" id="148673163"> <int key="NSCellFlags">-2079981824</int> @@ -1462,32 +1552,58 @@ </object> <string key="NSFrameSize">{906, 290}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="120436311"/> <string key="NSClassName">NSView</string> <string key="NSExtension">NSResponder</string> </object> <object class="NSCustomView" id="679064762"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="743280560"> + <object class="NSTextField" id="522658278"> <reference key="NSNextResponder" ref="679064762"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{20, 206}, {660, 14}}</string> + <string key="NSFrame">{{1, 42}, {264, 17}}</string> <reference key="NSSuperview" ref="679064762"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="489160988"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="82262124"> + <object class="NSTextFieldCell" key="NSCell" id="246337895"> <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">138412032</int> - <string key="NSContents">Small System Font Text</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="743280560"/> + <int key="NSCellFlags2">272629760</int> + <string key="NSContents">Current FFMpeg Advanced Option String:</string> + <reference key="NSSupport" ref="755377161"/> + <reference key="NSControlView" ref="522658278"/> <reference key="NSBackgroundColor" ref="1006136775"/> <reference key="NSTextColor" ref="555417541"/> </object> </object> + <object class="NSTextField" id="489160988"> + <reference key="NSNextResponder" ref="679064762"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{4, 0}, {882, 34}}</string> + <reference key="NSSuperview" ref="679064762"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="1037223262"> + <int key="NSCellFlags">-1805517311</int> + <int key="NSCellFlags2">272760832</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="489160988"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="649660579"/> + <reference key="NSTextColor" ref="726854009"/> + </object> + </object> </object> <string key="NSFrameSize">{906, 290}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="522658278"/> <object class="NSMutableString" key="NSClassName"> <characters key="NS.bytes">NSView</characters> </object> @@ -1851,14 +1967,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">fX264optViewTitleLabel</string> - <reference key="source" ref="674763238"/> - <reference key="destination" ref="743280560"/> - </object> - <int key="connectionID">257</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">fX264optPsyRDLabel</string> <reference key="source" ref="674763238"/> <reference key="destination" ref="777985871"/> @@ -1993,13 +2101,39 @@ </object> <int key="connectionID">434</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">X264AdvancedOptionsSet:</string> + <reference key="source" ref="674763238"/> + <reference key="destination" ref="489160988"/> + </object> + <int key="connectionID">452</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fDisplayLavcOptions</string> + <reference key="source" ref="674763238"/> + <reference key="destination" ref="489160988"/> + </object> + <int key="connectionID">455</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fDisplayLavcOptionsLabel</string> + <reference key="source" ref="674763238"/> + <reference key="destination" ref="522658278"/> + </object> + <int key="connectionID">456</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> - <reference key="object" ref="0"/> + <object class="NSArray" key="object" id="0"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <reference key="children" ref="658768339"/> <nil key="parent"/> </object> @@ -2320,21 +2454,13 @@ <reference key="object" ref="679064762"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="743280560"/> + <reference ref="489160988"/> + <reference ref="522658278"/> </object> <reference key="parent" ref="0"/> <string key="objectName">empty</string> </object> <object class="IBObjectRecord"> - <int key="objectID">255</int> - <reference key="object" ref="743280560"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="82262124"/> - </object> - <reference key="parent" ref="679064762"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">342</int> <reference key="object" ref="928228060"/> <object class="NSMutableArray" key="children"> @@ -2510,11 +2636,6 @@ <reference key="parent" ref="5114506"/> </object> <object class="IBObjectRecord"> - <int key="objectID">381</int> - <reference key="object" ref="82262124"/> - <reference key="parent" ref="743280560"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">7</int> <reference key="object" ref="302593572"/> <object class="NSMutableArray" key="children"> @@ -3044,65 +3165,70 @@ <reference key="object" ref="225631881"/> <reference key="parent" ref="297485972"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">450</int> + <reference key="object" ref="489160988"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1037223262"/> + </object> + <reference key="parent" ref="679064762"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">451</int> + <reference key="object" ref="1037223262"/> + <reference key="parent" ref="489160988"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">453</int> + <reference key="object" ref="522658278"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="246337895"/> + </object> + <reference key="parent" ref="679064762"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">454</int> + <reference key="object" ref="246337895"/> + <reference key="parent" ref="522658278"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" 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>10.IBPluginDependency</string> - <string>10.ImportedFromIB2</string> <string>11.IBAttributePlaceholdersKey</string> <string>11.IBPluginDependency</string> - <string>11.ImportedFromIB2</string> <string>12.IBAttributePlaceholdersKey</string> <string>12.IBPluginDependency</string> - <string>12.ImportedFromIB2</string> <string>13.IBAttributePlaceholdersKey</string> <string>13.IBPluginDependency</string> - <string>13.ImportedFromIB2</string> <string>14.IBPluginDependency</string> - <string>14.ImportedFromIB2</string> <string>15.IBPluginDependency</string> - <string>15.ImportedFromIB2</string> <string>16.IBPluginDependency</string> - <string>16.ImportedFromIB2</string> <string>17.IBPluginDependency</string> - <string>17.ImportedFromIB2</string> <string>18.IBAttributePlaceholdersKey</string> <string>18.IBPluginDependency</string> - <string>18.ImportedFromIB2</string> <string>19.IBPluginDependency</string> - <string>19.ImportedFromIB2</string> <string>20.IBPluginDependency</string> - <string>20.ImportedFromIB2</string> <string>21.IBPluginDependency</string> - <string>21.ImportedFromIB2</string> <string>22.IBPluginDependency</string> - <string>22.ImportedFromIB2</string> <string>23.IBAttributePlaceholdersKey</string> <string>23.IBPluginDependency</string> - <string>23.ImportedFromIB2</string> <string>24.IBAttributePlaceholdersKey</string> <string>24.IBPluginDependency</string> - <string>24.ImportedFromIB2</string> - <string>254.IBEditorWindowLastContentRect</string> <string>254.IBPluginDependency</string> - <string>254.ImportedFromIB2</string> - <string>254.editorWindowContentRectSynchronizationRect</string> - <string>255.IBPluginDependency</string> - <string>255.ImportedFromIB2</string> <string>30.IBPluginDependency</string> - <string>30.ImportedFromIB2</string> <string>32.IBAttributePlaceholdersKey</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>342.IBPluginDependency</string> <string>343.IBPluginDependency</string> <string>344.IBPluginDependency</string> @@ -3111,7 +3237,6 @@ <string>347.IBPluginDependency</string> <string>348.IBPluginDependency</string> <string>35.IBPluginDependency</string> - <string>35.ImportedFromIB2</string> <string>350.IBPluginDependency</string> <string>352.IBPluginDependency</string> <string>353.IBPluginDependency</string> @@ -3120,7 +3245,6 @@ <string>356.IBPluginDependency</string> <string>358.IBPluginDependency</string> <string>36.IBPluginDependency</string> - <string>36.ImportedFromIB2</string> <string>361.IBPluginDependency</string> <string>362.IBPluginDependency</string> <string>363.IBPluginDependency</string> @@ -3129,7 +3253,6 @@ <string>366.IBPluginDependency</string> <string>37.IBAttributePlaceholdersKey</string> <string>37.IBPluginDependency</string> - <string>37.ImportedFromIB2</string> <string>373.IBPluginDependency</string> <string>374.IBPluginDependency</string> <string>375.IBPluginDependency</string> @@ -3139,278 +3262,179 @@ <string>379.IBPluginDependency</string> <string>38.IBAttributePlaceholdersKey</string> <string>38.IBPluginDependency</string> - <string>38.ImportedFromIB2</string> <string>380.IBPluginDependency</string> - <string>381.IBPluginDependency</string> <string>382.IBAttributePlaceholdersKey</string> <string>382.IBPluginDependency</string> - <string>382.ImportedFromIB2</string> <string>383.IBPluginDependency</string> <string>384.IBPluginDependency</string> <string>385.IBPluginDependency</string> <string>388.IBAttributePlaceholdersKey</string> <string>388.IBPluginDependency</string> - <string>388.ImportedFromIB2</string> <string>389.IBPluginDependency</string> <string>39.IBAttributePlaceholdersKey</string> <string>39.IBPluginDependency</string> - <string>39.ImportedFromIB2</string> <string>390.IBPluginDependency</string> <string>391.IBPluginDependency</string> <string>396.IBAttributePlaceholdersKey</string> <string>396.IBPluginDependency</string> - <string>396.ImportedFromIB2</string> <string>397.IBPluginDependency</string> <string>398.IBAttributePlaceholdersKey</string> <string>398.IBPluginDependency</string> - <string>398.ImportedFromIB2</string> <string>399.IBPluginDependency</string> <string>40.IBPluginDependency</string> - <string>40.ImportedFromIB2</string> <string>400.IBPluginDependency</string> - <string>400.ImportedFromIB2</string> <string>401.IBPluginDependency</string> - <string>401.ImportedFromIB2</string> <string>402.IBPluginDependency</string> - <string>402.ImportedFromIB2</string> <string>403.IBPluginDependency</string> - <string>403.ImportedFromIB2</string> <string>407.IBAttributePlaceholdersKey</string> <string>407.IBPluginDependency</string> - <string>407.ImportedFromIB2</string> <string>408.IBAttributePlaceholdersKey</string> <string>408.IBPluginDependency</string> - <string>408.ImportedFromIB2</string> <string>409.IBPluginDependency</string> <string>41.IBPluginDependency</string> - <string>41.ImportedFromIB2</string> <string>410.IBPluginDependency</string> <string>42.IBPluginDependency</string> - <string>42.ImportedFromIB2</string> <string>420.IBPluginDependency</string> <string>421.IBAttributePlaceholdersKey</string> <string>421.IBPluginDependency</string> - <string>421.ImportedFromIB2</string> <string>422.IBPluginDependency</string> <string>423.IBPluginDependency</string> <string>427.IBAttributePlaceholdersKey</string> <string>427.IBPluginDependency</string> - <string>427.ImportedFromIB2</string> <string>428.IBPluginDependency</string> <string>429.IBPluginDependency</string> - <string>429.ImportedFromIB2</string> <string>43.IBPluginDependency</string> - <string>43.ImportedFromIB2</string> <string>430.IBPluginDependency</string> - <string>430.ImportedFromIB2</string> <string>431.IBPluginDependency</string> - <string>431.ImportedFromIB2</string> <string>432.IBPluginDependency</string> - <string>432.ImportedFromIB2</string> <string>438.IBPluginDependency</string> <string>439.IBPluginDependency</string> <string>44.IBAttributePlaceholdersKey</string> <string>44.IBPluginDependency</string> - <string>44.ImportedFromIB2</string> <string>440.IBPluginDependency</string> <string>441.IBPluginDependency</string> <string>442.IBPluginDependency</string> <string>443.IBPluginDependency</string> + <string>450.IBPluginDependency</string> + <string>451.IBPluginDependency</string> + <string>453.IBPluginDependency</string> + <string>454.IBPluginDependency</string> <string>46.IBAttributePlaceholdersKey</string> <string>46.IBPluginDependency</string> - <string>46.ImportedFromIB2</string> <string>49.IBAttributePlaceholdersKey</string> <string>49.IBPluginDependency</string> - <string>49.ImportedFromIB2</string> - <string>5.IBEditorWindowLastContentRect</string> <string>5.IBPluginDependency</string> - <string>5.ImportedFromIB2</string> - <string>5.editorWindowContentRectSynchronizationRect</string> <string>50.IBAttributePlaceholdersKey</string> <string>50.IBPluginDependency</string> - <string>50.ImportedFromIB2</string> <string>51.IBPluginDependency</string> - <string>51.ImportedFromIB2</string> <string>52.IBPluginDependency</string> - <string>52.ImportedFromIB2</string> <string>53.IBPluginDependency</string> - <string>53.ImportedFromIB2</string> <string>54.IBPluginDependency</string> - <string>54.ImportedFromIB2</string> <string>55.IBPluginDependency</string> - <string>55.ImportedFromIB2</string> <string>56.IBAttributePlaceholdersKey</string> <string>56.IBPluginDependency</string> - <string>56.ImportedFromIB2</string> <string>57.IBPluginDependency</string> - <string>57.ImportedFromIB2</string> <string>58.IBPluginDependency</string> - <string>58.ImportedFromIB2</string> <string>59.IBPluginDependency</string> - <string>59.ImportedFromIB2</string> <string>6.IBAttributePlaceholdersKey</string> <string>6.IBPluginDependency</string> - <string>6.ImportedFromIB2</string> <string>60.IBPluginDependency</string> - <string>60.ImportedFromIB2</string> <string>61.IBAttributePlaceholdersKey</string> <string>61.IBPluginDependency</string> - <string>61.ImportedFromIB2</string> <string>62.IBPluginDependency</string> - <string>62.ImportedFromIB2</string> <string>63.IBPluginDependency</string> - <string>63.ImportedFromIB2</string> <string>64.IBPluginDependency</string> - <string>64.ImportedFromIB2</string> <string>65.IBPluginDependency</string> - <string>65.ImportedFromIB2</string> <string>66.IBAttributePlaceholdersKey</string> <string>66.IBPluginDependency</string> - <string>66.ImportedFromIB2</string> <string>7.IBPluginDependency</string> - <string>7.ImportedFromIB2</string> <string>73.IBAttributePlaceholdersKey</string> <string>73.IBPluginDependency</string> - <string>73.ImportedFromIB2</string> <string>74.IBAttributePlaceholdersKey</string> <string>74.IBPluginDependency</string> - <string>74.ImportedFromIB2</string> <string>75.IBPluginDependency</string> - <string>75.ImportedFromIB2</string> <string>76.IBPluginDependency</string> - <string>76.ImportedFromIB2</string> <string>77.IBPluginDependency</string> - <string>77.ImportedFromIB2</string> <string>78.IBPluginDependency</string> - <string>78.ImportedFromIB2</string> <string>8.IBPluginDependency</string> - <string>8.ImportedFromIB2</string> <string>81.IBAttributePlaceholdersKey</string> <string>81.IBPluginDependency</string> - <string>81.ImportedFromIB2</string> <string>82.IBPluginDependency</string> - <string>82.ImportedFromIB2</string> <string>83.IBPluginDependency</string> - <string>83.ImportedFromIB2</string> <string>84.IBPluginDependency</string> - <string>84.ImportedFromIB2</string> <string>85.IBPluginDependency</string> - <string>85.ImportedFromIB2</string> <string>86.IBAttributePlaceholdersKey</string> <string>86.IBPluginDependency</string> - <string>86.ImportedFromIB2</string> <string>87.IBAttributePlaceholdersKey</string> <string>87.IBPluginDependency</string> - <string>87.ImportedFromIB2</string> <string>88.IBAttributePlaceholdersKey</string> <string>88.IBPluginDependency</string> - <string>88.ImportedFromIB2</string> <string>89.IBAttributePlaceholdersKey</string> <string>89.IBPluginDependency</string> - <string>89.ImportedFromIB2</string> <string>9.IBPluginDependency</string> - <string>9.ImportedFromIB2</string> <string>90.IBAttributePlaceholdersKey</string> <string>90.IBPluginDependency</string> - <string>90.ImportedFromIB2</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{113, 443}, {906, 290}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{42, 754}, {700, 290}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3419,7 +3443,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3428,7 +3451,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3438,12 +3460,9 @@ <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3454,144 +3473,102 @@ <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3599,940 +3576,149 @@ <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{-1032, 213}, {906, 290}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{692, 501}, {700, 290}}</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <nil key="activeLocalization"/> <object class="NSMutableDictionary" key="localizations"> <bool key="EncodedWithXMLCoder">YES</bool> <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <reference key="dict.values" ref="0"/> </object> <nil key="sourceID"/> - <int key="maxID">449</int> + <int key="maxID">456</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">HBAdvancedController</string> <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>X264AdvancedOptionsAnimate:</string> - <string>X264AdvancedOptionsChanged:</string> - <string>X264AdvancedOptionsSet:</string> - <string>X264AdvancedOptionsSetCurrentSettings:</string> - <string>X264AdvancedOptionsStandardizeOptString:</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="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>fDisplayX264Options</string> - <string>fDisplayX264OptionsLabel</string> - <string>fEmptyView</string> - <string>fX264opt8x8dctLabel</string> - <string>fX264opt8x8dctSwitch</string> - <string>fX264optAlphaDeblockPopUp</string> - <string>fX264optAnalyseLabel</string> - <string>fX264optAnalysePopUp</string> - <string>fX264optAqLabel</string> - <string>fX264optAqSlider</string> - <string>fX264optBAdaptLabel</string> - <string>fX264optBAdaptPopUp</string> - <string>fX264optBPyramidLabel</string> - <string>fX264optBPyramidPopUp</string> - <string>fX264optBetaDeblockPopUp</string> - <string>fX264optBframesLabel</string> - <string>fX264optBframesPopUp</string> - <string>fX264optCabacLabel</string> - <string>fX264optCabacSwitch</string> - <string>fX264optDeblockLabel</string> - <string>fX264optDirectPredLabel</string> - <string>fX264optDirectPredPopUp</string> - <string>fX264optMERangeLabel</string> - <string>fX264optMERangePopUp</string> - <string>fX264optMotionEstLabel</string> - <string>fX264optMotionEstPopUp</string> - <string>fX264optNodctdcmtLabel</string> - <string>fX264optNodctdcmtSwitch</string> - <string>fX264optPsyRDLabel</string> - <string>fX264optPsyRDSlider</string> - <string>fX264optPsyTrellisLabel</string> - <string>fX264optPsyTrellisSlider</string> - <string>fX264optRefLabel</string> - <string>fX264optRefPopUp</string> - <string>fX264optSubmeLabel</string> - <string>fX264optSubmePopUp</string> - <string>fX264optTrellisLabel</string> - <string>fX264optTrellisPopUp</string> - <string>fX264optView</string> - <string>fX264optViewTitleLabel</string> - <string>fX264optWeightPLabel</string> - <string>fX264optWeightPSwitch</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSTextField</string> - <string>NSTextField</string> - <string>NSView</string> - <string>NSTextField</string> - <string>NSButton</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSSlider</string> - <string>NSTextField</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSPopUpButton</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSButton</string> - <string>NSTextField</string> - <string>NSTextField</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSButton</string> - <string>NSTextField</string> - <string>NSSlider</string> - <string>NSTextField</string> - <string>NSSlider</string> - <string>NSTextField</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSPopUpButton</string> - <string>NSTextField</string> - <string>NSPopUpButton</string> - <string>NSView</string> - <string>NSTextField</string> - <string>NSTextField</string> - <string>NSButton</string> - </object> - </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">HBAdvancedController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">HBAdvancedController</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> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">NSActionCell</string> - <string key="superclassName">NSCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="835616628"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="790263097"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="747845720"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSButton</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSButtonCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSCell</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1071725258"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSFormatter</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="928232891"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenuItem</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="98919436"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenuItemCell</string> - <string key="superclassName">NSButtonCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="835616628"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="790263097"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="747845720"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="1071725258"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="928232891"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="195503719"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSError.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObject.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSThread.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURL.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Growl.framework/Headers/GrowlApplicationBridge.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">ImageKit.framework/Headers/IKImageBrowserView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">ImageKit.framework/Headers/IKSaveOptions.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">ImageKit.framework/Headers/ImageKitDeprecated.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">PDFKit.framework/Headers/PDFDocument.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">PDFKit.framework/Headers/PDFView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QTKit.framework/Headers/QTCaptureDecompressedAudioOutput.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QTKit.framework/Headers/QTCaptureDecompressedVideoOutput.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QTKit.framework/Headers/QTCaptureFileOutput.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QTKit.framework/Headers/QTCaptureVideoPreviewOutput.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QTKit.framework/Headers/QTCaptureView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QTKit.framework/Headers/QTMovie.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QTKit.framework/Headers/QTMovieView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzComposer.framework/Headers/QCCompositionParameterView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzComposer.framework/Headers/QCCompositionPickerView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzFilters.framework/Headers/QuartzFilterManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuickLookUI.framework/Headers/QLPreviewPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Sparkle.framework/Headers/SUUpdater.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSPopUpButton</string> - <string key="superclassName">NSButton</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSPopUpButtonCell</string> - <string key="superclassName">NSMenuItemCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSlider</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSlider.h</string> + <string key="minorKey">./Classes/HBAdvancedController.h</string> </object> </object> - <object class="IBPartialClassDescription"> - <string key="className">NSSliderCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSliderCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextField</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextFieldCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <reference key="sourceIdentifier" ref="98919436"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <string key="superclassName">NSResponder</string> - <reference key="sourceIdentifier" ref="195503719"/> - </object> </object> </object> <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <integer value="1050" key="NS.object.0"/> @@ -4542,7 +3728,19 @@ <integer value="3000" key="NS.object.0"/> </object> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> - <string key="IBDocument.LastKnownRelativeProjectPath">../HandBrake.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSMenuCheckmark</string> + <string>NSMenuMixedState</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>{9, 8}</string> + <string>{7, 2}</string> + </object> + </object> </data> </archive> diff --git a/macosx/HBAdvancedController.h b/macosx/HBAdvancedController.h index bc6e5b808..b59746e8f 100644 --- a/macosx/HBAdvancedController.h +++ b/macosx/HBAdvancedController.h @@ -16,6 +16,9 @@ IBOutlet NSTextField * fX264optViewTitleLabel; IBOutlet NSTextField * fDisplayX264OptionsLabel; IBOutlet NSTextField * fDisplayX264Options; + IBOutlet NSTextField * fDisplayLavcOptionsLabel; + IBOutlet NSTextField * fDisplayLavcOptions; + IBOutlet NSTextField * fX264optBframesLabel; IBOutlet NSPopUpButton * fX264optBframesPopUp; IBOutlet NSTextField * fX264optRefLabel; @@ -59,7 +62,9 @@ - (void) setView: (NSBox *) box; - (BOOL) loadMyNibFile; - (NSString *) optionsString; +- (NSString *) optionsStringLavc; - (void) setOptions: (NSString *)string; +- (void) setLavcOptions: (NSString *)string; - (void) enableUI: (bool) b; - (void) setHidden: (BOOL) hide; - (IBAction) X264AdvancedOptionsAnimate: (id) sender; diff --git a/macosx/HBAdvancedController.m b/macosx/HBAdvancedController.m index b8bb553c2..55da0c06b 100644 --- a/macosx/HBAdvancedController.m +++ b/macosx/HBAdvancedController.m @@ -38,23 +38,31 @@ return [fDisplayX264Options stringValue]; } +- (NSString *) optionsStringLavc +{ + return [fDisplayLavcOptions stringValue]; +} + - (void) setOptions: (NSString *)string { [fDisplayX264Options setStringValue:string]; [self X264AdvancedOptionsSet:nil]; } +- (void) setLavcOptions: (NSString *)string +{ + [fDisplayLavcOptions setStringValue:string]; +} + - (void) setHidden: (BOOL) hide { if(hide) { [fOptionsBox setContentView:fEmptyView]; - [fX264optViewTitleLabel setStringValue: @"Only Used With The x264 (H.264) Codec"]; } else { [fOptionsBox setContentView:fX264optView]; - [fX264optViewTitleLabel setStringValue: @""]; } return; } diff --git a/macosx/HBQueueController.mm b/macosx/HBQueueController.mm index 86f1b759b..41576e242 100644 --- a/macosx/HBQueueController.mm +++ b/macosx/HBQueueController.mm @@ -1316,7 +1316,27 @@ return ![(HBQueueOutlineView*)outlineView isDragging]; if ([[item objectForKey:@"VideoEncoder"] isEqualToString: @"H.264 (x264)"]) { [finalString appendString: @"x264 Options: " withAttributes:detailBoldAttr]; - [finalString appendString: [item objectForKey:@"x264Option"] withAttributes:detailAttr]; + if ([item objectForKey:@"x264Option"]) + { + [finalString appendString: [item objectForKey:@"x264Option"] withAttributes:detailAttr]; + } + else + { + [finalString appendString: @"x264 defaults" withAttributes:detailAttr]; + } + [finalString appendString:@"\n" withAttributes:detailAttr]; + } + else // we must be ffmpeg (lavc) + { + [finalString appendString: @"FFmpeg (lavc) Options: " withAttributes:detailBoldAttr]; + if ([item objectForKey:@"lavcOption"]) + { + [finalString appendString: [item objectForKey:@"lavcOption"] withAttributes:detailAttr]; + } + else + { + [finalString appendString: @"FFmpeg (lavc) defaults" withAttributes:detailAttr]; + } [finalString appendString:@"\n" withAttributes:detailAttr]; } |