Changeset 5d3edb82f37d177671789808248251bfdeaf7fd1

Timestamp:

13/12/04 22:48:06 (4 years ago)

Author:

Benjamin Pracht <bigben@videolan.org>

git-committer:

Benjamin Pracht <bigben@videolan.org> 1102974486 +0000

git-parent:

[c5d68965802198e8da1657f36cc39ee40b17eebf]

git-author:

Benjamin Pracht <bigben@videolan.org> 1102974486 +0000

Message:

Implements sorting of the current node from context menu

Files:

• extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib (modified) (previous)
• modules/gui/macosx/playlist.h (modified) (2 diffs)
• modules/gui/macosx/playlist.m (modified) (2 diffs)

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

@@ -396 +396 @@
-                searchItem = id; 
-                selectAll = id; 
+                sortNodeByAuthor = id; 
+                sortNodeByName = id; 
-            }; 
-            CLASS = VLCPlaylist; 
@@ -408 +410 @@
-                "o_mi_save_playlist" = id; 
-                "o_mi_selectall" = id; 
+                "o_mi_sort_author" = id; 
+                "o_mi_sort_name" = id; 
-                "o_outline_view" = id; 
-                "o_random_ckb" = id; 

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

@@ -4 +4 @@
-<dict>
-    <key>IBDocumentLocation</key>
-94 10
+230 -8
-    <key>IBEditorPositions</key>
-    <dict>
@@ -14 +14 @@
-        <string>84 667 419 44 0 0 1024 746 </string>
-        <key>915</key>
-620 326 100 13
+731 416 165 18
-    </dict>
-    <key>IBFramework Version</key>

modules/gui/macosx/playlist.h

@@ -53 +53 @@
-    IBOutlet id o_mi_info;
-    IBOutlet id o_mi_selectall;
+    IBOutlet id o_mi_sort_name;
+    IBOutlet id o_mi_sort_author;
-
-    NSImage *o_descendingSortingImage;
@@ -69 +71 @@
-
-- (void)playlistUpdated;
+- (void)sortNode:(int)i_mode;
-
-- (IBAction)playItem:(id)sender;
-- (IBAction)deleteItem:(id)sender;
-- (IBAction)selectAll:(id)sender;
+- (IBAction)sortNodeByName:(id)sender;
+- (IBAction)sortNodeByAuthor:(id)sender;
-
-- (void)appendArray:(NSArray*)o_array atPos:(int)i_position enqueue:(BOOL)b_enqueue;

modules/gui/macosx/playlist.m

@@ -153 +153 @@
-    [o_mi_selectall setTitle: _NS("Select All")];
-    [o_mi_info setTitle: _NS("Properties")];
+    [o_mi_sort_name setTitle: _NS("Sort Node by Name")];
+    [o_mi_sort_author setTitle: _NS("Sort Node by Author")];
-    [[o_tc_name headerCell] setStringValue:_NS("Name")];
-    [[o_tc_author headerCell] setStringValue:_NS("Author")];
@@ -317 +319 @@
-        [self playlistUpdated];
-    }
+}
+
+- (IBAction)sortNodeByName:(id)sender
+{
+    [self sortNode: SORT_TITLE];
+}
+
+- (IBAction)sortNodeByAuthor:(id)sender
+{
+    [self sortNode: SORT_AUTHOR];
+}
+
+- (void)sortNode:(int)i_mode
+{
+    playlist_t * p_playlist = vlc_object_find( VLCIntf, VLC_OBJECT_PLAYLIST,
+                                          FIND_ANYWHERE );
+    playlist_item_t * p_item;
+
+    if (p_playlist == NULL)
+    {
+        return;
+    }
+
+    if ([o_outline_view selectedRow] > -1)
+    {
+        p_item = [[o_outline_view itemAtRow: [o_outline_view selectedRow]]
+                                                                pointerValue];
+    }
+    else
+    /*If no item is selected, sort the whole playlist*/
+    {
+        playlist_view_t * p_view = playlist_ViewFind( p_playlist, VIEW_SIMPLE );
+        p_item = p_view->p_root;
+    }
+
+    if (p_item->i_children > -1)
+    {
+        vlc_mutex_lock(&p_playlist->object_lock );
+        playlist_RecursiveNodeSort( p_playlist, p_item, i_mode, ORDER_NORMAL );
+        vlc_mutex_unlock(&p_playlist->object_lock );
+    }
+    else
+    {
+        int i;
+
+        for (i = 0 ; i < p_item->i_parents ; i++)
+        {
+            if (p_item->pp_parents[i]->i_view == VIEW_SIMPLE)
+            {
+                vlc_mutex_lock(&p_playlist->object_lock );
+                playlist_RecursiveNodeSort( p_playlist,
+                        p_item->pp_parents[i]->p_parent, i_mode, ORDER_NORMAL );
+                vlc_mutex_unlock(&p_playlist->object_lock );
+                break;
+            }
+        }
+    }
+    vlc_object_release(p_playlist);
+    [self playlistUpdated];
-}
-