Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
390d51af by Claudio Cambra at 2022-08-28T09:19:11+00:00
macosx: Add a year and duration label to the album supplementary view
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
3 changed files:
- modules/gui/macosx/UI/VLCLibraryCollectionViewAlbumSupplementaryDetailView.xib
-
modules/gui/macosx/library/VLCLibraryCollectionViewAlbumSupplementaryDetailView.h
-
modules/gui/macosx/library/VLCLibraryCollectionViewAlbumSupplementaryDetailView.m
Changes:
=====================================
modules/gui/macosx/UI/VLCLibraryCollectionViewAlbumSupplementaryDetailView.xib
=====================================
@@ -87,14 +87,37 @@
<color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField horizontalHuggingPriority="251"
verticalHuggingPriority="751" translatesAutoresizingMaskIntoConstraints="NO"
id="HnP-Fk-juB">
- <rect key="frame" x="-2" y="203"
width="87" height="16"/>
- <textFieldCell key="cell"
lineBreakMode="truncatingTail" title="Album details" id="Nwk-76-Wx9">
- <font key="font" metaFont="system"/>
- <color key="textColor"
name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
+ <customView
translatesAutoresizingMaskIntoConstraints="NO" id="SvO-zd-2zo">
+ <rect key="frame" x="0.0" y="203"
width="794" height="16"/>
+ <subviews>
+ <textField
horizontalHuggingPriority="251" verticalHuggingPriority="751"
translatesAutoresizingMaskIntoConstraints="NO" id="HnP-Fk-juB">
+ <rect key="frame" x="-2" y="0.0"
width="87" height="16"/>
+ <textFieldCell key="cell"
lineBreakMode="truncatingTail" title="Album details" id="Nwk-76-Wx9">
+ <font key="font"
metaFont="system"/>
+ <color key="textColor"
name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField
horizontalHuggingPriority="251" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="QuO-3G-BMT">
+ <rect key="frame" x="687" y="0.0"
width="94" height="16"/>
+ <textFieldCell key="cell"
lineBreakMode="clipping" title="Year · Duration" id="JBg-wo-ZeE">
+ <font key="font"
metaFont="system"/>
+ <color key="textColor"
name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstItem="QuO-3G-BMT"
firstAttribute="top" relation="greaterThanOrEqual" secondItem="SvO-zd-2zo"
secondAttribute="top" id="Fdn-jn-Iaj"/>
+ <constraint firstAttribute="bottom"
secondItem="HnP-Fk-juB" secondAttribute="bottom" id="ImH-Vf-Khl"/>
+ <constraint firstItem="HnP-Fk-juB"
firstAttribute="top" secondItem="SvO-zd-2zo" secondAttribute="top"
id="OUS-PH-e6K"/>
+ <constraint firstItem="QuO-3G-BMT"
firstAttribute="centerY" secondItem="HnP-Fk-juB" secondAttribute="centerY"
id="Som-Jr-qAy"/>
+ <constraint firstAttribute="bottom"
relation="greaterThanOrEqual" secondItem="QuO-3G-BMT" secondAttribute="bottom"
id="UDs-9f-Og5"/>
+ <constraint firstItem="HnP-Fk-juB"
firstAttribute="leading" secondItem="SvO-zd-2zo" secondAttribute="leading"
id="Uuo-gf-FxL"/>
+ <constraint firstAttribute="trailing"
secondItem="QuO-3G-BMT" secondAttribute="trailing" constant="15"
id="Wfo-47-OGd"/>
+ <constraint firstItem="QuO-3G-BMT"
firstAttribute="leading" relation="greaterThanOrEqual" secondItem="HnP-Fk-juB"
secondAttribute="trailing" constant="5" id="aD2-Ry-CuA"/>
+ </constraints>
+ </customView>
<scrollView borderType="none"
autohidesScrollers="YES" horizontalLineScroll="52" horizontalPageScroll="10"
verticalLineScroll="52" verticalPageScroll="10" hasHorizontalScroller="NO"
usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none"
id="9ZS-oy-iP9">
<rect key="frame" x="0.0" y="0.0"
width="701" height="198"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES"/>
@@ -144,6 +167,10 @@
</scroller>
</scrollView>
</subviews>
+ <constraints>
+ <constraint firstItem="SvO-zd-2zo"
firstAttribute="leading" secondItem="nCe-dY-YMM" secondAttribute="leading"
id="gSC-OW-Sld"/>
+ <constraint firstAttribute="trailing"
secondItem="SvO-zd-2zo" secondAttribute="trailing" id="hZf-vs-RlK"/>
+ </constraints>
<visibilityPriorities>
<integer value="1000"/>
<integer value="1000"/>
@@ -185,6 +212,7 @@
<outlet property="albumDetailsTextField"
destination="HnP-Fk-juB" id="Hm3-l8-a9s"/>
<outlet property="albumTitleTextField"
destination="nCe-dY-YMM" id="h3l-p0-w3e"/>
<outlet property="albumTracksTableView"
destination="eEJ-WA-0aM" id="l8k-M9-a8e"/>
+ <outlet property="albumYearAndDurationTextField"
destination="QuO-3G-BMT" id="y34-rD-uR"/>
<outlet property="playAlbumButton" destination="ntd-VT-2KS"
id="ah5-as-eqw"/>
</connections>
<point key="canvasLocation" x="-237.5" y="-284"/>
=====================================
modules/gui/macosx/library/VLCLibraryCollectionViewAlbumSupplementaryDetailView.h
=====================================
@@ -36,6 +36,7 @@ extern NSCollectionViewSupplementaryElementKind const
VLCLibraryCollectionViewAl
@property (readwrite, retain, nonatomic) VLCMediaLibraryAlbum
*representedAlbum;
@property (readwrite, weak) IBOutlet NSTextField *albumTitleTextField;
@property (readwrite, weak) IBOutlet NSTextField *albumDetailsTextField;
+@property (readwrite, weak) IBOutlet NSTextField
*albumYearAndDurationTextField;
@property (readwrite, weak) IBOutlet VLCImageView *albumArtworkImageView;
@property (readwrite, weak) IBOutlet NSTableView *albumTracksTableView;
@property (readwrite, weak) IBOutlet NSButton *playAlbumButton;
=====================================
modules/gui/macosx/library/VLCLibraryCollectionViewAlbumSupplementaryDetailView.m
=====================================
@@ -63,7 +63,7 @@ NSCollectionViewSupplementaryElementKind const
VLCLibraryCollectionViewAlbumSupp
_albumTracksTableView.rowHeight = VLCLibraryTracksRowHeight;
_albumTitleTextField.font = [NSFont
VLCLibrarySupplementaryDetailViewTitleFont];
- _albumDetailsTextField.font = [ NSFont
VLCLibrarySupplementaryDetailViewSubtitleFont];
+ _albumDetailsTextField.font = [NSFont
VLCLibrarySupplementaryDetailViewSubtitleFont];
_albumDetailsTextField.textColor = [NSColor VLCOrangeElementColor];
if(@available(macOS 10.12.2, *)) {
@@ -86,6 +86,7 @@ NSCollectionViewSupplementaryElementKind const
VLCLibraryCollectionViewAlbumSupp
_albumTitleTextField.stringValue = _representedAlbum.displayString;
_albumDetailsTextField.stringValue = _representedAlbum.artistName;
+ _albumYearAndDurationTextField.stringValue = [NSString
stringWithFormat:@"%u · %@", _representedAlbum.year,
_representedAlbum.durationString];
_albumArtworkImageView.image = _representedAlbum.smallArtworkImage;
_tracksDataSource.representedAlbum = _representedAlbum;
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/390d51af9c6ea4a648c1c701bc9191d953ea3d72
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/390d51af9c6ea4a648c1c701bc9191d953ea3d72
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
