mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-04 09:11:33 +02:00
macosx: removed 'erase logo' from the video effects panel and moved 'add logo' to the overlay stuff (now called Miscellaneous)
This commit is contained in:
parent
a3be47c3a0
commit
6e18f20803
File diff suppressed because it is too large
Load Diff
@ -110,7 +110,7 @@
|
||||
IBOutlet id o_waves_ckb;
|
||||
IBOutlet id o_psychedelic_ckb;
|
||||
|
||||
/* video output & overlay */
|
||||
/* misc */
|
||||
IBOutlet id o_clone_ckb;
|
||||
IBOutlet id o_clone_lbl;
|
||||
IBOutlet id o_clone_fld;
|
||||
@ -119,8 +119,6 @@
|
||||
IBOutlet id o_addtext_text_lbl;
|
||||
IBOutlet id o_addtext_pos_lbl;
|
||||
IBOutlet id o_addtext_pos_pop;
|
||||
|
||||
/* Logo */
|
||||
IBOutlet id o_addlogo_ckb;
|
||||
IBOutlet id o_addlogo_logo_lbl;
|
||||
IBOutlet id o_addlogo_logo_fld;
|
||||
@ -130,13 +128,6 @@
|
||||
IBOutlet id o_addlogo_left_fld;
|
||||
IBOutlet id o_addlogo_transparency_lbl;
|
||||
IBOutlet id o_addlogo_transparency_sld;
|
||||
IBOutlet id o_eraselogo_ckb;
|
||||
IBOutlet id o_eraselogo_mask_lbl;
|
||||
IBOutlet id o_eraselogo_mask_fld;
|
||||
IBOutlet id o_eraselogo_top_lbl;
|
||||
IBOutlet id o_eraselogo_top_fld;
|
||||
IBOutlet id o_eraselogo_left_lbl;
|
||||
IBOutlet id o_eraselogo_left_fld;
|
||||
}
|
||||
|
||||
/* generic */
|
||||
@ -190,15 +181,11 @@
|
||||
- (IBAction)enableWaves:(id)sender;
|
||||
- (IBAction)enablePsychedelic:(id)sender;
|
||||
|
||||
/* video output & overlay */
|
||||
/* miscellaneous */
|
||||
- (IBAction)enableClone:(id)sender;
|
||||
- (IBAction)cloneModifierChanged:(id)sender;
|
||||
- (IBAction)enableAddText:(id)sender;
|
||||
- (IBAction)addTextModifierChanged:(id)sender;
|
||||
|
||||
/* logo */
|
||||
- (IBAction)enableAddLogo:(id)sender;
|
||||
- (IBAction)addLogoModifierChanged:(id)sender;
|
||||
- (IBAction)enableEraseLogo:(id)sender;
|
||||
- (IBAction)eraseLogoModifierChanged:(id)sender;
|
||||
@end
|
@ -68,8 +68,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
|
||||
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"crop"]] setLabel:_NS("Crop")];
|
||||
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"geometry"]] setLabel:_NS("Geometry")];
|
||||
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"color"]] setLabel:_NS("Color")];
|
||||
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"overlay"]] setLabel:_NS("Video output/Overlay")];
|
||||
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"logo"]] setLabel:_NS("Logo")];
|
||||
[[o_tableView tabViewItemAtIndex:[o_tableView indexOfTabViewItemWithIdentifier:@"misc"]] setLabel:_NS("Miscellaneous")];
|
||||
|
||||
[o_adjust_ckb setTitle:_NS("Image Adjust")];
|
||||
[o_adjust_hue_lbl setStringValue:_NS("Hue")];
|
||||
@ -164,16 +163,11 @@ static VLCVideoEffects *_o_sharedInstance = nil;
|
||||
[[o_addtext_pos_pop lastItem] setTag: 9];
|
||||
[o_addtext_pos_pop addItemWithTitle: _NS("Bottom-Right")];
|
||||
[[o_addtext_pos_pop lastItem] setTag: 10];
|
||||
|
||||
[o_addlogo_ckb setTitle:_NS("Add logo")];
|
||||
[o_addlogo_logo_lbl setStringValue:_NS("Logo")];
|
||||
[o_addlogo_top_lbl setStringValue:_NS("Top")];
|
||||
[o_addlogo_left_lbl setStringValue:_NS("Left")];
|
||||
[o_addlogo_transparency_lbl setStringValue:_NS("Transparency")];
|
||||
[o_eraselogo_ckb setTitle:_NS("Logo erase")];
|
||||
[o_eraselogo_mask_lbl setStringValue:_NS("Mask")];
|
||||
[o_eraselogo_top_lbl setStringValue:_NS("Top")];
|
||||
[o_eraselogo_left_lbl setStringValue:_NS("Left")];
|
||||
|
||||
[o_tableView selectFirstTabViewItem:self];
|
||||
|
||||
@ -337,20 +331,6 @@ static VLCVideoEffects *_o_sharedInstance = nil;
|
||||
[o_addlogo_top_lbl setEnabled: [o_addlogo_ckb state]];
|
||||
[o_addlogo_transparency_sld setEnabled: [o_addlogo_ckb state]];
|
||||
[o_addlogo_transparency_lbl setEnabled: [o_addlogo_ckb state]];
|
||||
tmpChar = config_GetPsz( p_intf, "erase-mask" );
|
||||
if( tmpChar )
|
||||
{
|
||||
[o_eraselogo_mask_fld setStringValue: [NSString stringWithUTF8String: tmpChar]];
|
||||
FREENULL( tmpChar );
|
||||
}
|
||||
[o_eraselogo_top_fld setIntValue: config_GetInt( p_intf, "erase-x" )];
|
||||
[o_eraselogo_left_fld setIntValue: config_GetInt( p_intf, "erase-y" )];
|
||||
[o_eraselogo_mask_fld setEnabled: [o_eraselogo_ckb state]];
|
||||
[o_eraselogo_mask_lbl setEnabled: [o_eraselogo_ckb state]];
|
||||
[o_eraselogo_left_fld setEnabled: [o_eraselogo_ckb state]];
|
||||
[o_eraselogo_left_lbl setEnabled: [o_eraselogo_ckb state]];
|
||||
[o_eraselogo_top_fld setEnabled: [o_eraselogo_ckb state]];
|
||||
[o_eraselogo_top_lbl setEnabled: [o_eraselogo_ckb state]];
|
||||
}
|
||||
|
||||
- (void)setVideoFilter: (char *)psz_name on:(BOOL)b_on
|
||||
@ -776,7 +756,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
|
||||
|
||||
|
||||
#pragma mark -
|
||||
#pragma mark video output & overlay
|
||||
#pragma mark Miscellaneous
|
||||
- (IBAction)enableClone:(id)sender
|
||||
{
|
||||
msg_Dbg( p_intf, "not yet implemented" );
|
||||
@ -797,9 +777,6 @@ static VLCVideoEffects *_o_sharedInstance = nil;
|
||||
msg_Dbg( p_intf, "not yet implemented" );
|
||||
}
|
||||
|
||||
|
||||
#pragma mark -
|
||||
#pragma mark logo
|
||||
- (IBAction)enableAddLogo:(id)sender
|
||||
{
|
||||
msg_Dbg( p_intf, "not yet implemented" );
|
||||
@ -810,15 +787,4 @@ static VLCVideoEffects *_o_sharedInstance = nil;
|
||||
msg_Dbg( p_intf, "not yet implemented" );
|
||||
}
|
||||
|
||||
- (IBAction)enableEraseLogo:(id)sender
|
||||
{
|
||||
msg_Dbg( p_intf, "not yet implemented" );
|
||||
}
|
||||
|
||||
- (IBAction)eraseLogoModifierChanged:(id)sender
|
||||
{
|
||||
msg_Dbg( p_intf, "not yet implemented" );
|
||||
}
|
||||
|
||||
|
||||
@end
|
Loading…
Reference in New Issue
Block a user