/*****************************************************************************
* 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.
*****************************************************************************/
/*****************************************************************************
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
-#include <vlc/vlc.h>
-#include "vlc_keys.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_keys.h>
#include "intf.h"
#include "prefs_widgets.h"
#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"
-#define MACOS_VERSION 3
-
#define POPULATE_A_KEY( o_menu, string, value ) \
{ \
NSMenuItem *o_mi; \
/* Normal */ \
- o_mi = [[NSMenuItem alloc] initWithTitle:string action:nil keyEquivalent:@""]; \
+ o_mi = [[NSMenuItem alloc] initWithTitle:string \
+ action:nil keyEquivalent:@""]; \
[o_mi setKeyEquivalentModifierMask: \
0]; \
[o_mi setAlternate: NO]; \
[o_mi setTag: \
( value )]; \
[o_menu addItem: o_mi]; \
-if( MACOS_VERSION >= 3 ) \
-{ \
/* Ctrl */ \
o_mi = [[NSMenuItem alloc] initWithTitle: \
[[NSString stringWithUTF8String: \
NSControlKeyMask | NSAlternateKeyMask | NSShiftKeyMask]; \
[o_mi setAlternate: YES]; \
[o_mi setTag: \
- (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT) | ( value )]; \
+ (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT) | \
+ ( value )]; \
[o_menu addItem: o_mi]; \
/* Ctrl+Alt+Apple */ \
o_mi = [[NSMenuItem alloc] initWithTitle: \
NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask]; \
[o_mi setAlternate: YES]; \
[o_mi setTag: \
- (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_COMMAND) | ( value )]; \
+ (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_COMMAND) | \
+ ( value )]; \
[o_menu addItem: o_mi]; \
/* Ctrl+Shift+Apple */ \
o_mi = [[NSMenuItem alloc] initWithTitle: \
NSControlKeyMask | NSShiftKeyMask | NSCommandKeyMask]; \
[o_mi setAlternate: YES]; \
[o_mi setTag: \
- (KEY_MODIFIER_CTRL | KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) | ( value )]; \
+ (KEY_MODIFIER_CTRL | KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) | \
+ ( value )]; \
[o_menu addItem: o_mi]; \
/* Ctrl+Alt+Shift+Apple */ \
o_mi = [[NSMenuItem alloc] initWithTitle: \
[[NSString stringWithUTF8String: \
- UP_ARROWHEAD OPTION_KEY UPWARDS_WHITE_ARROW PLACE_OF_INTEREST_SIGN \
+ UP_ARROWHEAD OPTION_KEY UPWARDS_WHITE_ARROW \
+ PLACE_OF_INTEREST_SIGN \
] stringByAppendingString: string] \
action:nil keyEquivalent:@""]; \
[o_mi setKeyEquivalentModifierMask: \
- NSControlKeyMask | NSAlternateKeyMask | NSShiftKeyMask | NSCommandKeyMask]; \
+ NSControlKeyMask | NSAlternateKeyMask | NSShiftKeyMask | \
+ NSCommandKeyMask]; \
[o_mi setAlternate: YES]; \
[o_mi setTag: \
- (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) | ( value )]; \
+ (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT | \
+ KEY_MODIFIER_COMMAND) | ( value )]; \
[o_menu addItem: o_mi]; \
/* Alt */ \
o_mi = [[NSMenuItem alloc] initWithTitle: \
NSAlternateKeyMask | NSShiftKeyMask | NSCommandKeyMask]; \
[o_mi setAlternate: YES]; \
[o_mi setTag: \
- (KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) | ( value )]; \
+ (KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) | \
+ ( value )]; \
[o_menu addItem: o_mi]; \
/* Shift */ \
o_mi = [[NSMenuItem alloc] initWithTitle: \
[o_mi setTag: \
KEY_MODIFIER_COMMAND | ( value )]; \
[o_menu addItem: o_mi]; \
-} \
-}
-
-#define ADD_LABEL( o_label, superFrame, x_offset, my_y_offset, label ) \
-{ \
- NSRect s_rc = superFrame; \
- s_rc.size.height = 17; \
- s_rc.origin.x = x_offset - 3; \
- s_rc.origin.y = superFrame.size.height - 17 + my_y_offset; \
- 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: label]; \
- [o_label setFont:[NSFont systemFontOfSize:0]]; \
- [o_label sizeToFit]; \
-}
-
-#define ADD_TEXTFIELD( o_textfield, superFrame, x_offset, my_y_offset, my_width, tooltip, init_value ) \
-{ \
- NSRect s_rc = superFrame; \
- s_rc.origin.x = x_offset; \
- s_rc.origin.y = my_y_offset; \
- s_rc.size.height = 22; \
- s_rc.size.width = my_width; \
- o_textfield = [[[NSTextField alloc] initWithFrame: s_rc] retain]; \
- [o_textfield setFont:[NSFont systemFontOfSize:0]]; \
- [o_textfield setToolTip: tooltip]; \
- [o_textfield setStringValue: init_value]; \
-}
-
-#define ADD_COMBO( o_combo, superFrame, x_offset, my_y_offset, x2_offset, tooltip ) \
-{ \
- NSRect s_rc = superFrame; \
- s_rc.origin.x = x_offset + 2; \
- s_rc.origin.y = my_y_offset; \
- s_rc.size.height = 26; \
- s_rc.size.width = superFrame.size.width + 2 - s_rc.origin.x - (x2_offset); \
- o_combo = [[[NSComboBox alloc] initWithFrame: s_rc] retain]; \
- [o_combo setFont:[NSFont systemFontOfSize:0]]; \
- [o_combo setToolTip: tooltip]; \
- [o_combo setUsesDataSource:TRUE]; \
- [o_combo setDataSource:self]; \
- [o_combo setNumberOfVisibleItems:10]; \
- [o_combo setCompletes:YES]; \
-}
-
-#define ADD_RIGHT_BUTTON( o_button, superFrame, x_offset, my_y_offset, tooltip, title ) \
-{ \
- NSRect s_rc = superFrame; \
- o_button = [[[NSButton alloc] initWithFrame: s_rc] retain]; \
- [o_button setButtonType: NSMomentaryPushInButton]; \
- [o_button setBezelStyle: NSRoundedBezelStyle]; \
- [o_button setTitle: title]; \
- [o_button setFont:[NSFont systemFontOfSize:0]]; \
- [o_button sizeToFit]; \
- s_rc = [o_button frame]; \
- s_rc.origin.x = superFrame.size.width - [o_button frame].size.width - 6; \
- s_rc.origin.y = my_y_offset - 6; \
- s_rc.size.width += 12; \
- [o_button setFrame: s_rc]; \
- [o_button setToolTip: tooltip]; \
- [o_button setTarget: self]; \
- [o_button setAction: @selector(openFileDialog:)]; \
-}
-
-#define ADD_POPUP( o_popup, superFrame, x_offset, my_y_offset, x2_offset, tooltip ) \
-{ \
- NSRect s_rc = superFrame; \
- s_rc.origin.x = x_offset - 1; \
- s_rc.origin.y = my_y_offset; \
- s_rc.size.height = 26; \
- s_rc.size.width = superFrame.size.width + 2 - s_rc.origin.x - (x2_offset); \
- o_popup = [[[NSPopUpButton alloc] initWithFrame: s_rc] retain]; \
- [o_popup setFont:[NSFont systemFontOfSize:0]]; \
- [o_popup setToolTip: tooltip]; \
-}
-
-#define ADD_STEPPER( o_stepper, superFrame, x_offset, my_y_offset, tooltip, lower, higher ) \
-{ \
- NSRect s_rc = superFrame; \
- s_rc.origin.x = x_offset; \
- s_rc.origin.y = my_y_offset; \
- s_rc.size.height = 23; \
- s_rc.size.width = 23; \
- o_stepper = [[[NSStepper alloc] initWithFrame: s_rc] retain]; \
- [o_stepper setFont:[NSFont systemFontOfSize:0]]; \
- [o_stepper setToolTip: tooltip]; \
- [o_stepper setMaxValue: higher]; \
- [o_stepper setMinValue: lower]; \
- [o_stepper setTarget: self]; \
- [o_stepper setAction: @selector(stepperChanged:)]; \
- [o_stepper sendActionOn:NSLeftMouseUpMask|NSLeftMouseDownMask|NSLeftMouseDraggedMask]; \
-}
-
-#define ADD_SLIDER( o_slider, superFrame, x_offset, my_y_offset, my_width, tooltip, lower, higher ) \
-{ \
- NSRect s_rc = superFrame; \
- s_rc.origin.x = x_offset; \
- s_rc.origin.y = my_y_offset; \
- s_rc.size.height = 21; \
- s_rc.size.width = my_width; \
- o_slider = [[[NSSlider alloc] initWithFrame: s_rc] retain]; \
- [o_slider setFont:[NSFont systemFontOfSize:0]]; \
- [o_slider setToolTip: tooltip]; \
- [o_slider setMaxValue: higher]; \
- [o_slider setMinValue: lower]; \
-}
-
-#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]; \
-}
-
-#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
+#define ADD_LABEL( o_label, superFrame, x_offset, my_y_offset, label, \
+ tooltip ) \
+{ \
+ NSRect s_rc = superFrame; \
+ s_rc.size.height = 17; \
+ s_rc.origin.x = x_offset - 3; \
+ s_rc.origin.y = superFrame.size.height - 17 + my_y_offset; \
+ 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: label]; \
+ [o_label setToolTip: tooltip]; \
+ [o_label setFont:[NSFont systemFontOfSize:0]]; \
+ [o_label sizeToFit]; \
+}
+
+#define ADD_TEXTFIELD( o_textfield, superFrame, x_offset, my_y_offset, \
+ my_width, tooltip, init_value ) \
+{ \
+ NSRect s_rc = superFrame; \
+ s_rc.origin.x = x_offset; \
+ s_rc.origin.y = my_y_offset; \
+ s_rc.size.height = 22; \
+ s_rc.size.width = my_width; \
+ o_textfield = [[[NSTextField alloc] initWithFrame: s_rc] retain]; \
+ [o_textfield setFont:[NSFont systemFontOfSize:0]]; \
+ [o_textfield setToolTip: tooltip]; \
+ [o_textfield setStringValue: init_value]; \
+}
+
+#define ADD_SECURETEXTFIELD( o_textfield, superFrame, x_offset, my_y_offset, \
+my_width, tooltip, init_value ) \
+{ \
+NSRect s_rc = superFrame; \
+s_rc.origin.x = x_offset; \
+s_rc.origin.y = my_y_offset; \
+s_rc.size.height = 22; \
+s_rc.size.width = my_width; \
+o_textfield = [[[NSSecureTextField alloc] initWithFrame: s_rc] retain]; \
+[o_textfield setFont:[NSFont systemFontOfSize:0]]; \
+[o_textfield setToolTip: tooltip]; \
+[o_textfield setStringValue: init_value]; \
+}
+
+#define ADD_COMBO( o_combo, superFrame, x_offset, my_y_offset, x2_offset, \
+ tooltip ) \
+{ \
+ NSRect s_rc = superFrame; \
+ s_rc.origin.x = x_offset + 2; \
+ s_rc.origin.y = my_y_offset; \
+ s_rc.size.height = 26; \
+ s_rc.size.width = superFrame.size.width + 2 - s_rc.origin.x - \
+ (x2_offset); \
+ o_combo = [[[NSComboBox alloc] initWithFrame: s_rc] retain]; \
+ [o_combo setFont:[NSFont systemFontOfSize:0]]; \
+ [o_combo setToolTip: tooltip]; \
+ [o_combo setUsesDataSource:TRUE]; \
+ [o_combo setDataSource:self]; \
+ [o_combo setNumberOfVisibleItems:10]; \
+ [o_combo setCompletes:YES]; \
+}
+
+#define ADD_RIGHT_BUTTON( o_button, superFrame, x_offset, my_y_offset, \
+ tooltip, title ) \
+{ \
+ NSRect s_rc = superFrame; \
+ o_button = [[[NSButton alloc] initWithFrame: s_rc] retain]; \
+ [o_button setButtonType: NSMomentaryPushInButton]; \
+ [o_button setBezelStyle: NSRoundedBezelStyle]; \
+ [o_button setTitle: title]; \
+ [o_button setFont:[NSFont systemFontOfSize:0]]; \
+ [o_button sizeToFit]; \
+ s_rc = [o_button frame]; \
+ s_rc.origin.x = superFrame.size.width - [o_button frame].size.width - 6;\
+ s_rc.origin.y = my_y_offset - 6; \
+ s_rc.size.width += 12; \
+ [o_button setFrame: s_rc]; \
+ [o_button setToolTip: tooltip]; \
+ [o_button setTarget: self]; \
+ [o_button setAction: @selector(openFileDialog:)]; \
+}
+
+#define ADD_POPUP( o_popup, superFrame, x_offset, my_y_offset, x2_offset, \
+ tooltip ) \
+{ \
+ NSRect s_rc = superFrame; \
+ s_rc.origin.x = x_offset - 1; \
+ s_rc.origin.y = my_y_offset; \
+ s_rc.size.height = 26; \
+ s_rc.size.width = superFrame.size.width + 2 - s_rc.origin.x - \
+ (x2_offset); \
+ o_popup = [[[NSPopUpButton alloc] initWithFrame: s_rc] retain]; \
+ [o_popup setFont:[NSFont systemFontOfSize:0]]; \
+ [o_popup setToolTip: tooltip]; \
+}
+
+#define ADD_STEPPER( o_stepper, superFrame, x_offset, my_y_offset, tooltip, \
+ lower, higher ) \
+{ \
+ NSRect s_rc = superFrame; \
+ s_rc.origin.x = x_offset; \
+ s_rc.origin.y = my_y_offset; \
+ s_rc.size.height = 23; \
+ s_rc.size.width = 23; \
+ o_stepper = [[[NSStepper alloc] initWithFrame: s_rc] retain]; \
+ [o_stepper setFont:[NSFont systemFontOfSize:0]]; \
+ [o_stepper setToolTip: tooltip]; \
+ [o_stepper setMaxValue: higher]; \
+ [o_stepper setMinValue: lower]; \
+ [o_stepper setTarget: self]; \
+ [o_stepper setAction: @selector(stepperChanged:)]; \
+ [o_stepper sendActionOn:NSLeftMouseUpMask | NSLeftMouseDownMask | \
+ NSLeftMouseDraggedMask]; \
+}
+
+#define ADD_SLIDER( o_slider, superFrame, x_offset, my_y_offset, my_width, \
+ tooltip, lower, higher ) \
+{ \
+ NSRect s_rc = superFrame; \
+ s_rc.origin.x = x_offset; \
+ s_rc.origin.y = my_y_offset; \
+ s_rc.size.height = 21; \
+ s_rc.size.width = my_width; \
+ o_slider = [[[NSSlider alloc] initWithFrame: s_rc] retain]; \
+ [o_slider setFont:[NSFont systemFontOfSize:0]]; \
+ [o_slider setToolTip: tooltip]; \
+ [o_slider setMaxValue: higher]; \
+ [o_slider setMinValue: lower]; \
+}
+
+#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
{
return [self initWithFrame: frame
if( self != nil )
{
p_item = _p_item;
- psz_name = strdup( p_item->psz_name );
+ psz_name = p_item->psz_name;
o_label = NULL;
i_type = p_item->i_type;
+ i_view_type = 0;
b_advanced = p_item->b_advanced;
[self setAutoresizingMask:NSViewWidthSizable | NSViewMinYMargin ];
}
return (self);
}
+- (void)setYPos:(int)i_yPos
+{
+ NSRect frame = [self frame];
+ frame.origin.y = i_yPos;
+ [self setFrame:frame];
+}
+
- (void)dealloc
{
if( o_label ) [o_label release];
- if( psz_name ) free( psz_name );
+ free( psz_name );
[super dealloc];
}
switch( i_curItem )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
i_margin = 8;
break;
case CONFIG_ITEM_STRING_LIST:
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6;
break;
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
i_margin = 8;
break;
case CONFIG_ITEM_STRING_LIST:
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6;
break;
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
i_margin = 13;
break;
case CONFIG_ITEM_STRING_LIST:
case CONFIG_ITEM_BOOL:
i_margin = 10;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 10;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 9;
break;
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
i_margin = 8;
break;
case CONFIG_ITEM_STRING_LIST:
case CONFIG_ITEM_BOOL:
i_margin = 8;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 8;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 7;
break;
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
i_margin = 8;
break;
case CONFIG_ITEM_STRING_LIST:
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6;
break;
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
i_margin = 8;
break;
case CONFIG_ITEM_STRING_LIST:
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 6;
break;
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
- i_margin = 6;
+ case CONFIG_ITEM_PASSWORD:
+ 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;
- break;
- case CONFIG_ITEM_INTEGER:
- i_margin = 5;
- break;
- case CONFIG_ITEM_RANGED_INTEGER:
- i_margin = 3;
- break;
- case CONFIG_ITEM_BOOL:
- i_margin = 3;
- break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 3;
- break;
- case CONFIG_ITEM_KEY_AFTER_10_3:
- i_margin = 2;
- break;
- case CONFIG_ITEM_MODULE_LIST:
- i_margin = 6;
- break;
- default:
- i_margin = 18;
- break;
- }
- break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- switch( i_lastItem )
- {
- case CONFIG_ITEM_STRING:
i_margin = 6;
break;
- case CONFIG_ITEM_STRING_LIST:
- i_margin = 5;
- break;
- case CONFIG_ITEM_FILE:
- i_margin = 4;
- break;
- case CONFIG_ITEM_MODULE:
- i_margin = 2;
- 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;
- break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 10;
+ i_margin = 7;
break;
case CONFIG_ITEM_KEY_AFTER_10_3:
- i_margin = 6;
+ 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;
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
i_margin = 8;
break;
case CONFIG_ITEM_STRING_LIST:
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 8;
break;
switch( i_lastItem )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
i_margin = 10;
break;
case CONFIG_ITEM_STRING_LIST:
case CONFIG_ITEM_BOOL:
i_margin = 7;
break;
- case CONFIG_ITEM_KEY_BEFORE_10_3:
- i_margin = 7;
- break;
case CONFIG_ITEM_KEY_AFTER_10_3:
i_margin = 5;
break;
+ (VLCConfigControl *)newControl: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- yOffset:(int) i_yPos
- lastItem: (int) i_lastItem
{
VLCConfigControl *p_control = NULL;
+
switch( _p_item->i_type )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
if( !_p_item->i_list )
{
- p_control = [[StringConfigControl alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[StringConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
}
else
{
- p_control = [[StringListConfigControl alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[StringListConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
}
break;
case CONFIG_ITEM_FILE:
case CONFIG_ITEM_DIRECTORY:
- p_control = [[FileConfigControl alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[FileConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
break;
case CONFIG_ITEM_MODULE:
case CONFIG_ITEM_MODULE_CAT:
- p_control = [[ModuleConfigControl alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[ModuleConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
break;
case CONFIG_ITEM_INTEGER:
if( _p_item->i_list )
{
- p_control = [[IntegerListConfigControl alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[IntegerListConfigControl alloc]
+ 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
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[RangedIntegerConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
}
else
{
- p_control = [[IntegerConfigControl alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[IntegerConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
}
break;
case CONFIG_ITEM_BOOL:
- p_control = [[BoolConfigControl alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[BoolConfigControl 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
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[RangedFloatConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
}
else
{
- p_control = [[FloatConfigControl alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[FloatConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
}
break;
case CONFIG_ITEM_KEY:
- if( MACOS_VERSION < 3 )
- {
- p_control = [[KeyConfigControlBefore103 alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
- }
- else
- {
- p_control = [[KeyConfigControlAfter103 alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
- }
+ p_control = [[KeyConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
break;
case CONFIG_ITEM_MODULE_LIST:
case CONFIG_ITEM_MODULE_LIST_CAT:
- p_control = [[ModuleListConfigControl alloc] initWithItem: _p_item
- withView: o_parent_view
- withVerticalOffset: i_yPos
- withLastItem: i_lastItem];
+ p_control = [[ModuleListConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
break;
default:
break;
return p_control;
}
-- (NSString *)getName
+- (NSString *)name
{
return [[VLCMain sharedInstance] localizedString: psz_name];
}
-- (int)getType
+- (int)type
{
return i_type;
}
+- (int)viewType
+{
+ return i_view_type;
+}
+
- (BOOL)isAdvanced
{
return b_advanced;
switch( p_item->i_type )
{
case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_PASSWORD:
case CONFIG_ITEM_FILE:
case CONFIG_ITEM_DIRECTORY:
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;
}
}
-@end
+- (void)resetValues
+{
+}
+- (int)labelSize
+{
+ return [o_label frame].size.width;
+}
-@implementation StringConfigControl
+- (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
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_textfieldString, *o_textfieldTooltip;
mainFrame.size.height = 22;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
+ if( p_item->i_type == CONFIG_ITEM_PASSWORD )
+ i_view_type = CONFIG_ITEM_PASSWORD;
+ else
+ i_view_type = CONFIG_ITEM_STRING;
+
+ o_textfieldTooltip = [[VLCMain sharedInstance] wrapString:
+ [[VLCMain sharedInstance] 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];
+ o_labelString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
+ ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_textfieldTooltip )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
/* 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];
+ if( p_item->value.psz )
+ o_textfieldString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->value.psz];
else
o_textfieldString = [NSString stringWithString: @""];
- ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2,
- 0, mainFrame.size.width - [o_label frame].size.width - 2,
- o_textfieldTooltip, o_textfieldString )
+ if( p_item->i_type == CONFIG_ITEM_PASSWORD )
+ {
+ ADD_SECURETEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2,
+ 0, mainFrame.size.width - [o_label frame].size.width -
+ 2, o_textfieldTooltip, o_textfieldString )
+ }
+ else
+ {
+ ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2,
+ 0, mainFrame.size.width - [o_label frame].size.width -
+ 2, o_textfieldTooltip, o_textfieldString )
+ }
[o_textfield setAutoresizingMask:NSViewWidthSizable ];
+
[self addSubview: o_textfield];
}
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];
}
- (char *)stringValue
{
- return strdup( [[VLCMain sharedInstance] delocalizeString:[o_textfield stringValue]] );
+ return [[VLCMain sharedInstance] delocalizeString:
+ [o_textfield stringValue]];
}
+- (void)resetValues
+{
+ NSString *o_textfieldString;
+ char *psz_value = config_GetPsz( VLCIntf, p_item->psz_name );
+ if( psz_value )
+ o_textfieldString = [[VLCMain sharedInstance]
+ localizedString: psz_value];
+ else
+ o_textfieldString = [NSString stringWithString: @""];
+ free( psz_value );
+ [super resetValues];
+}
@end
@implementation StringListConfigControl
-
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_textfieldTooltip;
mainFrame.size.height = 22;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
int i_index;
+ i_view_type = CONFIG_ITEM_STRING_LIST;
+
+ o_textfieldTooltip = [[VLCMain sharedInstance] wrapString:
+ [[VLCMain sharedInstance]
+ 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];
+ o_labelString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
+ ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_textfieldTooltip )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
/* build the textfield */
- o_textfieldTooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance] localizedString: 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( [o_combo indexOfSelectedItem] >= 0 )
return strdup( p_item->ppsz_list[[o_combo indexOfSelectedItem]] );
else
- return strdup( [[VLCMain sharedInstance] delocalizeString: [o_combo stringValue]] );
+ return strdup( [[VLCMain sharedInstance]
+ delocalizeString: [o_combo stringValue]] );
}
+- (void)resetValues
+{
+ int i_index;
+ [o_combo reloadData];
+ char *psz_value = config_GetPsz( VLCIntf, p_item->psz_name );
+
+ for( i_index = 0; i_index < p_item->i_list; i_index++ )
+ if( psz_value &&
+ !strcmp( psz_value, p_item->ppsz_list[i_index] ) )
+ [o_combo selectItemAtIndex: i_index];
+
+ free( psz_value );
+ [super resetValues];
+}
@end
@implementation StringListConfigControl (NSComboBoxDataSource)
-
-- (int)numberOfItemsInComboBox:(NSComboBox *)aComboBox
+- (NSInteger)numberOfItemsInComboBox:(NSComboBox *)aComboBox
{
return p_item->i_list;
}
-- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(int)i_index
+- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)i_index
{
if( p_item->ppsz_list_text && p_item->ppsz_list_text[i_index] )
{
- return [[VLCMain sharedInstance] localizedString: p_item->ppsz_list_text[i_index]];
- } else return [[VLCMain sharedInstance] localizedString: p_item->ppsz_list[i_index]];
+ return [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->ppsz_list_text[i_index]];
+ } else return [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->ppsz_list[i_index]];
}
-
@end
@implementation FileConfigControl
-
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
NSRect mainFrame = [o_parent_view frame];
- NSString *o_labelString, *o_buttonTooltip, *o_textfieldString, *o_textfieldTooltip;
+ NSString *o_labelString, *o_itemTooltip, *o_textfieldString;
mainFrame.size.height = 46;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
+ i_view_type = CONFIG_ITEM_FILE;
+
+ o_itemTooltip = [[VLCMain sharedInstance]
+ wrapString: [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->psz_longtext ] toWidth: PREFS_WRAP];
+
/* is it a directory */
- b_directory = ( [self getType] == CONFIG_ITEM_DIRECTORY ) ? YES : NO;
+ b_directory = ( [self type] == CONFIG_ITEM_DIRECTORY ) ? YES : NO;
/* add the label */
if( p_item->psz_text )
- o_labelString = [[VLCMain sharedInstance] localizedString: p_item->psz_text];
+ o_labelString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, 3, o_labelString )
+ ADD_LABEL( o_label, mainFrame, 0, 3, o_labelString, o_itemTooltip )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
/* build the button */
- o_buttonTooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance] localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
- ADD_RIGHT_BUTTON( o_button, mainFrame, 0, 0, o_buttonTooltip, _NS("Browse...") )
+ ADD_RIGHT_BUTTON( o_button, mainFrame, 0, 0, o_itemTooltip,
+ _NS("Browse...") )
[o_button setAutoresizingMask:NSViewMinXMargin ];
[self addSubview: o_button];
/* 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];
+ 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 - 8 - [o_button frame].size.width,
- o_textfieldTooltip, o_textfieldString )
+ ADD_TEXTFIELD( o_textfield, mainFrame, 12, 2, mainFrame.size.width -
+ 8 - [o_button frame].size.width,
+ o_itemTooltip, o_textfieldString )
[o_textfield setAutoresizingMask:NSViewWidthSizable ];
[self addSubview: o_textfield];
}
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ ;
+}
+
- (void)dealloc
{
[o_textfield release];
- (IBAction)openFileDialog: (id)sender
{
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
-
- [o_open_panel setTitle: (b_directory)?_NS("Select a directory"):_NS("Select a file")];
+
+ [o_open_panel setTitle: (b_directory)?
+ _NS("Select a directory"):_NS("Select a file")];
[o_open_panel setPrompt: _NS("Select")];
[o_open_panel setAllowsMultipleSelection: NO];
[o_open_panel setCanChooseFiles: !b_directory];
types:nil
modalForWindow:[sender window]
modalDelegate: self
- didEndSelector: @selector(pathChosenInPanel:
+ didEndSelector: @selector(pathChosenInPanel:
withReturn:
contextInfo:)
contextInfo: nil];
}
-- (void)pathChosenInPanel:(NSOpenPanel *)o_sheet withReturn:(int)i_return_code contextInfo:(void *)o_context_info
+- (void)pathChosenInPanel:(NSOpenPanel *)o_sheet
+ withReturn:(int)i_return_code contextInfo:(void *)o_context_info
{
if( i_return_code == NSOKButton )
{
return NULL;
}
+-(void)resetValues
+{
+ NSString *o_textfieldString;
+ char *psz_value = config_GetPsz( VLCIntf, p_item->psz_name );
+ if( psz_value )
+ o_textfieldString = [NSString stringWithFormat: @"%s", psz_value];
+ else
+ o_textfieldString = [NSString stringWithString: @""];
+
+ free(psz_value);
+ [super resetValues];
+}
@end
@implementation ModuleConfigControl
-
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_popupTooltip;
mainFrame.size.height = 22;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
- int i_index;
- vlc_list_t *p_list;
- module_t *p_parser;
+ i_view_type = CONFIG_ITEM_MODULE;
+
+ o_popupTooltip = [[VLCMain sharedInstance] wrapString:
+ [[VLCMain sharedInstance]
+ 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];
+ o_labelString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, -1, o_labelString )
+ ADD_LABEL( o_label, mainFrame, 0, -1, o_labelString, o_popupTooltip )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
/* build the popup */
- o_popupTooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance] localizedString: 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 ];
[o_popup addItemWithTitle: _NS("Default")];
[[o_popup lastItem] setTag: -1];
[o_popup selectItem: [o_popup lastItem]];
-
- /* 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++ )
- {
- 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];
- [o_popup addItemWithTitle: o_description];
- if( p_item->psz_value &&
- !strcmp( p_item->psz_value, p_parser->psz_object_name ) )
- {
- [o_popup selectItem:[o_popup lastItem]];
- }
- }
- }
- else
- {
- module_config_t *p_config;
- if( !strcmp( p_parser->psz_object_name, "main" ) )
- continue;
-
- p_config = p_parser->p_config;
- if( p_config ) do
- {
- /* Hack: required subcategory is stored in i_min */
- if( p_config->i_type == CONFIG_SUBCATEGORY &&
- p_config->i_value == p_item->i_min )
- {
- NSString *o_description = [[VLCMain sharedInstance]
- localizedString: p_parser->psz_longname];
- [o_popup addItemWithTitle: o_description];
-
- if( p_item->psz_value && !strcmp(p_item->psz_value,
- 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 );
+ [self resetValues];
[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];
{
NSString *newval = [o_popup titleOfSelectedItem];
char *returnval = NULL;
- int i_index;
- vlc_list_t *p_list;
- module_t *p_parser;
+ size_t i_module_index;
+ module_t *p_parser, **p_list;
- p_list = vlc_list_find( VLCIntf, VLC_OBJECT_MODULE, FIND_ANYWHERE );
- for( i_index = 0; i_index < p_list->i_count; i_index++ )
+ p_list = module_list_get( NULL );
+ for( i_module_index = 0; p_list[i_module_index]; i_module_index++ )
{
- p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+ p_parser = p_list[i_module_index];
+
if( p_item->i_type == CONFIG_ITEM_MODULE )
{
- if( !strcmp( p_parser->psz_capability,
- p_item->psz_type ) )
+ if( module_provides( p_parser, p_item->psz_type ) )
{
NSString *o_description = [[VLCMain sharedInstance]
- localizedString: p_parser->psz_longname];
+ localizedString: module_GetLongName( p_parser )];
if( [newval isEqualToString: o_description] )
{
- returnval = strdup(p_parser->psz_object_name);
+ returnval = strdup( module_get_object( p_parser ));
break;
}
}
}
else
{
- module_config_t *p_config;
- if( !strcmp( p_parser->psz_object_name, "main" ) )
- continue;
+ int i;
- p_config = p_parser->p_config;
- if( p_config ) do
+ if( module_is_main( p_parser) )
+ continue;
+ unsigned int confsize, unused;
+ module_config_get( p_parser, &confsize );
+ for ( i = 0; i < confsize; i++ )
{
+ module_config_t *p_config = module_config_get( p_parser, &unused ) + 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: module_GetLongName( p_parser )];
if( [newval isEqualToString: o_description] )
{
- returnval = strdup(p_parser->psz_object_name);
+ returnval = strdup(module_get_object( p_parser ));
break;
}
}
- } while( p_config->i_type != CONFIG_HINT_END && p_config++ );
+ }
}
}
- vlc_list_release( p_list );
+ module_list_free( p_list );
return returnval;
}
+-(void)resetValues
+{
+ /* build a list of available modules */
+ size_t i_index;
+ module_t *p_parser, **p_list;
+
+ p_list = module_list_get( NULL );
+ for( i_index = 0; p_list[i_index]; i_index++ )
+ {
+ p_parser = p_list[i_index];
+
+ if( p_item->i_type == CONFIG_ITEM_MODULE )
+ {
+ if( module_provides( p_parser, p_item->psz_type ) )
+ {
+ NSString *o_description = [[VLCMain sharedInstance]
+ localizedString: module_GetLongName( p_parser )];
+ [o_popup addItemWithTitle: o_description];
+ char *psz_value = config_GetPsz( VLCIntf, p_item->psz_name );
+
+ if( psz_value &&
+ !strcmp( psz_value, module_get_object( p_parser ) ) )
+ [o_popup selectItem:[o_popup lastItem]];
+
+ free(psz_value);
+ }
+ }
+ else
+ {
+ int i;
+
+ if( module_is_main( p_parser ) )
+ continue;
+ unsigned int confsize;
+ unsigned int unused;
+ module_config_t *p_configlist = module_config_get( p_parser, &confsize );
+ for ( i = 0; i < confsize; i++ )
+ {
+ module_config_t *p_config = &p_configlist[i];
+ /* Hack: required subcategory is stored in i_min */
+ if( p_config->i_type == CONFIG_SUBCATEGORY &&
+ config_GetInt( VLCIntf, p_item->psz_name) == p_item->min.i )
+ {
+ NSString *o_description = [[VLCMain sharedInstance]
+ localizedString: module_GetLongName( p_parser )];
+ [o_popup addItemWithTitle: o_description];
+ char *psz_value = config_GetPsz( VLCIntf, p_item->psz_name );
+
+ if( psz_value && !strcmp(psz_value,
+ module_get_object( p_parser )) )
+ [o_popup selectItem:[o_popup lastItem]];
+
+ free( psz_value );
+ }
+ }
+ module_config_free( p_configlist );
+ }
+ }
+ module_list_free( p_list );
+ [super resetValues];
+}
@end
@implementation IntegerConfigControl
-
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
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;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
+ i_view_type = CONFIG_ITEM_INTEGER;
+
o_tooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance] localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ [[VLCMain sharedInstance]
+ 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];
+ o_labelString = [[VLCMain sharedInstance]
+ 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_tooltip )
[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 ];
+ 0, o_tooltip, -100000, 100000)
+ [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];
return [o_textfield intValue];
}
+-(void)resetValues
+{
+ [o_textfield setIntValue: config_GetInt(VLCIntf, p_item->psz_name)];
+ [super resetValues];
+}
+
@end
@implementation IntegerListConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_textfieldTooltip;
mainFrame.size.height = 22;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
int i_index;
+ i_view_type = CONFIG_ITEM_STRING_LIST;
+
+ o_textfieldTooltip = [[VLCMain sharedInstance] wrapString:
+ [[VLCMain sharedInstance]
+ 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];
+ o_labelString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
+ ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_textfieldTooltip )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
/* build the textfield */
- o_textfieldTooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance] localizedString: 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];
return [o_combo intValue];
}
+-(void)resetValues
+{
+ int i_index;
+ [o_combo reloadData];
+ for( i_index = 0; i_index < p_item->i_list; i_index++ )
+ {
+ if( config_GetInt( VLCIntf, p_item->psz_name) == p_item->pi_list[i_index] )
+ {
+ [o_combo selectItemAtIndex: i_index];
+ }
+ }
+
+}
@end
@implementation IntegerListConfigControl (NSComboBoxDataSource)
-
-- (int)numberOfItemsInComboBox:(NSComboBox *)aComboBox
+- (NSInteger)numberOfItemsInComboBox:(NSComboBox *)aComboBox
{
return p_item->i_list;
}
-- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(int)i_index
+- (id)comboBox:(NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)i_index
{
if( p_item->ppsz_list_text && p_item->ppsz_list_text[i_index] )
- {
- return [[VLCMain sharedInstance] localizedString: p_item->ppsz_list_text[i_index]];
- } else return [NSString stringWithFormat: @"%i", p_item->pi_list[i_index]];
+ return [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->ppsz_list_text[i_index]];
+ else
+ return [NSString stringWithFormat: @"%i", p_item->pi_list[i_index]];
}
-
@end
@implementation RangedIntegerConfigControl
-
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 50;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
+ i_view_type = CONFIG_ITEM_RANGED_INTEGER;
+
+ o_tooltip = [[VLCMain sharedInstance] wrapString:
+ [[VLCMain sharedInstance]
+ 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];
+ o_labelString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
+ ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_tooltip )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
/* build the textfield */
- o_tooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance] localizedString: 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
[self addSubview: o_textfield];
/* build the mintextfield */
- ADD_LABEL( o_textfield_min, mainFrame, 12, -30, @"-8888" )
- [o_textfield_min setIntValue: p_item->i_min];
+ ADD_LABEL( o_textfield_min, mainFrame, 12, -30, @"-8888", @"" )
+ [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];
+ ADD_LABEL( o_textfield_max, mainFrame,
+ mainFrame.size.width - 31, -30, @"8888", @"" )
+ [o_textfield_max setIntValue: p_item->max.i];
[o_textfield_max setAutoresizingMask:NSViewMinXMargin ];
[self addSubview: o_textfield_max];
/* build the slider */
- ADD_SLIDER( o_slider, mainFrame, [o_textfield_min frame].origin.x + [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->i_min, p_item->i_max )
- [o_slider setIntValue: p_item->i_value];
+ ADD_SLIDER( o_slider, mainFrame, [o_textfield_min frame].origin.x +
+ [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->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:)];
- [o_slider sendActionOn:NSLeftMouseUpMask|NSLeftMouseDownMask|NSLeftMouseDraggedMask];
+ [o_slider sendActionOn:NSLeftMouseUpMask | NSLeftMouseDownMask |
+ NSLeftMouseDraggedMask];
[self addSubview: o_slider];
}
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];
return [o_slider intValue];
}
+- (void)resetValues
+{
+ int value = config_GetInt( VLCIntf, p_item->psz_name );
+ [o_textfield setIntValue:value];
+ [o_slider setIntValue:value];
+ [super resetValues];
+}
@end
@implementation FloatConfigControl
-
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
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;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
+ i_view_type = CONFIG_ITEM_INTEGER;
+
o_tooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance] localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
+ [[VLCMain sharedInstance]
+ 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];
+ o_labelString = [[VLCMain sharedInstance]
+ 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, -2, o_labelString, o_tooltip )
[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 setFloatValue: p_item->f_value];
- [o_stepper setAutoresizingMask:NSViewMinXMargin ];
+ 0, o_tooltip, -100000, 100000)
+ [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];
}
+- (void)resetValues
+{
+ [o_textfield setFloatValue: config_GetFloat( VLCIntf, p_item->psz_name)];
+ [super resetValues];
+}
@end
@implementation RangedFloatConfigControl
-
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 50;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
+ i_view_type = CONFIG_ITEM_RANGED_INTEGER;
+
+ o_tooltip = [[VLCMain sharedInstance] wrapString:
+ [[VLCMain sharedInstance]
+ 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];
+ o_labelString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
+ ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_tooltip )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
/* build the textfield */
- o_tooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance] localizedString: 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
[self addSubview: o_textfield];
/* build the mintextfield */
- ADD_LABEL( o_textfield_min, mainFrame, 12, -30, @"-8888" )
- [o_textfield_min setFloatValue: p_item->f_min];
+ ADD_LABEL( o_textfield_min, mainFrame, 12, -30, @"-8888", @"" )
+ [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];
+ ADD_LABEL( o_textfield_max, mainFrame, mainFrame.size.width - 31,
+ -30, @"8888", @"" )
+ [o_textfield_max setFloatValue: p_item->max.f];
[o_textfield_max setAutoresizingMask:NSViewMinXMargin ];
[self addSubview: o_textfield_max];
/* build the slider */
- ADD_SLIDER( o_slider, mainFrame, [o_textfield_min frame].origin.x + [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];
+ ADD_SLIDER( o_slider, mainFrame, [o_textfield_min frame].origin.x +
+ [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->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:)];
- [o_slider sendActionOn:NSLeftMouseUpMask|NSLeftMouseDownMask|NSLeftMouseDraggedMask];
+ [o_slider sendActionOn:NSLeftMouseUpMask | NSLeftMouseDownMask |
+ NSLeftMouseDraggedMask];
[self addSubview: o_slider];
}
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];
}
+- (void)resetValues
+{
+ [o_textfield setFloatValue: config_GetFloat(VLCIntf, p_item->psz_name)];
+ [o_slider setFloatValue: config_GetFloat(VLCIntf, p_item->psz_name)];
+ [super resetValues];
+}
@end
@implementation BoolConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 17;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
+ 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)
+ o_tooltip = [[VLCMain sharedInstance]
+ wrapString: [[VLCMain sharedInstance]
+ 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
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
-{
- 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 = i_yPos;
-
- if( [super initWithFrame: mainFrame item: _p_item] != nil )
- {
/* add the label */
if( p_item->psz_text )
- o_labelString = [[VLCMain sharedInstance] localizedString: p_item->psz_text];
+ o_labelString = [[VLCMain sharedInstance]
+ 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_tooltip )
[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];
}
+- (void)resetValues
+{
+ [o_checkbox setState: config_GetInt( VLCIntf, p_item->psz_name)];
+ [super resetValues];
+}
@end
-@implementation KeyConfigControlAfter103
-
+@implementation KeyConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
NSRect mainFrame = [o_parent_view frame];
NSString *o_labelString, *o_tooltip;
mainFrame.size.height = 22;
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN + 1;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
+ i_view_type = CONFIG_ITEM_KEY_AFTER_10_3;
+
+ o_tooltip = [[VLCMain sharedInstance] wrapString:
+ [[VLCMain sharedInstance]
+ 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];
+ o_labelString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, -1, o_labelString )
+ ADD_LABEL( o_label, mainFrame, 0, -1, o_labelString, o_tooltip )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
/* build the popup */
- o_tooltip = [[VLCMain sharedInstance] wrapString:
- [[VLCMain sharedInstance] localizedString: p_item->psz_longtext ] toWidth: PREFS_WRAP];
- ADD_POPUP( o_popup, mainFrame, [o_label frame].origin.x + [o_label frame].size.width + 3,
+ ADD_POPUP( o_popup, mainFrame, [o_label frame].origin.x +
+ [o_label frame].size.width + 3,
-2, 0, o_tooltip )
[o_popup setAutoresizingMask:NSViewWidthSizable ];
-
+
if( o_keys_menu == nil )
{
unsigned int i;
o_keys_menu = [[NSMenu alloc] initWithTitle: @"Keys Menu"];
+#warning this doesn't work anymore. FIXME.
+#if 0
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)
+ if( vlc_keys[i].psz_key_string )
+ POPULATE_A_KEY( o_keys_menu,
+ [NSString stringWithUTF8String:vlc_keys[i].psz_key_string]
+ , vlc_keys[i].i_key_code)
+#endif
}
[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];
return [o_popup selectedTag];
}
+- (void)resetValues
+{
+ [o_popup selectItem:[[o_popup menu] itemWithTag:config_GetInt( VLCIntf, p_item->psz_name )]];
+ [super resetValues];
+}
@end
@implementation ModuleListConfigControl
-
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
- withVerticalOffset: (int)i_yPos
- withLastItem: (int)i_lastItem
{
-if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST )
+ if( _p_item->i_type == CONFIG_ITEM_MODULE_LIST )
//TODO....
return nil;
//Fill our array to know how may items we have...
- vlc_list_t *p_list;
- module_t *p_parser;
- int i_index;
+ module_t *p_parser, **p_list;
+ size_t 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++ )
+ p_list = module_list_get( NULL );
+ for( i_module_index = 0; p_list[i_module_index]; i_module_index++ )
{
- p_parser = (module_t *)p_list->p_values[i_index].p_object ;
+ int i;
+ p_parser = p_list[i_module_index];
- if( !strcmp( p_parser->psz_object_name, "main" ) )
+ if( module_is_main( p_parser ) )
continue;
- module_config_t *p_config = p_parser->p_config;
- if( p_config ) do
+ unsigned int confsize;
+ module_config_t *p_configlist = module_config_get( p_parser, &confsize );
+
+ for ( i = 0; i < confsize; i++ )
{
+ unsigned int unused;
+ module_config_t *p_config = &p_configlist[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:p_parser->psz_longname];
- o_modulename = [NSString stringWithCString:p_parser->psz_object_name];
+ o_modulelongname = [NSString stringWithUTF8String:
+ module_GetLongName( p_parser )];
+ o_modulename = [NSString stringWithUTF8String:
+ module_get_object( p_parser )];
- 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, module_get_object( p_parser ) ) )
o_moduleenabled = [NSNumber numberWithBool:YES];
else
o_moduleenabled = [NSNumber numberWithBool:NO];
- [o_modulearray addObject:[NSMutableArray arrayWithObjects: o_modulename, o_modulelongname, o_moduleenabled, nil]];
+ [o_modulearray addObject:[NSMutableArray
+ arrayWithObjects: o_modulename, o_modulelongname,
+ o_moduleenabled, nil]];
}
- } while( p_config->i_type != CONFIG_HINT_END && p_config++ );
+ }
+ module_config_free( p_configlist );
}
- vlc_list_release( p_list );
+ module_list_free( p_list );
mainFrame.size.height = 30 + 18 * [o_modulearray count];
mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
mainFrame.origin.x = LEFTMARGIN;
- mainFrame.origin.y = i_yPos;
+ mainFrame.origin.y = 0;
if( [super initWithFrame: mainFrame item: _p_item] != nil )
{
+ i_view_type = CONFIG_ITEM_MODULE_LIST;
+
+ o_tooltip = [[VLCMain sharedInstance] wrapString:
+ [[VLCMain sharedInstance]
+ 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];
+ o_labelString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->psz_text];
else
o_labelString = [NSString stringWithString:@""];
- ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString )
+ ADD_LABEL( o_label, mainFrame, 0, -3, o_labelString, o_tooltip )
[o_label setAutoresizingMask:NSViewNotSizable ];
[self addSubview: o_label];
/* build the textfield */
- o_tooltip = [[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];
+ if( p_item->value.psz )
+ o_textfieldString = [[VLCMain sharedInstance]
+ localizedString: (char *)p_item->value.psz];
else
o_textfieldString = [NSString stringWithString: @""];
ADD_TEXTFIELD( o_textfield, mainFrame, [o_label frame].size.width + 2,
- mainFrame.size.height - 22, mainFrame.size.width - [o_label frame].size.width - 2,
- o_tooltip, o_textfieldString )
+ mainFrame.size.height - 22, mainFrame.size.width -
+ [o_label frame].size.width - 2, o_tooltip, o_textfieldString )
[o_textfield setAutoresizingMask:NSViewWidthSizable ];
[self addSubview: o_textfield];
/* TODO: find a good way to fix the row height and text size*/
/* FIXME: support for multiple selection... */
// [o_tableview setAllowsMultipleSelection:YES];
-
+
NSCell *o_headerCell = [[NSCell alloc] initTextCell:@"Enabled"];
NSCell *o_dataCell = [[NSButtonCell alloc] init];
[(NSButtonCell*)o_dataCell setButtonType:NSSwitchButton];
[o_dataCell setTitle:@""];
[o_dataCell setFont:[NSFont systemFontOfSize:0]];
- NSTableColumn *o_tableColumn = [[NSTableColumn alloc]initWithIdentifier:[NSString stringWithCString: "Enabled"]];
+ NSTableColumn *o_tableColumn = [[NSTableColumn alloc]
+ initWithIdentifier:@"Enabled"];
[o_tableColumn setHeaderCell: o_headerCell];
[o_tableColumn setDataCell: o_dataCell];
[o_tableColumn setWidth:17];
o_headerCell = [[NSCell alloc] initTextCell:@"Module Name"];
o_dataCell = [[NSTextFieldCell alloc] init];
[o_dataCell setFont:[NSFont systemFontOfSize:12]];
- o_tableColumn = [[NSTableColumn alloc]initWithIdentifier:[NSString stringWithCString: "Module"]];
+ o_tableColumn = [[NSTableColumn alloc]
+ initWithIdentifier:@"Module"];
[o_tableColumn setHeaderCell: o_headerCell];
[o_tableColumn setDataCell: o_dataCell];
[o_tableColumn setWidth:388 - 17];
[o_tableview addTableColumn: o_tableColumn];
- [o_tableview registerForDraggedTypes:[NSArray arrayWithObjects:
+ [o_tableview registerForDraggedTypes:[NSArray arrayWithObjects:
@"VLC media player module", nil]];
[o_tableview setDataSource:self];
[o_tableview setTarget: self];
[o_tableview setAction: @selector(tableChanged:)];
- [o_tableview sendActionOn:NSLeftMouseUpMask|NSLeftMouseDownMask|NSLeftMouseDraggedMask];
+ [o_tableview sendActionOn:NSLeftMouseUpMask | NSLeftMouseDownMask |
+ NSLeftMouseDraggedMask];
[o_scrollview setDocumentView: o_tableview];
}
[o_scrollview setAutoresizingMask:NSViewWidthSizable ];
return self;
}
+- (void) alignWithXPosition:(int)i_xPos
+{
+ ;
+}
+
- (IBAction)tableChanged:(id)sender
{
NSString *o_newstring = @"";
unsigned int i;
for( i = 0 ; i < [o_modulearray count] ; i++ )
- if( [[[o_modulearray objectAtIndex:i] objectAtIndex:2] boolValue] != NO )
+ if( [[[o_modulearray objectAtIndex:i] objectAtIndex:2]
+ boolValue] != NO )
{
- o_newstring = [o_newstring stringByAppendingString:[[o_modulearray objectAtIndex:i] objectAtIndex:0]];
- o_newstring = [o_newstring stringByAppendingString:@","];
+ o_newstring = [o_newstring stringByAppendingString:
+ [[o_modulearray objectAtIndex:i] objectAtIndex:0]];
+ o_newstring = [o_newstring stringByAppendingString:@":"];
}
-
- [o_textfield setStringValue: [o_newstring substringToIndex: ([o_newstring length])?[o_newstring length] - 1:0]];
+
+ [o_textfield setStringValue: [o_newstring
+ substringToIndex: ([o_newstring length])?[o_newstring length] - 1:0]];
}
- (void)dealloc
- (char *)stringValue
{
- return strdup( [[o_textfield stringValue] cString] );
+ return strdup( [[o_textfield stringValue] UTF8String] );
+}
+
+-(void)resetValues
+{
+#warning Reset prefs of the module selector is broken atm.
+ NSLog( @"don't forget about modulelistconfig" );
+ [super resetValues];
}
@end
@implementation ModuleListConfigControl (NSTableDataSource)
-- (BOOL)tableView:(NSTableView*)table writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pb
+- (BOOL)tableView:(NSTableView*)table writeRows:(NSArray*)rows
+ toPasteboard:(NSPasteboard*)pb
{
- // We only want to allow dragging of selected rows.
- NSEnumerator *iter = [rows objectEnumerator];
- NSNumber *row;
- while ((row = [iter nextObject]) != nil)
- {
- if (![table isRowSelected:[row intValue]])
- return NO;
- }
-
- [pb declareTypes:[NSArray arrayWithObject:@"VLC media player module"] owner:nil];
- [pb setPropertyList:rows forType:@"VLC media player module"];
- return YES;
+ // We only want to allow dragging of selected rows.
+ NSEnumerator *iter = [rows objectEnumerator];
+ NSNumber *row;
+ while ((row = [iter nextObject]) != nil)
+ {
+ if (![table isRowSelected:[row intValue]])
+ return NO;
+ }
+ [pb declareTypes:[NSArray
+ arrayWithObject:@"VLC media player module"] owner:nil];
+ [pb setPropertyList:rows forType:@"VLC media player module"];
+ return YES;
}
-- (NSDragOperation)tableView:(NSTableView*)table validateDrop:(id <NSDraggingInfo>)info proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)op
+- (NSDragOperation)tableView:(NSTableView*)table
+ validateDrop:(id <NSDraggingInfo>)info proposedRow:(NSInteger)row
+ proposedDropOperation:(NSTableViewDropOperation)op
{
- // Make drops at the end of the table go to the end.
- if (row == -1)
- {
- row = [table numberOfRows];
- op = NSTableViewDropAbove;
- [table setDropRow:row dropOperation:op];
- }
-
- // We don't ever want to drop onto a row, only between rows.
- if (op == NSTableViewDropOn)
- [table setDropRow:(row+1) dropOperation:NSTableViewDropAbove];
- return NSTableViewDropAbove;
+ // Make drops at the end of the table go to the end.
+ if (row == -1)
+ {
+ row = [table numberOfRows];
+ op = NSTableViewDropAbove;
+ [table setDropRow:row dropOperation:op];
+ }
+
+ // We don't ever want to drop onto a row, only between rows.
+ if (op == NSTableViewDropOn)
+ [table setDropRow:(row+1) dropOperation:NSTableViewDropAbove];
+ return NSTableViewDropAbove;
}
-- (BOOL)tableView:(NSTableView*)table acceptDrop:(id <NSDraggingInfo>)info row:(int)dropRow dropOperation:(NSTableViewDropOperation)op;
+- (BOOL)tableView:(NSTableView*)table acceptDrop:(id <NSDraggingInfo>)info
+ row:(NSInteger)dropRow dropOperation:(NSTableViewDropOperation)op;
{
- NSPasteboard *pb = [info draggingPasteboard];
- NSDragOperation srcMask = [info draggingSourceOperationMask];
- BOOL accepted = NO;
+ NSPasteboard *pb = [info draggingPasteboard];
+ NSDragOperation srcMask = [info draggingSourceOperationMask];
+ BOOL accepted = NO;
- NS_DURING
-
- NSArray *array;
+ NS_DURING
+
+ NSArray *array;
// Intra-table drag - data is the array of rows.
- if (!accepted && (array = [pb propertyListForType:@"VLC media player module"]) != NULL)
+ if (!accepted && (array =
+ [pb propertyListForType:@"VLC media player module"]) != NULL)
{
- NSEnumerator * iter = nil;
+ NSEnumerator *iter = nil;
id val;
- BOOL isCopy = (srcMask & NSDragOperationMove) ? NO:YES;
+ BOOL isCopy = (srcMask & NSDragOperationMove) ? NO:YES;
// Move the modules
- iter = [array objectEnumerator];
- while ((val = [iter nextObject]) != NULL)
- {
- NSArray *o_tmp = [[o_modulearray objectAtIndex:[val intValue]] mutableCopyWithZone:nil];
+ iter = [array objectEnumerator];
+ while ((val = [iter nextObject]) != NULL)
+ {
+ NSArray *o_tmp = [[o_modulearray objectAtIndex:
+ [val intValue]] mutableCopyWithZone:nil];
[o_modulearray removeObject:o_tmp];
- [o_modulearray insertObject:o_tmp atIndex:(dropRow>[val intValue]) ? dropRow - 1 : dropRow];
+ [o_modulearray insertObject:o_tmp
+ atIndex:(dropRow>[val intValue]) ? dropRow - 1 : dropRow];
dropRow++;
}
// Select the newly-dragged items.
iter = [array objectEnumerator];
//TODO...
- [table deselectAll:self];
+ [table deselectAll:self];
[self tableChanged:self];
[table setNeedsDisplay:YES];
- // Indicate that we finished the drag.
- accepted = YES;
- }
+ // Indicate that we finished the drag.
+ accepted = YES;
+ }
[table reloadData];
[table setNeedsDisplay:YES];
-
- NS_HANDLER
-
- // An exception occurred. Uh-oh. Update the track table so that
- // it stays consistent, and re-raise the exception.
- [table reloadData];
- [localException raise];
+
+ NS_HANDLER
+
+ // An exception occurred. Uh-oh. Update the track table so that
+ // it stays consistent, and re-raise the exception.
+ [table reloadData];
+ [localException raise];
[table setNeedsDisplay:YES];
NS_ENDHANDLER
-
- return accepted;
+
+ return accepted;
}
-- (int)numberOfRowsInTableView:(NSTableView *)aTableView
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
{
return [o_modulearray count];
}
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
+- (id)tableView:(NSTableView *)aTableView
+ objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
{
- if( [[aTableColumn identifier] isEqualToString:[NSString stringWithCString:"Enabled"]] )
+ if( [[aTableColumn identifier] isEqualToString: @"Enabled"] )
return [[o_modulearray objectAtIndex:rowIndex] objectAtIndex:2];
- if( [[aTableColumn identifier] isEqualToString:[NSString stringWithCString:"Module"]] )
+ if( [[aTableColumn identifier] isEqualToString: @"Module"] )
return [[o_modulearray objectAtIndex:rowIndex] objectAtIndex:1];
-
+
return nil;
}
-- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
+- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject
+ forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
{
- [[o_modulearray objectAtIndex:rowIndex] replaceObjectAtIndex:2 withObject: anObject];
+ [[o_modulearray objectAtIndex:rowIndex] replaceObjectAtIndex:2
+ withObject: anObject];
}
@end
projects / vlc / blobdiff