UIレイアウトをHigh Sierraに調整

diff --git a/KCD/Base.lproj/PowerUpSupportViewController.xib b/KCD/Base.lproj/PowerUpSupportViewController.xib
index 122ef6c..4967a1f 100644 (file)
--- a/KCD/Base.lproj/PowerUpSupportViewController.xib
+++ b/KCD/Base.lproj/PowerUpSupportViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2659" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -192,13 +192,13 @@
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="b1J-je-IDl">
                         <font key="font" metaFont="system"/>
                         <segments>
-                            <segment label="All" width="35" selected="YES"/>
-                            <segment label="駆逐" width="39" tag="1"/>
-                            <segment label="軽巡" width="39" tag="2"/>
-                            <segment label="重巡" width="39" tag="3"/>
-                            <segment label="空母" width="39" tag="4"/>
-                            <segment label="戦艦" width="38" tag="5"/>
-                            <segment label="潜水" width="38" tag="6"/>
+                            <segment label="All" width="36" selected="YES"/>
+                            <segment label="駆逐" width="40" tag="1"/>
+                            <segment label="軽巡" width="40" tag="2"/>
+                            <segment label="重巡" width="40" tag="3"/>
+                            <segment label="空母" width="40" tag="4"/>
+                            <segment label="戦艦" width="39" tag="5"/>
+                            <segment label="潜水" width="39" tag="6"/>
                             <segment label="他" width="35" tag="7"/>
                         </segments>
                     </segmentedCell>

diff --git a/KCD/Base.lproj/ScreenshotListViewController.xib b/KCD/Base.lproj/ScreenshotListViewController.xib
index e9198dc..db8bc08 100644 (file)
--- a/KCD/Base.lproj/ScreenshotListViewController.xib
+++ b/KCD/Base.lproj/ScreenshotListViewController.xib
@@ -62,7 +62,7 @@
                 <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yAb-DI-6ut">
                     <rect key="frame" x="207" y="6" width="267" height="21"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="17" id="hwt-Fn-wJs"/>
+                        <constraint firstAttribute="height" constant="17" id="XIp-hm-YVf"/>
                     </constraints>
                     <sliderCell key="cell" continuous="YES" refusesFirstResponder="YES" state="on" alignment="left" minValue="0.20000000000000001" maxValue="0.90000000000000002" doubleValue="0.90000000000000002" tickMarkPosition="above" sliderType="linear" id="hO7-4z-A2O"/>
                     <connections>
@@ -73,8 +73,9 @@
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vkb-uY-8tN">
                     <rect key="frame" x="6" y="8" width="197" height="17"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="193" id="Dzl-ia-8qS"/>
-                        <constraint firstAttribute="height" constant="17" id="guK-c8-dLQ"/>
+                        <constraint firstAttribute="width" constant="193" id="Ifi-Y0-SQ0"/>
+                        <constraint firstAttribute="height" constant="17" id="dWO-hq-MmN"/>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="193" id="i0z-t7-7Pe"/>
                     </constraints>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="rWY-Vt-N4T">
                         <font key="font" metaFont="system"/>
@@ -91,15 +92,15 @@
                 </textField>
             </subviews>
             <constraints>
-                <constraint firstAttribute="bottom" secondItem="vkb-uY-8tN" secondAttribute="bottom" constant="8" id="PfF-7V-b9m"/>
-                <constraint firstItem="vkb-uY-8tN" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="8" id="U2X-gh-3E4"/>
+                <constraint firstAttribute="bottom" secondItem="vkb-uY-8tN" secondAttribute="bottom" constant="8" id="2zb-uv-Uh7"/>
+                <constraint firstItem="vkb-uY-8tN" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" constant="8" id="RjQ-sf-DLj"/>
                 <constraint firstAttribute="trailing" secondItem="7U1-Yk-pgg" secondAttribute="trailing" id="Wx3-wj-ptE"/>
                 <constraint firstItem="7U1-Yk-pgg" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" id="Yix-uG-z25"/>
                 <constraint firstItem="7U1-Yk-pgg" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="Zdh-8d-J9U"/>
-                <constraint firstAttribute="trailing" secondItem="yAb-DI-6ut" secondAttribute="trailing" constant="8" id="aGW-zm-Jyq"/>
                 <constraint firstAttribute="bottom" secondItem="7U1-Yk-pgg" secondAttribute="bottom" constant="33" id="jlB-Hy-hgZ"/>
-                <constraint firstItem="yAb-DI-6ut" firstAttribute="leading" secondItem="vkb-uY-8tN" secondAttribute="trailing" constant="8" id="qnm-O9-zdZ"/>
-                <constraint firstAttribute="bottom" secondItem="yAb-DI-6ut" secondAttribute="bottom" constant="8" id="wQw-rB-Vex"/>
+                <constraint firstAttribute="bottom" secondItem="yAb-DI-6ut" secondAttribute="bottom" constant="8" id="jqK-sB-xEP"/>
+                <constraint firstItem="yAb-DI-6ut" firstAttribute="leading" secondItem="vkb-uY-8tN" secondAttribute="trailing" constant="8" id="kXa-oy-UWz"/>
+                <constraint firstAttribute="trailing" secondItem="yAb-DI-6ut" secondAttribute="trailing" constant="8" id="kYI-5T-hXR"/>
             </constraints>
             <point key="canvasLocation" x="72" y="135"/>
         </customView>

diff --git a/KCD/Base.lproj/ShipViewController.xib b/KCD/Base.lproj/ShipViewController.xib
index 933b2f2..b532d2e 100644 (file)
--- a/KCD/Base.lproj/ShipViewController.xib
+++ b/KCD/Base.lproj/ShipViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -54,7 +54,7 @@
                                                 <rect key="frame" x="1" y="1" width="33" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="TkX-6h-nud">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="TkX-6h-nud">
                                                         <rect key="frame" x="0.0" y="0.0" width="33" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="戦艦" id="kIN-Yq-Hsm">
@@ -97,7 +97,7 @@
                                                 <rect key="frame" x="37" y="1" width="90" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="FL8-Ci-gLs">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="FL8-Ci-gLs">
                                                         <rect key="frame" x="13" y="0.0" width="77" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Graf Zeppelin改" id="E0R-q0-YIZ">
@@ -115,7 +115,7 @@
                                                             </binding>
                                                         </connections>
                                                     </textField>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="bx8-sm-mpL">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="bx8-sm-mpL">
                                                         <rect key="frame" x="0.0" y="0.0" width="18" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="4" id="OZv-SL-t2R">
@@ -163,7 +163,7 @@
                                                 <rect key="frame" x="130" y="1" width="27" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="ADf-j4-LNM">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="ADf-j4-LNM">
                                                         <rect key="frame" x="0.0" y="0.0" width="27" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="155" id="oRB-8b-aqE">
@@ -207,7 +207,7 @@
                                                 <rect key="frame" x="160" y="1" width="71" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="T6m-uC-OCK">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="T6m-uC-OCK">
                                                         <rect key="frame" x="0.0" y="0.0" width="71" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="1,999,999" id="GfR-h8-xZs">
@@ -251,7 +251,7 @@
                                                 <rect key="frame" x="234" y="1" width="73" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Mf3-eA-KSG">
+                                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="Mf3-eA-KSG">
                                                         <rect key="frame" x="0.0" y="0.0" width="73" height="17"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="1,000,000" id="sZk-i1-ld2">
@@ -310,13 +310,13 @@
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="b1J-je-IDl">
                         <font key="font" metaFont="system"/>
                         <segments>
-                            <segment label="All" width="35" selected="YES"/>
-                            <segment label="駆逐" width="39" tag="1"/>
-                            <segment label="軽巡" width="39" tag="2"/>
-                            <segment label="重巡" width="39" tag="3"/>
-                            <segment label="空母" width="39" tag="4"/>
-                            <segment label="戦艦" width="38" tag="5"/>
-                            <segment label="潜水" width="38" tag="6"/>
+                            <segment label="All" width="36" selected="YES"/>
+                            <segment label="駆逐" width="40" tag="1"/>
+                            <segment label="軽巡" width="40" tag="2"/>
+                            <segment label="重巡" width="40" tag="3"/>
+                            <segment label="空母" width="40" tag="4"/>
+                            <segment label="戦艦" width="39" tag="5"/>
+                            <segment label="潜水" width="39" tag="6"/>
                             <segment label="他" width="35" tag="7"/>
                         </segments>
                     </segmentedCell>
@@ -324,7 +324,7 @@
                         <binding destination="-2" name="selectedIndex" keyPath="selectedShipType" id="2oN-90-s3Y"/>
                     </connections>
                 </segmentedControl>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="FZQ-ab-vfc">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="FZQ-ab-vfc">
                     <rect key="frame" x="4" y="399" width="79" height="17"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="TeI-HB-SYu">
@@ -341,8 +341,8 @@
                         <binding destination="-3" name="font" keyPath="delegate.monospaceSystemFont13" id="qih-DP-UaC"/>
                     </connections>
                 </textField>
-                <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" id="y27-Oc-ZPX">
-                    <rect key="frame" x="82" y="399" width="49" height="17"/>
+                <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" allowsCharacterPickerTouchBarItem="YES" id="y27-Oc-ZPX">
+                    <rect key="frame" x="62" y="399" width="44" height="17"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="ZnJ-Q2-7ID">
                         <numberFormatter key="formatter" formatterBehavior="custom10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" maximumFractionDigits="3" id="qbi-EQ-2Ta"/>
@@ -354,16 +354,16 @@
                         <binding destination="-2" name="value" keyPath="standardDeviation" id="8z9-bZ-5Wk"/>
                     </connections>
                 </textField>
-                <segmentedControl verticalHuggingPriority="750" id="ii6-Wq-Zpd">
-                    <rect key="frame" x="143" y="396" width="176" height="20"/>
+                <segmentedControl verticalHuggingPriority="750" misplaced="YES" id="ii6-Wq-Zpd">
+                    <rect key="frame" x="110" y="396" width="209" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="fvt-PE-zAC">
                         <font key="font" metaFont="smallSystem"/>
                         <segments>
                             <segment label="経験値" width="40" selected="YES"/>
-                            <segment label="能力値1" width="40" tag="1"/>
-                            <segment label="能力値2" width="43" tag="2"/>
-                            <segment label="能力値3" width="44" tag="3"/>
+                            <segment label="能力値1" width="53" tag="1"/>
+                            <segment label="能力値2" width="55" tag="2"/>
+                            <segment label="能力値3" width="55" tag="3"/>
                         </segments>
                     </segmentedCell>
                     <connections>
@@ -371,6 +371,7 @@
                     </connections>
                 </segmentedControl>
             </subviews>
+            <point key="canvasLocation" x="139.5" y="168"/>
         </customView>
         <arrayController mode="entity" entityName="Ship" fetchPredicateFormat="id != -2" editable="NO" automaticallyPreparesContent="YES" automaticallyRearrangesObjects="YES" id="b8v-Gn-JZD" userLabel="Ship">
             <connections>
@@ -409,7 +410,7 @@
                                         <rect key="frame" x="1" y="1" width="116" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="8CZ-RA-Js4">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="8CZ-RA-Js4">
                                                 <rect key="frame" x="13" y="0.0" width="103" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Graf Zeppelin改" id="aP0-AF-p8o">
@@ -427,7 +428,7 @@
                                                     </binding>
                                                 </connections>
                                             </textField>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="NuW-lo-X8H">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="NuW-lo-X8H">
                                                 <rect key="frame" x="0.0" y="0.0" width="18" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="4" id="mgm-dk-Go2">
@@ -475,7 +476,7 @@
                                         <rect key="frame" x="120" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="gnC-bQ-LdV">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="gnC-bQ-LdV">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="9Ar-fp-gdx">
@@ -519,7 +520,7 @@
                                         <rect key="frame" x="158" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Qte-LH-dKo">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="Qte-LH-dKo">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="gDY-E8-ZO7">
@@ -563,7 +564,7 @@
                                         <rect key="frame" x="196" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Xkk-nD-yA6">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="Xkk-nD-yA6">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="VK3-hg-r5G">
@@ -607,7 +608,7 @@
                                         <rect key="frame" x="234" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="WAW-HY-8lt">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="WAW-HY-8lt">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="zkw-Cs-P16">
@@ -651,7 +652,7 @@
                                         <rect key="frame" x="272" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="E6J-lG-vFb">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="E6J-lG-vFb">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="j67-Nm-egV">
@@ -732,7 +733,7 @@
                                         <rect key="frame" x="1" y="1" width="116" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="fMV-SM-AiN">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="fMV-SM-AiN">
                                                 <rect key="frame" x="13" y="0.0" width="103" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Graf Zeppelin改" id="qTN-CE-m3C">
@@ -750,7 +751,7 @@
                                                     </binding>
                                                 </connections>
                                             </textField>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="bjq-G7-rC2">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="bjq-G7-rC2">
                                                 <rect key="frame" x="0.0" y="0.0" width="18" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="4" id="2jc-Tc-bi3">
@@ -798,7 +799,7 @@
                                         <rect key="frame" x="120" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="qNv-4r-Rd1">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="qNv-4r-Rd1">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="f2z-sF-nY6">
@@ -842,7 +843,7 @@
                                         <rect key="frame" x="158" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="RoO-Rj-gC0">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="RoO-Rj-gC0">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="xIh-mN-mWP">
@@ -886,7 +887,7 @@
                                         <rect key="frame" x="196" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="f4t-7Z-t0G">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="f4t-7Z-t0G">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="ZpB-Y2-aXM">
@@ -930,7 +931,7 @@
                                         <rect key="frame" x="234" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Y8Q-nF-GpS">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="Y8Q-nF-GpS">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="ud4-AG-iyT">
@@ -974,7 +975,7 @@
                                         <rect key="frame" x="272" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="YM4-4m-b63">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="YM4-4m-b63">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="nhX-U6-f4J">
@@ -1029,7 +1030,7 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
             <clipView key="contentView" id="MyI-d7-N9C">
                 <rect key="frame" x="1" y="0.0" width="309" height="351"/>
-                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="shipviewtable24" rowSizeStyle="automatic" headerView="TD0-tZ-Rbv" viewBased="YES" floatsGroupRows="NO" id="Js9-iC-cBR">
                         <rect key="frame" x="0.0" y="0.0" width="309" height="328"/>
@@ -1055,7 +1056,7 @@
                                         <rect key="frame" x="1" y="1" width="116" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="gYx-84-mVX">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="gYx-84-mVX">
                                                 <rect key="frame" x="13" y="0.0" width="103" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Graf Zeppelin改" id="rFz-UF-DW3">
@@ -1073,7 +1074,7 @@
                                                     </binding>
                                                 </connections>
                                             </textField>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="0aC-0W-cNh">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="0aC-0W-cNh">
                                                 <rect key="frame" x="0.0" y="0.0" width="18" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="4" id="wlp-wT-zu2">
@@ -1121,7 +1122,7 @@
                                         <rect key="frame" x="120" y="1" width="33" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Atr-NA-1eC">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="Atr-NA-1eC">
                                                 <rect key="frame" x="0.0" y="0.0" width="33" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="超長" id="c1z-5h-c1a">
@@ -1171,7 +1172,7 @@
                                         <rect key="frame" x="156" y="1" width="35" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="fdZ-P1-bmY">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="fdZ-P1-bmY">
                                                 <rect key="frame" x="0.0" y="0.0" width="35" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="高速" id="iXJ-TB-lB4">
@@ -1218,7 +1219,7 @@
                                         <rect key="frame" x="194" y="1" width="113" height="17"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Dxo-MU-e5x" customClass="BorderTextField" customModule="KCD">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="Dxo-MU-e5x" customClass="BorderTextField" customModule="KCD">
                                                 <rect key="frame" x="0.0" y="0.0" width="27" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="Wmi-vP-xgv">
@@ -1235,7 +1236,7 @@
                                                     </binding>
                                                 </connections>
                                             </textField>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="B9I-n0-1Ty" customClass="BorderTextField" customModule="KCD">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="B9I-n0-1Ty" customClass="BorderTextField" customModule="KCD">
                                                 <rect key="frame" x="26" y="0.0" width="27" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="auB-gy-eyw">
@@ -1252,7 +1253,7 @@
                                                     </binding>
                                                 </connections>
                                             </textField>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="Udq-Mg-VZK" customClass="BorderTextField" customModule="KCD">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="Udq-Mg-VZK" customClass="BorderTextField" customModule="KCD">
                                                 <rect key="frame" x="52" y="0.0" width="27" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="853-eN-blb">
@@ -1269,7 +1270,7 @@
                                                     </binding>
                                                 </connections>
                                             </textField>
-                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="bLl-3Y-We0" customClass="BorderTextField" customModule="KCD">
+                                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="bLl-3Y-We0" customClass="BorderTextField" customModule="KCD">
                                                 <rect key="frame" x="78" y="0.0" width="27" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
                                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="100" id="gcn-h6-VyK">

diff --git a/KCD/Base.lproj/StrengthenListViewController.xib b/KCD/Base.lproj/StrengthenListViewController.xib
index 05866a6..042db04 100644 (file)
--- a/KCD/Base.lproj/StrengthenListViewController.xib
+++ b/KCD/Base.lproj/StrengthenListViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13529"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -68,7 +68,7 @@
                                 <tableViewGridLines key="gridStyleMask" horizontal="YES"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
-                                    <tableColumn width="306" minWidth="40" maxWidth="1000" id="j4m-Vi-Tl9">
+                                    <tableColumn identifier="" width="306" minWidth="40" maxWidth="1000" id="j4m-Vi-Tl9">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -368,17 +368,17 @@
                     </scroller>
                 </scrollView>
                 <segmentedControl verticalHuggingPriority="750" misplaced="YES" id="K6N-di-SOa">
-                    <rect key="frame" x="4" y="346" width="315" height="20"/>
+                    <rect key="frame" x="4" y="346" width="315" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="Ury-Lz-cPA">
                         <font key="font" metaFont="smallSystem"/>
                         <segments>
-                            <segment label="All" width="41" selected="YES"/>
-                            <segment label="主砲" width="42" tag="1"/>
-                            <segment label="副砲/魚雷/機銃" width="74"/>
-                            <segment label="航空機"/>
-                            <segment label="電探/対潜" width="53"/>
-                            <segment label="そのた"/>
+                            <segment label="All" width="37" selected="YES"/>
+                            <segment label="主砲" width="40" tag="1"/>
+                            <segment label="副砲/魚雷/機銃" width="88"/>
+                            <segment label="航空機" width="43"/>
+                            <segment label="電探/対潜" width="60"/>
+                            <segment label="そのた" width="41"/>
                         </segments>
                     </segmentedCell>
                     <connections>