Commit e04568eb authored by Vibhoothi's avatar Vibhoothi

playQueue: Add new properties and initPlayQueueView

This commit links the collectionViewItem to the view and then in the mainWindow
added new function initPlayQueueView which will deal with initialising the
playQueue.
parent c6174654
......@@ -422,6 +422,7 @@ AAAAAAEGA
<outlet property="controlsBar" destination="5339" id="5624"/>
<outlet property="playQueueButton" destination="4bZ-fr-NwC" id="6Ba-p8-49J"/>
<outlet property="playQueuePopOver" destination="h7i-E8-l3p" id="fzM-Mg-RbQ"/>
<outlet property="playQueueView" destination="7NT-pn-kBf" id="hvI-jy-lHo"/>
<outlet property="topView" destination="MHl-Bi-RNm" id="VQW-Cp-YXw"/>
<outlet property="videoView" destination="4665" id="5622"/>
<outlet property="videoViewBottomConstraint" destination="ZVn-EJ-9CG" id="8F2-BP-yVS"/>
......@@ -517,7 +518,7 @@ AAAAAAEGA
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<collectionView ambiguous="YES" id="7NT-pn-kBf">
<rect key="frame" x="0.0" y="0.0" width="254" height="197"/>
<rect key="frame" x="0.0" y="0.0" width="254" height="214"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES"/>
<color key="primaryBackgroundColor" red="0.83137254901960789" green="0.84313725490196079" blue="0.85490196078431369" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
......@@ -528,11 +529,11 @@ AAAAAAEGA
<color key="backgroundColor" red="0.8944739232570198" green="0.91764705882352937" blue="0.89710036067083654" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="iGt-eN-2Ld">
<rect key="frame" x="1" y="144" width="233" height="15"/>
<rect key="frame" x="1" y="-15" width="0.0" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="Hb1-Fm-C8I">
<rect key="frame" x="234" y="1" width="15" height="143"/>
<rect key="frame" x="-15" y="1" width="16" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
......
......@@ -7,15 +7,45 @@
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VLCPlayQueue">
<connections>
<outlet property="playQueueImage" destination="Oy8-G8-wBS" id="Hzd-xV-Mq6"/>
<outlet property="playQueueTitle" destination="IBC-zS-6lz" id="1PU-6D-dxD"/>
<outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="Hz6-mo-xeY">
<rect key="frame" x="0.0" y="0.0" width="231" height="231"/>
<rect key="frame" x="0.0" y="0.0" width="231" height="120"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<point key="canvasLocation" x="14.5" y="148.5"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Oy8-G8-wBS">
<rect key="frame" x="20" y="29" width="66" height="61"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="VLC" id="IMu-Qb-py9"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IBC-zS-6lz">
<rect key="frame" x="110" y="73" width="103" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="videoName" id="f2f-qi-Bgz">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bv3-4c-ygu">
<rect key="frame" x="110" y="46" width="103" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="artistName" id="Dbo-hD-W6V">
<font key="font" metaFont="system" size="11"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
<point key="canvasLocation" x="14.5" y="93"/>
</customView>
</objects>
<resources>
<image name="VLC" width="512" height="512"/>
</resources>
</document>
......@@ -34,7 +34,7 @@
#import "misc.h"
#import "VLCFSPanelController.h"
#import "VLCLibraryView.h"
#import "VLCLibraryItem.h"
#import "VLCPlayQueue.h"
@class VLCDetachedVideoWindow;
@class VLCMainWindowControlsBar;
......@@ -52,6 +52,7 @@ typedef enum {
@property (readonly) BOOL nativeFullscreenMode;
@property (readwrite) BOOL nonembedded;
@property (weak) IBOutlet NSCollectionView *collectionView;
@property (weak) IBOutlet NSCollectionView *playQueueView;
@property (strong) VLCLibraryItem *dataModel;
@property (strong) NSMutableArray *dummyData;
@property (readonly) VLCFSPanelController* fspanel;
......
......@@ -379,7 +379,17 @@ static const float f_min_window_height = 307.;
}
}
#pragma mark playQueueView
- (void) initPlayQueueView
{
self.playQueueView.wantsLayer = YES;
self.playQueueView.delegate = self;
[self.playQueueView registerClass:[VLCPlayQueue class] forItemWithIdentifier:@"playQueueItems"];
NSCollectionViewFlowLayout *playQueueList = [[NSCollectionViewFlowLayout alloc] init];
playQueueList.itemSize = NSMakeSize( 231, 120);
// playQueueList.sectionInset
}
#pragma mark -
......
......@@ -24,6 +24,11 @@
#import <Cocoa/Cocoa.h>
@interface VLCPlayQueue : NSCollectionViewItem
@interface VLCPlayQueue : NSCollectionViewItem < NSCollectionViewDelegate>
//PlayQueue View
@property (nonatomic,strong) IBOutlet NSImageView *playQueueImage;
@property (strong) IBOutlet NSTextField *playQueueTitle;
@property (strong) IBOutlet NSTextField *playQueueArtistName;
@end
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