Skip to content

J
jami-client-macos
Commit 548c1c2d authored by Alexandre Lision's avatar Alexandre Lision
Browse files
Options

ui: update layout constraints 

There was an issue with the wizard's help popover content. Some layout
contraints were not interpreted by the 10.10 SDK (used for packaging)
Text is now wrapping properly, displaying all the content.

Another issue was with the welcome page message. The uri field was
compressed because the french translation takes a lot more space.
The welcome message is now allowed to take more spaces horizontally,
allowing the uri to be properly displayed.

Change-Id: I65a6ecf1b4f933fd1b3804680657f1afd17fe692
Tuleap: #1353
parent 313427fe
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 35 deletions
ui/Base.lproj/RingWindow.xib
View file @ 548c1c2d
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2553a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<development version="7000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
<objects>
......@@ -609,16 +608,8 @@
<customView translatesAutoresizingMaskIntoConstraints="NO" id="D6e-KX-8gC">
<rect key="frame" x="103" y="194" width="520" height="270"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VJ1-xk-v5e">
<rect key="frame" x="137" y="104" width="247" height="63"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Ring is free software for universal communication which respects the freedoms and privacy of its users." id="eln-Vm-t0d">
<font key="font" size="15" name="HelveticaNeue"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kFj-Sh-o5u">
<rect key="frame" x="95" y="77" width="330" height="19"/>
<rect key="frame" x="95" y="98" width="330" height="19"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="326" id="i1K-ok-BEb"/>
</constraints>
......@@ -629,7 +620,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JN3-vO-zcd" userLabel="Ring ID" customClass="RingIDField">
<rect key="frame" x="20" y="43" width="400" height="26"/>
<rect key="frame" x="20" y="64" width="400" height="26"/>
<constraints>
<constraint firstAttribute="height" constant="26" id="TYe-h2-pPT"/>
<constraint firstAttribute="width" constant="400" id="ywt-Ml-u9k"/>
......@@ -649,7 +640,7 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="symbol_name" id="9ti-Q4-TAv"/>
</imageView>
<button translatesAutoresizingMaskIntoConstraints="NO" id="Oac-o7-2Ge">
<rect key="frame" x="470" y="41" width="30" height="30"/>
<rect key="frame" x="470" y="62" width="30" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="AXu-uA-KCC"/>
<constraint firstAttribute="width" constant="30" id="h6a-Lg-QRm"/>
......@@ -663,7 +654,7 @@
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="eXV-BT-B6J" customClass="IconButton">
<rect key="frame" x="431" y="41" width="30" height="30"/>
<rect key="frame" x="431" y="62" width="30" height="30"/>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="qrcode" imagePosition="only" alignment="center" transparent="YES" imageScaling="proportionallyUpOrDown" inset="2" id="vvm-Gy-Tbh">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
......@@ -677,6 +668,14 @@
<action selector="toggleQRCode:" target="-2" id="jZa-65-o5C"/>
</connections>
</button>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VJ1-xk-v5e">
<rect key="frame" x="24" y="125" width="473" height="42"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Ring is free software for universal communication which respects the freedoms and privacy of its users." id="eln-Vm-t0d">
<font key="font" size="15" name="HelveticaNeue"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
<constraints>
<constraint firstItem="f62-JV-dgr" firstAttribute="top" secondItem="D6e-KX-8gC" secondAttribute="top" constant="20" id="0b6-u8-yQg"/>
......
ui/Base.lproj/RingWizardNewAccount.xib
View file @ 548c1c2d
......@@ -423,13 +423,17 @@ Gw
<point key="canvasLocation" x="199" y="581"/>
</customView>
<customView id="5d2-w4-t7n">
<rect key="frame" x="0.0" y="0.0" width="350" height="108"/>
<rect key="frame" x="0.0" y="0.0" width="350" height="99"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="wsh-QZ-fXj">
<rect key="frame" x="18" y="20" width="314" height="68"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="0qE-Sz-hdc">
<font key="font" metaFont="system"/>
<rect key="frame" x="18" y="20" width="314" height="59"/>
<constraints>
<constraint firstAttribute="height" constant="59" id="XRy-g1-xvh"/>
<constraint firstAttribute="width" constant="310" id="kiE-3q-jrv"/>
</constraints>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="justified" id="0qE-Sz-hdc">
<font key="font" metaFont="smallSystem"/>
<string key="title">By checking this, you will register a unique username on Ring network. People can use it to contact you instead of using your RingID which is 40 characters long.</string>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
......@@ -437,23 +441,23 @@ Gw
</textField>
</subviews>
<constraints>
<constraint firstItem="wsh-QZ-fXj" firstAttribute="centerY" secondItem="5d2-w4-t7n" secondAttribute="centerY" id="2LG-iF-irA"/>
<constraint firstItem="wsh-QZ-fXj" firstAttribute="leading" secondItem="5d2-w4-t7n" secondAttribute="leading" constant="20" id="5yp-xd-EQK"/>
<constraint firstItem="wsh-QZ-fXj" firstAttribute="centerX" secondItem="5d2-w4-t7n" secondAttribute="centerX" id="Lde-tI-97A"/>
<constraint firstAttribute="bottom" secondItem="wsh-QZ-fXj" secondAttribute="bottom" constant="20" id="Vhw-8E-PGE"/>
<constraint firstItem="wsh-QZ-fXj" firstAttribute="top" secondItem="5d2-w4-t7n" secondAttribute="top" constant="20" id="aFs-IQ-VBH"/>
<constraint firstAttribute="trailing" secondItem="wsh-QZ-fXj" secondAttribute="trailing" constant="20" id="omo-Yd-iK5"/>
<constraint firstItem="wsh-QZ-fXj" firstAttribute="leading" secondItem="5d2-w4-t7n" secondAttribute="leading" constant="20" symbolic="YES" id="Ua0-mg-IBy"/>
<constraint firstItem="wsh-QZ-fXj" firstAttribute="top" secondItem="5d2-w4-t7n" secondAttribute="top" constant="20" symbolic="YES" id="tno-jg-mwQ"/>
</constraints>
<point key="canvasLocation" x="-605" y="823"/>
<point key="canvasLocation" x="-651" y="781.5"/>
</customView>
<customView id="Cdg-Wr-oF6">
<rect key="frame" x="0.0" y="0.0" width="348" height="91"/>
<rect key="frame" x="0.0" y="0.0" width="348" height="102"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="eOp-Af-ygv">
<rect key="frame" x="18" y="20" width="312" height="51"/>
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" id="zUH-kc-cik">
<font key="font" metaFont="system"/>
<rect key="frame" x="18" y="20" width="312" height="62"/>
<constraints>
<constraint firstAttribute="height" constant="62" id="5mA-Bq-bMF"/>
<constraint firstAttribute="width" constant="308" id="fAL-sO-RRi"/>
</constraints>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="zUH-kc-cik">
<font key="font" metaFont="smallSystem"/>
<string key="title">Your password must be at least 6 characters. It will be used to encrypt your account data and to link new devices to your account.</string>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
......@@ -461,14 +465,10 @@ Gw
</textField>
</subviews>
<constraints>
<constraint firstItem="eOp-Af-ygv" firstAttribute="centerX" secondItem="Cdg-Wr-oF6" secondAttribute="centerX" id="2Fi-dX-tcs"/>
<constraint firstItem="eOp-Af-ygv" firstAttribute="leading" secondItem="Cdg-Wr-oF6" secondAttribute="leading" constant="20" id="QZx-Wk-O5K"/>
<constraint firstAttribute="bottom" secondItem="eOp-Af-ygv" secondAttribute="bottom" constant="20" id="X4g-gk-nc2"/>
<constraint firstItem="eOp-Af-ygv" firstAttribute="top" secondItem="Cdg-Wr-oF6" secondAttribute="top" constant="20" id="c7E-ah-vgm"/>
<constraint firstAttribute="trailing" secondItem="eOp-Af-ygv" secondAttribute="trailing" constant="20" id="eop-dQ-IiC"/>
<constraint firstItem="eOp-Af-ygv" firstAttribute="centerY" secondItem="Cdg-Wr-oF6" secondAttribute="centerY" id="r2Q-MH-hTe"/>
<constraint firstItem="eOp-Af-ygv" firstAttribute="top" secondItem="Cdg-Wr-oF6" secondAttribute="top" constant="20" symbolic="YES" id="1Gm-Cd-4hu"/>
<constraint firstItem="eOp-Af-ygv" firstAttribute="leading" secondItem="Cdg-Wr-oF6" secondAttribute="leading" constant="20" symbolic="YES" id="dRD-x6-zge"/>
</constraints>
<point key="canvasLocation" x="-606" y="657.5"/>
<point key="canvasLocation" x="-606" y="599"/>
</customView>
</objects>
<resources>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment