diff --git a/data/dark/ic_action_accept.png b/data/dark/ic_action_accept.png index d93146d9902e3d7631f4d215abcdf50445264481..b26a2c05e3f261641734c91aef9322830ab10daf 100644 Binary files a/data/dark/ic_action_accept.png and b/data/dark/ic_action_accept.png differ diff --git a/data/dark/ic_action_cancel.png b/data/dark/ic_action_cancel.png index f889617e4471d6a0c65dd81a060bea482276b322..51b4401ca053ca8cad6e9903646709a2f44444df 100644 Binary files a/data/dark/ic_action_cancel.png and b/data/dark/ic_action_cancel.png differ diff --git a/data/dark/ic_action_transfer.png b/data/dark/ic_action_transfer.png index a84953a7d3a053897fbdb46cbe605602e6d814e5..1f56e066238816eb60cdba40edfb4df62c41a26d 100644 Binary files a/data/dark/ic_action_transfer.png and b/data/dark/ic_action_transfer.png differ diff --git a/src/views/IconButton.mm b/src/views/IconButton.mm index 24ce76e06320aff6c2732849b167d5354fd92414..45aa00e5e9b63cff16aab47412cef765bd4e492f 100644 --- a/src/views/IconButton.mm +++ b/src/views/IconButton.mm @@ -33,7 +33,7 @@ } if (self.imageInsets == 0) - self.imageInsets = 5.0f; + self.imageInsets = 8.0f; } - (void)drawRect:(NSRect)dirtyRect diff --git a/ui/Base.lproj/Conversation.xib b/ui/Base.lproj/Conversation.xib index f29b95d7d7483ecc151a07acea48ffeeddb1c21c..415517dc000e63b6199196c4364869fba273d18e 100644 --- a/ui/Base.lproj/Conversation.xib +++ b/ui/Base.lproj/Conversation.xib @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="ConversationVC"> @@ -148,9 +148,6 @@ <font key="font" metaFont="system"/> </buttonCell> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="highlightColor"> <color key="value" red="0.16862745100000001" green="0.70588235290000001" blue="0.78823529410000004" alpha="1" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> @@ -206,26 +203,6 @@ <action selector="placeCall:" target="-2" id="2h9-fM-gof"/> </connections> </button> - <button verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UJf-cF-RAo" customClass="IconButton"> - <rect key="frame" x="698" y="5" width="40" height="40"/> - <constraints> - <constraint firstAttribute="width" constant="40" id="TmF-ip-m4C"/> - <constraint firstAttribute="height" constant="40" id="rbQ-lE-sAq"/> - </constraints> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_send" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" inset="2" id="s6a-eK-t3T"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> - </userDefinedRuntimeAttributes> - <connections> - <action selector="sendMessage:" target="-2" id="5Cf-jA-eJM"/> - <binding destination="-2" name="enabled" keyPath="self.message.length" id="ZmZ-2N-CPX"/> - </connections> - </button> <textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bsk-Gj-qQ2"> <rect key="frame" x="68" y="5" width="622" height="40"/> <constraints> @@ -248,6 +225,21 @@ <outlet property="delegate" destination="-2" id="2u2-D4-htz"/> </connections> </textField> + <button verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UJf-cF-RAo" customClass="IconButton"> + <rect key="frame" x="698" y="5" width="40" height="40"/> + <constraints> + <constraint firstAttribute="width" constant="40" id="TmF-ip-m4C"/> + <constraint firstAttribute="height" constant="40" id="rbQ-lE-sAq"/> + </constraints> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_send" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" inset="2" id="s6a-eK-t3T"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <connections> + <action selector="sendMessage:" target="-2" id="5Cf-jA-eJM"/> + <binding destination="-2" name="enabled" keyPath="self.message.length" id="ZmZ-2N-CPX"/> + </connections> + </button> </subviews> <constraints> <constraint firstItem="cFH-d7-Erh" firstAttribute="top" secondItem="Rth-di-Tls" secondAttribute="top" constant="5" id="2zJ-2h-dLg"/> diff --git a/ui/Base.lproj/CurrentCall.xib b/ui/Base.lproj/CurrentCall.xib index 5b504d113c6cf70e80f5a97b620f8518f975994c..afc02dae41000f7b302f3fd657f14822a474bf45 100644 --- a/ui/Base.lproj/CurrentCall.xib +++ b/ui/Base.lproj/CurrentCall.xib @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="CurrentCallVC"> @@ -77,9 +77,29 @@ <userDefinedRuntimeAttribute type="string" keyPath="layer.cornerRadius" value="15"/> </userDefinedRuntimeAttributes> </textField> - <button hidden="YES" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zss-6A-bSy" userLabel="AddToContact" customClass="IconButton"> - <rect key="frame" x="249" y="7" width="30" height="30"/> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bg3-hB-nE8"> + <rect key="frame" x="76" y="14" width="85" height="17"/> + <constraints> + <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="81" id="gT7-Wu-XtU"/> + </constraints> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Person name" id="osk-LS-0Qg"> + <font key="font" metaFont="system"/> + <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> + <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="X5k-sy-WtA"> + <rect key="frame" x="20" y="10" width="50" height="50"/> + <constraints> + <constraint firstAttribute="width" constant="50" id="2tx-rb-idH"/> + <constraint firstAttribute="height" constant="50" id="B5W-X8-r0z"/> + </constraints> + <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="dK5-Oj-aua"/> + </imageView> + <button hidden="YES" wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zss-6A-bSy" userLabel="AddToContact" customClass="IconButton"> + <rect key="frame" x="167" y="7" width="30" height="30"/> <constraints> + <constraint firstAttribute="height" constant="30" id="9GG-e3-JDT"/> <constraint firstAttribute="width" constant="30" id="DdM-FT-7kb"/> </constraints> <backgroundFilters> @@ -95,32 +115,19 @@ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> </buttonCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> + <integer key="value" value="6"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> <connections> <action selector="addToContact:" target="-2" id="OI1-7U-4T7"/> </connections> </button> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bg3-hB-nE8"> - <rect key="frame" x="76" y="14" width="85" height="17"/> - <constraints> - <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="81" id="gT7-Wu-XtU"/> - </constraints> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Person name" id="osk-LS-0Qg"> - <font key="font" metaFont="system"/> - <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="X5k-sy-WtA"> - <rect key="frame" x="20" y="10" width="50" height="50"/> - <constraints> - <constraint firstAttribute="width" constant="50" id="2tx-rb-idH"/> - <constraint firstAttribute="height" constant="50" id="B5W-X8-r0z"/> - </constraints> - <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="dK5-Oj-aua"/> - </imageView> </subviews> <constraints> <constraint firstItem="Zss-6A-bSy" firstAttribute="leading" secondItem="bg3-hB-nE8" secondAttribute="trailing" constant="8" id="6V0-Gq-SMw"/> + <constraint firstItem="Zss-6A-bSy" firstAttribute="centerY" secondItem="bg3-hB-nE8" secondAttribute="centerY" id="CSK-r9-Zt7"/> <constraint firstItem="kFD-FB-vig" firstAttribute="leading" secondItem="bg3-hB-nE8" secondAttribute="leading" id="LXG-QI-oPf"/> <constraint firstItem="cIU-M7-xpN" firstAttribute="top" secondItem="d0X-cW-Xgz" secondAttribute="top" constant="24" id="Qc7-qp-qSV"/> <constraint firstAttribute="trailing" secondItem="cIU-M7-xpN" secondAttribute="trailing" constant="20" id="RXf-xZ-4f9"/> @@ -149,9 +156,6 @@ <font key="font" metaFont="system"/> </buttonCell> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="highlightColor"> <color key="value" red="0.16862745100000001" green="0.70588235290000001" blue="0.78823529410000004" alpha="1" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> @@ -174,9 +178,6 @@ <font key="font" size="10" name=".HelveticaNeueDeskInterface-Regular"/> </buttonCell> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="highlightColor"> <color key="value" red="0.16862745100000001" green="0.70588235290000001" blue="0.78823529410000004" alpha="1" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> @@ -199,9 +200,6 @@ <font key="font" metaFont="system"/> </buttonCell> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="highlightColor"> <color key="value" red="0.16862745100000001" green="0.70588235290000001" blue="0.78823529410000004" alpha="1" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> @@ -224,9 +222,6 @@ <font key="font" size="10" name=".HelveticaNeueDeskInterface-Regular"/> </buttonCell> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="highlightColor"> <color key="value" red="0.16862745100000001" green="0.70588235290000001" blue="0.78823529410000004" alpha="1" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> @@ -244,7 +239,7 @@ <constraint firstAttribute="width" constant="40" id="MYx-uE-Bej"/> <constraint firstAttribute="height" constant="40" id="dmD-ga-Kwv"/> </constraints> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_hangup" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="kR5-bV-2KY"> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_cancel" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="kR5-bV-2KY"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> </buttonCell> @@ -252,9 +247,6 @@ <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> <color key="value" red="0.94509803921568625" green="0.16078431372549018" blue="0.0" alpha="0.83999999999999997" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> <connections> <action selector="hangUp:" target="-2" id="1Fj-b8-nfh"/> @@ -271,9 +263,6 @@ <font key="font" size="10" name=".HelveticaNeueDeskInterface-Regular"/> </buttonCell> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="highlightColor"> <color key="value" red="0.16862745100000001" green="0.70588235290000001" blue="0.78823529410000004" alpha="1" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> @@ -296,9 +285,6 @@ <font key="font" metaFont="system"/> </buttonCell> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="highlightColor"> <color key="value" red="0.16862745100000001" green="0.70588235290000001" blue="0.78823529410000004" alpha="1" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> @@ -330,9 +316,6 @@ <font key="font" metaFont="system"/> </buttonCell> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="10"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="highlightColor"> <color key="value" red="0.16862745098039217" green="0.70588235294117641" blue="0.78823529411764703" alpha="1" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> @@ -389,7 +372,7 @@ <constraint firstAttribute="width" constant="40" id="O83-pI-Vas"/> <constraint firstAttribute="height" constant="40" id="tQE-0z-Q3y"/> </constraints> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_hangup" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="qBC-R5-W49"> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_cancel" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="qBC-R5-W49"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> </buttonCell> @@ -397,9 +380,6 @@ <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> <color key="value" red="0.94509803920000002" green="0.16078431369999999" blue="0.0" alpha="0.83999999999999997" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> <connections> <action selector="hangUp:" target="-2" id="MMl-em-Nrb"/> @@ -416,9 +396,6 @@ <font key="font" metaFont="system"/> </buttonCell> <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="8"/> - </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="highlightColor"> <color key="value" red="0.16862745100000001" green="0.70588235290000001" blue="0.78823529410000004" alpha="1" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> @@ -443,13 +420,21 @@ <customView misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="se7-PJ-iwD"> <rect key="frame" x="545" y="223" width="110" height="112"/> <subviews> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aav-3e-AnU"> + <rect key="frame" x="32" y="7" width="46" height="17"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Cancel" id="TlL-HO-5Ey"> + <font key="font" metaFont="system"/> + <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> <button toolTip="Hang up" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D0G-XT-lhI" userLabel="Hang Up" customClass="IconButton"> - <rect key="frame" x="20" y="32" width="70" height="70"/> + <rect key="frame" x="27" y="32" width="56" height="56"/> <constraints> - <constraint firstAttribute="height" constant="70" id="FTZ-JO-UdI"/> - <constraint firstAttribute="width" constant="70" id="i20-DN-iit"/> + <constraint firstAttribute="height" constant="56" id="FTZ-JO-UdI"/> + <constraint firstAttribute="width" constant="56" id="i20-DN-iit"/> </constraints> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_hangup" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="3JO-aO-fnu"> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_cancel" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="3JO-aO-fnu"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> </buttonCell> @@ -458,25 +443,17 @@ <color key="value" red="0.94509803920000002" green="0.16078431369999999" blue="0.0" alpha="0.83999999999999997" colorSpace="calibratedRGB"/> </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="15"/> + <integer key="value" value="16"/> </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> <connections> <action selector="hangUp:" target="-2" id="6ew-Fv-wF7"/> </connections> </button> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aav-3e-AnU"> - <rect key="frame" x="32" y="7" width="46" height="17"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Cancel" id="TlL-HO-5Ey"> - <font key="font" metaFont="system"/> - <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> </subviews> <constraints> <constraint firstItem="D0G-XT-lhI" firstAttribute="centerX" secondItem="se7-PJ-iwD" secondAttribute="centerX" id="Ety-3T-k5N"/> - <constraint firstItem="D0G-XT-lhI" firstAttribute="top" secondItem="se7-PJ-iwD" secondAttribute="top" constant="10" id="K7F-Z0-GFu"/> + <constraint firstItem="D0G-XT-lhI" firstAttribute="top" secondItem="se7-PJ-iwD" secondAttribute="top" constant="24" id="K7F-Z0-GFu"/> <constraint firstItem="Aav-3e-AnU" firstAttribute="top" secondItem="D0G-XT-lhI" secondAttribute="bottom" constant="8" id="Kz0-3c-wmP"/> <constraint firstItem="Aav-3e-AnU" firstAttribute="centerX" secondItem="se7-PJ-iwD" secondAttribute="centerX" id="Teh-iF-VrN"/> <constraint firstAttribute="width" constant="110" id="eyg-Eq-bcF"/> @@ -486,28 +463,6 @@ <customView translatesAutoresizingMaskIntoConstraints="NO" id="W4l-Be-bhM"> <rect key="frame" x="135" y="109" width="404" height="291"/> <subviews> - <button toolTip="Hang up" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2cB-dz-KYg" userLabel="Hang Up" customClass="IconButton"> - <rect key="frame" x="220" y="43" width="70" height="70"/> - <constraints> - <constraint firstAttribute="width" constant="70" id="Avo-rM-awf"/> - <constraint firstAttribute="height" constant="70" id="z5h-9v-SNU"/> - </constraints> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_hangup" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="sxM-Qb-qWD"> - <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> - <font key="font" metaFont="system"/> - </buttonCell> - <userDefinedRuntimeAttributes> - <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> - <color key="value" red="0.94509803920000002" green="0.16078431369999999" blue="0.0" alpha="0.83999999999999997" colorSpace="calibratedRGB"/> - </userDefinedRuntimeAttribute> - <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="15"/> - </userDefinedRuntimeAttribute> - </userDefinedRuntimeAttributes> - <connections> - <action selector="hangUp:" target="-2" id="wVq-bI-wmY"/> - </connections> - </button> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9Cd-Vs-wtu"> <rect key="frame" x="234" y="18" width="43" height="17"/> <constraints> @@ -561,18 +516,18 @@ </textFieldCell> </textField> <button toolTip="Pick up" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qgD-3D-nD5" userLabel="Accept" customClass="IconButton"> - <rect key="frame" x="115" y="43" width="70" height="70"/> + <rect key="frame" x="122" y="43" width="56" height="56"/> <constraints> - <constraint firstAttribute="height" constant="70" id="IFG-ni-9mc"/> - <constraint firstAttribute="width" constant="70" id="uoL-Wy-Ek2"/> + <constraint firstAttribute="height" constant="56" id="IFG-ni-9mc"/> + <constraint firstAttribute="width" constant="56" id="uoL-Wy-Ek2"/> </constraints> - <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_call" imagePosition="overlaps" alignment="left" transparent="YES" imageScaling="proportionallyDown" id="CoO-HS-nEB"> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_accept" imagePosition="overlaps" alignment="left" transparent="YES" imageScaling="proportionallyDown" id="CoO-HS-nEB"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> </buttonCell> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> - <integer key="value" value="15"/> + <integer key="value" value="16"/> </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> <color key="value" red="0.23529411764705882" green="0.6470588235294118" blue="0.16078431372549018" alpha="0.80000000000000004" colorSpace="calibratedRGB"/> @@ -582,20 +537,42 @@ <action selector="accept:" target="-2" id="maS-G8-eY7"/> </connections> </button> + <button toolTip="Hang up" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2cB-dz-KYg" userLabel="Hang Up" customClass="IconButton"> + <rect key="frame" x="227" y="43" width="56" height="56"/> + <constraints> + <constraint firstAttribute="width" constant="56" id="Avo-rM-awf"/> + <constraint firstAttribute="height" constant="56" id="z5h-9v-SNU"/> + </constraints> + <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_cancel" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="sxM-Qb-qWD"> + <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> + <font key="font" metaFont="system"/> + </buttonCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> + <color key="value" red="0.94509803920000002" green="0.16078431369999999" blue="0.0" alpha="0.83999999999999997" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> + <integer key="value" value="16"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> + <connections> + <action selector="hangUp:" target="-2" id="wVq-bI-wmY"/> + </connections> + </button> </subviews> <constraints> <constraint firstItem="N3W-75-NuQ" firstAttribute="centerX" secondItem="W4l-Be-bhM" secondAttribute="centerX" id="ABJ-dP-zZT"/> <constraint firstItem="qnn-D2-O1C" firstAttribute="top" secondItem="V2C-DZ-Ygi" secondAttribute="bottom" constant="8" id="ClJ-Gw-V9J"/> - <constraint firstItem="qgD-3D-nD5" firstAttribute="leading" secondItem="W4l-Be-bhM" secondAttribute="leading" constant="115" id="LYx-Yw-xfe"/> + <constraint firstItem="qgD-3D-nD5" firstAttribute="leading" secondItem="W4l-Be-bhM" secondAttribute="leading" constant="122" id="LYx-Yw-xfe"/> <constraint firstItem="9Cd-Vs-wtu" firstAttribute="centerX" secondItem="2cB-dz-KYg" secondAttribute="centerX" id="NFr-oZ-cLw"/> - <constraint firstItem="2cB-dz-KYg" firstAttribute="top" secondItem="qnn-D2-O1C" secondAttribute="bottom" constant="8" id="RWw-Pn-eAO"/> + <constraint firstItem="2cB-dz-KYg" firstAttribute="top" secondItem="qnn-D2-O1C" secondAttribute="bottom" constant="22" id="RWw-Pn-eAO"/> <constraint firstItem="qnn-D2-O1C" firstAttribute="centerX" secondItem="W4l-Be-bhM" secondAttribute="centerX" id="SFe-9R-EVd"/> <constraint firstItem="9Cd-Vs-wtu" firstAttribute="top" secondItem="2cB-dz-KYg" secondAttribute="bottom" constant="8" id="Tmr-bc-0W9"/> - <constraint firstAttribute="trailing" secondItem="2cB-dz-KYg" secondAttribute="trailing" constant="114" id="Xxj-BS-gPZ"/> + <constraint firstAttribute="trailing" secondItem="2cB-dz-KYg" secondAttribute="trailing" constant="121" id="Xxj-BS-gPZ"/> <constraint firstItem="neP-Vf-7Tp" firstAttribute="top" secondItem="qgD-3D-nD5" secondAttribute="bottom" constant="8" id="agL-to-xl2"/> <constraint firstItem="V2C-DZ-Ygi" firstAttribute="top" secondItem="N3W-75-NuQ" secondAttribute="bottom" constant="8" id="c2D-cL-ahg"/> <constraint firstAttribute="width" constant="404" id="dzx-yF-Ffl"/> - <constraint firstItem="qgD-3D-nD5" firstAttribute="top" secondItem="qnn-D2-O1C" secondAttribute="bottom" constant="8" id="lCg-9I-qeP"/> + <constraint firstItem="qgD-3D-nD5" firstAttribute="top" secondItem="qnn-D2-O1C" secondAttribute="bottom" constant="22" id="lCg-9I-qeP"/> <constraint firstItem="V2C-DZ-Ygi" firstAttribute="centerX" secondItem="W4l-Be-bhM" secondAttribute="centerX" id="mGd-oj-2O4"/> <constraint firstAttribute="height" constant="291" id="pWV-Tm-dtp"/> <constraint firstItem="neP-Vf-7Tp" firstAttribute="centerX" secondItem="qgD-3D-nD5" secondAttribute="centerX" id="puk-xU-0dz"/> @@ -667,10 +644,10 @@ <rect key="frame" x="0.0" y="0.0" width="338" height="459"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> - <size key="minSize" width="323" height="459"/> + <size key="minSize" width="338" height="459"/> <size key="maxSize" width="463" height="10000000"/> <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> - <size key="minSize" width="323" height="459"/> + <size key="minSize" width="338" height="459"/> <size key="maxSize" width="463" height="10000000"/> </textView> </subviews> @@ -681,7 +658,7 @@ <autoresizingMask key="autoresizingMask"/> </scroller> <scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="eno-qS-nJm"> - <rect key="frame" x="323" y="0.0" width="15" height="459"/> + <rect key="frame" x="322" y="0.0" width="16" height="459"/> <autoresizingMask key="autoresizingMask"/> </scroller> </scrollView> @@ -771,16 +748,16 @@ <resources> <image name="NSGoRightTemplate" width="9" height="12"/> <image name="NSUser" width="32" height="32"/> + <image name="ic_action_accept" width="72" height="72"/> <image name="ic_action_add_participant" width="72" height="72"/> - <image name="ic_action_call" width="72" height="72"/> + <image name="ic_action_cancel" width="72" height="72"/> <image name="ic_action_chat" width="72" height="72"/> - <image name="ic_action_hangup" width="72" height="72"/> <image name="ic_action_hold" width="72" height="72"/> <image name="ic_action_merge_calls" width="72" height="72"/> <image name="ic_action_mute_audio" width="72" height="72"/> <image name="ic_action_mute_video" width="72" height="72"/> <image name="ic_action_record" width="54" height="54"/> - <image name="ic_action_transfer" width="72" height="72"/> + <image name="ic_action_transfer" width="57.599998474121094" height="57.599998474121094"/> <image name="ic_person_add" width="48" height="48"/> </resources> </document> diff --git a/ui/Base.lproj/RingWindow.xib b/ui/Base.lproj/RingWindow.xib index f3a1659a87eff91f9d7ad02b2ae593c97d65b175..ece20547f83d3d162f1f4f8c18bb9f219c3c83c3 100644 --- a/ui/Base.lproj/RingWindow.xib +++ b/ui/Base.lproj/RingWindow.xib @@ -133,6 +133,11 @@ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/> <font key="font" metaFont="system"/> </buttonCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> + <integer key="value" value="6"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> <connections> <action selector="showContacts:" target="jrf-42-1l2" id="SBF-5u-2lU"/> </connections> @@ -143,6 +148,11 @@ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/> <font key="font" metaFont="system"/> </buttonCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> + <integer key="value" value="6"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> <connections> <action selector="showHistory:" target="jrf-42-1l2" id="8AY-hb-Hhj"/> </connections> @@ -211,28 +221,33 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> + <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="MYe-rn-qOP"> + <rect key="frame" x="35" y="6" width="16" height="17"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="n" drawsBackground="YES" id="sGB-x7-gig"> + <font key="font" metaFont="smallSystem"/> + <color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" red="0.98431372549019602" green="0.28627450980392155" blue="0.28235294117647058" alpha="0.90000000000000002" colorSpace="calibratedRGB"/> + </textFieldCell> + </textField> <button hidden="YES" verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="DAd-lc-L62" userLabel="Call Button" customClass="IconButton"> - <rect key="frame" x="288" y="18" width="25" height="25"/> + <rect key="frame" x="288" y="15" width="30" height="30"/> <constraints> - <constraint firstAttribute="height" constant="25" id="0mP-Ez-X7O"/> - <constraint firstAttribute="width" constant="25" id="kYf-6V-X04"/> + <constraint firstAttribute="height" constant="30" id="0mP-Ez-X7O"/> + <constraint firstAttribute="width" constant="30" id="kYf-6V-X04"/> </constraints> <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_video" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="CcV-tT-jWI"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> </buttonCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> + <integer key="value" value="6"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> <connections> <action selector="callClickedAtRow:" target="-1" id="zew-Rw-kFH"/> </connections> </button> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="MYe-rn-qOP"> - <rect key="frame" x="35" y="6" width="16" height="17"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="n" drawsBackground="YES" id="sGB-x7-gig"> - <font key="font" metaFont="smallSystem"/> - <color key="textColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" red="0.98431372549019602" green="0.28627450980392155" blue="0.28235294117647058" alpha="0.90000000000000002" colorSpace="calibratedRGB"/> - </textFieldCell> - </textField> </subviews> <constraints> <constraint firstItem="MYe-rn-qOP" firstAttribute="trailing" secondItem="sHH-wj-oHs" secondAttribute="trailing" id="1nI-oe-P2F"/> @@ -240,61 +255,77 @@ <constraint firstItem="sHH-wj-oHs" firstAttribute="top" secondItem="Z6G-mQ-L3J" secondAttribute="top" constant="6" id="KMX-Ru-AEa"/> <constraint firstItem="MYe-rn-qOP" firstAttribute="bottom" secondItem="sHH-wj-oHs" secondAttribute="bottom" id="QV9-5r-9us"/> <constraint firstAttribute="bottom" secondItem="sHH-wj-oHs" secondAttribute="bottom" constant="6" id="SJ6-9t-r0l"/> - <constraint firstAttribute="trailing" secondItem="DAd-lc-L62" secondAttribute="trailing" constant="8" id="Zsb-GR-rRN"/> + <constraint firstAttribute="trailing" secondItem="DAd-lc-L62" secondAttribute="trailing" constant="3" id="Zsb-GR-rRN"/> <constraint firstItem="DAd-lc-L62" firstAttribute="centerY" secondItem="Z6G-mQ-L3J" secondAttribute="centerY" id="amg-Ei-hAd"/> </constraints> <connections> <outlet property="textField" destination="epa-Ih-aKF" id="ISN-G3-Hxj"/> </connections> </tableCellView> - <tableCellView identifier="CallCell" id="nvG-hU-lKg" userLabel="CallCell"> - <rect key="frame" x="1" y="63" width="321" height="45"/> + <tableCellView identifier="CallCell" id="nvG-hU-lKg" userLabel="CallCell" customClass="ContextualTableCellView"> + <rect key="frame" x="1" y="63" width="321" height="50"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="Sm2-al-NU0"> - <rect key="frame" x="6" y="2" width="204" height="20"/> - <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="details" id="mK5-kV-YOO"> - <font key="font" size="13" name="HelveticaNeue-Light"/> - <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/> - <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> - </textFieldCell> - </textField> - <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="goj-2q-MrC"> - <rect key="frame" x="287" y="10" width="25" height="25"/> + <button verticalHuggingPriority="750" tag="600" translatesAutoresizingMaskIntoConstraints="NO" id="goj-2q-MrC" customClass="IconButton"> + <rect key="frame" x="288" y="10" width="30" height="30"/> <constraints> - <constraint firstAttribute="width" constant="25" id="1BZ-Kd-bEV"/> - <constraint firstAttribute="height" constant="25" id="kff-nD-Fcp"/> + <constraint firstAttribute="width" constant="30" id="1BZ-Kd-bEV"/> + <constraint firstAttribute="height" constant="30" id="kff-nD-Fcp"/> </constraints> <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_cancel" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" inset="2" id="s5P-Zv-nbT"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="system"/> </buttonCell> + <userDefinedRuntimeAttributes> + <userDefinedRuntimeAttribute type="number" keyPath="imageInsets"> + <integer key="value" value="6"/> + </userDefinedRuntimeAttribute> + <userDefinedRuntimeAttribute type="color" keyPath="bgColor"> + <color key="value" red="0.94509803920000002" green="0.16078431369999999" blue="0.0" alpha="0.83999999999999997" colorSpace="calibratedRGB"/> + </userDefinedRuntimeAttribute> + </userDefinedRuntimeAttributes> <connections> <action selector="hangUpClickedAtRow:" target="-1" id="mlM-gd-4bQ"/> </connections> </button> <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="sfz-V3-QhK"> - <rect key="frame" x="6" y="19" width="73" height="23"/> + <rect key="frame" x="6" y="24" width="276" height="23"/> + <constraints> + <constraint firstAttribute="height" constant="23" id="Knk-h9-HbW"/> + </constraints> <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Call name" id="j0J-Xd-uth"> <font key="font" size="16" name="HelveticaNeue-Light"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> + <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="Sm2-al-NU0"> + <rect key="frame" x="6" y="3" width="276" height="20"/> + <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="details" id="mK5-kV-YOO"> + <font key="font" size="13" name="HelveticaNeue-Light"/> + <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/> + <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> + </textFieldCell> + </textField> </subviews> <constraints> + <constraint firstItem="Sm2-al-NU0" firstAttribute="top" secondItem="sfz-V3-QhK" secondAttribute="bottom" constant="1" id="4ta-Gr-B5A"/> <constraint firstItem="goj-2q-MrC" firstAttribute="centerY" secondItem="nvG-hU-lKg" secondAttribute="centerY" id="Kym-eH-bYz"/> <constraint firstItem="sfz-V3-QhK" firstAttribute="top" secondItem="nvG-hU-lKg" secondAttribute="top" constant="3" id="M4L-Af-Pfa"/> + <constraint firstItem="sfz-V3-QhK" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="O23-cp-x3m"/> <constraint firstItem="Sm2-al-NU0" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="WJh-9X-RGV"/> - <constraint firstAttribute="trailing" secondItem="goj-2q-MrC" secondAttribute="trailing" constant="9" id="hjs-hz-0hg"/> + <constraint firstItem="Sm2-al-NU0" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="YZn-VJ-val"/> + <constraint firstAttribute="trailing" secondItem="goj-2q-MrC" secondAttribute="trailing" constant="3" id="hjs-hz-0hg"/> + <constraint firstItem="goj-2q-MrC" firstAttribute="leading" secondItem="Sm2-al-NU0" secondAttribute="trailing" constant="8" id="iHP-pI-Jw3"/> <constraint firstItem="sfz-V3-QhK" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="vjw-ee-Iqh"/> + <constraint firstItem="goj-2q-MrC" firstAttribute="leading" secondItem="sfz-V3-QhK" secondAttribute="trailing" constant="8" id="y0f-Av-r8z"/> </constraints> <connections> <outlet property="textField" destination="sfz-V3-QhK" id="0Ka-vn-gAW"/> </connections> </tableCellView> <customView identifier="HoverRowView" id="f78-Ki-IyO" customClass="HoverTableRowView"> - <rect key="frame" x="1" y="110" width="321" height="55"/> + <rect key="frame" x="1" y="115" width="321" height="55"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> </customView> </prototypeCellViews> @@ -668,7 +699,7 @@ <image name="NSShareTemplate" width="11" height="16"/> <image name="NSUser" width="32" height="32"/> <image name="ic_action_call" width="72" height="72"/> - <image name="ic_action_cancel" width="48" height="48"/> + <image name="ic_action_cancel" width="72" height="72"/> <image name="ic_action_video" width="72" height="72"/> <image name="ic_history" width="72" height="72"/> <image name="ic_persons" width="72" height="72"/>