Skip to content

Commit 03e4651

Browse files
committed
Update view to use constraints.
1 parent 87e605f commit 03e4651

File tree

1 file changed

+93
-63
lines changed

1 file changed

+93
-63
lines changed

osx/src/main/resources/Progress.xib

Lines changed: 93 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -22,76 +22,106 @@
2222
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
2323
<customObject id="2" customClass="NSApplication"/>
2424
<customView id="3" customClass="NSTableCellView">
25-
<rect key="frame" x="0.0" y="0.0" width="333" height="82"/>
25+
<rect key="frame" x="0.0" y="0.0" width="333" height="96"/>
2626
<autoresizingMask key="autoresizingMask"/>
2727
<subviews>
28-
<imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4">
29-
<rect key="frame" x="0.0" y="40" width="38" height="38"/>
30-
<autoresizingMask key="autoresizingMask"/>
28+
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="4">
29+
<rect key="frame" x="8" y="53" width="32.5" height="39"/>
30+
<constraints>
31+
<constraint firstAttribute="height" constant="32" id="3m3-D7-Vbj"/>
32+
<constraint firstAttribute="width" constant="32" id="HXf-3D-gBp"/>
33+
</constraints>
3134
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" id="5">
3235
<imageReference key="image" image="square.and.arrow.down.fill" catalog="system" symbolScale="default" renderingMode="template"/>
3336
</imageCell>
3437
</imageView>
35-
<box fixedFrame="YES" boxType="oldStyle" borderType="none" title="Title" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="6">
36-
<rect key="frame" x="40" y="0.0" width="293" height="82"/>
37-
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
38-
<view key="contentView" id="qh3-aM-KOn">
39-
<rect key="frame" x="0.0" y="0.0" width="293" height="82"/>
40-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
41-
<subviews>
42-
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7">
43-
<rect key="frame" x="28" y="22" width="259" height="14"/>
44-
<autoresizingMask key="autoresizingMask" widthSizable="YES"/>
45-
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="8">
46-
<font key="font" metaFont="smallSystem"/>
47-
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
48-
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
49-
</textFieldCell>
50-
</textField>
51-
<progressIndicator wantsLayer="YES" verticalHuggingPriority="750" fixedFrame="YES" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="9">
52-
<rect key="frame" x="8" y="42" width="277" height="12"/>
53-
<autoresizingMask key="autoresizingMask" widthSizable="YES"/>
54-
</progressIndicator>
55-
<popUpButton fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="10">
56-
<rect key="frame" x="2" y="56" width="283" height="22"/>
57-
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
58-
<popUpButtonCell key="cell" type="bevel" title=" " bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="bezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="13" id="11">
59-
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
60-
<font key="font" metaFont="smallSystem"/>
61-
<menu key="menu" title="OtherViews" id="12">
62-
<items>
63-
<menuItem title=" " state="on" id="13"/>
64-
</items>
65-
</menu>
66-
</popUpButtonCell>
67-
</popUpButton>
68-
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="14">
69-
<rect key="frame" x="28" y="5" width="259" height="14"/>
70-
<autoresizingMask key="autoresizingMask" widthSizable="YES"/>
71-
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="15">
72-
<font key="font" metaFont="smallSystemBold"/>
73-
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
74-
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
75-
</textFieldCell>
76-
</textField>
77-
<imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="16">
78-
<rect key="frame" x="7" y="21" width="16" height="16"/>
79-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
80-
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="topRight" imageScaling="proportionallyDown" id="17"/>
81-
</imageView>
82-
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="18">
83-
<rect key="frame" x="6" y="42" width="281" height="14"/>
84-
<autoresizingMask key="autoresizingMask" widthSizable="YES"/>
85-
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="19">
86-
<font key="font" metaFont="smallSystemBold"/>
87-
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
88-
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
89-
</textFieldCell>
90-
</textField>
91-
</subviews>
92-
</view>
93-
</box>
38+
<customView translatesAutoresizingMaskIntoConstraints="NO" id="xpF-cV-7ys">
39+
<rect key="frame" x="48" y="8" width="277" height="80"/>
40+
<subviews>
41+
<popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="10" userLabel="Files">
42+
<rect key="frame" x="-5" y="66" width="282" height="14"/>
43+
<popUpButtonCell key="cell" type="bevel" title=" " bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="bezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="13" id="11">
44+
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
45+
<font key="font" metaFont="smallSystem"/>
46+
<menu key="menu" title="OtherViews" id="12">
47+
<items>
48+
<menuItem title=" " state="on" id="13"/>
49+
</items>
50+
</menu>
51+
</popUpButtonCell>
52+
</popUpButton>
53+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="18" userLabel="Status Text">
54+
<rect key="frame" x="-2" y="44" width="281" height="14"/>
55+
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="19">
56+
<font key="font" metaFont="smallSystemBold"/>
57+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
58+
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
59+
</textFieldCell>
60+
</textField>
61+
<progressIndicator wantsLayer="YES" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="9">
62+
<rect key="frame" x="0.0" y="46" width="277" height="12"/>
63+
</progressIndicator>
64+
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="16" userLabel="Status Image">
65+
<rect key="frame" x="0.0" y="23" width="16" height="16"/>
66+
<constraints>
67+
<constraint firstAttribute="height" constant="16" id="TWI-sn-COS"/>
68+
<constraint firstAttribute="width" constant="16" id="nYR-V5-EGU"/>
69+
</constraints>
70+
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="topRight" imageScaling="proportionallyDown" id="17"/>
71+
</imageView>
72+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7" userLabel="Progress Text">
73+
<rect key="frame" x="22" y="24" width="257" height="14"/>
74+
<constraints>
75+
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="eri-6X-uIh"/>
76+
</constraints>
77+
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="8">
78+
<font key="font" metaFont="smallSystem"/>
79+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
80+
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
81+
</textFieldCell>
82+
</textField>
83+
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="14" userLabel="Status Message">
84+
<rect key="frame" x="22" y="2" width="257" height="14"/>
85+
<constraints>
86+
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="g5t-vC-LMI"/>
87+
</constraints>
88+
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="15">
89+
<font key="font" metaFont="smallSystemBold"/>
90+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
91+
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
92+
</textFieldCell>
93+
</textField>
94+
</subviews>
95+
<constraints>
96+
<constraint firstItem="7" firstAttribute="top" secondItem="9" secondAttribute="bottom" constant="8" symbolic="YES" id="4st-LA-JH6"/>
97+
<constraint firstItem="10" firstAttribute="leading" secondItem="xpF-cV-7ys" secondAttribute="leading" id="6qj-5L-iXF"/>
98+
<constraint firstAttribute="trailing" secondItem="14" secondAttribute="trailing" id="AKn-Ca-3EP"/>
99+
<constraint firstAttribute="height" constant="80" id="AbX-6j-zDT"/>
100+
<constraint firstItem="10" firstAttribute="top" secondItem="xpF-cV-7ys" secondAttribute="top" id="Kla-d5-iCd"/>
101+
<constraint firstItem="18" firstAttribute="leading" secondItem="xpF-cV-7ys" secondAttribute="leading" id="LlV-2G-h1N"/>
102+
<constraint firstItem="18" firstAttribute="top" secondItem="10" secondAttribute="bottom" constant="8" symbolic="YES" id="SNs-60-NTP"/>
103+
<constraint firstItem="7" firstAttribute="leading" secondItem="16" secondAttribute="trailing" constant="8" symbolic="YES" id="Wll-wc-ysN"/>
104+
<constraint firstItem="7" firstAttribute="width" secondItem="14" secondAttribute="width" id="ayd-gi-H4I"/>
105+
<constraint firstAttribute="trailing" secondItem="7" secondAttribute="trailing" id="bUw-IR-dNq"/>
106+
<constraint firstItem="16" firstAttribute="leading" secondItem="xpF-cV-7ys" secondAttribute="leading" id="bgj-yX-GLM"/>
107+
<constraint firstItem="9" firstAttribute="top" secondItem="10" secondAttribute="bottom" constant="8" symbolic="YES" id="ceC-3c-qli"/>
108+
<constraint firstAttribute="trailing" secondItem="18" secondAttribute="trailing" id="eXn-WE-bUS"/>
109+
<constraint firstItem="14" firstAttribute="top" secondItem="7" secondAttribute="bottom" constant="8" symbolic="YES" id="gb6-u4-jMI"/>
110+
<constraint firstAttribute="trailing" secondItem="10" secondAttribute="trailing" id="hib-pY-0rc"/>
111+
<constraint firstItem="9" firstAttribute="leading" secondItem="xpF-cV-7ys" secondAttribute="leading" id="kez-rL-ucY"/>
112+
<constraint firstItem="16" firstAttribute="top" secondItem="18" secondAttribute="bottom" constant="5" id="lgg-DH-Jwp"/>
113+
<constraint firstAttribute="trailing" secondItem="9" secondAttribute="trailing" id="niJ-Ds-jTr"/>
114+
</constraints>
115+
</customView>
94116
</subviews>
117+
<constraints>
118+
<constraint firstAttribute="bottom" secondItem="xpF-cV-7ys" secondAttribute="bottom" constant="8" id="9tb-bc-LXo"/>
119+
<constraint firstItem="4" firstAttribute="leading" secondItem="3" secondAttribute="leading" constant="8" id="NX9-b0-ijc"/>
120+
<constraint firstItem="xpF-cV-7ys" firstAttribute="top" secondItem="3" secondAttribute="top" constant="8" id="QY1-Ab-5QS"/>
121+
<constraint firstItem="xpF-cV-7ys" firstAttribute="leading" secondItem="4" secondAttribute="trailing" constant="8" symbolic="YES" id="R3a-Sz-DUH"/>
122+
<constraint firstItem="4" firstAttribute="top" secondItem="3" secondAttribute="top" constant="8" id="g20-gB-Lxw"/>
123+
<constraint firstAttribute="trailing" secondItem="xpF-cV-7ys" secondAttribute="trailing" constant="8" id="gHJ-W3-Tsa"/>
124+
</constraints>
95125
<connections>
96126
<outlet property="imageView" destination="4" id="QF0-pP-AYK"/>
97127
<outlet property="textField" destination="7" id="rQJ-Lo-9Ia"/>

0 commit comments

Comments
 (0)