X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fprefs.m;h=cce4386f19e6e037f24e76dfe435c58813baafc3;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=eff5b9fc1acf076834b995d885b819d3b468dd4c;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index eff5b9fc1a..cce4386f19 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 (Centrale Réseaux) and its contributors + * 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 @@ -101,6 +101,11 @@ static VLCPrefs *_o_sharedMainInstance = nil; [o_tree selectRow:0 byExtendingSelection:NO]; } +- (void)setTitle: (NSString *) o_title_name +{ + [o_title setStringValue: o_title_name]; +} + - (void)showPrefs { /* load our nib (if not already loaded) */ @@ -137,7 +142,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?") ); } @@ -191,13 +196,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 @@ -214,7 +219,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 @@ -224,6 +232,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; @@ -236,7 +246,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; @@ -246,6 +256,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]; } @@ -260,13 +272,19 @@ 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; + p_end = p_parser->p_config + p_parser->confsize; + if( [[self getName] isEqualToString: @"main"] ) { /* @@ -281,7 +299,7 @@ static VLCTreeItem *o_root_item = nil; 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 ) @@ -295,39 +313,63 @@ static VLCTreeItem *o_root_item = nil; 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]]; break; case CONFIG_SUBCATEGORY: - o_child_name = [[VLCMain sharedInstance] - localizedString: config_CategoryNameGet(p_item->i_value ) ]; - if( p_item->i_value != SUBCAT_PLAYLIST_GENERAL && - 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]]; + } + 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 */ @@ -354,15 +396,15 @@ static VLCTreeItem *o_root_item = nil; 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 */ @@ -400,12 +442,17 @@ static VLCTreeItem *o_root_item = nil; [p_subcategory_item->o_children addObject:[[VLCTreeItem alloc] initWithName:[[VLCMain sharedInstance] - localizedString: p_module->psz_object_name ] + localizedString: (char *)p_module->psz_shortname ? + (char *)p_module->psz_shortname : (char *)p_module->psz_object_name ] + withTitle:[[VLCMain sharedInstance] + localizedString: (char *)p_module->psz_longname ? + (char *)p_module->psz_longname : (char *)p_module->psz_object_name ] + withHelp: @"" ID: p_module->i_object_id parent:p_subcategory_item children:IsALeafNode whithCategory: -1]]; - } + } } vlc_list_release( p_list ); } @@ -422,6 +469,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]; @@ -468,6 +525,8 @@ static VLCTreeItem *o_root_item = nil; 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 | @@ -480,7 +539,8 @@ static VLCTreeItem *o_root_item = nil; 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; o_subviews = [[NSMutableArray alloc] initWithCapacity:10]; /* Get a pointer to the module */ @@ -492,8 +552,10 @@ static VLCTreeItem *o_root_item = nil; /* 0OOoo something went really bad */ return nil; } + + p_end = p_parser->p_config + p_parser->confsize; + p_item = p_parser->p_config; - int i = 0; p_item = p_parser->p_config + 1; @@ -501,18 +563,18 @@ static VLCTreeItem *o_root_item = nil; { 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: break; - case CONFIG_SECTION: - break; case CONFIG_CATEGORY: break; - case CONFIG_HINT_END: + case CONFIG_SECTION: break; case CONFIG_HINT_USAGE: break; @@ -530,13 +592,12 @@ static VLCTreeItem *o_root_item = nil; } break; } - } while( p_item++->i_type != CONFIG_HINT_END ); + } while( p_item < p_end && p_item++ ); vlc_object_release( 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,15 +613,19 @@ static VLCTreeItem *o_root_item = nil; } 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_end = p_parser->p_config + p_parser->confsize; + p_item = (p_parser->p_config + i_object_category); if( ( p_item->i_type == CONFIG_CATEGORY ) && - ( ( p_item->i_value == CAT_PLAYLIST ) || - ( 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 @@ -568,24 +633,28 @@ static VLCTreeItem *o_root_item = nil; p_item++; if( !p_item ) { - 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: break; - case CONFIG_SECTION: - break; case CONFIG_CATEGORY: break; - case CONFIG_HINT_END: + case CONFIG_SECTION: break; case CONFIG_HINT_USAGE: break; default: { VLCConfigControl *o_control = nil; + if( p_item->b_internal == VLC_TRUE ) + { + break; + } o_control = [VLCConfigControl newControl:p_item withView:o_view]; if( o_control != nil ) @@ -597,7 +666,7 @@ static VLCTreeItem *o_root_item = nil; 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 ); @@ -614,7 +683,7 @@ static VLCTreeItem *o_root_item = nil; NSEnumerator *enumerator = [o_subviews objectEnumerator]; VLCConfigControl *o_widget; NSRect o_frame; - + while( ( o_widget = [enumerator nextObject] ) ) if( ( [o_widget isAdvanced] ) && (! b_advanced) ) continue; @@ -659,8 +728,8 @@ static VLCTreeItem *o_root_item = nil; [o_label setBordered: NO]; [o_label setEditable: NO]; [o_label setSelectable: NO]; - [o_label setStringValue: _NS("Some options are available but " \ - "hidden. Check \"Advanced\" to see them.")]; + [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];