macosx: fix reveal in finder main menu item

(cherry picked from commit 7bc42a5901de36bdcc8b934868d0700989d23597)
Signed-off-by: David Fuhrmann <dfuhrmann@videolan.org>

extras/package/macosx/Resources/English.lproj/MainMenu.xib

@@ -12,11 +12,11 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
+      <integer value="4596"/>
       <integer value="2730"/>
-      <integer value="5547"/>
       <integer value="2461"/>
-      <integer value="4596"/>
-      <integer value="57"/>
+      <integer value="5547"/>
+      <integer value="81"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -4510,6 +4510,22 @@
           </object>
           <int key="connectionID">5615</int>
         </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">o_mi_revealInFinder</string>
+            <reference key="source" ref="651263286"/>
+            <reference key="destination" ref="252497091"/>
+          </object>
+          <int key="connectionID">5616</int>
+        </object>
+        <object class="IBConnectionRecord">
+          <object class="IBActionConnection" key="connection">
+            <string key="label">revealItemInFinder:</string>
+            <reference key="source" ref="651263286"/>
+            <reference key="destination" ref="252497091"/>
+          </object>
+          <int key="connectionID">5617</int>
+        </object>
       </object>
       <object class="IBMutableOrderedSet" key="objectRecords">
         <object class="NSArray" key="orderedObjects">
@@ -7181,7 +7197,7 @@
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{431, 473}, {297, 263}}</string>
+          <string>{{302, 473}, {297, 263}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -7212,7 +7228,7 @@
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">5615</int>
+      <int key="maxID">5617</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -7805,6 +7821,7 @@
               <string>openWebsite:</string>
               <string>quitAfterPlayback:</string>
               <string>resizeVideoWindow:</string>
+              <string>revealItemInFinder:</string>
               <string>savePlaylist:</string>
               <string>setPlaybackRate:</string>
               <string>showAudioEffects:</string>
@@ -7890,6 +7907,7 @@
               <string>id</string>
               <string>id</string>
               <string>id</string>
+              <string>id</string>
             </object>
           </object>
           <object class="NSMutableDictionary" key="actionInfosByName">
@@ -7912,6 +7930,7 @@
               <string>openWebsite:</string>
               <string>quitAfterPlayback:</string>
               <string>resizeVideoWindow:</string>
+              <string>revealItemInFinder:</string>
               <string>savePlaylist:</string>
               <string>setPlaybackRate:</string>
               <string>showAudioEffects:</string>
@@ -8012,6 +8031,10 @@
                 <string key="name">resizeVideoWindow:</string>
                 <string key="candidateClassName">id</string>
               </object>
+              <object class="IBActionInfo">
+                <string key="name">revealItemInFinder:</string>
+                <string key="candidateClassName">id</string>
+              </object>
               <object class="IBActionInfo">
                 <string key="name">savePlaylist:</string>
                 <string key="candidateClassName">id</string>
@@ -8237,6 +8260,7 @@
               <string>o_mi_readme</string>
               <string>o_mi_record</string>
               <string>o_mi_repeat</string>
+              <string>o_mi_revealInFinder</string>
               <string>o_mi_save_playlist</string>
               <string>o_mi_screen</string>
               <string>o_mi_select_all</string>
@@ -8416,6 +8440,7 @@
               <string>NSMenuItem</string>
               <string>NSMenuItem</string>
               <string>NSMenuItem</string>
+              <string>NSMenuItem</string>
               <string>id</string>
               <string>id</string>
               <string>id</string>
@@ -8580,6 +8605,7 @@
               <string>o_mi_readme</string>
               <string>o_mi_record</string>
               <string>o_mi_repeat</string>
+              <string>o_mi_revealInFinder</string>
               <string>o_mi_save_playlist</string>
               <string>o_mi_screen</string>
               <string>o_mi_select_all</string>
@@ -9011,6 +9037,10 @@
                 <string key="name">o_mi_repeat</string>
                 <string key="candidateClassName">NSMenuItem</string>
               </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_mi_revealInFinder</string>
+                <string key="candidateClassName">NSMenuItem</string>
+              </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_mi_save_playlist</string>
                 <string key="candidateClassName">NSMenuItem</string>
@@ -9687,7 +9717,7 @@
         </object>
         <object class="IBPartialClassDescription">
           <string key="className">VLCPlaylist</string>
-          <string key="superclassName">VLCPlaylistCommon</string>
+          <string key="superclassName">NSObject</string>
           <object class="NSMutableDictionary" key="actions">
             <bool key="EncodedWithXMLCoder">YES</bool>
             <object class="NSArray" key="dict.sortedKeys">
@@ -9809,6 +9839,7 @@
               <string>o_mi_sort_author</string>
               <string>o_mi_sort_name</string>
               <string>o_mm_mi_revealInFinder</string>
+              <string>o_outline_view</string>
               <string>o_playlist_header</string>
               <string>o_playlist_view</string>
               <string>o_playlist_wizard</string>
@@ -9834,6 +9865,7 @@
               <string>id</string>
               <string>id</string>
               <string>id</string>
+              <string>VLCPlaylistView</string>
               <string>id</string>
               <string>id</string>
               <string>id</string>
@@ -9862,6 +9894,7 @@
               <string>o_mi_sort_author</string>
               <string>o_mi_sort_name</string>
               <string>o_mm_mi_revealInFinder</string>
+              <string>o_outline_view</string>
               <string>o_playlist_header</string>
               <string>o_playlist_view</string>
               <string>o_playlist_wizard</string>
@@ -9932,6 +9965,10 @@
                 <string key="name">o_mm_mi_revealInFinder</string>
                 <string key="candidateClassName">id</string>
               </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">o_outline_view</string>
+                <string key="candidateClassName">VLCPlaylistView</string>
+              </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_playlist_header</string>
                 <string key="candidateClassName">id</string>
@@ -9967,22 +10004,6 @@
             <string key="minorKey">../../../modules/gui/macosx/playlist.h</string>
           </object>
         </object>
-        <object class="IBPartialClassDescription">
-          <string key="className">VLCPlaylistCommon</string>
-          <string key="superclassName">NSObject</string>
-          <object class="NSMutableDictionary" key="outlets">
-            <string key="NS.key.0">o_outline_view</string>
-            <string key="NS.object.0">VLCPlaylistView</string>
-          </object>
-          <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-            <string key="NS.key.0">o_outline_view</string>
-            <object class="IBToOneOutletInfo" key="NS.object.0">
-              <string key="name">o_outline_view</string>
-              <string key="candidateClassName">VLCPlaylistView</string>
-            </object>
-          </object>
-          <reference key="sourceIdentifier" ref="669160037"/>
-        </object>
         <object class="IBPartialClassDescription">
           <string key="className">VLCPlaylistView</string>
           <string key="superclassName">NSOutlineView</string>

modules/gui/macosx/MainMenu.h

@@ -74,6 +74,7 @@
     IBOutlet NSMenuItem * o_mi_open_wizard;
     IBOutlet NSMenuItem * o_mi_convertandsave;
     IBOutlet NSMenuItem * o_mi_save_playlist;
+    IBOutlet NSMenuItem * o_mi_revealInFinder;
 
     IBOutlet NSMenu * o_mu_edit;
     IBOutlet NSMenuItem * o_mi_cut;
@@ -246,6 +247,8 @@
 - (IBAction)intfOpenNet:(id)sender;
 - (IBAction)intfOpenCapture:(id)sender;
 - (IBAction)savePlaylist:(id)sender;
+- (IBAction)revealItemInFinder:(id)sender;
+- (void)setCanRevealInFinder:(BOOL)b_value;
 
 - (IBAction)toggleEffectsButton:(id)sender;
 - (IBAction)toggleJumpButtons:(id)sender;

modules/gui/macosx/MainMenu.m

@@ -371,6 +371,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
     [o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")];
     [o_mi_convertandsave setTitle: _NS("Convert / Stream...")];
     [o_mi_save_playlist setTitle: _NS("Save Playlist...")];
+    [o_mi_revealInFinder setTitle: _NS("Reveal in Finder")];
+    [[o_mi_revealInFinder menu] setAutoenablesItems: NO];
 
     [o_mu_edit setTitle: _NS("Edit")];
     [o_mi_cut setTitle: _NS("Cut")];
@@ -1130,6 +1132,16 @@ static VLCMainMenu *_o_sharedInstance = nil;
     [[[VLCMain sharedInstance] playlist] savePlaylist:sender];
 }
 
+- (IBAction)revealItemInFinder:(id)sender
+{
+    [[[VLCMain sharedInstance] playlist] revealItemInFinder:sender];
+}
+
+- (void)setCanRevealInFinder:(BOOL)b_value
+{
+    [o_mi_revealInFinder setEnabled:b_value];
+}
+
 - (IBAction)showConvertAndSave:(id)sender
 {
     if (o_convertandsave == nil)

modules/gui/macosx/playlist.h

@@ -94,7 +94,6 @@
     IBOutlet id o_mi_info;
     IBOutlet id o_mi_preparse;
     IBOutlet id o_mi_revealInFinder;
-    IBOutlet id o_mm_mi_revealInFinder;
     IBOutlet id o_mi_dl_cover_art;
     IBOutlet id o_mi_selectall;
     IBOutlet id o_mi_sort_name;

modules/gui/macosx/playlist.m

@@ -587,8 +587,6 @@
     [o_mi_dl_cover_art setTitle: _NS("Download Cover Art")];
     [o_mi_preparse setTitle: _NS("Fetch Meta Data")];
     [o_mi_revealInFinder setTitle: _NS("Reveal in Finder")];
-    [o_mm_mi_revealInFinder setTitle: _NS("Reveal in Finder")];
-    [[o_mm_mi_revealInFinder menu] setAutoenablesItems: NO];
     [o_mi_sort_name setTitle: _NS("Sort Node by Name")];
     [o_mi_sort_author setTitle: _NS("Sort Node by Author")];
 
@@ -626,7 +624,7 @@
         char *psz_uri = input_item_GetURI(p_item->p_input);
 
         [o_mi_revealInFinder setEnabled: NO];
-        [o_mm_mi_revealInFinder setEnabled: NO];
+        [[[VLCMain sharedInstance] mainMenu] setCanRevealInFinder: NO];
         if (psz_uri) {
             o_mrl = [NSMutableString stringWithUTF8String: psz_uri];
 
@@ -637,7 +635,7 @@
 
             if ([o_mrl characterAtIndex:0] == '/') {
                 [o_mi_revealInFinder setEnabled: YES];
-                [o_mm_mi_revealInFinder setEnabled: YES];
+                [[[VLCMain sharedInstance] mainMenu] setCanRevealInFinder: YES];
             }
             free(psz_uri);
         }