summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--macosx/Controller.mm25
-rw-r--r--macosx/English.lproj/PictureSettings.xib254
-rw-r--r--macosx/English.lproj/Preferences.xib97
-rw-r--r--macosx/HBPreferencesController.m1
-rw-r--r--macosx/PictureController.h2
-rw-r--r--macosx/PictureController.mm10
6 files changed, 95 insertions, 294 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index b2ddff7a5..bdebb6954 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -4083,26 +4083,25 @@ the user is using "Custom" settings by determining the sender*/
}
/* Detelecine */
- if ([fPictureController detelecine]) {
+ if ([fPictureController detelecine])
+ {
[fPicSettingDetelecine setStringValue: @"Yes"];
}
- else {
- [fPicSettingDetelecine setStringValue: @"No"];
+ else
+ {
+ [fPicSettingDetelecine setStringValue: @"Off"];
}
/* Decomb */
- if ([fPictureController decomb] == 0)
+ if ([fPictureController decomb])
{
- [fPicSettingDecomb setStringValue: @"Off"];
+ [fPicSettingDecomb setStringValue: @"1:2:6:9:80:16:16"];
}
- else if ([fPictureController decomb] == 1)
+ else
{
- [fPicSettingDecomb setStringValue: @"1:2:6:9:80:16:16"];
+ [fPicSettingDecomb setStringValue: @"Off"];
}
- else if ([fPictureController decomb] == 2)
- {
- [fPicSettingDecomb setStringValue:[[NSUserDefaults standardUserDefaults] stringForKey:@"DecombCustomString"]];
- }
+
/* VFR (Variable Frame Rate) */
@@ -5912,7 +5911,7 @@ return YES;
job->pixel_ratio = [[chosenPreset objectForKey:@"PicturePAR"] intValue];
- /* If the preset has no objectForKey:@"UsesPictureFilters", then we know it is a legacy preset
+ /* If the preset has no objectForKey:@"UsesPictureFilters", then we know it is a legacy preset
* and handle the filters here as before.
* NOTE: This should be removed when the update presets code is done as we can be assured that legacy
* presets are updated to work properly with new keys.
@@ -6041,7 +6040,7 @@ return YES;
/* Decomb */
/* Even though we currently allow for a custom setting for decomb, ultimately it will only have Off and
* Default so we just pay attention to anything greater than 0 as 1 (Default). 0 is Off. */
- if ([[chosenPreset objectForKey:@"PictureDecomb"] intValue] > 0)
+ if ([[chosenPreset objectForKey:@"PictureDecomb"] intValue] == 1)
{
[fPictureController setDecomb:1];
}
diff --git a/macosx/English.lproj/PictureSettings.xib b/macosx/English.lproj/PictureSettings.xib
index b5e0cea8f..68ea6c435 100644
--- a/macosx/English.lproj/PictureSettings.xib
+++ b/macosx/English.lproj/PictureSettings.xib
@@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">352.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="6"/>
+ <integer value="23"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -844,6 +844,27 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
+ <object class="NSButton" id="974850032">
+ <reference key="NSNextResponder" ref="628081139"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{4, 10}, {82, 18}}</string>
+ <reference key="NSSuperview" ref="628081139"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="464410464">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">67239936</int>
+ <string key="NSContents">Decomb:</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="974850032"/>
+ <int key="NSButtonFlags">1210864127</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSAlternateImage" ref="931738615"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
<object class="NSPopUpButton" id="243795165">
<reference key="NSNextResponder" ref="628081139"/>
<int key="NSvFlags">256</int>
@@ -962,92 +983,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="NSTextColor" ref="1053668690"/>
</object>
</object>
- <object class="NSPopUpButton" id="878291110">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{75, 9}, {110, 15}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="162356603">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">264192</int>
- <reference key="NSSupport" ref="22"/>
- <reference key="NSControlView" ref="878291110"/>
- <int key="NSButtonFlags">109199615</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="826709342"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="170535567">
- <reference key="NSMenu" ref="146867052"/>
- <string key="NSTitle">Item1</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="315488983"/>
- <reference key="NSMixedImage" ref="216289096"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="162356603"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="146867052">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="170535567"/>
- <object class="NSMenuItem" id="226508779">
- <reference key="NSMenu" ref="146867052"/>
- <string key="NSTitle">Item2</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="315488983"/>
- <reference key="NSMixedImage" ref="216289096"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="162356603"/>
- </object>
- <object class="NSMenuItem" id="43352374">
- <reference key="NSMenu" ref="146867052"/>
- <string key="NSTitle">Item3</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="315488983"/>
- <reference key="NSMixedImage" ref="216289096"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="162356603"/>
- </object>
- </object>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- </object>
- <object class="NSTextField" id="742513844">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{18, 7}, {52, 17}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="604349861">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Decomb:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="742513844"/>
- <reference key="NSBackgroundColor" ref="407686733"/>
- <reference key="NSTextColor" ref="1053668690"/>
- </object>
- </object>
<object class="NSSlider" id="581126685">
<reference key="NSNextResponder" ref="628081139"/>
<int key="NSvFlags">268</int>
@@ -1625,22 +1560,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">fDecombPopUp</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="878291110"/>
- </object>
- <int key="connectionID">193</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">SettingsChanged:</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="878291110"/>
- </object>
- <int key="connectionID">194</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">fDeblockSlider</string>
<reference key="source" ref="355312334"/>
<reference key="destination" ref="581126685"/>
@@ -1735,6 +1654,22 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
<int key="connectionID">233</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">fDecombCheck</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="974850032"/>
+ </object>
+ <int key="connectionID">238</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">SettingsChanged:</string>
+ <reference key="source" ref="355312334"/>
+ <reference key="destination" ref="974850032"/>
+ </object>
+ <int key="connectionID">239</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1843,11 +1778,10 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference ref="346912008"/>
<reference ref="905607845"/>
<reference ref="94419441"/>
- <reference ref="878291110"/>
- <reference ref="742513844"/>
<reference ref="581126685"/>
<reference ref="1069536323"/>
<reference ref="314638156"/>
+ <reference ref="974850032"/>
</object>
<reference key="parent" ref="49161063"/>
</object>
@@ -2343,64 +2277,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="parent" ref="844127024"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">185</int>
- <reference key="object" ref="878291110"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="162356603"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">186</int>
- <reference key="object" ref="742513844"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="604349861"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">187</int>
- <reference key="object" ref="604349861"/>
- <reference key="parent" ref="742513844"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">188</int>
- <reference key="object" ref="162356603"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="146867052"/>
- </object>
- <reference key="parent" ref="878291110"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">189</int>
- <reference key="object" ref="146867052"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="43352374"/>
- <reference ref="226508779"/>
- <reference ref="170535567"/>
- </object>
- <reference key="parent" ref="162356603"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">190</int>
- <reference key="object" ref="43352374"/>
- <reference key="parent" ref="146867052"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">191</int>
- <reference key="object" ref="226508779"/>
- <reference key="parent" ref="146867052"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">192</int>
- <reference key="object" ref="170535567"/>
- <reference key="parent" ref="146867052"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">195</int>
<reference key="object" ref="581126685"/>
<object class="NSMutableArray" key="children">
@@ -2552,6 +2428,20 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="object" ref="567286013"/>
<reference key="parent" ref="66510867"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">236</int>
+ <reference key="object" ref="974850032"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="464410464"/>
+ </object>
+ <reference key="parent" ref="309105014"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">237</int>
+ <reference key="object" ref="464410464"/>
+ <reference key="parent" ref="974850032"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2594,20 +2484,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>18.IBPluginDependency</string>
<string>18.ImportedFromIB2</string>
<string>180.IBPluginDependency</string>
- <string>185.IBPluginDependency</string>
- <string>185.ImportedFromIB2</string>
- <string>186.IBPluginDependency</string>
- <string>186.ImportedFromIB2</string>
- <string>189.IBPluginDependency</string>
- <string>189.ImportedFromIB2</string>
<string>19.IBPluginDependency</string>
<string>19.ImportedFromIB2</string>
- <string>190.IBPluginDependency</string>
- <string>190.ImportedFromIB2</string>
- <string>191.IBPluginDependency</string>
- <string>191.ImportedFromIB2</string>
- <string>192.IBPluginDependency</string>
- <string>192.ImportedFromIB2</string>
<string>195.IBPluginDependency</string>
<string>196.IBPluginDependency</string>
<string>197.IBPluginDependency</string>
@@ -2641,6 +2519,8 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>231.ImportedFromIB2</string>
<string>234.IBPluginDependency</string>
<string>235.IBPluginDependency</string>
+ <string>236.IBPluginDependency</string>
+ <string>236.ImportedFromIB2</string>
<string>25.IBPluginDependency</string>
<string>25.ImportedFromIB2</string>
<string>26.IBPluginDependency</string>
@@ -2747,18 +2627,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
@@ -2835,10 +2703,12 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{302, 299}, {484, 557}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{302, 299}, {484, 557}}</string>
+ <string>{{497, 299}, {484, 557}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <reference ref="9"/>
+ <string>{{497, 299}, {484, 557}}</string>
<reference ref="9"/>
<string>{{221, 276}, {533, 580}}</string>
<reference ref="9"/>
@@ -2877,7 +2747,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">235</int>
+ <int key="maxID">239</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2949,7 +2819,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>fDeblockCheck</string>
<string>fDeblockField</string>
<string>fDeblockSlider</string>
- <string>fDecombPopUp</string>
+ <string>fDecombCheck</string>
<string>fDeinterlacePopUp</string>
<string>fDenoisePopUp</string>
<string>fDetelecineCheck</string>
@@ -2985,7 +2855,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>NSButton</string>
<string>NSTextField</string>
<string>NSSlider</string>
- <string>NSPopUpButton</string>
+ <string>NSButton</string>
<string>NSPopUpButton</string>
<string>NSPopUpButton</string>
<string>NSButton</string>
diff --git a/macosx/English.lproj/Preferences.xib b/macosx/English.lproj/Preferences.xib
index 1602d5db9..4c88164b0 100644
--- a/macosx/English.lproj/Preferences.xib
+++ b/macosx/English.lproj/Preferences.xib
@@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">352.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="236"/>
+ <integer value="234"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -148,7 +148,7 @@
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor" id="104533627">
+ <object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
@@ -353,50 +353,20 @@
<string key="NSExtension">NSControl</string>
</object>
<object class="NSCustomView" id="520288288">
- <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="1062449667">
- <reference key="NSNextResponder" ref="520288288"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{207, 40}, {208, 22}}</string>
- <reference key="NSSuperview" ref="520288288"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="51555548">
- <int key="NSCellFlags">-1804468671</int>
- <int key="NSCellFlags2">272630784</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="964910696"/>
- <reference key="NSControlView" ref="1062449667"/>
- <bool key="NSDrawsBackground">YES</bool>
- <object class="NSColor" key="NSBackgroundColor" id="686497954">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textBackgroundColor</string>
- <object class="NSColor" key="NSColor" id="993015046">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textColor</string>
- <reference key="NSColor" ref="104533627"/>
- </object>
- </object>
- </object>
<object class="NSTextField" id="539748933">
<reference key="NSNextResponder" ref="520288288"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{47, 42}, {155, 17}}</string>
+ <string key="NSFrame">{{34, 42}, {432, 17}}</string>
<reference key="NSSuperview" ref="520288288"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="374363387">
<int key="NSCellFlags">67239488</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Custom Decomb String:</string>
+ <int key="NSCellFlags2">138413056</int>
+ <string key="NSContents">Nothing here right now, but I am sure we will think of something</string>
<reference key="NSSupport" ref="964910696"/>
<reference key="NSControlView" ref="539748933"/>
<reference key="NSBackgroundColor" ref="525377782"/>
@@ -405,6 +375,7 @@
</object>
</object>
<string key="NSFrameSize">{496, 82}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -442,7 +413,15 @@
<reference key="NSSupport" ref="964910696"/>
<reference key="NSControlView" ref="172081130"/>
<bool key="NSDrawsBackground">YES</bool>
- <reference key="NSBackgroundColor" ref="686497954"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textBackgroundColor</string>
+ <object class="NSColor" key="NSColor" id="993015046">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ </object>
<reference key="NSTextColor" ref="887152126"/>
<int key="NSVisibleItemCount">10</int>
<bool key="NSHasVerticalScroller">YES</bool>
@@ -719,7 +698,7 @@
<string key="NSExtension">NSResponder</string>
</object>
<object class="NSCustomView" id="23728330">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -904,7 +883,6 @@
</object>
</object>
<string key="NSFrameSize">{486, 123}</string>
- <reference key="NSSuperview"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
</object>
@@ -1108,26 +1086,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
- <string key="label">value: values.DecombCustomString</string>
- <reference key="source" ref="1062449667"/>
- <reference key="destination" ref="580534391"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="1062449667"/>
- <reference key="NSDestination" ref="580534391"/>
- <string key="NSLabel">value: values.DecombCustomString</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">values.DecombCustomString</string>
- <object class="NSDictionary" key="NSOptions">
- <string key="NS.key.0">NSContinuouslyUpdatesValue</string>
- <integer value="1" key="NS.object.0" id="9"/>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">330</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
<string key="label">value: values.EncodeLogLocation</string>
<reference key="source" ref="907177043"/>
<reference key="destination" ref="580534391"/>
@@ -1308,7 +1266,6 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="539748933"/>
- <reference ref="1062449667"/>
</object>
<reference key="parent" ref="510204080"/>
<string key="objectName">Picture</string>
@@ -1510,20 +1467,6 @@
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">324</int>
- <reference key="object" ref="1062449667"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="51555548"/>
- </object>
- <reference key="parent" ref="520288288"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">325</int>
- <reference key="object" ref="51555548"/>
- <reference key="parent" ref="1062449667"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">326</int>
<reference key="object" ref="539748933"/>
<object class="NSMutableArray" key="children">
@@ -1701,8 +1644,6 @@
<string>295.ImportedFromIB2</string>
<string>296.IBPluginDependency</string>
<string>296.ImportedFromIB2</string>
- <string>324.IBPluginDependency</string>
- <string>325.IBPluginDependency</string>
<string>326.IBPluginDependency</string>
<string>327.IBPluginDependency</string>
<string>347.IBPluginDependency</string>
@@ -1737,7 +1678,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{220, 300}, {492, 189}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
+ <integer value="1" id="9"/>
<string>{{0, 636}, {500, 209}}</string>
<string>{{144, 376}, {496, 82}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1796,8 +1737,6 @@
<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>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index 7f2bc40f8..b51dacf8d 100644
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -54,7 +54,6 @@
@"NO", @"DisableDvdAutoDetect",
@"Alert Window", @"AlertWhenDone",
@"1", @"LoggingLevel",
- @"4:10:15:9:10:35:9", @"DecombCustomString",
@"NO", @"EncodeLogLocation",
@"10", @"PreviewsNumber",
nil]];
diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index 6aa03f1a9..631a1d11c 100644
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -37,7 +37,7 @@
IBOutlet NSTextField * fCropRightField;
IBOutlet NSStepper * fCropRightStepper;
IBOutlet NSPopUpButton * fDeinterlacePopUp;
- IBOutlet NSPopUpButton * fDecombPopUp;
+ IBOutlet NSButton * fDecombCheck;
IBOutlet NSButton * fDetelecineCheck;
IBOutlet NSButton * fDeblockCheck;
IBOutlet NSTextField * fDeblockField;
diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 7ba284f83..c0f5771af 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -161,6 +161,7 @@
[fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
[fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
[fDeblockCheck setState: fPictureFilterSettings.deblock];
+ [fDecombCheck setState: fPictureFilterSettings.decomb];
fPicture = 0;
MaxOutputWidth = title->width - job->crop[2] - job->crop[3];
@@ -191,13 +192,6 @@ are maintained across different sources */
/* Set denoises level according to the integer in the main window */
[fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
- /* we use a popup to show the decomb settings */
- [fDecombPopUp removeAllItems];
- [fDecombPopUp addItemWithTitle: @"None"];
- [fDecombPopUp addItemWithTitle: @"Default"];
- [fDecombPopUp addItemWithTitle: @"Custom"];
- /* Set denoises level according to the integer in the main window */
- [fDecombPopUp selectItemAtIndex: fPictureFilterSettings.decomb];
}
@@ -417,7 +411,7 @@ are maintained across different sources */
fPictureFilterSettings.deblock = [fDeblockField intValue];
}
- fPictureFilterSettings.decomb = [fDecombPopUp indexOfSelectedItem];
+ fPictureFilterSettings.decomb = [fDecombCheck state];
if( job->keep_ratio )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 05:27:28 +0000