艦隊索敵値などが反映されなくなる問題を修正

diff --git a/KCD/HMFleetViewController.m b/KCD/HMFleetViewController.m
index bdd4dc4..377685a 100644 (file)
--- a/KCD/HMFleetViewController.m
+++ b/KCD/HMFleetViewController.m
@@ -10,6 +10,7 @@
 #import "HMShipDetailViewController.h"
 
 #import "HMFleet.h"
+#import "HMFleetManager.h"
 
 #import "HMAppDelegate.h"
 
@@ -195,7 +196,9 @@ const NSInteger maxFleetNumber = 4;
 
 - (void)setFleetNumber:(NSInteger)fleetNumber
 {
-       self.fleet = [HMFleet fleetWithNumber:@(fleetNumber)];
+       HMAppDelegate *appDelegate = [[NSApplication sharedApplication] delegate];
+       HMFleetManager *fm = appDelegate.fleetManager;
+       self.fleet = fm.fleets[fleetNumber - 1];
        _fleetNumber = fleetNumber;
 }
 - (NSInteger)fleetNumber

diff --git a/KCD/HMUITestWindowController.m b/KCD/HMUITestWindowController.m
index 9b44b57..4175ae5 100644 (file)
--- a/KCD/HMUITestWindowController.m
+++ b/KCD/HMUITestWindowController.m
@@ -27,13 +27,13 @@
 
 - (void)windowDidLoad {
     [super windowDidLoad];
-       
-       self.testViewController = [self.testViewControllerClass new];
-       NSRect frame = self.testViewController.view.frame;
-       self.window.contentSize = frame.size;
-//     [self.testViewController.view setFrame:[self.testViewPlaceholder frame]];
-       [self.testViewController.view setAutoresizingMask:[self.testViewPlaceholder autoresizingMask]];
-       [[self.testViewPlaceholder superview] replaceSubview:self.testViewPlaceholder with:self.testViewController.view];
+//     
+//     self.testViewController = [self.testViewControllerClass new];
+//     NSRect frame = self.testViewController.view.frame;
+//     self.window.contentSize = frame.size;
+////   [self.testViewController.view setFrame:[self.testViewPlaceholder frame]];
+//     [self.testViewController.view setAutoresizingMask:[self.testViewPlaceholder autoresizingMask]];
+//     [[self.testViewPlaceholder superview] replaceSubview:self.testViewPlaceholder with:self.testViewController.view];
 }
 
 @end

diff --git a/KCD/ja.lproj/HMFleetMinimumViewController.xib b/KCD/ja.lproj/HMFleetMinimumViewController.xib
index 529f769..7924f22 100644 (file)
--- a/KCD/ja.lproj/HMFleetMinimumViewController.xib
+++ b/KCD/ja.lproj/HMFleetMinimumViewController.xib
@@ -154,7 +154,7 @@
                     </textFieldCell>
                     <connections>
                         <binding destination="-3" name="font" keyPath="delegate.monospaceSystemFont11" id="vqv-f1-c1R"/>
-                        <binding destination="-2" name="hidden" keyPath="repairable" id="v9O-cV-MtY">
+                        <binding destination="gCv-EU-Vnz" name="hidden" keyPath="selection.repairable" id="Hkp-U2-RpR">
                             <dictionary key="options">
                                 <string key="NSValueTransformerName">NSNegateBoolean</string>
                             </dictionary>
@@ -171,7 +171,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <connections>
-                        <binding destination="-2" name="hidden" keyPath="repairable" id="0Y7-u7-l5n">
+                        <binding destination="gCv-EU-Vnz" name="hidden" keyPath="selection.repairable" id="3D5-ho-PNe">
                             <dictionary key="options">
                                 <string key="NSValueTransformerName">NSNegateBoolean</string>
                             </dictionary>

diff --git a/KCD/ja.lproj/HMFleetViewController.xib b/KCD/ja.lproj/HMFleetViewController.xib
index 66d9d35..9c35538 100644 (file)
--- a/KCD/ja.lproj/HMFleetViewController.xib
+++ b/KCD/ja.lproj/HMFleetViewController.xib
@@ -116,7 +116,7 @@
                     </textFieldCell>
                     <connections>
                         <binding destination="-3" name="font" keyPath="delegate.monospaceSystemFont13" id="PF0-ou-K6v"/>
-                        <binding destination="MYB-8m-P41" name="value" keyPath="selection.totalSakuteki" id="JRu-FL-yUV"/>
+                        <binding destination="MYB-8m-P41" name="value" keyPath="selection.totalSakuteki" id="4Cv-OM-5Cq"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="ee5-Xk-4iW">
@@ -138,12 +138,12 @@
                     </textFieldCell>
                     <connections>
                         <binding destination="-3" name="font" keyPath="delegate.monospaceSystemFont13" id="r57-yZ-zBo"/>
-                        <binding destination="MYB-8m-P41" name="displayPatternValue1" keyPath="selection.totalSeiku" id="7Sq-iR-bBg">
+                        <binding destination="MYB-8m-P41" name="displayPatternValue1" keyPath="selection.totalSeiku" id="LuX-Zm-HUB">
                             <dictionary key="options">
                                 <string key="NSDisplayPattern">%{value1}@ (%{value2}@)</string>
                             </dictionary>
                         </binding>
-                        <binding destination="MYB-8m-P41" name="displayPatternValue2" keyPath="selection.totalCalclatedSeiku" previousBinding="7Sq-iR-bBg" id="70Q-az-J1k">
+                        <binding destination="MYB-8m-P41" name="displayPatternValue2" keyPath="selection.totalCalclatedSeiku" previousBinding="LuX-Zm-HUB" id="3mY-Ib-hoE">
                             <dictionary key="options">
                                 <string key="NSDisplayPattern">%{value1}@ (%{value2}@)</string>
                             </dictionary>
@@ -165,12 +165,12 @@
                     </textFieldCell>
                     <connections>
                         <binding destination="-3" name="font" keyPath="delegate.monospaceSystemFont11" id="D3c-11-4qp"/>
+                        <binding destination="MYB-8m-P41" name="value" keyPath="selection.repairTime" id="L7t-yF-hnS"/>
                         <binding destination="MYB-8m-P41" name="hidden" keyPath="selection.repairable" id="6p5-99-GUi">
                             <dictionary key="options">
                                 <string key="NSValueTransformerName">NSNegateBoolean</string>
                             </dictionary>
                         </binding>
-                        <binding destination="MYB-8m-P41" name="value" keyPath="selection.repairTime" id="L7t-yF-hnS"/>
                     </connections>
                 </textField>
                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" id="1Fs-NZ-L8n">