装備一覧を表示できるようにした（仮作成）

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index abf5dc2..a53ab89 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -10,6 +10,8 @@
                F4131ECF190F5C08004F7F9A /* HMStoreCreateSlotItemHistoryCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131ECE190F5C08004F7F9A /* HMStoreCreateSlotItemHistoryCommand.m */; };
                F4131ED5190F63D8004F7F9A /* HMUpdateSlotItemCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131ED4190F63D8004F7F9A /* HMUpdateSlotItemCommand.m */; };
                F4131ED8190FA08D004F7F9A /* HMDestroyItem2Command.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131ED7190FA08D004F7F9A /* HMDestroyItem2Command.m */; };
+               F4131EDC190FEBCC004F7F9A /* HMSlotItemWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4131EDA190FEBCC004F7F9A /* HMSlotItemWindowController.m */; };
+               F4131EDE190FEBDB004F7F9A /* HMSlotItemWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4131EE0190FEBDB004F7F9A /* HMSlotItemWindowController.xib */; };
                F43E67B718BE02A10087E5B6 /* STypeShortName.plist in Resources */ = {isa = PBXBuildFile; fileRef = F43E67B618BE02A10087E5B6 /* STypeShortName.plist */; };
                F43E67B918BE060E0087E5B6 /* LevelUpExp.plist in Resources */ = {isa = PBXBuildFile; fileRef = F43E67B818BE060E0087E5B6 /* LevelUpExp.plist */; };
                F4513EDD18B619B600073552 /* HMCoreDataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EDC18B619B600073552 /* HMCoreDataManager.m */; };
@@ -111,6 +113,9 @@
                F4131ED4190F63D8004F7F9A /* HMUpdateSlotItemCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMUpdateSlotItemCommand.m; sourceTree = "<group>"; };
                F4131ED6190FA08D004F7F9A /* HMDestroyItem2Command.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMDestroyItem2Command.h; sourceTree = "<group>"; };
                F4131ED7190FA08D004F7F9A /* HMDestroyItem2Command.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMDestroyItem2Command.m; sourceTree = "<group>"; };
+               F4131ED9190FEBCC004F7F9A /* HMSlotItemWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMSlotItemWindowController.h; sourceTree = "<group>"; };
+               F4131EDA190FEBCC004F7F9A /* HMSlotItemWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMSlotItemWindowController.m; sourceTree = "<group>"; };
+               F4131EDF190FEBDB004F7F9A /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/HMSlotItemWindowController.xib; sourceTree = "<group>"; };
                F43E67B618BE02A10087E5B6 /* STypeShortName.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = STypeShortName.plist; sourceTree = "<group>"; };
                F43E67B818BE060E0087E5B6 /* LevelUpExp.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = LevelUpExp.plist; sourceTree = "<group>"; };
                F4513EDB18B619B600073552 /* HMCoreDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCoreDataManager.h; sourceTree = "<group>"; };
@@ -453,6 +458,9 @@
                                F4B2D03518F83CC800542742 /* HMDeckViewController.xib */,
                                F49828FA1902A226000D6BBE /* HMStrokeTextFieldCell.h */,
                                F49828FB1902A226000D6BBE /* HMStrokeTextFieldCell.m */,
+                               F4131ED9190FEBCC004F7F9A /* HMSlotItemWindowController.h */,
+                               F4131EDA190FEBCC004F7F9A /* HMSlotItemWindowController.m */,
+                               F4131EE0190FEBDB004F7F9A /* HMSlotItemWindowController.xib */,
                        );
                        name = UI;
                        sourceTree = "<group>";
@@ -625,6 +633,7 @@
                                F4513EF018B96C6C00073552 /* Links.rtf in Resources */,
                                F4BDEB5D187252F30069D0CE /* MainMenu.xib in Resources */,
                                F4B3DC3F18E5C8870011B4FC /* HMBroserWindowController.xib in Resources */,
+                               F4131EDE190FEBDB004F7F9A /* HMSlotItemWindowController.xib in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -673,6 +682,7 @@
                                F4B414EF18B0BF1A00468DAF /* HMMasterMapInfoCommand.m in Sources */,
                                F4C118FC18A67B1C005D5B25 /* CustomHTTPProtocol.m in Sources */,
                                F4B3DC1B18DEAB5E0011B4FC /* HMKaihatuHistory.m in Sources */,
+                               F4131EDC190FEBCC004F7F9A /* HMSlotItemWindowController.m in Sources */,
                                F4D2CBCB18B05E58000EBC59 /* HMMaserShipCommand.m in Sources */,
                                F4513EFA18BB699700073552 /* HMShipWindowController.m in Sources */,
                                F46F104118A9B85E0063E503 /* HMJSONNode.m in Sources */,
@@ -725,6 +735,14 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
+               F4131EE0190FEBDB004F7F9A /* HMSlotItemWindowController.xib */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               F4131EDF190FEBDB004F7F9A /* ja */,
+                       );
+                       name = HMSlotItemWindowController.xib;
+                       sourceTree = "<group>";
+               };
                F494DC6818C8BAB900AE97E4 /* HMPowerUpSupportViewController.xib */ = {
                        isa = PBXVariantGroup;
                        children = (

diff --git a/KCD/Base.lproj/MainMenu.xib b/KCD/Base.lproj/MainMenu.xib
index 18df3a2..5282f8a 100644 (file)
--- a/KCD/Base.lproj/MainMenu.xib
+++ b/KCD/Base.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13C1021" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1080" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
+        <deployment defaultVersion="1090" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -231,6 +231,11 @@
                                     <action selector="showHideHistory:" target="494" id="0rp-Sl-bZf"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="SlotItem" keyEquivalent="e" id="1dX-yC-Onz">
+                                <connections>
+                                    <action selector="showHideSlotItemWindow:" target="-1" id="Gy1-8v-t7R"/>
+                                </connections>
+                            </menuItem>
                         </items>
                     </menu>
                 </menuItem>

diff --git a/KCD/HMAppDelegate.h b/KCD/HMAppDelegate.h
index 427eeac..2802844 100644 (file)
--- a/KCD/HMAppDelegate.h
+++ b/KCD/HMAppDelegate.h
@@ -22,6 +22,7 @@
 @property (strong, nonatomic) IBOutlet NSMenuItem *debugMenuItem;
 
 - (IBAction)showHideHistory:(id)sender;
+- (IBAction)showHideSlotItemWindow:(id)sender;
 
 - (IBAction)saveLocalData:(id)sender;
 - (IBAction)loadLocalData:(id)sender;

diff --git a/KCD/HMAppDelegate.m b/KCD/HMAppDelegate.m
index 2721776..9bb7fcb 100644 (file)
--- a/KCD/HMAppDelegate.m
+++ b/KCD/HMAppDelegate.m
@@ -10,6 +10,7 @@
 
 #import "HMBroserWindowController.h"
 #import "HMHistoryWindowController.h"
+#import "HMSlotItemWindowController.h"
 
 #import "HMTSVSupport.h"
 
@@ -26,6 +27,7 @@
 
 @property (strong) HMBroserWindowController *browserWindowController;
 @property (strong) HMHistoryWindowController *historyWindowController;
+@property (strong) HMSlotItemWindowController *slotItemWindowController;
 
 #ifdef DEBUG
 @property (strong) HMShipWindowController *shipWindowController;
@@ -127,6 +129,14 @@ static FILE* logFileP = NULL;
                        [menuItem setTitle:NSLocalizedString(@"Hide History", @"")];
                }
                return YES;
+       } else if(action == @selector(showHideSlotItemWindow:)) {
+               NSWindow *window = self.slotItemWindowController.window;
+               if(!window.isVisible || !window.isMainWindow) {
+                       [menuItem setTitle:NSLocalizedString(@"Show Slot Item", @"")];
+               } else {
+                       [menuItem setTitle:NSLocalizedString(@"Hide Slot Item", @"")];
+               }
+               return YES;
        } else if(action == @selector(saveLocalData:) || action == @selector(loadLocalData:)) {
                return YES;
        }
@@ -152,6 +162,20 @@ static FILE* logFileP = NULL;
        }
 }
 
+- (IBAction)showHideSlotItemWindow:(id)sender
+{
+       if(!self.slotItemWindowController) {
+               self.slotItemWindowController = [HMSlotItemWindowController new];
+       }
+       
+       NSWindow *window = self.slotItemWindowController.window;
+       if(!window.isVisible || !window.isMainWindow) {
+               [window makeKeyAndOrderFront:nil];
+       } else {
+               [window orderOut:nil];
+       }
+}
+
 #pragma mark - NSApplicationDelegate
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender
 {

diff --git a/KCD/HMSlotItemWindowController.h b/KCD/HMSlotItemWindowController.h
new file mode 100644 (file)
index 0000000..d108f0b
--- /dev/null
+++ b/KCD/HMSlotItemWindowController.h
@@ -0,0 +1,14 @@
+//
+//  HMSlotItemWindowController.h
+//  KCD
+//
+//  Created by Hori,Masaki on 2014/04/29.
+//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface HMSlotItemWindowController : NSWindowController
+
+@property (readonly) NSManagedObjectContext *managedObjectContext;
+@end

diff --git a/KCD/HMSlotItemWindowController.m b/KCD/HMSlotItemWindowController.m
new file mode 100644 (file)
index 0000000..bbff501
--- /dev/null
+++ b/KCD/HMSlotItemWindowController.m
@@ -0,0 +1,30 @@
+//
+//  HMSlotItemWindowController.m
+//  KCD
+//
+//  Created by Hori,Masaki on 2014/04/29.
+//  Copyright (c) 2014年 Hori,Masaki. All rights reserved.
+//
+
+#import "HMSlotItemWindowController.h"
+
+#import "HMServerDataStore.h"
+
+@interface HMSlotItemWindowController ()
+
+@end
+
+@implementation HMSlotItemWindowController
+
+- (id)init
+{
+       self = [super initWithWindowNibName:NSStringFromClass([self class])];
+       return self;
+}
+
+- (NSManagedObjectContext *)managedObjectContext
+{
+       return [HMServerDataStore defaultManager].managedObjectContext;
+}
+
+@end

diff --git a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
index 97d8bee..52de1ed 100644 (file)
--- a/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
+++ b/KCD/KCD.xcdatamodeld/KCD.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="5063" systemVersion="13C64" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="5064" systemVersion="13C1021" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
     <entity name="Basic" representedClassName="HMKCManagedObject" syncable="YES">
         <attribute name="active_flag" optional="YES" attributeType="Boolean" syncable="YES"/>
         <attribute name="comment" optional="YES" attributeType="String" syncable="YES"/>
@@ -258,7 +258,12 @@
         <attribute name="type_2" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="type_3" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="usebull" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
-        <relationship name="slotItems" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SlotItem" inverseName="master_slotItem" inverseEntity="SlotItem" syncable="YES"/>
+        <relationship name="slotItems" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="SlotItem" inverseName="master_slotItem" inverseEntity="SlotItem" syncable="YES"/>
+    </entity>
+    <entity name="MasterSlotItemEquipType" representedClassName="HMKCManagedObject" syncable="YES">
+        <attribute name="id" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="show_flg" optional="YES" attributeType="Boolean" defaultValueString="0" syncable="YES"/>
     </entity>
     <entity name="MasterSType" representedClassName="HMKCManagedObject" syncable="YES">
         <attribute name="id" attributeType="Integer 32" indexed="YES" syncable="YES"/>
@@ -345,6 +350,7 @@
         <attribute name="taisen_1" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="use_bull" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="use_fuel" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <relationship name="equippedItem" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="SlotItem" inverseName="equippedShip" inverseEntity="SlotItem" syncable="YES"/>
         <relationship name="master_ship" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MasterShip" inverseName="ships" inverseEntity="MasterShip" syncable="YES"/>
     </entity>
     <entity name="SlotItem" representedClassName="HMKCManagedObject" syncable="YES">
@@ -359,6 +365,7 @@
         <attribute name="id" optional="YES" attributeType="Integer 64" defaultValueString="0" syncable="YES"/>
         <attribute name="kaih" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="sakb" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <relationship name="equippedShip" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Ship" inverseName="equippedItem" inverseEntity="Ship" syncable="YES"/>
         <relationship name="master_slotItem" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="MasterSlotItem" inverseName="slotItems" inverseEntity="MasterSlotItem" syncable="YES"/>
     </entity>
     <elements>
@@ -371,12 +378,13 @@
         <element name="MasterMapInfo" positionX="0" positionY="0" width="128" height="253"/>
         <element name="MasterMission" positionX="0" positionY="0" width="128" height="255"/>
         <element name="MasterShip" positionX="0" positionY="0" width="128" height="1515"/>
-        <element name="MasterSlotItem" positionX="0" positionY="0" width="128" height="540"/>
+        <element name="MasterSlotItem" positionX="0" positionY="0" width="128" height="538"/>
         <element name="MasterSType" positionX="0" positionY="0" width="128" height="135"/>
         <element name="MasterUseItem" positionX="0" positionY="0" width="128" height="150"/>
         <element name="Material" positionX="0" positionY="0" width="128" height="150"/>
         <element name="NyukyoDock" positionX="0" positionY="0" width="128" height="195"/>
-        <element name="Ship" positionX="0" positionY="0" width="128" height="750"/>
-        <element name="SlotItem" positionX="0" positionY="0" width="128" height="225"/>
+        <element name="Ship" positionX="0" positionY="0" width="128" height="763"/>
+        <element name="SlotItem" positionX="0" positionY="0" width="128" height="238"/>
+        <element name="MasterSlotItemEquipType" positionX="9" positionY="153" width="128" height="88"/>
     </elements>
 </model>
\ No newline at end of file

diff --git a/KCD/ja.lproj/HMBroserWindowController.xib b/KCD/ja.lproj/HMBroserWindowController.xib
index 2ac327b..4095272 100644 (file)
--- a/KCD/ja.lproj/HMBroserWindowController.xib
+++ b/KCD/ja.lproj/HMBroserWindowController.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13C1021" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment defaultVersion="1090" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
@@ -246,9 +246,11 @@
                                             <string key="NSDisplayPattern">%{value1}@/%{value2}@</string>
                                         </dictionary>
                                     </binding>
-                                    <binding destination="1lk-ii-37p" name="displayPatternValue2" keyPath="selection.max_chara" previousBinding="nsa-4z-cse" id="Ack-sO-3xb">
+                                    <binding destination="1lk-ii-37p" name="displayPatternValue2" keyPath="selection.max_chara" previousBinding="nsa-4z-cse" id="IjC-s5-OEy">
                                         <dictionary key="options">
                                             <string key="NSDisplayPattern">%{value1}@/%{value2}@</string>
+                                            <string key="NSNoSelectionPlaceholder">0</string>
+                                            <string key="NSNullPlaceholder">0</string>
                                         </dictionary>
                                     </binding>
                                 </connections>
@@ -276,9 +278,11 @@
                                             <string key="NSDisplayPattern">%{value1}@/%{value2}@</string>
                                         </dictionary>
                                     </binding>
-                                    <binding destination="1lk-ii-37p" name="displayPatternValue2" keyPath="selection.max_slotitem" previousBinding="Cgj-14-UG2" id="hv9-gn-2jA">
+                                    <binding destination="1lk-ii-37p" name="displayPatternValue2" keyPath="selection.max_slotitem" previousBinding="Cgj-14-UG2" id="HBV-Ae-F3V">
                                         <dictionary key="options">
                                             <string key="NSDisplayPattern">%{value1}@/%{value2}@</string>
+                                            <string key="NSNoSelectionPlaceholder">0</string>
+                                            <string key="NSNullPlaceholder">0</string>
                                         </dictionary>
                                     </binding>
                                 </connections>

diff --git a/KCD/ja.lproj/HMSlotItemWindowController.xib b/KCD/ja.lproj/HMSlotItemWindowController.xib
new file mode 100644 (file)
index 0000000..b4ed8d2
--- /dev/null
+++ b/KCD/ja.lproj/HMSlotItemWindowController.xib
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13C1021" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="HMSlotItemWindowController">
+            <connections>
+                <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <window title="装備一覧" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" 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="687" height="490"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
+            <view key="contentView" id="se5-gp-TjO">
+                <rect key="frame" x="0.0" y="0.0" width="687" height="490"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="zZm-II-t14">
+                        <rect key="frame" x="-1" y="-1" width="689" height="444"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <clipView key="contentView" id="IeT-WH-NSY">
+                            <rect key="frame" x="1" y="17" width="687" height="426"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="7Ud-zW-skg" id="kje-ie-wKU">
+                                    <rect key="frame" x="0.0" y="0.0" width="687" height="426"/>
+                                    <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 width="83" minWidth="40" maxWidth="1000" id="x7R-Xy-lfl">
+                                            <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"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="qYq-Oc-svj">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="ceg-Ko-EOy" name="value" keyPath="arrangedObjects.master_slotItem.name" id="px4-6P-EFS"/>
+                                            </connections>
+                                        </tableColumn>
+                                        <tableColumn width="79" minWidth="40" maxWidth="1000" id="LBH-a2-vwX">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="type0">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="QzF-GL-QV5">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="ceg-Ko-EOy" name="value" keyPath="arrangedObjects.master_slotItem.type_0" id="fKn-so-Ytf"/>
+                                            </connections>
+                                        </tableColumn>
+                                        <tableColumn width="64" minWidth="10" maxWidth="3.4028234663852886e+38" id="a7t-L6-Z0O">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="type1">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="pe5-Td-YND">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="ceg-Ko-EOy" name="value" keyPath="arrangedObjects.master_slotItem.type_1" id="X9x-Gu-YUl"/>
+                                            </connections>
+                                        </tableColumn>
+                                        <tableColumn width="64" minWidth="10" maxWidth="3.4028234663852886e+38" id="Bhw-0J-017">
+                                            <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" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="tNq-jA-brL">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="ceg-Ko-EOy" name="value" keyPath="arrangedObjects.master_slotItem.type_2" id="u2S-D7-37h"/>
+                                            </connections>
+                                        </tableColumn>
+                                        <tableColumn width="64" minWidth="10" maxWidth="3.4028234663852886e+38" id="bXK-fc-c4Y">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="type3">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="yNZ-cj-nDz">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="ceg-Ko-EOy" name="value" keyPath="arrangedObjects.master_slotItem.type_3" id="UgO-ie-a02"/>
+                                            </connections>
+                                        </tableColumn>
+                                        <tableColumn width="64" minWidth="10" maxWidth="3.4028234663852886e+38" id="0ze-J2-3BD">
+                                            <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" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="1Tf-PP-gNW">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="ceg-Ko-EOy" name="value" keyPath="arrangedObjects.master_slotItem.rare" id="k6P-48-Oq6"/>
+                                            </connections>
+                                        </tableColumn>
+                                        <tableColumn width="64" minWidth="10" maxWidth="3.4028234663852886e+38" id="dQL-M5-EkN">
+                                            <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" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="EnR-V4-iWa">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="ceg-Ko-EOy" name="value" keyPath="arrangedObjects.equippedShip.name" id="qpC-2G-JVK"/>
+                                            </connections>
+                                        </tableColumn>
+                                        <tableColumn width="181" minWidth="10" maxWidth="3.4028234663852886e+38" id="DaO-ZM-OmX">
+                                            <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+                                                <font key="font" metaFont="smallSystem"/>
+                                                <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
+                                            </tableHeaderCell>
+                                            <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="kdM-q8-odP">
+                                                <font key="font" metaFont="system"/>
+                                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                            <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+                                            <connections>
+                                                <binding destination="ceg-Ko-EOy" name="value" keyPath="arrangedObjects.id" id="vcx-c3-xl0"/>
+                                            </connections>
+                                        </tableColumn>
+                                    </tableColumns>
+                                </tableView>
+                            </subviews>
+                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="lHY-Vv-cBO">
+                            <rect key="frame" x="1" y="475" width="687" height="16"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="37" horizontal="NO" id="W9i-6l-gQT">
+                            <rect key="frame" x="-15" y="17" width="16" height="0.0"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <tableHeaderView key="headerView" id="7Ud-zW-skg">
+                            <rect key="frame" x="0.0" y="0.0" width="687" height="17"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </tableHeaderView>
+                    </scrollView>
+                    <searchField verticalHuggingPriority="750" id="ERr-T4-mcK">
+                        <rect key="frame" x="20" y="451" width="331" height="22"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="15D-be-yiw">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </searchFieldCell>
+                        <connections>
+                            <binding destination="ceg-Ko-EOy" name="predicate" keyPath="filterPredicate" id="KEo-nz-5si">
+                                <dictionary key="options">
+                                    <string key="NSDisplayName">predicate</string>
+                                    <string key="NSPredicateFormat">master_slotItem.name contains $value</string>
+                                </dictionary>
+                            </binding>
+                        </connections>
+                    </searchField>
+                </subviews>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
+            </connections>
+        </window>
+        <arrayController mode="entity" entityName="SlotItem" editable="NO" automaticallyPreparesContent="YES" id="ceg-Ko-EOy">
+            <connections>
+                <binding destination="-2" name="managedObjectContext" keyPath="managedObjectContext" id="gmN-zL-8kd"/>
+                <binding destination="zv1-TV-Khy" name="sortDescriptors" keyPath="values.slotItemSortKey" id="57p-Co-Ax4">
+                    <dictionary key="options">
+                        <string key="NSValueTransformerName">NSKeyedUnarchiveFromData</string>
+                    </dictionary>
+                </binding>
+            </connections>
+        </arrayController>
+        <userDefaultsController representsSharedInstance="YES" id="zv1-TV-Khy"/>
+    </objects>
+</document>

diff --git a/KCD/ja.lproj/Localizable.strings b/KCD/ja.lproj/Localizable.strings
index 3e1843c..a54ccb3 100644 (file)
Binary files a/KCD/ja.lproj/Localizable.strings and b/KCD/ja.lproj/Localizable.strings differ

diff --git a/KCD/ja.lproj/MainMenu.strings b/KCD/ja.lproj/MainMenu.strings
index b7d6612..32fbf1c 100644 (file)
--- a/KCD/ja.lproj/MainMenu.strings
+++ b/KCD/ja.lproj/MainMenu.strings
@@ -137,3 +137,4 @@
 
 "o9G-2b-cSn.title" = "履歴";
 
+"1dX-yC-Onz.title" = "装備一覧";