X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgui%2Fmacosx%2Fprefs.m;h=7bdb0e7ea107bd4bdd18cc497f010817e9bffb7f;hb=6175138560eec61cb77424374b244818b0412fdc;hp=1c957fe9cd23eaf83759d3b2d80bf284fdea42b0;hpb=5ee2785c6f32ff620a4762b92527ab32ca8eb42e;p=vlc diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index 1c957fe9cd..7bdb0e7ea1 100644 --- a/modules/gui/macosx/prefs.m +++ b/modules/gui/macosx/prefs.m @@ -1,7 +1,7 @@ /***************************************************************************** * prefs.m: MacOS X module for vlc ***************************************************************************** - * Copyright (C) 2002-2005 VideoLAN + * Copyright (C) 2002-2006 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen @@ -19,10 +19,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/* VLCPrefs manages the main preferences dialog +/* VLCPrefs manages the main preferences dialog the class is related to wxwindows intf, PrefsPanel */ /* VLCTreeItem should contain: - the children of the treeitem @@ -46,13 +46,18 @@ #include /* for MAXPATHLEN */ #include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include -#include "intf.h" -#include "prefs.h" -#include "prefs_widgets.h" -#include "vlc_keys.h" +#import "intf.h" +#import "prefs.h" +#import "simple_prefs.h" +#import "prefs_widgets.h" +#import "vlc_keys.h" /***************************************************************************** * VLCPrefs implementation @@ -101,11 +106,16 @@ static VLCPrefs *_o_sharedMainInstance = nil; [o_tree selectRow:0 byExtendingSelection:NO]; } -- (void)showPrefs +- (void)setTitle: (NSString *) o_title_name { - /* load our nib (if not already loaded) */ - [NSBundle loadNibNamed:@"Preferences" owner:self]; + [o_title setStringValue: o_title_name]; +} +- (void)showPrefs +{ + [[o_basicFull_matrix cellAtRow:0 column:0] setState: NSOffState]; + [[o_basicFull_matrix cellAtRow:0 column:1] setState: NSOnState]; + [o_prefs_window center]; [o_prefs_window makeKeyAndOrderFront:self]; } @@ -117,6 +127,8 @@ static VLCPrefs *_o_sharedMainInstance = nil; [o_cancel_btn setTitle: _NS("Cancel")]; [o_reset_btn setTitle: _NS("Reset All")]; [o_advanced_ckb setTitle: _NS("Advanced")]; + [[o_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")]; + [[o_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")]; } - (IBAction)savePrefs: (id)sender @@ -137,7 +149,7 @@ static VLCPrefs *_o_sharedMainInstance = nil; 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" + _NS("Beware this will reset the VLC media player preferences.\n" "Are you sure you want to continue?") ); } @@ -146,10 +158,12 @@ static VLCPrefs *_o_sharedMainInstance = nil; { if( i_return == NSAlertAlternateReturn ) { + [o_prefs_view setDocumentView: o_empty_view]; config_ResetAll( p_intf ); + [[VLCTreeItem rootItem] resetView]; [[o_tree itemAtRow:[o_tree selectedRow]] showView:o_prefs_view advancedView: - ( [o_advanced_ckb state] == NSOnState ) ? VLC_TRUE : VLC_FALSE]; + ( [o_advanced_ckb state] == NSOnState ) ? true : false]; } } @@ -159,7 +173,15 @@ static VLCPrefs *_o_sharedMainInstance = nil; [o_advanced_ckb setState: b_advanced]; /* refresh the view of the current treeitem */ [[o_tree itemAtRow:[o_tree selectedRow]] showView:o_prefs_view advancedView: - ( [o_advanced_ckb state] == NSOnState ) ? VLC_TRUE : VLC_FALSE]; + ( [o_advanced_ckb state] == NSOnState ) ? true : false]; +} + +- (IBAction)buttonAction: (id)sender +{ + [o_prefs_window orderOut: self]; + [[o_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState]; + [[o_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState]; + [[[VLCMain sharedInstance] getSimplePreferences] showSimplePrefs]; } - (void)loadConfigTree @@ -175,7 +197,7 @@ static VLCPrefs *_o_sharedMainInstance = nil; { [[o_tree itemAtRow:[o_tree selectedRow]] showView: o_prefs_view advancedView:( [o_advanced_ckb state] == NSOnState ) ? - VLC_TRUE : VLC_FALSE]; + true : false]; } @end @@ -189,13 +211,13 @@ static VLCPrefs *_o_sharedMainInstance = nil; - (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item { - return (item == nil) ? YES : ( ([item numberOfChildren] != -1) && + return (item == nil) ? YES : ( ([item numberOfChildren] != -1) && ([item numberOfChildren] != 0)); } - (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item { return (item == nil) ? [[VLCTreeItem rootItem] childAtIndex:index] : - [item childAtIndex:index]; + (id)[item childAtIndex:index]; } - (id)outlineView:(NSOutlineView *)outlineView @@ -212,7 +234,10 @@ static VLCTreeItem *o_root_item = nil; #define IsALeafNode ((id)-1) -- (id)initWithName: (NSString *)o_item_name ID: (int)i_id +- (id)initWithName: (NSString *)o_item_name + withTitle: (NSString *)o_item_title + withHelp: (NSString *)o_item_help + ID: (int)i_id parent:(VLCTreeItem *)o_parent_item children:(NSMutableArray *)o_children_array whithCategory: (int) i_category @@ -222,6 +247,8 @@ static VLCTreeItem *o_root_item = nil; if( self != nil ) { o_name = [o_item_name copy]; + o_title= [o_item_title copy]; + o_help= [o_item_help copy]; i_object_id = i_id; o_parent = o_parent_item; o_children = o_children_array; @@ -234,7 +261,7 @@ static VLCTreeItem *o_root_item = nil; + (VLCTreeItem *)rootItem { if (o_root_item == nil) - o_root_item = [[VLCTreeItem alloc] initWithName:@"main" ID:0 + o_root_item = [[VLCTreeItem alloc] initWithName:@"main" withTitle:@"main" withHelp:@"" ID:0 parent:nil children:[[NSMutableArray alloc] initWithCapacity:10] whithCategory: -1]; return o_root_item; @@ -244,6 +271,8 @@ static VLCTreeItem *o_root_item = nil; { if (o_children != IsALeafNode) [o_children release]; [o_name release]; + [o_title release]; + [o_help release]; [super dealloc]; } @@ -258,13 +287,18 @@ static VLCTreeItem *o_root_item = nil; intf_thread_t *p_intf = VLCIntf; vlc_list_t *p_list; module_t *p_module = NULL; - module_config_t *p_item; - int i_index; + module_t *p_parser; + module_config_t *p_item, + *p_end; + int i_index = 0; /* List the modules */ p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); if( !p_list ) return nil; + /* get parser */ + p_parser = (module_t *)p_list->p_values[i_index].p_object; + if( [[self getName] isEqualToString: @"main"] ) { /* @@ -273,13 +307,13 @@ static VLCTreeItem *o_root_item = nil; 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( !strcmp( p_module->psz_object_name, "main" ) ) + if( !strcmp( module_GetObjName( p_module ), "main" ) ) break; } if( p_module == NULL ) { msg_Err( p_intf, - "could not find the main module in our preferences" ); + "could not load the preferences" ); return nil; } if( i_index < p_list->i_count ) @@ -288,84 +322,113 @@ static VLCTreeItem *o_root_item = nil; /* Enumerate config categories and store a reference so we can * generate their config panel them when it is asked by the user. */ VLCTreeItem *p_last_category = NULL; - p_item = p_module->p_config; + unsigned int i_confsize; + p_item = module_GetConfig( p_parser, &i_confsize ); + p_end = p_item + i_confsize; o_children = [[NSMutableArray alloc] initWithCapacity:10]; if( p_item ) do { NSString *o_child_name; + NSString *o_child_title; + NSString *o_child_help; switch( p_item->i_type ) { case CONFIG_CATEGORY: + if( p_item->value.i == -1 ) break; + o_child_name = [[VLCMain sharedInstance] - localizedString: config_CategoryNameGet(p_item->i_value ) ]; + localizedString: config_CategoryNameGet( p_item->value.i )]; + o_child_title = o_child_name; + o_child_help = [[VLCMain sharedInstance] + localizedString: config_CategoryHelpGet( p_item->value.i )]; p_last_category = [VLCTreeItem alloc]; [o_children addObject:[p_last_category initWithName: o_child_name - ID: p_item->i_value + withTitle: o_child_title + withHelp: o_child_help + ID: p_item->value.i parent:self children:[[NSMutableArray alloc] initWithCapacity:10] - whithCategory: p_item - p_module->p_config]]; + whithCategory: p_item - module_GetConfig( p_module, &i_confsize )]]; break; case CONFIG_SUBCATEGORY: - o_child_name = [[VLCMain sharedInstance] - localizedString: config_CategoryNameGet(p_item->i_value ) ]; - if( p_item->i_value != SUBCAT_VIDEO_GENERAL && - p_item->i_value != SUBCAT_AUDIO_GENERAL ) + if( p_item->value.i == -1 ) break; + + if( p_item->value.i != SUBCAT_PLAYLIST_GENERAL && + p_item->value.i != SUBCAT_VIDEO_GENERAL && + p_item->value.i != SUBCAT_INPUT_GENERAL && + p_item->value.i != SUBCAT_INTERFACE_GENERAL && + p_item->value.i != SUBCAT_SOUT_GENERAL && + p_item->value.i != SUBCAT_ADVANCED_MISC && + p_item->value.i != SUBCAT_AUDIO_GENERAL ) + { + o_child_name = [[VLCMain sharedInstance] + localizedString: config_CategoryNameGet( p_item->value.i ) ]; + o_child_title = o_child_name; + o_child_help = [[VLCMain sharedInstance] + localizedString: config_CategoryHelpGet( p_item->value.i ) ]; + [p_last_category->o_children addObject:[[VLCTreeItem alloc] initWithName: o_child_name - ID: p_item->i_value + withTitle: o_child_title + withHelp: o_child_help + ID: p_item->value.i parent:p_last_category children:[[NSMutableArray alloc] initWithCapacity:10] - whithCategory: p_item - p_module->p_config]]; + whithCategory: p_item - module_GetConfig( p_parser, &i_confsize )]]; + } + break; default: break; } - } while( p_item->i_type != CONFIG_HINT_END && p_item++ ); + } while( p_item < p_end && p_item++ ); } /* Build a tree of the plugins */ /* Add the capabilities */ for( i_index = 0; i_index < p_list->i_count; i_index++ ) { + unsigned int confsize; p_module = (module_t *)p_list->p_values[i_index].p_object; /* Exclude the main module */ - if( !strcmp( p_module->psz_object_name, "main" ) ) + if( !strcmp( module_GetObjName( p_module ), "main" ) ) continue; /* Exclude empty plugins (submodules don't have config */ /* options, they are stored in the parent module) */ - if( p_module->b_submodule ) - continue; - else - p_item = p_module->p_config; +// Does not work +// if( modules_IsSubModule( p_module ) ) +// continue; + p_item = module_GetConfig( p_module, &confsize ); if( !p_item ) continue; + if( !p_item->i_type ) break; int i_category = -1; int i_subcategory = -1; int i_options = 0; do { if( p_item->i_type == CONFIG_CATEGORY ) - i_category = p_item->i_value; + i_category = p_item->value.i; else if( p_item->i_type == CONFIG_SUBCATEGORY ) - i_subcategory = p_item->i_value; + i_subcategory = p_item->value.i; if( p_item->i_type & CONFIG_ITEM ) i_options ++; if( i_options > 0 && i_category >= 0 && i_subcategory >= 0 ) break; - } while( p_item->i_type != CONFIG_HINT_END && p_item++ ); + } while( p_item < p_end && p_item++ ); if( !i_options ) continue; /* Find the right category item */ long cookie; - vlc_bool_t b_found = VLC_FALSE; + bool b_found = false; unsigned int i; VLCTreeItem* p_category_item, * p_subcategory_item; for (i = 0 ; i < [o_children count] ; i++) @@ -373,14 +436,14 @@ static VLCTreeItem *o_root_item = nil; p_category_item = [o_children objectAtIndex: i]; if( p_category_item->i_object_id == i_category ) { - b_found = VLC_TRUE; + b_found = true; break; } } if( !b_found ) continue; /* Find subcategory item */ - b_found = VLC_FALSE; + b_found = false; cookie = -1; for (i = 0 ; i < [p_category_item->o_children count] ; i++) { @@ -388,7 +451,7 @@ static VLCTreeItem *o_root_item = nil; objectAtIndex: i]; if( p_subcategory_item->i_object_id == i_subcategory ) { - b_found = VLC_TRUE; + b_found = true; break; } } @@ -397,12 +460,15 @@ static VLCTreeItem *o_root_item = nil; [p_subcategory_item->o_children addObject:[[VLCTreeItem alloc] initWithName:[[VLCMain sharedInstance] - localizedString: p_module->psz_object_name ] - ID: p_module->i_object_id + localizedString: module_GetName( p_module, false ) ] + withTitle:[[VLCMain sharedInstance] + localizedString: module_GetLongName( p_module ) ] + withHelp: @"" + ID: ((vlc_object_t*)p_module)->i_object_id parent:p_subcategory_item children:IsALeafNode whithCategory: -1]]; - } + } } vlc_list_release( p_list ); } @@ -419,6 +485,16 @@ static VLCTreeItem *o_root_item = nil; return o_name; } +- (NSString *)getTitle +{ + return o_title; +} + +- (NSString *)getHelp +{ + return o_help; +} + - (VLCTreeItem *)childAtIndex:(int)i_index { return [[self children] objectAtIndex:i_index]; @@ -446,9 +522,11 @@ static VLCTreeItem *o_root_item = nil; { p_parser = (module_t *)p_list->p_values[i_index].p_object ; - if( !strcmp( p_parser->psz_object_name, psz_module_name ) ) + if( !strcmp( module_GetObjName( p_parser ), psz_module_name ) ) { - BOOL b_has_prefs = p_parser->i_config_items != 0; + unsigned int confsize; + module_GetConfig( p_parser, &confsize ); + BOOL b_has_prefs = confsize != 0; vlc_list_release( p_list ); return( b_has_prefs ); } @@ -460,12 +538,13 @@ static VLCTreeItem *o_root_item = nil; } - (NSView *)showView:(NSScrollView *)o_prefs_view - advancedView:(vlc_bool_t) b_advanced + advancedView:(bool) b_advanced { -fprintf( stderr, "[%s] showView\n", [o_name UTF8String] ); NSRect s_vrc; NSView *o_view; + [[VLCPrefs sharedInstance] setTitle: [self getTitle]]; + /* NSLog( [self getHelp] ); */ s_vrc = [[o_prefs_view contentView] bounds]; s_vrc.size.height -= 4; o_view = [[VLCFlippedView alloc] initWithFrame: s_vrc]; [o_view setAutoresizingMask: NSViewWidthSizable | NSViewMinYMargin | @@ -478,49 +557,43 @@ fprintf( stderr, "[%s] showView\n", [o_name UTF8String] ); intf_thread_t *p_intf = VLCIntf; vlc_list_t *p_list; module_t *p_parser = NULL; - module_config_t *p_item; + module_config_t *p_item, + *p_end; + unsigned int confsize; o_subviews = [[NSMutableArray alloc] initWithCapacity:10]; /* Get a pointer to the module */ if( i_object_category == -1 ) { - p_parser = (module_t *) vlc_object_get( p_intf, i_object_id ); - if( !p_parser || p_parser->i_object_type != VLC_OBJECT_MODULE ) + p_parser = (module_t *) vlc_object_get( i_object_id ); + if( !p_parser ) { /* 0OOoo something went really bad */ return nil; } - p_item = p_parser->p_config; - int i = 0; - - p_item = p_parser->p_config + 1; + p_item = module_GetConfig( p_parser, &confsize ); + p_end = p_item + confsize; do { if( !p_item ) { - msg_Err( p_intf, "null item found" ); + msg_Err( p_intf, "invalid preference item found" ); break; } + if( p_item > p_end ) + break; switch(p_item->i_type) { case CONFIG_SUBCATEGORY: -fprintf( stderr, "drawing subcategory %s\n", [o_name UTF8String] ); - break; - case CONFIG_SECTION: -fprintf( stderr, "drawing section %s\n", p_item->psz_text ); break; case CONFIG_CATEGORY: -fprintf( stderr, "drawing category %s\n", [o_name UTF8String] ); break; - case CONFIG_HINT_END: -fprintf( stderr, "end of (sub)category\n" ); + case CONFIG_SECTION: break; case CONFIG_HINT_USAGE: -fprintf( stderr, "skipping hint usage\n" ); break; default: -fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type ); { VLCConfigControl *o_control = nil; o_control = [VLCConfigControl newControl:p_item @@ -531,17 +604,15 @@ fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type ); NSViewWidthSizable]; [o_subviews addObject: o_control]; } -fprintf( stderr, "\n" ); } break; } - } while( p_item++->i_type != CONFIG_HINT_END ); + } while( p_item < p_end && p_item++ ); - vlc_object_release( p_parser ); + vlc_object_release( (vlc_object_t*)p_parser ); } else { - int i = 0; int i_index; p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); if( !p_list ) return o_view; @@ -552,48 +623,49 @@ fprintf( stderr, "\n" ); 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, "main" ) ) + if( !strcmp( module_GetObjName( p_parser ), "main" ) ) break; } if( p_parser == NULL ) { - msg_Err( p_intf, "could not find the main module in our " - "preferences" ); + msg_Err( p_intf, "could not load preferences" ); return o_view; } - p_item = (p_parser->p_config + i_object_category); + unsigned int confsize; + p_item = module_GetConfig( p_parser, &confsize ); + p_end = p_item + confsize; + p_item += i_object_category; + if( ( p_item->i_type == CONFIG_CATEGORY ) && - ( ( p_item->i_value == CAT_AUDIO ) || - ( p_item->i_value == CAT_VIDEO ) ) ) + ( ( p_item->value.i == CAT_PLAYLIST ) || + ( p_item->value.i == CAT_AUDIO ) || + ( p_item->value.i == CAT_VIDEO ) || + ( p_item->value.i == CAT_INTERFACE ) || + ( p_item->value.i == CAT_INPUT ) || + ( p_item->value.i == CAT_SOUT ) ) ) p_item++; do { p_item++; - if( !p_item ) + if( !p_item || !p_item->i_type ) { - msg_Err( p_intf, "null item found" ); + msg_Err( p_intf, "invalid preference item found" ); break; } - switch(p_item->i_type) + if( p_item > p_end ) + break; + switch( p_item->i_type ) { case CONFIG_SUBCATEGORY: -fprintf( stderr, "drawing subcategory %s\n", [o_name UTF8String] ); - break; - case CONFIG_SECTION: -fprintf( stderr, "drawing section %s\n", p_item->psz_text ); break; case CONFIG_CATEGORY: -fprintf( stderr, "drawing category %s\n", [o_name UTF8String] ); break; - case CONFIG_HINT_END: -fprintf( stderr, "end of (sub)category\n" ); + case CONFIG_SECTION: break; case CONFIG_HINT_USAGE: -fprintf( stderr, "skipping hint usage\n" ); break; default: -fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type ); { VLCConfigControl *o_control = nil; o_control = [VLCConfigControl newControl:p_item @@ -607,7 +679,7 @@ fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type ); break; } } - } while ( ( p_item->i_type != CONFIG_HINT_END ) && + } while ( ( p_item < p_end ) && ( p_item->i_type != CONFIG_SUBCATEGORY ) ); vlc_list_release( p_list ); @@ -619,10 +691,12 @@ fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type ); int i_lastItem = 0; int i_yPos = -2; int i_max_label = 0; + int i_show_advanced = 0; + NSEnumerator *enumerator = [o_subviews objectEnumerator]; VLCConfigControl *o_widget; NSRect o_frame; - + while( ( o_widget = [enumerator nextObject] ) ) if( ( [o_widget isAdvanced] ) && (! b_advanced) ) continue; @@ -634,7 +708,10 @@ fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type ); { int i_widget; if( ( [o_widget isAdvanced] ) && (! b_advanced) ) + { + i_show_advanced++; continue; + } i_widget = [o_widget getViewType]; i_yPos += [VLCConfigControl calcVerticalMargin:i_widget @@ -649,6 +726,28 @@ fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type ); i_lastItem = i_widget; [o_view addSubview:o_widget]; } + if( i_show_advanced != 0 ) + { + /* We add the advanced notice... */ + NSRect s_rc = [o_view frame]; + NSTextField *o_label; + s_rc.size.height = 17; + s_rc.origin.x = LEFTMARGIN; + s_rc.origin.y = i_yPos += [VLCConfigControl + calcVerticalMargin:CONFIG_ITEM_STRING + lastItem:i_lastItem]; + o_label = [[[NSTextField alloc] initWithFrame: s_rc] retain]; + [o_label setDrawsBackground: NO]; + [o_label setBordered: NO]; + [o_label setEditable: NO]; + [o_label setSelectable: NO]; + [o_label setStringValue: _NS("Some options are hidden. " \ + "Check \"Advanced\" to display them.")]; + [o_label setFont:[NSFont systemFontOfSize:10]]; + [o_label sizeToFit]; + [o_view addSubview:o_label]; + i_yPos += [o_label frame].size.height; + } o_frame = [o_view frame]; o_frame.size.height = i_yPos; [o_view setFrame:o_frame]; @@ -671,6 +770,21 @@ fprintf( stderr, "%s (%d)", p_item->psz_name, p_item->i_type ); [[o_children objectAtIndex:i] applyChanges]; } +- (void)resetView +{ + unsigned int i; + if( o_subviews != nil ) + { + //Item has been shown + [o_subviews release]; + o_subviews = nil; + } + + if( o_children != IsALeafNode ) + for( i = 0 ; i < [o_children count] ; i++ ) + [[o_children objectAtIndex:i] resetView]; +} + @end