Commit f107c9de authored by Vibhoothi's avatar Vibhoothi

playQueue: Make future-ready

Initialised basic playQueue with collectionView
Changed the definitions of functions from VideoWindowCommon to MainWindow
Cleanup the XIBs
parent 3b5f85e7
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
<rect key="frame" x="0.0" y="293" width="716" height="40"/> <rect key="frame" x="0.0" y="293" width="716" height="40"/>
<subviews> <subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="MHl-Bi-RNm" userLabel="Sections"> <customView translatesAutoresizingMaskIntoConstraints="NO" id="MHl-Bi-RNm" userLabel="Sections">
<rect key="frame" x="0.0" y="-13" width="716" height="53"/> <rect key="frame" x="0.0" y="-24" width="716" height="64"/>
<subviews> <subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4bZ-fr-NwC"> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4bZ-fr-NwC">
<rect key="frame" x="666" y="15" width="40" height="32"/> <rect key="frame" x="671" y="22" width="29" height="32"/>
<buttonCell key="cell" type="push" bezelStyle="rounded" image="dropzone-background" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="l5S-is-aSf"> <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="playlist-1btn" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="l5S-is-aSf">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
</buttonCell> </buttonCell>
...@@ -486,11 +486,6 @@ AAAAAAEGA ...@@ -486,11 +486,6 @@ AAAAAAEGA
<rect key="frame" x="12" y="273" width="262" height="5"/> <rect key="frame" x="12" y="273" width="262" height="5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</box> </box>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4oF-e6-yUT">
<rect key="frame" x="229" y="284" width="37" height="29"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="effects-one-button" id="Z5d-YI-SwA"/>
</imageView>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ymV-Bt-6cp"> <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ymV-Bt-6cp">
<rect key="frame" x="12" y="2" width="27" height="32"/> <rect key="frame" x="12" y="2" width="27" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
...@@ -541,26 +536,25 @@ AAAAAAEGA ...@@ -541,26 +536,25 @@ AAAAAAEGA
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</scroller> </scroller>
</scrollView> </scrollView>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lmf-zd-tnX">
<rect key="frame" x="242" y="282" width="32" height="25"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="NSTouchBarExitFullScreenTemplate" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" id="hvB-NA-pI2">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
</subviews> </subviews>
<point key="canvasLocation" x="33" y="1331.5"/> <point key="canvasLocation" x="33" y="1331.5"/>
</customView> </customView>
<collectionViewItem id="24O-DU-off"> <collectionViewItem id="24O-DU-off"/>
<connections>
<outlet property="view" destination="cbW-vF-tDT" id="MXZ-ZE-6pE"/>
</connections>
</collectionViewItem>
<view id="cbW-vF-tDT">
<rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
<autoresizingMask key="autoresizingMask"/>
</view>
</objects> </objects>
<resources> <resources>
<image name="NSTouchBarExitFullScreenTemplate" width="18" height="30"/>
<image name="backward-6btns" width="28" height="23"/> <image name="backward-6btns" width="28" height="23"/>
<image name="backward-6btns-pressed" width="28" height="23"/> <image name="backward-6btns-pressed" width="28" height="23"/>
<image name="dropzone-background" width="4" height="4"/>
<image name="effects-double-buttons" width="29" height="23"/> <image name="effects-double-buttons" width="29" height="23"/>
<image name="effects-double-buttons-pressed" width="29" height="23"/> <image name="effects-double-buttons-pressed" width="29" height="23"/>
<image name="effects-one-button" width="29" height="23"/>
<image name="forward-6btns" width="28" height="23"/> <image name="forward-6btns" width="28" height="23"/>
<image name="forward-6btns-pressed" width="28" height="23"/> <image name="forward-6btns-pressed" width="28" height="23"/>
<image name="fullscreen-double-buttons" width="29" height="23"/> <image name="fullscreen-double-buttons" width="29" height="23"/>
...@@ -569,6 +563,7 @@ AAAAAAEGA ...@@ -569,6 +563,7 @@ AAAAAAEGA
<image name="next-6btns-pressed" width="29" height="23"/> <image name="next-6btns-pressed" width="29" height="23"/>
<image name="play" width="27" height="23"/> <image name="play" width="27" height="23"/>
<image name="play-pressed" width="27" height="23"/> <image name="play-pressed" width="27" height="23"/>
<image name="playlist-1btn" width="29" height="23"/>
<image name="playlist-btn" width="28" height="23"/> <image name="playlist-btn" width="28" height="23"/>
<image name="playlist-btn-pressed" width="28" height="23"/> <image name="playlist-btn-pressed" width="28" height="23"/>
<image name="previous-6btns" width="29" height="23"/> <image name="previous-6btns" width="29" height="23"/>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
<customObject id="-2" userLabel="File's Owner" customClass="VLCPlayQueue"> <customObject id="-2" userLabel="File's Owner" customClass="VLCPlayQueue">
...@@ -12,8 +13,9 @@ ...@@ -12,8 +13,9 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/> <customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="Hz6-mo-xeY"> <customView id="Hz6-mo-xeY">
<rect key="frame" x="0.0" y="0.0" width="480" height="272"/> <rect key="frame" x="0.0" y="0.0" width="231" height="231"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<point key="canvasLocation" x="14.5" y="148.5"/>
</customView> </customView>
</objects> </objects>
</document> </document>
...@@ -56,6 +56,9 @@ typedef enum { ...@@ -56,6 +56,9 @@ typedef enum {
@property (strong) NSMutableArray *dummyData; @property (strong) NSMutableArray *dummyData;
@property (readonly) VLCFSPanelController* fspanel; @property (readonly) VLCFSPanelController* fspanel;
@property (nonatomic, copy) NSDictionary *overrideClassNames; @property (nonatomic, copy) NSDictionary *overrideClassNames;
@property (nonatomic, weak) IBOutlet VLCTopBarView* topView;
@property (readwrite,strong) IBOutlet NSButton *playQueueButton;
@property (strong) IBOutlet NSPopover *playQueuePopOver;
......
...@@ -361,6 +361,27 @@ static const float f_min_window_height = 307.; ...@@ -361,6 +361,27 @@ static const float f_min_window_height = 307.;
return 1; return 1;
} }
#pragma mark - Play Queue
#pragma mark popOver Initialisation
- (BOOL)buttonIsPressed
{
return self.playQueueButton.intValue == 1;
}
- (IBAction)popOver:(id)sender {
NSLog(@"VLC: play-Queue tapped");
if (self.buttonIsPressed)
{
[self.playQueuePopOver showRelativeToRect:[self.playQueueButton bounds] ofView:self.playQueueButton preferredEdge:NSMaxYEdge];
} else {
[self.playQueuePopOver close];
}
}
#pragma mark - #pragma mark -
#pragma mark Playlist State toggle #pragma mark Playlist State toggle
- (void)changePlaylistState:(VLCPlaylistStateEvent)event - (void)changePlaylistState:(VLCPlaylistStateEvent)event
......
...@@ -42,9 +42,6 @@ static const float f_min_video_height = 70.0; ...@@ -42,9 +42,6 @@ static const float f_min_video_height = 70.0;
@property (weak) IBOutlet NSLayoutConstraint *videoViewBottomConstraint; @property (weak) IBOutlet NSLayoutConstraint *videoViewBottomConstraint;
@property (nonatomic, weak) IBOutlet VLCVoutView* videoView; @property (nonatomic, weak) IBOutlet VLCVoutView* videoView;
@property (nonatomic, weak) IBOutlet VLCTopBarView* topView;
@property (readwrite,strong) IBOutlet NSButton *playQueueButton;
@property (strong) IBOutlet NSPopover *playQueuePopOver;
@property (nonatomic, weak) IBOutlet VLCControlsBarCommon* controlsBar; @property (nonatomic, weak) IBOutlet VLCControlsBarCommon* controlsBar;
@property (readonly) BOOL inFullscreenTransition; @property (readonly) BOOL inFullscreenTransition;
@property (readonly) BOOL windowShouldExitFullscreenWhenFinished; @property (readonly) BOOL windowShouldExitFullscreenWhenFinished;
......
...@@ -520,23 +520,6 @@ ...@@ -520,23 +520,6 @@
[self setLevel:i_originalLevel]; [self setLevel:i_originalLevel];
} }
#pragma mark - popOver Initialisation
- (BOOL)buttonIsPressed
{
return self.playQueueButton.intValue == 1;
}
- (IBAction)popOver:(id)sender {
NSLog(@"VLC: play-Queue tapped");
if (self.buttonIsPressed)
{
[self.playQueuePopOver showRelativeToRect:[self.playQueueButton bounds] ofView:self.playQueueButton preferredEdge:NSMaxYEdge];
} else {
[self.playQueuePopOver close];
}
}
#pragma mark - #pragma mark -
#pragma mark Fullscreen Logic #pragma mark Fullscreen Logic
......
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