/*****************************************************************************
* prefs.m: MacOS X module for vlc
*****************************************************************************
- * Copyright (C) 2002-2005 VideoLAN
+ * Copyright (C) 2002-2006 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-/* VLCPrefs manages the main preferences dialog
+/* VLCPrefs manages the main preferences dialog
the class is related to wxwindows intf, PrefsPanel */
/* VLCTreeItem should contain:
- the children of the treeitem
p_intf = VLCIntf;
o_empty_view = [[NSView alloc] init];
}
-
+
return _o_sharedMainInstance;
}
[o_prefs_view setBorderType: NSGrooveBorder];
[o_prefs_view setHasVerticalScroller: YES];
[o_prefs_view setDrawsBackground: NO];
- [o_prefs_view setRulersVisible: NO];
[o_prefs_view setDocumentView: o_empty_view];
[o_tree selectRow:0 byExtendingSelection:NO];
}
+- (void)setTitle: (NSString *) o_title_name
+{
+ [o_title setStringValue: o_title_name];
+}
+
- (void)showPrefs
{
/* load our nib (if not already loaded) */
[NSBundle loadNibNamed:@"Preferences" owner:self];
-
- /* Show View for the currently select treeitem */
- /* [self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID]
- andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]]; */
+
[o_prefs_window center];
[o_prefs_window makeKeyAndOrderFront:self];
}
- (IBAction)resetAll: (id)sender
{
- NSBeginInformationalAlertSheet(_NS("Reset Preferences"), _NS("Cancel"), _NS("Continue"),
- nil, o_prefs_window, self, @selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil,
- _NS("Beware this will reset your VLC media player preferences.\n"
+ NSBeginInformationalAlertSheet(_NS("Reset Preferences"), _NS("Cancel"),
+ _NS("Continue"), nil, o_prefs_window, self,
+ @selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil,
+ _NS("Beware this will reset the VLC media player preferences.\n"
"Are you sure you want to continue?") );
}
-- (void)sheetDidEnd:(NSWindow *)o_sheet returnCode:(int)i_return contextInfo:(void *)o_context
+- (void)sheetDidEnd:(NSWindow *)o_sheet returnCode:(int)i_return
+ contextInfo:(void *)o_context
{
if( i_return == NSAlertAlternateReturn )
{
+ [o_prefs_view setDocumentView: o_empty_view];
config_ResetAll( p_intf );
- [[o_tree itemAtRow:[o_tree selectedRow]] showView:o_prefs_view advancedView:
- ([o_advanced_ckb state] == NSOnState)?VLC_TRUE:VLC_FALSE];
+ [[VLCTreeItem rootItem] resetView];
+ [[o_tree itemAtRow:[o_tree selectedRow]]
+ showView:o_prefs_view advancedView:
+ ( [o_advanced_ckb state] == NSOnState ) ? VLC_TRUE : VLC_FALSE];
}
}
[o_advanced_ckb setState: b_advanced];
/* refresh the view of the current treeitem */
[[o_tree itemAtRow:[o_tree selectedRow]] showView:o_prefs_view advancedView:
- ([o_advanced_ckb state] == NSOnState)?VLC_TRUE:VLC_FALSE];
+ ( [o_advanced_ckb state] == NSOnState ) ? VLC_TRUE : VLC_FALSE];
}
- (void)loadConfigTree
/* update the document view to the view of the selected tree item */
- (void)outlineViewSelectionDidChange:(NSNotification *)o_notification
{
- [[o_tree itemAtRow:[o_tree selectedRow]] showView: o_prefs_view advancedView:
- ([o_advanced_ckb state] == NSOnState)?VLC_TRUE:VLC_FALSE];
+ [[o_tree itemAtRow:[o_tree selectedRow]] showView: o_prefs_view
+ advancedView:( [o_advanced_ckb state] == NSOnState ) ?
+ VLC_TRUE : VLC_FALSE];
}
@end
@implementation VLCPrefs (NSTableDataSource)
- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
- return (item == nil) ? [[VLCTreeItem rootItem] numberOfChildren] : [item numberOfChildren];
+ return (item == nil) ? [[VLCTreeItem rootItem] numberOfChildren] :
+ [item numberOfChildren];
}
-- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
- return (item == nil) ? YES : (([item numberOfChildren] != -1) && ([item numberOfChildren] != 0));
+- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
+{
+ return (item == nil) ? YES : ( ([item numberOfChildren] != -1) &&
+ ([item numberOfChildren] != 0));
}
- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item {
- return (item == nil) ? [[VLCTreeItem rootItem] childAtIndex:index] : [item childAtIndex:index];
+ return (item == nil) ? [[VLCTreeItem rootItem] childAtIndex:index] :
+ (id)[item childAtIndex:index];
}
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
+- (id)outlineView:(NSOutlineView *)outlineView
+ objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
+{
return (item == nil) ? @"" : (id)[item getName];
}
#define IsALeafNode ((id)-1)
-- (id)initWithName: (NSString *)o_item_name ID: (int)i_id parent:(VLCTreeItem *)o_parent_item children:(NSMutableArray *)o_children_array whithCategory: (int) i_category
+- (id)initWithName: (NSString *)o_item_name
+ withTitle: (NSString *)o_item_title
+ withHelp: (NSString *)o_item_help
+ ID: (int)i_id
+ parent:(VLCTreeItem *)o_parent_item
+ children:(NSMutableArray *)o_children_array
+ whithCategory: (int) i_category
{
self = [super init];
if( self != nil )
{
o_name = [o_item_name copy];
+ o_title= [o_item_title copy];
+ o_help= [o_item_help copy];
i_object_id = i_id;
o_parent = o_parent_item;
o_children = o_children_array;
i_object_category = i_category;
- o_view = nil;
+ o_subviews = nil;
}
return( self );
}
-+ (VLCTreeItem *)rootItem {
- if (o_root_item == nil) o_root_item = [[VLCTreeItem alloc] initWithName:@"main" ID: 0 parent:nil children:[[NSMutableArray alloc] initWithCapacity:10] whithCategory: -1];
- return o_root_item;
++ (VLCTreeItem *)rootItem
+{
+ if (o_root_item == nil)
+ o_root_item = [[VLCTreeItem alloc] initWithName:@"main" withTitle:@"main" withHelp:@"" ID:0
+ parent:nil children:[[NSMutableArray alloc] initWithCapacity:10]
+ whithCategory: -1];
+ return o_root_item;
}
- (void)dealloc
{
if (o_children != IsALeafNode) [o_children release];
[o_name release];
+ [o_title release];
+ [o_help release];
[super dealloc];
}
intf_thread_t *p_intf = VLCIntf;
vlc_list_t *p_list;
module_t *p_module = NULL;
- module_config_t *p_item;
- int i_index;
+ module_t *p_parser;
+ module_config_t *p_item,
+ *p_end;
+ int i_index = 0;
/* List the modules */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
if( !p_list ) return nil;
+ /* get parser */
+ p_parser = (module_t *)p_list->p_values[i_index].p_object;
+ p_end = p_parser->p_config + p_parser->confsize;
+
if( [[self getName] isEqualToString: @"main"] )
{
/*
}
if( p_module == NULL )
{
- msg_Err( p_intf, "could not find the main module in our preferences" );
+ msg_Err( p_intf,
+ "could not load the preferences" );
return nil;
}
if( i_index < p_list->i_count )
if( p_item ) do
{
NSString *o_child_name;
+ NSString *o_child_title;
+ NSString *o_child_help;
switch( p_item->i_type )
{
case CONFIG_CATEGORY:
- o_child_name = [[VLCMain sharedInstance] localizedString: config_CategoryNameGet(p_item->i_value ) ];
+ if( p_item->value.i == -1 ) break;
+
+ o_child_name = [[VLCMain sharedInstance]
+ localizedString: config_CategoryNameGet( p_item->value.i )];
+ o_child_title = o_child_name;
+ o_child_help = [[VLCMain sharedInstance]
+ localizedString: config_CategoryHelpGet( p_item->value.i )];
p_last_category = [VLCTreeItem alloc];
- [o_children addObject:[p_last_category initWithName: o_child_name
- ID: p_item->i_value parent:self children:[[NSMutableArray alloc] initWithCapacity:10] whithCategory: p_item - p_module->p_config]];
+ [o_children addObject:[p_last_category
+ initWithName: o_child_name
+ withTitle: o_child_title
+ withHelp: o_child_help
+ ID: p_item->value.i
+ parent:self
+ children:[[NSMutableArray alloc]
+ initWithCapacity:10]
+ whithCategory: p_item - p_module->p_config]];
break;
case CONFIG_SUBCATEGORY:
- o_child_name = [[VLCMain sharedInstance] localizedString: config_CategoryNameGet(p_item->i_value ) ];
- if( p_item->i_value != SUBCAT_VIDEO_GENERAL &&
- p_item->i_value != SUBCAT_AUDIO_GENERAL )
- [p_last_category->o_children addObject:[[VLCTreeItem alloc] initWithName: o_child_name
- ID: p_item->i_value parent:p_last_category children:[[NSMutableArray alloc] initWithCapacity:10] whithCategory: p_item - p_module->p_config]];
+ if( p_item->value.i == -1 ) break;
+
+ if( p_item->value.i != SUBCAT_PLAYLIST_GENERAL &&
+ p_item->value.i != SUBCAT_VIDEO_GENERAL &&
+ p_item->value.i != SUBCAT_INPUT_GENERAL &&
+ p_item->value.i != SUBCAT_INTERFACE_GENERAL &&
+ p_item->value.i != SUBCAT_SOUT_GENERAL &&
+ p_item->value.i != SUBCAT_ADVANCED_MISC &&
+ p_item->value.i != SUBCAT_AUDIO_GENERAL )
+ {
+ o_child_name = [[VLCMain sharedInstance]
+ localizedString: config_CategoryNameGet( p_item->value.i ) ];
+ o_child_title = o_child_name;
+ o_child_help = [[VLCMain sharedInstance]
+ localizedString: config_CategoryHelpGet( p_item->value.i ) ];
+
+ [p_last_category->o_children
+ addObject:[[VLCTreeItem alloc]
+ initWithName: o_child_name
+ withTitle: o_child_title
+ withHelp: o_child_help
+ ID: p_item->value.i
+ parent:p_last_category
+ children:[[NSMutableArray alloc]
+ initWithCapacity:10]
+ whithCategory: p_item - p_module->p_config]];
+ }
+
break;
default:
break;
}
- } while( p_item->i_type != CONFIG_HINT_END && p_item++ );
+ } while( p_item < p_end && p_item++ );
}
/* Build a tree of the plugins */
if( !strcmp( p_module->psz_object_name, "main" ) )
continue;
- /* Exclude empty plugins (submodules don't have config options, they
- * are stored in the parent module) */
+ /* Exclude empty plugins (submodules don't have config */
+ /* options, they are stored in the parent module) */
if( p_module->b_submodule )
continue;
else
do
{
if( p_item->i_type == CONFIG_CATEGORY )
- {
- i_category = p_item->i_value;
- }
+ i_category = p_item->value.i;
else if( p_item->i_type == CONFIG_SUBCATEGORY )
- {
- i_subcategory = p_item->i_value;
- }
+ i_subcategory = p_item->value.i;
+
if( p_item->i_type & CONFIG_ITEM )
i_options ++;
if( i_options > 0 && i_category >= 0 && i_subcategory >= 0 )
- {
break;
- }
- } while( p_item->i_type != CONFIG_HINT_END && p_item++ );
+ } while( p_item < p_end && p_item++ );
if( !i_options ) continue;
/* Find the right category item */
}
}
if( !b_found ) continue;
-
+
/* Find subcategory item */
b_found = VLC_FALSE;
cookie = -1;
for (i = 0 ; i < [p_category_item->o_children count] ; i++)
{
- p_subcategory_item = [p_category_item->o_children objectAtIndex: i];
+ p_subcategory_item = [p_category_item->o_children
+ objectAtIndex: i];
if( p_subcategory_item->i_object_id == i_subcategory )
{
b_found = VLC_TRUE;
if( !b_found )
p_subcategory_item = p_category_item;
- [p_subcategory_item->o_children addObject:[[VLCTreeItem alloc] initWithName:
- [[VLCMain sharedInstance] localizedString: p_module->psz_object_name ]
- ID: p_module->i_object_id parent:p_subcategory_item children:IsALeafNode whithCategory: -1]];
-
- }
+ [p_subcategory_item->o_children addObject:[[VLCTreeItem alloc]
+ initWithName:[[VLCMain sharedInstance]
+ localizedString: (char *)p_module->psz_shortname ?
+ (char *)p_module->psz_shortname : (char *)p_module->psz_object_name ]
+ withTitle:[[VLCMain sharedInstance]
+ localizedString: (char *)p_module->psz_longname ?
+ (char *)p_module->psz_longname : (char *)p_module->psz_object_name ]
+ withHelp: @""
+ ID: p_module->i_object_id
+ parent:p_subcategory_item
+ children:IsALeafNode
+ whithCategory: -1]];
+ }
}
vlc_list_release( p_list );
}
return o_name;
}
-- (VLCTreeItem *)childAtIndex:(int)i_index {
+- (NSString *)getTitle
+{
+ return o_title;
+}
+
+- (NSString *)getHelp
+{
+ return o_help;
+}
+
+- (VLCTreeItem *)childAtIndex:(int)i_index
+{
return [[self children] objectAtIndex:i_index];
}
return( NO );
}
-- (NSView *)showView:(NSScrollView *)o_prefs_view advancedView:(vlc_bool_t) b_advanced
+- (NSView *)showView:(NSScrollView *)o_prefs_view
+ advancedView:(vlc_bool_t) b_advanced
{
-fprintf( stderr, "[%s] showView\n", [o_name UTF8String] );
- if( o_view == nil )
+ NSRect s_vrc;
+ NSView *o_view;
+
+ [[VLCPrefs sharedInstance] setTitle: [self getTitle]];
+ /* NSLog( [self getHelp] ); */
+ s_vrc = [[o_prefs_view contentView] bounds]; s_vrc.size.height -= 4;
+ o_view = [[VLCFlippedView alloc] initWithFrame: s_vrc];
+ [o_view setAutoresizingMask: NSViewWidthSizable | NSViewMinYMargin |
+ NSViewMaxYMargin];
+
+/* Create all subviews if it isn't already done because we cannot use */
+/* setHiden for MacOS < 10.3*/
+ if( o_subviews == nil )
{
intf_thread_t *p_intf = VLCIntf;
vlc_list_t *p_list;
module_t *p_parser = NULL;
- module_config_t *p_item;
- NSRect s_vrc;
+ module_config_t *p_item,
+ *p_end;
- s_vrc = [[o_prefs_view contentView] bounds]; s_vrc.size.height -= 4;
- o_view = [[VLCFlippedView alloc] initWithFrame: s_vrc];
- [o_view setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
-
+ o_subviews = [[NSMutableArray alloc] initWithCapacity:10];
/* Get a pointer to the module */
if( i_object_category == -1 )
{
/* 0OOoo something went really bad */
return nil;
}
+
+ p_end = p_parser->p_config + p_parser->confsize;
+
p_item = p_parser->p_config;
- int i = 0;
- int i_yPos = -2;
- int i_lastItem = 0;
p_item = p_parser->p_config + 1;
{
if( !p_item )
{
- fprintf( stderr, "Something is going very bad... skipping null item\n" );
+ msg_Err( p_intf, "invalid preference item found" );
break;
}
+ if( p_item > p_end )
+ break;
switch(p_item->i_type)
{
case CONFIG_SUBCATEGORY:
-fprintf( stderr, "drawing subcategory %s\n", [o_name UTF8String] );
- break;
- case CONFIG_SECTION:
-fprintf( stderr, "drawing section %s\n", p_item->psz_text );
break;
case CONFIG_CATEGORY:
-fprintf( stderr, "drawing category %s\n", [o_name UTF8String] );
break;
- case CONFIG_HINT_END:
-fprintf( stderr, "end of (sub)category\n" );
+ case CONFIG_SECTION:
break;
case CONFIG_HINT_USAGE:
-fprintf( stderr, "skipping hint usage\n" );
break;
default:
-fprintf( stderr, "%s (%d) is ", p_item->psz_name, p_item->i_type );
{
VLCConfigControl *o_control = nil;
- int i_widget = 0;
- if( p_item->b_advanced && (! b_advanced) )
- break;
- 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" );
-#define MACOS_VERSION 4
- if( MACOS_VERSION < 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***" );
+ [o_control setAutoresizingMask: NSViewMaxYMargin |
+ NSViewWidthSizable];
+ [o_subviews addObject: o_control];
}
- 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
- lastItem: i_lastItem];
- if( o_control != nil )
- {
- i_yPos += [o_control frame].size.height;
- i_lastItem = i_widget;
- [o_control setAutoresizingMask: NSViewMaxYMargin | NSViewWidthSizable];
- [o_view addSubview: o_control];
- }
- }
-fprintf( stderr, "\n" );
- break;
}
+ break;
}
- } while( p_item++->i_type != CONFIG_HINT_END );
+ } while( p_item < p_end && p_item++ );
vlc_object_release( p_parser );
}
}
if( p_parser == NULL )
{
- msg_Err( p_intf, "could not find the main module in our preferences" );
+ msg_Err( p_intf, "could not load preferences" );
return o_view;
}
+ p_end = p_parser->p_config + p_parser->confsize;
+
p_item = (p_parser->p_config + i_object_category);
if( ( p_item->i_type == CONFIG_CATEGORY ) &&
- ( ( p_item->i_value == CAT_AUDIO ) || ( p_item->i_value == CAT_VIDEO ) ) )
+ ( ( p_item->value.i == CAT_PLAYLIST ) ||
+ ( p_item->value.i == CAT_AUDIO ) ||
+ ( p_item->value.i == CAT_VIDEO ) ||
+ ( p_item->value.i == CAT_INTERFACE ) ||
+ ( p_item->value.i == CAT_INPUT ) ||
+ ( p_item->value.i == CAT_SOUT ) ) )
p_item++;
- int i = 0;
- int i_yPos = -2;
- int i_lastItem = 0;
-
do
{
p_item++;
if( !p_item )
{
- fprintf( stderr, "Something is going very bad... skipping null item\n" );
+ msg_Err( p_intf, "invalid preference item found" );
break;
}
- switch(p_item->i_type)
+ if( p_item > p_end )
+ break;
+ switch( p_item->i_type )
{
case CONFIG_SUBCATEGORY:
-fprintf( stderr, "drawing subcategory %s\n", [o_name UTF8String] );
- break;
- case CONFIG_SECTION:
-fprintf( stderr, "drawing section %s\n", p_item->psz_text );
break;
case CONFIG_CATEGORY:
-fprintf( stderr, "drawing category %s\n", [o_name UTF8String] );
break;
- case CONFIG_HINT_END:
-fprintf( stderr, "end of (sub)category\n" );
+ case CONFIG_SECTION:
break;
case CONFIG_HINT_USAGE:
-fprintf( stderr, "skipping hint usage\n" );
break;
default:
-fprintf( stderr, "%s (%d) is ", p_item->psz_name, p_item->i_type );
{
VLCConfigControl *o_control = nil;
- int i_widget = 0;
- switch( p_item->i_type )
- {
- 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" );
- #define MACOS_VERSION 4
- if( MACOS_VERSION < 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 )
+ if( p_item->b_internal == VLC_TRUE )
+ {
+ break;
+ }
+ o_control = [VLCConfigControl newControl:p_item
+ withView:o_view];
+ if( o_control != nil )
{
- i_yPos += [VLCConfigControl calcVerticalMargin:i_widget lastItem:i_lastItem];
- o_control = [VLCConfigControl newControl:p_item
- withView:o_view
- yOffset: i_yPos
- lastItem: i_lastItem];
- if( o_control != nil )
- {
- i_yPos += [o_control frame].size.height;
- i_lastItem = i_widget;
- [o_control setAutoresizingMask: NSViewMaxYMargin | NSViewWidthSizable];
- [o_view addSubview: o_control];
- }
+ [o_control setAutoresizingMask: NSViewMaxYMargin |
+ NSViewWidthSizable];
+ [o_subviews addObject: o_control];
}
-fprintf( stderr, "\n" );
break;
}
}
- } while ( ( p_item->i_type != CONFIG_HINT_END ) && ( p_item->i_type != CONFIG_SUBCATEGORY ) );
+ } while ( ( p_item < p_end ) &&
+ ( p_item->i_type != CONFIG_SUBCATEGORY ) );
- vlc_object_release( p_parser );
vlc_list_release( p_list );
}
}
- else
- {
- NSRect s_vrc;
- s_vrc = [[o_prefs_view contentView] bounds]; s_vrc.size.height -= 4;
- [o_view setFrame: s_vrc];
- }
+
if( o_view != nil )
+ {
+ int i_lastItem = 0;
+ int i_yPos = -2;
+ int i_max_label = 0;
+ int i_show_advanced = 0;
+
+ NSEnumerator *enumerator = [o_subviews objectEnumerator];
+ VLCConfigControl *o_widget;
+ NSRect o_frame;
+
+ while( ( o_widget = [enumerator nextObject] ) )
+ if( ( [o_widget isAdvanced] ) && (! b_advanced) )
+ continue;
+ else if( i_max_label < [o_widget getLabelSize] )
+ i_max_label = [o_widget getLabelSize];
+
+ enumerator = [o_subviews objectEnumerator];
+ while( ( o_widget = [enumerator nextObject] ) )
+ {
+ int i_widget;
+ if( ( [o_widget isAdvanced] ) && (! b_advanced) )
+ {
+ i_show_advanced++;
+ continue;
+ }
+
+ i_widget = [o_widget getViewType];
+ i_yPos += [VLCConfigControl calcVerticalMargin:i_widget
+ lastItem:i_lastItem];
+ [o_widget setYPos:i_yPos];
+ o_frame = [o_widget frame];
+ o_frame.size.width = [o_view frame].size.width -
+ LEFTMARGIN - RIGHTMARGIN;
+ [o_widget setFrame:o_frame];
+ [o_widget alignWithXPosition: i_max_label];
+ i_yPos += [o_widget frame].size.height;
+ i_lastItem = i_widget;
+ [o_view addSubview:o_widget];
+ }
+ if( i_show_advanced != 0 )
+ {
+ /* We add the advanced notice... */
+ NSRect s_rc = [o_view frame];
+ NSTextField *o_label;
+ s_rc.size.height = 17;
+ s_rc.origin.x = LEFTMARGIN;
+ s_rc.origin.y = i_yPos += [VLCConfigControl
+ calcVerticalMargin:CONFIG_ITEM_STRING
+ lastItem:i_lastItem];
+ o_label = [[[NSTextField alloc] initWithFrame: s_rc] retain];
+ [o_label setDrawsBackground: NO];
+ [o_label setBordered: NO];
+ [o_label setEditable: NO];
+ [o_label setSelectable: NO];
+ [o_label setStringValue: _NS("Some options are hidden. " \
+ "Check \"Advanced\" to display them.")];
+ [o_label setFont:[NSFont systemFontOfSize:10]];
+ [o_label sizeToFit];
+ [o_view addSubview:o_label];
+ i_yPos += [o_label frame].size.height;
+ }
+ o_frame = [o_view frame];
+ o_frame.size.height = i_yPos;
+ [o_view setFrame:o_frame];
[o_prefs_view setDocumentView:o_view];
+
+ }
return o_view;
}
- (void)applyChanges
{
unsigned int i;
- if( o_view != nil )
- {
- //Item has been shown
-fprintf( stderr, "[%s] applying changes\n", [o_name cString]);
- NSArray *o_subviews = [o_view subviews];
+ if( o_subviews != nil )
+ //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];
}
+- (void)resetView
+{
+ unsigned int i;
+ if( o_subviews != nil )
+ {
+ //Item has been shown
+ [o_subviews release];
+ o_subviews = nil;
+ }
+
+ if( o_children != IsALeafNode )
+ for( i = 0 ; i < [o_children count] ; i++ )
+ [[o_children objectAtIndex:i] resetView];
+}
+
@end
projects / vlc / blobdiff