* don't use tabs here as well

[vlc] / modules / gui / macosx / prefs_widgets.h

diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h
index 725b069d7b0b2a0d98d827b55a2e3167df2d5ba0..4ef8557735889523f8726dd0255831481f7c35fa 100644 (file)
--- a/modules/gui/macosx/prefs_widgets.h
+++ b/modules/gui/macosx/prefs_widgets.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * prefs_widgets.h: Preferences controls
  *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
+ * Copyright (C) 2002-2003 the VideoLAN team
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan.org> 
@@ -21,40 +21,40 @@
  * 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)
+#define LEFTMARGIN  18
+#define RIGHTMARGIN 18
 
-@interface VLCConfigControl : NSBox
+@interface VLCConfigControl : NSView
 {
-    vlc_object_t    *p_this;
+    module_config_t *p_item;
     char            *psz_name;
     NSTextField     *o_label;
     int             i_type;
+    int             i_view_type;
     vlc_bool_t      b_advanced;
 }
 
-+ (VLCConfigControl *)newControl: (module_config_t *)p_item withView: (NSView *)o_parent_view withObject: (vlc_object_t *)p_this;
-- (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;
+- (id)initWithFrame: (NSRect)frame item: (module_config_t *)p_item;
 - (NSString *)getName;
 - (int)getType;
+- (int)getViewType;
 - (BOOL)isAdvanced;
-
+- (void)setYPos:(int)i_yPos;
 - (int)intValue;
 - (float)floatValue;
 - (char *)stringValue;
+- (void)applyChanges;
+- (int)getLabelSize;
+- (void) alignWithXPosition:(int)i_xPos;
+static NSMenu   *o_keys_menu = nil;
 
-@end
-
-@interface KeyConfigControl : VLCConfigControl
-{
-    NSMatrix        *o_matrix;
-    NSComboBox      *o_combo;
-}
-
-@end
-
-@interface ModuleConfigControl : VLCConfigControl
-{
-    NSPopUpButton   *o_popup;
-}
++ (int)calcVerticalMargin: (int)i_curItem lastItem:(int)i_lastItem;
 
 @end
 
@@ -63,6 +63,9 @@
     NSTextField     *o_textfield;
 }
 
+- (id) initWithItem: (module_config_t *)_p_item
+           withView: (NSView *)o_parent_view;
+
 @end
 
 @interface StringListConfigControl : VLCConfigControl
@@ -70,6 +73,9 @@
     NSComboBox      *o_combo;
 }
 
+- (id) initWithItem: (module_config_t *)_p_item
+           withView: (NSView *)o_parent_view;
+
 @end
 
 @interface FileConfigControl : VLCConfigControl
@@ -79,17 +85,33 @@
     BOOL            b_directory;
 }
 
+- (id) initWithItem: (module_config_t *)_p_item
+           withView: (NSView *)o_parent_view;
+
 - (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;
+
+@end
+
 @interface IntegerConfigControl : VLCConfigControl
 {
     NSTextField     *o_textfield;
     NSStepper       *o_stepper;
 }
 
+
+- (id) initWithItem: (module_config_t *)_p_item
+           withView: (NSView *)o_parent_view;
 - (IBAction)stepperChanged:(id)sender;
 - (void)textfieldChanged:(NSNotification *)o_notification;
 
@@ -100,6 +122,9 @@
     NSComboBox      *o_combo;
 }
 
+- (id) initWithItem: (module_config_t *)_p_item
+           withView: (NSView *)o_parent_view;
+
 @end
 
 @interface RangedIntegerConfigControl : VLCConfigControl
@@ -110,16 +135,36 @@
     NSTextField     *o_textfield_max;
 }
 
+
+- (id) initWithItem: (module_config_t *)_p_item
+           withView: (NSView *)o_parent_view;
 - (IBAction)sliderChanged:(id)sender;
 - (void)textfieldChanged:(NSNotification *)o_notification;
 
 @end
 
+@interface BoolConfigControl : VLCConfigControl
+{
+    NSButton        *o_checkbox;
+}
+
+- (id) initWithItem: (module_config_t *)_p_item
+           withView: (NSView *)o_parent_view;
+
+@end
+
 @interface FloatConfigControl : VLCConfigControl
 {
     NSTextField     *o_textfield;
+    NSStepper       *o_stepper;
 }
 
+
+- (id) initWithItem: (module_config_t *)_p_item
+           withView: (NSView *)o_parent_view;
+- (IBAction)stepperChanged:(id)sender;
+- (void)textfieldChanged:(NSNotification *)o_notification;
+
 @end
 
 @interface RangedFloatConfigControl : VLCConfigControl
@@ -130,15 +175,52 @@
     NSTextField     *o_textfield_max;
 }
 
+
+- (id) initWithItem: (module_config_t *)_p_item
+           withView: (NSView *)o_parent_view;
 - (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;
+
+@end
+
+@interface KeyConfigControlAfter103 : VLCConfigControl
 {
-    NSButton        *o_checkbox;
+    NSPopUpButton   *o_popup;
 }
 
+- (id) initWithItem: (module_config_t *)_p_item
+           withView: (NSView *)o_parent_view;
+
 @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;
+
+@end
+
+//#undef CONFIG_ITEM_LIST_STRING
+//#undef CONFIG_ITEM_RANGED_INTEGER
+//#undef CONFIG_ITEM_KEY_BEFORE_10_3
+//#undef CONFIG_ITEM_KEY_AFTER_10_3
+