]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/prefs.m
Removes trailing spaces. Removes tabs.
[vlc] / modules / gui / macosx / prefs.m
index 35a47daf8b3f5a8074cac56d6e43217331ab44c3..cce4386f19e6e037f24e76dfe435c58813baafc3 100644 (file)
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * prefs.m: MacOS X module for vlc
  *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: prefs.m,v 1.38 2004/01/30 12:44:21 hartman Exp $
+ * Copyright (C) 2002-2006 the VideoLAN team
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
- *         Derk-Jan Hartman <hartman at videolan.org>
+ *          Derk-Jan Hartman <hartman at videolan dot org>
  *
  * 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
  *
  * 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
+   the class is related to wxwindows intf, PrefsPanel */
+/* VLCTreeItem should contain:
+   - the children of the treeitem
+   - the associated prefs widgets
+   - the documentview with all the prefs widgets in it
+   - a saveChanges action
+   - a revertChanges action
+   - an advanced action (to hide/show advanced options)
+   - a redraw view action
+   - the children action should generate a list of the treeitems children (to be used by VLCPrefs datasource)
+
+   The class is sort of a mix of wxwindows intfs, PrefsTreeCtrl and ConfigTreeData
+*/
+/* VLCConfigControl are subclassed NSView's containing and managing individual config items
+   the classes are VERY closely related to wxwindows ConfigControls */
+
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
 #include <stdlib.h>                                      /* malloc(), free() */
+#include <sys/param.h>                                    /* for MAXPATHLEN */
 #include <string.h>
 
+#include <vlc/vlc.h>
+#include <vlc_config_cat.h>
+
 #include "intf.h"
 #include "prefs.h"
-#include "misc.h"
-#include <vlc_help.h>
-
-#define ROOT_ID 1241
-#define GENERAL_ID 1242
-#define MODULE_ID 1243
-#define CAPABILITY_ID 1244
+#include "prefs_widgets.h"
+#include "vlc_keys.h"
 
 /*****************************************************************************
  * VLCPrefs implementation
  *****************************************************************************/
 @implementation VLCPrefs
 
-- (id)init
+static VLCPrefs *_o_sharedMainInstance = nil;
+
++ (VLCPrefs *)sharedInstance
 {
-    self = [super init];
+    return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
+}
 
-    if( self != nil )
+- (id)init
+{
+    if( _o_sharedMainInstance ) {
+        [self dealloc];
+    }
+    else
     {
-        o_empty_view = [[[NSView alloc] init] retain];
+        _o_sharedMainInstance = [super init];
+        p_intf = VLCIntf;
+        o_empty_view = [[NSView alloc] init];
     }
 
-    return( self );
+    return _o_sharedMainInstance;
 }
 
 - (void)dealloc
@@ -63,7 +89,7 @@
 
 - (void)awakeFromNib
 {
-    p_intf = [NSApp getIntf];
+    p_intf = VLCIntf;
     b_advanced = config_GetInt( p_intf, "advanced" );
 
     [self initStrings];
     [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];
-    [o_tree expandItem:[o_tree itemAtRow:0]];
+}
+
+- (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];
+
+    [o_prefs_window center];
+    [o_prefs_window makeKeyAndOrderFront:self];
 }
 
 - (void)initStrings
     [o_advanced_ckb setTitle: _NS("Advanced")];
 }
 
-- (void)showPrefs
-{
-    // show first tree item
-    [[o_prefs_view window] center];
-    [[o_prefs_view window] makeKeyAndOrderFront:self];
-}
-
 - (IBAction)savePrefs: (id)sender
 {
-    // walk trough all treeitems and tell them all to save
+    /* TODO: call savePrefs on Root item */
+    [[VLCTreeItem rootItem] applyChanges];
     config_SaveConfigFile( p_intf, NULL );
     [o_prefs_window orderOut: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 );
-        // show first config treeitem
+        [[VLCTreeItem rootItem] resetView];
+        [[o_tree itemAtRow:[o_tree selectedRow]]
+            showView:o_prefs_view advancedView:
+            ( [o_advanced_ckb state] == NSOnState ) ? VLC_TRUE : VLC_FALSE];
     }
 }
 
 {
     b_advanced = !b_advanced;
     [o_advanced_ckb setState: b_advanced];
-    // walk trough all treeitems and set advanced state
+    /* 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];
 }
 
-- (void)outlineViewSelectionDidChange:(NSNotification *)o_notification
+- (void)loadConfigTree
 {
-    // a tree item will be shown
 }
 
-- (void)showViewForID:(int)i_id
+- (void)outlineViewSelectionIsChanging:(NSNotification *)o_notification
 {
 }
 
+/* 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];
+}
+
 @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] >= 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 {
-    return (item == nil) ? @"" : (id)[item name];
+- (id)outlineView:(NSOutlineView *)outlineView
+    objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
+{
+    return (item == nil) ? @"" : (id)[item getName];
 }
 
 @end
@@ -166,29 +219,45 @@ static VLCTreeItem *o_root_item = nil;
 
 #define IsALeafNode ((id)-1)
 
-- (id)initWithID: (int)i_id parent: (VLCTreeItem *)o_parent_item
+- (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_subviews = nil;
     }
     return( self );
 }
 
-+ (VLCTreeItem *)rootItem {
-   if (o_root_item == nil) o_root_item = [[VLCTreeItem alloc] initWithID: ROOT_ID parent:nil];
-   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( psz_help ) free( psz_help );
-    if( psz_section ) free( psz_section );
-    if (o_name) [o_name release];
     if (o_children != IsALeafNode) [o_children release];
+    [o_name release];
+    [o_title release];
+    [o_help release];
     [super dealloc];
 }
 
@@ -196,36 +265,31 @@ static VLCTreeItem *o_root_item = nil;
  * Loads children incrementally */
 - (NSArray *)children
 {
-    if (o_children == NULL)
+    if( o_children == IsALeafNode )
+        return o_children;
+    if( [ o_children count] == 0 )
     {
-        intf_thread_t   *p_intf = [NSApp getIntf];
-        vlc_list_t      *p_list = NULL;
+        intf_thread_t   *p_intf = VLCIntf;
+        vlc_list_t      *p_list;
         module_t        *p_module = NULL;
-        module_config_t *p_item = NULL;
-        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;
 
-        if( [self objectID] == ROOT_ID )
-        {
-            /* Create the General Settings and Modules items */
-            o_children = [[NSMutableArray alloc] initWithCapacity:2];
-            o_name = @"root";
-            [o_children addObject:[[VLCTreeItem alloc] initWithID: GENERAL_ID parent:self]];
-            [o_children addObject:[[VLCTreeItem alloc] initWithID: MODULE_ID parent:self]];
-            [o_children retain];
-        }
-        else if( [self objectID] == GENERAL_ID )
+        /* 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"] )
         {
             /*
-             * Build a tree of the main options
-             */
-            o_name = [_NS("General Settings") copy];
-            psz_help = strdup( GENERAL_HELP );
-            psz_section = strdup( GENERAL_TITLE );
-            
+            * Find the main module
+            */
             for( i_index = 0; i_index < p_list->i_count; i_index++ )
             {
                 p_module = (module_t *)p_list->p_values[i_index].p_object;
@@ -234,165 +298,488 @@ static VLCTreeItem *o_root_item = nil;
             }
             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 )
             {
+                /* We found the main module */
                 /* Enumerate config categories and store a reference so we can
                  * generate their config panel them when it is asked by the user. */
+                VLCTreeItem *p_last_category = NULL;
                 p_item = p_module->p_config;
                 o_children = [[NSMutableArray alloc] initWithCapacity:10];
-
                 if( p_item ) do
                 {
-                    VLCTreeItem *o_now;
-
+                    NSString *o_child_name;
+                    NSString *o_child_title;
+                    NSString *o_child_help;
                     switch( p_item->i_type )
                     {
-                    case CONFIG_HINT_CATEGORY:
-                        o_now = [[VLCTreeItem alloc] initWithID: p_module->i_object_id parent:self];
-                        [o_now setName: [[NSApp localizedString: p_item->psz_text] retain]];
-                        [o_children addObject: o_now];
+                    case CONFIG_CATEGORY:
+                        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
+                            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:
+                        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++ );
-                [o_children retain];
-                //[o_children sortUsingSelector:@selector(caseInsensitiveCompare:)];
+                } while( p_item < p_end && p_item++ );
             }
-        }
-        else if( [self objectID] == MODULE_ID )
-        {
-            int i_counter;
-            int i_total;
-            BOOL b_found;
-
-            /* Build a list of the capabilities */
-            o_name = [_NS("Modules") copy];
-            psz_help = strdup( PLUGIN_HELP );
-            psz_section = strdup( PLUGIN_TITLE );
-            
-            o_children = [[NSMutableArray alloc] initWithCapacity:10];
+
+            /* Build a tree of the plugins */
+            /* Add the capabilities */
             for( i_index = 0; i_index < p_list->i_count; i_index++ )
             {
                 p_module = (module_t *)p_list->p_values[i_index].p_object;
-                
+
                 /* Exclude the main module */
                 if( !strcmp( p_module->psz_object_name, "main" ) )
                     continue;
 
-                /* Exclude empty modules */
+                /* Exclude empty plugins (submodules don't have config */
+                /* options, they are stored in the parent module) */
                 if( p_module->b_submodule )
-                    p_item = ((module_t *)p_module->p_parent)->p_config;
+                    continue;
                 else
                     p_item = p_module->p_config;
-                
+
                 if( !p_item ) continue;
+                int i_category = -1;
+                int i_subcategory = -1;
+                int i_options = 0;
                 do
                 {
+                    if( p_item->i_type == CONFIG_CATEGORY )
+                        i_category = p_item->value.i;
+                    else if( p_item->i_type == CONFIG_SUBCATEGORY )
+                        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 < p_end && p_item++ );
+                if( !i_options ) continue;
+
+                /* Find the right category item */
+
+                long cookie;
+                vlc_bool_t b_found = VLC_FALSE;
+                unsigned int i;
+                VLCTreeItem* p_category_item, * p_subcategory_item;
+                for (i = 0 ; i < [o_children count] ; i++)
+                {
+                    p_category_item = [o_children objectAtIndex: i];
+                    if( p_category_item->i_object_id == i_category )
+                    {
+                        b_found = VLC_TRUE;
+                        break;
+                    }
                 }
-                while( p_item->i_type != CONFIG_HINT_END && p_item++ );
-                if( p_item->i_type == CONFIG_HINT_END ) continue;
-                
-                i_total = [o_children count];
-                b_found = FALSE;
-                
-                for( i_counter = 0; i_counter < i_total; i_counter++ )
+                if( !b_found ) continue;
+
+                /* Find subcategory item */
+                b_found = VLC_FALSE;
+                cookie = -1;
+                for (i = 0 ; i < [p_category_item->o_children count] ; i++)
                 {
-                    if( [[[o_children objectAtIndex: i_counter] name] isEqualToString:
-                        [NSApp localizedString: p_module->psz_capability]] )
+                    p_subcategory_item = [p_category_item->o_children
+                                            objectAtIndex: i];
+                    if( p_subcategory_item->i_object_id == i_subcategory )
                     {
-                        b_found = TRUE;
+                        b_found = VLC_TRUE;
                         break;
                     }
                 }
-                
                 if( !b_found )
-                {
-                    VLCTreeItem *o_now = [[VLCTreeItem alloc] initWithID: CAPABILITY_ID parent:self];
-                    [o_now setName: [NSApp localizedString: p_module->psz_capability]];
-                    [o_children addObject:o_now];
+                    p_subcategory_item = p_category_item;
+
+                [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]];
                 }
-            }
-            [o_children retain];
-            //[o_children sortUsingSelector:@selector(caseInsensitiveCompare:)];
         }
-        else if( [self objectID] == CAPABILITY_ID )
+        vlc_list_release( p_list );
+    }
+    return o_children;
+}
+
+- (int)getObjectID
+{
+    return i_object_id;
+}
+
+- (NSString *)getName
+{
+    return o_name;
+}
+
+- (NSString *)getTitle
+{
+    return o_title;
+}
+
+- (NSString *)getHelp
+{
+    return o_help;
+}
+
+- (VLCTreeItem *)childAtIndex:(int)i_index
+{
+    return [[self children] objectAtIndex:i_index];
+}
+
+- (int)numberOfChildren {
+    id i_tmp = [self children];
+    return (i_tmp == IsALeafNode) ? (-1) : (int)[i_tmp count];
+}
+
+- (BOOL)hasPrefs:(NSString *)o_module_name
+{
+    intf_thread_t *p_intf = VLCIntf;
+    module_t *p_parser;
+    vlc_list_t *p_list;
+    char *psz_module_name;
+    int i_index;
+
+    psz_module_name = (char *)[o_module_name UTF8String];
+
+    /* look for module */
+    p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+
+    for( i_index = 0; i_index < p_list->i_count; i_index++ )
+    {
+        p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+
+        if( !strcmp( p_parser->psz_object_name, psz_module_name ) )
         {
-            /* add the modules */
-            o_children = [[NSMutableArray alloc] initWithCapacity:3];
-            for( i_index = 0; i_index < p_list->i_count; i_index++ )
+            BOOL b_has_prefs = p_parser->i_config_items != 0;
+            vlc_list_release( p_list );
+            return( b_has_prefs );
+        }
+    }
+
+    vlc_list_release( p_list );
+
+    return( NO );
+}
+
+- (NSView *)showView:(NSScrollView *)o_prefs_view
+    advancedView:(vlc_bool_t) b_advanced
+{
+    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,
+                        *p_end;
+
+        o_subviews = [[NSMutableArray alloc] initWithCapacity:10];
+        /* Get a pointer to the module */
+        if( i_object_category == -1 )
+        {
+            p_parser = (module_t *) vlc_object_get( p_intf, i_object_id );
+            if( !p_parser || p_parser->i_object_type != VLC_OBJECT_MODULE )
             {
-                p_module = (module_t *)p_list->p_values[i_index].p_object;
-                
-                /* Exclude the main module */
-                if( !strcmp( p_module->psz_object_name, "main" ) )
-                    continue;
+                /* 0OOoo something went really bad */
+                return nil;
+            }
+            p_end = p_parser->p_config + p_parser->confsize;
+            p_item = p_parser->p_config;
 
-                /* Exclude empty modules */
-                if( p_module->b_submodule )
-                    p_item = ((module_t *)p_module->p_parent)->p_config;
-                else
-                    p_item = p_module->p_config;
-                
-                if( !p_item ) continue;
-                do
+            p_item = p_parser->p_config + 1;
+
+            do
+            {
+                if( !p_item )
                 {
-                    if( p_item->i_type & CONFIG_ITEM )
-                        break;
+                    msg_Err( p_intf, "invalid preference item found" );
+                    break;
+                }
+                if( p_item > p_end )
+                    break;
+                switch(p_item->i_type)
+                {
+                case CONFIG_SUBCATEGORY:
+                    break;
+                case CONFIG_CATEGORY:
+                    break;
+                case CONFIG_SECTION:
+                    break;
+                case CONFIG_HINT_USAGE:
+                    break;
+                default:
+                {
+                    VLCConfigControl *o_control = nil;
+                    o_control = [VLCConfigControl newControl:p_item
+                                                  withView:o_view];
+                    if( o_control != nil )
+                    {
+                        [o_control setAutoresizingMask: NSViewMaxYMargin |
+                            NSViewWidthSizable];
+                        [o_subviews addObject: o_control];
+                    }
+                }
+                    break;
                 }
-                while( p_item->i_type != CONFIG_HINT_END && p_item++ );
-                if( p_item->i_type == CONFIG_HINT_END ) continue;
+            } while( p_item < p_end && p_item++ );
 
-                if( [[self name] isEqualToString:
-                    [NSApp localizedString: p_module->psz_capability]] )
+            vlc_object_release( p_parser );
+        }
+        else
+        {
+            int i_index;
+            p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+            if( !p_list ) return o_view;
+
+            /*
+            * Find the main module
+            */
+            for( i_index = 0; i_index < p_list->i_count; i_index++ )
+            {
+                p_parser = (module_t *)p_list->p_values[i_index].p_object;
+                if( !strcmp( p_parser->psz_object_name, "main" ) )
+                    break;
+            }
+            if( p_parser == NULL )
+            {
+                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->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++;
+
+            do
+            {
+                p_item++;
+                if( !p_item )
                 {
-                    VLCTreeItem *o_now = [[VLCTreeItem alloc] initWithID: p_module->i_object_id parent:self];
-                    psz_help = strdup(GetCapabilityHelp( p_module->psz_capability, 1));
-                    psz_section = strdup(GetCapabilityHelp( p_module->psz_capability, 2));
-                    [o_now setName: [[NSApp localizedString:p_module->psz_object_name] retain]];
-                    [o_children addObject:o_now];
+                    msg_Err( p_intf, "invalid preference item found" );
+                    break;
                 }
+                if( p_item > p_end )
+                    break;
+                switch( p_item->i_type )
+                {
+                case CONFIG_SUBCATEGORY:
+                    break;
+                case CONFIG_CATEGORY:
+                    break;
+                case CONFIG_SECTION:
+                    break;
+                case CONFIG_HINT_USAGE:
+                    break;
+                default:
+                {
+                    VLCConfigControl *o_control = nil;
+            if( p_item->b_internal == VLC_TRUE )
+            {
+            break;
             }
-            [o_children retain];
+                    o_control = [VLCConfigControl newControl:p_item
+                                                  withView:o_view];
+                    if( o_control != nil )
+                    {
+                        [o_control setAutoresizingMask: NSViewMaxYMargin |
+                                                        NSViewWidthSizable];
+                        [o_subviews addObject: o_control];
+                    }
+                    break;
+                }
+                }
+            } while ( ( p_item < p_end ) &&
+                      ( p_item->i_type != CONFIG_SUBCATEGORY ) );
+
+            vlc_list_release( p_list );
         }
-        else
+    }
+
+    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 )
         {
-            /* all the other stuff are leafs */
-            o_children = IsALeafNode;
+            /* 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_children;
+    return o_view;
 }
 
-- (int)objectID
+- (void)applyChanges
 {
-    return i_object_id;
+    unsigned int i;
+    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];
 }
 
-- (NSString *)name
+- (void)resetView
 {
-    if( o_name ) return o_name;
-}
+    unsigned int i;
+    if( o_subviews != nil )
+    {
+        //Item has been shown
+        [o_subviews release];
+        o_subviews = nil;
+    }
 
-- (void)setName:(NSString *)a_name;
-{
-    if( o_name ) [o_name release];
-    o_name = [a_name copy];
+    if( o_children != IsALeafNode )
+        for( i = 0 ; i < [o_children count] ; i++ )
+            [[o_children objectAtIndex:i] resetView];
 }
 
-- (VLCTreeItem *)childAtIndex:(int)i_index
-{
-    return [[self children] objectAtIndex:i_index];
-}
+@end
+
+
+@implementation VLCFlippedView
 
-- (int)numberOfChildren
+- (BOOL)isFlipped
 {
-    id i_tmp = [self children];
-    return (i_tmp == IsALeafNode) ? (-1) : (int)[i_tmp count];
+    return( YES );
 }
 
 @end