* prefs.m: MacOS X module for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
- * $Id: prefs.m,v 1.37 2004/01/25 17:01:57 murray Exp $
+ * $Id: prefs.m,v 1.38 2004/01/30 12:44:21 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
- * Derk-Jan Hartman <thedj at users.sf.net>
+ * Derk-Jan Hartman <hartman at videolan.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
* Preamble
*****************************************************************************/
#include <stdlib.h> /* malloc(), free() */
-#include <sys/param.h> /* for MAXPATHLEN */
#include <string.h>
#include "intf.h"
#include "prefs.h"
-#include "vlc_keys.h"
+#include "misc.h"
+#include <vlc_help.h>
+
+#define ROOT_ID 1241
+#define GENERAL_ID 1242
+#define MODULE_ID 1243
+#define CAPABILITY_ID 1244
/*****************************************************************************
* VLCPrefs implementation
if( self != nil )
{
- o_empty_view = [[NSView alloc] init];
- o_save_prefs = [[NSMutableDictionary alloc] init];
+ o_empty_view = [[[NSView alloc] init] retain];
}
return( self );
- (void)dealloc
{
[o_empty_view release];
- [o_save_prefs release];
[super dealloc];
}
[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)initStrings
- (void)showPrefs
{
- [o_save_prefs release];
- o_save_prefs = [[NSMutableDictionary alloc] init];
- [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];
+ // show first tree item
+ [[o_prefs_view window] center];
+ [[o_prefs_view window] makeKeyAndOrderFront:self];
}
- (IBAction)savePrefs: (id)sender
{
- id o_vlc_config;
- NSEnumerator *o_enum;
-
- o_enum = [o_save_prefs objectEnumerator];
- while( ( o_vlc_config = [o_enum nextObject] ) )
- {
- 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;
-
- case CONFIG_ITEM_STRING:
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_DIRECTORY:
- {
- char *psz_value;
- NSString *o_value = [o_vlc_config stringValue];
- psz_value = (char *)[o_value UTF8String];
-
- config_PutPsz( p_intf, psz_name, psz_value );
- }
- break;
-
- case CONFIG_ITEM_INTEGER:
- case CONFIG_ITEM_BOOL:
- {
- int i_value = [o_vlc_config intValue];
-
- config_PutInt( p_intf, psz_name, i_value );
- }
- break;
-
- case CONFIG_ITEM_FLOAT:
- {
- float f_value = [o_vlc_config floatValue];
-
- config_PutFloat( p_intf, psz_name, f_value );
- }
- break;
-
- case CONFIG_ITEM_KEY:
- {
- unsigned int i_key = config_GetInt( p_intf, psz_name );
- unsigned int i_new_key = 0;
-
- if( [o_vlc_config class] == [VLCMatrix class] )
- {
- int i;
- NSButtonCell *o_current_cell;
- NSArray *o_cells = [o_vlc_config cells];
- i_new_key = (i_key & ~KEY_MODIFIER);
- for( i = 0; i < [o_cells count]; i++ )
- {
- o_current_cell = [o_cells objectAtIndex:i];
- if( [[o_current_cell title] isEqualToString:_NS("Command")] &&
- [o_current_cell state] == NSOnState )
- i_new_key |= KEY_MODIFIER_COMMAND;
- if( [[o_current_cell title] isEqualToString:_NS("Control")] &&
- [o_current_cell state] == NSOnState )
- i_new_key |= KEY_MODIFIER_CTRL;
- if( [[o_current_cell title] isEqualToString:_NS("Option/Alt")] &&
- [o_current_cell state] == NSOnState )
- i_new_key |= KEY_MODIFIER_ALT;
- if( [[o_current_cell title] isEqualToString:_NS("Shift")] &&
- [o_current_cell state] == NSOnState )
- i_new_key |= KEY_MODIFIER_SHIFT;
- }
- }
- else
- {
- i_new_key = (i_key & KEY_MODIFIER);
- i_new_key |= StringToKey([[o_vlc_config stringValue] cString]);
- }
- config_PutInt( p_intf, psz_name, i_new_key );
- }
- break;
- }
- }
+ // walk trough all treeitems and tell them all to save
config_SaveConfigFile( p_intf, NULL );
[o_prefs_window orderOut:self];
}
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]];
+ // show first config treeitem
}
}
{
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]];
-}
-
-- (IBAction)openFileDialog: (id)sender
-{
- NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
-
- [o_open_panel setTitle: _NS("Select file or directory")];
- [o_open_panel setPrompt: _NS("Select")];
- [o_open_panel setAllowsMultipleSelection: NO];
- [o_open_panel setCanChooseFiles: YES];
- [o_open_panel setCanChooseDirectories: YES];
- [o_open_panel beginSheetForDirectory:nil
- file:nil
- types:nil
- modalForWindow:[sender window]
- modalDelegate: self
- didEndSelector: @selector(pathChosenInPanel:
- withReturn:
- contextInfo:)
- contextInfo: sender];
-}
-
-- (void)pathChosenInPanel:(NSOpenPanel *)o_sheet withReturn:(int)i_return_code contextInfo:(void *)o_context_info
-{
- if( i_return_code == NSOKButton )
- {
- NSString *o_path = [[o_sheet filenames] objectAtIndex: 0];
- VLCTextField *o_field = (VLCTextField *)[(VLCButton *)o_context_info tag]; /* FIXME */
- [o_field setStringValue: o_path];
- [self configChanged: o_field];
- }
-}
-
-- (void)loadConfigTree
-{
-
-}
-
-- (void)outlineViewSelectionIsChanging:(NSNotification *)o_notification
-{
+ // walk trough all treeitems and set advanced state
}
- (void)outlineViewSelectionDidChange:(NSNotification *)o_notification
{
- [self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID]
- andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]];
+ // a tree item will be shown
}
-- (void)configChanged:(id)o_unknown
+- (void)showViewForID:(int)i_id
{
- id o_vlc_config = [o_unknown isKindOfClass: [NSNotification class]] ?
- [o_unknown object] : o_unknown;
-
- NSString *o_name = [o_vlc_config configName];
- [o_save_prefs setObject: o_vlc_config forKey: o_name];
-}
-
-- (void)showViewForID: (int)i_id andName: (NSString *)o_item_name
-{
- 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 )
- {
- /* 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]; \
- } \
- }
-
-#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]]; \
- }
-
-#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; \
- }
-
-#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];
- [o_view setAutoresizingMask: NSViewWidthSizable];
- s_rc.origin.x = X_ORIGIN;
- s_rc.origin.y = Y_ORIGIN;
- BOOL b_right_cat = FALSE;
-
- if( p_item ) do
- {
- 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 )
- {
- continue;
- }
- switch( p_item->i_type )
- {
- case CONFIG_ITEM_MODULE:
- {
- 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 = 25;
- 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 )
- {
- [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]];
- }
- }
- }
- }
-
- CONTROL_LABEL( p_item->psz_text );
- s_rc.origin.y += s_rc.size.height;
- s_rc.origin.x = X_ORIGIN;
- }
- break;
-
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_DIRECTORY:
- {
- char *psz_duptip = NULL;
- char *psz_value = p_item->psz_value ?
- p_item->psz_value : "";
-
- if ( p_item->psz_longtext != NULL )
- psz_duptip = strdup( p_item->psz_longtext );
-
- s_rc.origin.y += 10;
- s_rc.size.width = - 10;
- s_rc.size.height = 25;
- CHECK_VIEW_HEIGHT;
- CONTROL_LABEL( p_item->psz_text );
- s_rc.origin.x = X_ORIGIN;
- s_rc.origin.y += s_rc.size.height;
- CHECK_VIEW_HEIGHT;
-
- VLCButton *button = [[VLCButton alloc] initWithFrame: s_rc];
- CONTROL_CONFIG( button, o_module_name, CONFIG_ITEM_STRING , p_item->psz_name );
- [button setButtonType: NSMomentaryPushInButton];
- [button setBezelStyle: NSRoundedBezelStyle];
- [button setTitle: _NS("Browse...")];
- [button sizeToFit];
- [button setAutoresizingMask:NSViewMinXMargin];
- [button setFrameOrigin: NSMakePoint( s_vrc.size.width - ( 10 + [button frame].size.width), s_rc.origin.y)];
-
- [button setTarget: self];
- [button setAction: @selector(openFileDialog:)];
-
- s_rc.size.height = 25;
- s_rc.size.width = s_vrc.size.width - ( 35 + [button frame].size.width);
-
- o_text_field = [[VLCTextField alloc] initWithFrame: s_rc];
- CONTROL_CONFIG( o_text_field, o_module_name, CONFIG_ITEM_STRING , p_item->psz_name );
-
- [o_text_field setStringValue: [NSApp localizedString: psz_value]];
- if ( psz_duptip != NULL )
- {
- [o_text_field setToolTip: [NSApp wrapString: [NSApp localizedString:
- psz_duptip] toWidth: PREFS_WRAP ]];
- free(psz_duptip);
- }
-
- [[NSNotificationCenter defaultCenter] addObserver: self
- selector: @selector(configChanged:)
- name: NSControlTextDidChangeNotification
- object: o_text_field];
- [o_text_field setAutoresizingMask:NSViewWidthSizable];
- [button setTag: (int) o_text_field ]; /* FIXME */
-
- [o_view addSubview: [o_text_field autorelease]];
- [o_view addSubview: [button autorelease]];
- s_rc.origin.y += s_rc.size.height;
- s_rc.origin.x = X_ORIGIN;
- }
- break;
-
- case CONFIG_ITEM_STRING:
- {
- if( !p_item->ppsz_list )
- {
- 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 = 25;
- 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];
- [[NSNotificationCenter defaultCenter] addObserver: self
- selector: @selector(configChanged:)
- name: NSControlTextDidChangeNotification
- object: o_combo_box];
-
- 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++ )
- {
- [o_combo_box addItemWithObjectValue:
- [NSApp localizedString: p_item->ppsz_list[i]]];
- }
- [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( p_item->f_min == p_item->f_max )
- {
- INPUT_FIELD_FLOAT( p_item->psz_name, p_item->psz_text, 70,
- p_item->f_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->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;
- }
- }
- break;
-
- case CONFIG_ITEM_BOOL:
- {
- 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 )
- {
- [o_btn_bool setToolTip: [NSApp wrapString: [NSApp localizedString: psz_duptip] toWidth: PREFS_WRAP]];
- free( psz_duptip );
- }
- [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;
-
- case CONFIG_ITEM_KEY:
- {
- int i;
- char *psz_duptip = NULL;
- VLCComboBox *o_combo_box;
-
- if ( p_item->psz_longtext != NULL )
- psz_duptip = strdup( p_item->psz_longtext );
-
- s_rc.origin.y += 10;
- s_rc.size.width = - 10;
- s_rc.size.height = 20;
- CHECK_VIEW_HEIGHT;
- CONTROL_LABEL( p_item->psz_text );
- s_rc.origin.x = X_ORIGIN;
- s_rc.origin.y += s_rc.size.height;
- s_rc.size.width = s_vrc.size.width - X_ORIGIN * 2;
- CHECK_VIEW_HEIGHT;
- VLCMatrix *o_matrix = [[VLCMatrix alloc] initWithFrame: s_rc mode: NSHighlightModeMatrix cellClass: [NSButtonCell class] numberOfRows:2 numberOfColumns:2];
- NSArray *o_cells = [o_matrix cells];
- for( i=0; i < [o_cells count]; i++ )
- {
- NSButtonCell *o_current_cell = [o_cells objectAtIndex:i];
- [o_current_cell setButtonType: NSSwitchButton];
- [o_current_cell setControlSize: NSSmallControlSize];
- if( psz_duptip != NULL )
- {
- [o_matrix setToolTip: [NSApp wrapString: [NSApp localizedString: psz_duptip] toWidth: PREFS_WRAP] forCell: o_current_cell];
- }
- switch( i )
- {
- case 0:
- [o_current_cell setTitle:_NS("Command")];
- [o_current_cell setState: p_item->i_value & KEY_MODIFIER_COMMAND];
- break;
- case 1:
- [o_current_cell setTitle:_NS("Control")];
- [o_current_cell setState: p_item->i_value & KEY_MODIFIER_CTRL];
- break;
- case 2:
- [o_current_cell setTitle:_NS("Option/Alt")];
- [o_current_cell setState: p_item->i_value & KEY_MODIFIER_ALT];
- break;
- case 3:
- [o_current_cell setTitle:_NS("Shift")];
- [o_current_cell setState: p_item->i_value & KEY_MODIFIER_SHIFT];
- break;
- }
- [o_current_cell setTarget: self];
- [o_current_cell setAction: @selector(configChanged:)];
- [o_current_cell sendActionOn:NSLeftMouseUpMask];
- }
- CONTROL_CONFIG( o_matrix, o_module_name,
- CONFIG_ITEM_KEY, p_item->psz_name );
- [o_matrix sizeToCells];
- [o_view addSubview: [o_matrix autorelease]];
-
- s_rc.origin.x += [o_matrix frame].size.width + 20;
- s_rc.size.height = 25;
- s_rc.size.width = 100;
-
- CHECK_VIEW_HEIGHT;
-
- o_combo_box = [[VLCComboBox alloc] initWithFrame: s_rc];
- CONTROL_CONFIG( o_combo_box, o_module_name,
- CONFIG_ITEM_KEY, p_item->psz_name );
- [o_combo_box setTarget: self];
- [o_combo_box setAction: @selector(configChanged:)];
- [o_combo_box sendActionOn:NSLeftMouseUpMask];
- [[NSNotificationCenter defaultCenter] addObserver: self
- selector: @selector(configChanged:)
- name: NSControlTextDidChangeNotification
- object: o_combo_box];
-
- if ( psz_duptip != NULL )
- {
- [o_combo_box setToolTip: [NSApp wrapString: [NSApp localizedString: psz_duptip] toWidth: PREFS_WRAP]];
- }
- [o_view addSubview: [o_combo_box autorelease]];
-
- for( i = 0; i < sizeof(vlc_keys) / sizeof(key_descriptor_t); i++ )
- {
-
- if( vlc_keys[i].psz_key_string && *vlc_keys[i].psz_key_string )
- [o_combo_box addItemWithObjectValue: [NSApp localizedString:vlc_keys[i].psz_key_string]];
- }
-
- [o_combo_box setStringValue: [NSApp localizedString:KeyToString(( ((unsigned int)p_item->i_value) & ~KEY_MODIFIER ))]];
-
- s_rc.origin.y += s_rc.size.height;
- s_rc.origin.x = X_ORIGIN;
- if( psz_duptip ) free( psz_duptip );
- }
- break;
-
- }
-
- #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];
}
-
@end
@implementation VLCPrefs (NSTableDataSource)
}
- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
- return (item == nil) ? YES : ([item numberOfChildren] != -1);
+ return (item == nil) ? YES : ([item numberOfChildren] >= 0);
}
- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item {
}
- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
- return (item == nil) ? @"" : (id)[item getName];
+ return (item == nil) ? @"" : (id)[item name];
}
@end
#define IsALeafNode ((id)-1)
-- (id)initWithName: (NSString *)o_item_name ID: (int)i_id parent:(VLCTreeItem *)o_parent_item
+- (id)initWithID: (int)i_id parent: (VLCTreeItem *)o_parent_item
{
self = [super init];
if( self != nil )
{
- o_name = [o_item_name copy];
i_object_id = i_id;
o_parent = o_parent_item;
}
}
+ (VLCTreeItem *)rootItem {
- if (o_root_item == nil) o_root_item = [[VLCTreeItem alloc] initWithName:@"main" ID: 0 parent:nil];
+ if (o_root_item == nil) o_root_item = [[VLCTreeItem alloc] initWithID: ROOT_ID parent:nil];
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];
[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;
+- (NSArray *)children
+{
+ if (o_children == NULL)
+ {
+ intf_thread_t *p_intf = [NSApp getIntf];
+ vlc_list_t *p_list = NULL;
module_t *p_module = NULL;
- module_config_t *p_item;
- int i_index,j;
+ module_config_t *p_item = NULL;
+ int i_index;
/* List the modules */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
if( !p_list ) return nil;
- if( [[self getName] isEqualToString: @"main"] )
+ 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 )
{
/*
- * Build a tree of the main options
- */
+ * Build a tree of the main options
+ */
+ o_name = [_NS("General Settings") copy];
+ psz_help = strdup( GENERAL_HELP );
+ psz_section = strdup( GENERAL_TITLE );
+
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( 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;
if( p_item ) do
{
- NSString *o_child_name;
-
+ VLCTreeItem *o_now;
+
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]];
+ 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];
break;
}
}
while( p_item->i_type != CONFIG_HINT_END && p_item++ );
-
- /* Add the modules item */
- [o_children addObject:[[VLCTreeItem alloc] initWithName: _NS("Modules")
- ID: 0 parent:self]];
- }
- else
- {
- o_children = IsALeafNode;
+ [o_children retain];
+ //[o_children sortUsingSelector:@selector(caseInsensitiveCompare:)];
}
}
- else if( [[self getName] isEqualToString: _NS("Modules")] )
+ else if( [self objectID] == MODULE_ID )
{
- /* Add the capabilities */
+ 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];
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 */
- p_item = p_module->p_config;
+ 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
{
}
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 < (int)[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]];
- }
- }
- }
- }
-
- BOOL b_found = FALSE;
- for( j = 0; j < (int)[o_children count]; j++ )
+
+ i_total = [o_children count];
+ b_found = FALSE;
+
+ for( i_counter = 0; i_counter < i_total; i_counter++ )
{
- if( [[[o_children objectAtIndex:j] getName] isEqualToString: o_capability] )
+ if( [[[o_children objectAtIndex: i_counter] name] isEqualToString:
+ [NSApp localizedString: p_module->psz_capability]] )
{
b_found = TRUE;
break;
}
}
+
if( !b_found )
{
- [o_children addObject:[[VLCTreeItem alloc] initWithName: o_capability
- ID: 0 parent:self]];
+ VLCTreeItem *o_now = [[VLCTreeItem alloc] initWithID: CAPABILITY_ID parent:self];
+ [o_now setName: [NSApp localizedString: p_module->psz_capability]];
+ [o_children addObject:o_now];
}
}
+ [o_children retain];
+ //[o_children sortUsingSelector:@selector(caseInsensitiveCompare:)];
}
- else if( [[o_parent getName] isEqualToString: _NS("Modules")] )
+ else if( [self objectID] == CAPABILITY_ID )
{
- /* Now add the modules */
- o_children = [[NSMutableArray alloc] initWithCapacity:10];
+ /* add the modules */
+ o_children = [[NSMutableArray alloc] initWithCapacity:3];
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 */
- p_item = p_module->p_config;
+ 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
{
}
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]] )
+
+ if( [[self name] isEqualToString:
+ [NSApp localizedString: p_module->psz_capability]] )
{
- [o_children addObject:[[VLCTreeItem alloc] initWithName:
- [NSApp localizedString: p_module->psz_object_name ]
- ID: p_module->i_object_id parent:self]];
+ 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];
}
}
+ [o_children retain];
}
else
{
return o_children;
}
-- (int)getObjectID
+- (int)objectID
{
return i_object_id;
}
-- (NSString *)getName
+- (NSString *)name
{
- return o_name;
+ if( o_name ) return o_name;
}
-- (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];
+- (void)setName:(NSString *)a_name;
+{
+ if( o_name ) [o_name release];
+ o_name = [a_name copy];
}
-- (BOOL)hasPrefs:(NSString *)o_module_name
+- (VLCTreeItem *)childAtIndex:(int)i_index
{
- intf_thread_t *p_intf = [NSApp getIntf];
- 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 ) )
- {
- 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 );
+ return [[self children] objectAtIndex:i_index];
}
-@end
-
-
-@implementation VLCFlippedView
-
-- (BOOL)isFlipped
+- (int)numberOfChildren
{
- return( YES );
+ id i_tmp = [self children];
+ return (i_tmp == IsALeafNode) ? (-1) : (int)[i_tmp count];
}
@end
-
-IMPL_CONTROL_CONFIG(Button);
-IMPL_CONTROL_CONFIG(PopUpButton);
-IMPL_CONTROL_CONFIG(ComboBox);
-IMPL_CONTROL_CONFIG(TextField);
-IMPL_CONTROL_CONFIG(Slider);
-IMPL_CONTROL_CONFIG(Matrix);
projects / vlc / commitdiff