OSDN Git Service

情報量を最小に絞った艦娘情報ビューを追加
authormasakih <masakih@users.sourceforge.jp>
Sat, 7 Mar 2015 13:08:26 +0000 (22:08 +0900)
committermasakih <masakih@users.sourceforge.jp>
Sat, 7 Mar 2015 13:08:26 +0000 (22:08 +0900)
KCD.xcodeproj/project.pbxproj
KCD/HMMinimumShipViewController.h [new file with mode: 0644]
KCD/HMMinimumShipViewController.m [new file with mode: 0644]
KCD/HMMinimumShipViewController.xib [new file with mode: 0644]

index 5cb6380..7ab4899 100644 (file)
                F4BDEB71187252F30069D0CE /* KCDTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F4BDEB70187252F30069D0CE /* KCDTests.m */; };
                F4BDEB7B187253130069D0CE /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4BDEB7A187253130069D0CE /* WebKit.framework */; };
                F4BEE4731AA5E34600979752 /* HMSlotItemFrameView.m in Sources */ = {isa = PBXBuildFile; fileRef = F4BEE4721AA5E34600979752 /* HMSlotItemFrameView.m */; };
+               F4BEE4771AA9E4EF00979752 /* HMMinimumShipViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4BEE4751AA9E4EF00979752 /* HMMinimumShipViewController.m */; };
+               F4BEE4781AA9E4EF00979752 /* HMMinimumShipViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4BEE4761AA9E4EF00979752 /* HMMinimumShipViewController.xib */; };
                F4BEEE9F18D211280006F70C /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F4BEEE9D18D211280006F70C /* Localizable.strings */; };
                F4C041BA1875CAF5009273EB /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4C041B91875CAF5009273EB /* JavaScriptCore.framework */; };
                F4C118FA18A67B1C005D5B25 /* CacheStoragePolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C118F518A67B1C005D5B25 /* CacheStoragePolicy.m */; };
                F4BDEB7A187253130069D0CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
                F4BEE4711AA5E34600979752 /* HMSlotItemFrameView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMSlotItemFrameView.h; sourceTree = "<group>"; };
                F4BEE4721AA5E34600979752 /* HMSlotItemFrameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMSlotItemFrameView.m; sourceTree = "<group>"; };
+               F4BEE4741AA9E4EF00979752 /* HMMinimumShipViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMinimumShipViewController.h; sourceTree = "<group>"; };
+               F4BEE4751AA9E4EF00979752 /* HMMinimumShipViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMinimumShipViewController.m; sourceTree = "<group>"; };
+               F4BEE4761AA9E4EF00979752 /* HMMinimumShipViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HMMinimumShipViewController.xib; sourceTree = "<group>"; };
                F4BEEE9E18D211280006F70C /* ja */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
                F4BEEEA118D211360006F70C /* ja */ = {isa = PBXFileReference; lastKnownFileType = text; name = ja; path = ja.lproj/Localizable.strings.sed; sourceTree = "<group>"; };
                F4BEEEA418D211500006F70C /* ja */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; name = ja; path = ja.lproj/Makefile; sourceTree = "<group>"; };
                                F4D6BCB71AA32BEA00742FEB /* HMFleetViewController.h */,
                                F4D6BCB81AA32BEA00742FEB /* HMFleetViewController.m */,
                                F4D6BCB91AA32BEA00742FEB /* HMFleetViewController.xib */,
+                               F4BEE4791AAB025400979752 /* HMFleetMinimumViewController.xib */,
+                               F4BEE4741AA9E4EF00979752 /* HMMinimumShipViewController.h */,
+                               F4BEE4751AA9E4EF00979752 /* HMMinimumShipViewController.m */,
+                               F4BEE4761AA9E4EF00979752 /* HMMinimumShipViewController.xib */,
                        );
                        name = TestAndDebug;
                        path = KCD;
                                F4B3DC3918E5C8700011B4FC /* HMJSONViewWindowController.xib in Resources */,
                                F4D6BCAA1AA298FD00742FEB /* HMShipDetailViewController.xib in Resources */,
                                F4B3DC3318E5C8520011B4FC /* HMShipViewController.xib in Resources */,
+                               F4BEE4781AA9E4EF00979752 /* HMMinimumShipViewController.xib in Resources */,
                                F4D6BC9D1AA1FAC700742FEB /* HMUITestWindowController.xib in Resources */,
                                F43E67B718BE02A10087E5B6 /* STypeShortName.plist in Resources */,
                                F4D6BCBB1AA32BEB00742FEB /* HMFleetViewController.xib in Resources */,
                                F4C118FA18A67B1C005D5B25 /* CacheStoragePolicy.m in Sources */,
                                F4D6BCA91AA298FD00742FEB /* HMShipDetailViewController.m in Sources */,
                                F4A3AD9219BDDD8E00FDBF80 /* HMPreferencePanelController.m in Sources */,
+                               F4BEE4771AA9E4EF00979752 /* HMMinimumShipViewController.m in Sources */,
                                F4B2A08F1A1F9C2100D2EF12 /* HMExternalBrowserWindowController.m in Sources */,
                                F4B3DC2118DECF570011B4FC /* HMTSVSupport.m in Sources */,
                                F4B1E30819C73B6A00805879 /* HMSuppliesCell.m in Sources */,
diff --git a/KCD/HMMinimumShipViewController.h b/KCD/HMMinimumShipViewController.h
new file mode 100644 (file)
index 0000000..6278bb4
--- /dev/null
@@ -0,0 +1,17 @@
+//
+//  HMMinimumShipViewController.h
+//  KCD
+//
+//  Created by Hori,Masaki on 2015/03/06.
+//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@class HMKCShipObject;
+
+@interface HMMinimumShipViewController : NSViewController
+
+@property (strong) HMKCShipObject *ship;
+
+@end
diff --git a/KCD/HMMinimumShipViewController.m b/KCD/HMMinimumShipViewController.m
new file mode 100644 (file)
index 0000000..342dca0
--- /dev/null
@@ -0,0 +1,45 @@
+//
+//  HMMinimumShipViewController.m
+//  KCD
+//
+//  Created by Hori,Masaki on 2015/03/06.
+//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+#import "HMMinimumShipViewController.h"
+#import "HMSuppliesView.h"
+
+#import "HMServerDataStore.h"
+
+@interface HMMinimumShipViewController ()
+
+@property (readonly) NSManagedObjectContext *managedObjectContext;
+
+@property (nonatomic, weak) IBOutlet HMSuppliesView *supply;
+
+@end
+
+@implementation HMMinimumShipViewController
+- (id)init
+{
+       self = [super initWithNibName:NSStringFromClass([self class]) bundle:nil];
+       return self;
+}
+
+- (NSManagedObjectContext *)managedObjectContext
+{
+       return [HMServerDataStore defaultManager].managedObjectContext;
+}
+
+- (void)setShip:(HMKCShipObject *)ship
+{
+       self.representedObject = ship;
+       
+       self.supply.shipStatus = ship;
+}
+- (HMKCShipObject *)ship
+{
+       return self.representedObject;
+}
+
+@end
diff --git a/KCD/HMMinimumShipViewController.xib b/KCD/HMMinimumShipViewController.xib
new file mode 100644 (file)
index 0000000..e438679
--- /dev/null
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="HMMinimumShipViewController">
+            <connections>
+                <outlet property="supply" destination="oCc-bA-TCR" id="SZm-Rf-Fuc"/>
+                <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="173" height="17"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="XdN-GX-9ik">
+                    <rect key="frame" x="-2" y="0.0" width="60" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="千代田航改二" id="rNp-iM-bNk">
+                        <font key="font" size="13" name="AquaKana"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                    <connections>
+                        <binding destination="Jeh-2g-2SK" name="value" keyPath="selection.name" id="ms8-W4-ydK">
+                            <dictionary key="options">
+                                <string key="NSNoSelectionPlaceholder">空席</string>
+                            </dictionary>
+                        </binding>
+                    </connections>
+                </textField>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="5Ds-eT-IIh">
+                    <rect key="frame" x="114" y="0.0" width="61" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123/123" id="b4R-If-THa" customClass="HMStrokeTextFieldCell">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                    <connections>
+                        <binding destination="Jeh-2g-2SK" name="displayPatternValue1" keyPath="selection.nowhp" id="1Ga-rJ-H5m">
+                            <dictionary key="options">
+                                <string key="NSDisplayPattern">%{value1}@/%{value2}@</string>
+                                <string key="NSNoSelectionPlaceholder">-</string>
+                                <string key="NSNullPlaceholder">-</string>
+                            </dictionary>
+                        </binding>
+                        <binding destination="Jeh-2g-2SK" name="displayPatternValue2" keyPath="selection.maxhp" previousBinding="1Ga-rJ-H5m" id="Sh6-6Q-PwI">
+                            <dictionary key="options">
+                                <string key="NSDisplayPattern">%{value1}@/%{value2}@</string>
+                                <string key="NSNoSelectionPlaceholder">-</string>
+                                <string key="NSNullPlaceholder">-</string>
+                            </dictionary>
+                        </binding>
+                        <binding destination="Jeh-2g-2SK" name="textColor" keyPath="selection.statusColor" id="K64-Ur-hA2"/>
+                    </connections>
+                </textField>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="qit-fF-dVl">
+                    <rect key="frame" x="58" y="0.0" width="21" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="49" id="FwR-YA-3mt" customClass="HMStrokeTextFieldCell">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                    <connections>
+                        <binding destination="Jeh-2g-2SK" name="value" keyPath="selection.cond" id="Hpf-36-exR">
+                            <dictionary key="options">
+                                <string key="NSNoSelectionPlaceholder">-</string>
+                                <string key="NSNullPlaceholder">-</string>
+                            </dictionary>
+                        </binding>
+                    </connections>
+                </textField>
+                <customView id="oCc-bA-TCR" customClass="HMSuppliesView">
+                    <rect key="frame" x="81" y="2" width="31" height="13"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                </customView>
+            </subviews>
+            <point key="canvasLocation" x="32.5" y="138.5"/>
+        </customView>
+        <objectController mode="entity" entityName="Ship" editable="NO" automaticallyPreparesContent="YES" id="Jeh-2g-2SK">
+            <connections>
+                <binding destination="-2" name="contentObject" keyPath="representedObject" id="Ez6-dV-1BO"/>
+                <binding destination="-2" name="managedObjectContext" keyPath="managedObjectContext" id="R4e-hh-PLo"/>
+            </connections>
+        </objectController>
+    </objects>
+</document>