Skip to content

Commit 8da9a84

Browse files
fkuehnejbkempf
authored andcommitted
macosx: add convinience menu item to add files to playlist (closes #13759)
1 parent 5a7b99d commit 8da9a84

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10102" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
33
<dependencies>
44
<deployment version="1070" identifier="macosx"/>
55
<development version="7000" identifier="xcode"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10102"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
77
</dependencies>
88
<objects>
99
<customObject id="-2" userLabel="File's Owner" customClass="VLCPlaylist">
1010
<connections>
11+
<outlet property="addFilesToPlaylistMenuItem" destination="lGc-nc-8Yq" id="joN-zx-w8u"/>
1112
<outlet property="deletePlaylistMenuItem" destination="13" id="Qwn-a7-On0"/>
1213
<outlet property="downloadCoverArtPlaylistMenuItem" destination="2" id="z0y-0U-uRz"/>
1314
<outlet property="infoPlaylistMenuItem" destination="9" id="uIr-Np-fpB"/>
@@ -84,6 +85,13 @@
8485
<action selector="revealItemInFinder:" target="-2" id="4WU-rm-69M"/>
8586
</connections>
8687
</menuItem>
88+
<menuItem isSeparatorItem="YES" id="sUF-9g-Rxq"/>
89+
<menuItem title="Add Files" id="lGc-nc-8Yq">
90+
<modifierMask key="keyEquivalentModifierMask"/>
91+
<connections>
92+
<action selector="addFilesToPlaylist:" target="-2" id="r6Z-KP-ovf"/>
93+
</connections>
94+
</menuItem>
8795
</items>
8896
</menu>
8997
</objects>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment version="1070" identifier="macosx"/>
55
<development version="7000" identifier="xcode"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
77
<capability name="box content view" minToolsVersion="7.0"/>
88
</dependencies>
99
<objects>

modules/gui/macosx/VLCPlaylist.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
@property (readwrite, weak) IBOutlet NSMenuItem *sortNamePlaylistMenuItem;
4141
@property (readwrite, weak) IBOutlet NSMenuItem *sortAuthorPlaylistMenuItem;
4242
@property (readwrite, weak) IBOutlet NSMenuItem *recursiveExpandPlaylistMenuItem;
43+
@property (readwrite, weak) IBOutlet NSMenuItem *addFilesToPlaylistMenuItem;
4344

4445
@property (nonatomic, readwrite, weak) VLCPlaylistView *outlineView;
4546
@property (nonatomic, readwrite, weak) NSTableHeaderView *playlistHeaderView;
@@ -68,6 +69,7 @@
6869
- (IBAction)sortNodeByAuthor:(id)sender;
6970
- (IBAction)recursiveExpandNode:(id)sender;
7071
- (IBAction)showInfoPanel:(id)sender;
72+
- (IBAction)addFilesToPlaylist:(id)sender;
7173

7274
- (NSArray *)draggedItems;
7375

modules/gui/macosx/VLCPlaylist.m

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#import "MainMenu.h"
4747
#import "VLCPlaylistInfo.h"
4848
#import "ResumeDialogController.h"
49+
#import "open.h"
4950

5051
#include <vlc_keys.h>
5152
#import <vlc_interface.h>
@@ -236,6 +237,7 @@ - (void)initStrings
236237
[_revealInFinderPlaylistMenuItem setTitle: _NS("Reveal in Finder")];
237238
[_sortNamePlaylistMenuItem setTitle: _NS("Sort Node by Name")];
238239
[_sortAuthorPlaylistMenuItem setTitle: _NS("Sort Node by Author")];
240+
[_addFilesToPlaylistMenuItem setTitle: _NS("Add File...")];
239241
}
240242

241243
- (void)playlistUpdated
@@ -394,6 +396,11 @@ - (IBAction)showInfoPanel:(id)sender
394396
[[[VLCMain sharedInstance] currentMediaInfoPanel] toggleWindow:sender];
395397
}
396398

399+
- (IBAction)addFilesToPlaylist:(id)sender
400+
{
401+
[[[VLCMain sharedInstance] open] openFile];
402+
}
403+
397404
- (IBAction)deleteItem:(id)sender
398405
{
399406
[_model deleteSelectedItem];

0 commit comments

Comments
 (0)