From 8c327c14891f9cb6b46980a0ec4556e2ae44d20b Mon Sep 17 00:00:00 2001
From: masakih <masakih@users.sourceforge.jp>
Date: Thu, 27 Mar 2014 00:48:32 +0900
Subject: [PATCH] =?utf8?q?=E5=B1=A5=E6=AD=B4=E3=81=AE=E3=82=BD=E3=83=BC?=
 =?utf8?q?=E3=83=88=E3=81=AA=E3=81=A8=E3=82=99=E3=82=92=E4=BF=9D=E5=AD=98?=
 =?utf8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
 =?utf8?q?=20#50208?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KCD/HMHistoryWindowController.xib | 63 +++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 26 deletions(-)

diff --git a/KCD/HMHistoryWindowController.xib b/KCD/HMHistoryWindowController.xib
index d0bd723d..f5e30563 100644
--- a/KCD/HMHistoryWindowController.xib
+++ b/KCD/HMHistoryWindowController.xib
@@ -12,7 +12,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application"/>
-        <window title="履歴" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="F0z-JX-Cv5">
+        <window title="履歴" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="HistoryWindow" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="718" height="528"/>
@@ -33,19 +33,19 @@
                                     <subviews>
                                         <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="e8j-V0-zb3">
                                             <rect key="frame" x="17" y="8" width="638" height="455"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <clipView key="contentView" id="fQm-u6-BcB">
                                                 <rect key="frame" x="1" y="17" width="636" height="437"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" autosaveColumns="NO" headerView="S87-OC-vhS" id="aCA-Gg-AUV">
+                                                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" autosaveName="kaihatuHistory" headerView="S87-OC-vhS" id="aCA-Gg-AUV">
                                                         <rect key="frame" x="0.0" y="0.0" width="636" height="437"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <size key="intercellSpacing" width="3" height="2"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                         <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                         <tableColumns>
-                                                            <tableColumn editable="NO" width="151" minWidth="40" maxWidth="1000" id="3oz-eZ-JDf">
+                                                            <tableColumn identifier="date" editable="NO" width="145" minWidth="40" maxWidth="1000" id="3oz-eZ-JDf">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="日付">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -62,8 +62,8 @@
                                                                     <binding destination="cv5-a8-9nJ" name="value" keyPath="arrangedObjects.date" id="0ns-cn-0ij"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="80" minWidth="40" maxWidth="1000" id="LGK-3f-aFf">
-                                                                <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="開発">
+                                                            <tableColumn identifier="name" editable="NO" width="108" minWidth="40" maxWidth="1000" id="LGK-3f-aFf">
+                                                                <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="装備">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -78,7 +78,7 @@
                                                                     <binding destination="cv5-a8-9nJ" name="value" keyPath="arrangedObjects.name" id="uLM-9Y-zfA"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="124" minWidth="10" maxWidth="3.4028234663852886e+38" id="9eS-LF-0yX">
+                                                            <tableColumn identifier="flagShipName" editable="NO" width="102" minWidth="10" maxWidth="3.4028234663852886e+38" id="9eS-LF-0yX">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="秘書艦">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -94,7 +94,7 @@
                                                                     <binding destination="cv5-a8-9nJ" name="value" keyPath="arrangedObjects.flagShipName" id="aJQ-m6-ecl"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="LlV-sb-faL">
+                                                            <tableColumn identifier="flagShipLv" editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="LlV-sb-faL">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Lv.">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -110,7 +110,7 @@
                                                                     <binding destination="cv5-a8-9nJ" name="value" keyPath="arrangedObjects.flagShipLv" id="Fpm-F1-YIQ"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="WkQ-8o-mn2">
+                                                            <tableColumn identifier="commanderLv" editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="WkQ-8o-mn2">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="司令Lv.">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -126,7 +126,7 @@
                                                                     <binding destination="cv5-a8-9nJ" name="value" keyPath="arrangedObjects.commanderLv" id="SW1-fO-VcQ"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="qJR-M3-M3J">
+                                                            <tableColumn identifier="fuel" editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="qJR-M3-M3J">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="æ²¹">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -142,7 +142,7 @@
                                                                     <binding destination="cv5-a8-9nJ" name="value" keyPath="arrangedObjects.fuel" id="lh0-vj-w09"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="dU8-RK-8xU">
+                                                            <tableColumn identifier="bull" editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="dU8-RK-8xU">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="å¼¾">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -158,7 +158,7 @@
                                                                     <binding destination="cv5-a8-9nJ" name="value" keyPath="arrangedObjects.bull" id="gHz-HM-Ghw"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="qQv-dW-1fG">
+                                                            <tableColumn identifier="steel" editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="qQv-dW-1fG">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="鉄">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -174,7 +174,7 @@
                                                                     <binding destination="cv5-a8-9nJ" name="value" keyPath="arrangedObjects.steel" id="xN8-D0-VHt"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="eYp-gy-XF7">
+                                                            <tableColumn identifier="bauxite" editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="eYp-gy-XF7">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="ボーキ">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -190,7 +190,7 @@
                                                                     <binding destination="cv5-a8-9nJ" name="value" keyPath="arrangedObjects.bauxite" id="RkV-gZ-YMY"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="csP-8r-YKJ">
+                                                            <tableColumn identifier="kaihatusizai" editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="csP-8r-YKJ">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="資材">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -234,19 +234,19 @@
                                     <subviews>
                                         <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="hg2-fZ-LqB">
                                             <rect key="frame" x="17" y="8" width="638" height="455"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <clipView key="contentView" id="pnS-lB-JNx">
                                                 <rect key="frame" x="1" y="17" width="636" height="437"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" autosaveColumns="NO" headerView="11L-S0-22L" id="Wyj-Am-Fha">
+                                                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" autosaveName="kenzoHistory" headerView="11L-S0-22L" id="Wyj-Am-Fha">
                                                         <rect key="frame" x="0.0" y="0.0" width="636" height="437"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <size key="intercellSpacing" width="3" height="2"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                         <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                                         <tableColumns>
-                                                            <tableColumn editable="NO" width="151" minWidth="40" maxWidth="1000" id="CwC-jx-5h1">
+                                                            <tableColumn identifier="date" editable="NO" width="143" minWidth="40" maxWidth="1000" id="CwC-jx-5h1">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="日付">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -263,7 +263,7 @@
                                                                     <binding destination="9pH-dt-0h6" name="value" keyPath="arrangedObjects.date" id="LuH-RP-7Ed"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="80" minWidth="40" maxWidth="1000" id="0fT-I5-7lP">
+                                                            <tableColumn identifier="name" editable="NO" width="111" minWidth="40" maxWidth="1000" id="0fT-I5-7lP">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="艦娘">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -279,7 +279,7 @@
                                                                     <binding destination="9pH-dt-0h6" name="value" keyPath="arrangedObjects.name" id="99u-nS-ZSK"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="124" minWidth="10" maxWidth="3.4028234663852886e+38" id="qUW-lA-2xb">
+                                                            <tableColumn identifier="flagShipName" editable="NO" width="101" minWidth="10" maxWidth="3.4028234663852886e+38" id="qUW-lA-2xb">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="秘書艦">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -295,7 +295,7 @@
                                                                     <binding destination="9pH-dt-0h6" name="value" keyPath="arrangedObjects.flagShipName" id="cCG-PM-Ph3"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="e6w-fE-xxU">
+                                                            <tableColumn identifier="flagShipLv" editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="e6w-fE-xxU">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Lv.">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -311,7 +311,7 @@
                                                                     <binding destination="9pH-dt-0h6" name="value" keyPath="arrangedObjects.flagShipLv" id="XYf-cr-m8u"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="Hw9-4G-XxG">
+                                                            <tableColumn identifier="commanderLv" editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="Hw9-4G-XxG">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="司令Lv.">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -327,7 +327,7 @@
                                                                     <binding destination="9pH-dt-0h6" name="value" keyPath="arrangedObjects.commanderLv" id="wDq-io-xh5"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="gHD-g5-CuT">
+                                                            <tableColumn identifier="fuel" editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="gHD-g5-CuT">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="æ²¹">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -343,7 +343,7 @@
                                                                     <binding destination="9pH-dt-0h6" name="value" keyPath="arrangedObjects.fuel" id="10Q-0t-lhq"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="csG-Q3-MzA">
+                                                            <tableColumn identifier="bull" editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="csG-Q3-MzA">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="å¼¾">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -359,7 +359,7 @@
                                                                     <binding destination="9pH-dt-0h6" name="value" keyPath="arrangedObjects.bull" id="nj5-ab-0HD"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="5It-r0-Gzl">
+                                                            <tableColumn identifier="steel" editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="5It-r0-Gzl">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="鉄">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -375,7 +375,7 @@
                                                                     <binding destination="9pH-dt-0h6" name="value" keyPath="arrangedObjects.steel" id="7I8-8C-c66"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="qti-L4-GJq">
+                                                            <tableColumn identifier="bauxite" editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="qti-L4-GJq">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="ボーキ">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -391,7 +391,7 @@
                                                                     <binding destination="9pH-dt-0h6" name="value" keyPath="arrangedObjects.bauxite" id="MQ9-lU-6ZI"/>
                                                                 </connections>
                                                             </tableColumn>
-                                                            <tableColumn editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="hrV-e6-bLp">
+                                                            <tableColumn identifier="kaihatusizai" editable="NO" width="39" minWidth="10" maxWidth="3.4028234663852886e+38" id="hrV-e6-bLp">
                                                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="資材">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -444,6 +444,11 @@
                     </dictionary>
                 </binding>
                 <binding destination="-2" name="managedObjectContext" keyPath="manageObjectContext" id="REH-UB-fGs"/>
+                <binding destination="2Bd-Vo-AL8" name="sortDescriptors" keyPath="values.kaihatuHistorySortDesc" id="szW-fa-goE">
+                    <dictionary key="options">
+                        <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
+                    </dictionary>
+                </binding>
             </connections>
         </arrayController>
         <arrayController mode="entity" entityName="KenzoHistory" editable="NO" automaticallyPreparesContent="YES" automaticallyRearrangesObjects="YES" id="9pH-dt-0h6" userLabel="KenzoHistory">
@@ -454,7 +459,13 @@
                     </dictionary>
                 </binding>
                 <binding destination="-2" name="managedObjectContext" keyPath="manageObjectContext" id="Oj9-1u-97D"/>
+                <binding destination="2Bd-Vo-AL8" name="sortDescriptors" keyPath="values.kenzoHistorySortDesc" id="dt0-tB-AjD">
+                    <dictionary key="options">
+                        <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
+                    </dictionary>
+                </binding>
             </connections>
         </arrayController>
+        <userDefaultsController representsSharedInstance="YES" id="2Bd-Vo-AL8"/>
     </objects>
 </document>
-- 
2.11.0