[vlc-commits] macosx: remove old playlist data source, remove unneeded outline view inits

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sun Dec 28 17:43:18 2014 +0100| [1100886107563dd8436d7cc159a956a52155288c] | committer: David Fuhrmann

macosx: remove old playlist data source, remove unneeded outline view inits

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1100886107563dd8436d7cc159a956a52155288c
---

 .../macosx/Resources/English.lproj/MainWindow.xib        |   14 +++-----------
 modules/gui/macosx/playlist.m                            |    6 ++----
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/MainWindow.xib b/extras/package/macosx/Resources/English.lproj/MainWindow.xib
index 171a0d5..acd6ef9 100644
--- a/extras/package/macosx/Resources/English.lproj/MainWindow.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainWindow.xib
@@ -21,12 +21,12 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="5305"/>
       <integer value="5605"/>
-      <integer value="4756"/>
       <integer value="5265"/>
-      <integer value="5260"/>
+      <integer value="21"/>
       <integer value="4850"/>
+      <integer value="5260"/>
+      <integer value="5305"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -2464,14 +2464,6 @@
         </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
-            <string key="label">dataSource</string>
-            <reference key="source" ref="23448837"/>
-            <reference key="destination" ref="998338913"/>
-          </object>
-          <int key="connectionID">5599</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
             <string key="label">delegate</string>
             <reference key="source" ref="23448837"/>
             <reference key="destination" ref="998338913"/>
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index fb7b763..cdb34e8 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -228,10 +228,6 @@
         return;
 
     playlist_t * p_playlist = pl_Get(VLCIntf);
-    [o_outline_view setTarget: self];
-    [o_outline_view setDelegate: self];
-    [o_outline_view setAllowsEmptySelection: NO];
-    [o_outline_view expandItem: [o_outline_view itemAtRow:0]];
 
     [self reloadStyles];
     [self initStrings];
@@ -240,8 +236,10 @@
     [o_outline_view setDataSource:o_model];
     [o_outline_view reloadData];
 
+    [o_outline_view setTarget: self];
     [o_outline_view setDoubleAction: @selector(playItem:)];
 
+    [o_outline_view setAllowsEmptySelection: NO];
     [o_outline_view registerForDraggedTypes: [NSArray arrayWithObjects:NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]];
     [o_outline_view setIntercellSpacing: NSMakeSize (0.0, 1.0)];