Skip to content

V
vlc-2-2
Commit 3cf913ba authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* made the method names humanally readable, fixed a minor bug and slightly reduced the panel's size

parent 07b66252
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 75 deletions
extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib
View file @ 3cf913ba
...@@ -128,18 +128,18 @@ ...@@ -128,18 +128,18 @@
}, },
{ {
ACTIONS = { ACTIONS = {
"adjImg_Enbl" = id; enableAdjustImage = id;
"adjImg_opaque" = id; enableHeadphoneVirtualizer = id;
"adjImg_rstrDefaults" = id; enableVolumeNormalization = id;
"adjImg_sliders" = id; expandAdjustImage = id;
"audFtls_hdphnVirt" = id; expandAudioFilters = id;
"audFtls_maxLevelSld" = id; expandVideoFilters = id;
"audFtls_vlmeNorm" = id; moreInfoVideoFilters = id;
"extWin_exp_adjImg" = id; opaqueSliderAction = id;
"extWin_exp_audFlts" = id; restoreDefaultsForAdjustImage = id;
"extWin_exp_vidFlts" = id; sliderActionAdjustImage = id;
vidFlts = id; sliderActionMaximumAudioLevel = id;
"vidFlts_mrInfo" = id; videoFilterAction = id;
}; };
CLASS = VLCExtended; CLASS = VLCExtended;
LANGUAGE = ObjC; LANGUAGE = ObjC;
......
extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib
View file @ 3cf913ba
...@@ -7,23 +7,23 @@ ...@@ -7,23 +7,23 @@
<key>IBEditorPositions</key> <key>IBEditorPositions</key>
<dict> <dict>
<key>13</key> <key>13</key>
<string>525 541 390 138 0 0 1440 878 </string> <string>153 575 390 138 0 0 1440 878 </string>
<key>32</key> <key>32</key>
<string>525 482 390 255 0 0 1440 878 </string> <string>525 476 390 255 0 0 1440 878 </string>
<key>5</key> <key>5</key>
<string>525 495 390 230 0 0 1440 878 </string> <string>518 235 390 230 0 0 1440 878 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>454.0</string> <string>446.1</string>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>18</integer>
<integer>32</integer>
<integer>13</integer> <integer>13</integer>
<integer>5</integer> <integer>5</integer>
<integer>18</integer>
<integer>32</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>9A321</string> <string>8P135</string>
<key>targetFramework</key> <key>targetFramework</key>
<string>IBCocoaFramework</string> <string>IBCocoaFramework</string>
</dict> </dict>
......
modules/gui/macosx/extended.h
View file @ 3cf913ba
/***************************************************************************** /*****************************************************************************
* extended.h: MacOS X Extended interface panel * extended.h: MacOS X Extended interface panel
***************************************************************************** *****************************************************************************
* Copyright (C) 2005-2006 the VideoLAN team * Copyright (C) 2005-2007 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Felix Kühne <fkuehne@users.sf.net> * Authors: Felix Paul Kühne <fkuehne@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -94,18 +94,18 @@ ...@@ -94,18 +94,18 @@
BOOL o_config_changed; BOOL o_config_changed;
} }
- (IBAction)adjImg_Enbl:(id)sender; - (IBAction)enableAdjustImage:(id)sender;
- (IBAction)adjImg_rstrDefaults:(id)sender; - (IBAction)restoreDefaultsForAdjustImage:(id)sender;
- (IBAction)adjImg_sliders:(id)sender; - (IBAction)sliderActionAdjustImage:(id)sender;
- (IBAction)adjImg_opaque:(id)sender; - (IBAction)opaqueSliderAction:(id)sender;
- (IBAction)audFtls_hdphnVirt:(id)sender; - (IBAction)enableHeadphoneVirtualizer:(id)sender;
- (IBAction)audFtls_maxLevelSld:(id)sender; - (IBAction)sliderActionMaximumAudioLevel:(id)sender;
- (IBAction)audFtls_vlmeNorm:(id)sender; - (IBAction)enableVolumeNormalization:(id)sender;
- (IBAction)extWin_exp_adjImg:(id)sender; - (IBAction)expandAdjustImage:(id)sender;
- (IBAction)extWin_exp_audFlts:(id)sender; - (IBAction)expandAudioFilters:(id)sender;
- (IBAction)extWin_exp_vidFlts:(id)sender; - (IBAction)expandVideoFilters:(id)sender;
- (IBAction)vidFlts:(id)sender; - (IBAction)videoFilterAction:(id)sender;
- (IBAction)vidFlts_mrInfo:(id)sender; - (IBAction)moreInfoVideoFilters:(id)sender;
+ (VLCExtended *)sharedInstance; + (VLCExtended *)sharedInstance;
- (BOOL)getConfigChanged; - (BOOL)getConfigChanged;
......
modules/gui/macosx/extended.m
View file @ 3cf913ba
/***************************************************************************** /*****************************************************************************
* extended.m: MacOS X Extended interface panel * extended.m: MacOS X Extended interface panel
***************************************************************************** *****************************************************************************
* Copyright (C) 2005-2006 the VideoLAN team * Copyright (C) 2005-2007 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Felix Kühne <fkuehne@users.sf.net> * Authors: Felix Paul Kühne <fkuehne@videolan.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -22,16 +22,6 @@ ...@@ -22,16 +22,6 @@
*****************************************************************************/ *****************************************************************************/
/*****************************************************************************
* Note:
* the code used to bind with VLC's modules is heavily based upon
* ../wxwidgets/extrapanel.cpp, written by Clément Stenac.
* the code used to insert/remove the views was inspired by intf.m,
* written by Derk-Jan Hartman and Benjamin Pracht.
* (all 3 are members of the VideoLAN team)
*****************************************************************************/
/***************************************************************************** /*****************************************************************************
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
...@@ -188,15 +178,15 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -188,15 +178,15 @@ static VLCExtended *_o_sharedInstance = nil;
/* collaps all views so Cocoa saves the window position correctly */ /* collaps all views so Cocoa saves the window position correctly */
if( o_adjImg_expanded ) if( o_adjImg_expanded )
{ {
[self extWin_exp_adjImg: nil]; [self expandAdjustImage: nil];
} }
if( o_audFlts_expanded ) if( o_audFlts_expanded )
{ {
[self extWin_exp_audFlts: nil]; [self expandAudioFilters: nil];
} }
if( o_vidFlts_expanded ) if( o_vidFlts_expanded )
{ {
[self extWin_exp_vidFlts: nil]; [self expandVideoFilters: nil];
} }
} }
...@@ -258,7 +248,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -258,7 +248,7 @@ static VLCExtended *_o_sharedInstance = nil;
[o_extended_window makeKeyAndOrderFront:nil]; [o_extended_window makeKeyAndOrderFront:nil];
} }
- (IBAction)adjImg_Enbl:(id)sender - (IBAction)enableAdjustImage:(id)sender
{ {
/* en-/disable the sliders */ /* en-/disable the sliders */
if ([o_ckb_enblAdjustImg state] == NSOnState) if ([o_ckb_enblAdjustImg state] == NSOnState)
...@@ -281,7 +271,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -281,7 +271,7 @@ static VLCExtended *_o_sharedInstance = nil;
} }
} }
- (IBAction)adjImg_rstrDefaults:(id)sender - (IBAction)restoreDefaultsForAdjustImage:(id)sender
{ {
/* reset the sliders */ /* reset the sliders */
[o_sld_brightness setIntValue: 100]; [o_sld_brightness setIntValue: 100];
...@@ -289,16 +279,18 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -289,16 +279,18 @@ static VLCExtended *_o_sharedInstance = nil;
[o_sld_gamma setIntValue: 10]; [o_sld_gamma setIntValue: 10];
[o_sld_hue setIntValue: 0]; [o_sld_hue setIntValue: 0];
[o_sld_saturation setIntValue: 100]; [o_sld_saturation setIntValue: 100];
[o_sld_opaque setIntValue: 100];
/* transmit the values */ /* transmit the values */
[self adjImg_sliders: o_sld_brightness]; [self sliderActionAdjustImage: o_sld_brightness];
[self adjImg_sliders: o_sld_contrast]; [self sliderActionAdjustImage: o_sld_contrast];
[self adjImg_sliders: o_sld_gamma]; [self sliderActionAdjustImage: o_sld_gamma];
[self adjImg_sliders: o_sld_hue]; [self sliderActionAdjustImage: o_sld_hue];
[self adjImg_sliders: o_sld_saturation]; [self sliderActionAdjustImage: o_sld_saturation];
[self opaqueSliderAction: o_sld_opaque];
} }
- (IBAction)adjImg_sliders:(id)sender - (IBAction)sliderActionAdjustImage:(id)sender
{ {
/* read-out the sliders' values and apply them */ /* read-out the sliders' values and apply them */
intf_thread_t * p_intf = VLCIntf; intf_thread_t * p_intf = VLCIntf;
...@@ -361,7 +353,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -361,7 +353,7 @@ static VLCExtended *_o_sharedInstance = nil;
} }
/* change the opaqueness of the vouts */ /* change the opaqueness of the vouts */
- (IBAction)adjImg_opaque:(id)sender - (IBAction)opaqueSliderAction:(id)sender
{ {
vlc_value_t val; vlc_value_t val;
id o_window = [NSApp keyWindow]; id o_window = [NSApp keyWindow];
...@@ -400,7 +392,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -400,7 +392,7 @@ static VLCExtended *_o_sharedInstance = nil;
o_config_changed = YES; o_config_changed = YES;
} }
- (IBAction)audFtls_hdphnVirt:(id)sender - (IBAction)enableHeadphoneVirtualizer:(id)sender
{ {
/* en-/disable headphone virtualisation */ /* en-/disable headphone virtualisation */
if ([o_ckb_hdphnVirt state] == NSOnState) if ([o_ckb_hdphnVirt state] == NSOnState)
...@@ -411,7 +403,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -411,7 +403,7 @@ static VLCExtended *_o_sharedInstance = nil;
} }
} }
- (IBAction)audFtls_maxLevelSld:(id)sender - (IBAction)sliderActionMaximumAudioLevel:(id)sender
{ {
/* read-out the slider's value and apply it */ /* read-out the slider's value and apply it */
intf_thread_t * p_intf = VLCIntf; intf_thread_t * p_intf = VLCIntf;
...@@ -427,7 +419,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -427,7 +419,7 @@ static VLCExtended *_o_sharedInstance = nil;
o_config_changed = YES; o_config_changed = YES;
} }
- (IBAction)audFtls_vlmeNorm:(id)sender - (IBAction)enableVolumeNormalization:(id)sender
{ {
/* en-/disable volume normalisation */ /* en-/disable volume normalisation */
if ([o_ckb_vlme_norm state] == NSOnState) if ([o_ckb_vlme_norm state] == NSOnState)
...@@ -438,7 +430,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -438,7 +430,7 @@ static VLCExtended *_o_sharedInstance = nil;
} }
} }
- (IBAction)extWin_exp_adjImg:(id)sender - (IBAction)expandAdjustImage:(id)sender
{ {
/* expand or collapse adjImg */ /* expand or collapse adjImg */
NSRect o_win_rect = [o_extended_window frame]; NSRect o_win_rect = [o_extended_window frame];
...@@ -487,7 +479,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -487,7 +479,7 @@ static VLCExtended *_o_sharedInstance = nil;
[o_box_adjImg setFrameFromContentFrame: o_box_adjImg_rect]; [o_box_adjImg setFrameFromContentFrame: o_box_adjImg_rect];
} }
- (IBAction)extWin_exp_audFlts:(id)sender - (IBAction)expandAudioFilters:(id)sender
{ {
/* expand or collapse audFlts */ /* expand or collapse audFlts */
NSRect o_win_rect = [o_extended_window frame]; NSRect o_win_rect = [o_extended_window frame];
...@@ -527,7 +519,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -527,7 +519,7 @@ static VLCExtended *_o_sharedInstance = nil;
[o_box_audFlts setFrameFromContentFrame: o_box_audFlts_rect]; [o_box_audFlts setFrameFromContentFrame: o_box_audFlts_rect];
} }
- (IBAction)extWin_exp_vidFlts:(id)sender - (IBAction)expandVideoFilters:(id)sender
{ {
/* expand or collapse vidFlts */ /* expand or collapse vidFlts */
NSRect o_win_rect = [o_extended_window frame]; NSRect o_win_rect = [o_extended_window frame];
...@@ -538,18 +530,18 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -538,18 +530,18 @@ static VLCExtended *_o_sharedInstance = nil;
{ {
/* move the window contents upwards (partially done through settings /* move the window contents upwards (partially done through settings
* inside the nib) and resize the window */ * inside the nib) and resize the window */
o_win_rect.size.height = o_win_rect.size.height - 188; o_win_rect.size.height = o_win_rect.size.height - 172;
o_win_rect.origin.y = [o_extended_window frame].origin.y + 188; o_win_rect.origin.y = [o_extended_window frame].origin.y + 172;
o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y + 188; o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y + 172;
/* remove the inserted view */ /* remove the inserted view */
[o_videoFilters_view removeFromSuperviewWithoutNeedingDisplay]; [o_videoFilters_view removeFromSuperviewWithoutNeedingDisplay];
}else{ }else{
/* move the window contents downwards and resize the window */ /* move the window contents downwards and resize the window */
o_win_rect.size.height = o_win_rect.size.height + 188; o_win_rect.size.height = o_win_rect.size.height + 172;
o_win_rect.origin.y = [o_extended_window frame].origin.y - 188; o_win_rect.origin.y = [o_extended_window frame].origin.y - 172;
o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y - 188; o_box_audFlts_rect.origin.y = o_box_audFlts_rect.origin.y - 172;
} }
[o_box_audFlts setFrameFromContentFrame: o_box_audFlts_rect]; [o_box_audFlts setFrameFromContentFrame: o_box_audFlts_rect];
...@@ -558,12 +550,12 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -558,12 +550,12 @@ static VLCExtended *_o_sharedInstance = nil;
if (o_vidFlts_expanded) if (o_vidFlts_expanded)
{ {
o_box_vidFlts_rect.size.height = [o_box_vidFlts frame].size.height - 188; o_box_vidFlts_rect.size.height = [o_box_vidFlts frame].size.height - 172;
o_vidFlts_expanded = NO; o_vidFlts_expanded = NO;
} else { } else {
/* insert view */ /* insert view */
o_box_vidFlts_rect.size.height = [o_box_vidFlts frame].size.height + 188; o_box_vidFlts_rect.size.height = [o_box_vidFlts frame].size.height + 172;
[o_videoFilters_view setFrame: NSMakeRect( 20, -10, 370, 188)]; [o_videoFilters_view setFrame: NSMakeRect( 20, -10, 370, 172)];
[o_videoFilters_view setNeedsDisplay:YES]; [o_videoFilters_view setNeedsDisplay:YES];
[o_videoFilters_view setAutoresizesSubviews: YES]; [o_videoFilters_view setAutoresizesSubviews: YES];
[[o_box_vidFlts contentView] addSubview: o_videoFilters_view]; [[o_box_vidFlts contentView] addSubview: o_videoFilters_view];
...@@ -572,7 +564,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -572,7 +564,7 @@ static VLCExtended *_o_sharedInstance = nil;
[o_box_vidFlts setFrameFromContentFrame: o_box_vidFlts_rect]; [o_box_vidFlts setFrameFromContentFrame: o_box_vidFlts_rect];
} }
- (IBAction)vidFlts:(id)sender - (IBAction)videoFilterAction:(id)sender
{ {
/* en-/disable video filters */ /* en-/disable video filters */
if (sender == o_ckb_blur) if (sender == o_ckb_blur)
...@@ -607,11 +599,11 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -607,11 +599,11 @@ static VLCExtended *_o_sharedInstance = nil;
else { else {
/* this shouldn't happen */ /* this shouldn't happen */
msg_Warn (VLCIntf, "cannot find switched video-filter"); msg_Err( VLCIntf, "cannot find switched video-filter" );
} }
} }
- (IBAction)vidFlts_mrInfo:(id)sender - (IBAction)moreInfoVideoFilters:(id)sender
{ {
/* show info sheet */ /* show info sheet */
NSBeginInformationalAlertSheet(_NS("About the video filters"), _NS("OK"), @"", @"", NSBeginInformationalAlertSheet(_NS("About the video filters"), _NS("OK"), @"", @"",
......
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