* ./modules/gui/macosx/prefs.m: new configuration interface

ChangeLog

 0.5.0
 Not released yet
 
+  * ./modules/gui/macosx/prefs.m: new configuration interface
   * ./src/misc/netutils.c: GetMacAddress Darwin support
   * ./src/libvlc.h: default to en0 instead of eth0 under Darwin
   * ./plugins/dvdplay/access.c: use dvdplay after it has completed

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -28,7 +28,7 @@
             SUPERCLASS = NSObject; 
         }, 
         {
-            ACTIONS = {clearRecentItems = id; }; 
+            ACTIONS = {clearRecentItems = id; viewPreferences = id; }; 
             CLASS = VLCMain; 
             LANGUAGE = ObjC; 
             OUTLETS = {
@@ -57,13 +57,13 @@
                 "o_mi_open_disc" = id; 
                 "o_mi_open_file" = id; 
                 "o_mi_open_net" = id; 
-                "o_mi_open_quickly" = id; 
                 "o_mi_open_recent" = id; 
                 "o_mi_open_recent_cm" = id; 
                 "o_mi_paste" = id; 
                 "o_mi_pause" = id; 
                 "o_mi_play" = id; 
                 "o_mi_playlist" = id; 
+                "o_mi_prefs" = id; 
                 "o_mi_previous" = id; 
                 "o_mi_program" = id; 
                 "o_mi_quit" = id; 

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -16,6 +16,7 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>636</integer>
+		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>6D52</string>

modules/gui/macosx/Modules.am

@@ -4,6 +4,7 @@ SOURCES_macosx = \
 	modules/gui/macosx/vout.m \
 	modules/gui/macosx/intf.m \
 	modules/gui/macosx/open.m \
+	modules/gui/macosx/prefs.m \
 	modules/gui/macosx/playlist.m \
 	modules/gui/macosx/controls.m \
         modules/gui/macosx/asystm.m
@@ -11,6 +12,7 @@ SOURCES_macosx = \
 noinst_HEADERS += \
 	modules/gui/macosx/intf.h \
 	modules/gui/macosx/open.h \
+	modules/gui/macosx/prefs.h \
 	modules/gui/macosx/playlist.h \
 	modules/gui/macosx/vout.h \
 	modules/gui/macosx/adev_discovery.h \

modules/gui/macosx/intf.h

@@ -2,7 +2,7 @@
  * intf.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.h,v 1.2 2002/10/02 22:56:53 massiot Exp $
+ * $Id: intf.h,v 1.3 2002/11/05 03:57:16 jlj Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -82,6 +82,8 @@ struct intf_sys_t
  *****************************************************************************/
 @interface VLCMain : NSObject
 {
+    id o_prefs;                 /* VLCPrefs       */
+
     IBOutlet id o_window;       /* main window    */
 
     IBOutlet id o_controls;     /* VLCControls    */
@@ -94,6 +96,7 @@ struct intf_sys_t
     /* main menu */
 
     IBOutlet id o_mi_about;
+    IBOutlet id o_mi_prefs;
     IBOutlet id o_mi_hide;
     IBOutlet id o_mi_hide_others;
     IBOutlet id o_mi_show_all;
@@ -103,7 +106,6 @@ struct intf_sys_t
     IBOutlet id o_mi_open_file;
     IBOutlet id o_mi_open_disc;
     IBOutlet id o_mi_open_net;
-    IBOutlet id o_mi_open_quickly;
     IBOutlet id o_mi_open_recent;
     IBOutlet id o_mi_open_recent_cm;
 
@@ -166,6 +168,8 @@ struct intf_sys_t
 
 //- (void)selectAction:(id)sender;
 
+- (IBAction)viewPreferences:(id)sender;
+
 @end
 
 @interface VLCMain (Internal)

modules/gui/macosx/intf.m

@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.m,v 1.3 2002/10/02 22:56:53 massiot Exp $
+ * $Id: intf.m,v 1.4 2002/11/05 03:57:16 jlj Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -33,6 +33,7 @@
 
 #include "intf.h"
 #include "vout.h"
+#include "prefs.h"
 #include "playlist.h"
 #include "asystm.h"
 
@@ -164,6 +165,18 @@ static void Run( intf_thread_t *p_intf )
  *****************************************************************************/
 @implementation VLCMain
 
+- (id)init
+{
+    self = [super init];
+
+    if( self != nil )
+    {
+        o_prefs = nil;
+    }
+
+    return( self ); 
+}
+
 - (void)awakeFromNib
 {
     NSString * pTitle = [NSString
@@ -175,6 +188,7 @@ static void Run( intf_thread_t *p_intf )
     [o_msgs_btn_ok setTitle: _NS("Close")];
 
     [o_mi_about setTitle: _NS("About vlc")];
+    [o_mi_prefs setTitle: _NS("Preferences")];
     [o_mi_hide setTitle: _NS("Hide vlc")];
     [o_mi_hide_others setTitle: _NS("Hide Others")];
     [o_mi_show_all setTitle: _NS("Show All")];
@@ -184,7 +198,6 @@ static void Run( intf_thread_t *p_intf )
     [o_mi_open_file setTitle: _NS("Open File")];
     [o_mi_open_disc setTitle: _NS("Open Disc")];
     [o_mi_open_net setTitle: _NS("Open Network")];
-    [o_mi_open_quickly setTitle: _NS("Open Quickly...")];
     [o_mi_open_recent setTitle: _NS("Open Recent")];
     [o_mi_open_recent_cm setTitle: _NS("Clear Menu")];
 
@@ -424,6 +437,12 @@ static void Run( intf_thread_t *p_intf )
         vout_DestroyThread( p_vout );
     }
 
+    if( o_prefs != nil )
+    {
+        [o_prefs release];
+        o_prefs = nil;
+    }
+
     [NSApp stop: nil];
 
     /* write cached user defaults to disk */
@@ -743,6 +762,16 @@ static void Run( intf_thread_t *p_intf )
     [self application: nil openFile: [sender title]]; 
 }
 
+- (IBAction)viewPreferences:(id)sender
+{
+    if( o_prefs == nil )
+    {
+        o_prefs = [[VLCPrefs alloc] init];
+    }
+
+    [o_prefs createPrefPanel: @"main"];
+}
+
 @end
 
 @implementation VLCMain (NSMenuValidation)

modules/gui/macosx/prefs.h

+/*****************************************************************************
+ * prefs.h: MacOS X plugin for vlc
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ * $Id: prefs.h,v 1.1 2002/11/05 03:57:16 jlj Exp $
+ *
+ * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
+ *
+ * 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
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * VLCPrefs interface
+ *****************************************************************************/
+@interface VLCPrefs : NSObject
+{
+    intf_thread_t *p_intf;
+
+    NSMutableDictionary *o_pref_panels;
+    NSMutableDictionary *o_toolbars;
+    NSMutableDictionary *o_scroll_views;
+    NSMutableDictionary *o_panel_views;
+    NSMutableDictionary *o_save_prefs;
+}
+
+- (BOOL)hasPrefs:(NSString *)o_module_name;
+- (void)createPrefPanel:(NSString *)o_module_name;
+- (void)destroyPrefPanel:(id)o_unknown;
+- (void)selectPrefView:(id)sender;
+
+- (void)moduleSelected:(id)sender;
+- (void)configureModule:(id)sender;
+- (void)selectModule:(id)sender;
+
+- (void)configChanged:(id)o_unknown;
+
+- (void)clickedApply:(id)sender;
+- (void)clickedCancelOK:(id)sender;
+
+@end
+
+@interface VLCFlippedView : NSView
+{
+
+}
+
+@end
+
+#define INTF_CONTROL_CONFIG(x) \
+@interface VLC##x : NS##x \
+{ \
+    NSString *o_module_name; \
+    NSString *o_config_name; \
+    int i_config_type; \
+} \
+- (void)setModuleName:(NSString *)_o_module_name; \
+- (void)setConfigName:(NSString *)_o_config_name; \
+- (void)setConfigType:(int)_i_config_type; \
+- (NSString *)moduleName; \
+- (NSString *)configName; \
+- (int)configType; \
+@end
+
+#define IMPL_CONTROL_CONFIG(x) \
+@implementation VLC##x \
+- (id)init \
+{ \
+    self = [super init]; \
+    if( self != nil ) \
+    { \
+        o_module_name = nil; \
+        o_config_name = nil; \
+        i_config_type = 0; \
+    } \
+    return( self ); \
+} \
+- (void)dealloc \
+{ \
+    if( o_module_name != nil ) \
+    { \
+        [o_module_name release]; \
+    } \
+    if( o_config_name != nil ) \
+    { \
+        [o_config_name release]; \
+    } \
+    [super dealloc]; \
+} \
+- (void)setModuleName:(NSString *)_o_module_name \
+{ \
+    if( o_module_name != nil ) \
+    { \
+        [o_module_name release]; \
+    } \
+    o_module_name = [_o_module_name retain]; \
+} \
+- (void)setConfigName:(NSString *)_o_config_name \
+{ \
+    if( o_config_name != nil ) \
+    { \
+        [o_config_name release]; \
+    } \
+    o_config_name = [_o_config_name retain]; \
+} \
+- (void)setConfigType:(int)_i_config_type \
+{ \
+    i_config_type = _i_config_type; \
+} \
+- (NSString *)moduleName \
+{ \
+    return( o_module_name ); \
+} \
+- (NSString *)configName \
+{ \
+    return( o_config_name ); \
+} \
+- (int)configType \
+{ \
+    return( i_config_type ); \
+} \
+@end
+
+INTF_CONTROL_CONFIG(Button);
+INTF_CONTROL_CONFIG(ComboBox);
+INTF_CONTROL_CONFIG(TextField);
+
+#define CONTROL_CONFIG( obj, mname, ctype, cname ) \
+    { \
+        [obj setModuleName: mname]; \
+        [obj setConfigType: ctype]; \
+        [obj setConfigName: [NSString stringWithCString: cname]]; \
+    }
+