Skip to content

V
vlc
Commit a0ff74f7 authored by Jérome Decoodt's avatar Jérome Decoodt
Browse files
Options

Added widget, fix save, etc. 

Known bugs: changing advanced view, detection of MacOS X version at
            runtime and many others...
parent f07020df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2152 additions and 821 deletions
modules/gui/macosx/prefs.h
View file @ a0ff74f7
......@@ -28,6 +28,7 @@
VLCTreeItem *o_parent;
NSMutableArray *o_children;
int i_object_category;
NSView *o_view;
}
+ (VLCTreeItem *)rootItem;
......@@ -36,7 +37,8 @@
- (int)getObjectID;
- (NSString *)getName;
- (BOOL)hasPrefs:(NSString *)o_module_name;
- (NSView *)showView:(NSScrollView *)o_prefs_view;
- (NSView *)showView:(NSScrollView *)o_prefs_view advancedView:(vlc_bool_t) b_advanced;
- (void)applyChanges;
@end
......
modules/gui/macosx/prefs.m
View file @ a0ff74f7
This diff is collapsed.
modules/gui/macosx/prefs_widgets.h
View file @ a0ff74f7
......@@ -21,20 +21,22 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#define CONFIG_ITEM_STRING_LIST (CONFIG_ITEM_STRING + 1)
#define CONFIG_ITEM_RANGED_INTEGER (CONFIG_ITEM_INTEGER + 1)
#define CONFIG_ITEM_KEY_BEFORE_10_3 (CONFIG_ITEM_KEY + 1)
#define CONFIG_ITEM_KEY_AFTER_10_3 (CONFIG_ITEM_KEY + 2)
@interface VLCConfigControl : NSView
{
vlc_object_t *p_this;
module_config_t *p_item;
char *psz_name;
NSTextField *o_label;
int i_type;
vlc_bool_t b_advanced;
NSView *contentView;
}
+ (VLCConfigControl *)newControl: (module_config_t *)p_item withView: (NSView *)o_parent_view withObject: (vlc_object_t *)p_this offset:(NSPoint) offset;
- (id)initWithFrame: (NSRect)frame item: (module_config_t *)p_item withObject: (vlc_object_t *)_p_this;
+ (VLCConfigControl *)newControl: (module_config_t *)_p_item withView: (NSView *)o_parent_view yOffset:(int) i_yPos lastItem: (int) i_lastItem;
- (id)initWithFrame: (NSRect)frame item: (module_config_t *)p_item;
- (NSString *)getName;
- (int)getType;
- (BOOL)isAdvanced;
......@@ -42,30 +44,23 @@
- (int)intValue;
- (float)floatValue;
- (char *)stringValue;
- (void)applyChanges;
static NSMenu *o_keys_menu = nil;
@end
@interface KeyConfigControl : VLCConfigControl
{
NSMatrix *o_matrix;
NSComboBox *o_combo;
}
+ (int)calcVerticalMargin: (int)i_curItem lastItem:(int)i_lastItem;
@end
#if 0
@interface ModuleConfigControl : VLCConfigControl
{
NSPopUpButton *o_popup;
}
@end
#endif
@interface StringConfigControl : VLCConfigControl
{
NSTextField *o_textfield;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
@end
@interface StringListConfigControl : VLCConfigControl
......@@ -73,7 +68,13 @@
NSComboBox *o_combo;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
@end
@interface FileConfigControl : VLCConfigControl
{
NSTextField *o_textfield;
......@@ -81,17 +82,39 @@
BOOL b_directory;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
- (IBAction)openFileDialog: (id)sender;
- (void)pathChosenInPanel:(NSOpenPanel *)o_sheet withReturn:(int)i_return_code contextInfo:(void *)o_context_info;
@end
@interface ModuleConfigControl : VLCConfigControl
{
NSPopUpButton *o_popup;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
@end
@interface IntegerConfigControl : VLCConfigControl
{
NSTextField *o_textfield;
NSStepper *o_stepper;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
- (IBAction)stepperChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification;
......@@ -102,6 +125,11 @@
NSComboBox *o_combo;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
@end
@interface RangedIntegerConfigControl : VLCConfigControl
......@@ -112,17 +140,42 @@
NSTextField *o_textfield_max;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
- (IBAction)sliderChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification;
@end
#if 0
@interface BoolConfigControl : VLCConfigControl
{
NSButton *o_checkbox;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
@end
@interface FloatConfigControl : VLCConfigControl
{
NSTextField *o_textfield;
NSStepper *o_stepper;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
- (IBAction)stepperChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification;
@end
@interface RangedFloatConfigControl : VLCConfigControl
......@@ -133,16 +186,60 @@
NSTextField *o_textfield_max;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
- (IBAction)sliderChanged:(id)sender;
- (void)textfieldChanged:(NSNotification *)o_notification;
@end
@interface KeyConfigControlBefore103 : VLCConfigControl
{
NSButton *o_cmd_checkbox;
NSButton *o_ctrl_checkbox;
NSButton *o_alt_checkbox;
NSButton *o_shift_checkbox;
NSPopUpButton *o_popup;
}
@interface BoolConfigControl : VLCConfigControl
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
@end
@interface KeyConfigControlAfter103 : VLCConfigControl
{
NSButton *o_checkbox;
NSPopUpButton *o_popup;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
@end
@interface ModuleListConfigControl : VLCConfigControl
{
NSTextField *o_textfield;
NSScrollView *o_scrollview;
NSMutableArray *o_modulearray;
}
- (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
withVerticalOffset: (int)i_yPos
withLastItem: (int)i_lastItem;
@end
#endif
\ No newline at end of file
//#undef CONFIG_ITEM_LIST_STRING
//#undef CONFIG_ITEM_RANGED_INTEGER
//#undef CONFIG_ITEM_KEY_BEFORE_10_3
//#undef CONFIG_ITEM_KEY_AFTER_10_3
modules/gui/macosx/prefs_widgets.m
View file @ a0ff74f7
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment