Skip to content

V
vlc
Commit 36b438b5 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Jean-Baptiste Kempf
Browse files
Options

macosx: re-add the 'Reset' button to the image adjust filter, since it used be present in the past 

(cherry picked from commit 4b709298)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent ab827594
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 11 deletions
extras/package/macosx/Resources/English.lproj/VideoEffects.xib
View file @ 36b438b5
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="644"/> <integer value="48"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<object class="BGHUDTabViewItem" id="313931694"> <object class="BGHUDTabViewItem" id="313931694">
<string key="NSIdentifier">basic</string> <string key="NSIdentifier">basic</string>
<object class="NSView" key="NSView" id="1044285835"> <object class="NSView" key="NSView" id="1044285835">
<nil key="NSNextResponder"/> <reference key="NSNextResponder" ref="898819366"/>
<int key="NSvFlags">274</int> <int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -321,6 +321,39 @@ ...@@ -321,6 +321,39 @@
<string key="themeKey">gradientTheme</string> <string key="themeKey">gradientTheme</string>
</object> </object>
</object> </object>
<object class="NSButton" id="370408073">
<reference key="NSNextResponder" ref="627843039"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{217, 12}, {73, 17}}</string>
<reference key="NSSuperview" ref="627843039"/>
<string key="NSReuseIdentifierKey">_NS:125</string>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDButtonCell" key="NSCell" id="496532368">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134479872</int>
<string key="NSContents">Reset</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">9</double>
<int key="NSfFlags">3600</int>
</object>
<string key="NSCellIdentifier">_NS:125</string>
<reference key="NSControlView" ref="370408073"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">36</int>
<object class="NSFont" key="NSAlternateImage">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">9</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
<string key="themeKey">gradientTheme</string>
<int key="BGButtonType">0</int>
</object>
</object>
</object> </object>
<string key="NSFrame">{{1, 1}, {308, 164}}</string> <string key="NSFrame">{{1, 1}, {308, 164}}</string>
<reference key="NSSuperview" ref="308548124"/> <reference key="NSSuperview" ref="308548124"/>
...@@ -671,6 +704,7 @@ ...@@ -671,6 +704,7 @@
</object> </object>
</object> </object>
<string key="NSFrame">{{10, 33}, {638, 197}}</string> <string key="NSFrame">{{10, 33}, {638, 197}}</string>
<reference key="NSSuperview" ref="898819366"/>
</object> </object>
<string key="NSLabel">Basic</string> <string key="NSLabel">Basic</string>
<reference key="NSColor" ref="279270326"/> <reference key="NSColor" ref="279270326"/>
...@@ -2713,7 +2747,7 @@ ...@@ -2713,7 +2747,7 @@
<object class="NSTabViewItem" id="657146767"> <object class="NSTabViewItem" id="657146767">
<string key="NSIdentifier">misc</string> <string key="NSIdentifier">misc</string>
<object class="NSView" key="NSView" id="542129148"> <object class="NSView" key="NSView" id="542129148">
<reference key="NSNextResponder" ref="898819366"/> <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -3110,14 +3144,13 @@ ...@@ -3110,14 +3144,13 @@
</object> </object>
</object> </object>
<string key="NSFrame">{{10, 33}, {638, 197}}</string> <string key="NSFrame">{{10, 33}, {638, 197}}</string>
<reference key="NSSuperview" ref="898819366"/>
</object> </object>
<string key="NSLabel">Miscellaneous</string> <string key="NSLabel">Miscellaneous</string>
<reference key="NSColor" ref="279270326"/> <reference key="NSColor" ref="279270326"/>
<reference key="NSTabView" ref="898819366"/> <reference key="NSTabView" ref="898819366"/>
</object> </object>
</object> </object>
<reference key="NSSelectedTabViewItem" ref="657146767"/> <reference key="NSSelectedTabViewItem" ref="313931694"/>
<object class="NSFont" key="NSFont"> <object class="NSFont" key="NSFont">
<string key="NSName">LucidaGrande</string> <string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double> <double key="NSSize">13</double>
...@@ -3129,7 +3162,7 @@ ...@@ -3129,7 +3162,7 @@
<nil key="themeKey"/> <nil key="themeKey"/>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="542129148"/> <reference ref="1044285835"/>
</object> </object>
</object> </object>
</object> </object>
...@@ -4356,6 +4389,22 @@ ...@@ -4356,6 +4389,22 @@
</object> </object>
<int key="connectionID">701</int> <int key="connectionID">701</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">enableAdjustBrightnessThreshold:</string>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="370408073"/>
</object>
<int key="connectionID">706</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_adjust_reset_btn</string>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="370408073"/>
</object>
<int key="connectionID">707</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
...@@ -4565,6 +4614,7 @@ ...@@ -4565,6 +4614,7 @@
<reference ref="685913676"/> <reference ref="685913676"/>
<reference ref="396951138"/> <reference ref="396951138"/>
<reference ref="279446133"/> <reference ref="279446133"/>
<reference ref="370408073"/>
</object> </object>
<reference key="parent" ref="1044285835"/> <reference key="parent" ref="1044285835"/>
</object> </object>
...@@ -6176,6 +6226,20 @@ ...@@ -6176,6 +6226,20 @@
<reference key="object" ref="6278927"/> <reference key="object" ref="6278927"/>
<reference key="parent" ref="899288616"/> <reference key="parent" ref="899288616"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">704</int>
<reference key="object" ref="370408073"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="496532368"/>
</object>
<reference key="parent" ref="308548124"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">705</int>
<reference key="object" ref="496532368"/>
<reference key="parent" ref="370408073"/>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
...@@ -6519,6 +6583,9 @@ ...@@ -6519,6 +6583,9 @@
<string>70.IBPluginDependency</string> <string>70.IBPluginDependency</string>
<string>70.IBViewBoundsToFrameTransform</string> <string>70.IBViewBoundsToFrameTransform</string>
<string>70.ImportedFromIB2</string> <string>70.ImportedFromIB2</string>
<string>704.IBPluginDependency</string>
<string>704.IBViewBoundsToFrameTransform</string>
<string>705.IBPluginDependency</string>
<string>71.IBPluginDependency</string> <string>71.IBPluginDependency</string>
<string>72.IBPluginDependency</string> <string>72.IBPluginDependency</string>
<string>73.IBPluginDependency</string> <string>73.IBPluginDependency</string>
...@@ -7093,6 +7160,11 @@ ...@@ -7093,6 +7160,11 @@
<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwdAAAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwdAAAA</bytes>
</object> </object>
<boolean value="YES"/> <boolean value="YES"/>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDWQAAwdgAAA</bytes>
</object>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.binarymethod.BGHUDAppKitPlugin</string> <string>com.binarymethod.BGHUDAppKitPlugin</string>
<string>com.binarymethod.BGHUDAppKitPlugin</string> <string>com.binarymethod.BGHUDAppKitPlugin</string>
...@@ -7171,7 +7243,7 @@ ...@@ -7171,7 +7243,7 @@
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">701</int> <int key="maxID">707</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
...@@ -7489,6 +7561,7 @@ ...@@ -7489,6 +7561,7 @@
<string>o_adjust_gamma_sld</string> <string>o_adjust_gamma_sld</string>
<string>o_adjust_hue_lbl</string> <string>o_adjust_hue_lbl</string>
<string>o_adjust_hue_sld</string> <string>o_adjust_hue_sld</string>
<string>o_adjust_reset_btn</string>
<string>o_adjust_saturation_lbl</string> <string>o_adjust_saturation_lbl</string>
<string>o_adjust_saturation_sld</string> <string>o_adjust_saturation_sld</string>
<string>o_banding_ckb</string> <string>o_banding_ckb</string>
...@@ -7646,6 +7719,7 @@ ...@@ -7646,6 +7719,7 @@
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="NSMutableDictionary" key="toOneOutletInfosByName">
...@@ -7674,6 +7748,7 @@ ...@@ -7674,6 +7748,7 @@
<string>o_adjust_gamma_sld</string> <string>o_adjust_gamma_sld</string>
<string>o_adjust_hue_lbl</string> <string>o_adjust_hue_lbl</string>
<string>o_adjust_hue_sld</string> <string>o_adjust_hue_sld</string>
<string>o_adjust_reset_btn</string>
<string>o_adjust_saturation_lbl</string> <string>o_adjust_saturation_lbl</string>
<string>o_adjust_saturation_sld</string> <string>o_adjust_saturation_sld</string>
<string>o_banding_ckb</string> <string>o_banding_ckb</string>
...@@ -7831,6 +7906,10 @@ ...@@ -7831,6 +7906,10 @@
<string key="name">o_adjust_hue_sld</string> <string key="name">o_adjust_hue_sld</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBToOneOutletInfo">
<string key="name">o_adjust_reset_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">o_adjust_saturation_lbl</string> <string key="name">o_adjust_saturation_lbl</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
......
modules/gui/macosx/VideoEffects.h
View file @ 36b438b5
/***************************************************************************** /*****************************************************************************
* VideoEffects.h: MacOS X interface module * VideoEffects.h: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2011 Felix Paul Kühne * Copyright (C) 2011-2012 Felix Paul Kühne
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
IBOutlet id o_adjust_saturation_sld; IBOutlet id o_adjust_saturation_sld;
IBOutlet id o_adjust_gamma_lbl; IBOutlet id o_adjust_gamma_lbl;
IBOutlet id o_adjust_gamma_sld; IBOutlet id o_adjust_gamma_sld;
IBOutlet id o_adjust_reset_btn;
IBOutlet id o_sharpen_ckb; IBOutlet id o_sharpen_ckb;
IBOutlet id o_sharpen_lbl; IBOutlet id o_sharpen_lbl;
IBOutlet id o_sharpen_sld; IBOutlet id o_sharpen_sld;
......
modules/gui/macosx/VideoEffects.m
View file @ 36b438b5
/***************************************************************************** /*****************************************************************************
* VideoEffects.m: MacOS X interface module * VideoEffects.m: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2011 Felix Paul Kühne * Copyright (C) 2011-2012 Felix Paul Kühne
* $Id$ * $Id$
* *
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org> * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
...@@ -78,6 +78,7 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -78,6 +78,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[o_adjust_brightness_ckb setTitle:_NS("Brightness Threshold")]; [o_adjust_brightness_ckb setTitle:_NS("Brightness Threshold")];
[o_adjust_saturation_lbl setStringValue:_NS("Saturation")]; [o_adjust_saturation_lbl setStringValue:_NS("Saturation")];
[o_adjust_gamma_lbl setStringValue:_NS("Gamma")]; [o_adjust_gamma_lbl setStringValue:_NS("Gamma")];
[o_adjust_reset_btn setTitle: _NS("Reset")];
[o_sharpen_ckb setTitle:_NS("Sharpen")]; [o_sharpen_ckb setTitle:_NS("Sharpen")];
[o_sharpen_lbl setStringValue:_NS("Sigma")]; [o_sharpen_lbl setStringValue:_NS("Sigma")];
[o_banding_ckb setTitle:_NS("Banding removal")]; [o_banding_ckb setTitle:_NS("Banding removal")];
...@@ -246,6 +247,7 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -246,6 +247,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[o_adjust_gamma_lbl setEnabled: b_state]; [o_adjust_gamma_lbl setEnabled: b_state];
[o_adjust_hue_lbl setEnabled: b_state]; [o_adjust_hue_lbl setEnabled: b_state];
[o_adjust_saturation_lbl setEnabled: b_state]; [o_adjust_saturation_lbl setEnabled: b_state];
[o_adjust_reset_btn setEnabled: b_state];
[o_sharpen_sld setFloatValue: config_GetFloat( p_intf, "sharpen-sigma" )]; [o_sharpen_sld setFloatValue: config_GetFloat( p_intf, "sharpen-sigma" )];
[o_sharpen_sld setEnabled: [o_sharpen_ckb state]]; [o_sharpen_sld setEnabled: [o_sharpen_ckb state]];
[o_sharpen_lbl setEnabled: [o_sharpen_ckb state]]; [o_sharpen_lbl setEnabled: [o_sharpen_ckb state]];
...@@ -572,11 +574,12 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -572,11 +574,12 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[o_adjust_hue_lbl setEnabled: b_state]; [o_adjust_hue_lbl setEnabled: b_state];
[o_adjust_saturation_sld setEnabled: b_state]; [o_adjust_saturation_sld setEnabled: b_state];
[o_adjust_saturation_lbl setEnabled: b_state]; [o_adjust_saturation_lbl setEnabled: b_state];
[o_adjust_reset_btn setEnabled: b_state];
} }
- (IBAction)adjustSliderChanged:(id)sender - (IBAction)adjustSliderChanged:(id)sender
{ {
if( sender == o_adjust_brightness_sld ) if( sender == o_adjust_brightness_sld )
[self setVideoFilterProperty: "brightness" forFilter: "adjust" float: [o_adjust_brightness_sld floatValue]]; [self setVideoFilterProperty: "brightness" forFilter: "adjust" float: [o_adjust_brightness_sld floatValue]];
else if( sender == o_adjust_contrast_sld ) else if( sender == o_adjust_contrast_sld )
[self setVideoFilterProperty: "contrast" forFilter: "adjust" float: [o_adjust_contrast_sld floatValue]]; [self setVideoFilterProperty: "contrast" forFilter: "adjust" float: [o_adjust_contrast_sld floatValue]];
...@@ -590,7 +593,21 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -590,7 +593,21 @@ static VLCVideoEffects *_o_sharedInstance = nil;
- (IBAction)enableAdjustBrightnessThreshold:(id)sender - (IBAction)enableAdjustBrightnessThreshold:(id)sender
{ {
config_PutInt( p_intf, "brightness-threshold", [o_adjust_brightness_ckb state] ); if (sender == o_adjust_reset_btn)
{
[o_adjust_brightness_sld setFloatValue: 1.0];
[o_adjust_contrast_sld setFloatValue: 1.0];
[o_adjust_gamma_sld setFloatValue: 1.0];
[o_adjust_hue_sld setIntValue: 0.0];
[o_adjust_saturation_sld setFloatValue: 1.0];
[self setVideoFilterProperty: "brightness" forFilter: "adjust" float: [o_adjust_brightness_sld floatValue]];
[self setVideoFilterProperty: "contrast" forFilter: "adjust" float: [o_adjust_contrast_sld floatValue]];
[self setVideoFilterProperty: "gamma" forFilter: "adjust" float: [o_adjust_gamma_sld floatValue]];
[self setVideoFilterProperty: "hue" forFilter: "adjust" integer: [o_adjust_hue_sld intValue]];
[self setVideoFilterProperty: "saturation" forFilter: "adjust" float: [o_adjust_saturation_sld floatValue]];
}
else
config_PutInt( p_intf, "brightness-threshold", [o_adjust_brightness_ckb state] );
} }
- (IBAction)enableSharpen:(id)sender - (IBAction)enableSharpen:(id)sender
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment