[vlc-devel] [PATCH 3/8] macosx: Update main window to use new slider
Marvin Scholz
epirat07 at gmail.com
Tue Jul 18 20:30:06 CEST 2017
---
modules/gui/macosx/UI/MainWindow.xib | 90 +++++++++++++-----------------------
1 file changed, 31 insertions(+), 59 deletions(-)
diff --git a/modules/gui/macosx/UI/MainWindow.xib b/modules/gui/macosx/UI/MainWindow.xib
index acc247d8d3..17367f905a 100644
--- a/modules/gui/macosx/UI/MainWindow.xib
+++ b/modules/gui/macosx/UI/MainWindow.xib
@@ -18,7 +18,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/>
<rect key="contentRect" x="53" y="419" width="716" height="333"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
<view key="contentView" id="2">
<rect key="frame" x="0.0" y="0.0" width="716" height="333"/>
<autoresizingMask key="autoresizingMask"/>
@@ -68,7 +68,7 @@
<action selector="buttonAction:" target="4850" id="4915"/>
</connections>
</button>
- <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4899" customClass="VLCWindowTitleTextField">
+ <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4899" customClass="VLCWindowTitleTextField">
<rect key="frame" x="65" y="3" width="577" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="VLC media player" allowsEditingTextAttributes="YES" usesSingleLineMode="YES" id="4900">
<font key="font" metaFont="system"/>
@@ -138,7 +138,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="20" indentationPerLevel="14" autoresizesOutlineColumn="YES" outlineTableColumn="4717" id="4714" customClass="PXSourceList">
- <rect key="frame" x="0.0" y="0.0" width="203" height="20"/>
+ <rect key="frame" x="0.0" y="0.0" width="236" height="273"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES"/>
<size key="intercellSpacing" width="3" height="0.0"/>
<color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -190,7 +190,7 @@
<rect key="frame" x="0.0" y="-4" width="477" height="27"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="top" imageScaling="axesIndependently" image="topbar_background" id="4693"/>
</imageView>
- <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5610">
+ <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5610">
<rect key="frame" x="6" y="5" width="33" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="5611">
<font key="font" metaFont="smallSystem"/>
@@ -198,7 +198,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <searchField wantsLayer="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5614">
+ <searchField wantsLayer="YES" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5614">
<rect key="frame" x="319" y="2" width="150" height="19"/>
<constraints>
<constraint firstAttribute="width" constant="150" id="AM9-aF-RtQ"/>
@@ -238,7 +238,7 @@
<customView translatesAutoresizingMaskIntoConstraints="NO" id="5605" customClass="VLCDragDropView">
<rect key="frame" x="0.0" y="0.0" width="477" height="252"/>
<subviews>
- <box autoresizesSubviews="NO" transparent="YES" title="Box" borderType="none" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="4739">
+ <box autoresizesSubviews="NO" borderType="none" title="Box" titlePosition="noTitle" transparent="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4739">
<rect key="frame" x="89" y="10" width="300" height="230"/>
<view key="contentView" id="pxq-Tn-LtA">
<rect key="frame" x="0.0" y="0.0" width="300" height="230"/>
@@ -252,7 +252,7 @@
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyDown" image="dropzone" id="4726"/>
</imageView>
- <textField verticalHuggingPriority="749" translatesAutoresizingMaskIntoConstraints="NO" id="4727">
+ <textField verticalHuggingPriority="749" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4727">
<rect key="frame" x="79" y="69" width="143" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Drop Media here" id="4728">
<font key="font" metaFont="system" size="18"/>
@@ -599,43 +599,7 @@
<constraint firstItem="2789" firstAttribute="left" secondItem="4671" secondAttribute="right" id="pEa-Hl-83C"/>
</constraints>
</customView>
- <customView translatesAutoresizingMaskIntoConstraints="NO" id="5335" customClass="VLCProgressView">
- <rect key="frame" x="279" y="11" width="223" height="14"/>
- <subviews>
- <customView translatesAutoresizingMaskIntoConstraints="NO" id="4919" customClass="VLCThreePartImageView">
- <rect key="frame" x="0.0" y="0.0" width="223" height="14"/>
- </customView>
- <customView hidden="YES" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4701" customClass="VLCThreePartImageView">
- <rect key="frame" x="1" y="1" width="70" height="12"/>
- </customView>
- <progressIndicator hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="3584" userLabel="Buffering Bar">
- <rect key="frame" x="0.0" y="1" width="223" height="12"/>
- </progressIndicator>
- <slider hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4422" customClass="TimeLineSlider">
- <rect key="frame" x="0.0" y="1" width="223" height="15"/>
- <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="10000" doubleValue="3204.0777439024391" tickMarkPosition="above" sliderType="linear" id="4425">
- <font key="font" size="12" name="Helvetica"/>
- </sliderCell>
- <connections>
- <action selector="timeSliderAction:" target="5339" id="5370"/>
- </connections>
- </slider>
- </subviews>
- <constraints>
- <constraint firstItem="4422" firstAttribute="centerY" secondItem="5335" secondAttribute="centerY" constant="-1" id="Czk-qS-fTt"/>
- <constraint firstItem="4919" firstAttribute="leading" secondItem="5335" secondAttribute="leading" id="G4c-AN-5uA"/>
- <constraint firstItem="4919" firstAttribute="top" secondItem="5335" secondAttribute="top" id="OJz-TZ-fOg"/>
- <constraint firstAttribute="trailing" secondItem="3584" secondAttribute="trailing" id="RLD-z0-Ztm"/>
- <constraint firstAttribute="height" constant="14" id="Ve2-Hb-qa0"/>
- <constraint firstItem="3584" firstAttribute="leading" secondItem="5335" secondAttribute="leading" id="YuF-fn-ghh"/>
- <constraint firstAttribute="bottom" secondItem="4919" secondAttribute="bottom" id="dqR-kg-QSm"/>
- <constraint firstAttribute="trailing" secondItem="4919" secondAttribute="trailing" id="ix2-DU-D5x"/>
- <constraint firstAttribute="trailing" secondItem="4422" secondAttribute="trailing" id="ovG-Bb-kVU"/>
- <constraint firstItem="3584" firstAttribute="centerY" secondItem="5335" secondAttribute="centerY" id="rZy-tT-BZ6"/>
- <constraint firstItem="4422" firstAttribute="leading" secondItem="5335" secondAttribute="leading" id="y3S-Bb-sZ1"/>
- </constraints>
- </customView>
- <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4423" customClass="VLCTimeField">
+ <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4423" customClass="VLCTimeField">
<rect key="frame" x="508" y="11" width="56" height="13"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="52" id="oTA-8E-R2c"/>
@@ -750,6 +714,18 @@
<constraint firstAttribute="right" secondItem="4419" secondAttribute="right" id="teb-w0-7R0"/>
</constraints>
</customView>
+ <slider hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4422" customClass="VLCSlider">
+ <rect key="frame" x="279" y="10" width="223" height="16"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="14" id="JuE-o0-ajo"/>
+ </constraints>
+ <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="10000" doubleValue="3204.0777439024391" tickMarkPosition="above" sliderType="linear" id="4425" customClass="VLCSliderCell">
+ <font key="font" size="12" name="Helvetica"/>
+ </sliderCell>
+ <connections>
+ <action selector="timeSliderAction:" target="5339" id="5370"/>
+ </connections>
+ </slider>
</subviews>
<constraints>
<constraint firstItem="3653" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="5K8-hV-nOQ"/>
@@ -757,19 +733,19 @@
<constraint firstItem="3652" firstAttribute="leading" secondItem="3649" secondAttribute="trailing" constant="3" id="Apb-gM-P9J"/>
<constraint firstItem="4423" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="HUU-wF-duH"/>
<constraint firstItem="jlp-Z2-Qdl" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="Hnv-b4-wWi"/>
- <constraint firstItem="5335" firstAttribute="leading" secondItem="mrr-Bw-co0" secondAttribute="trailing" constant="8" symbolic="YES" id="I5r-X9-Qdm"/>
- <constraint firstItem="5335" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="MpQ-gv-fno"/>
<constraint firstItem="dff-fl-Mde" firstAttribute="leading" secondItem="3652" secondAttribute="trailing" constant="8" symbolic="YES" id="TVP-Cr-bfO"/>
<constraint firstItem="4417" firstAttribute="trailing" secondItem="3649" secondAttribute="trailing" id="WUo-ur-GGy"/>
<constraint firstItem="3647" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="WdH-6H-Xhc"/>
+ <constraint firstItem="4423" firstAttribute="leading" secondItem="4422" secondAttribute="trailing" constant="8" id="YpP-Vj-f9b"/>
+ <constraint firstItem="4422" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="Zit-b0-8jR"/>
<constraint firstItem="4417" firstAttribute="leading" secondItem="3649" secondAttribute="leading" id="b86-zP-VqN"/>
<constraint firstItem="4417" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="gI8-2E-JGT"/>
<constraint firstItem="dff-fl-Mde" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="gqZ-nc-67e"/>
<constraint firstItem="3649" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="ll4-Gr-Hs6"/>
<constraint firstItem="3652" firstAttribute="centerY" secondItem="5608" secondAttribute="centerY" id="o7m-oP-mfd"/>
<constraint firstItem="jlp-Z2-Qdl" firstAttribute="leading" secondItem="5608" secondAttribute="leading" constant="8" id="odn-Ek-4d1"/>
+ <constraint firstItem="4422" firstAttribute="leading" secondItem="mrr-Bw-co0" secondAttribute="trailing" constant="8" id="tg9-ZJ-h8u"/>
<constraint firstItem="3653" firstAttribute="leading" secondItem="4423" secondAttribute="trailing" constant="8" symbolic="YES" id="tn5-dP-NYa"/>
- <constraint firstItem="4423" firstAttribute="leading" secondItem="5335" secondAttribute="trailing" constant="8" symbolic="YES" id="tvk-Cf-6uD"/>
<constraint firstItem="3647" firstAttribute="leading" secondItem="jlp-Z2-Qdl" secondAttribute="trailing" constant="4" id="ucM-uq-yJA"/>
<constraint firstItem="mrr-Bw-co0" firstAttribute="leading" secondItem="3647" secondAttribute="trailing" constant="4" id="vZh-zx-o9s"/>
<constraint firstItem="3649" firstAttribute="leading" secondItem="3653" secondAttribute="trailing" constant="3" id="wz6-Z8-Pow"/>
@@ -855,8 +831,6 @@
<outlet property="playlistButton" destination="4671" id="AZd-5b-MrA"/>
<outlet property="prevButton" destination="qfh-30-nky" id="uN2-nC-7Mt"/>
<outlet property="prevButtonWidthConstraint" destination="bP7-Ec-OLG" id="qs4-ok-Ual"/>
- <outlet property="progressBar" destination="3584" id="d57-az-Grm"/>
- <outlet property="progressView" destination="5335" id="dBT-U1-rmL"/>
<outlet property="repeatButton" destination="2789" id="lRj-JN-Yry"/>
<outlet property="repeatButtonWidthConstraint" destination="3Ww-8A-Fh7" id="i89-fY-S9w"/>
<outlet property="shuffleButton" destination="2208" id="kf1-mU-75T"/>
@@ -864,8 +838,6 @@
<outlet property="stopButton" destination="3647" id="ddx-Gq-iPV"/>
<outlet property="timeField" destination="4423" id="Wvo-az-Lou"/>
<outlet property="timeSlider" destination="4422" id="I3H-rQ-4GH"/>
- <outlet property="timeSliderBackgroundView" destination="4919" id="6gl-QT-tF7"/>
- <outlet property="timeSliderGradientView" destination="4701" id="2CZ-VD-eHh"/>
<outlet property="volumeDownButton" destination="3653" id="brO-P5-sUM"/>
<outlet property="volumeSlider" destination="3649" id="NDW-el-poL"/>
<outlet property="volumeTrackImageView" destination="4417" id="xH3-Dg-2Ok"/>
@@ -876,14 +848,14 @@
<windowStyleMask key="styleMask" titled="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="265" y="520" width="612" height="157"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
<value key="minSize" type="size" width="612" height="159"/>
<value key="maxSize" type="size" width="612" height="159"/>
<view key="contentView" id="5266">
<rect key="frame" x="0.0" y="0.0" width="612" height="157"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="5275">
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5275">
<rect key="frame" x="18" y="120" width="576" height="17"/>
<textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Subscribe to a podcast" id="5276">
<font key="font" metaFont="systemBold"/>
@@ -891,7 +863,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="5274">
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5274">
<rect key="frame" x="18" y="98" width="576" height="14"/>
<textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Enter URL of the podcast to subscribe to:" usesSingleLineMode="YES" id="5277">
<font key="font" metaFont="smallSystem"/>
@@ -899,7 +871,7 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5289">
+ <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5289">
<rect key="frame" x="20" y="68" width="572" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="5290">
<font key="font" metaFont="system"/>
@@ -956,14 +928,14 @@ Gw
<windowStyleMask key="styleMask" titled="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="265" y="520" width="612" height="156"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
<value key="minSize" type="size" width="612" height="159"/>
<value key="maxSize" type="size" width="612" height="159"/>
<view key="contentView" id="5306">
<rect key="frame" x="0.0" y="0.0" width="612" height="156"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="5311">
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5311">
<rect key="frame" x="18" y="119" width="576" height="17"/>
<textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Unsubscribe from a podcast" id="5312">
<font key="font" metaFont="systemBold"/>
@@ -971,7 +943,7 @@ Gw
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="5310">
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5310">
<rect key="frame" x="18" y="97" width="576" height="14"/>
<textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" title="Select the podcast you would like to unsubscribe from:" usesSingleLineMode="YES" id="5313">
<font key="font" metaFont="smallSystem"/>
@@ -1067,7 +1039,7 @@ Gw
<image name="stop-pressed" width="29" height="23"/>
<image name="topbar_background" width="1" height="27"/>
<image name="volume-high" width="13" height="11"/>
- <image name="volume-low" width="5" height="11"/>
+ <image name="volume-low" width="5" height="10"/>
<image name="volume-slider-track" width="48" height="5"/>
</resources>
</document>
--
2.11.0 (Apple Git-81)
More information about the vlc-devel
mailing list