Commit fe36eed7 authored by Vibhoothi's avatar Vibhoothi

macosx: Implement basic LibraryView

This is very first stage implementation of libraryView,here its using hardcoded images
parent 66462fdb
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment identifier="macosx"/> <deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/>
<rect key="contentRect" x="53" y="419" width="716" height="333"/> <rect key="contentRect" x="53" y="419" width="716" height="333"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1178"/> <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
<view key="contentView" id="2"> <view key="contentView" id="2">
<rect key="frame" x="0.0" y="0.0" width="716" height="333"/> <rect key="frame" x="0.0" y="0.0" width="716" height="333"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<collectionView id="9My-dJ-ffm"> <collectionView id="9My-dJ-ffm">
<rect key="frame" x="0.0" y="0.0" width="714" height="158"/> <rect key="frame" x="0.0" y="0.0" width="714" height="295"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
<color key="primaryBackgroundColor" name="systemGreenColor" catalog="System" colorSpace="catalog"/> <color key="primaryBackgroundColor" red="0.58105844259999995" green="0.12855249639999999" blue="0.57453137639999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections> <connections>
<outlet property="itemPrototype" destination="jCi-fI-3Z2" id="hDE-WR-6dZ"/> <outlet property="itemPrototype" destination="jCi-fI-3Z2" id="hDE-WR-6dZ"/>
</connections> </connections>
...@@ -406,15 +406,7 @@ ...@@ -406,15 +406,7 @@
<outlet property="volumeUpButton" destination="3652" id="vXR-KC-L2N"/> <outlet property="volumeUpButton" destination="3652" id="vXR-KC-L2N"/>
</connections> </connections>
</customObject> </customObject>
<collectionViewItem id="jCi-fI-3Z2"> <collectionViewItem id="jCi-fI-3Z2"/>
<connections>
<outlet property="view" destination="LL0-re-ZbQ" id="mmD-XP-2Sr"/>
</connections>
</collectionViewItem>
<view id="LL0-re-ZbQ">
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
<autoresizingMask key="autoresizingMask"/>
</view>
</objects> </objects>
<resources> <resources>
<image name="backward-6btns" width="28" height="23"/> <image name="backward-6btns" width="28" height="23"/>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#import "VLCVideoWindowCommon.h" #import "VLCVideoWindowCommon.h"
#import "misc.h" #import "misc.h"
#import "VLCFSPanelController.h" #import "VLCFSPanelController.h"
#import "VLCMainWindowCollectionViewItem.h"
@class VLCDetachedVideoWindow; @class VLCDetachedVideoWindow;
@class VLCMainWindowControlsBar; @class VLCMainWindowControlsBar;
...@@ -49,10 +50,12 @@ typedef enum { ...@@ -49,10 +50,12 @@ typedef enum {
@property (readonly) BOOL nativeFullscreenMode; @property (readonly) BOOL nativeFullscreenMode;
@property (readwrite) BOOL nonembedded; @property (readwrite) BOOL nonembedded;
@property (assign) IBOutlet NSCollectionView *collectionView;
@property (strong) IBOutlet NSCollectionView *collectionView; @property (strong) VLCMainWindowCollectionViewItem *collectionViewItem;
@property (strong) NSArray *VLCContents;
@property (readonly) VLCFSPanelController* fspanel; @property (readonly) VLCFSPanelController* fspanel;
@property (nonatomic, copy) NSDictionary *overrideClassNames;
- (void)changePlaylistState:(VLCPlaylistStateEvent)event; - (void)changePlaylistState:(VLCPlaylistStateEvent)event;
......
...@@ -132,6 +132,10 @@ static const float f_min_window_height = 307.; ...@@ -132,6 +132,10 @@ static const float f_min_window_height = 307.;
/* update fs button to reflect state for next startup */ /* update fs button to reflect state for next startup */
if (var_InheritBool(pl_Get(getIntf()), "fullscreen")) if (var_InheritBool(pl_Get(getIntf()), "fullscreen"))
[self.controlsBar setFullscreenState:YES]; [self.controlsBar setFullscreenState:YES];
/* Make collectionview visible when Player loads */
[self makeCollectionViewVisible];
} }
#pragma mark - key and event handling #pragma mark - key and event handling
...@@ -206,6 +210,33 @@ static const float f_min_window_height = 307.; ...@@ -206,6 +210,33 @@ static const float f_min_window_height = 307.;
} }
[self makeFirstResponder:_collectionView]; [self makeFirstResponder:_collectionView];
self.collectionViewItem = [VLCMainWindowCollectionViewItem new];
self.VLCContents = @[
@{
@"itemImage":@"VLC"},
@{
@"itemImage":@"VLC"},
@{
@"itemImage":@"VLC"},
@{
@"itemImage":@"VLC"},
@{
@"itemImage":@"VLC"},
@{
@"itemImage":@"VLC"},
@{
@"itemImage":@"VLC"},
@{
@"itemImage":@"VLC"},
@{
@"itemImage":@"VLC"},
@{
@"itemImage":@"VLC"},
];
[self.collectionView setItemPrototype: self.collectionViewItem ];
[self.collectionView setContent: self.VLCContents];
} }
// Hides the collection view and makes the vout view in foreground // Hides the collection view and makes the vout view in foreground
......
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