vlc | branch: master | Marvin Scholz <[email protected]> | Mon Apr  3 10:16:16 
2017 +0200| [2c54082b78966a0302c106d29f74b41a9b92bce5] | committer: Marvin 
Scholz

macOS: Use Image Button subclasses for Status Bar Icon

Ref: #17916

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2c54082b78966a0302c106d29f74b41a9b92bce5
---

 modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib 
b/modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib
index 2adb94b..49e3383 100755
--- a/modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib
+++ b/modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" 
toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" 
propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" 
toolsVersion="12118" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" 
propertyAccessControl="none">
     <dependencies>
+        <deployment identifier="macosx"/>
         <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" 
version="11762"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" 
version="12118"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" 
customClass="VLCStatusBarIcon">
@@ -73,7 +74,7 @@
                     <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
                     <imageCell key="cell" refusesFirstResponder="YES" 
alignment="left" imageScaling="proportionallyDown" image="VLC" id="7Ns-2s-EgU"/>
                 </imageView>
-                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" id="Byt-pH-60l">
+                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" 
id="Byt-pH-60l">
                     <rect key="frame" x="60" y="42" width="183" height="17"/>
                     <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" 
allowsUndo="NO" sendsActionOnEndEditing="YES" title="The Fox (What Does the Fox 
Say?) to this very very" usesSingleLineMode="YES" id="Fo7-qA-sCC">
@@ -82,7 +83,7 @@
                         <color key="backgroundColor" name="controlColor" 
catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" id="FnZ-Gr-BKf">
+                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" 
id="FnZ-Gr-BKf">
                     <rect key="frame" x="60" y="27" width="183" height="17"/>
                     <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" 
sendsActionOnEndEditing="YES" title="by Ylvis" usesSingleLineMode="YES" 
id="TWt-2V-iGT">
@@ -91,7 +92,7 @@
                         <color key="backgroundColor" 
red="0.021842277486911033" green="0.021842277486911033" 
blue="0.021842277486911033" alpha="1" colorSpace="calibratedRGB"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" id="SKt-XT-Vki">
+                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" 
id="SKt-XT-Vki">
                     <rect key="frame" x="60" y="12" width="183" height="17"/>
                     <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" 
sendsActionOnEndEditing="YES" title="on “The Fox”" usesSingleLineMode="YES" 
id="IKI-Pl-Iji">
@@ -118,7 +119,7 @@
                         <action selector="toggelProgressTime:" target="-2" 
id="S3e-vr-guH"/>
                     </connections>
                 </button>
-                <button id="p8X-zU-PwN">
+                <button id="p8X-zU-PwN" customClass="VLCHUDImageButton">
                     <rect key="frame" x="76" y="20" width="28" height="24"/>
                     <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="square" 
bezelStyle="shadowlessSquare" image="VLCPreviousTemplate" 
imagePosition="overlaps" alignment="center" 
imageScaling="proportionallyUpOrDown" inset="2" id="PSI-Wi-u0R">
@@ -129,7 +130,7 @@
                         <action selector="statusBarIconPrevious:" target="-2" 
id="kAL-hK-8qL"/>
                     </connections>
                 </button>
-                <button id="lvI-lN-t4O">
+                <button id="lvI-lN-t4O" customClass="VLCHUDToggleButton">
                     <rect key="frame" x="109" y="20" width="28" height="24"/>
                     <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="square" 
bezelStyle="shadowlessSquare" image="VLCPlayTemplate" imagePosition="only" 
alignment="center" alternateImage="VLCPauseTemplate" 
imageScaling="proportionallyUpOrDown" inset="2" id="nqu-wV-vI1">
@@ -140,7 +141,7 @@
                         <action selector="statusBarIconTogglePlayPause:" 
target="-2" id="K38-Dr-lNS"/>
                     </connections>
                 </button>
-                <button id="NHj-Vf-SPF">
+                <button id="NHj-Vf-SPF" customClass="VLCHUDImageButton">
                     <rect key="frame" x="141" y="20" width="28" height="24"/>
                     <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="square" 
bezelStyle="shadowlessSquare" image="VLCNextTemplate" imagePosition="overlaps" 
alignment="center" imageScaling="proportionallyUpOrDown" inset="2" 
id="BIa-Vy-yD2">
@@ -162,7 +163,7 @@
                         <action selector="statusBarIconToggleRandom:" 
target="-2" id="IHE-JL-EfK"/>
                     </connections>
                 </button>
-                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" id="z3X-aG-Veg">
+                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" 
id="z3X-aG-Veg">
                     <rect key="frame" x="18" y="0.0" width="100" height="17"/>
                     <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" 
allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="right" title="--:--" 
usesSingleLineMode="YES" id="CLT-p2-bxf">
@@ -171,7 +172,7 @@
                         <color key="backgroundColor" 
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" id="za4-8d-tZy">
+                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" 
id="za4-8d-tZy">
                     <rect key="frame" x="115" y="1" width="17" height="17"/>
                     <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" 
lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" 
alignment="center" title="/" usesSingleLineMode="YES" id="y3P-oA-eTa">
@@ -180,7 +181,7 @@
                         <color key="backgroundColor" 
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" id="wXO-2p-mxK">
+                <textField horizontalHuggingPriority="251" 
verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" 
id="wXO-2p-mxK">
                     <rect key="frame" x="127" y="0.0" width="102" height="17"/>
                     <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" lineBreakMode="truncatingTail" 
allowsUndo="NO" sendsActionOnEndEditing="YES" title="--:--" 
usesSingleLineMode="YES" id="vF8-Z8-vhW">

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to