/*****************************************************************************
- * prefs.m: MacOS X plugin for vlc
+ * prefs.m: MacOS X module for vlc
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: prefs.m,v 1.30 2003/05/26 14:59:37 hartman Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $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
#include "intf.h"
#include "prefs.h"
+#include "vlc_keys.h"
/*****************************************************************************
* VLCPrefs implementation
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_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;
+ }
+ }
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 preferences.\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
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
{
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;
-
- 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;
-
- }
+ [o_save_prefs setObject: o_vlc_config forKey: o_name];
}
- (void)showViewForID: (int)i_id andName: (NSString *)o_item_name
/* 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;
+ BOOL b_right_cat = TRUE;
if( p_item ) do
{
if ( p_item->psz_longtext != NULL )
psz_duptip = strdup( p_item->psz_longtext );
- s_rc.size.height = 30;
+ s_rc.size.height = 25;
s_rc.size.width = 200;
s_rc.origin.y += 10;
}
[o_view addSubview: [o_modules autorelease]];
- [o_modules addItemWithTitle: _NS("None")];
+ [o_modules addItemWithTitle: _NS("Default")];
[[o_modules lastItem] setTag: -1];
[o_modules selectItem: [o_modules lastItem]];
}
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 ?
if ( p_item->psz_longtext != NULL )
psz_duptip = strdup( p_item->psz_longtext );
- s_rc.size.height = 27;
+ s_rc.size.height = 25;
s_rc.size.width = 200;
s_rc.origin.y += 10;
[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 )
{
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;
}
module_config_t *p_item;
int i_index,j;
- /* List the plugins */
+ /* List the modules */
p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
if( !p_list ) return nil;
}
if( p_module == NULL )
{
- msg_Err( p_intf, "Could not find the main module in our prefs" );
+ msg_Err( p_intf, "could not find the main module in our preferences" );
return nil;
}
if( i_index < p_list->i_count )
}
while( p_item->i_type != CONFIG_HINT_END && p_item++ );
- /* Add the plugins item */
+ /* Add the modules item */
[o_children addObject:[[VLCTreeItem alloc] initWithName: _NS("Modules")
ID: 0 parent:self]];
}
if( !strcmp( p_module->psz_object_name, "main" ) )
continue;
- /* Exclude empty plugins */
+ /* Exclude empty modules */
p_item = p_module->p_config;
if( !p_item ) continue;
do
{
o_capability = [NSApp localizedString: p_submodule->psz_capability];
BOOL b_found = FALSE;
- for( j = 0; j < [o_children count]; j++ )
+ for( j = 0; j < (int)[o_children count]; j++ )
{
if( [[[o_children objectAtIndex:j] getName] isEqualToString: o_capability] )
{
}
BOOL b_found = FALSE;
- for( j = 0; j < [o_children count]; j++ )
+ for( j = 0; j < (int)[o_children count]; j++ )
{
if( [[[o_children objectAtIndex:j] getName] isEqualToString: o_capability] )
{
if( !strcmp( p_module->psz_object_name, "main" ) )
continue;
- /* Exclude empty plugins */
+ /* Exclude empty modules */
p_item = p_module->p_config;
if( !p_item ) continue;
do
- (int)numberOfChildren {
id i_tmp = [self children];
- return (i_tmp == IsALeafNode) ? (-1) : [i_tmp count];
+ return (i_tmp == IsALeafNode) ? (-1) : (int)[i_tmp count];
}
- (BOOL)hasPrefs:(NSString *)o_module_name
IMPL_CONTROL_CONFIG(ComboBox);
IMPL_CONTROL_CONFIG(TextField);
IMPL_CONTROL_CONFIG(Slider);
+IMPL_CONTROL_CONFIG(Matrix);
projects / vlc / blobdiff