Commit 3f6bf89a authored by hartman's avatar hartman
Browse files

* Revert back to old prefs.

  - fixed the bug with the modules not setting up their prefs.
  - bugs: int with strings items are broken (see relfontsize)
  - hotkeys elements don't really work
parent e4849efb
/*****************************************************************************
* prefs.h: MacOS X module for vlc
*****************************************************************************
* Copyright (C) 2002-2004 VideoLAN
* $Id: prefs.h,v 1.14 2004/01/30 12:44:21 hartman Exp $
* Copyright (C) 2002-2003 VideoLAN
* $Id: prefs.h,v 1.15 2004/02/19 19:38:58 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Derk-Jan Hartman <hartman at videolan dot org>
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
*
* 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
......@@ -22,26 +21,22 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#define PREFS_WRAP 300
@interface VLCTreeItem : NSObject
{
int i_object_id;
char *psz_help;
char *psz_section;
NSString *o_name;
NSMutableArray *o_config_controls;
int i_object_id;
VLCTreeItem *o_parent;
NSMutableArray *o_children;
}
+ (VLCTreeItem *)rootItem;
- (id)initWithID: (int)i_id parent: (VLCTreeItem *)o_parent_item;
- (int)numberOfChildren;
- (VLCTreeItem *)childAtIndex:(int)i_index;
- (int)objectID;
- (NSString *)name;
- (void)setName:(NSString *)a_name;
- (int)getObjectID;
- (NSString *)getName;
- (BOOL)hasPrefs:(NSString *)o_module_name;
@end
......@@ -52,7 +47,9 @@
{
intf_thread_t *p_intf;
vlc_bool_t b_advanced;
VLCTreeItem *o_config_tree;
NSView *o_empty_view;
NSMutableDictionary *o_save_prefs;
IBOutlet id o_prefs_window;
IBOutlet id o_tree;
......@@ -70,6 +67,105 @@
- (IBAction)resetAll: (id)sender;
- (void)sheetDidEnd:(NSWindow *)o_sheet returnCode:(int)i_return contextInfo:(void *)o_context;
- (IBAction)advancedToggle: (id)sender;
- (void)showViewForID: (int)i_id;
- (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
@interface VLCFlippedView : NSView
{
}
@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]]; \
}
@end
\ No newline at end of file
/*****************************************************************************
* prefs.m: MacOS X module for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: prefs.m,v 1.40 2004/02/06 03:52:09 hartman Exp $
* Copyright (C) 2002-2004 VideoLAN
* $Id: prefs.m,v 1.41 2004/02/19 19:38:58 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Derk-Jan Hartman <hartman at videolan.org>
* 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
......@@ -26,17 +26,12 @@
* Preamble
*****************************************************************************/
#include <stdlib.h> /* malloc(), free() */
#include <sys/param.h> /* for MAXPATHLEN */
#include <string.h>
#include "intf.h"
#include "prefs.h"
#include "misc.h"
#include <vlc_help.h>
#define ROOT_ID 1241
#define GENERAL_ID 1242
#define MODULE_ID 1243
#define CAPABILITY_ID 1244
#include "vlc_keys.h"
/*****************************************************************************
* VLCPrefs implementation
......@@ -49,7 +44,8 @@
if( self != nil )
{
o_empty_view = [[[NSView alloc] init] retain];
o_empty_view = [[NSView alloc] init];
o_save_prefs = [[NSMutableDictionary alloc] init];
}
return( self );
......@@ -58,6 +54,7 @@
- (void)dealloc
{
[o_empty_view release];
[o_save_prefs release];
[super dealloc];
}
......@@ -74,7 +71,6 @@
[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
......@@ -88,14 +84,113 @@
- (void)showPrefs
{
// show first tree item
[[o_prefs_view window] center];
[[o_prefs_view window] makeKeyAndOrderFront:self];
[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
{
// walk trough all treeitems and tell them all to save
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];
}
......@@ -118,7 +213,8 @@
if( i_return == NSAlertAlternateReturn )
{
config_ResetAll( p_intf );
// show first config treeitem
[self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID]
andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]];
}
}
......@@ -126,18 +222,613 @@
{
b_advanced = !b_advanced;
[o_advanced_ckb setState: b_advanced];
// walk trough all treeitems and set advanced state
[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
{
}
- (void)outlineViewSelectionDidChange:(NSNotification *)o_notification
{
// a tree item will be shown
[self showViewForID: [[o_tree itemAtRow:[o_tree selectedRow]] getObjectID]
andName: [[o_tree itemAtRow:[o_tree selectedRow]] getName]];
}
- (void)showViewForID:(int)i_id
- (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 */
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 = 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: [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 : "";