Some new layout

This commit is contained in:
Selim Mustafaev 2022-07-08 00:46:32 +03:00
parent 2fae386797
commit 306f6b6163
3 changed files with 53 additions and 27 deletions

View File

@ -12,12 +12,12 @@
<key>AutoCat2.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
<key>AutoCat2Mac.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
<key>AutoCat2UITests.testExample.xcscheme</key>
<dict>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21179.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="ANK-bM-ijm">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21208.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="ANK-bM-ijm">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21179.7"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21208.1"/>
<capability name="NSView safe area layout guides" minToolsVersion="12.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -733,12 +733,12 @@
<scene sceneID="HHJ-M8-hIB">
<objects>
<viewController storyboardIdentifier="CheckController" id="XFl-Wx-eYr" customClass="CheckController" customModule="AutoCat2Mac" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" misplaced="YES" id="qCL-3f-aoO">
<rect key="frame" x="0.0" y="0.0" width="316" height="181"/>
<view key="view" id="qCL-3f-aoO">
<rect key="frame" x="0.0" y="0.0" width="328" height="229"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="93a-kE-ZA0">
<rect key="frame" x="1" y="1" width="154" height="32"/>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="93a-kE-ZA0">
<rect key="frame" x="9" y="9" width="154" height="32"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="140" id="aw4-k5-7pa"/>
</constraints>
@ -749,9 +749,12 @@
Gw
</string>
</buttonCell>
<connections>
<action selector="onCancel:" target="XFl-Wx-eYr" id="sQd-Ye-TxD"/>
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MTd-tE-Cey">
<rect key="frame" x="18" y="119" width="280" height="26"/>
<rect key="frame" x="18" y="183" width="292" height="26"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Check new plate number" id="gQS-6S-oEK">
<font key="font" textStyle="title1" name=".SFNS-Regular"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@ -759,7 +762,7 @@ Gw
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PMS-6j-xbV">
<rect key="frame" x="58" y="52" width="200" height="43"/>
<rect key="frame" x="64" y="116" width="200" height="43"/>
<constraints>
<constraint firstAttribute="width" constant="200" id="fdh-Ch-kwi"/>
</constraints>
@ -769,8 +772,15 @@ Gw
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6Bn-HZ-aid">
<rect key="frame" x="157" y="1" width="154" height="32"/>
<progressIndicator hidden="YES" maxValue="100" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="cWb-uY-s69">
<rect key="frame" x="148" y="60" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="GFT-bK-Ak6"/>
<constraint firstAttribute="height" constant="32" id="Gso-V8-5KF"/>
</constraints>
</progressIndicator>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6Bn-HZ-aid">
<rect key="frame" x="165" y="9" width="154" height="32"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="140" id="Sqt-aL-ILa"/>
</constraints>
@ -778,32 +788,39 @@ Gw
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="onCheck:" target="XFl-Wx-eYr" id="LoP-Ss-gjW"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="MTd-tE-Cey" firstAttribute="top" secondItem="qCL-3f-aoO" secondAttribute="top" constant="20" symbolic="YES" id="1hz-As-vMj"/>
<constraint firstItem="6Bn-HZ-aid" firstAttribute="top" secondItem="PMS-6j-xbV" secondAttribute="bottom" constant="24" id="4f6-xb-Jra"/>
<constraint firstAttribute="trailing" secondItem="6Bn-HZ-aid" secondAttribute="trailing" constant="8" id="7gA-CT-ZsC"/>
<constraint firstItem="93a-kE-ZA0" firstAttribute="leading" secondItem="qCL-3f-aoO" secondAttribute="leading" constant="8" id="KwZ-5h-7cw"/>
<constraint firstAttribute="bottom" secondItem="6Bn-HZ-aid" secondAttribute="bottom" constant="8" id="TeE-Dj-sRe"/>
<constraint firstAttribute="trailing" secondItem="6Bn-HZ-aid" secondAttribute="trailing" constant="16" id="7gA-CT-ZsC"/>
<constraint firstItem="93a-kE-ZA0" firstAttribute="leading" secondItem="qCL-3f-aoO" secondAttribute="leading" constant="16" id="KwZ-5h-7cw"/>
<constraint firstItem="6Bn-HZ-aid" firstAttribute="top" secondItem="cWb-uY-s69" secondAttribute="bottom" constant="24" id="MMM-F5-rgD"/>
<constraint firstAttribute="bottom" secondItem="6Bn-HZ-aid" secondAttribute="bottom" constant="16" id="TeE-Dj-sRe"/>
<constraint firstItem="PMS-6j-xbV" firstAttribute="top" secondItem="MTd-tE-Cey" secondAttribute="bottom" constant="24" id="b81-2u-K2K"/>
<constraint firstItem="PMS-6j-xbV" firstAttribute="centerX" secondItem="qCL-3f-aoO" secondAttribute="centerX" id="dNS-Q5-yFq"/>
<constraint firstAttribute="bottom" secondItem="93a-kE-ZA0" secondAttribute="bottom" constant="8" id="g9K-lY-ds3"/>
<constraint firstItem="6Bn-HZ-aid" firstAttribute="leading" secondItem="93a-kE-ZA0" secondAttribute="trailing" constant="8" id="iiJ-9b-2Jx"/>
<constraint firstItem="cWb-uY-s69" firstAttribute="top" secondItem="PMS-6j-xbV" secondAttribute="bottom" constant="24" id="djF-Ft-Efx"/>
<constraint firstItem="cWb-uY-s69" firstAttribute="centerX" secondItem="qCL-3f-aoO" secondAttribute="centerX" id="e9q-h1-gr1"/>
<constraint firstAttribute="bottom" secondItem="93a-kE-ZA0" secondAttribute="bottom" constant="16" id="g9K-lY-ds3"/>
<constraint firstItem="6Bn-HZ-aid" firstAttribute="leading" secondItem="93a-kE-ZA0" secondAttribute="trailing" constant="16" id="iiJ-9b-2Jx"/>
<constraint firstItem="MTd-tE-Cey" firstAttribute="leading" secondItem="qCL-3f-aoO" secondAttribute="leading" constant="20" symbolic="YES" id="iwp-bD-Tyz"/>
<constraint firstItem="93a-kE-ZA0" firstAttribute="top" secondItem="cWb-uY-s69" secondAttribute="bottom" constant="24" id="lsA-G2-mW5"/>
<constraint firstItem="93a-kE-ZA0" firstAttribute="width" secondItem="6Bn-HZ-aid" secondAttribute="width" id="rde-Pn-h9P"/>
<constraint firstAttribute="trailing" secondItem="MTd-tE-Cey" secondAttribute="trailing" constant="20" symbolic="YES" id="uEZ-qE-45L"/>
<constraint firstItem="93a-kE-ZA0" firstAttribute="top" secondItem="PMS-6j-xbV" secondAttribute="bottom" constant="24" id="w77-80-Ggq"/>
</constraints>
</view>
<connections>
<outlet property="cancelButton" destination="93a-kE-ZA0" id="5bF-Bh-NP8"/>
<outlet property="checkButton" destination="6Bn-HZ-aid" id="peV-8h-Mzp"/>
<outlet property="progress" destination="cWb-uY-s69" id="d4r-Za-9Tc"/>
<outlet property="textField" destination="PMS-6j-xbV" id="hTZ-nV-TIE"/>
</connections>
</viewController>
<customObject id="8Mg-sX-vG1" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="746" y="1462.5"/>
<point key="canvasLocation" x="746" y="1503"/>
</scene>
<!--Main Split Controller-->
<scene sceneID="p66-TL-mk9">
@ -830,18 +847,18 @@ Gw
<scene sceneID="yd4-3O-Y98">
<objects>
<viewController id="8Zn-vq-a7w" customClass="SidebarController" customModule="AutoCat2Mac" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="V8j-Wf-y5G">
<rect key="frame" x="0.0" y="0.0" width="149" height="489"/>
<view key="view" misplaced="YES" id="V8j-Wf-y5G">
<rect key="frame" x="0.0" y="0.0" width="149" height="541"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="28" horizontalPageScroll="10" verticalLineScroll="28" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zbf-Sa-jlX">
<rect key="frame" x="0.0" y="0.0" width="149" height="489"/>
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zbf-Sa-jlX">
<rect key="frame" x="0.0" y="0.0" width="149" height="593"/>
<clipView key="contentView" drawsBackground="NO" id="SqE-1u-BH2">
<rect key="frame" x="0.0" y="0.0" width="149" height="489"/>
<rect key="frame" x="0.0" y="0.0" width="149" height="593"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveName="Sidebar" rowHeight="28" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="13" autosaveExpandedItems="YES" outlineTableColumn="RdD-fI-vom" id="d2l-fY-90X">
<rect key="frame" x="0.0" y="0.0" width="149" height="489"/>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" multipleSelection="NO" autosaveName="Sidebar" rowHeight="27" rowSizeStyle="automatic" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="13" autosaveExpandedItems="YES" outlineTableColumn="RdD-fI-vom" id="d2l-fY-90X">
<rect key="frame" x="0.0" y="0.0" width="149" height="593"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="0.0"/>
<color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>

View File

@ -12,6 +12,7 @@ class CheckController: NSViewController {
@IBOutlet weak var checkButton: NSButton!
@IBOutlet weak var cancelButton: NSButton!
@IBOutlet weak var textField: NSTextField!
@IBOutlet weak var progress: NSProgressIndicator!
override func viewDidLoad() {
super.viewDidLoad()
@ -20,4 +21,12 @@ class CheckController: NSViewController {
cancelButton.controlSize = .large
textField.controlSize = .large
}
@IBAction func onCancel(_ sender: NSButton) {
view.window?.close()
}
@IBAction func onCheck(_ sender: NSButton) {
}
}