Skip to content

V
vlc-gpu
Commit 49ee8d5b authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Let's break the prefs again for OSX 

  now to get it working. There is a semi-todo/design list in prefs.m.
parent 8903b3b7
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 825 deletions
modules/gui/macosx/prefs.h
View file @ 49ee8d5b
/***************************************************************************** /*****************************************************************************
* prefs.h: MacOS X module for vlc * prefs.h: MacOS X module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2005 VideoLAN
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
#define PREFS_WRAP 300
@interface VLCTreeItem : NSObject @interface VLCTreeItem : NSObject
{ {
NSString *o_name; NSString *o_name;
...@@ -67,12 +65,7 @@ ...@@ -67,12 +65,7 @@
- (IBAction)savePrefs: (id)sender; - (IBAction)savePrefs: (id)sender;
- (IBAction)closePrefs: (id)sender; - (IBAction)closePrefs: (id)sender;
- (IBAction)resetAll: (id)sender; - (IBAction)resetAll: (id)sender;
- (void)sheetDidEnd:(NSWindow *)o_sheet returnCode:(int)i_return contextInfo:(void *)o_context;
- (IBAction)advancedToggle: (id)sender; - (IBAction)advancedToggle: (id)sender;
- (IBAction)openFileDialog: (id)sender;
- (void)pathChosenInPanel:(NSOpenPanel *)o_sheet withReturn:(int)i_return_code contextInfo:(void *)o_context_info;
- (void)showViewForID: (int) i_id andName:(NSString *)o_item_name;
- (void)configChanged:(id)o_unknown;
@end @end
...@@ -82,92 +75,3 @@ ...@@ -82,92 +75,3 @@
} }
@end @end
#define INTF_CONTROL_CONFIG(x) \
@interface VLC##x : NS##x \
{ \
NSString *o_module_name; \
NSString *o_config_name; \
int i_config_type; \
} \
- (void)setModuleName:(NSString *)_o_module_name; \
- (void)setConfigName:(NSString *)_o_config_name; \
- (void)setConfigType:(int)_i_config_type; \
- (NSString *)moduleName; \
- (NSString *)configName; \
- (int)configType; \
@end
#define IMPL_CONTROL_CONFIG(x) \
@implementation VLC##x \
- (id)init \
{ \
self = [super init]; \
if( self != nil ) \
{ \
o_module_name = nil; \
o_config_name = nil; \
i_config_type = 0; \
} \
return( self ); \
} \
- (void)dealloc \
{ \
if( o_module_name != nil ) \
{ \
[o_module_name release]; \
} \
if( o_config_name != nil ) \
{ \
[o_config_name release]; \
} \
[super dealloc]; \
} \
- (void)setModuleName:(NSString *)_o_module_name \
{ \
if( o_module_name != nil ) \
{ \
[o_module_name release]; \
} \
o_module_name = [_o_module_name retain]; \
} \
- (void)setConfigName:(NSString *)_o_config_name \
{ \
if( o_config_name != nil ) \
{ \
[o_config_name release]; \
} \
o_config_name = [_o_config_name retain]; \
} \
- (void)setConfigType:(int)_i_config_type \
{ \
i_config_type = _i_config_type; \
} \
- (NSString *)moduleName \
{ \
return( o_module_name ); \
} \
- (NSString *)configName \
{ \
return( o_config_name ); \
} \
- (int)configType \
{ \
return( i_config_type ); \
} \
@end
INTF_CONTROL_CONFIG(Button);
INTF_CONTROL_CONFIG(PopUpButton);
INTF_CONTROL_CONFIG(ComboBox);
INTF_CONTROL_CONFIG(TextField);
INTF_CONTROL_CONFIG(Slider);
INTF_CONTROL_CONFIG(Matrix);
#define CONTROL_CONFIG( obj, mname, ctype, cname ) \
{ \
[obj setModuleName: mname]; \
[obj setConfigType: ctype]; \
[obj setConfigName: [NSString stringWithUTF8String: cname]]; \
}
modules/gui/macosx/prefs.m
View file @ 49ee8d5b
/***************************************************************************** /*****************************************************************************
* prefs.m: MacOS X module for vlc * prefs.m: MacOS X module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2004 VideoLAN * Copyright (C) 2002-2005 VideoLAN
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -22,6 +22,23 @@ ...@@ -22,6 +22,23 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, 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 * Preamble
*****************************************************************************/ *****************************************************************************/
...@@ -47,10 +64,14 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -47,10 +64,14 @@ static VLCPrefs *_o_sharedMainInstance = nil;
- (id)init - (id)init
{ {
if( _o_sharedMainInstance) { if( _o_sharedMainInstance ) {
[self dealloc]; [self dealloc];
} else { }
else
{
_o_sharedMainInstance = [super init]; _o_sharedMainInstance = [super init];
p_intf = VLCIntf;
o_empty_view = [[NSView alloc] init];
} }
return _o_sharedMainInstance; return _o_sharedMainInstance;
...@@ -59,20 +80,11 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -59,20 +80,11 @@ static VLCPrefs *_o_sharedMainInstance = nil;
- (void)dealloc - (void)dealloc
{ {
[o_empty_view release]; [o_empty_view release];
[o_save_prefs release];
[super dealloc]; [super dealloc];
} }
- (void)showPrefs - (void)awakeFromNib
{ {
/* load our nib */
[NSBundle loadNibNamed:@"Preferences" owner:self];
/* from "init" =< r8571 */
o_empty_view = [[NSView alloc] init];
o_save_prefs = [[NSMutableDictionary alloc] init];
/* from "awakeFromNib" =< r8571 */
p_intf = VLCIntf; p_intf = VLCIntf;
b_advanced = config_GetInt( p_intf, "advanced" ); b_advanced = config_GetInt( p_intf, "advanced" );
...@@ -84,12 +96,16 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -84,12 +96,16 @@ static VLCPrefs *_o_sharedMainInstance = nil;
[o_prefs_view setRulersVisible: NO]; [o_prefs_view setRulersVisible: NO];
[o_prefs_view setDocumentView: o_empty_view]; [o_prefs_view setDocumentView: o_empty_view];
[o_tree selectRow:0 byExtendingSelection:NO]; [o_tree selectRow:0 byExtendingSelection:NO];
/* end of the previous "awakeFromNib" method */ }
[o_save_prefs release]; - (void)showPrefs
o_save_prefs = [[NSMutableDictionary alloc] init]; {
[self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID] /* load our nib (if not already loaded) */
andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]]; [NSBundle loadNibNamed:@"Preferences" owner:self];
/* Show View for the currently select treeitem */
/* [self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID]
andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]]; */
[o_prefs_window center]; [o_prefs_window center];
[o_prefs_window makeKeyAndOrderFront:self]; [o_prefs_window makeKeyAndOrderFront:self];
} }
...@@ -105,112 +121,7 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -105,112 +121,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
- (IBAction)savePrefs: (id)sender - (IBAction)savePrefs: (id)sender
{ {
id o_vlc_config; /* TODO: call savePrefs on Root item */
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:
{
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_FILE:
case CONFIG_ITEM_DIRECTORY:
{
char *psz_value;
NSString *o_value = [o_vlc_config stringValue];
psz_value = (char *)[o_value fileSystemRepresentation];
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;
}
}
config_SaveConfigFile( p_intf, NULL ); config_SaveConfigFile( p_intf, NULL );
[o_prefs_window orderOut:self]; [o_prefs_window orderOut:self];
} }
...@@ -242,615 +153,27 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -242,615 +153,27 @@ static VLCPrefs *_o_sharedMainInstance = nil;
{ {
b_advanced = !b_advanced; b_advanced = !b_advanced;
[o_advanced_ckb setState: b_advanced]; [o_advanced_ckb setState: b_advanced];
[self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID] /* refresh the view of the current treeitem */
andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]]; /* [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)loadConfigTree
{ {
} }
- (void)outlineViewSelectionIsChanging:(NSNotification *)o_notification - (void)outlineViewSelectionIsChanging:(NSNotification *)o_notification
{ {
} }
/* update the document view to the view of the selected tree item */
- (void)outlineViewSelectionDidChange:(NSNotification *)o_notification - (void)outlineViewSelectionDidChange:(NSNotification *)o_notification
{ {
/*
[self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID] [self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID]
andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]]; andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]];*/
}
- (void)configChanged:(id)o_unknown
{
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 */
vlc_list_release( p_list );
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: \
[[VLCMain sharedInstance] 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: [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] 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 = TRUE;
if( p_item ) do
{
if( p_item->i_type == CONFIG_HINT_CATEGORY )
{
if( !strcmp( p_parser->psz_object_name, "main" ) &&
[o_item_name isEqualToString: [[VLCMain sharedInstance] 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: [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] 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 = [[VLCMain sharedInstance]
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: [[VLCMain sharedInstance] localizedString: psz_value]];
if ( psz_duptip != NULL )
{
[o_text_field setToolTip: [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] 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,
[[VLCMain sharedInstance] 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: [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] 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:
[[VLCMain sharedInstance] localizedString: p_item->ppsz_list[i]]];
}
[o_combo_box setStringValue: [[VLCMain sharedInstance] 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: [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] 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: [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] 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: [[VLCMain sharedInstance] localizedString: p_item->psz_text]];
if ( psz_duptip != NULL )
{
[o_btn_bool setToolTip: [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] 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: [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] 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: [[VLCMain sharedInstance] wrapString: [[VLCMain sharedInstance] 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: [[VLCMain sharedInstance] localizedString:vlc_keys[i].psz_key_string]];
}
[o_combo_box setStringValue: [[VLCMain sharedInstance] 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_object_release( p_parser );
vlc_list_release( p_list );
[o_prefs_view setDocumentView: o_view];
[o_prefs_view setNeedsDisplay: TRUE];
}
@end @end
@implementation VLCPrefs (NSTableDataSource) @implementation VLCPrefs (NSTableDataSource)
...@@ -906,8 +229,10 @@ static VLCTreeItem *o_root_item = nil; ...@@ -906,8 +229,10 @@ static VLCTreeItem *o_root_item = nil;
/* Creates and returns the array of children /* Creates and returns the array of children
* Loads children incrementally */ * Loads children incrementally */
- (NSArray *)children { - (NSArray *)children
if (o_children == NULL) { {
if( o_children == NULL )
{
intf_thread_t *p_intf = VLCIntf; intf_thread_t *p_intf = VLCIntf;
vlc_list_t *p_list; vlc_list_t *p_list;
module_t *p_module = NULL; module_t *p_module = NULL;
...@@ -921,7 +246,7 @@ static VLCTreeItem *o_root_item = nil; ...@@ -921,7 +246,7 @@ static VLCTreeItem *o_root_item = nil;
if( [[self getName] isEqualToString: @"main"] ) if( [[self getName] isEqualToString: @"main"] )
{ {
/* /*
* Build a tree of the main options * Find the main module
*/ */
for( i_index = 0; i_index < p_list->i_count; i_index++ ) for( i_index = 0; i_index < p_list->i_count; i_index++ )
{ {
...@@ -1160,10 +485,3 @@ static VLCTreeItem *o_root_item = nil; ...@@ -1160,10 +485,3 @@ static VLCTreeItem *o_root_item = nil;
} }
@end @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);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment