ValueTransformerとかで表示するようにした

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index e328d12..d5face9 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -146,6 +146,8 @@
                F4D6BC9D1AA1FAC700742FEB /* HMUITestWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4D6BC9B1AA1FAC600742FEB /* HMUITestWindowController.xib */; };
                F4D6BCA91AA298FD00742FEB /* HMShipDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D6BCA71AA298FD00742FEB /* HMShipDetailViewController.m */; };
                F4D6BCAA1AA298FD00742FEB /* HMShipDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4D6BCA81AA298FD00742FEB /* HMShipDetailViewController.xib */; };
+               F4D6BCAD1AA2A60900742FEB /* HMSokuTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D6BCAC1AA2A60900742FEB /* HMSokuTransformer.m */; };
+               F4D6BCB01AA2A97200742FEB /* HMLengTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4D6BCAF1AA2A97200742FEB /* HMLengTransformer.m */; };
                F4E33B5818BF5F67005B8C07 /* HMMemberSlotItemCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4E33B5718BF5F67005B8C07 /* HMMemberSlotItemCommand.m */; };
                F4E7802818DBD2A00011BC4C /* HMGetShipCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4E7802718DBD2A00011BC4C /* HMGetShipCommand.m */; };
                F4E7802B18DC3A820011BC4C /* HMLocalDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = F4E7802A18DC3A820011BC4C /* HMLocalDataStore.m */; };
@@ -420,6 +422,10 @@
                F4D6BCA61AA298FD00742FEB /* HMShipDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMShipDetailViewController.h; sourceTree = "<group>"; };
                F4D6BCA71AA298FD00742FEB /* HMShipDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMShipDetailViewController.m; sourceTree = "<group>"; };
                F4D6BCA81AA298FD00742FEB /* HMShipDetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HMShipDetailViewController.xib; sourceTree = "<group>"; };
+               F4D6BCAB1AA2A60900742FEB /* HMSokuTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMSokuTransformer.h; sourceTree = "<group>"; };
+               F4D6BCAC1AA2A60900742FEB /* HMSokuTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMSokuTransformer.m; sourceTree = "<group>"; };
+               F4D6BCAE1AA2A97100742FEB /* HMLengTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMLengTransformer.h; sourceTree = "<group>"; };
+               F4D6BCAF1AA2A97200742FEB /* HMLengTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMLengTransformer.m; sourceTree = "<group>"; };
                F4E33B5618BF5F67005B8C07 /* HMMemberSlotItemCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberSlotItemCommand.h; sourceTree = "<group>"; };
                F4E33B5718BF5F67005B8C07 /* HMMemberSlotItemCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMemberSlotItemCommand.m; sourceTree = "<group>"; };
                F4E7802618DBD2A00011BC4C /* HMGetShipCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMGetShipCommand.h; sourceTree = "<group>"; };
@@ -822,6 +828,10 @@
                                F4D6BCA61AA298FD00742FEB /* HMShipDetailViewController.h */,
                                F4D6BCA71AA298FD00742FEB /* HMShipDetailViewController.m */,
                                F4D6BCA81AA298FD00742FEB /* HMShipDetailViewController.xib */,
+                               F4D6BCAB1AA2A60900742FEB /* HMSokuTransformer.h */,
+                               F4D6BCAC1AA2A60900742FEB /* HMSokuTransformer.m */,
+                               F4D6BCAE1AA2A97100742FEB /* HMLengTransformer.h */,
+                               F4D6BCAF1AA2A97200742FEB /* HMLengTransformer.m */,
                        );
                        name = TestAndDebug;
                        path = KCD;
@@ -974,6 +984,7 @@
                                F4B1E30819C73B6A00805879 /* HMSuppliesCell.m in Sources */,
                                F4A3AD8E19BB220000FDBF80 /* HMMaskInfomation.m in Sources */,
                                F4E7802E18DC3AF00011BC4C /* LocalData.xcdatamodeld in Sources */,
+                               F4D6BCAD1AA2A60900742FEB /* HMSokuTransformer.m in Sources */,
                                F4131ED5190F63D8004F7F9A /* HMUpdateSlotItemCommand.m in Sources */,
                                F4C1190518A71AEA005D5B25 /* HMJSONReciever.m in Sources */,
                                F44AB24119E8252600F217AF /* HMKCSlotItemObject+Extensions.m in Sources */,
@@ -984,6 +995,7 @@
                                F4E33B5818BF5F67005B8C07 /* HMMemberSlotItemCommand.m in Sources */,
                                F4C1190B18A74DF0005D5B25 /* HMJSONCommand.m in Sources */,
                                F44AB23E19E824D700F217AF /* HMKCSlotItemObject.m in Sources */,
+                               F4D6BCB01AA2A97200742FEB /* HMLengTransformer.m in Sources */,
                                F4B414F518B1888800468DAF /* HMMasterFurnitureCommand.m in Sources */,
                                F4AA0601192E1FE900844688 /* HMBattleCommand.m in Sources */,
                                F43F3D521A39CC7500D6DAF7 /* HMKCMasterSlotItemObject.m in Sources */,

diff --git a/KCD/HMShipDetailViewController.xib b/KCD/HMShipDetailViewController.xib
index 1d4ee9e..cf8838b 100644 (file)
--- a/KCD/HMShipDetailViewController.xib
+++ b/KCD/HMShipDetailViewController.xib
@@ -15,17 +15,17 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <box autoresizesSubviews="NO" title="Box" boxType="oldStyle" borderType="line" titlePosition="noTitle" id="UcL-be-VtO">
-            <rect key="frame" x="0.0" y="0.0" width="266" height="147"/>
+            <rect key="frame" x="0.0" y="1" width="263" height="140"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <view key="contentView">
-                <rect key="frame" x="1" y="1" width="264" height="145"/>
+                <rect key="frame" x="1" y="1" width="261" height="138"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="lOd-8R-NeB">
-                        <rect key="frame" x="3" y="120" width="126" height="22"/>
+                        <rect key="frame" x="3" y="117" width="105" height="19"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Prinz Eugen改" id="gNM-OH-sPb">
-                            <font key="font" metaFont="system" size="18"/>
+                            <font key="font" metaFont="system" size="15"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -34,10 +34,10 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="uli-H9-olO">
-                        <rect key="frame" x="127" y="120" width="44" height="16"/>
+                        <rect key="frame" x="124" y="117" width="44" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Lv.123" id="R4E-HW-TLi">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -50,23 +50,23 @@
                         </connections>
                     </textField>
                     <customView id="4aK-wq-q5Q" customClass="HMSuppliesView">
-                        <rect key="frame" x="229" y="123" width="31" height="11"/>
+                        <rect key="frame" x="226" y="120" width="31" height="11"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     </customView>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="pfp-C2-pfi">
-                        <rect key="frame" x="198" y="102" width="40" height="16"/>
+                        <rect key="frame" x="195" y="100" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="回避：" id="vGR-g6-P0T">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="wsV-fA-ftg">
-                        <rect key="frame" x="234" y="102" width="27" height="16"/>
+                        <rect key="frame" x="231" y="100" width="27" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="555" id="PoO-j6-7dC">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -79,19 +79,19 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="jrs-5q-3Dq">
-                        <rect key="frame" x="3" y="102" width="40" height="16"/>
+                        <rect key="frame" x="3" y="100" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="火力：" id="vq7-bv-bMS">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="MhK-xT-BZ5">
-                        <rect key="frame" x="39" y="102" width="27" height="16"/>
+                        <rect key="frame" x="39" y="100" width="27" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="555" id="x4N-nW-RuR">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -104,19 +104,19 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="ggt-pS-tUa">
-                        <rect key="frame" x="3" y="86" width="40" height="16"/>
+                        <rect key="frame" x="3" y="84" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="対空：" id="HVr-wh-nse">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="ODP-3j-7pa">
-                        <rect key="frame" x="39" y="86" width="27" height="16"/>
+                        <rect key="frame" x="39" y="84" width="27" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="555" id="lZS-T9-P53">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -129,19 +129,19 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="5Jb-be-v4i">
-                        <rect key="frame" x="68" y="102" width="40" height="16"/>
+                        <rect key="frame" x="67" y="100" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="装甲：" id="MNE-NV-RXW">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="v2z-U7-peN">
-                        <rect key="frame" x="104" y="102" width="27" height="16"/>
+                        <rect key="frame" x="103" y="100" width="27" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="555" id="x2P-ET-49C">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -154,37 +154,40 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="i0a-YS-6bV">
-                        <rect key="frame" x="68" y="86" width="40" height="16"/>
+                        <rect key="frame" x="67" y="84" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="搭載：" id="C7w-uZ-DOB">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="8M3-F9-HrI">
-                        <rect key="frame" x="104" y="86" width="27" height="16"/>
+                        <rect key="frame" x="103" y="84" width="27" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="555" id="1HF-EB-M7w">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
+                        <connections>
+                            <binding destination="LyA-xZ-gxq" name="value" keyPath="selection.totalEquipment" id="EO8-em-ZeA"/>
+                        </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="b3l-fI-ksA">
-                        <rect key="frame" x="133" y="102" width="40" height="16"/>
+                        <rect key="frame" x="131" y="100" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="雷装：" id="hNd-Sa-XKk">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="B8Q-yY-l7r">
-                        <rect key="frame" x="169" y="102" width="27" height="16"/>
+                        <rect key="frame" x="167" y="100" width="27" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="555" id="wHY-1d-FGU">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -197,19 +200,19 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="rk6-5V-xd4">
-                        <rect key="frame" x="133" y="86" width="40" height="16"/>
+                        <rect key="frame" x="131" y="84" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="対潜：" id="DrM-F1-N4G">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="7JJ-Y7-dXA">
-                        <rect key="frame" x="169" y="86" width="27" height="16"/>
+                        <rect key="frame" x="167" y="84" width="27" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="555" id="Pjz-Ri-U8t">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -222,40 +225,44 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="BvS-Ih-RXB">
-                        <rect key="frame" x="3" y="70" width="40" height="16"/>
+                        <rect key="frame" x="3" y="68" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="速力：" id="DTr-6e-vRU">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="OYH-VA-HMm">
-                        <rect key="frame" x="39" y="70" width="28" height="16"/>
+                        <rect key="frame" x="36" y="68" width="28" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="高速" id="adr-PV-kwo">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
-                            <binding destination="LyA-xZ-gxq" name="value" keyPath="selection.master_ship.soku" id="slL-eO-9zc"/>
+                            <binding destination="LyA-xZ-gxq" name="value" keyPath="selection.master_ship.soku" id="mgy-5k-rOE">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">HMSokuTransformer</string>
+                                </dictionary>
+                            </binding>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="vst-xl-EJR">
-                        <rect key="frame" x="198" y="86" width="40" height="16"/>
+                        <rect key="frame" x="195" y="84" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="索敵：" id="k2e-QS-e7j">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="31D-yf-TJc">
-                        <rect key="frame" x="234" y="86" width="27" height="16"/>
+                        <rect key="frame" x="231" y="84" width="27" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="555" id="Ugm-q8-2XR">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -268,40 +275,44 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="hFr-EX-ZW8">
-                        <rect key="frame" x="68" y="70" width="40" height="16"/>
+                        <rect key="frame" x="67" y="68" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="射程：" id="ISZ-KQ-UWe">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="A8T-Ta-7D7">
-                        <rect key="frame" x="104" y="70" width="28" height="16"/>
+                        <rect key="frame" x="100" y="68" width="28" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="超長" id="gqh-bT-H4d">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
-                            <binding destination="LyA-xZ-gxq" name="value" keyPath="selection.master_ship.leng" id="4bZ-Hk-zeI"/>
+                            <binding destination="LyA-xZ-gxq" name="value" keyPath="selection.master_ship.leng" id="2J8-Ir-DRz">
+                                <dictionary key="options">
+                                    <string key="NSValueTransformerName">HMLengTransformer</string>
+                                </dictionary>
+                            </binding>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Ywj-Nl-nkD">
-                        <rect key="frame" x="133" y="70" width="40" height="16"/>
+                        <rect key="frame" x="131" y="68" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="運：" id="B2R-cW-MAz">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="wCA-ZP-hgS">
-                        <rect key="frame" x="169" y="70" width="27" height="16"/>
+                        <rect key="frame" x="167" y="68" width="27" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="555" id="dWU-0T-WgZ">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -314,46 +325,46 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="IuM-Cf-0Wz">
-                        <rect key="frame" x="23" y="51" width="155" height="16"/>
+                        <rect key="frame" x="23" y="50" width="155" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="10cm連装高角砲+高射装置" id="ffa-WS-hV4">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="yEC-6w-mfV">
-                        <rect key="frame" x="23" y="35" width="155" height="16"/>
+                        <rect key="frame" x="23" y="34" width="155" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="12.7cm連装高角砲(後期型)" id="dHd-MZ-ogJ">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="TcK-Cm-oHt">
-                        <rect key="frame" x="23" y="19" width="155" height="16"/>
+                        <rect key="frame" x="23" y="18" width="155" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="35.6cm連装砲(ダズル迷彩)" id="3GI-CW-8ep">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="VcC-xJ-Zgy">
-                        <rect key="frame" x="23" y="3" width="155" height="16"/>
+                        <rect key="frame" x="23" y="2" width="155" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="10cm連装高角砲+高射装置" id="TxG-oA-ZZ9">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <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" id="dqM-rk-aUD">
-                        <rect key="frame" x="3" y="51" width="20" height="16"/>
+                        <rect key="frame" x="3" y="50" width="20" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="99" id="h02-po-2nW">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -362,10 +373,10 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="jK6-e9-Ttj">
-                        <rect key="frame" x="3" y="35" width="20" height="16"/>
+                        <rect key="frame" x="3" y="34" width="20" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="99" id="s0p-Z1-nkd">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -374,10 +385,10 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Ym9-Cq-w68">
-                        <rect key="frame" x="3" y="19" width="20" height="16"/>
+                        <rect key="frame" x="3" y="18" width="20" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="99" id="9rQ-J5-5V8">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -386,10 +397,10 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="9kc-Rz-6Nh">
-                        <rect key="frame" x="3" y="3" width="20" height="16"/>
+                        <rect key="frame" x="3" y="2" width="20" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="99" id="gno-ak-ho2">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -398,7 +409,7 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="StE-9n-Hmk">
-                        <rect key="frame" x="198" y="70" width="40" height="16"/>
+                        <rect key="frame" x="195" y="68" width="40" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="体調：" id="IJG-UT-PzU">
                             <font key="font" size="12" name="AquaKana"/>
@@ -407,10 +418,10 @@
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="n0h-2O-9Yd">
-                        <rect key="frame" x="234" y="70" width="27" height="16"/>
+                        <rect key="frame" x="231" y="68" width="27" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="555" id="QbZ-FH-GXS">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
@@ -423,7 +434,7 @@
                         </connections>
                     </textField>
                     <textField verticalHuggingPriority="750" id="yEg-Ft-id5">
-                        <rect key="frame" x="211" y="8" width="48" height="16"/>
+                        <rect key="frame" x="208" y="7" width="48" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="pmT-Un-aP5">
                             <font key="font" metaFont="miniSystem"/>
@@ -435,22 +446,22 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="xtg-d9-8ZI">
-                        <rect key="frame" x="171" y="120" width="56" height="16"/>
+                        <rect key="frame" x="168" y="117" width="56" height="16"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="999/999" id="eHT-bW-VWQ">
-                            <font key="font" metaFont="controlContent"/>
+                            <font key="font" metaFont="cellTitle"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                         <connections>
-                            <binding destination="LyA-xZ-gxq" name="displayPatternValue1" keyPath="selection.nowhp" id="xdY-qy-JLX">
+                            <binding destination="LyA-xZ-gxq" name="displayPatternValue2" keyPath="selection.maxhp" previousBinding="xdY-qy-JLX" id="RCk-76-d34">
                                 <dictionary key="options">
                                     <string key="NSDisplayPattern">%{value1}@/%{value2}@</string>
                                     <string key="NSNoSelectionPlaceholder">-</string>
                                     <string key="NSNullPlaceholder">-</string>
                                 </dictionary>
                             </binding>
-                            <binding destination="LyA-xZ-gxq" name="displayPatternValue2" keyPath="selection.maxhp" previousBinding="xdY-qy-JLX" id="RCk-76-d34">
+                            <binding destination="LyA-xZ-gxq" name="displayPatternValue1" keyPath="selection.nowhp" id="xdY-qy-JLX">
                                 <dictionary key="options">
                                     <string key="NSDisplayPattern">%{value1}@/%{value2}@</string>
                                     <string key="NSNoSelectionPlaceholder">-</string>
@@ -460,7 +471,7 @@
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qGA-Ee-BqT">
-                        <rect key="frame" x="223" y="33" width="38" height="17"/>
+                        <rect key="frame" x="220" y="32" width="38" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="dSj-Wd-0im">
                             <font key="font" metaFont="system"/>
@@ -476,12 +487,12 @@
             <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
             <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <font key="titleFont" metaFont="system"/>
-            <point key="canvasLocation" x="189" y="435.5"/>
+            <point key="canvasLocation" x="187.5" y="432"/>
         </box>
         <objectController mode="entity" entityName="Ship" editable="NO" automaticallyPreparesContent="YES" id="LyA-xZ-gxq">
             <connections>
-                <binding destination="-2" name="contentObject" keyPath="representedObject" id="AqT-Ic-sXo"/>
                 <binding destination="-2" name="managedObjectContext" keyPath="managedObjectContext" id="s3F-fn-EKY"/>
+                <binding destination="-2" name="contentObject" keyPath="representedObject" id="AqT-Ic-sXo"/>
             </connections>
         </objectController>
     </objects>

diff --git a/KCD/HMUITestWindowController.xib b/KCD/HMUITestWindowController.xib
index cf95dde..0929b00 100644 (file)
--- a/KCD/HMUITestWindowController.xib
+++ b/KCD/HMUITestWindowController.xib
@@ -23,7 +23,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView id="Lxs-Lw-GIx">
-                        <rect key="frame" x="7" y="65" width="266" height="147"/>
+                        <rect key="frame" x="7" y="72" width="263" height="140"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     </customView>
                 </subviews>