/*****************************************************************************
- * prefs.m: MacOS X plugin for vlc
+ * prefs.m: MacOS X module for vlc
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: prefs.m,v 1.31 2003/06/06 00:38:41 hartman Exp $
+ * Copyright (C) 2002-2006 the VideoLAN team
+ * $Id$
*
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
- * Derk-Jan Hartman <thedj at users.sf.net>
+ * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
+ * 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
+ - 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 <sys/param.h> /* for MAXPATHLEN */
#include <string.h>
-#include "intf.h"
-#include "prefs.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_config_cat.h>
+
+#import "intf.h"
+#import "prefs.h"
+#import "simple_prefs.h"
+#import "prefs_widgets.h"
+#import "vlc_keys.h"
+
+/* /!\ Warning: Unreadable code :/ */
+
+@interface VLCTreeItem : NSObject
+{
+ NSString *_name;
+ NSMutableArray *_children;
+ NSMutableArray *_options;
+ NSMutableArray *_subviews;
+}
+
+- (id)initWithName:(NSString*)name;
+
+- (int)numberOfChildren;
+- (VLCTreeItem *)childAtIndex:(NSInteger)i_index;
+
+- (NSString *)name;
+- (NSMutableArray *)children;
+- (NSMutableArray *)options;
+- (void)showView:(NSScrollView *)o_prefs_view;
+- (void)applyChanges;
+- (void)resetView;
+
+@end
+
+/* CONFIG_SUBCAT */
+@interface VLCTreeSubCategoryItem : VLCTreeItem
+{
+ int _subCategory;
+}
++ (VLCTreeSubCategoryItem *)subCategoryTreeItemWithSubCategory:(int)subCategory;
+- (id)initWithSubCategory:(int)subCategory;
+- (int)subCategory;
+@end
+
+/* Plugin daughters */
+@interface VLCTreePluginItem : VLCTreeItem
+{
+ module_config_t * _configItems;
+ unsigned int _configSize;
+}
++ (VLCTreePluginItem *)pluginTreeItemWithPlugin:(module_t *)plugin;
+- (id)initWithPlugin:(module_t *)plugin;
+
+- (module_config_t *)configItems;
+- (unsigned int)configSize;
+@end
+
+/* CONFIG_CAT */
+@interface VLCTreeCategoryItem : VLCTreeItem
+{
+ int _category;
+}
++ (VLCTreeCategoryItem *)categoryTreeItemWithCategory:(int)category;
+- (id)initWithCategory:(int)category;
+
+- (int)category;
+- (VLCTreeSubCategoryItem *)itemRepresentingSubCategory:(int)category;
+@end
+
+/* individual options. */
+@interface VLCTreeLeafItem : VLCTreeItem
+{
+ module_config_t * _configItem;
+}
+- (id)initWithConfigItem:(module_config_t *)configItem;
+
+- (module_config_t *)configItem;
+@end
+
+@interface VLCTreeMainItem : VLCTreePluginItem
+{
+}
+- (VLCTreeCategoryItem *)itemRepresentingCategory:(int)category;
+@end
+
+#pragma mark -
/*****************************************************************************
* 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_sharedMainInstance = [super init];
+ p_intf = VLCIntf;
o_empty_view = [[NSView alloc] init];
+ _rootTreeItem = [[VLCTreeMainItem alloc] init];
}
- return( self );
+ return _o_sharedMainInstance;
}
- (void)dealloc
{
[o_empty_view release];
+ [_rootTreeItem release];
[super dealloc];
}
- (void)awakeFromNib
{
- p_intf = [NSApp getIntf];
- b_advanced = config_GetInt( p_intf, "advanced" );
+ p_intf = VLCIntf;
[self initStrings];
- [o_advanced_ckb setState: b_advanced];
[o_prefs_view setBorderType: NSGrooveBorder];
[o_prefs_view setHasVerticalScroller: YES];
[o_prefs_view setDrawsBackground: NO];
- [o_prefs_view setRulersVisible: YES];
[o_prefs_view setDocumentView: o_empty_view];
- [o_tree selectRow:0 byExtendingSelection:NO];
+ [o_tree selectRowIndexes: [NSIndexSet indexSetWithIndex: 0] byExtendingSelection: NO];
}
-- (void)initStrings
+- (void)setTitle: (NSString *) o_title_name
{
- [o_prefs_window setTitle: _NS("Preferences")];
- [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_title setStringValue: o_title_name];
}
- (void)showPrefs
{
+ [[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];
+ [_rootTreeItem resetView];
+}
+
+- (void)initStrings
+{
+ [o_prefs_window setTitle: _NS("Preferences")];
+ [o_save_btn setTitle: _NS("Save")];
+ [o_cancel_btn setTitle: _NS("Cancel")];
+ [o_reset_btn setTitle: _NS("Reset All")];
+ [[o_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
+ [[o_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
}
- (IBAction)savePrefs: (id)sender
{
+ /* TODO: call savePrefs on Root item */
+ [_rootTreeItem applyChanges];
config_SaveConfigFile( p_intf, NULL );
[o_prefs_window orderOut:self];
}
- (IBAction)resetAll: (id)sender
{
- NSBeginInformationalAlertSheet(_NS("Reset Preferences"), @"Cancel", @"Continue",
- nil, o_prefs_window, self, @selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil,
- _NS("Beware this will reset your VLC Media Player config file.\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 )
{
config_ResetAll( p_intf );
- [self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID]
- andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]];
+ [_rootTreeItem resetView];
}
}
-- (IBAction)advancedToggle: (id)sender
+- (IBAction)buttonAction: (id)sender
{
- b_advanced = !b_advanced;
- [o_advanced_ckb setState: b_advanced];
- [self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID]
- andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]];
+ [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] simplePreferences] showSimplePrefs];
}
- (void)loadConfigTree
{
-
}
- (void)outlineViewSelectionIsChanging:(NSNotification *)o_notification
{
}
+/* update the document view to the view of the selected tree item */
- (void)outlineViewSelectionDidChange:(NSNotification *)o_notification
{
- [self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID]
- andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]];
+ [[o_tree itemAtRow:[o_tree selectedRow]] showView: o_prefs_view];
+ [o_tree expandItem:[o_tree itemAtRow:[o_tree selectedRow]]];
}
-- (void)configChanged:(id)o_unknown
-{
- id o_vlc_config = [o_unknown isKindOfClass: [NSNotification class]] ?
- [o_unknown object] : o_unknown;
-
- int i_type = [o_vlc_config configType];
- NSString *o_name = [o_vlc_config configName];
- char *psz_name = (char *)[o_name UTF8String];
-
- switch( i_type )
- {
-
- case CONFIG_ITEM_MODULE:
- {
- char *psz_value;
- module_t *p_a_module;
- int i_id = [[o_vlc_config selectedItem] tag];
-
- p_a_module = (module_t *)vlc_object_get( p_intf, i_id );
- if( p_a_module == NULL || p_a_module->i_object_type != VLC_OBJECT_MODULE )
- {
- i_id = -1;
- }
-
- psz_value = ( i_id == -1 ) ? "" : p_a_module->psz_object_name ;
- config_PutPsz( p_intf, psz_name, strdup(psz_value) );
- }
- break;
+@end
- case CONFIG_ITEM_STRING:
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_DIRECTORY:
- {
- char *psz_value;
- NSString *o_value;
+@implementation VLCPrefs (NSTableDataSource)
- o_value = [o_vlc_config stringValue];
- psz_value = (char *)[o_value UTF8String];
+- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
+{
+ return (item == nil) ? [_rootTreeItem numberOfChildren] : [item numberOfChildren];
+}
- config_PutPsz( p_intf, psz_name, psz_value );
- }
- break;
+- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
+{
+ return (item == nil) ? [_rootTreeItem numberOfChildren] : [item numberOfChildren];
+}
- case CONFIG_ITEM_INTEGER:
- case CONFIG_ITEM_BOOL:
- {
- int i_value = [o_vlc_config intValue];
+- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item
+{
+ return (item == nil) ? (id)[_rootTreeItem childAtIndex:index]: (id)[item childAtIndex:index];
+}
- config_PutInt( p_intf, psz_name, i_value );
- }
- break;
+- (id)outlineView:(NSOutlineView *)outlineView
+ objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
+{
+ return (item == nil) ? @"" : [item name];
+}
- case CONFIG_ITEM_FLOAT:
- {
- float f_value = [o_vlc_config floatValue];
+@end
- config_PutFloat( p_intf, psz_name, f_value );
- }
- break;
+#pragma mark -
+@implementation VLCTreeMainItem
+- (VLCTreeCategoryItem *)itemRepresentingCategory:(int)category
+{
+ for( int i = 0; i < [[self children] count]; i++ )
+ {
+ VLCTreeCategoryItem * categoryItem = [[self children] objectAtIndex:i];
+ if( [categoryItem category] == category )
+ return categoryItem;
}
+ return nil;
}
-- (void)showViewForID: (int)i_id andName: (NSString *)o_item_name
+- (bool)isSubCategoryGeneral:(int)category
{
- vlc_list_t *p_list;
- module_t *p_parser;
- module_config_t *p_item;
-
- int i_pos, i_module_tag, i_index;
-
- NSString *o_module_name;
- NSRect s_rc; /* rect */
- NSView *o_view; /* view */
- NSRect s_vrc; /* view rect */
- VLCTextField *o_text_field; /* input field / label */
-
- p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
-
- /* Get a pointer to the module */
- p_parser = (module_t *)vlc_object_get( p_intf, i_id );
- if( p_parser->i_object_type != VLC_OBJECT_MODULE )
+ if(category == SUBCAT_VIDEO_GENERAL ||
+ category == SUBCAT_ADVANCED_MISC ||
+ category == SUBCAT_INPUT_GENERAL ||
+ category == SUBCAT_INTERFACE_GENERAL ||
+ category == SUBCAT_SOUT_GENERAL||
+ category == SUBCAT_PLAYLIST_GENERAL||
+ category == SUBCAT_AUDIO_GENERAL )
{
- /* 0OOoo something went really bad */
- return;
- }
-
- /* Enumerate config options and add corresponding config boxes */
- o_module_name = [NSString stringWithUTF8String: p_parser->psz_object_name];
- p_item = p_parser->p_config;
-
- i_pos = 0;
- o_view = nil;
- i_module_tag = 3;
-
-#define X_ORIGIN 20
-#define Y_ORIGIN (X_ORIGIN - 10)
-
-#define CHECK_VIEW_HEIGHT \
- { \
- float f_new_pos = s_rc.origin.y + s_rc.size.height + X_ORIGIN; \
- if( f_new_pos > s_vrc.size.height ) \
- { \
- s_vrc.size.height = f_new_pos; \
- [o_view setFrame: s_vrc]; \
- } \
+ return true;
}
+ return false;
+}
-#define CONTROL_LABEL( label ) \
- { \
- s_rc.origin.x += s_rc.size.width + 10; \
- s_rc.size.width = s_vrc.size.width - s_rc.origin.x - X_ORIGIN - 20; \
- o_text_field = [[NSTextField alloc] initWithFrame: s_rc]; \
- [o_text_field setDrawsBackground: NO]; \
- [o_text_field setBordered: NO]; \
- [o_text_field setEditable: NO]; \
- [o_text_field setSelectable: NO]; \
- if ( label ) \
- { \
- [o_text_field setStringValue: \
- [NSApp localizedString: label]]; \
- } \
- [o_text_field sizeToFit]; \
- [o_view addSubview: [o_text_field autorelease]]; \
- }
+/* Creates and returns the array of children
+ * Loads children incrementally */
+- (NSMutableArray *)children
+{
+ if( _children ) return _children;
+ _children = [[NSMutableArray alloc] init];
-#define INPUT_FIELD( ctype, cname, label, w, msg, param, tip ) \
- { \
- char * psz_duptip = NULL; \
- if ( p_item->psz_longtext != NULL ) \
- psz_duptip = strdup( p_item->psz_longtext ); \
- s_rc.size.height = 25; \
- s_rc.size.width = w; \
- s_rc.origin.y += 10; \
- CHECK_VIEW_HEIGHT; \
- o_text_field = [[VLCTextField alloc] initWithFrame: s_rc]; \
- [o_text_field setAlignment: NSRightTextAlignment]; \
- CONTROL_CONFIG( o_text_field, o_module_name, ctype, cname ); \
- [o_text_field msg: param]; \
- if ( psz_duptip != NULL ) \
- { \
- [o_text_field setToolTip: [NSApp wrapString: [NSApp localizedString: \
- psz_duptip] toWidth: PREFS_WRAP ]]; \
- free(psz_duptip);\
- } \
- [o_view addSubview: [o_text_field autorelease]]; \
- [[NSNotificationCenter defaultCenter] addObserver: self \
- selector: @selector(configChanged:) \
- name: NSControlTextDidChangeNotification \
- object: o_text_field]; \
- CONTROL_LABEL( label ); \
- s_rc.origin.y += s_rc.size.height; \
- s_rc.origin.x = X_ORIGIN; \
- }
+ intf_thread_t *p_intf = VLCIntf;
+
+ /* List the modules */
+ size_t count, i;
+ module_t ** modules = module_list_get( &count );
+ if( !modules ) return nil;
-#define INPUT_FIELD_INTEGER( name, label, w, param, tip ) \
- INPUT_FIELD( CONFIG_ITEM_INTEGER, name, label, w, setIntValue, param, tip )
-#define INPUT_FIELD_FLOAT( name, label, w, param, tip ) \
- INPUT_FIELD( CONFIG_ITEM_FLOAT, name, label, w, setFloatValue, param, tip )
-#define INPUT_FIELD_STRING( name, label, w, param, tip ) \
- INPUT_FIELD( CONFIG_ITEM_STRING, name, label, w, setStringValue, param, tip )
-
- /* Init View */
- s_vrc = [[o_prefs_view contentView] bounds]; s_vrc.size.height -= 4;
- o_view = [[VLCFlippedView alloc] initWithFrame: s_vrc];
- s_rc.origin.x = X_ORIGIN;
- s_rc.origin.y = Y_ORIGIN;
- BOOL b_right_cat = FALSE;
-
- if( p_item ) do
+ /* Build a tree of the plugins */
+ /* Add the capabilities */
+ for( i = 0; i < count; i++ )
{
- if( p_item->i_type == CONFIG_HINT_CATEGORY )
- {
- if( !strcmp( p_parser->psz_object_name, "main" ) &&
- [o_item_name isEqualToString: [NSApp localizedString: p_item->psz_text]] )
- {
- b_right_cat = TRUE;
- } else if( strcmp( p_parser->psz_object_name, "main" ) )
- {
- b_right_cat = TRUE;
- } else b_right_cat = FALSE;
- } else if( p_item->i_type == CONFIG_HINT_END && !strcmp( p_parser->psz_object_name, "main" ) )
- {
- b_right_cat = FALSE;
- }
-
- if( (p_item->b_advanced && !b_advanced ) || !b_right_cat )
+ VLCTreeCategoryItem * categoryItem = nil;
+ VLCTreeSubCategoryItem * subCategoryItem = nil;
+ VLCTreePluginItem * pluginItem = nil;
+ module_config_t *p_configs = NULL;
+ int lastsubcat = 0;
+ unsigned int confsize;
+
+ module_t * p_module = modules[i];
+
+ /* Exclude empty plugins (submodules don't have config */
+ /* options, they are stored in the parent module) */
+ if( module_is_main( p_module) )
{
- continue;
+ pluginItem = self;
+ _configItems = module_config_get( p_module, &confsize );
+ _configSize = confsize;
+ } else {
+ pluginItem = [VLCTreePluginItem pluginTreeItemWithPlugin: p_module];
+ confsize = [pluginItem configSize];
}
- switch( p_item->i_type )
+ p_configs = [pluginItem configItems];
+
+ unsigned int j;
+ for( j = 0; j < confsize; j++ )
{
- case CONFIG_ITEM_MODULE:
+ int configType = p_configs[j].i_type;
+ if( configType == CONFIG_CATEGORY )
{
- VLCPopUpButton *o_modules;
- module_t *p_a_module;
- char * psz_duptip = NULL;
-
- if ( p_item->psz_longtext != NULL )
- psz_duptip = strdup( p_item->psz_longtext );
-
- s_rc.size.height = 30;
- s_rc.size.width = 200;
- s_rc.origin.y += 10;
-
- CHECK_VIEW_HEIGHT;
-
- o_modules = [[VLCPopUpButton alloc] initWithFrame: s_rc];
- CONTROL_CONFIG( o_modules, o_module_name,
- CONFIG_ITEM_MODULE, p_item->psz_name );
- [o_modules setTarget: self];
- [o_modules setAction: @selector(configChanged:)];
- [o_modules sendActionOn:NSLeftMouseUpMask];
-
- if ( psz_duptip != NULL )
+ categoryItem = [self itemRepresentingCategory:p_configs[j].value.i];
+ if(!categoryItem)
{
- [o_modules setToolTip: [NSApp wrapString: [NSApp localizedString: psz_duptip] toWidth: PREFS_WRAP]];
- free( psz_duptip );
- }
- [o_view addSubview: [o_modules autorelease]];
-
- [o_modules addItemWithTitle: _NS("Default")];
- [[o_modules lastItem] setTag: -1];
- [o_modules selectItem: [o_modules lastItem]];
-
- /* build a list of available modules */
- {
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
- {
- p_a_module = (module_t *)p_list->p_values[i_index].p_object ;
-
- if( !strcmp( p_a_module->psz_capability,
- p_item->psz_type ) )
- {
- NSString *o_description = [NSApp
- localizedString: p_a_module->psz_longname];
- [o_modules addItemWithTitle: o_description];
- [[o_modules lastItem] setTag: p_a_module->i_object_id];
-
- if( p_item->psz_value &&
- !strcmp( p_item->psz_value, p_a_module->psz_object_name ) )
- {
- [o_modules selectItem:[o_modules lastItem]];
- }
- }
- }
+ categoryItem = [VLCTreeCategoryItem categoryTreeItemWithCategory:p_configs[j].value.i];
+ if(categoryItem) [[self children] addObject:categoryItem];
}
-
- CONTROL_LABEL( p_item->psz_text );
- s_rc.origin.y += s_rc.size.height;
- s_rc.origin.x = X_ORIGIN;
}
- break;
-
- case CONFIG_ITEM_STRING:
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_DIRECTORY:
+ else if( configType == CONFIG_SUBCATEGORY )
{
-
- if( !p_item->ppsz_list )
+ lastsubcat = p_configs[j].value.i;
+ if( categoryItem && ![self isSubCategoryGeneral:lastsubcat] )
{
- char *psz_value = p_item->psz_value ?
- p_item->psz_value : "";
-
- INPUT_FIELD_STRING( p_item->psz_name, p_item->psz_text, 200,
- [NSApp localizedString: psz_value],
- p_item->psz_longtext );
- }
- else
- {
- int i;
- VLCComboBox *o_combo_box;
- char * psz_duptip = NULL;
- if ( p_item->psz_longtext != NULL )
- psz_duptip = strdup( p_item->psz_longtext );
-
- s_rc.size.height = 27;
- s_rc.size.width = 200;
- s_rc.origin.y += 10;
-
- CHECK_VIEW_HEIGHT;
-
- o_combo_box = [[VLCComboBox alloc] initWithFrame: s_rc];
- CONTROL_CONFIG( o_combo_box, o_module_name,
- CONFIG_ITEM_STRING, p_item->psz_name );
- [o_combo_box setTarget: self];
- [o_combo_box setAction: @selector(configChanged:)];
- [o_combo_box sendActionOn:NSLeftMouseUpMask];
-
- if ( psz_duptip != NULL )
- {
- [o_combo_box setToolTip: [NSApp wrapString: [NSApp localizedString: psz_duptip] toWidth: PREFS_WRAP]];
- free( psz_duptip );
- }
- [o_view addSubview: [o_combo_box autorelease]];
-
- for( i=0; p_item->ppsz_list[i]; i++ )
+ subCategoryItem = [categoryItem itemRepresentingSubCategory:lastsubcat];
+ if(!subCategoryItem)
{
- [o_combo_box addItemWithObjectValue:
- [NSApp localizedString: p_item->ppsz_list[i]]];
+ subCategoryItem = [VLCTreeSubCategoryItem subCategoryTreeItemWithSubCategory:lastsubcat];
+ if(subCategoryItem) [[categoryItem children] addObject:subCategoryItem];
}
- [o_combo_box setStringValue: [NSApp localizedString:
- p_item->psz_value ? p_item->psz_value : ""]];
-
- CONTROL_LABEL( p_item->psz_text );
-
- s_rc.origin.y += s_rc.size.height;
- s_rc.origin.x = X_ORIGIN;
}
-
}
- break;
-
- case CONFIG_ITEM_INTEGER:
- {
- if( p_item->i_min == p_item->i_max )
- {
- INPUT_FIELD_INTEGER( p_item->psz_name, p_item->psz_text, 70,
- p_item->i_value, p_item->psz_longtext );
- }
- else
- {
- /*create a slider */
- VLCSlider *o_slider;
- char * psz_duptip = NULL;
- if ( p_item->psz_longtext != NULL )
- psz_duptip = strdup( p_item->psz_longtext );
-
- s_rc.size.height = 27;
- s_rc.size.width = 200;
- s_rc.origin.y += 10;
-
- CHECK_VIEW_HEIGHT;
-
- o_slider = [[VLCSlider alloc] initWithFrame: s_rc];
- [o_slider setMinValue: p_item->i_min];
- [o_slider setMaxValue: p_item->i_max];
- [o_slider setIntValue: p_item->i_value];
-
- if ( psz_duptip != NULL )
- {
- [o_slider setToolTip: [NSApp wrapString: [NSApp localizedString: psz_duptip] toWidth: PREFS_WRAP]];
- free( psz_duptip );
- }
- [o_slider setTarget: self];
- [o_slider setAction: @selector(configChanged:)];
- [o_slider sendActionOn:NSLeftMouseUpMask];
- CONTROL_CONFIG( o_slider, o_module_name,
- CONFIG_ITEM_INTEGER, p_item->psz_name );
- [o_view addSubview: [o_slider autorelease]];
- CONTROL_LABEL( p_item->psz_text );
-
- s_rc.origin.y += s_rc.size.height;
- s_rc.origin.x = X_ORIGIN;
- }
- }
- break;
-
- case CONFIG_ITEM_FLOAT:
+
+ if( module_is_main( p_module) && (configType & CONFIG_ITEM) )
{
- if( p_item->f_min == p_item->f_max )
+ if( categoryItem && [self isSubCategoryGeneral:lastsubcat] )
{
- INPUT_FIELD_FLOAT( p_item->psz_name, p_item->psz_text, 70,
- p_item->f_value, p_item->psz_longtext );
+ [[categoryItem options] addObject:[[VLCTreeLeafItem alloc] initWithConfigItem:&p_configs[j]]];
}
- else
+ else if( subCategoryItem )
{
- /* create a slider */
- VLCSlider *o_slider;
- char * psz_duptip = NULL;
- if ( p_item->psz_longtext != NULL )
- psz_duptip = strdup( p_item->psz_longtext );
-
- s_rc.size.height = 27;
- s_rc.size.width = 200;
- s_rc.origin.y += 10;
-
- CHECK_VIEW_HEIGHT;
-
- o_slider = [[VLCSlider alloc] initWithFrame: s_rc];
- [o_slider setMinValue: p_item->f_min];
- [o_slider setMaxValue: p_item->f_max];
- [o_slider setFloatValue: p_item->f_value];
-
- if ( psz_duptip != NULL )
- {
- [o_slider setToolTip: [NSApp wrapString: [NSApp localizedString: psz_duptip] toWidth: PREFS_WRAP]];
- free( psz_duptip );
- }
- [o_slider setTarget: self];
- [o_slider setAction: @selector(configChanged:)];
- [o_slider sendActionOn:NSLeftMouseUpMask];
- CONTROL_CONFIG( o_slider, o_module_name,
- CONFIG_ITEM_FLOAT, p_item->psz_name );
- [o_view addSubview: [o_slider autorelease]];
- CONTROL_LABEL( p_item->psz_text );
-
- s_rc.origin.y += s_rc.size.height;
- s_rc.origin.x = X_ORIGIN;
+ [[subCategoryItem options] addObject:[[VLCTreeLeafItem alloc] initWithConfigItem:&p_configs[j]]];
}
}
- break;
-
- case CONFIG_ITEM_BOOL:
+ else if( !module_is_main( p_module) && (configType & CONFIG_ITEM))
{
- VLCButton *o_btn_bool;
- char * psz_duptip = NULL;
-
- if ( p_item->psz_longtext != NULL )
- psz_duptip = strdup( p_item->psz_longtext );
-
- s_rc.size.height = 27;
- s_rc.size.width = s_vrc.size.width - X_ORIGIN * 2 - 20;
- s_rc.origin.y += 10;
-
- CHECK_VIEW_HEIGHT;
-
- o_btn_bool = [[VLCButton alloc] initWithFrame: s_rc];
- [o_btn_bool setButtonType: NSSwitchButton];
- [o_btn_bool setIntValue: p_item->i_value];
- [o_btn_bool setTitle: [NSApp localizedString: p_item->psz_text]];
- if ( psz_duptip != NULL )
+ if( ![[subCategoryItem children] containsObject: pluginItem] )
{
- [o_btn_bool setToolTip: [NSApp wrapString: [NSApp localizedString: psz_duptip] toWidth: PREFS_WRAP]];
- free( psz_duptip );
+ [[subCategoryItem children] addObject:pluginItem];
}
- [o_btn_bool setTarget: self];
- [o_btn_bool setAction: @selector(configChanged:)];
- CONTROL_CONFIG( o_btn_bool, o_module_name,
- CONFIG_ITEM_BOOL, p_item->psz_name );
- [o_view addSubview: [o_btn_bool autorelease]];
-
- s_rc.origin.y += s_rc.size.height;
- }
- break;
-
+ if( pluginItem )
+ [[pluginItem options] addObject:[[VLCTreeLeafItem alloc] initWithConfigItem:&p_configs[j]]];
}
-
- #undef INPUT_FIELD_INTEGER
- #undef INPUT_FIELD_FLOAT
- #undef INPUT_FIELD_STRING
- #undef INPUT_FIELD
- #undef CHECK_VIEW_HEIGHT
- #undef CONTROL_LABEL
- #undef Y_ORIGIN
- #undef X_ORIGIN
}
- while( p_item->i_type != CONFIG_HINT_END && p_item++ );
- vlc_list_release( p_list );
-
- [o_prefs_view setDocumentView: o_view];
- [o_prefs_view setNeedsDisplay: TRUE];
+ }
+ module_list_free( modules );
+ return _children;
}
-
-
@end
-@implementation VLCPrefs (NSTableDataSource)
-
-- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
- return (item == nil) ? [[VLCTreeItem rootItem] numberOfChildren] : [item numberOfChildren];
+#pragma mark -
+@implementation VLCTreeCategoryItem
++ (VLCTreeCategoryItem *)categoryTreeItemWithCategory:(int)category
+{
+ if(!config_CategoryNameGet( category )) return nil;
+ return [[[[self class] alloc] initWithCategory:category] autorelease];
}
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
- return (item == nil) ? YES : ([item numberOfChildren] != -1);
+- (id)initWithCategory:(int)category
+{
+ NSString * name = [[VLCMain sharedInstance] localizedString: config_CategoryNameGet( category )];
+ if(self = [super initWithName:name])
+ {
+ _category = category;
+ //_help = [[[VLCMain sharedInstance] localizedString: config_CategoryHelpGet( category )] retain];
+ }
+ return self;
}
-- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item {
- return (item == nil) ? [[VLCTreeItem rootItem] childAtIndex:index] : [item childAtIndex:index];
+- (VLCTreeSubCategoryItem *)itemRepresentingSubCategory:(int)subCategory
+{
+ assert( [self isKindOfClass:[VLCTreeCategoryItem class]] );
+ for( int i = 0; i < [[self children] count]; i++ )
+ {
+ VLCTreeSubCategoryItem * subCategoryItem = [[self children] objectAtIndex:i];
+ if( [subCategoryItem subCategory] == subCategory )
+ return subCategoryItem;
+ }
+ return nil;
}
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
- return (item == nil) ? @"" : (id)[item getName];
+- (int)category
+{
+ return _category;
}
-
@end
-@implementation VLCTreeItem
-
-static VLCTreeItem *o_root_item = nil;
+#pragma mark -
+@implementation VLCTreeSubCategoryItem
+- (id)initWithSubCategory:(int)subCategory
+{
+ NSString * name = [[VLCMain sharedInstance] localizedString: config_CategoryNameGet( subCategory )];
+ if(self = [super initWithName:name])
+ {
+ _subCategory = subCategory;
+ //_help = [[[VLCMain sharedInstance] localizedString: config_CategoryHelpGet( subCategory )] retain];
+ }
+ return self;
+}
-#define IsALeafNode ((id)-1)
++ (VLCTreeSubCategoryItem *)subCategoryTreeItemWithSubCategory:(int)subCategory
+{
+ if(!config_CategoryNameGet( subCategory )) return nil;
+ return [[[[self class] alloc] initWithSubCategory:subCategory] autorelease];
+}
-- (id)initWithName: (NSString *)o_item_name ID: (int)i_id parent:(VLCTreeItem *)o_parent_item
+- (int)subCategory
{
- self = [super init];
+ return _subCategory;
+}
- if( self != nil )
+@end
+
+#pragma mark -
+@implementation VLCTreePluginItem
+- (id)initWithPlugin:(module_t *)plugin
+{
+ NSString * name = [[VLCMain sharedInstance] localizedString: module_get_name( plugin, false )?:""];
+ if(self = [super initWithName:name])
{
- o_name = [o_item_name copy];
- i_object_id = i_id;
- o_parent = o_parent_item;
+ _configItems = module_config_get( plugin, &_configSize );
+ //_plugin = plugin;
+ //_help = [[[VLCMain sharedInstance] localizedString: config_CategoryHelpGet( subCategory )] retain];
}
- return( self );
+ return self;
}
-+ (VLCTreeItem *)rootItem {
- if (o_root_item == nil) o_root_item = [[VLCTreeItem alloc] initWithName:@"main" ID: 0 parent:nil];
- return o_root_item;
++ (VLCTreePluginItem *)pluginTreeItemWithPlugin:(module_t *)plugin
+{
+ return [[[[self class] alloc] initWithPlugin:plugin] autorelease];
}
- (void)dealloc
{
- if (o_children != IsALeafNode) [o_children release];
- [o_name release];
+ module_config_free( _configItems );
[super dealloc];
}
-/* Creates and returns the array of children
- * Loads children incrementally */
-- (NSArray *)children {
- if (o_children == NULL) {
- intf_thread_t *p_intf = [NSApp getIntf];
- vlc_list_t *p_list;
- module_t *p_module = NULL;
- module_config_t *p_item;
- int i_index,j;
-
- /* List the plugins */
- p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
- if( !p_list ) return nil;
-
- if( [[self getName] isEqualToString: @"main"] )
- {
- /*
- * Build a tree of the main options
- */
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
- {
- 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 find the main module in our prefs" );
- 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. */
- p_item = p_module->p_config;
- o_children = [[NSMutableArray alloc] initWithCapacity:10];
-
- if( p_item ) do
- {
- NSString *o_child_name;
-
- switch( p_item->i_type )
- {
- case CONFIG_HINT_CATEGORY:
- o_child_name = [NSApp localizedString: p_item->psz_text];
- [o_children addObject:[[VLCTreeItem alloc] initWithName: o_child_name
- ID: p_module->i_object_id parent:self]];
- break;
- }
- }
- while( p_item->i_type != CONFIG_HINT_END && p_item++ );
-
- /* Add the plugins item */
- [o_children addObject:[[VLCTreeItem alloc] initWithName: _NS("Modules")
- ID: 0 parent:self]];
- }
- else
- {
- o_children = IsALeafNode;
- }
- }
- else if( [[self getName] isEqualToString: _NS("Modules")] )
- {
- /* Add the capabilities */
- o_children = [[NSMutableArray alloc] initWithCapacity:10];
- 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 plugins */
- p_item = p_module->p_config;
- if( !p_item ) continue;
- do
- {
- if( p_item->i_type & CONFIG_ITEM )
- break;
- }
- while( p_item->i_type != CONFIG_HINT_END && p_item++ );
- if( p_item->i_type == CONFIG_HINT_END ) continue;
-
- /* Create the capability tree if it doesn't already exist */
- NSString *o_capability;
- o_capability = [NSApp localizedString: p_module->psz_capability];
- if( !p_module->psz_capability || !*p_module->psz_capability )
- {
- /* Empty capability ? Let's look at the submodules */
- module_t * p_submodule;
- for( j = 0; j < p_module->i_children; j++ )
- {
- p_submodule = (module_t*)p_module->pp_children[ j ];
- if( p_submodule->psz_capability && *p_submodule->psz_capability )
- {
- o_capability = [NSApp localizedString: p_submodule->psz_capability];
- BOOL b_found = FALSE;
- for( j = 0; j < [o_children count]; j++ )
- {
- if( [[[o_children objectAtIndex:j] getName] isEqualToString: o_capability] )
- {
- b_found = TRUE;
- break;
- }
- }
- if( !b_found )
- {
- [o_children addObject:[[VLCTreeItem alloc] initWithName: o_capability
- ID: 0 parent:self]];
- }
- }
- }
- }
+- (module_config_t *)configItems
+{
+ return _configItems;
+}
- BOOL b_found = FALSE;
- for( j = 0; j < [o_children count]; j++ )
- {
- if( [[[o_children objectAtIndex:j] getName] isEqualToString: o_capability] )
- {
- b_found = TRUE;
- break;
- }
- }
- if( !b_found )
- {
- [o_children addObject:[[VLCTreeItem alloc] initWithName: o_capability
- ID: 0 parent:self]];
- }
- }
- }
- else if( [[o_parent getName] isEqualToString: _NS("Modules")] )
- {
- /* Now add the modules */
- o_children = [[NSMutableArray alloc] initWithCapacity:10];
- 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 plugins */
- p_item = p_module->p_config;
- if( !p_item ) continue;
- do
- {
- if( p_item->i_type & CONFIG_ITEM )
- break;
- }
- while( p_item->i_type != CONFIG_HINT_END && p_item++ );
- if( p_item->i_type == CONFIG_HINT_END ) continue;
-
- /* Check the capability */
- NSString *o_capability;
- o_capability = [NSApp localizedString: p_module->psz_capability];
- if( !p_module->psz_capability || !*p_module->psz_capability )
- {
- /* Empty capability ? Let's look at the submodules */
- module_t * p_submodule;
- for( j = 0; j < p_module->i_children; j++ )
- {
- p_submodule = (module_t*)p_module->pp_children[ j ];
- if( p_submodule->psz_capability && *p_submodule->psz_capability )
- {
- o_capability = [NSApp localizedString: p_submodule->psz_capability];
- if( [o_capability isEqualToString: [self getName]] )
- {
- [o_children addObject:[[VLCTreeItem alloc] initWithName:
- [NSApp localizedString: p_module->psz_object_name ]
- ID: p_module->i_object_id parent:self]];
- }
- }
- }
- }
- else if( [o_capability isEqualToString: [self getName]] )
- {
- [o_children addObject:[[VLCTreeItem alloc] initWithName:
- [NSApp localizedString: p_module->psz_object_name ]
- ID: p_module->i_object_id parent:self]];
- }
- }
- }
- else
- {
- /* all the other stuff are leafs */
- o_children = IsALeafNode;
- }
+- (unsigned int)configSize
+{
+ return _configSize;
+}
+
+@end
+
+#pragma mark -
+@implementation VLCTreeLeafItem
+
+- (id)initWithConfigItem: (module_config_t *) configItem
+{
+ NSString * name = [[[VLCMain sharedInstance] localizedString:configItem->psz_name] autorelease];
+ self = [super initWithName:name];
+ if( self != nil )
+ {
+ _configItem = configItem;
}
- return o_children;
+ return self;
+}
+
+- (module_config_t *)configItem
+{
+ return _configItem;
}
+@end
+
+#pragma mark -
+#pragma mark (Root class for all TreeItems)
+@implementation VLCTreeItem
-- (int)getObjectID
+- (id)initWithName:(NSString*)name
{
- return i_object_id;
+ self = [super init];
+ if( self != nil )
+ {
+ _name = [name retain];
+ }
+ return self;
}
-- (NSString *)getName
+- (void)dealloc
{
- return o_name;
+ [_children release];
+ [_options release];
+ [_name release];
+ [_subviews release];
+ [super dealloc];
}
-- (VLCTreeItem *)childAtIndex:(int)i_index {
+- (VLCTreeItem *)childAtIndex:(NSInteger)i_index
+{
return [[self children] objectAtIndex:i_index];
}
-- (int)numberOfChildren {
- id i_tmp = [self children];
- return (i_tmp == IsALeafNode) ? (-1) : [i_tmp count];
+- (int)numberOfChildren
+{
+ return [[self children] count];
}
-- (BOOL)hasPrefs:(NSString *)o_module_name
+- (NSString *)name
{
- intf_thread_t *p_intf = [NSApp getIntf];
- module_t *p_parser;
- vlc_list_t *p_list;
- char *psz_module_name;
- int i_index;
+ return [[_name retain] autorelease];
+}
- psz_module_name = (char *)[o_module_name UTF8String];
+- (void)showView:(NSScrollView *)prefsView
+{
+ NSRect s_vrc;
+ NSView *view;
- /* look for module */
- p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ [[VLCPrefs sharedInstance] setTitle: [self name]];
+ s_vrc = [[prefsView contentView] bounds]; s_vrc.size.height -= 4;
+ view = [[VLCFlippedView alloc] initWithFrame: s_vrc];
+ [view setAutoresizingMask: NSViewWidthSizable | NSViewMinYMargin | NSViewMaxYMargin];
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ if(!_subviews)
{
- p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+ _subviews = [[NSMutableArray alloc] initWithCapacity:10];
- if( !strcmp( p_parser->psz_object_name, psz_module_name ) )
+ long i;
+ for( i = 0; i < [[self options] count]; i++)
{
- BOOL b_has_prefs = p_parser->i_config_items != 0;
- vlc_list_release( p_list );
- return( b_has_prefs );
+ VLCTreeLeafItem * item = [[self options] objectAtIndex:i];
+
+ VLCConfigControl *control;
+ control = [VLCConfigControl newControl:[item configItem] withView:view];
+ if( control )
+ {
+ [control setAutoresizingMask: NSViewMaxYMargin | NSViewWidthSizable];
+ [_subviews addObject: control];
+ }
}
}
- vlc_list_release( p_list );
+ assert(view);
+
+ int i_lastItem = 0;
+ int i_yPos = -2;
+ int i_max_label = 0;
+
+ NSEnumerator *enumerator = [_subviews objectEnumerator];
+ VLCConfigControl *widget;
+ NSRect frame;
+
+ while( ( widget = [enumerator nextObject] ) )
+ if( i_max_label < [widget labelSize] )
+ i_max_label = [widget labelSize];
+
+ enumerator = [_subviews objectEnumerator];
+ while( ( widget = [enumerator nextObject] ) )
+ {
+ int i_widget;
+
+ i_widget = [widget viewType];
+ i_yPos += [VLCConfigControl calcVerticalMargin:i_widget lastItem:i_lastItem];
+ [widget setYPos:i_yPos];
+ frame = [widget frame];
+ frame.size.width = [view frame].size.width - LEFTMARGIN - RIGHTMARGIN;
+ [widget setFrame:frame];
+ [widget alignWithXPosition: i_max_label];
+ i_yPos += [widget frame].size.height;
+ i_lastItem = i_widget;
+ [view addSubview:widget];
+ }
- return( NO );
+ frame = [view frame];
+ frame.size.height = i_yPos;
+ [view setFrame:frame];
+ [prefsView setDocumentView:view];
}
-@end
+- (void)applyChanges
+{
+ unsigned int i;
+ for( i = 0 ; i < [_subviews count] ; i++ )
+ [[_subviews objectAtIndex:i] applyChanges];
+ for( i = 0 ; i < [_children count] ; i++ )
+ [[_children objectAtIndex:i] applyChanges];
+}
+
+- (void)resetView
+{
+ unsigned int i;
+ for( i = 0 ; i < [_subviews count] ; i++ )
+ [[_subviews objectAtIndex:i] resetValues];
+
+ for( i = 0 ; i < [_options count] ; i++ )
+ [[_options objectAtIndex:i] resetView];
+
+ for( i = 0 ; i < [_children count] ; i++ )
+ [[_children objectAtIndex:i] resetView];
+
+}
+- (NSMutableArray *)children
+{
+ if(!_children) _children = [[NSMutableArray alloc] init];
+ return _children;
+}
+
+- (NSMutableArray *)options
+{
+ if(!_options) _options = [[NSMutableArray alloc] init];
+ return _options;
+}
+@end
+
+#pragma mark -
@implementation VLCFlippedView
- (BOOL)isFlipped
}
@end
-
-IMPL_CONTROL_CONFIG(Button);
-IMPL_CONTROL_CONFIG(PopUpButton);
-IMPL_CONTROL_CONFIG(ComboBox);
-IMPL_CONTROL_CONFIG(TextField);
-IMPL_CONTROL_CONFIG(Slider);
projects / vlc / blobdiff