From cec394f2a8b583dd78187187c2e45dcbc194f456 Mon Sep 17 00:00:00 2001 From: David Fuhrmann Date: Tue, 30 Apr 2013 21:34:14 +0200 Subject: [PATCH] macosx: remove obsolete puzzle black box checkbox --- .../Resources/English.lproj/VideoEffects.xib | 100 ++++-------------- modules/gui/macosx/VideoEffects.h | 1 - modules/gui/macosx/VideoEffects.m | 10 +- 3 files changed, 20 insertions(+), 91 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/VideoEffects.xib b/extras/package/macosx/Resources/English.lproj/VideoEffects.xib index 60330c1cd7..3fa0527891 100644 --- a/extras/package/macosx/Resources/English.lproj/VideoEffects.xib +++ b/extras/package/macosx/Resources/English.lproj/VideoEffects.xib @@ -2,10 +2,10 @@ 1050 - 12C60 + 12D78 851 - 1187.34 - 625.00 + 1187.37 + 626.00 YES @@ -21,7 +21,7 @@ YES - + YES @@ -1456,35 +1456,10 @@ 274 YES - - - 268 - {{15, 12}, {271, 18}} - - YES - - 67108864 - 131072 - Black Slot - - - 1211912448 - 2 - - - - - 200 - 25 - gradientTheme - 3 - - NO - 268 - {{170, 70}, {96, 19}} + {{170, 41}, {96, 19}} YES @@ -1562,7 +1537,7 @@ 268 - {{271, 68}, {15, 22}} + {{271, 39}, {15, 22}} YES @@ -1581,7 +1556,7 @@ 268 - {{15, 73}, {86, 14}} + {{15, 44}, {86, 14}} YES @@ -1599,7 +1574,7 @@ 268 - {{170, 43}, {96, 19}} + {{170, 14}, {96, 19}} YES @@ -1675,7 +1650,7 @@ 268 - {{271, 41}, {15, 22}} + {{271, 12}, {15, 22}} YES @@ -1694,7 +1669,7 @@ 268 - {{15, 46}, {86, 14}} + {{15, 17}, {86, 14}} YES @@ -1710,11 +1685,11 @@ gradientTheme - {{1, 1}, {308, 101}} + {{1, 1}, {308, 72}} - {{320, 77}, {310, 103}} + {{320, 106}, {310, 74}} {0, 0} @@ -2031,7 +2006,7 @@ 268 - {{320, 57}, {170, 18}} + {{320, 84}, {170, 18}} YES @@ -2183,7 +2158,7 @@ - {{320, 12}, {310, 47}} + {{320, 39}, {310, 47}} {0, 0} @@ -4258,14 +4233,6 @@ 545 - - - o_puzzle_blackslot_ckb - - - - 546 - o_puzzle_ckb @@ -4754,14 +4721,6 @@ 627 - - - puzzleModifierChanged: - - - - 628 - sepiaModifierChanged: @@ -5769,10 +5728,10 @@ - - + + @@ -6446,7 +6405,6 @@ YES - @@ -6461,20 +6419,6 @@ - - 136 - - - YES - - - - - - 137 - - - 138 @@ -7791,9 +7735,6 @@ 124.IBViewBoundsToFrameTransform 129.IBPluginDependency 13.IBPluginDependency - 136.IBPluginDependency - 136.IBViewBoundsToFrameTransform - 137.IBPluginDependency 138.IBPluginDependency 138.IBViewBoundsToFrameTransform 139.IBPluginDependency @@ -8252,11 +8193,6 @@ com.binarymethod.BGHUDAppKitPlugin com.apple.InterfaceBuilder.CocoaPlugin com.binarymethod.BGHUDAppKitPlugin - - P4AAAL+AAABBcAAAwhgAAA - - com.binarymethod.BGHUDAppKitPlugin - com.binarymethod.BGHUDAppKitPlugin P4AAAL+AAABDKgAAwq4AAA @@ -8745,12 +8681,12 @@ com.binarymethod.BGHUDAppKitPlugin com.binarymethod.BGHUDAppKitPlugin - P4AAAL+AAABBAAAAwtAAAA + P4AAAL+AAABDoAAAwqgAAA com.binarymethod.BGHUDAppKitPlugin com.apple.InterfaceBuilder.CocoaPlugin - AUEAAABCLAAAA + AUOgAABBuAAAA com.binarymethod.BGHUDAppKitPlugin diff --git a/modules/gui/macosx/VideoEffects.h b/modules/gui/macosx/VideoEffects.h index 1355cff943..8b383cf8d4 100644 --- a/modules/gui/macosx/VideoEffects.h +++ b/modules/gui/macosx/VideoEffects.h @@ -82,7 +82,6 @@ IBOutlet id o_puzzle_columns_lbl; IBOutlet id o_puzzle_columns_fld; IBOutlet id o_puzzle_columns_stp; - IBOutlet id o_puzzle_blackslot_ckb; IBOutlet id o_clone_ckb; IBOutlet id o_clone_number_fld; IBOutlet id o_clone_number_stp; diff --git a/modules/gui/macosx/VideoEffects.m b/modules/gui/macosx/VideoEffects.m index 3ed1eea010..45e0168347 100644 --- a/modules/gui/macosx/VideoEffects.m +++ b/modules/gui/macosx/VideoEffects.m @@ -124,7 +124,6 @@ static VLCVideoEffects *_o_sharedInstance = nil; [o_puzzle_ckb setTitle:_NS("Puzzle game")]; [o_puzzle_rows_lbl setStringValue:_NS("Rows")]; [o_puzzle_columns_lbl setStringValue:_NS("Columns")]; - [o_puzzle_blackslot_ckb setTitle:_NS("Black Slot")]; [o_clone_ckb setTitle:_NS("Clone")]; [o_clone_number_lbl setStringValue:_NS("Number of clones")]; [o_wall_ckb setTitle:_NS("Wall")]; @@ -378,7 +377,6 @@ static VLCVideoEffects *_o_sharedInstance = nil; [self setPuzzleColumnsValue: config_GetInt(p_intf, "puzzle-cols")]; [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]; [o_puzzle_rows_fld setEnabled: b_state]; [o_puzzle_rows_stp setEnabled: b_state]; @@ -386,8 +384,7 @@ static VLCVideoEffects *_o_sharedInstance = nil; [o_puzzle_columns_fld setEnabled: b_state]; [o_puzzle_columns_stp 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")]; b_state = [o_clone_ckb state]; [o_clone_number_lbl setEnabled: b_state]; @@ -1115,14 +1112,11 @@ static VLCVideoEffects *_o_sharedInstance = nil; [o_puzzle_rows_fld setEnabled: b_state]; [o_puzzle_rows_stp setEnabled: b_state]; [o_puzzle_rows_lbl setEnabled: b_state]; - [o_puzzle_blackslot_ckb setEnabled: b_state]; } - (IBAction)puzzleModifierChanged:(id)sender { - if (sender == o_puzzle_blackslot_ckb) - [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) + if (sender == o_puzzle_columns_fld || sender == o_puzzle_columns_stp) [self setVideoFilterProperty: "puzzle-cols" forFilter: "puzzle" integer: [sender intValue]]; else [self setVideoFilterProperty: "puzzle-rows" forFilter: "puzzle" integer: [sender intValue]]; -- 2.39.5