/*****************************************************************************
* prefs_widgets.m: Preferences controls
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
+ * Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Derk-Jan Hartman <hartman at videolan.org>
- * Jérôme Decoodt <djc at videolan.org>
+ * Jérôme Decoodt <djc at videolan.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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* 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.
*****************************************************************************/
/*****************************************************************************
#define OFFSET_RIGHT 20
#define OFFSET_BETWEEN 2
-#define LEFTMARGIN 18
-#define RIGHTMARGIN 18
-
-#define UPWARDS_WHITE_ARROW "\xE2\x87\xA7"
+#define UPWARDS_WHITE_ARROW "\xE2\x87\xA7"
#define OPTION_KEY "\xE2\x8C\xA5"
#define UP_ARROWHEAD "\xE2\x8C\x83"
#define PLACE_OF_INTEREST_SIGN "\xE2\x8C\x98"
[o_mi setTag: \
( value )]; \
[o_menu addItem: o_mi]; \
-if( MACOS_VERSION >= 10.3 ) \
-{ \
/* Ctrl */ \
o_mi = [[NSMenuItem alloc] initWithTitle: \
[[NSString stringWithUTF8String: \
[o_mi setTag: \
KEY_MODIFIER_COMMAND | ( value )]; \
[o_menu addItem: o_mi]; \
-} \
}
#define ADD_LABEL( o_label, superFrame, x_offset, my_y_offset, label ) \
[o_checkbox sizeToFit]; \
}
-#define ADD_CHECKBOX( o_checkbox, superFrame, x_offset, my_y_offset, label, \
- tooltip, init_value, position ) \
-{ \
- NSRect s_rc = superFrame; \
- s_rc.size.height = 18; \
- s_rc.origin.x = x_offset - 2; \
- s_rc.origin.y = superFrame.size.height - 18 + my_y_offset; \
- o_checkbox = [[[NSButton alloc] initWithFrame: s_rc] retain]; \
- [o_checkbox setFont:[NSFont systemFontOfSize:0]]; \
- [o_checkbox setButtonType: NSSwitchButton]; \
- [o_checkbox setImagePosition: position]; \
- [o_checkbox setIntValue: init_value]; \
- [o_checkbox setTitle: label]; \
- [o_checkbox setToolTip: tooltip]; \
- [o_checkbox sizeToFit]; \
-}
-
@implementation VLCConfigControl
- (id)initWithFrame: (NSRect)frame
{
[self setFrame:frame];
}
+#if GC_ENABLED
+- (void)finalize
+{
+ /* since dealloc isn't called on 10.5 if GC is enabled and since GC is
+ * Obj-C only, we need to do this: */
+ if( psz_name ) free( psz_name );
+ [super finalize];
+}
+#endif
+
- (void)dealloc
{
if( o_label ) [o_label release];
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
- i_margin = 6;
+ i_margin = 10;
break;
case CONFIG_ITEM_STRING_LIST:
- i_margin = 5;
+ i_margin = 9;
break;
case CONFIG_ITEM_FILE:
- i_margin = 4;
+ i_margin = 8;
break;
case CONFIG_ITEM_MODULE:
- i_margin = 2;
+ i_margin = 6;
break;
case CONFIG_ITEM_INTEGER:
- i_margin = 5;
+ i_margin = 9;
break;
case CONFIG_ITEM_RANGED_INTEGER:
- i_margin = 3;
+ i_margin = 7;
break;
case CONFIG_ITEM_BOOL:
- i_margin = 3;
+ i_margin = 7;
break;
case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 3;
+ i_margin = 7;
break;
case CONFIG_ITEM_KEY_AFTER_10_3:
- i_margin = 2;
+ i_margin = 5;
break;
case CONFIG_ITEM_MODULE_LIST:
- i_margin = 6;
+ i_margin = 10;
break;
default:
- i_margin = 18;
+ i_margin = 20;
break;
}
break;
withView: (NSView *)o_parent_view
{
VLCConfigControl *p_control = NULL;
+ /* Skip depracated options */
+ if( _p_item->psz_current )
+ {
+ return NULL;
+ }
+
switch( _p_item->i_type )
{
case CONFIG_ITEM_STRING:
initWithItem: _p_item
withView: o_parent_view];
}
- else if( _p_item->i_min != 0 || _p_item->i_max != 0 )
+ else if( _p_item->min.i != 0 || _p_item->max.i != 0 )
{
p_control = [[RangedIntegerConfigControl alloc]
initWithItem: _p_item
withView: o_parent_view];
break;
case CONFIG_ITEM_FLOAT:
- if( _p_item->f_min != 0 || _p_item->f_max != 0 )
+ if( _p_item->min.f != 0 || _p_item->max.f != 0 )
{
p_control = [[RangedFloatConfigControl alloc]
initWithItem: _p_item
}
break;
case CONFIG_ITEM_KEY:
- if( MACOS_VERSION < 10.3 )
- {
- p_control = [[KeyConfigControlBefore103 alloc]
- initWithItem: _p_item
- withView: o_parent_view];
- }
- else
- {
- p_control = [[KeyConfigControlAfter103 alloc]
+ p_control = [[KeyConfigControl alloc]
initWithItem: _p_item
withView: o_parent_view];
- }
break;
case CONFIG_ITEM_MODULE_LIST:
case CONFIG_ITEM_MODULE_LIST_CAT:
case CONFIG_ITEM_MODULE:
case CONFIG_ITEM_MODULE_LIST:
case CONFIG_ITEM_MODULE_LIST_CAT:
-fprintf( stderr, "Applying %s to %s\n" , [self stringValue], psz_name );
config_PutPsz( VLCIntf, psz_name, [self stringValue] );
break;
case CONFIG_ITEM_KEY:
/* So you don't need to restart to have the changes take effect */
-fprintf( stderr, "Applying %d to %s\n" , [self intValue], psz_name );
val.i_int = [self intValue];
- var_Set( VLCIntf->p_vlc, psz_name, val );
+ var_Set( VLCIntf->p_libvlc, psz_name, val );
case CONFIG_ITEM_INTEGER:
case CONFIG_ITEM_BOOL:
-fprintf( stderr, "Applying %d to %s\n" , [self intValue], psz_name );
config_PutInt( VLCIntf, psz_name, [self intValue] );
break;
case CONFIG_ITEM_FLOAT:
-fprintf( stderr, "Applying %f to %s\n" , [self floatValue], psz_name );
config_PutFloat( VLCIntf, psz_name, [self floatValue] );
break;
}
}
+
+- (int)getLabelSize
+{
+ return [o_label frame].size.width;
+}
+
+- (void) alignWithXPosition:(int)i_xPos;
+{
+ /* FIXME: not implemented atm, but created to shut up the warning
+ * about "method definition not found" -- FK @ 7/24/05 */
+}
@end
@implementation StringConfigControl
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
/* build the textfield */
o_textfieldTooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance] localizedString: p_item->psz_longtext]
+ [[VLCMain sharedInstance] localizedString: (char *)p_item->psz_longtext]
toWidth: PREFS_WRAP];
- if( p_item->psz_value )
+ if( p_item->value.psz )
o_textfieldString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_value];
+ localizedString: (char *)p_item->value.psz];
else
o_textfieldString = [NSString stringWithString: @""];
ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2,
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ NSRect frame;
+ NSRect superFrame = [self frame];
+ frame = [o_label frame];
+ frame.origin.x = i_xPos - frame.size.width - 3;
+ [o_label setFrame:frame];
+
+ frame = [o_textfield frame];
+ frame.origin.x = i_xPos + 2;
+ frame.size.width = superFrame.size.width - frame.origin.x - 1;
+ [o_textfield setFrame:frame];
+}
+
- (void)dealloc
{
- [o_label release];
[o_textfield release];
[super dealloc];
}
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
/* build the textfield */
o_textfieldTooltip = [[VLCMain sharedInstance] wrapString:
[[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
ADD_COMBO( o_combo, mainFrame, [o_label frame].size.width,
-2, 0, o_textfieldTooltip )
[o_combo setAutoresizingMask:NSViewWidthSizable ];
for( i_index = 0; i_index < p_item->i_list; i_index++ )
- if( p_item->psz_value &&
- !strcmp( p_item->psz_value, p_item->ppsz_list[i_index] ) )
+ if( p_item->value.psz &&
+ !strcmp( p_item->value.psz, p_item->ppsz_list[i_index] ) )
[o_combo selectItemAtIndex: i_index];
[self addSubview: o_combo];
}
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ NSRect frame;
+ NSRect superFrame = [self frame];
+ frame = [o_label frame];
+ frame.origin.x = i_xPos - frame.size.width - 3;
+ [o_label setFrame:frame];
+
+ frame = [o_combo frame];
+ frame.origin.x = i_xPos + 2;
+ frame.size.width = superFrame.size.width - frame.origin.x + 2;
+ [o_combo setFrame:frame];
+}
+
- (void)dealloc
{
[o_combo release];
if( p_item->ppsz_list_text && p_item->ppsz_list_text[i_index] )
{
return [[VLCMain sharedInstance]
- localizedString: p_item->ppsz_list_text[i_index]];
+ localizedString: (char *)p_item->ppsz_list_text[i_index]];
} else return [[VLCMain sharedInstance]
- localizedString: p_item->ppsz_list[i_index]];
+ localizedString: (char *)p_item->ppsz_list[i_index]];
}
@end
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
ADD_LABEL( o_label, mainFrame, 0, 3, o_labelString )
/* build the button */
o_buttonTooltip = [[VLCMain sharedInstance]
wrapString: [[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
ADD_RIGHT_BUTTON( o_button, mainFrame, 0, 0, o_buttonTooltip,
_NS("Browse...") )
[o_button setAutoresizingMask:NSViewMinXMargin ];
/* build the textfield */
o_textfieldTooltip = [[VLCMain sharedInstance] wrapString:
[[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
- if( p_item->psz_value )
- o_textfieldString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_value];
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ if( p_item->value.psz )
+ o_textfieldString = [NSString stringWithFormat: @"%s", (char *)p_item->value.psz];
else
o_textfieldString = [NSString stringWithString: @""];
ADD_TEXTFIELD( o_textfield, mainFrame, 12, 2, mainFrame.size.width -
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ ;
+}
+
- (void)dealloc
{
[o_textfield release];
types:nil
modalForWindow:[sender window]
modalDelegate: self
- didEndSelector: @selector(pathChosenInPanel:
+ didEndSelector: @selector(pathChosenInPanel:
withReturn:
contextInfo:)
contextInfo: nil];
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
ADD_LABEL( o_label, mainFrame, 0, -1, o_labelString )
/* build the popup */
o_popupTooltip = [[VLCMain sharedInstance] wrapString:
[[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
ADD_POPUP( o_popup, mainFrame, [o_label frame].size.width,
-2, 0, o_popupTooltip )
[o_popup setAutoresizingMask:NSViewWidthSizable ];
p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
for( i_index = 0; i_index < p_list->i_count; i_index++ )
{
- p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+ p_parser = (module_t *)p_list->p_values[i_index].p_object;
+
if( p_item->i_type == CONFIG_ITEM_MODULE )
{
if( !strcmp( p_parser->psz_capability,
p_item->psz_type ) )
{
NSString *o_description = [[VLCMain sharedInstance]
- localizedString: p_parser->psz_longname];
+ localizedString: (char *)p_parser->psz_longname];
[o_popup addItemWithTitle: o_description];
- if( p_item->psz_value &&
- !strcmp( p_item->psz_value, p_parser->psz_object_name ) )
+ if( p_item->value.psz &&
+ !strcmp( p_item->value.psz, p_parser->psz_object_name ) )
[o_popup selectItem:[o_popup lastItem]];
}
}
else
{
- module_config_t *p_config;
+ int i;
+
if( !strcmp( p_parser->psz_object_name, "main" ) )
- continue;
+ continue;
- p_config = p_parser->p_config;
- if( p_config ) do
+ for ( i = 0; i < p_parser->confsize; i++ )
{
+ module_config_t *p_config = p_parser->p_config + i;
/* Hack: required subcategory is stored in i_min */
if( p_config->i_type == CONFIG_SUBCATEGORY &&
- p_config->i_value == p_item->i_min )
+ p_config->value.i == p_item->min.i )
{
NSString *o_description = [[VLCMain sharedInstance]
- localizedString: p_parser->psz_longname];
+ localizedString: (char *)p_parser->psz_longname];
[o_popup addItemWithTitle: o_description];
- if( p_item->psz_value && !strcmp(p_item->psz_value,
+ if( p_item->value.psz && !strcmp(p_item->value.psz,
p_parser->psz_object_name) )
[o_popup selectItem:[o_popup lastItem]];
}
- } while( p_config->i_type != CONFIG_HINT_END && p_config++ );
+ }
}
}
vlc_list_release( p_list );
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ NSRect frame;
+ NSRect superFrame = [self frame];
+ frame = [o_label frame];
+ frame.origin.x = i_xPos - frame.size.width - 3;
+ [o_label setFrame:frame];
+
+ frame = [o_popup frame];
+ frame.origin.x = i_xPos - 1;
+ frame.size.width = superFrame.size.width - frame.origin.x + 2;
+ [o_popup setFrame:frame];
+}
+
- (void)dealloc
{
[o_popup release];
{
NSString *newval = [o_popup titleOfSelectedItem];
char *returnval = NULL;
- int i_index;
+ int i_module_index;
vlc_list_t *p_list;
module_t *p_parser;
p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ for( i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ )
{
- p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+ p_parser = (module_t *)p_list->p_values[i_module_index].p_object;
+
if( p_item->i_type == CONFIG_ITEM_MODULE )
{
if( !strcmp( p_parser->psz_capability,
p_item->psz_type ) )
{
NSString *o_description = [[VLCMain sharedInstance]
- localizedString: p_parser->psz_longname];
+ localizedString: (char *)p_parser->psz_longname];
if( [newval isEqualToString: o_description] )
{
returnval = strdup(p_parser->psz_object_name);
}
else
{
- module_config_t *p_config;
+ int i;
+
if( !strcmp( p_parser->psz_object_name, "main" ) )
- continue;
+ continue;
- p_config = p_parser->p_config;
- if( p_config ) do
+ for ( i = 0; i < p_parser->confsize; i++ )
{
+ module_config_t *p_config = p_parser->p_config + i;
/* Hack: required subcategory is stored in i_min */
if( p_config->i_type == CONFIG_SUBCATEGORY &&
- p_config->i_value == p_item->i_min )
+ p_config->value.i == p_item->min.i )
{
NSString *o_description = [[VLCMain sharedInstance]
- localizedString: p_parser->psz_longname];
+ localizedString: (char *)p_parser->psz_longname];
if( [newval isEqualToString: o_description] )
{
returnval = strdup(p_parser->psz_object_name);
break;
}
}
- } while( p_config->i_type != CONFIG_HINT_END && p_config++ );
+ }
}
}
vlc_list_release( p_list );
withView: (NSView *)o_parent_view
{
NSRect mainFrame = [o_parent_view frame];
- NSString *o_labelString, *o_tooltip, *o_textfieldString;
+ NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 23;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
o_tooltip = [[VLCMain sharedInstance] wrapString:
[[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, -2, o_labelString )
+ ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
/* build the stepper */
ADD_STEPPER( o_stepper, mainFrame, mainFrame.size.width - 19,
0, o_tooltip, -1600, 1600)
- [o_stepper setIntValue: p_item->i_value];
- [o_stepper setAutoresizingMask:NSViewMinXMargin ];
+ [o_stepper setIntValue: p_item->value.i];
+ [o_stepper setAutoresizingMask:NSViewMaxXMargin ];
[self addSubview: o_stepper];
- /* build the textfield */
- if( p_item->psz_value )
- o_textfieldString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_value];
- else
- o_textfieldString = [NSString stringWithString: @""];
ADD_TEXTFIELD( o_textfield, mainFrame, mainFrame.size.width - 19 - 52,
1, 49, o_tooltip, @"" )
- [o_textfield setIntValue: p_item->i_value];
+ [o_textfield setIntValue: p_item->value.i];
[o_textfield setDelegate: self];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(textfieldChanged:)
name: NSControlTextDidChangeNotification
object: o_textfield];
- [o_textfield setAutoresizingMask:NSViewMinXMargin ];
+ [o_textfield setAutoresizingMask:NSViewMaxXMargin ];
[self addSubview: o_textfield];
}
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ NSRect frame;
+ frame = [o_label frame];
+ frame.origin.x = i_xPos - frame.size.width - 3;
+ [o_label setFrame:frame];
+
+ frame = [o_textfield frame];
+ frame.origin.x = i_xPos + 2;
+ [o_textfield setFrame:frame];
+
+ frame = [o_stepper frame];
+ frame.origin.x = i_xPos + [o_textfield frame].size.width + 5;
+ [o_stepper setFrame:frame];
+}
+
- (void)dealloc
{
[o_stepper release];
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
/* build the textfield */
o_textfieldTooltip = [[VLCMain sharedInstance] wrapString:
[[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
ADD_COMBO( o_combo, mainFrame, [o_label frame].size.width,
-2, 0, o_textfieldTooltip )
[o_combo setAutoresizingMask:NSViewWidthSizable ];
for( i_index = 0; i_index < p_item->i_list; i_index++ )
{
- if( p_item->i_value == p_item->pi_list[i_index] )
+ if( p_item->value.i == p_item->pi_list[i_index] )
{
[o_combo selectItemAtIndex: i_index];
}
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ NSRect frame;
+ NSRect superFrame = [self frame];
+ frame = [o_label frame];
+ frame.origin.x = i_xPos - frame.size.width - 3;
+ [o_label setFrame:frame];
+
+ frame = [o_combo frame];
+ frame.origin.x = i_xPos + 2;
+ frame.size.width = superFrame.size.width - frame.origin.x + 2;
+ [o_combo setFrame:frame];
+}
+
- (void)dealloc
{
[o_combo release];
{
if( p_item->ppsz_list_text && p_item->ppsz_list_text[i_index] )
return [[VLCMain sharedInstance]
- localizedString: p_item->ppsz_list_text[i_index]];
+ localizedString: (char *)p_item->ppsz_list_text[i_index]];
else
return [NSString stringWithFormat: @"%i", p_item->pi_list[i_index]];
}
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
/* build the textfield */
o_tooltip = [[VLCMain sharedInstance] wrapString:
[[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2,
28, 49, o_tooltip, @"" )
- [o_textfield setIntValue: p_item->i_value];
+ [o_textfield setIntValue: p_item->value.i];
[o_textfield setAutoresizingMask:NSViewMaxXMargin ];
[o_textfield setDelegate: self];
[[NSNotificationCenter defaultCenter] addObserver: self
/* build the mintextfield */
ADD_LABEL( o_textfield_min, mainFrame, 12, -30, @"-8888" )
- [o_textfield_min setIntValue: p_item->i_min];
+ [o_textfield_min setIntValue: p_item->min.i];
[o_textfield_min setAutoresizingMask:NSViewMaxXMargin ];
+ [o_textfield_min setAlignment:NSRightTextAlignment];
[self addSubview: o_textfield_min];
/* build the maxtextfield */
ADD_LABEL( o_textfield_max, mainFrame,
mainFrame.size.width - 31, -30, @"8888" )
- [o_textfield_max setIntValue: p_item->i_max];
+ [o_textfield_max setIntValue: p_item->max.i];
[o_textfield_max setAutoresizingMask:NSViewMinXMargin ];
[self addSubview: o_textfield_max];
[o_textfield_max frame].size.width -
[o_textfield_max frame].size.width - 14 -
[o_textfield_min frame].origin.x, o_tooltip,
- p_item->i_min, p_item->i_max )
- [o_slider setIntValue: p_item->i_value];
+ p_item->min.i, p_item->max.i )
+ [o_slider setIntValue: p_item->value.i];
[o_slider setAutoresizingMask:NSViewWidthSizable ];
[o_slider setTarget: self];
[o_slider setAction: @selector(sliderChanged:)];
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ NSRect frame;
+ frame = [o_label frame];
+ frame.origin.x = i_xPos - frame.size.width - 3;
+ [o_label setFrame:frame];
+
+ frame = [o_textfield frame];
+ frame.origin.x = i_xPos + 2;
+ [o_textfield setFrame:frame];
+}
+
- (void)dealloc
{
[o_textfield release];
withView: (NSView *)o_parent_view
{
NSRect mainFrame = [o_parent_view frame];
- NSString *o_labelString, *o_tooltip, *o_textfieldString;
+ NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 23;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
o_tooltip = [[VLCMain sharedInstance] wrapString:
[[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
ADD_LABEL( o_label, mainFrame, 0, -2, o_labelString )
/* build the stepper */
ADD_STEPPER( o_stepper, mainFrame, mainFrame.size.width - 19,
0, o_tooltip, -1600, 1600)
- [o_stepper setFloatValue: p_item->f_value];
- [o_stepper setAutoresizingMask:NSViewMinXMargin ];
+ [o_stepper setFloatValue: p_item->value.f];
+ [o_stepper setAutoresizingMask:NSViewMaxXMargin ];
[self addSubview: o_stepper];
/* build the textfield */
- if( p_item->psz_value )
- o_textfieldString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_value];
- else
- o_textfieldString = [NSString stringWithString: @""];
ADD_TEXTFIELD( o_textfield, mainFrame, mainFrame.size.width - 19 - 52,
1, 49, o_tooltip, @"" )
- [o_textfield setFloatValue: p_item->f_value];
+ [o_textfield setFloatValue: p_item->value.f];
[o_textfield setDelegate: self];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(textfieldChanged:)
name: NSControlTextDidChangeNotification
object: o_textfield];
- [o_textfield setAutoresizingMask:NSViewMinXMargin ];
+ [o_textfield setAutoresizingMask:NSViewMaxXMargin ];
[self addSubview: o_textfield];
}
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ NSRect frame;
+ frame = [o_label frame];
+ frame.origin.x = i_xPos - frame.size.width - 3;
+ [o_label setFrame:frame];
+
+ frame = [o_textfield frame];
+ frame.origin.x = i_xPos + 2;
+ [o_textfield setFrame:frame];
+
+ frame = [o_stepper frame];
+ frame.origin.x = i_xPos + [o_textfield frame].size.width + 5;
+ [o_stepper setFrame:frame];
+}
+
- (void)dealloc
{
[o_stepper release];
[o_stepper setFloatValue: [o_textfield floatValue]];
}
-- (int)floatValue
+- (float)floatValue
{
return [o_stepper floatValue];
}
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
/* build the textfield */
o_tooltip = [[VLCMain sharedInstance] wrapString:
[[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2,
28, 49, o_tooltip, @"" )
- [o_textfield setFloatValue: p_item->f_value];
+ [o_textfield setFloatValue: p_item->value.f];
[o_textfield setAutoresizingMask:NSViewMaxXMargin ];
[o_textfield setDelegate: self];
[[NSNotificationCenter defaultCenter] addObserver: self
/* build the mintextfield */
ADD_LABEL( o_textfield_min, mainFrame, 12, -30, @"-8888" )
- [o_textfield_min setFloatValue: p_item->f_min];
+ [o_textfield_min setFloatValue: p_item->min.f];
[o_textfield_min setAutoresizingMask:NSViewMaxXMargin ];
+ [o_textfield_min setAlignment:NSRightTextAlignment];
[self addSubview: o_textfield_min];
/* build the maxtextfield */
ADD_LABEL( o_textfield_max, mainFrame, mainFrame.size.width - 31,
-30, @"8888" )
- [o_textfield_max setFloatValue: p_item->f_max];
+ [o_textfield_max setFloatValue: p_item->max.f];
[o_textfield_max setAutoresizingMask:NSViewMinXMargin ];
[self addSubview: o_textfield_max];
[o_textfield_min frame].size.width + 6, -1, mainFrame.size.width -
[o_textfield_max frame].size.width -
[o_textfield_max frame].size.width - 14 -
- [o_textfield_min frame].origin.x, o_tooltip, p_item->f_min,
- p_item->f_max )
- [o_slider setFloatValue: p_item->f_value];
+ [o_textfield_min frame].origin.x, o_tooltip, p_item->min.f,
+ p_item->max.f )
+ [o_slider setFloatValue: p_item->value.f];
[o_slider setAutoresizingMask:NSViewWidthSizable ];
[o_slider setTarget: self];
[o_slider setAction: @selector(sliderChanged:)];
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ NSRect frame;
+ frame = [o_label frame];
+ frame.origin.x = i_xPos - frame.size.width - 3;
+ [o_label setFrame:frame];
+
+ frame = [o_textfield frame];
+ frame.origin.x = i_xPos + 2;
+ [o_textfield setFrame:frame];
+}
+
- (void)dealloc
{
[o_textfield release];
[o_slider setFloatValue: [o_textfield floatValue]];
}
-- (int)floatValue
+- (float)floatValue
{
return [o_slider floatValue];
}
i_view_type = CONFIG_ITEM_BOOL;
/* add the checkbox */
- if( p_item->psz_text )
- o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
- else
- o_labelString = [NSString stringWithString:@""];
o_tooltip = [[VLCMain sharedInstance]
wrapString: [[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
- ADD_CHECKBOX( o_checkbox, mainFrame, 0, 0, o_labelString,
- o_tooltip, p_item->i_value, NSImageRight)
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ ADD_CHECKBOX( o_checkbox, mainFrame, 0,
+ 0, @"", o_tooltip, p_item->value.i, NSImageLeft)
[o_checkbox setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_checkbox];
- }
- return self;
-}
-
-- (void)dealloc
-{
- [o_checkbox release];
- [super dealloc];
-}
-
-- (int)intValue
-{
- return [o_checkbox intValue];
-}
-
-@end
-
-@implementation KeyConfigControlBefore103
-
-- (id) initWithItem: (module_config_t *)_p_item
- withView: (NSView *)o_parent_view
-{
- NSRect mainFrame = [o_parent_view frame];
- NSString *o_labelString, *o_tooltip;
- mainFrame.size.height = 37;
- mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
- mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = 0;
-
- if( [super initWithFrame: mainFrame item: _p_item] != nil )
- {
- i_view_type = CONFIG_ITEM_KEY_BEFORE_10_3;
-
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, -10, o_labelString )
+ ADD_LABEL( o_label, mainFrame, [o_checkbox frame].size.width, 0, o_labelString )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
-
- /* add the checkboxes */
- o_tooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
- ADD_CHECKBOX( o_cmd_checkbox, mainFrame,
- [o_label frame].size.width + 2, 0,
- [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN], o_tooltip,
- ((((unsigned int)p_item->i_value) & KEY_MODIFIER_COMMAND)?YES:NO),
- NSImageLeft )
- [o_cmd_checkbox setState: p_item->i_value & KEY_MODIFIER_COMMAND];
- ADD_CHECKBOX( o_ctrl_checkbox, mainFrame,
- [o_cmd_checkbox frame].size.width +
- [o_cmd_checkbox frame].origin.x + 6, 0,
- [NSString stringWithUTF8String:UP_ARROWHEAD], o_tooltip,
- ((((unsigned int)p_item->i_value) & KEY_MODIFIER_CTRL)?YES:NO),
- NSImageLeft )
- [o_ctrl_checkbox setState: p_item->i_value & KEY_MODIFIER_CTRL];
- ADD_CHECKBOX( o_alt_checkbox, mainFrame, [o_label frame].size.width +
- 2, -2 - [o_cmd_checkbox frame].size.height,
- [NSString stringWithUTF8String:OPTION_KEY], o_tooltip,
- ((((unsigned int)p_item->i_value) & KEY_MODIFIER_ALT)?YES:NO),
- NSImageLeft )
- [o_alt_checkbox setState: p_item->i_value & KEY_MODIFIER_ALT];
- ADD_CHECKBOX( o_shift_checkbox, mainFrame,
- [o_cmd_checkbox frame].size.width +
- [o_cmd_checkbox frame].origin.x + 6, -2 -
- [o_cmd_checkbox frame].size.height,
- [NSString stringWithUTF8String:UPWARDS_WHITE_ARROW], o_tooltip,
- ((((unsigned int)p_item->i_value) & KEY_MODIFIER_SHIFT)?YES:NO),
- NSImageLeft )
- [o_shift_checkbox setState: p_item->i_value & KEY_MODIFIER_SHIFT];
- [self addSubview: o_cmd_checkbox];
- [self addSubview: o_ctrl_checkbox];
- [self addSubview: o_alt_checkbox];
- [self addSubview: o_shift_checkbox];
-
- /* build the popup */
- ADD_POPUP( o_popup, mainFrame, [o_shift_checkbox frame].origin.x +
- [o_shift_checkbox frame].size.width + 4,
- 4, 0, o_tooltip )
- [o_popup setAutoresizingMask:NSViewWidthSizable ];
-
- if( o_keys_menu == nil )
- {
- unsigned int i;
- o_keys_menu = [[NSMenu alloc] initWithTitle: @"Keys Menu"];
- 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 )
- POPULATE_A_KEY( o_keys_menu,
- [NSString stringWithCString:vlc_keys[i].psz_key_string]
- , vlc_keys[i].i_key_code)
- }
- [o_popup setMenu:[o_keys_menu copyWithZone:nil]];
- [o_popup selectItemWithTitle: [[VLCMain sharedInstance]
- localizedString:KeyToString(
- (((unsigned int)p_item->i_value) & ~KEY_MODIFIER ))]];
- [self addSubview: o_popup];
}
return self;
}
- (void)dealloc
{
- [o_cmd_checkbox release];
- [o_ctrl_checkbox release];
- [o_alt_checkbox release];
- [o_shift_checkbox release];
- [o_popup release];
+ [o_checkbox release];
[super dealloc];
}
- (int)intValue
{
- unsigned int i_new_key = 0;
-
- i_new_key |= ([o_cmd_checkbox state] == NSOnState) ?
- KEY_MODIFIER_COMMAND : 0;
- i_new_key |= ([o_ctrl_checkbox state] == NSOnState) ?
- KEY_MODIFIER_CTRL : 0;
- i_new_key |= ([o_alt_checkbox state] == NSOnState) ?
- KEY_MODIFIER_ALT : 0;
- i_new_key |= ([o_shift_checkbox state] == NSOnState) ?
- KEY_MODIFIER_SHIFT : 0;
-
- i_new_key |= StringToKey([[[o_popup selectedItem] title] cString]);
- return i_new_key;
+ return [o_checkbox intValue];
}
+
@end
-@implementation KeyConfigControlAfter103
+@implementation KeyConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
{
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
ADD_LABEL( o_label, mainFrame, 0, -1, o_labelString )
/* build the popup */
o_tooltip = [[VLCMain sharedInstance] wrapString:
[[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
ADD_POPUP( o_popup, mainFrame, [o_label frame].origin.x +
[o_label frame].size.width + 3,
-2, 0, o_tooltip )
, vlc_keys[i].i_key_code)
}
[o_popup setMenu:[o_keys_menu copyWithZone:nil]];
- [o_popup selectItemWithTag: p_item->i_value];
+ [o_popup selectItem:[[o_popup menu] itemWithTag:p_item->value.i]];
[self addSubview: o_popup];
}
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ NSRect frame;
+ NSRect superFrame = [self frame];
+ frame = [o_label frame];
+ frame.origin.x = i_xPos - frame.size.width - 3;
+ [o_label setFrame:frame];
+
+ frame = [o_popup frame];
+ frame.origin.x = i_xPos - 1;
+ frame.size.width = superFrame.size.width - frame.origin.x + 2;
+ [o_popup setFrame:frame];
+}
+
- (void)dealloc
{
[o_popup release];
//Fill our array to know how may items we have...
vlc_list_t *p_list;
module_t *p_parser;
- int i_index;
+ int i_module_index;
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_textfieldString, *o_tooltip;
o_modulearray = [[NSMutableArray alloc] initWithCapacity:10];
/* build a list of available modules */
p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ for( i_module_index = 0; i_module_index < p_list->i_count; i_module_index++ )
{
- p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+ int i;
+ p_parser = (module_t *)p_list->p_values[i_module_index].p_object;
if( !strcmp( p_parser->psz_object_name, "main" ) )
continue;
- module_config_t *p_config = p_parser->p_config;
- if( p_config ) do
+ for ( i = 0; i < p_parser->confsize; i++ )
{
+ module_config_t *p_config = p_parser->p_config + i;
NSString *o_modulelongname, *o_modulename;
NSNumber *o_moduleenabled = nil;
+
/* Hack: required subcategory is stored in i_min */
if( p_config->i_type == CONFIG_SUBCATEGORY &&
- p_config->i_value == _p_item->i_min )
+ p_config->value.i == _p_item->min.i )
{
- o_modulelongname = [NSString stringWithCString:
+ o_modulelongname = [NSString stringWithUTF8String:
p_parser->psz_longname];
- o_modulename = [NSString stringWithCString:
+ o_modulename = [NSString stringWithUTF8String:
p_parser->psz_object_name];
- if( _p_item->psz_value &&
- strstr( _p_item->psz_value, p_parser->psz_object_name ) )
+ if( _p_item->value.psz &&
+ strstr( _p_item->value.psz, p_parser->psz_object_name ) )
o_moduleenabled = [NSNumber numberWithBool:YES];
else
o_moduleenabled = [NSNumber numberWithBool:NO];
arrayWithObjects: o_modulename, o_modulelongname,
o_moduleenabled, nil]];
}
- } while( p_config->i_type != CONFIG_HINT_END && p_config++ );
+ }
}
vlc_list_release( p_list );
/* add the label */
if( p_item->psz_text )
o_labelString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_text];
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
/* build the textfield */
o_tooltip = [[VLCMain sharedInstance] wrapString:
[[VLCMain sharedInstance]
- localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
- if( p_item->psz_value )
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ if( p_item->value.psz )
o_textfieldString = [[VLCMain sharedInstance]
- localizedString: p_item->psz_value];
+ localizedString: (char *)p_item->value.psz];
else
o_textfieldString = [NSString stringWithString: @""];
ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2,
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ ;
+}
+
- (IBAction)tableChanged:(id)sender
{
NSString *o_newstring = @"";
{
o_newstring = [o_newstring stringByAppendingString:
[[o_modulearray objectAtIndex:i] objectAtIndex:0]];
- o_newstring = [o_newstring stringByAppendingString:@","];
+ o_newstring = [o_newstring stringByAppendingString:@":"];
}
[o_textfield setStringValue: [o_newstring
- (char *)stringValue
{
- return strdup( [[o_textfield stringValue] cString] );
+ return strdup( [[o_textfield stringValue] UTF8String] );
}
@end
projects / vlc / blobdiff