* prefs.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
- * $Id: prefs.m,v 1.25 2003/05/24 02:48:55 hartman Exp $
+ * $Id: prefs.m,v 1.33 2003/08/08 16:41:04 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Derk-Jan Hartman <thedj at users.sf.net>
if( self != nil )
{
o_empty_view = [[NSView alloc] init];
+ o_save_prefs = [[NSMutableDictionary alloc] init];
}
return( self );
- (void)dealloc
{
[o_empty_view release];
+ [o_save_prefs release];
[super dealloc];
}
[o_prefs_view setBorderType: NSGrooveBorder];
[o_prefs_view setHasVerticalScroller: YES];
[o_prefs_view setDrawsBackground: NO];
- [o_prefs_view setRulersVisible: YES];
+ [o_prefs_view setRulersVisible: NO];
[o_prefs_view setDocumentView: o_empty_view];
[o_tree selectRow:0 byExtendingSelection:NO];
}
- (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];
}
- (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_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;
+
+ }
+ }
config_SaveConfigFile( p_intf, NULL );
[o_prefs_window orderOut:self];
}
- (IBAction)resetAll: (id)sender
{
- config_ResetAll( p_intf );
+ NSBeginInformationalAlertSheet(_NS("Reset Preferences"), _NS("Cancel"), _NS("Continue"),
+ nil, o_prefs_window, self, @selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil,
+ _NS("Beware this will reset your VLC Media Player config file.\n"
+ "Are you sure you want to continue?") );
+}
+
+- (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]];
+ }
}
- (IBAction)advancedToggle: (id)sender
{
b_advanced = !b_advanced;
[o_advanced_ckb setState: b_advanced];
- [o_tree selectRow: [o_tree selectedRow] byExtendingSelection:NO];
+ [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)outlineViewSelectionDidChange:(NSNotification *)o_notification
{
- [self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID] 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]];
}
- (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 lossyCString];
-
- switch( i_type )
- {
-
- case CONFIG_ITEM_MODULE:
- {
- char *psz_value;
- NSString *o_value;
-
- o_value = [o_vlc_config titleOfSelectedItem];
- [o_value isEqualToString: _NS("Auto") ] ? psz_value = "" :
- psz_value = (char *)[o_value lossyCString];
- config_PutPsz( p_intf, psz_name, psz_value );
- }
- break;
-
- case CONFIG_ITEM_STRING:
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_DIRECTORY:
- {
- char *psz_value;
- NSString *o_value;
-
- o_value = [o_vlc_config stringValue];
- psz_value = (char *)[o_value lossyCString];
-
- 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;
-
- }
+ [o_save_prefs setObject: o_vlc_config forKey: o_name];
}
- (void)showViewForID: (int)i_id andName: (NSString *)o_item_name
}
/* Enumerate config options and add corresponding config boxes */
- o_module_name = [NSString stringWithCString: p_parser->psz_object_name];
+ o_module_name = [NSString stringWithUTF8String: p_parser->psz_object_name];
p_item = p_parser->p_config;
i_pos = 0;
#define INPUT_FIELD( ctype, cname, label, w, msg, param, tip ) \
{ \
char * psz_duptip = NULL; \
- if ( p_item->psz_longtext != NULL && [NSApp getEncoding] == NSISOLatin1StringEncoding ) \
- psz_duptip = strdup(p_item->psz_longtext); \
+ 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; \
[o_text_field msg: param]; \
if ( psz_duptip != NULL ) \
{ \
- [o_text_field setToolTip: [NSApp localizedString: \
- vlc_wraptext(psz_duptip, PREFS_WRAP)]]; \
+ [o_text_field setToolTip: [NSApp wrapString: [NSApp localizedString: \
+ psz_duptip] toWidth: PREFS_WRAP ]]; \
free(psz_duptip);\
} \
[o_view addSubview: [o_text_field autorelease]]; \
/* 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;
VLCPopUpButton *o_modules;
module_t *p_a_module;
char * psz_duptip = NULL;
- if ( p_item->psz_longtext != NULL && [NSApp getEncoding] == NSISOLatin1StringEncoding )
- psz_duptip = strdup(p_item->psz_longtext);
-
- s_rc.size.height = 30;
+
+ 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;
if ( psz_duptip != NULL )
{
- [o_modules setToolTip: [NSApp localizedString:
- vlc_wraptext(psz_duptip, PREFS_WRAP)]];
+ [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("Auto")];
+ [o_modules addItemWithTitle: _NS("Default")];
+ [[o_modules lastItem] setTag: -1];
+ [o_modules selectItem: [o_modules lastItem]];
/* build a list of available modules */
{
if( !strcmp( p_a_module->psz_capability,
p_item->psz_type ) )
{
- NSString *o_object_name = [NSApp
- localizedString: p_a_module->psz_object_name];
- [o_modules addItemWithTitle: o_object_name];
+ 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]];
+ }
}
}
}
-
- if( p_item->psz_value != NULL )
- {
- NSString *o_value =
- [NSApp localizedString: p_item->psz_value];
-
- [o_modules selectItemWithTitle: o_value];
- }
- else
- {
- [o_modules selectItemWithTitle: _NS("Auto")];
- }
CONTROL_LABEL( p_item->psz_text );
s_rc.origin.y += s_rc.size.height;
}
break;
- case CONFIG_ITEM_STRING:
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 ?
int i;
VLCComboBox *o_combo_box;
char * psz_duptip = NULL;
- if ( p_item->psz_longtext != NULL && [NSApp getEncoding] == NSISOLatin1StringEncoding )
- psz_duptip = strdup(p_item->psz_longtext);
+ if ( p_item->psz_longtext != NULL )
+ psz_duptip = strdup( p_item->psz_longtext );
s_rc.size.height = 27;
s_rc.size.width = 200;
if ( psz_duptip != NULL )
{
- [o_combo_box setToolTip: [NSApp localizedString:
- vlc_wraptext(psz_duptip, PREFS_WRAP)]];
+ [o_combo_box setToolTip: [NSApp wrapString: [NSApp localizedString: psz_duptip] toWidth: PREFS_WRAP]];
free( psz_duptip );
}
[o_view addSubview: [o_combo_box autorelease]];
case CONFIG_ITEM_INTEGER:
{
- INPUT_FIELD_INTEGER( p_item->psz_name, p_item->psz_text, 70,
- p_item->i_value, p_item->psz_longtext );
+ 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:
{
- INPUT_FIELD_FLOAT( p_item->psz_name, p_item->psz_text, 70,
- p_item->f_value, p_item->psz_longtext );
+ 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;
{
VLCButton *o_btn_bool;
char * psz_duptip = NULL;
- if ( p_item->psz_longtext != NULL && [NSApp getEncoding] == NSISOLatin1StringEncoding )
- psz_duptip = strdup(p_item->psz_longtext);
+
+ 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;
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]];
+ [o_btn_bool setTitle: [NSApp localizedString: p_item->psz_text]];
if ( psz_duptip != NULL )
{
- [o_btn_bool setToolTip: [NSApp localizedString:
- vlc_wraptext(psz_duptip, PREFS_WRAP)]];
+ [o_btn_bool setToolTip: [NSApp wrapString: [NSApp localizedString: psz_duptip] toWidth: PREFS_WRAP]];
free( psz_duptip );
}
[o_btn_bool setTarget: self];
if (o_children == NULL) {
intf_thread_t *p_intf = [NSApp getIntf];
vlc_list_t *p_list;
- module_t *p_module;
+ module_t *p_module = NULL;
module_config_t *p_item;
int i_index,j;
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 */
char *psz_module_name;
int i_index;
- psz_module_name = (char *)[o_module_name lossyCString];
+ psz_module_name = (char *)[o_module_name UTF8String];
/* look for module */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
IMPL_CONTROL_CONFIG(PopUpButton);
IMPL_CONTROL_CONFIG(ComboBox);
IMPL_CONTROL_CONFIG(TextField);
+IMPL_CONTROL_CONFIG(Slider);
projects / vlc / blobdiff