Commit c169acfa authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx/playlist: fix rendering and improve style

parent d4ec3a04
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#import <vlc_url.h> #import <vlc_url.h>
#import <vlc_strings.h> #import <vlc_strings.h>
#import <vlc_services_discovery.h> #import <vlc_services_discovery.h>
#import "PLModel.h"
#import "ControlsBar.h" #import "ControlsBar.h"
#import "VideoView.h" #import "VideoView.h"
...@@ -174,8 +175,6 @@ static VLCMainWindow *sharedInstance = nil; ...@@ -174,8 +175,6 @@ static VLCMainWindow *sharedInstance = nil;
VLCPlaylist *playlist = [[VLCMain sharedInstance] playlist]; VLCPlaylist *playlist = [[VLCMain sharedInstance] playlist];
playlist.outlineView = o_outline_view; playlist.outlineView = o_outline_view;
playlist.playlistHeaderView = [o_outline_view headerView]; playlist.playlistHeaderView = [o_outline_view headerView];
[o_outline_view setDelegate:playlist];
[o_outline_view setDataSource:playlist];
[o_dropzone_btn setTitle: _NS("Open media...")]; [o_dropzone_btn setTitle: _NS("Open media...")];
[[o_dropzone_btn cell] accessibilitySetOverrideValue:_NS("Click to open an advanced dialog to select the media to play. You can also drop files here to play.") forAttribute:NSAccessibilityDescriptionAttribute]; [[o_dropzone_btn cell] accessibilitySetOverrideValue:_NS("Click to open an advanced dialog to select the media to play. You can also drop files here to play.") forAttribute:NSAccessibilityDescriptionAttribute];
...@@ -1132,7 +1131,6 @@ static VLCMainWindow *sharedInstance = nil; ...@@ -1132,7 +1131,6 @@ static VLCMainWindow *sharedInstance = nil;
if ([[item identifier] isEqualToString:@"playlist"]) { if ([[item identifier] isEqualToString:@"playlist"]) {
PL_LOCK; PL_LOCK;
[[[[VLCMain sharedInstance] playlist] model] changeRootItem:p_playlist->p_playing]; [[[[VLCMain sharedInstance] playlist] model] changeRootItem:p_playlist->p_playing];
PL_UNLOCK; PL_UNLOCK;
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
- (id)initWithOutlineView:(NSOutlineView *)outlineView playlist:(playlist_t *)pl rootItem:(playlist_item_t *)root playlistObject:(id)plObj; - (id)initWithOutlineView:(NSOutlineView *)outlineView playlist:(playlist_t *)pl rootItem:(playlist_item_t *)root playlistObject:(id)plObj;
{ {
self = [super init]; self = [super init];
if(self) { if (self) {
p_playlist = pl; p_playlist = pl;
_outlineView = outlineView; _outlineView = outlineView;
_playlist = plObj; _playlist = plObj;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/***************************************************************************** /*****************************************************************************
* VLCPlaylist interface * VLCPlaylist interface
*****************************************************************************/ *****************************************************************************/
@interface VLCPlaylist : NSObject<NSOutlineViewDataSource, NSOutlineViewDelegate> @interface VLCPlaylist : NSObject<NSOutlineViewDelegate>
@property (readwrite, weak) IBOutlet NSMenu *playlistMenu; @property (readwrite, weak) IBOutlet NSMenu *playlistMenu;
@property (readwrite, weak) IBOutlet NSMenuItem *playPlaylistMenuItem; @property (readwrite, weak) IBOutlet NSMenuItem *playPlaylistMenuItem;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment