[vlc-commits] [Git][videolan/vlc][master] 21 commits: macosx: Remove unused VLCLibraryButtonFont
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Tue May 9 17:14:05 UTC 2023
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
b2d13b1f by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Remove unused VLCLibraryButtonFont
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
1dc1f907 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Use bolding and heavier weight fonts less extensively, particularly for things that are not a priority in the UI
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
b1726198 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Add VLCLibrarySubsection header fonts
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
de5504a1 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Use subsection header fonts for VLCLibraryAlbumTableCellView
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
7ca59d11 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Do not do double import of same header in VLCMediaSourceCollectionViewItem
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
7e0f392e by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Adjust VLCMediaSourceDeviceCollectionViewItem title tect view font just like VLCMediaSourceCollectionViewItem
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
f399793f by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Remove VLCLibrarySupplementaryDetailViewTitleFont, replace use with VLCLibrarySubsectionHeaderFont
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
f352973f by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Adjust font sizing and visibility on VLCLibraryAlbumTableCellView XIB
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
adjust album table cv
- - - - -
73a70e81 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Make VLCPlaylistTableCellView time text view less difficult to see
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
968c379b by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Remove large vs small custom sizing for table cell views, use default system font
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
7bb59032 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Remove unused highlight cell fonts
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
81941f8f by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Use proper stack view for text fields in VLCPlaylistTableCellView rather than janky hard-coded positioning, fixing spacing
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
b1633eda by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Use standard font sizing for playlist table cell view items
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
59d117d6 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Replace VLCLibraryCellAnnotationFont in favour of normal bold font
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
6701d75a by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Use normal font sizing and regular fonts in collection view item XIBs
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
b1ea3a04 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Use proper stack view for text fields in VLCPlaylistTableCellView rather than janky hard-coded positioning
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
01cf8022 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Put lower limits on bounds of collection view item sizes
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
7f0bd72a by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Use default font sizing for subheadings
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
704f8b53 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Debolden time fields, do not enforce universal style on them in control bars
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
ddecbce7 by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Adjust sizing of library song table cell views, fix cutting-off of text
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
38a99dfc by Claudio Cambra at 2023-05-09T15:43:36+00:00
macosx: Remove large text setting
Signed-off-by: Claudio Cambra <developer at claudiocambra.com>
- - - - -
23 changed files:
- modules/gui/macosx/UI/VLCLibraryAlbumTableCellView.xib
- modules/gui/macosx/UI/VLCLibraryCollectionViewItem.xib
- modules/gui/macosx/UI/VLCLibraryTableCellView.xib
- modules/gui/macosx/UI/VLCLibraryWindow.xib
- modules/gui/macosx/UI/VLCMediaSourceCollectionViewItem.xib
- modules/gui/macosx/UI/VLCMediaSourceDeviceCollectionViewItem.xib
- modules/gui/macosx/UI/VLCPlaylistTableCellView.xib
- modules/gui/macosx/extensions/NSFont+VLCAdditions.h
- modules/gui/macosx/extensions/NSFont+VLCAdditions.m
- modules/gui/macosx/library/VLCLibraryCollectionViewItem.m
- modules/gui/macosx/library/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m
- modules/gui/macosx/library/VLCLibraryTableCellView.m
- modules/gui/macosx/library/VLCLibraryUIUnits.m
- modules/gui/macosx/library/VLCLibraryWindow.m
- modules/gui/macosx/library/audio-library/VLCLibraryAlbumTableCellView.m
- modules/gui/macosx/library/audio-library/VLCLibraryCollectionViewAlbumSupplementaryDetailView.m
- modules/gui/macosx/library/audio-library/VLCLibraryCollectionViewAudioGroupSupplementaryDetailView.m
- modules/gui/macosx/library/media-source/VLCMediaSourceCollectionViewItem.m
- modules/gui/macosx/library/media-source/VLCMediaSourceDeviceCollectionViewItem.m
- modules/gui/macosx/main/macosx.m
- modules/gui/macosx/playlist/VLCPlaylistTableCellView.m
- modules/gui/macosx/preferences/VLCSimplePrefsController.m
- modules/gui/macosx/windows/mainwindow/VLCControlsBarCommon.m
Changes:
=====================================
modules/gui/macosx/UI/VLCLibraryAlbumTableCellView.xib
=====================================
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
+ <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -16,29 +17,29 @@
<rect key="frame" x="0.0" y="0.0" width="640" height="450"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lyR-U9-HKd">
- <rect key="frame" x="18" y="279" width="108" height="16"/>
+ <rect key="frame" x="18" y="283" width="108" height="14"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Year" id="7gz-CN-9ab">
<numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="O17-O0-cUq">
<real key="minimum" value="0.0"/>
</numberFormatter>
- <font key="font" usesAppearanceFont="YES"/>
- <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="smallSystem"/>
+ <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dd9-b1-XEf">
- <rect key="frame" x="18" y="300" width="108" height="16"/>
+ <rect key="frame" x="18" y="302" width="108" height="14"/>
<textFieldCell key="cell" title="Summary" id="sx3-rr-j2L">
- <font key="font" usesAppearanceFont="YES"/>
- <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="smallSystem"/>
+ <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="U23-gv-Pf6">
- <rect key="frame" x="142" y="393" width="74" height="16"/>
+ <rect key="frame" x="142" y="386" width="86" height="19"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Artist name" id="3Ae-qv-Wyy">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemMedium" size="15"/>
+ <color key="textColor" name="VLCAccentColor"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -50,9 +51,9 @@
</constraints>
</customView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xJW-ps-ycn">
- <rect key="frame" x="142" y="414" width="80" height="16"/>
+ <rect key="frame" x="142" y="410" width="104" height="20"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Album name" id="aCe-ia-0Ww">
- <font key="font" usesAppearanceFont="YES"/>
+ <font key="font" metaFont="systemSemibold" size="17"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -109,5 +110,8 @@
</objects>
<resources>
<image name="libraryPlay" width="64" height="64"/>
+ <namedColor name="VLCAccentColor">
+ <color red="1" green="0.37999999523162842" blue="0.039999999105930328" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </namedColor>
</resources>
</document>
=====================================
modules/gui/macosx/UI/VLCLibraryCollectionViewItem.xib
=====================================
@@ -72,15 +72,15 @@
<color key="borderColor" red="1" green="0.38123786450000002" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</box>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OBS-Eh-1mT">
- <rect key="frame" x="-2" y="23" width="52" height="24"/>
+ <rect key="frame" x="-2" y="31" width="37" height="16"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" usesSingleLineMode="YES" id="7Hy-o3-LvX">
- <font key="font" metaFont="system" size="20"/>
+ <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" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="u2r-zy-XEW">
- <rect key="frame" x="180" y="2" width="34" height="16"/>
+ <rect key="frame" x="180" y="11" width="34" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="NEW" id="NeT-5U-eZn">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -102,9 +102,9 @@
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VAn-gF-QiZ">
- <rect key="frame" x="-2" y="0.0" width="42" height="19"/>
+ <rect key="frame" x="-2" y="11" width="37" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="LSS-jh-llZ">
- <font key="font" metaFont="system" size="15"/>
+ <font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
=====================================
modules/gui/macosx/UI/VLCLibraryTableCellView.xib
=====================================
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -15,41 +15,61 @@
<customView translatesAutoresizingMaskIntoConstraints="NO" id="ffE-px-l0g" customClass="VLCTrackingView">
<rect key="frame" x="0.0" y="0.0" width="398" height="71"/>
</customView>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ohB-P0-nCv">
- <rect key="frame" x="76" y="28" width="321" height="16"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="ZPw-XO-XD1">
- <font key="font" usesAppearanceFont="YES"/>
- <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="xJW-ps-ycn">
- <rect key="frame" x="76" y="39" width="321" height="16"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="aCe-ia-0Ww">
- <font key="font" usesAppearanceFont="YES"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9U4-xB-uBz">
- <rect key="frame" x="68" y="35" width="163" height="2"/>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ydb-7n-5Cd" customClass="VLCImageView">
+ <rect key="frame" x="5" y="5" width="61" height="61"/>
<constraints>
- <constraint firstAttribute="height" constant="2" id="504-lb-qgN"/>
- <constraint firstAttribute="width" constant="163" id="7H6-lL-hAs"/>
+ <constraint firstAttribute="width" secondItem="Ydb-7n-5Cd" secondAttribute="height" multiplier="1:1" id="4aB-rs-m22"/>
</constraints>
</customView>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TPv-k2-6XS">
- <rect key="frame" x="76" y="17" width="321" height="16"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="jZ4-pa-K3T">
- <font key="font" usesAppearanceFont="YES"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ydb-7n-5Cd" customClass="VLCImageView">
- <rect key="frame" x="3" y="3" width="65" height="65"/>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2yt-Ph-v3B">
+ <rect key="frame" x="76" y="7" width="312" height="58"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xJW-ps-ycn">
+ <rect key="frame" x="-2" y="42" width="316" height="16"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="aCe-ia-0Ww">
+ <font key="font" usesAppearanceFont="YES"/>
+ <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="ohB-P0-nCv">
+ <rect key="frame" x="-2" y="21" width="316" height="16"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="ZPw-XO-XD1">
+ <font key="font" usesAppearanceFont="YES"/>
+ <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="TPv-k2-6XS">
+ <rect key="frame" x="-2" y="0.0" width="316" height="16"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="jZ4-pa-K3T">
+ <font key="font" usesAppearanceFont="YES"/>
+ <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
<constraints>
- <constraint firstAttribute="width" secondItem="Ydb-7n-5Cd" secondAttribute="height" multiplier="1:1" id="4aB-rs-m22"/>
+ <constraint firstAttribute="trailing" secondItem="TPv-k2-6XS" secondAttribute="trailing" id="8tz-sY-cnw"/>
+ <constraint firstAttribute="trailing" secondItem="xJW-ps-ycn" secondAttribute="trailing" id="Gjm-2a-BoV"/>
+ <constraint firstAttribute="trailing" secondItem="ohB-P0-nCv" secondAttribute="trailing" id="v0L-6o-dhM"/>
+ </constraints>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9U4-xB-uBz">
+ <rect key="frame" x="66" y="35" width="163" height="2"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="2" id="504-lb-qgN"/>
+ <constraint firstAttribute="width" constant="163" id="7H6-lL-hAs"/>
</constraints>
</customView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NFZ-x0-t5c">
@@ -67,24 +87,18 @@
<constraints>
<constraint firstItem="NFZ-x0-t5c" firstAttribute="centerX" secondItem="Ydb-7n-5Cd" secondAttribute="centerX" id="0Eb-LH-6nF"/>
<constraint firstItem="9U4-xB-uBz" firstAttribute="leading" secondItem="Ydb-7n-5Cd" secondAttribute="trailing" id="2hg-4x-fvu"/>
- <constraint firstItem="ohB-P0-nCv" firstAttribute="leading" secondItem="Ydb-7n-5Cd" secondAttribute="trailing" constant="10" id="3wD-FP-vka"/>
- <constraint firstItem="TPv-k2-6XS" firstAttribute="leading" secondItem="ohB-P0-nCv" secondAttribute="leading" id="4qb-9H-TVg"/>
- <constraint firstItem="Ydb-7n-5Cd" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="3" id="8hv-Qt-uAI"/>
+ <constraint firstItem="Ydb-7n-5Cd" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="5" id="8hv-Qt-uAI"/>
<constraint firstItem="9U4-xB-uBz" firstAttribute="centerY" secondItem="Ydb-7n-5Cd" secondAttribute="centerY" id="BrT-ZR-zAc"/>
- <constraint firstAttribute="trailing" secondItem="xJW-ps-ycn" secondAttribute="trailing" constant="3" id="DYW-KQ-pre"/>
- <constraint firstItem="xJW-ps-ycn" firstAttribute="leading" secondItem="ohB-P0-nCv" secondAttribute="leading" id="DYk-9g-adD"/>
<constraint firstItem="ffE-px-l0g" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="EMs-It-nUH"/>
<constraint firstAttribute="bottom" secondItem="ffE-px-l0g" secondAttribute="bottom" id="I7D-8N-oA1"/>
<constraint firstItem="ffE-px-l0g" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="M01-2i-CLZ"/>
- <constraint firstAttribute="trailing" secondItem="TPv-k2-6XS" secondAttribute="trailing" constant="3" id="PQV-7d-ldF"/>
- <constraint firstAttribute="trailing" secondItem="ohB-P0-nCv" secondAttribute="trailing" constant="3" id="Sm0-L4-7aP"/>
- <constraint firstAttribute="bottom" secondItem="Ydb-7n-5Cd" secondAttribute="bottom" constant="3" id="aVd-Ld-lUH"/>
- <constraint firstItem="TPv-k2-6XS" firstAttribute="top" secondItem="9U4-xB-uBz" secondAttribute="bottom" constant="2" id="bpM-Qh-hOY"/>
+ <constraint firstItem="2yt-Ph-v3B" firstAttribute="centerY" secondItem="ffE-px-l0g" secondAttribute="centerY" id="Xsk-fe-nEI"/>
+ <constraint firstAttribute="bottom" secondItem="Ydb-7n-5Cd" secondAttribute="bottom" constant="5" id="aVd-Ld-lUH"/>
<constraint firstItem="NFZ-x0-t5c" firstAttribute="centerY" secondItem="Ydb-7n-5Cd" secondAttribute="centerY" id="dRw-WH-Y00"/>
- <constraint firstItem="Ydb-7n-5Cd" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="3" id="iPZ-zR-jTv"/>
+ <constraint firstItem="Ydb-7n-5Cd" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="5" id="iPZ-zR-jTv"/>
<constraint firstAttribute="trailing" secondItem="ffE-px-l0g" secondAttribute="trailing" id="m4c-HB-V5e"/>
- <constraint firstItem="ohB-P0-nCv" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="mGo-gc-dR6"/>
- <constraint firstItem="9U4-xB-uBz" firstAttribute="top" secondItem="xJW-ps-ycn" secondAttribute="bottom" constant="2" id="tbV-d6-umL"/>
+ <constraint firstItem="2yt-Ph-v3B" firstAttribute="leading" secondItem="Ydb-7n-5Cd" secondAttribute="trailing" constant="10" id="svv-3z-IWh"/>
+ <constraint firstAttribute="trailing" secondItem="2yt-Ph-v3B" secondAttribute="trailing" constant="10" id="uti-Wq-BEz"/>
</constraints>
<connections>
<outlet property="playInstantlyButton" destination="NFZ-x0-t5c" id="suD-1u-UrY"/>
=====================================
modules/gui/macosx/UI/VLCLibraryWindow.xib
=====================================
@@ -394,8 +394,8 @@
<constraint firstAttribute="width" constant="40" id="Rox-Cf-MSz"/>
</constraints>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="00:00" id="q8L-S3-Ylc">
- <font key="font" metaFont="systemSemibold" size="10"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="miniSystem"/>
+ <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -434,8 +434,8 @@
<constraint firstAttribute="width" constant="48" id="mAg-xF-yHo"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" state="on" alignment="left" title="-00:00" id="adD-oG-KsD">
- <font key="font" metaFont="systemSemibold" size="10"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="miniSystem"/>
+ <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -831,14 +831,14 @@
<scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GUe-Sd-j2l">
<rect key="frame" x="0.0" y="0.0" width="869" height="808"/>
<clipView key="contentView" id="mqU-ND-NId">
- <rect key="frame" x="1" y="1" width="852" height="806"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <rect key="frame" x="1" y="1" width="867" height="806"/>
+ <autoresizingMask key="autoresizingMask"/>
<subviews>
<view translatesAutoresizingMaskIntoConstraints="NO" id="fxG-zK-eLG">
- <rect key="frame" x="0.0" y="806" width="836" height="0.0"/>
+ <rect key="frame" x="0.0" y="806" width="851" height="0.0"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="y8S-p5-jaq">
- <rect key="frame" x="0.0" y="0.0" width="836" height="0.0"/>
+ <rect key="frame" x="0.0" y="0.0" width="851" height="0.0"/>
</stackView>
</subviews>
<constraints>
@@ -1374,16 +1374,16 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
- <scrollView autohidesScrollers="YES" horizontalLineScroll="17" horizontalPageScroll="10" verticalLineScroll="17" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QqV-hX-sZw">
+ <scrollView autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QqV-hX-sZw">
<rect key="frame" x="0.0" y="0.0" width="714" height="358"/>
<clipView key="contentView" id="D1c-vg-zeA">
- <rect key="frame" x="1" y="1" width="712" height="341"/>
+ <rect key="frame" x="1" y="1" width="712" height="356"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView identifier="VLCLibrarySongsTableViewIdentifier" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" rowSizeStyle="automatic" headerView="LR0-xA-UlZ" viewBased="YES" id="Xck-iv-pH4" customClass="VLCLibraryTableView">
- <rect key="frame" x="0.0" y="0.0" width="1125" height="313"/>
+ <rect key="frame" x="0.0" y="0.0" width="1125" height="328"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <size key="intercellSpacing" width="17" height="0.0"/>
+ <size key="intercellSpacing" width="17" height="5"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
@@ -1400,7 +1400,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="VLCLibrarySongsTableViewSongPlayingTableCellViewIdentifier" id="IOs-it-7Fy" customClass="VLCLibrarySongsTableViewSongPlayingTableCellView">
- <rect key="frame" x="8" y="0.0" width="18" height="17"/>
+ <rect key="frame" x="8" y="2" width="18" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MSe-hS-04C">
@@ -1432,11 +1432,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="VLCLibrarySongsTableViewTitleTableCellViewIdentifier" id="SZw-Fr-2EA">
- <rect key="frame" x="43" y="0.0" width="300" height="24"/>
+ <rect key="frame" x="43" y="2" width="300" height="26"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zai-EE-AIZ">
- <rect key="frame" x="0.0" y="4" width="300" height="16"/>
+ <rect key="frame" x="0.0" y="5" width="300" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="y7s-2M-iio">
<font key="font" usesAppearanceFont="YES"/>
@@ -1464,11 +1464,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="VLCLibrarySongsTableViewDurationTableCellViewIdentifier" id="w9x-WQ-1Zs">
- <rect key="frame" x="360" y="0.0" width="60" height="24"/>
+ <rect key="frame" x="360" y="2" width="60" height="24"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wYt-1l-VHr">
- <rect key="frame" x="0.0" y="4" width="60" height="16"/>
+ <rect key="frame" x="0.0" y="4" width="60" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="0z5-xP-p2I">
<font key="font" usesAppearanceFont="YES"/>
@@ -1496,11 +1496,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="VLCLibrarySongsTableViewArtistTableCellViewIdentifier" id="ecm-4Q-BHD">
- <rect key="frame" x="437" y="0.0" width="150" height="17"/>
+ <rect key="frame" x="437" y="2" width="150" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LpX-Ty-dhy">
- <rect key="frame" x="0.0" y="0.0" width="150" height="16"/>
+ <rect key="frame" x="0.0" y="0.0" width="150" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Sox-k5-8GV">
<font key="font" usesAppearanceFont="YES"/>
@@ -1528,11 +1528,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="VLCLibrarySongsTableViewAlbumTableCellViewIdentifier" id="aMg-rT-0RL">
- <rect key="frame" x="604" y="0.0" width="200" height="17"/>
+ <rect key="frame" x="604" y="2" width="200" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PbF-Bm-f34">
- <rect key="frame" x="0.0" y="0.0" width="200" height="16"/>
+ <rect key="frame" x="0.0" y="0.0" width="200" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="as7-Ec-3tU">
<font key="font" usesAppearanceFont="YES"/>
@@ -1560,11 +1560,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="VLCLibrarySongsTableViewGenreTableCellViewIdentifier" id="RpF-ZZ-VVR">
- <rect key="frame" x="821" y="0.0" width="150" height="17"/>
+ <rect key="frame" x="821" y="2" width="150" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="faR-Tr-m5n">
- <rect key="frame" x="0.0" y="0.0" width="150" height="16"/>
+ <rect key="frame" x="0.0" y="0.0" width="150" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="mYg-CM-jff">
<font key="font" usesAppearanceFont="YES"/>
@@ -1592,11 +1592,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="VLCLibrarySongsTableViewPlayCountTableCellViewIdentifier" id="yc4-Vp-4hr">
- <rect key="frame" x="988" y="0.0" width="64" height="17"/>
+ <rect key="frame" x="988" y="2" width="64" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4VQ-fV-w9a">
- <rect key="frame" x="0.0" y="0.0" width="64" height="16"/>
+ <rect key="frame" x="0.0" y="0.0" width="64" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="h8S-0f-C5S">
<font key="font" usesAppearanceFont="YES"/>
@@ -1624,11 +1624,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="VLCLibrarySongsTableViewYearTableCellViewIdentifier" id="I8Z-L8-hBM">
- <rect key="frame" x="1069" y="0.0" width="47" height="17"/>
+ <rect key="frame" x="1069" y="2" width="47" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9Er-xE-Jz7">
- <rect key="frame" x="0.0" y="0.0" width="47" height="16"/>
+ <rect key="frame" x="0.0" y="0.0" width="47" height="18"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="5bJ-rm-CUk">
<font key="font" usesAppearanceFont="YES"/>
@@ -1648,7 +1648,7 @@
</subviews>
</clipView>
<scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="2VX-c2-fRL">
- <rect key="frame" x="1" y="342" width="712" height="15"/>
+ <rect key="frame" x="1" y="341" width="712" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="NFb-XZ-MAv">
=====================================
modules/gui/macosx/UI/VLCMediaSourceCollectionViewItem.xib
=====================================
@@ -52,12 +52,12 @@
</constraints>
</customView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OBS-Eh-1mT">
- <rect key="frame" x="-2" y="4" width="52" height="24"/>
+ <rect key="frame" x="-2" y="4" width="37" height="24"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="wMC-00-Vuv"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" title="Label" usesSingleLineMode="YES" id="7Hy-o3-LvX">
- <font key="font" metaFont="system" size="20"/>
+ <font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
=====================================
modules/gui/macosx/UI/VLCMediaSourceDeviceCollectionViewItem.xib
=====================================
@@ -14,20 +14,20 @@
</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="214" height="246"/>
+ <customView misplaced="YES" id="Hz6-mo-xeY">
+ <rect key="frame" x="0.0" y="0.0" width="214" height="238"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jJ3-BQ-y8F">
- <rect key="frame" x="-2" y="0.0" width="56" height="24"/>
+ <rect key="frame" x="-2" y="0.0" width="37" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" title="Label" usesSingleLineMode="YES" id="Utm-F6-CKx">
- <font key="font" metaFont="systemBold" size="20"/>
+ <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="rko-Nc-j4c" customClass="VLCImageView">
- <rect key="frame" x="0.0" y="32" width="214" height="214"/>
+ <rect key="frame" x="0.0" y="24" width="214" height="214"/>
<constraints>
<constraint firstAttribute="width" secondItem="rko-Nc-j4c" secondAttribute="height" multiplier="1:1" id="tGe-gB-9im"/>
</constraints>
=====================================
modules/gui/macosx/UI/VLCPlaylistTableCellView.xib
=====================================
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -9,55 +9,75 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="c22-O7-iKe" customClass="VLCPlaylistTableCellView">
- <rect key="frame" x="0.0" y="0.0" width="398" height="81"/>
+ <rect key="frame" x="0.0" y="0.0" width="398" height="58"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ohB-P0-nCv">
- <rect key="frame" x="142" y="32" width="37" height="17"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="ZPw-XO-XD1">
- <font key="font" usesAppearanceFont="YES"/>
- <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="xJW-ps-ycn">
- <rect key="frame" x="142" y="46" width="37" height="17"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="aCe-ia-0Ww">
- <font key="font" usesAppearanceFont="YES"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0Ge-7z-bq6">
+ <rect key="frame" x="97" y="0.0" width="245" height="58"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ohB-P0-nCv">
+ <rect key="frame" x="-2" y="42" width="249" height="16"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="ZPw-XO-XD1">
+ <font key="font" usesAppearanceFont="YES"/>
+ <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="xJW-ps-ycn">
+ <rect key="frame" x="-2" y="21" width="249" height="16"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="aCe-ia-0Ww">
+ <font key="font" usesAppearanceFont="YES"/>
+ <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="TPv-k2-6XS">
+ <rect key="frame" x="-2" y="0.0" width="249" height="16"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="jZ4-pa-K3T">
+ <font key="font" usesAppearanceFont="YES"/>
+ <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="TPv-k2-6XS" secondAttribute="trailing" id="Bdm-3y-L6Y"/>
+ <constraint firstAttribute="trailing" secondItem="xJW-ps-ycn" secondAttribute="trailing" id="Te0-Yn-6Bc"/>
+ <constraint firstAttribute="trailing" secondItem="ohB-P0-nCv" secondAttribute="trailing" id="weY-Nx-VPO"/>
+ </constraints>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Ydb-7n-5Cd" customClass="VLCImageView">
- <rect key="frame" x="14" y="3" width="120" height="75"/>
+ <rect key="frame" x="10" y="5" width="77" height="48"/>
<constraints>
<constraint firstAttribute="width" secondItem="Ydb-7n-5Cd" secondAttribute="height" multiplier="16:10" id="4aB-rs-m22"/>
</constraints>
</customView>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xnT-RR-pOf">
- <rect key="frame" x="14" y="28" width="24" height="24"/>
+ <rect key="frame" x="10" y="17" width="24" height="24"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="note" id="UzG-df-K2K"/>
</imageView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="97z-d7-S3D" customClass="VLCImageView">
- <rect key="frame" x="59" y="3" width="75" height="75"/>
+ <rect key="frame" x="39" y="5" width="48" height="48"/>
<constraints>
<constraint firstAttribute="width" secondItem="97z-d7-S3D" secondAttribute="height" multiplier="1:1" id="YBL-j9-anm"/>
</constraints>
</customView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Ha-ZH-fa9">
- <rect key="frame" x="349" y="32" width="37" height="17"/>
+ <rect key="frame" x="350" y="21" width="40" height="16"/>
<constraints>
- <constraint firstAttribute="width" constant="33" id="0cB-ga-0Uw"/>
+ <constraint firstAttribute="width" constant="36" id="0cB-ga-0Uw"/>
</constraints>
- <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="N0j-xB-3t9">
- <font key="font" usesAppearanceFont="YES"/>
- <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TPv-k2-6XS">
- <rect key="frame" x="142" y="18" width="37" height="17"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="jZ4-pa-K3T">
+ <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Label" id="N0j-xB-3t9">
<font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -65,25 +85,19 @@
</textField>
</subviews>
<constraints>
- <constraint firstItem="ohB-P0-nCv" firstAttribute="leading" secondItem="Ydb-7n-5Cd" secondAttribute="trailing" constant="10" id="3wD-FP-vka"/>
- <constraint firstItem="TPv-k2-6XS" firstAttribute="leading" secondItem="ohB-P0-nCv" secondAttribute="leading" id="4qb-9H-TVg"/>
- <constraint firstItem="Ydb-7n-5Cd" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="14" id="8hv-Qt-uAI"/>
- <constraint firstItem="xJW-ps-ycn" firstAttribute="leading" secondItem="ohB-P0-nCv" secondAttribute="leading" id="DYk-9g-adD"/>
- <constraint firstItem="ohB-P0-nCv" firstAttribute="top" secondItem="xJW-ps-ycn" secondAttribute="bottom" constant="-3" id="Epo-on-wpL"/>
- <constraint firstItem="97z-d7-S3D" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="3" id="FbP-R4-bAA"/>
- <constraint firstItem="3Ha-ZH-fa9" firstAttribute="centerY" secondItem="ohB-P0-nCv" secondAttribute="centerY" id="Flo-4k-Vaz"/>
- <constraint firstItem="3Ha-ZH-fa9" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="xJW-ps-ycn" secondAttribute="trailing" constant="10" id="NxZ-be-5y0"/>
+ <constraint firstItem="Ydb-7n-5Cd" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="10" id="8hv-Qt-uAI"/>
+ <constraint firstItem="0Ge-7z-bq6" firstAttribute="centerY" secondItem="3Ha-ZH-fa9" secondAttribute="centerY" id="DpI-8u-rFu"/>
+ <constraint firstItem="0Ge-7z-bq6" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="EXo-Wn-Jh5"/>
+ <constraint firstItem="97z-d7-S3D" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="5" id="FbP-R4-bAA"/>
<constraint firstItem="xnT-RR-pOf" firstAttribute="leading" secondItem="Ydb-7n-5Cd" secondAttribute="leading" id="O8E-35-EK3"/>
- <constraint firstAttribute="trailing" secondItem="3Ha-ZH-fa9" secondAttribute="trailing" constant="14" id="SVJ-UL-O5m"/>
- <constraint firstAttribute="bottom" secondItem="97z-d7-S3D" secondAttribute="bottom" constant="3" id="XfR-Fd-n6o"/>
- <constraint firstAttribute="bottom" secondItem="Ydb-7n-5Cd" secondAttribute="bottom" constant="3" id="aVd-Ld-lUH"/>
+ <constraint firstAttribute="trailing" secondItem="3Ha-ZH-fa9" secondAttribute="trailing" constant="10" id="SVJ-UL-O5m"/>
+ <constraint firstAttribute="bottom" secondItem="97z-d7-S3D" secondAttribute="bottom" constant="5" id="XfR-Fd-n6o"/>
+ <constraint firstAttribute="bottom" secondItem="Ydb-7n-5Cd" secondAttribute="bottom" constant="5" id="aVd-Ld-lUH"/>
+ <constraint firstItem="0Ge-7z-bq6" firstAttribute="leading" secondItem="97z-d7-S3D" secondAttribute="trailing" constant="10" id="adC-9f-And"/>
<constraint firstItem="97z-d7-S3D" firstAttribute="trailing" secondItem="Ydb-7n-5Cd" secondAttribute="trailing" id="bzC-Km-KOo"/>
- <constraint firstItem="3Ha-ZH-fa9" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="TPv-k2-6XS" secondAttribute="trailing" constant="10" id="feB-7H-8HN"/>
+ <constraint firstItem="0Ge-7z-bq6" firstAttribute="trailing" secondItem="3Ha-ZH-fa9" secondAttribute="leading" constant="-10" id="dSC-Pq-ml2"/>
<constraint firstItem="xnT-RR-pOf" firstAttribute="centerY" secondItem="97z-d7-S3D" secondAttribute="centerY" id="gLa-2C-g8X"/>
- <constraint firstItem="Ydb-7n-5Cd" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="3" id="iPZ-zR-jTv"/>
- <constraint firstItem="ohB-P0-nCv" firstAttribute="centerY" secondItem="c22-O7-iKe" secondAttribute="centerY" id="mGo-gc-dR6"/>
- <constraint firstItem="TPv-k2-6XS" firstAttribute="top" secondItem="ohB-P0-nCv" secondAttribute="bottom" constant="-3" id="vSW-bd-8ac"/>
- <constraint firstItem="3Ha-ZH-fa9" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ohB-P0-nCv" secondAttribute="trailing" constant="10" id="wQv-VX-Hhb"/>
+ <constraint firstItem="Ydb-7n-5Cd" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="5" id="iPZ-zR-jTv"/>
</constraints>
<connections>
<outlet property="artistTextField" destination="TPv-k2-6XS" id="jJV-4C-USY"/>
=====================================
modules/gui/macosx/extensions/NSFont+VLCAdditions.h
=====================================
@@ -27,21 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
@interface NSFont (VLCAdditions)
+ (instancetype)VLClibrarySectionHeaderFont;
-+ (instancetype)VLClibraryHighlightCellTitleFont;
-+ (instancetype)VLClibraryHighlightCellSubtitleFont;
-+ (instancetype)VLClibraryHighlightCellHighlightLabelFont;
-+ (instancetype)VLClibraryLargeCellTitleFont;
-+ (instancetype)VLClibraryLargeCellSubtitleFont;
-+ (instancetype)VLClibrarySmallCellTitleFont;
-+ (instancetype)VLClibrarySmallCellSubtitleFont;
-+ (instancetype)VLClibraryCellAnnotationFont;
-+ (instancetype)VLClibraryButtonFont;
-+ (instancetype)VLCplaylistLabelFont;
-+ (instancetype)VLCplaylistSelectedItemLabelFont;
-+ (instancetype)VLCsmallPlaylistLabelFont;
-+ (instancetype)VLCsmallPlaylistSelectedItemLabelFont;
-+ (instancetype)VLCLibrarySupplementaryDetailViewTitleFont;
-+ (instancetype)VLCLibrarySupplementaryDetailViewSubtitleFont;
++ (instancetype)VLCLibrarySubsectionHeaderFont;
++ (instancetype)VLCLibrarySubsectionSubheaderFont;
@end
=====================================
modules/gui/macosx/extensions/NSFont+VLCAdditions.m
=====================================
@@ -29,79 +29,14 @@
return [NSFont systemFontOfSize:24. weight:NSFontWeightBold];
}
-+ (instancetype)VLClibraryHighlightCellTitleFont
++ (instancetype)VLCLibrarySubsectionHeaderFont
{
- return [NSFont systemFontOfSize:21. weight:NSFontWeightMedium];
+ return [NSFont systemFontOfSize:17. weight:NSFontWeightSemibold];
}
-+ (instancetype)VLClibraryHighlightCellSubtitleFont
++ (instancetype)VLCLibrarySubsectionSubheaderFont
{
- return [NSFont systemFontOfSize:13. weight:NSFontWeightSemibold];
-}
-
-+ (instancetype)VLClibraryHighlightCellHighlightLabelFont
-{
- return [NSFont systemFontOfSize:11. weight:NSFontWeightBold];
-}
-
-+ (instancetype)VLClibraryLargeCellTitleFont
-{
- return [NSFont systemFontOfSize:17. weight:NSFontWeightMedium];
-}
-
-+ (instancetype)VLClibraryLargeCellSubtitleFont
-{
- return [NSFont systemFontOfSize:13. weight:NSFontWeightSemibold];
-}
-
-+ (instancetype)VLClibrarySmallCellTitleFont
-{
- return [NSFont systemFontOfSize:13. weight:NSFontWeightMedium];
-}
-
-+ (instancetype)VLClibrarySmallCellSubtitleFont
-{
- return [NSFont systemFontOfSize:10. weight:NSFontWeightSemibold];
-}
-
-+ (instancetype)VLClibraryCellAnnotationFont
-{
- return [NSFont systemFontOfSize:15. weight:NSFontWeightBold];
-}
-
-+ (instancetype)VLClibraryButtonFont
-{
- return [NSFont systemFontOfSize:15. weight:NSFontWeightBold];
-}
-
-+ (instancetype)VLCplaylistLabelFont
-{
- return [NSFont systemFontOfSize:13. weight:NSFontWeightRegular];
-}
-
-+ (instancetype)VLCplaylistSelectedItemLabelFont
-{
- return [NSFont systemFontOfSize:13. weight:NSFontWeightBold];
-}
-
-+ (instancetype)VLCsmallPlaylistLabelFont
-{
- return [NSFont systemFontOfSize:10. weight:NSFontWeightRegular];
-}
-
-+ (instancetype)VLCsmallPlaylistSelectedItemLabelFont
-{
- return [NSFont systemFontOfSize:10. weight:NSFontWeightBold];
-}
-
-+ (instancetype)VLCLibrarySupplementaryDetailViewTitleFont
-{
- return [NSFont systemFontOfSize:20. weight:NSFontWeightSemibold];
-}
-
-+ (instancetype)VLCLibrarySupplementaryDetailViewSubtitleFont
-{
- return [NSFont systemFontOfSize:18. weight:NSFontWeightMedium];
+ return [NSFont systemFontOfSize:15. weight:NSFontWeightMedium];
}
@end
=====================================
modules/gui/macosx/library/VLCLibraryCollectionViewItem.m
=====================================
@@ -98,10 +98,6 @@ const CGFloat VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;
selector:@selector(mediaItemThumbnailGenerated:)
name:VLCLibraryModelMediaItemThumbnailGenerated
object:nil];
- [notificationCenter addObserver:self
- selector:@selector(updateFontBasedOnSetting:)
- name:VLCConfigurationChangedNotification
- object:nil];
}
return self;
}
@@ -128,11 +124,11 @@ const CGFloat VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;
[(VLCTrackingView *)self.view setViewToHide:self.playInstantlyButton];
self.secondaryInfoTextField.textColor = [NSColor VLClibrarySubtitleColor];
- self.annotationTextField.font = [NSFont VLClibraryCellAnnotationFont];
+ self.annotationTextField.font = [NSFont systemFontOfSize:NSFont.systemFontSize weight:NSFontWeightBold];
self.annotationTextField.textColor = [NSColor VLClibraryAnnotationColor];
self.annotationTextField.backgroundColor = [NSColor VLClibraryAnnotationBackgroundColor];
self.unplayedIndicatorTextField.stringValue = _NS("NEW");
- self.unplayedIndicatorTextField.font = [NSFont VLClibraryHighlightCellHighlightLabelFont];
+ self.unplayedIndicatorTextField.font = [NSFont systemFontOfSize:NSFont.systemFontSize weight:NSFontWeightBold];
self.highlightBox.borderColor = [NSColor VLCAccentColor];
self.unplayedIndicatorTextField.textColor = [NSColor VLCAccentColor];
@@ -144,7 +140,6 @@ const CGFloat VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;
}
[self updateColoredAppearance:self.view.effectiveAppearance];
- [self updateFontBasedOnSetting:nil];
[self prepareForReuse];
}
@@ -172,17 +167,6 @@ const CGFloat VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;
self.mediaTitleTextField.textColor = isDark ? [NSColor VLClibraryDarkTitleColor] : [NSColor VLClibraryLightTitleColor];
}
-- (void)updateFontBasedOnSetting:(NSNotification *)aNotification
-{
- if (config_GetInt("macosx-large-text")) {
- self.mediaTitleTextField.font = [NSFont VLClibraryLargeCellTitleFont];
- self.secondaryInfoTextField.font = [NSFont VLClibraryLargeCellSubtitleFont];
- } else {
- self.mediaTitleTextField.font = [NSFont VLClibrarySmallCellTitleFont];
- self.secondaryInfoTextField.font = [NSFont VLClibrarySmallCellSubtitleFont];
- }
-}
-
#pragma mark - view representation
- (void)prepareForReuse
=====================================
modules/gui/macosx/library/VLCLibraryCollectionViewMediaItemSupplementaryDetailView.m
=====================================
@@ -52,8 +52,8 @@ NSCollectionViewSupplementaryElementKind const VLCLibraryCollectionViewMediaItem
- (void)awakeFromNib
{
- _mediaItemTitleTextField.font = [NSFont VLCLibrarySupplementaryDetailViewTitleFont];
- _mediaItemDetailTextField.font = [NSFont VLCLibrarySupplementaryDetailViewSubtitleFont];
+ _mediaItemTitleTextField.font = [NSFont VLCLibrarySubsectionHeaderFont];
+ _mediaItemDetailTextField.font = [NSFont VLCLibrarySubsectionSubheaderFont];
_mediaItemDetailTextField.textColor = [NSColor VLCAccentColor];
if(@available(macOS 10.12.2, *)) {
=====================================
modules/gui/macosx/library/VLCLibraryTableCellView.m
=====================================
@@ -51,9 +51,6 @@
- (void)awakeFromNib
{
- self.singlePrimaryTitleTextField.font = [NSFont VLClibraryLargeCellTitleFont];
- self.primaryTitleTextField.font = [NSFont VLClibraryLargeCellTitleFont];
- self.secondaryTitleTextField.font = [NSFont VLClibraryLargeCellSubtitleFont];
[self prepareForReuse];
}
=====================================
modules/gui/macosx/library/VLCLibraryUIUnits.m
=====================================
@@ -74,12 +74,12 @@
+ (const CGFloat)dynamicCollectionViewItemMinimumWidth
{
- return 180;
+ return 150;
}
+ (const CGFloat)dynamicCollectionViewItemMaximumWidth
{
- return 280;
+ return 200;
}
+ (const CGFloat)collectionViewItemSpacing
=====================================
modules/gui/macosx/library/VLCLibraryWindow.m
=====================================
@@ -179,10 +179,6 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
selector:@selector(repeatStateUpdated:)
name:VLCPlaybackRepeatChanged
object:nil];
- [notificationCenter addObserver:self
- selector:@selector(updateViewCellDimensionsBasedOnSetting:)
- name:VLCConfigurationChangedNotification
- object:nil];
[notificationCenter addObserver:self
selector:@selector(playerStateChanged:)
name:VLCPlayerCurrentMediaItemChanged
@@ -212,7 +208,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
_playlistDragDropView.dropTarget = self;
_playlistCounterTextField.useStrongRounding = YES;
- _playlistCounterTextField.font = [NSFont VLCplaylistSelectedItemLabelFont];
+ _playlistCounterTextField.font = [NSFont boldSystemFontOfSize:NSFont.systemFontSize];
_playlistCounterTextField.textColor = [NSColor VLClibraryAnnotationColor];
_playlistCounterTextField.hidden = YES;
@@ -226,7 +222,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
_playlistTableView.dataSource = _playlistDataSource;
_playlistTableView.delegate = _playlistDataSource;
- [self updateViewCellDimensionsBasedOnSetting:nil];
+ _playlistTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
[_playlistTableView reloadData];
_libraryVideoViewController = [[VLCLibraryVideoViewController alloc] initWithLibraryWindow:self];
@@ -313,13 +309,6 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
}
}
-- (void)updateViewCellDimensionsBasedOnSetting:(NSNotification *)aNotification
-{
- _playlistTableView.rowHeight = config_GetInt("macosx-large-text") ?
- [VLCLibraryUIUnits largeTableViewRowHeight] :
- [VLCLibraryUIUnits mediumTableViewRowHeight];
-}
-
#pragma mark - playmode state display and interaction
- (IBAction)shuffleAction:(id)sender
=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAlbumTableCellView.m
=====================================
@@ -121,10 +121,8 @@ const CGFloat VLCLibraryAlbumTableCellViewDefaultHeight = 168.;
- (void)awakeFromNib
{
[self setupTracksTableView];
- self.albumNameTextField.font = [NSFont VLClibraryLargeCellTitleFont];
- self.artistNameTextField.font = [NSFont VLClibraryLargeCellSubtitleFont];
- self.yearTextField.font = [NSFont VLClibrarySmallCellTitleFont];
- self.summaryTextField.font = [NSFont VLClibrarySmallCellTitleFont];
+ self.albumNameTextField.font = [NSFont VLCLibrarySubsectionHeaderFont];
+ self.artistNameTextField.font = [NSFont VLCLibrarySubsectionSubheaderFont];
self.trackingView.viewToHide = self.playInstantlyButton;
self.artistNameTextField.textColor = [NSColor VLCAccentColor];
=====================================
modules/gui/macosx/library/audio-library/VLCLibraryCollectionViewAlbumSupplementaryDetailView.m
=====================================
@@ -71,8 +71,8 @@ NSCollectionViewSupplementaryElementKind const VLCLibraryCollectionViewAlbumSupp
_albumTracksTableView.delegate = _tracksTableViewDelegate;
_albumTracksTableView.rowHeight = VLCLibraryTracksRowHeight;
- _albumTitleTextField.font = [NSFont VLCLibrarySupplementaryDetailViewTitleFont];
- _albumDetailsTextField.font = [NSFont VLCLibrarySupplementaryDetailViewSubtitleFont];
+ _albumTitleTextField.font = [NSFont VLCLibrarySubsectionHeaderFont];
+ _albumDetailsTextField.font = [NSFont VLCLibrarySubsectionSubheaderFont];
_albumDetailsTextField.textColor = [NSColor VLCAccentColor];
=====================================
modules/gui/macosx/library/audio-library/VLCLibraryCollectionViewAudioGroupSupplementaryDetailView.m
=====================================
@@ -51,7 +51,7 @@ NSCollectionViewSupplementaryElementKind const VLCLibraryCollectionViewAudioGrou
_audioGroupAlbumsTableView.dataSource = _audioGroupAlbumsDataSource;
_audioGroupAlbumsTableView.delegate = _audioGroupAlbumsTableViewDelegate;
- _audioGroupNameTextField.font = [NSFont VLCLibrarySupplementaryDetailViewTitleFont];
+ _audioGroupNameTextField.font = [NSFont VLCLibrarySubsectionHeaderFont];
NSNotificationCenter * const notificationCenter = NSNotificationCenter.defaultCenter;
[notificationCenter addObserver:self
=====================================
modules/gui/macosx/library/media-source/VLCMediaSourceCollectionViewItem.m
=====================================
@@ -33,8 +33,6 @@
#import "main/VLCMain.h"
-#import "main/VLCMain.h"
-
#import "playlist/VLCPlaylistController.h"
#import "views/VLCImageView.h"
@@ -52,19 +50,6 @@ NSString *VLCMediaSourceCellIdentifier = @"VLCLibraryCellIdentifier";
@implementation VLCMediaSourceCollectionViewItem
-- (instancetype)initWithNibName:(NSNibName)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
- self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
- if (self) {
- NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
- [notificationCenter addObserver:self
- selector:@selector(updateFontBasedOnSetting:)
- name:VLCConfigurationChangedNotification
- object:nil];
- }
- return self;
-}
-
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -76,7 +61,7 @@ NSString *VLCMediaSourceCellIdentifier = @"VLCLibraryCellIdentifier";
- (void)awakeFromNib
{
[(VLCTrackingView *)self.view setViewToHide:self.playInstantlyButton];
- self.annotationTextField.font = [NSFont VLClibraryCellAnnotationFont];
+ self.annotationTextField.font = [NSFont systemFontOfSize:NSFont.systemFontSize weight:NSFontWeightBold];
self.annotationTextField.textColor = [NSColor VLClibraryAnnotationColor];
self.annotationTextField.backgroundColor = [NSColor VLClibraryAnnotationBackgroundColor];
@@ -88,7 +73,6 @@ NSString *VLCMediaSourceCellIdentifier = @"VLCLibraryCellIdentifier";
}
[self updateColoredAppearance:self.view.effectiveAppearance];
- [self updateFontBasedOnSetting:nil];
[self prepareForReuse];
}
@@ -116,15 +100,6 @@ NSString *VLCMediaSourceCellIdentifier = @"VLCLibraryCellIdentifier";
self.mediaTitleTextField.textColor = isDark ? [NSColor VLClibraryDarkTitleColor] : [NSColor VLClibraryLightTitleColor];
}
-- (void)updateFontBasedOnSetting:(NSNotification *)aNotification
-{
- if (config_GetInt("macosx-large-text")) {
- self.mediaTitleTextField.font = [NSFont VLClibraryLargeCellTitleFont];
- } else {
- self.mediaTitleTextField.font = [NSFont VLClibrarySmallCellTitleFont];
- }
-}
-
#pragma mark - view representation
- (void)prepareForReuse
=====================================
modules/gui/macosx/library/media-source/VLCMediaSourceDeviceCollectionViewItem.m
=====================================
@@ -23,9 +23,14 @@
#import "VLCMediaSourceDeviceCollectionViewItem.h"
#import "extensions/NSColor+VLCAdditions.h"
+#import "extensions/NSFont+VLCAdditions.h"
+
+#import "main/VLCMain.h"
#import "views/VLCImageView.h"
+#import <vlc_configuration.h>
+
NSString *VLCMediaSourceDeviceCellIdentifier = @"VLCMediaSourceDeviceCellIdentifier";
@interface VLCMediaSourceDeviceCollectionViewItem ()
=====================================
modules/gui/macosx/main/macosx.m
=====================================
@@ -139,7 +139,6 @@ vlc_module_begin()
add_bool("macosx-statusicon", true, DISPLAY_STATUS_ICONMENU_TEXT, DISPLAY_STATUS_ICONMENU_LONGTEXT)
add_bool("macosx-icon-change", true, ICONCHANGE_TEXT, ICONCHANGE_LONGTEXT)
add_integer_with_range("macosx-max-volume", 125, 60, 200, VOLUME_MAX_TEXT, NULL)
- add_bool("macosx-large-text", false, LARGE_LISTFONT_TEXT, NULL)
set_section(N_("Behavior"), 0)
add_bool("macosx-autoplay", true, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT)
=====================================
modules/gui/macosx/playlist/VLCPlaylistTableCellView.m
=====================================
@@ -35,24 +35,8 @@
#import <vlc_configuration.h>
- at interface VLCPlaylistTableCellView ()
-{
- NSFont *_displayedFont;
- NSFont *_displayedBoldFont;
-}
- at end
-
@implementation VLCPlaylistTableCellView
-- (void)awakeFromNib
-{
- [self updateFontsBasedOnSetting:nil];
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(updateFontsBasedOnSetting:)
- name:VLCConfigurationChangedNotification
- object:nil];
-}
-
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -61,11 +45,13 @@
- (void)setRepresentsCurrentPlaylistItem:(BOOL)representsCurrentPlaylistItem
{
_representsCurrentPlaylistItem = representsCurrentPlaylistItem;
- NSFont *displayedFont = _representsCurrentPlaylistItem ? _displayedBoldFont : _displayedFont;
+
+ NSFont * const displayedFont = _representsCurrentPlaylistItem ?
+ [NSFont boldSystemFontOfSize:NSFont.systemFontSize] :
+ [NSFont systemFontOfSize:NSFont.systemFontSize];
+
self.mediaTitleTextField.font = displayedFont;
self.secondaryMediaTitleTextField.font = displayedFont;
- self.artistTextField.font = _displayedFont;
- self.durationTextField.font = _displayedFont;
}
- (void)setRepresentedPlaylistItem:(VLCPlaylistItem *)item
@@ -102,17 +88,4 @@
_representedPlaylistItem = item;
}
-- (void)updateFontsBasedOnSetting:(NSNotification *)aNotification
-{
- BOOL largeText = config_GetInt("macosx-large-text");
- if (largeText) {
- _displayedFont = [NSFont VLCplaylistLabelFont];
- _displayedBoldFont = [NSFont VLCplaylistSelectedItemLabelFont];
- } else {
- _displayedFont = [NSFont VLCsmallPlaylistLabelFont];
- _displayedBoldFont = [NSFont VLCsmallPlaylistSelectedItemLabelFont];
- }
- [self setRepresentsCurrentPlaylistItem:_representsCurrentPlaylistItem];
-}
-
@end
=====================================
modules/gui/macosx/preferences/VLCSimplePrefsController.m
=====================================
@@ -643,7 +643,6 @@ static inline const char * __config_GetLabel(vlc_object_t *p_this, const char *p
}
[self setupButton:_intf_statusIconCheckbox forBoolValue: "macosx-statusicon"];
- [self setupButton:_intf_largeFontInListsCheckbox forBoolValue: "macosx-large-text"];
[self setupButton:_video_nativeFullscreenCheckbox forBoolValue: "macosx-nativefullscreenmode"];
[self setupButton:_video_embeddedCheckbox forBoolValue: "embedded-video"];
@@ -973,7 +972,6 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
config_PutInt("metadata-network-access", [_intf_artCheckbox state]);
config_PutInt("macosx-statusicon", [_intf_statusIconCheckbox state]);
- config_PutInt("macosx-large-text", [_intf_largeFontInListsCheckbox state]);
[self changeModule:@"growl" inConfig:@"control" enable:[_intf_enableNotificationsCheckbox state] == NSOnState];
=====================================
modules/gui/macosx/windows/mainwindow/VLCControlsBarCommon.m
=====================================
@@ -153,18 +153,12 @@
self.muteVolumeButton.accessibilityLabel = self.muteVolumeButton.toolTip;
[self updateMuteVolumeButtonImage];
- NSColor *timeFieldTextColor = [NSColor controlTextColor];
-
- [self.timeField setTextColor: timeFieldTextColor];
- [self.timeField setFont:[NSFont titleBarFontOfSize:10.0]];
[self.timeField setNeedsDisplay:YES];
[self.timeField setRemainingIdentifier:VLCTimeFieldDisplayTimeAsElapsed];
self.trailingTimeField.isTimeRemaining = NO;
self.timeField.accessibilityLabel = _NS("Playback time");
self.trailingTimeField.isTimeRemaining = !self.timeField.isTimeRemaining;
- [self.trailingTimeField setTextColor: timeFieldTextColor];
- [self.trailingTimeField setFont:[NSFont titleBarFontOfSize:10.0]];
[self.trailingTimeField setNeedsDisplay:YES];
[self.trailingTimeField setRemainingIdentifier:VLCTimeFieldDisplayTimeAsRemaining];
self.trailingTimeField.isTimeRemaining = YES;
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/85956d14b4fde63f461c56f67c717003c3da4db8...38a99dfc5101e6ca2e749aae49ddb347f5ff5eca
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/85956d14b4fde63f461c56f67c717003c3da4db8...38a99dfc5101e6ca2e749aae49ddb347f5ff5eca
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list