* 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
- 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)
#include <sys/param.h> /* for MAXPATHLEN */
#include <string.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_config_cat.h>
-#include "intf.h"
-#include "prefs.h"
-#include "prefs_widgets.h"
-#include "vlc_keys.h"
+#import "intf.h"
+#import "prefs.h"
+#import "simple_prefs.h"
+#import "prefs_widgets.h"
+#import "vlc_keys.h"
+
+/* /!\ Warning: Unreadable code :/ */
/*****************************************************************************
* VLCPrefs implementation
- (void)awakeFromNib
{
p_intf = VLCIntf;
- b_advanced = config_GetInt( p_intf, "advanced" );
[self initStrings];
- [o_advanced_ckb setState: b_advanced];
[o_prefs_view setBorderType: NSGrooveBorder];
[o_prefs_view setHasVerticalScroller: YES];
[o_prefs_view setDrawsBackground: NO];
- (void)showPrefs
{
- /* load our nib (if not already loaded) */
- [NSBundle loadNibNamed:@"Preferences" owner:self];
-
+ [[o_basicFull_matrix cellAtRow:0 column:0] setState: NSOffState];
+ [[o_basicFull_matrix cellAtRow:0 column:1] setState: NSOnState];
+
[o_prefs_window center];
[o_prefs_window makeKeyAndOrderFront:self];
}
[o_save_btn setTitle: _NS("Save")];
[o_cancel_btn setTitle: _NS("Cancel")];
[o_reset_btn setTitle: _NS("Reset All")];
- [o_advanced_ckb setTitle: _NS("Advanced")];
+ [[o_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
+ [[o_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
}
- (IBAction)savePrefs: (id)sender
config_ResetAll( p_intf );
[[VLCTreeItem rootItem] resetView];
[[o_tree itemAtRow:[o_tree selectedRow]]
- showView:o_prefs_view advancedView:
- ( [o_advanced_ckb state] == NSOnState ) ? VLC_TRUE : VLC_FALSE];
+ showView:o_prefs_view];
}
}
-- (IBAction)advancedToggle: (id)sender
+- (IBAction)buttonAction: (id)sender
{
- b_advanced = !b_advanced;
- [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_prefs_window orderOut: self];
+ [[o_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState];
+ [[o_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState];
+ [[[VLCMain sharedInstance] getSimplePreferences] showSimplePrefs];
}
- (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];
}
@end
- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
{
- return (item == nil) ? YES : ( ([item numberOfChildren] != -1) &&
+ return (item == nil) ? YES : ( ([item numberOfChildren] != -1) &&
([item numberOfChildren] != 0));
}
intf_thread_t *p_intf = VLCIntf;
vlc_list_t *p_list;
module_t *p_module = NULL;
- module_config_t *p_item;
- int i_index;
-
- /* List the modules */
- p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
- if( !p_list ) return nil;
-
+ module_t *p_main_module;
+ module_config_t *p_items;
+ int i = 0;
if( [[self getName] isEqualToString: @"main"] )
{
- /*
- * Find the main module
- */
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ p_main_module = module_GetMainModule( p_intf );
+ assert( p_main_module );
+
+ /* 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;
+ unsigned int i_confsize;
+ p_items = module_GetConfig( p_main_module, &i_confsize );
+ o_children = [[NSMutableArray alloc] initWithCapacity:10];
+ for( int i = 0; i < i_confsize; i++ )
{
- p_module = (module_t *)p_list->p_values[i_index].p_object;
- if( !strcmp( p_module->psz_object_name, "main" ) )
- break;
- }
- if( p_module == NULL )
- {
- 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
+ NSString *o_child_name;
+ NSString *o_child_title;
+ NSString *o_child_help;
+ switch( p_items[i].i_type )
{
- NSString *o_child_name;
- NSString *o_child_title;
- NSString *o_child_help;
- switch( p_item->i_type )
- {
case CONFIG_CATEGORY:
- if( p_item->i_value == -1 ) break;
+ if( p_items[i].value.i == -1 ) break;
o_child_name = [[VLCMain sharedInstance]
- localizedString: config_CategoryNameGet( p_item->i_value )];
+ localizedString: config_CategoryNameGet( p_items[i].value.i )];
o_child_title = o_child_name;
o_child_help = [[VLCMain sharedInstance]
- localizedString: config_CategoryHelpGet( p_item->i_value )];
+ localizedString: config_CategoryHelpGet( p_items[i].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->i_value
+ ID: ((vlc_object_t*)p_main_module)->i_object_id
parent:self
children:[[NSMutableArray alloc]
initWithCapacity:10]
- whithCategory: p_item - p_module->p_config]];
+ whithCategory: p_items[i].value.i]];
break;
case CONFIG_SUBCATEGORY:
- if( p_item->i_value == -1 ) break;
-
- if( p_item->i_value != SUBCAT_PLAYLIST_GENERAL &&
- p_item->i_value != SUBCAT_VIDEO_GENERAL &&
- p_item->i_value != SUBCAT_INPUT_GENERAL &&
- p_item->i_value != SUBCAT_INTERFACE_GENERAL &&
- p_item->i_value != SUBCAT_SOUT_GENERAL &&
- p_item->i_value != SUBCAT_ADVANCED_MISC &&
- p_item->i_value != SUBCAT_AUDIO_GENERAL )
+ if( p_items[i].value.i == -1 ) break;
+
+ if( p_items[i].value.i != SUBCAT_PLAYLIST_GENERAL &&
+ p_items[i].value.i != SUBCAT_VIDEO_GENERAL &&
+ p_items[i].value.i != SUBCAT_INPUT_GENERAL &&
+ p_items[i].value.i != SUBCAT_INTERFACE_GENERAL &&
+ p_items[i].value.i != SUBCAT_SOUT_GENERAL &&
+ p_items[i].value.i != SUBCAT_ADVANCED_MISC &&
+ p_items[i].value.i != SUBCAT_AUDIO_GENERAL )
{
o_child_name = [[VLCMain sharedInstance]
- localizedString: config_CategoryNameGet( p_item->i_value ) ];
+ localizedString: config_CategoryNameGet( p_items[i].value.i ) ];
o_child_title = o_child_name;
o_child_help = [[VLCMain sharedInstance]
- localizedString: config_CategoryHelpGet( p_item->i_value ) ];
+ localizedString: config_CategoryHelpGet( p_items[i].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->i_value
+ ID: ((vlc_object_t*)p_main_module)->i_object_id
parent:p_last_category
children:[[NSMutableArray alloc]
initWithCapacity:10]
- whithCategory: p_item - p_module->p_config]];
+ whithCategory: p_items[i].value.i]];
}
-
+
break;
default:
break;
- }
- } while( p_item->i_type != CONFIG_HINT_END && p_item++ );
+ }
}
+ vlc_object_release( (vlc_object_t *)p_main_module );
+
+ /* List the modules */
+ p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ if( !p_list ) return nil;
+
/* Build a tree of the plugins */
/* Add the capabilities */
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ for( i = 0; i < p_list->i_count; i++ )
{
- p_module = (module_t *)p_list->p_values[i_index].p_object;
+ unsigned int confsize;
+ p_module = (module_t *)p_list->p_values[i].p_object;
/* Exclude the main module */
- if( !strcmp( p_module->psz_object_name, "main" ) )
+ if( module_IsMainModule( p_module ) )
continue;
/* Exclude empty plugins (submodules don't have config */
/* options, they are stored in the parent module) */
- if( p_module->b_submodule )
- continue;
- else
- p_item = p_module->p_config;
+ p_items = module_GetConfig( p_module, &confsize );
+
+ unsigned int j;
- if( !p_item ) continue;
int i_category = -1;
int i_subcategory = -1;
- int i_options = 0;
- do
+ bool b_item = false;
+
+ for( j = 0; j < confsize; j++ )
{
- if( p_item->i_type == CONFIG_CATEGORY )
- i_category = p_item->i_value;
- else if( p_item->i_type == CONFIG_SUBCATEGORY )
- i_subcategory = p_item->i_value;
-
- if( p_item->i_type & CONFIG_ITEM )
- i_options ++;
- if( i_options > 0 && i_category >= 0 && i_subcategory >= 0 )
+ if( p_items[j].i_type == CONFIG_CATEGORY )
+ i_category = p_items[j].value.i;
+ else if( p_items[j].i_type == CONFIG_SUBCATEGORY )
+ i_subcategory = p_items[j].value.i;
+
+ if( p_items[j].i_type & CONFIG_ITEM )
+ b_item = true;
+
+ if( b_item && i_category >= 0 && i_subcategory >= 0 )
break;
- } while( p_item->i_type != CONFIG_HINT_END && p_item++ );
- if( !i_options ) continue;
+ }
+
+ if( !b_item ) continue;
/* Find the right category item */
long cookie;
- vlc_bool_t b_found = VLC_FALSE;
- unsigned int i;
+ bool b_found = false;
+
VLCTreeItem* p_category_item, * p_subcategory_item;
- for (i = 0 ; i < [o_children count] ; i++)
+ for (j = 0 ; j < [o_children count] ; j++)
{
- p_category_item = [o_children objectAtIndex: i];
- if( p_category_item->i_object_id == i_category )
+ p_category_item = [o_children objectAtIndex: j];
+ if( p_category_item->i_object_category == i_category )
{
- b_found = VLC_TRUE;
+ b_found = true;
break;
}
}
if( !b_found ) continue;
/* Find subcategory item */
- b_found = VLC_FALSE;
+ b_found = false;
cookie = -1;
- for (i = 0 ; i < [p_category_item->o_children count] ; i++)
+ for (j = 0 ; j < [p_category_item->o_children count] ; j++)
{
p_subcategory_item = [p_category_item->o_children
- objectAtIndex: i];
- if( p_subcategory_item->i_object_id == i_subcategory )
+ objectAtIndex: j];
+ if( p_subcategory_item->i_object_category == i_subcategory )
{
- b_found = VLC_TRUE;
+ b_found = true;
break;
}
}
[p_subcategory_item->o_children addObject:[[VLCTreeItem alloc]
initWithName:[[VLCMain sharedInstance]
- localizedString: p_module->psz_shortname ?
- p_module->psz_shortname : p_module->psz_object_name ]
+ localizedString: module_GetName( p_module, false ) ]
withTitle:[[VLCMain sharedInstance]
- localizedString: p_module->psz_longname ?
- p_module->psz_longname : p_module->psz_object_name ]
+ localizedString: module_GetLongName( p_module ) ]
withHelp: @""
- ID: p_module->i_object_id
+ ID: ((vlc_object_t*)p_module)->i_object_id
parent:p_subcategory_item
children:IsALeafNode
whithCategory: -1]];
}
+ vlc_list_release( p_list );
}
- vlc_list_release( p_list );
}
return o_children;
}
{
p_parser = (module_t *)p_list->p_values[i_index].p_object ;
- if( !strcmp( p_parser->psz_object_name, psz_module_name ) )
+ if( !strcmp( module_GetObjName( p_parser ), psz_module_name ) )
{
- BOOL b_has_prefs = p_parser->i_config_items != 0;
+ unsigned int confsize;
+ module_GetConfig( p_parser, &confsize );
+ BOOL b_has_prefs = confsize != 0;
vlc_list_release( p_list );
return( b_has_prefs );
}
}
- (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] ); */
+ /* 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 |
{
intf_thread_t *p_intf = VLCIntf;
vlc_list_t *p_list;
- module_t *p_parser = NULL;
- module_config_t *p_item;
+ module_t *p_module = NULL;
+ module_t *p_main_module;
+ module_config_t *p_items;
+ unsigned int confsize;
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 )
- {
- /* 0OOoo something went really bad */
- return nil;
- }
- p_item = p_parser->p_config;
+ p_module = (module_t *) vlc_object_get( i_object_id );
+ assert( p_module );
- p_item = p_parser->p_config + 1;
+ p_items = module_GetConfig( p_module, &confsize );
- do
+ for( unsigned int i = 0; i < confsize; i++ )
{
- if( !p_item )
- {
- msg_Err( p_intf, "invalid preference item found" );
- break;
- }
- switch(p_item->i_type)
- {
- case CONFIG_SUBCATEGORY:
- break;
- case CONFIG_CATEGORY:
- break;
- case CONFIG_SECTION:
- break;
- case CONFIG_HINT_END:
- break;
- case CONFIG_HINT_USAGE:
- break;
- default:
+ switch( p_items[i].i_type )
{
- VLCConfigControl *o_control = nil;
- o_control = [VLCConfigControl newControl:p_item
- withView:o_view];
- if( o_control != nil )
+ case CONFIG_SUBCATEGORY:
+ case CONFIG_CATEGORY:
+ case CONFIG_SECTION:
+ case CONFIG_HINT_USAGE:
+ break;
+ default:
{
- [o_control setAutoresizingMask: NSViewMaxYMargin |
- NSViewWidthSizable];
- [o_subviews addObject: o_control];
+ VLCConfigControl *o_control = nil;
+ o_control = [VLCConfigControl newControl:&p_items[i]
+ withView:o_view];
+ if( o_control )
+ {
+ [o_control setAutoresizingMask: NSViewMaxYMargin |
+ NSViewWidthSizable];
+ [o_subviews addObject: o_control];
+ }
}
- }
break;
}
- } while( p_item++->i_type != CONFIG_HINT_END );
-
- vlc_object_release( p_parser );
+ }
+ vlc_object_release( (vlc_object_t*)p_module );
}
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_item = (p_parser->p_config + i_object_category);
- if( ( p_item->i_type == CONFIG_CATEGORY ) &&
- ( ( p_item->i_value == CAT_PLAYLIST ) ||
- ( p_item->i_value == CAT_AUDIO ) ||
- ( p_item->i_value == CAT_VIDEO ) ||
- ( p_item->i_value == CAT_INTERFACE ) ||
- ( p_item->i_value == CAT_INPUT ) ||
- ( p_item->i_value == CAT_SOUT ) ) )
- p_item++;
-
- do
+ p_main_module = module_GetMainModule( p_intf );
+ assert( p_main_module );
+ module_config_t *p_items;
+
+ unsigned int i, confsize;
+ p_items = module_GetConfig( p_main_module, &confsize );
+
+ /* We need to first, find the right (sub)category,
+ * and then abort when we find a new (sub)category. Part of the Ugliness. */
+ bool in_right_category = false;
+ bool in_subcategory = false;
+ bool done = false;
+ for( i = 0; i < confsize; i++ )
{
- p_item++;
- if( !p_item )
+ if( !p_items[i].i_type )
{
msg_Err( p_intf, "invalid preference item found" );
break;
}
- switch( p_item->i_type )
- {
- case CONFIG_SUBCATEGORY:
- break;
- case CONFIG_CATEGORY:
- break;
- case CONFIG_SECTION:
- break;
- case CONFIG_HINT_END:
- break;
- case CONFIG_HINT_USAGE:
- break;
- default:
+
+ switch( p_items[i].i_type )
{
- VLCConfigControl *o_control = nil;
- if( p_item->b_internal == VLC_TRUE )
- {
- break;
- }
- o_control = [VLCConfigControl newControl:p_item
- withView:o_view];
- if( o_control != nil )
+ case CONFIG_CATEGORY:
+ if(!in_right_category && p_items[i].value.i == i_object_category)
+ in_right_category = true;
+ else if(in_right_category)
+ done = true;
+ break;
+ case CONFIG_SUBCATEGORY:
+ if(!in_right_category && p_items[i].value.i == i_object_category)
+ {
+ in_right_category = true;
+ in_subcategory = true;
+ }
+ else if(in_right_category && in_subcategory)
+ done = true;
+ break;
+ case CONFIG_SECTION:
+ case CONFIG_HINT_USAGE:
+ break;
+ default:
{
- [o_control setAutoresizingMask: NSViewMaxYMargin |
- NSViewWidthSizable];
- [o_subviews addObject: o_control];
+ if(!in_right_category) break;
+
+ VLCConfigControl *o_control = nil;
+ o_control = [VLCConfigControl newControl:&p_items[i]
+ withView:o_view];
+ if( o_control != nil )
+ {
+ [o_control setAutoresizingMask: NSViewMaxYMargin |
+ NSViewWidthSizable];
+ [o_subviews addObject: o_control];
+ }
+ break;
}
- break;
- }
}
- } while ( ( p_item->i_type != CONFIG_HINT_END ) &&
- ( p_item->i_type != CONFIG_SUBCATEGORY ) );
-
- vlc_list_release( p_list );
+ if( done ) break;
+ }
+ vlc_object_release( (vlc_object_t*)p_main_module );
}
}
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] )
+ 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
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];
projects / vlc / blobdiff