Skip to content

V
vlc
Commit cec394f2 authored by David Fuhrmann's avatar David Fuhrmann
Browse files
Options

macosx: remove obsolete puzzle black box checkbox

parent 6c3f3309
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 91 deletions
extras/package/macosx/Resources/English.lproj/VideoEffects.xib
View file @ cec394f2
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data> <data>
<int key="IBDocument.SystemTarget">1050</int> <int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">12C60</string> <string key="IBDocument.SystemVersion">12D78</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string> <string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1187.34</string> <string key="IBDocument.AppKitVersion">1187.37</string>
<string key="IBDocument.HIToolboxVersion">625.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
...@@ -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="1"/> <integer value="9"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -1456,35 +1456,10 @@ ...@@ -1456,35 +1456,10 @@
<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>
<object class="NSButton" id="268273719">
<reference key="NSNextResponder" ref="390350599"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 12}, {271, 18}}</string>
<reference key="NSSuperview" ref="390350599"/>
<bool key="NSEnabled">YES</bool>
<object class="BGHUDButtonCell" key="NSCell" id="825848151">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">Black Slot</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="268273719"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="908559007"/>
<reference key="NSAlternateImage" ref="223641879"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
<string key="themeKey">gradientTheme</string>
<int key="BGButtonType">3</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="357710165"> <object class="NSTextField" id="357710165">
<reference key="NSNextResponder" ref="390350599"/> <reference key="NSNextResponder" ref="390350599"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{170, 70}, {96, 19}}</string> <string key="NSFrame">{{170, 41}, {96, 19}}</string>
<reference key="NSSuperview" ref="390350599"/> <reference key="NSSuperview" ref="390350599"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="BGHUDTextFieldCell" key="NSCell" id="371370652"> <object class="BGHUDTextFieldCell" key="NSCell" id="371370652">
...@@ -1562,7 +1537,7 @@ ...@@ -1562,7 +1537,7 @@
<object class="NSStepper" id="444599762"> <object class="NSStepper" id="444599762">
<reference key="NSNextResponder" ref="390350599"/> <reference key="NSNextResponder" ref="390350599"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{271, 68}, {15, 22}}</string> <string key="NSFrame">{{271, 39}, {15, 22}}</string>
<reference key="NSSuperview" ref="390350599"/> <reference key="NSSuperview" ref="390350599"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="BGHUDStepperCell" key="NSCell" id="45229381"> <object class="BGHUDStepperCell" key="NSCell" id="45229381">
...@@ -1581,7 +1556,7 @@ ...@@ -1581,7 +1556,7 @@
<object class="BGHUDLabel" id="422916449"> <object class="BGHUDLabel" id="422916449">
<reference key="NSNextResponder" ref="390350599"/> <reference key="NSNextResponder" ref="390350599"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 73}, {86, 14}}</string> <string key="NSFrame">{{15, 44}, {86, 14}}</string>
<reference key="NSSuperview" ref="390350599"/> <reference key="NSSuperview" ref="390350599"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="149241228"> <object class="NSTextFieldCell" key="NSCell" id="149241228">
...@@ -1599,7 +1574,7 @@ ...@@ -1599,7 +1574,7 @@
<object class="NSTextField" id="227755793"> <object class="NSTextField" id="227755793">
<reference key="NSNextResponder" ref="390350599"/> <reference key="NSNextResponder" ref="390350599"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{170, 43}, {96, 19}}</string> <string key="NSFrame">{{170, 14}, {96, 19}}</string>
<reference key="NSSuperview" ref="390350599"/> <reference key="NSSuperview" ref="390350599"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="BGHUDTextFieldCell" key="NSCell" id="54082411"> <object class="BGHUDTextFieldCell" key="NSCell" id="54082411">
...@@ -1675,7 +1650,7 @@ ...@@ -1675,7 +1650,7 @@
<object class="NSStepper" id="814287388"> <object class="NSStepper" id="814287388">
<reference key="NSNextResponder" ref="390350599"/> <reference key="NSNextResponder" ref="390350599"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{271, 41}, {15, 22}}</string> <string key="NSFrame">{{271, 12}, {15, 22}}</string>
<reference key="NSSuperview" ref="390350599"/> <reference key="NSSuperview" ref="390350599"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="BGHUDStepperCell" key="NSCell" id="267728995"> <object class="BGHUDStepperCell" key="NSCell" id="267728995">
...@@ -1694,7 +1669,7 @@ ...@@ -1694,7 +1669,7 @@
<object class="BGHUDLabel" id="56743507"> <object class="BGHUDLabel" id="56743507">
<reference key="NSNextResponder" ref="390350599"/> <reference key="NSNextResponder" ref="390350599"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 46}, {86, 14}}</string> <string key="NSFrame">{{15, 17}, {86, 14}}</string>
<reference key="NSSuperview" ref="390350599"/> <reference key="NSSuperview" ref="390350599"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="588626332"> <object class="NSTextFieldCell" key="NSCell" id="588626332">
...@@ -1710,11 +1685,11 @@ ...@@ -1710,11 +1685,11 @@
<string key="themeKey">gradientTheme</string> <string key="themeKey">gradientTheme</string>
</object> </object>
</object> </object>
<string key="NSFrame">{{1, 1}, {308, 101}}</string> <string key="NSFrame">{{1, 1}, {308, 72}}</string>
<reference key="NSSuperview" ref="915406024"/> <reference key="NSSuperview" ref="915406024"/>
</object> </object>
</object> </object>
<string key="NSFrame">{{320, 77}, {310, 103}}</string> <string key="NSFrame">{{320, 106}, {310, 74}}</string>
<reference key="NSSuperview" ref="934925915"/> <reference key="NSSuperview" ref="934925915"/>
<string key="NSOffsets">{0, 0}</string> <string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell"> <object class="NSTextFieldCell" key="NSTitleCell">
...@@ -2031,7 +2006,7 @@ ...@@ -2031,7 +2006,7 @@
<object class="NSButton" id="415395095"> <object class="NSButton" id="415395095">
<reference key="NSNextResponder" ref="934925915"/> <reference key="NSNextResponder" ref="934925915"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{320, 57}, {170, 18}}</string> <string key="NSFrame">{{320, 84}, {170, 18}}</string>
<reference key="NSSuperview" ref="934925915"/> <reference key="NSSuperview" ref="934925915"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="BGHUDButtonCell" key="NSCell" id="453694164"> <object class="BGHUDButtonCell" key="NSCell" id="453694164">
...@@ -2183,7 +2158,7 @@ ...@@ -2183,7 +2158,7 @@
<reference key="NSSuperview" ref="1040338176"/> <reference key="NSSuperview" ref="1040338176"/>
</object> </object>
</object> </object>
<string key="NSFrame">{{320, 12}, {310, 47}}</string> <string key="NSFrame">{{320, 39}, {310, 47}}</string>
<reference key="NSSuperview" ref="934925915"/> <reference key="NSSuperview" ref="934925915"/>
<string key="NSOffsets">{0, 0}</string> <string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell"> <object class="NSTextFieldCell" key="NSTitleCell">
...@@ -4258,14 +4233,6 @@ ...@@ -4258,14 +4233,6 @@
</object> </object>
<int key="connectionID">545</int> <int key="connectionID">545</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_puzzle_blackslot_ckb</string>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="268273719"/>
</object>
<int key="connectionID">546</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">o_puzzle_ckb</string> <string key="label">o_puzzle_ckb</string>
...@@ -4754,14 +4721,6 @@ ...@@ -4754,14 +4721,6 @@
</object> </object>
<int key="connectionID">627</int> <int key="connectionID">627</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">puzzleModifierChanged:</string>
<reference key="source" ref="707254443"/>
<reference key="destination" ref="268273719"/>
</object>
<int key="connectionID">628</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">sepiaModifierChanged:</string> <string key="label">sepiaModifierChanged:</string>
...@@ -5769,10 +5728,10 @@ ...@@ -5769,10 +5728,10 @@
<reference ref="351076845"/> <reference ref="351076845"/>
<reference ref="322802751"/> <reference ref="322802751"/>
<reference ref="767337060"/> <reference ref="767337060"/>
<reference ref="415395095"/>
<reference ref="1040338176"/>
<reference ref="1038213364"/> <reference ref="1038213364"/>
<reference ref="292241539"/> <reference ref="292241539"/>
<reference ref="415395095"/>
<reference ref="1040338176"/>
</object> </object>
<reference key="parent" ref="160045531"/> <reference key="parent" ref="160045531"/>
</object> </object>
...@@ -6446,7 +6405,6 @@ ...@@ -6446,7 +6405,6 @@
<reference key="object" ref="915406024"/> <reference key="object" ref="915406024"/>
<object class="NSMutableArray" key="children"> <object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="268273719"/>
<reference ref="357710165"/> <reference ref="357710165"/>
<reference ref="444599762"/> <reference ref="444599762"/>
<reference ref="422916449"/> <reference ref="422916449"/>
...@@ -6461,20 +6419,6 @@ ...@@ -6461,20 +6419,6 @@
<reference key="object" ref="795958519"/> <reference key="object" ref="795958519"/>
<reference key="parent" ref="36160666"/> <reference key="parent" ref="36160666"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">136</int>
<reference key="object" ref="268273719"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="825848151"/>
</object>
<reference key="parent" ref="915406024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">137</int>
<reference key="object" ref="825848151"/>
<reference key="parent" ref="268273719"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">138</int> <int key="objectID">138</int>
<reference key="object" ref="357710165"/> <reference key="object" ref="357710165"/>
...@@ -7791,9 +7735,6 @@ ...@@ -7791,9 +7735,6 @@
<string>124.IBViewBoundsToFrameTransform</string> <string>124.IBViewBoundsToFrameTransform</string>
<string>129.IBPluginDependency</string> <string>129.IBPluginDependency</string>
<string>13.IBPluginDependency</string> <string>13.IBPluginDependency</string>
<string>136.IBPluginDependency</string>
<string>136.IBViewBoundsToFrameTransform</string>
<string>137.IBPluginDependency</string>
<string>138.IBPluginDependency</string> <string>138.IBPluginDependency</string>
<string>138.IBViewBoundsToFrameTransform</string> <string>138.IBViewBoundsToFrameTransform</string>
<string>139.IBPluginDependency</string> <string>139.IBPluginDependency</string>
...@@ -8252,11 +8193,6 @@ ...@@ -8252,11 +8193,6 @@
<string>com.binarymethod.BGHUDAppKitPlugin</string> <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>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwhgAAA</bytes>
</object>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDKgAAwq4AAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABDKgAAwq4AAA</bytes>
</object> </object>
...@@ -8745,12 +8681,12 @@ ...@@ -8745,12 +8681,12 @@
<string>com.binarymethod.BGHUDAppKitPlugin</string> <string>com.binarymethod.BGHUDAppKitPlugin</string>
<string>com.binarymethod.BGHUDAppKitPlugin</string> <string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBAAAAwtAAAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABDoAAAwqgAAA</bytes>
</object> </object>
<string>com.binarymethod.BGHUDAppKitPlugin</string> <string>com.binarymethod.BGHUDAppKitPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUEAAABCLAAAA</bytes> <bytes key="NSTransformStruct">AUOgAABBuAAAA</bytes>
</object> </object>
<string>com.binarymethod.BGHUDAppKitPlugin</string> <string>com.binarymethod.BGHUDAppKitPlugin</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
......
modules/gui/macosx/VideoEffects.h
View file @ cec394f2
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
IBOutlet id o_puzzle_columns_lbl; IBOutlet id o_puzzle_columns_lbl;
IBOutlet id o_puzzle_columns_fld; IBOutlet id o_puzzle_columns_fld;
IBOutlet id o_puzzle_columns_stp; IBOutlet id o_puzzle_columns_stp;
IBOutlet id o_puzzle_blackslot_ckb;
IBOutlet id o_clone_ckb; IBOutlet id o_clone_ckb;
IBOutlet id o_clone_number_fld; IBOutlet id o_clone_number_fld;
IBOutlet id o_clone_number_stp; IBOutlet id o_clone_number_stp;
......
modules/gui/macosx/VideoEffects.m
View file @ cec394f2
...@@ -124,7 +124,6 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -124,7 +124,6 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[o_puzzle_ckb setTitle:_NS("Puzzle game")]; [o_puzzle_ckb setTitle:_NS("Puzzle game")];
[o_puzzle_rows_lbl setStringValue:_NS("Rows")]; [o_puzzle_rows_lbl setStringValue:_NS("Rows")];
[o_puzzle_columns_lbl setStringValue:_NS("Columns")]; [o_puzzle_columns_lbl setStringValue:_NS("Columns")];
[o_puzzle_blackslot_ckb setTitle:_NS("Black Slot")];
[o_clone_ckb setTitle:_NS("Clone")]; [o_clone_ckb setTitle:_NS("Clone")];
[o_clone_number_lbl setStringValue:_NS("Number of clones")]; [o_clone_number_lbl setStringValue:_NS("Number of clones")];
[o_wall_ckb setTitle:_NS("Wall")]; [o_wall_ckb setTitle:_NS("Wall")];
...@@ -378,7 +377,6 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -378,7 +377,6 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[self setPuzzleColumnsValue: config_GetInt(p_intf, "puzzle-cols")]; [self setPuzzleColumnsValue: config_GetInt(p_intf, "puzzle-cols")];
[self setPuzzleRowsValue: config_GetInt(p_intf, "puzzle-rows")]; [self setPuzzleRowsValue: config_GetInt(p_intf, "puzzle-rows")];
[o_puzzle_blackslot_ckb setState: config_GetInt(p_intf, "puzzle-black-slot")];
b_state = [o_puzzle_ckb state]; b_state = [o_puzzle_ckb state];
[o_puzzle_rows_fld setEnabled: b_state]; [o_puzzle_rows_fld setEnabled: b_state];
[o_puzzle_rows_stp setEnabled: b_state]; [o_puzzle_rows_stp setEnabled: b_state];
...@@ -386,8 +384,7 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -386,8 +384,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[o_puzzle_columns_fld setEnabled: b_state]; [o_puzzle_columns_fld setEnabled: b_state];
[o_puzzle_columns_stp setEnabled: b_state]; [o_puzzle_columns_stp setEnabled: b_state];
[o_puzzle_columns_lbl setEnabled: b_state]; [o_puzzle_columns_lbl setEnabled: b_state];
[o_puzzle_blackslot_ckb setEnabled: b_state];
[self setCloneValue: config_GetInt(p_intf, "clone-count")]; [self setCloneValue: config_GetInt(p_intf, "clone-count")];
b_state = [o_clone_ckb state]; b_state = [o_clone_ckb state];
[o_clone_number_lbl setEnabled: b_state]; [o_clone_number_lbl setEnabled: b_state];
...@@ -1115,14 +1112,11 @@ static VLCVideoEffects *_o_sharedInstance = nil; ...@@ -1115,14 +1112,11 @@ static VLCVideoEffects *_o_sharedInstance = nil;
[o_puzzle_rows_fld setEnabled: b_state]; [o_puzzle_rows_fld setEnabled: b_state];
[o_puzzle_rows_stp setEnabled: b_state]; [o_puzzle_rows_stp setEnabled: b_state];
[o_puzzle_rows_lbl setEnabled: b_state]; [o_puzzle_rows_lbl setEnabled: b_state];
[o_puzzle_blackslot_ckb setEnabled: b_state];
} }
- (IBAction)puzzleModifierChanged:(id)sender - (IBAction)puzzleModifierChanged:(id)sender
{ {
if (sender == o_puzzle_blackslot_ckb) if (sender == o_puzzle_columns_fld || sender == o_puzzle_columns_stp)
[self setVideoFilterProperty: "puzzle-black-slot" forFilter: "puzzle" boolean: [o_puzzle_blackslot_ckb state]];
else if (sender == o_puzzle_columns_fld || sender == o_puzzle_columns_stp)
[self setVideoFilterProperty: "puzzle-cols" forFilter: "puzzle" integer: [sender intValue]]; [self setVideoFilterProperty: "puzzle-cols" forFilter: "puzzle" integer: [sender intValue]];
else else
[self setVideoFilterProperty: "puzzle-rows" forFilter: "puzzle" integer: [sender intValue]]; [self setVideoFilterProperty: "puzzle-rows" forFilter: "puzzle" integer: [sender intValue]];
......
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