}
p_item = p_parser->p_config;
int i = 0;
- int i_yPos = -2;
- int i_lastItem = 0;
p_item = p_parser->p_config + 1;
fprintf( stderr, "skipping hint usage\n" );
break;
default:
-fprintf( stderr, "%s (%d) is ", p_item->psz_name, p_item->i_type );
+fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type );
{
VLCConfigControl *o_control = nil;
- int i_widget = 0;
- switch( p_item->i_type )
+ o_control = [VLCConfigControl newControl:p_item
+ withView:o_view];
+ if( o_control != nil )
{
- case CONFIG_ITEM_STRING:
-fprintf( stderr, "CONFIG_ITEM_STRING" );
- if( !p_item->i_list )
- i_widget = CONFIG_ITEM_STRING;
- else
- i_widget = CONFIG_ITEM_STRING_LIST;
- break;
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_DIRECTORY:
-fprintf( stderr, "CONFIG_ITEM_FILE" );
- i_widget = CONFIG_ITEM_FILE;
- break;
- case CONFIG_ITEM_MODULE:
- case CONFIG_ITEM_MODULE_CAT:
-fprintf( stderr, "CONFIG_ITEM_MODULE" );
- i_widget = CONFIG_ITEM_MODULE;
- break;
- case CONFIG_ITEM_INTEGER:
-fprintf( stderr, "CONFIG_ITEM_INTEGER" );
- if( p_item->i_list )
- i_widget = CONFIG_ITEM_STRING_LIST;
- else if( p_item->i_min != 0 || p_item->i_max != 0 )
- i_widget = CONFIG_ITEM_RANGED_INTEGER;
- else
- i_widget = CONFIG_ITEM_INTEGER;
- break;
- case CONFIG_ITEM_FLOAT:
-fprintf( stderr, "CONFIG_ITEM_FLOAT" );
- if( p_item->f_min != 0 || p_item->f_max != 0 )
- i_widget = CONFIG_ITEM_RANGED_INTEGER;
- else
- i_widget = CONFIG_ITEM_INTEGER;
- break;
- case CONFIG_ITEM_BOOL:
-fprintf( stderr, "CONFIG_ITEM_BOOL" );
- i_widget = CONFIG_ITEM_BOOL;
- break;
- case CONFIG_ITEM_KEY:
-fprintf( stderr, "CONFIG_ITEM_KEY" );
- if( MACOS_VERSION < 10.3 )
- i_widget = CONFIG_ITEM_KEY_BEFORE_10_3;
- else
- i_widget = CONFIG_ITEM_KEY_AFTER_10_3;
- break;
- case CONFIG_ITEM_MODULE_LIST:
- case CONFIG_ITEM_MODULE_LIST_CAT:
-fprintf( stderr, "CONFIG_ITEM_MODULE_LIST" );
- i_widget = CONFIG_ITEM_MODULE_LIST;
- break;
- default:
-fprintf( stderr, "***UNKNOWN***" );
- }
- if( i_widget != 0 )
- {
- i_yPos += [VLCConfigControl
- calcVerticalMargin:i_widget lastItem:i_lastItem];
- o_control = [VLCConfigControl newControl:p_item
- withView:o_view
- yOffset: i_yPos];
- if( o_control != nil )
- {
- i_yPos += [o_control frame].size.height;
- i_lastItem = i_widget;
- [o_control setAutoresizingMask: NSViewMaxYMargin |
- NSViewWidthSizable];
- [o_subviews addObject: o_control];
- }
+ [o_control setAutoresizingMask: NSViewMaxYMargin |
+ NSViewWidthSizable];
+ [o_subviews addObject: o_control];
}
fprintf( stderr, "\n" );
- break;
}
+ break;
}
} while( p_item++->i_type != CONFIG_HINT_END );
else
{
int i = 0;
- int i_yPos = -2;
- int i_lastItem = 0;
int i_index;
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
if( !p_list ) return o_view;
fprintf( stderr, "skipping hint usage\n" );
break;
default:
-fprintf( stderr, "%s (%d) is ", p_item->psz_name, p_item->i_type );
+fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type );
{
VLCConfigControl *o_control = nil;
- int i_widget = 0;
- switch( p_item->i_type )
+ o_control = [VLCConfigControl newControl:p_item
+ withView:o_view];
+ if( o_control != nil )
{
- case CONFIG_ITEM_STRING:
-fprintf( stderr, "CONFIG_ITEM_STRING" );
- if( !p_item->i_list )
- i_widget = CONFIG_ITEM_STRING;
- else
- i_widget = CONFIG_ITEM_STRING_LIST;
- break;
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_DIRECTORY:
-fprintf( stderr, "CONFIG_ITEM_FILE" );
- i_widget = CONFIG_ITEM_FILE;
- break;
- case CONFIG_ITEM_MODULE:
- case CONFIG_ITEM_MODULE_CAT:
-fprintf( stderr, "CONFIG_ITEM_MODULE" );
- i_widget = CONFIG_ITEM_MODULE;
- break;
- case CONFIG_ITEM_INTEGER:
-fprintf( stderr, "CONFIG_ITEM_INTEGER" );
- if( p_item->i_list )
- i_widget = CONFIG_ITEM_STRING_LIST;
- else if( p_item->i_min != 0 || p_item->i_max != 0 )
- i_widget = CONFIG_ITEM_RANGED_INTEGER;
- else
- i_widget = CONFIG_ITEM_INTEGER;
- break;
- case CONFIG_ITEM_FLOAT:
-fprintf( stderr, "CONFIG_ITEM_FLOAT" );
- if( p_item->f_min != 0 || p_item->f_max != 0 )
- i_widget = CONFIG_ITEM_RANGED_INTEGER;
- else
- i_widget = CONFIG_ITEM_INTEGER;
- break;
- case CONFIG_ITEM_BOOL:
-fprintf( stderr, "CONFIG_ITEM_BOOL" );
- i_widget = CONFIG_ITEM_BOOL;
- break;
- case CONFIG_ITEM_KEY:
-fprintf( stderr, "CONFIG_ITEM_KEY" );
- if( MACOS_VERSION < 10.3 )
- i_widget = CONFIG_ITEM_KEY_BEFORE_10_3;
- else
- i_widget = CONFIG_ITEM_KEY_AFTER_10_3;
- break;
- case CONFIG_ITEM_MODULE_LIST:
- case CONFIG_ITEM_MODULE_LIST_CAT:
-fprintf( stderr, "CONFIG_ITEM_MODULE_LIST" );
- i_widget = CONFIG_ITEM_MODULE_LIST;
- break;
- default:
-fprintf( stderr, "***UNKNOWN***" );
- }
- if( i_widget != 0 )
- {
- i_yPos += [VLCConfigControl
- calcVerticalMargin:i_widget lastItem:i_lastItem];
- o_control = [VLCConfigControl newControl:p_item
- withView:o_view
- yOffset: i_yPos];
- if( o_control != nil )
- {
- i_yPos += [o_control frame].size.height;
- i_lastItem = i_widget;
- [o_control setAutoresizingMask: NSViewMaxYMargin |
- NSViewWidthSizable];
- [o_subviews addObject: o_control];
- }
+ [o_control setAutoresizingMask: NSViewMaxYMargin |
+ NSViewWidthSizable];
+ [o_subviews addObject: o_control];
}
-fprintf( stderr, "\n" );
break;
}
}
if( o_view != nil )
{
int i_lastItem = 0;
- int i_yPos = 0;
+ int i_yPos = -2;
unsigned int i;
for( i = 0 ; i < [o_subviews count] ; i++ )
{
[o_widget setYPos:i_yPos];
i_yPos += [o_widget frame].size.height;
i_lastItem = i_widget;
- [o_widget setAutoresizingMask: NSViewMaxYMargin |
- NSViewWidthSizable];
[o_view addSubview:o_widget];
}
{
unsigned int i;
if( o_subviews != nil )
- {
- //Item has been shown
-fprintf( stderr, "[%s] applying changes\n", [o_name cString]);
+ //Item has been shown
for( i = 0 ; i < [o_subviews count] ; i++ )
[[o_subviews objectAtIndex:i] applyChanges];
- }
+
if( o_children != IsALeafNode )
for( i = 0 ; i < [o_children count] ; i++ )
[[o_children objectAtIndex:i] applyChanges];
}
+ (VLCConfigControl *)newControl: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view yOffset:(int) i_yPos;
+ withView: (NSView *)o_parent_view;
- (id)initWithFrame: (NSRect)frame item: (module_config_t *)p_item;
- (NSString *)getName;
- (int)getType;
}
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
@end
}
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
@end
}
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
- (IBAction)openFileDialog: (id)sender;
- (void)pathChosenInPanel:(NSOpenPanel *)o_sheet withReturn:(int)i_return_code contextInfo:(void *)o_context_info;
}
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
@end
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
- (IBAction)stepperChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification;
}
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
@end
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
- (IBAction)sliderChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification;
}
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
@end
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
- (IBAction)stepperChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification;
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
- (IBAction)sliderChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification;
}
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
@end
}
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
@end
}
- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos;
+ withView: (NSView *)o_parent_view;
@end
+ (VLCConfigControl *)newControl: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- yOffset:(int) i_yPos
{
VLCConfigControl *p_control = NULL;
switch( _p_item->i_type )
{
p_control = [[StringConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
}
else
{
p_control = [[StringListConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
}
break;
case CONFIG_ITEM_FILE:
case CONFIG_ITEM_DIRECTORY:
p_control = [[FileConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
break;
case CONFIG_ITEM_MODULE:
case CONFIG_ITEM_MODULE_CAT:
p_control = [[ModuleConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
break;
case CONFIG_ITEM_INTEGER:
if( _p_item->i_list )
{
p_control = [[IntegerListConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
}
else if( _p_item->i_min != 0 || _p_item->i_max != 0 )
{
p_control = [[RangedIntegerConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
}
else
{
p_control = [[IntegerConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
}
break;
case CONFIG_ITEM_BOOL:
p_control = [[BoolConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
break;
case CONFIG_ITEM_FLOAT:
if( _p_item->f_min != 0 || _p_item->f_max != 0 )
{
p_control = [[RangedFloatConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
}
else
{
p_control = [[FloatConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
}
break;
case CONFIG_ITEM_KEY:
{
p_control = [[KeyConfigControlBefore103 alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
}
else
{
p_control = [[KeyConfigControlAfter103 alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
}
break;
case CONFIG_ITEM_MODULE_LIST:
case CONFIG_ITEM_MODULE_LIST_CAT:
p_control = [[ModuleListConfigControl alloc]
initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos];
+ withView: o_parent_view];
break;
default:
break;
@implementation StringConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_textfieldString, *o_textfieldTooltip;
mainFrame.size.height = 22;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
@implementation StringListConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_textfieldTooltip;
mainFrame.size.height = 22;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
@implementation FileConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_buttonTooltip, *o_textfieldString;
mainFrame.size.height = 46;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
@implementation ModuleConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_popupTooltip;
mainFrame.size.height = 22;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
@implementation IntegerConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip, *o_textfieldString;
mainFrame.size.height = 23;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_textfieldTooltip;
mainFrame.size.height = 22;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
@implementation RangedIntegerConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 50;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
@implementation FloatConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip, *o_textfieldString;
mainFrame.size.height = 23;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
@implementation RangedFloatConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 50;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 17;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 37;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
@implementation KeyConfigControlAfter103
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 22;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
@implementation ModuleListConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
{
if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST )
//TODO....
mainFrame.size.height = 30 + 18 * [o_modulearray count];
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
i_view_type = CONFIG_ITEM_MODULE_LIST;