1.1 --- a/src/cocoaui/cocoaui.h	Wed Jun 24 06:06:40 2009 +0000
     1.2 +++ b/src/cocoaui/cocoaui.h	Sat Mar 03 15:52:59 2012 +1000
     1.3 @@ -21,6 +21,7 @@
     1.4  
     1.5  #import <AppKit/AppKit.h>
     1.6  #include "lxdream.h"
     1.7 +#include "config.h"
     1.8  #include "gui.h"
     1.9  #include "gettext.h"
    1.10  
    1.11 @@ -75,6 +76,7 @@
    1.12      int headerHeight;
    1.13  }
    1.14  - (id)initWithFrame: (NSRect)frameRect title:(NSString *)title;
    1.15 +- (id)initWithFrame: (NSRect)frameRect title:(NSString *)title configGroup: (lxdream_config_group_t)group scrollable: (BOOL)scroll;
    1.16  - (int)contentHeight;
    1.17  @end
    1.18  
    1.19 @@ -90,12 +92,27 @@
    1.20  }
    1.21  @end
    1.22  
    1.23 +
    1.24 +@interface ConfigurationView : NSView
    1.25 +{
    1.26 +    lxdream_config_group_t group;
    1.27 +    int labelWidth;
    1.28 +    NSTextField *fields[CONFIG_MAX_KEYS][2];
    1.29 +}
    1.30 +- (id)initWithFrame: (NSRect)frameRect;
    1.31 +- (id)initWithFrame: (NSRect)frameRect configGroup: (lxdream_config_group_t)group;
    1.32 +- (void)setLabelWidth: (int)width;
    1.33 +- (void)setConfigGroup: (lxdream_config_group_t)group;
    1.34 +- (void)setDevice: (struct maple_device *)device;
    1.35 +@end
    1.36 +
    1.37 +
    1.38  @interface LxdreamPrefsPanel : NSPanel
    1.39  {
    1.40      NSArray *toolbar_ids;
    1.41      NSArray *toolbar_defaults;
    1.42 +    NSView *config_panes[3];
    1.43      NSDictionary *toolbar_items;
    1.44 -    NSView *path_pane, *ctrl_pane;
    1.45      KeyBindingEditor *binding_editor;
    1.46  }
    1.47  - (id)initWithContentRect:(NSRect)contentRect;
    1.48 @@ -107,11 +124,10 @@
    1.49  NSView *video_osx_create_drawable();
    1.50  void cocoa_gui_show_preferences();
    1.51  NSView *cocoa_gui_create_prefs_controller_pane();
    1.52 -NSView *cocoa_gui_create_prefs_path_pane();
    1.53  
    1.54  
    1.55  #ifdef __cplusplus
    1.56  }
    1.57  #endif
    1.58      
    1.59 -#endif /* lxdream_cocoaui_H */
    1.60 \ No newline at end of file
    1.61 +#endif /* lxdream_cocoaui_H */