* Use the playlist info panel instead of the old one everywhere

	- old VLCInfo and InfoPanel have been removed from nib file
	- VLCPlaylistInfo and PlaylistInfoPanel have been renamed
	- old info.c and info.h are still in repository, but not compiled, should I remove them ?

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

@@ -52,10 +52,34 @@
             SUPERCLASS = NSObject; 
         }, 
         {
-            ACTIONS = {showCategory = id; toggleInfoPanel = id; }; 
+            ACTIONS = {
+                createOutlineGroup = id; 
+                deleteOutlineGroup = id; 
+                handleGroup = id; 
+                infoCancel = id; 
+                infoOk = id; 
+                toggleInfoPanel = id; 
+                togglePlaylistInfoPanel = id; 
+            }; 
             CLASS = VLCInfo; 
             LANGUAGE = ObjC; 
-            OUTLETS = {"o_selector" = id; "o_view" = id; "o_window" = id; }; 
+            OUTLETS = {
+                "o_author_lbl" = id; 
+                "o_author_txt" = id; 
+                "o_btn_add_group" = id; 
+                "o_btn_cancel" = id; 
+                "o_btn_delete_group" = id; 
+                "o_btn_ok" = id; 
+                "o_group_cbx" = id; 
+                "o_group_color" = id; 
+                "o_group_lbl" = id; 
+                "o_info_window" = id; 
+                "o_outline_view" = id; 
+                "o_title_lbl" = id; 
+                "o_title_txt" = id; 
+                "o_uri_lbl" = id; 
+                "o_uri_txt" = id; 
+            }; 
             SUPERCLASS = NSObject; 
         }, 
         {
@@ -96,15 +120,12 @@
                 "o_err_msg" = id; 
                 "o_error" = id; 
                 "o_info" = id; 
-                "o_info_window" = id; 
                 "o_messages" = id; 
                 "o_mi_about" = id; 
                 "o_mi_add_intf" = id; 
                 "o_mi_audiotrack" = id; 
                 "o_mi_bring_atf" = id; 
                 "o_mi_bwd" = id; 
-                "o_mi_bwd1m" = id; 
-                "o_mi_bwd5m" = id; 
                 "o_mi_channels" = id; 
                 "o_mi_chapter" = id; 
                 "o_mi_clear" = id; 
@@ -121,8 +142,6 @@
                 "o_mi_floatontop" = id; 
                 "o_mi_fullscreen" = id; 
                 "o_mi_fwd" = id; 
-                "o_mi_fwd1m" = id; 
-                "o_mi_fwd5m" = id; 
                 "o_mi_half_window" = id; 
                 "o_mi_hide" = id; 
                 "o_mi_hide_others" = id; 
@@ -371,37 +390,6 @@
             }; 
             SUPERCLASS = NSObject; 
         }, 
-        {
-            ACTIONS = {
-                createOutlineGroup = id; 
-                deleteOutlineGroup = id; 
-                handleGroup = id; 
-                infoCancel = id; 
-                infoOk = id; 
-                togglePlaylistInfoPanel = id; 
-            }; 
-            CLASS = VLCPlaylistInfo; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "o_author_lbl" = id; 
-                "o_author_txt" = id; 
-                "o_btn_add_group" = id; 
-                "o_btn_cancel" = id; 
-                "o_btn_delete_group" = id; 
-                "o_btn_ok" = id; 
-                "o_group_cbx" = id; 
-                "o_group_color" = id; 
-                "o_group_lbl" = id; 
-                "o_info_window" = id; 
-                "o_outline_view" = id; 
-                "o_title_lbl" = id; 
-                "o_title_txt" = id; 
-                "o_uri_lbl" = id; 
-                "o_uri_txt" = id; 
-                "o_vlc_playlist" = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
         {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, 
         {
             ACTIONS = {advancedToggle = id; closePrefs = id; resetAll = id; savePrefs = id; }; 

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

@@ -3,18 +3,18 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>219 45 505 517 0 0 800 578 </string>
+	<string>457 229 505 517 0 0 1024 746 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1617</key>
 		<string>542 480 104 149 0 0 1024 746 </string>
 		<key>29</key>
-		<string>117 522 419 44 0 0 800 578 </string>
+		<string>186 686 419 44 0 0 1024 746 </string>
 		<key>915</key>
-		<string>54 452 118 149 0 0 1024 746 </string>
+		<string>54 452 185 199 0 0 1024 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
-	<string>364.0</string>
+	<string>362.0</string>
 	<key>IBLockedObjects</key>
 	<array>
 		<integer>1789</integer>
@@ -22,8 +22,6 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>21</integer>
-		<integer>29</integer>
-		<integer>1789</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>7F44</string>

modules/gui/macosx/Modules.am

@@ -7,8 +7,6 @@ SOURCES_macosx = \
 	controls.m \
 	intf.m \
 	intf.h \
-	info.h \
-	info.m \
 	macosx.m \
 	misc.m \
 	misc.h \

modules/gui/macosx/intf.h

@@ -239,6 +239,7 @@ struct intf_sys_t
 
 - (id)getControls;
 - (id)getPlaylist;
+- (id)getInfo;
 - (void)terminate;
 
 - (void)initStrings;

modules/gui/macosx/intf.m

@@ -687,6 +687,15 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
     return nil;
 }
 
+- (id)getInfo
+{
+    if ( o_info )
+    {
+        return o_info;
+    }
+    return  nil;
+}
+
 - (void)manage
 {
     NSDate * o_sleep_date;
@@ -811,7 +820,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
             vlc_object_release( (vlc_object_t *)p_vout );
         }
         [o_playlist updateRowSelection];
-        [o_info updateInfo];
+//        [o_info updateInfo];
 
         p_intf->p_sys->b_current_title_update = FALSE;
     }

modules/gui/macosx/playlistinfo.h

@@ -2,7 +2,7 @@
  * playlistinfo.h: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2002-2004 VideoLAN
- * $Id: playlist.h 7015 2004-03-08 15:22:58Z bigben $
+ * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org> 
  *
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 
-@interface VLCPlaylistInfo : NSObject
+@interface VLCInfo : NSObject
 {
     IBOutlet id o_info_window;
     IBOutlet id o_uri_lbl;
@@ -40,19 +40,24 @@
     IBOutlet id o_btn_delete_group;
     IBOutlet id o_btn_add_group;
     IBOutlet id o_outline_view;
-    IBOutlet id o_vlc_playlist;
     IBOutlet id o_group_lbl;
     IBOutlet id o_group_cbx;
     IBOutlet id o_group_color;
+
+    int i_item;
+    NSMutableArray * o_selected;
 }
 
 - (IBAction)togglePlaylistInfoPanel:(id)sender;
+- (IBAction)toggleInfoPanel:(id)sender;
+- (void)initPanel:(id)sender;
 - (IBAction)infoCancel:(id)sender;
 - (IBAction)infoOk:(id)sender;
 - (IBAction)handleGroup:(id)sender;
 - (IBAction)deleteOutlineGroup:(id)sender;
 - (IBAction)createOutlineGroup:(id)sender;
 - (void)createComboBox;
+- (int)getItem;
 
 @end