* Start of new playlist for OSX.

  - basic data retrieval implemented
  - data display not yet implemented
  - many broken outlets and even more broken actions
  - won't compile
  - if you work on this (and please do) please communicate this fact to the IRC channel and make regurlar commits to prevent that multiple people work on this (and especially the NIB).

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

@@ -402,43 +402,10 @@
             SUPERCLASS = NSObject; 
         }, 
         {
-            ACTIONS = {
-                deleteItems = id; 
-                disableGroup = id; 
-                enableGroup = id; 
-                handlePopUp = id; 
-                playItem = id; 
-                savePlaylist = id; 
-                searchItem = id; 
-                selectAll = id; 
-                toggleItemsEnabled = id; 
-                toggleWindow = id; 
-            }; 
+            ACTIONS = {}; 
             CLASS = VLCPlaylist; 
             LANGUAGE = ObjC; 
-            OUTLETS = {
-                "o_btn_playlist" = id; 
-                "o_ctx_menu" = id; 
-                "o_loop_popup" = id; 
-                "o_mi_delete" = id; 
-                "o_mi_disableGroup" = id; 
-                "o_mi_enableGroup" = id; 
-                "o_mi_info" = id; 
-                "o_mi_play" = id; 
-                "o_mi_save_playlist" = id; 
-                "o_mi_selectall" = id; 
-                "o_mi_toggleItemsEnabled" = id; 
-                "o_random_ckb" = id; 
-                "o_search_button" = id; 
-                "o_search_keyword" = id; 
-                "o_status_field" = id; 
-                "o_table_view" = id; 
-                "o_tc_author" = id; 
-                "o_tc_duration" = id; 
-                "o_tc_id" = id; 
-                "o_tc_name" = id; 
-                "o_window" = id; 
-            }; 
+            OUTLETS = {}; 
             SUPERCLASS = NSObject; 
         }, 
         {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, 

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

@@ -3,13 +3,15 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>332 421 505 517 0 0 1280 938 </string>
+	<string>726 239 505 517 0 0 1280 938 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1617</key>
 		<string>542 480 104 149 0 0 1024 746 </string>
+		<key>2197</key>
+		<string>9 51 596 368 0 0 1280 938 </string>
 		<key>29</key>
-		<string>41 667 419 44 0 0 1024 746 </string>
+		<string>58 849 419 44 0 0 1280 938 </string>
 		<key>915</key>
 		<string>54 452 185 199 0 0 1024 746 </string>
 	</dict>
@@ -18,13 +20,19 @@
 	<key>IBLockedObjects</key>
 	<array>
 		<integer>1789</integer>
+		<integer>2199</integer>
+		<integer>2206</integer>
+		<integer>2208</integer>
+		<integer>2202</integer>
+		<integer>2204</integer>
+		<integer>2203</integer>
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
+		<integer>2197</integer>
 		<integer>21</integer>
-		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>7M34</string>
+	<string>7R28</string>
 </dict>
 </plist>

modules/gui/macosx/playlist.h

@@ -25,7 +25,7 @@
 /*****************************************************************************
  * VLCPlaylistView interface 
  *****************************************************************************/
-@interface VLCPlaylistView : NSTableView
+@interface VLCPlaylistView : NSOutlineView
 {
 }
 
@@ -36,79 +36,12 @@
  *****************************************************************************/
 @interface VLCPlaylist : NSObject
 {
-    int i_moveRow;
-    bool b_isSortDescending;
-
-    IBOutlet id o_window;
     IBOutlet id o_btn_playlist;
-    IBOutlet id o_table_view;
-
-    IBOutlet id o_status_field;
-    IBOutlet id o_tc_id;
-    IBOutlet id o_tc_name;
-    IBOutlet id o_tc_author;
-    IBOutlet id o_tc_duration;
-    IBOutlet id o_tc_sortColumn;
-
-    IBOutlet id o_ctx_menu;
-    IBOutlet id o_mi_save_playlist;
-    IBOutlet id o_mi_info;
-    IBOutlet id o_mi_play;
-    IBOutlet id o_mi_delete;
-    IBOutlet id o_mi_selectall;
-    IBOutlet id o_mi_toggleItemsEnabled;
-    IBOutlet id o_mi_enableGroup;
-    IBOutlet id o_mi_disableGroup;
-
-    IBOutlet id o_random_ckb;
-
-    IBOutlet id o_search_keyword;
-    IBOutlet id o_search_button;
-
-    IBOutlet id o_loop_popup;
-
-/*For playlist info window*/
-
-    IBOutlet id o_info_window;
-    IBOutlet id o_uri_lbl;
-    IBOutlet id o_title_lbl;
-    IBOutlet id o_author_lbl;
-    IBOutlet id o_uri_txt;
-    IBOutlet id o_title_txt;
-    IBOutlet id o_author_txt;
-    IBOutlet id o_btn_info_ok;
-    IBOutlet id o_btn_info_cancel;
-    IBOutlet id o_tbv_info;
-
-    NSImage *o_descendingSortingImage;
-    NSImage *o_ascendingSortingImage;
+    IBOutlet id o_outline_view;
 }
 
 - (void)initStrings;
-- (NSMenu *)menuForEvent:(NSEvent *)o_event;
-
-- (IBAction)toggleWindow:(id)sender;
-- (IBAction)savePlaylist:(id)sender;
-- (IBAction)playItem:(id)sender;
-- (IBAction)deleteItems:(id)sender;
-- (IBAction)toggleItemsEnabled:(id)sender;
-- (IBAction)enableGroup:(id)sender;
-- (IBAction)disableGroup:(id)sender;
-- (IBAction)selectAll:(id)sender;
-- (IBAction)searchItem:(id)sender;
-- (IBAction)handlePopUp:(id)sender;
 
 - (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue;
-
-- (void)updateRowSelection;
-- (void)playlistUpdated;
-
-/*For playlist info window*/
-
-- (int)selectedPlaylistItem;
-- (void)deleteGroup:(int)i_id;
-- (NSMutableArray *)selectedPlaylistItemsList;
-- (NSColor *)getColor:(int)i_group;
-
 @end