OSDN Git Service

状況などをNSTabViewで表示するように変更
authormasakih <masakih@users.sourceforge.jp>
Fri, 13 Mar 2015 12:43:11 +0000 (21:43 +0900)
committermasakih <masakih@users.sourceforge.jp>
Fri, 13 Mar 2015 12:43:11 +0000 (21:43 +0900)
KCD/HMBroserWindowController.h
KCD/HMBroserWindowController.m
KCD/ja.lproj/HMBroserWindowController.xib
KCD/ja.lproj/HMDocksViewController.xib
KCD/ja.lproj/HMPowerUpSupportViewController.xib
KCD/ja.lproj/HMShipViewController.xib

index ee01d0f..7a8b205 100644 (file)
 
 @property (weak) IBOutlet WebView *webView;
 @property (weak) IBOutlet NSView *placeholder;
-@property (nonatomic, weak) IBOutlet NSView *docksPlaceholder;
 
 @property (readonly) NSAttributedString *linksString;
 
-@property NSInteger selectedViewsSegment;
-
 @property (nonatomic, strong) IBOutlet NSArrayController *deckContoller;
 @property (nonatomic, readonly) NSString *flagShipName;
 
@@ -38,7 +35,5 @@
 
 
 - (IBAction)reloadContent:(id)sender;
-- (IBAction)selectView:(id)sender;
-
 
 @end
index 1a8ae3d..2f9a394 100644 (file)
@@ -39,14 +39,16 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
 @interface HMBroserWindowController ()
 @property NSPoint flashTopLeft;
 
-@property (strong) NSViewController *selectedViewController;
-@property (strong) NSMutableDictionary *controllers;
-
 @property (strong) NSNumber *flagShipID;
 
 @property (strong) HMFleetViewController *fleetViewController;
 @property FleetViewPosition fleetViewPosition;
 
+@property (weak) IBOutlet NSTabView *informations;
+@property (strong) HMDocksViewController *docksViewController;
+@property (strong) HMShipViewController *shipViewController;
+@property (strong) HMPowerUpSupportViewController *powerUpViewController;
+
 @end
 
 @implementation HMBroserWindowController
@@ -66,7 +68,6 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
 {
        self = [super initWithWindowNibName:NSStringFromClass([self class])];
        if(self) {
-               _controllers = [NSMutableDictionary new];
                [self loadWindow];
        }
        return self;
@@ -84,11 +85,15 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
        self.flashTopLeft = NSMakePoint(70, 145);
        [self adjustFlash];
        
-       self.selectedViewController = [HMDocksViewController new];
-       [self.selectedViewController.view setFrame:[self.docksPlaceholder frame]];
-       [self.selectedViewController.view setAutoresizingMask:[self.docksPlaceholder autoresizingMask]];
-       [[self.docksPlaceholder superview] replaceSubview:self.docksPlaceholder with:self.selectedViewController.view];
-       [self.controllers setObject:self.selectedViewController forKey:@0];
+       self.docksViewController = [HMDocksViewController new];
+       self.shipViewController = [HMShipViewController new];
+       self.powerUpViewController = [HMPowerUpSupportViewController new];
+       NSTabViewItem *item = [self.informations tabViewItemAtIndex:0];
+       item.view = self.docksViewController.view;
+       item = [self.informations tabViewItemAtIndex:1];
+       item.view = self.shipViewController.view;
+       item = [self.informations tabViewItemAtIndex:2];
+       item.view = self.powerUpViewController.view;
        
        self.fleetViewController = [[HMFleetViewController alloc] initWithViewType:detailViewType];
        [self.fleetViewController.view setFrame:[self.deckPlaceholder frame]];
@@ -111,7 +116,6 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
        [self bind:@"shipCount" toObject:self.shipController withKeyPath:@"arrangedObjects.@count" options:nil];
 }
 
-
 - (NSManagedObjectContext *)managedObjectContext
 {
        return [HMServerDataStore defaultManager].managedObjectContext;
@@ -128,34 +132,34 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
 
 - (void)showViewWithNumber:(ViewType)type
 {
-       Class controllerClass = Nil;
-
-       switch (type) {
-               case kScheduleType:
-                       controllerClass = [HMDocksViewController class];
-                       break;
-               case kOrganizeType:
-                       controllerClass = [HMShipViewController class];
-                       break;
-               case kPowerUpType:
-                       controllerClass = [HMPowerUpSupportViewController class];
-                       break;
-       }
-       
-       if(!controllerClass) return;
-       if([self.selectedViewController isMemberOfClass:controllerClass]) return;
-       
-       NSViewController *newContoller = [self.controllers objectForKey:@(type)];
-       if(!newContoller) {
-               newContoller = [controllerClass new];
-               [self.controllers setObject:newContoller forKey:@(type)];
-       }
-       [newContoller.view setFrame:[self.selectedViewController.view frame]];
-       [newContoller.view setAutoresizingMask:[self.selectedViewController.view autoresizingMask]];
-       [[self.selectedViewController.view superview] replaceSubview:self.selectedViewController.view with:newContoller.view];
-       self.selectedViewController = newContoller;
-       
-       self.selectedViewsSegment = type;
+//     Class controllerClass = Nil;
+//
+//     switch (type) {
+//             case kScheduleType:
+//                     controllerClass = [HMDocksViewController class];
+//                     break;
+//             case kOrganizeType:
+//                     controllerClass = [HMShipViewController class];
+//                     break;
+//             case kPowerUpType:
+//                     controllerClass = [HMPowerUpSupportViewController class];
+//                     break;
+//     }
+//     
+//     if(!controllerClass) return;
+//     if([self.selectedViewController isMemberOfClass:controllerClass]) return;
+//     
+//     NSViewController *newContoller = [self.controllers objectForKey:@(type)];
+//     if(!newContoller) {
+//             newContoller = [controllerClass new];
+//             [self.controllers setObject:newContoller forKey:@(type)];
+//     }
+//     [newContoller.view setFrame:[self.selectedViewController.view frame]];
+//     [newContoller.view setAutoresizingMask:[self.selectedViewController.view autoresizingMask]];
+//     [[self.selectedViewController.view superview] replaceSubview:self.selectedViewController.view with:newContoller.view];
+//     self.selectedViewController = newContoller;
+//     
+//     self.selectedViewsSegment = type;
 }
 
 - (void)adjustFlash
@@ -236,9 +240,9 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
 {
        NSInteger tag = -1;
        if([sender respondsToSelector:@selector(selectedSegment)]) {
-               NSSegmentedCell *cell = [sender cell];
-               NSUInteger index = [sender selectedSegment];
-               tag = [cell tagForSegment:index];
+//             NSSegmentedCell *cell = [sender cell];
+//             NSUInteger index = [sender selectedSegment];
+//             tag = [cell tagForSegment:index];
        } else {
                tag = [sender tag];
        }
index d3f3ced..3e4d241 100644 (file)
@@ -11,7 +11,7 @@
                 <outlet property="basicController" destination="1lk-ii-37p" id="EBc-Kc-cHP"/>
                 <outlet property="deckContoller" destination="eqP-ex-UzI" id="8n5-Er-BIF"/>
                 <outlet property="deckPlaceholder" destination="tIf-gd-MhY" id="aXM-5K-Uwd"/>
-                <outlet property="docksPlaceholder" destination="jkX-gl-a14" id="dhr-oF-eq0"/>
+                <outlet property="informations" destination="fK1-fC-Xdm" id="why-oJ-aEb"/>
                 <outlet property="placeholder" destination="raX-C4-fMW" id="T7y-R7-3qy"/>
                 <outlet property="shipController" destination="VIO-ns-NM0" id="drF-cE-z3k"/>
                 <outlet property="webView" destination="tgB-GD-Aq9" id="3AA-N6-bnp"/>
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="MainWindow" animationBehavior="default" id="1">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="104" y="240" width="1153" height="778"/>
+            <rect key="contentRect" x="104" y="240" width="1161" height="778"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="1153" height="778"/>
+                <rect key="frame" x="0.0" y="0.0" width="1161" height="778"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <customView id="jkX-gl-a14">
-                        <rect key="frame" x="807" y="166" width="346" height="575"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" heightSizable="YES"/>
-                    </customView>
                     <customView id="raX-C4-fMW">
                         <rect key="frame" x="8" y="298" width="800" height="480"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -42,7 +38,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     </customView>
                     <scrollView borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" id="hy2-T8-sUp">
-                        <rect key="frame" x="823" y="6" width="308" height="43"/>
+                        <rect key="frame" x="829" y="6" width="311" height="43"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="rGC-re-IS2">
                             <rect key="frame" x="0.0" y="0.0" width="788" height="31"/>
                                     <rect key="frame" x="0.0" y="0.0" width="788" height="43"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                    <size key="minSize" width="308" height="43"/>
+                                    <size key="minSize" width="311" height="43"/>
                                     <size key="maxSize" width="806" height="10000000"/>
                                     <color key="insertionPointColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                    <size key="minSize" width="308" height="43"/>
+                                    <size key="minSize" width="311" height="43"/>
                                     <size key="maxSize" width="806" height="10000000"/>
                                     <connections>
                                         <binding destination="-2" name="attributedString" keyPath="linksString" id="Zq5-KB-a2U">
                         </scroller>
                     </scrollView>
                     <box autoresizesSubviews="NO" verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="hNz-5S-KHR">
-                        <rect key="frame" x="814" y="164" width="327" height="5"/>
+                        <rect key="frame" x="820" y="164" width="329" height="5"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <font key="titleFont" metaFont="system"/>
                     </box>
                     <box autoresizesSubviews="NO" verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="0Qm-W2-6cQ">
-                        <rect key="frame" x="814" y="88" width="327" height="5"/>
+                        <rect key="frame" x="820" y="88" width="329" height="5"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <font key="titleFont" metaFont="system"/>
                     </box>
-                    <segmentedControl verticalHuggingPriority="750" id="DzQ-d1-fzE">
-                        <rect key="frame" x="814" y="743" width="237" height="24"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
-                        <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="sDP-iK-20N">
-                            <font key="font" metaFont="system"/>
-                            <segments>
-                                <segment label="状況" selected="YES"/>
-                                <segment label="編成支援" tag="1"/>
-                                <segment label="近代化改修支援" tag="2"/>
-                            </segments>
-                        </segmentedCell>
-                        <connections>
-                            <action selector="selectView:" target="-2" id="9k2-Fy-KWD"/>
-                            <binding destination="-2" name="selectedIndex" keyPath="selectedViewsSegment" id="Y74-mZ-YTP"/>
-                        </connections>
-                    </segmentedControl>
                     <box autoresizesSubviews="NO" verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="nxC-2x-83k">
-                        <rect key="frame" x="814" y="58" width="327" height="5"/>
+                        <rect key="frame" x="820" y="58" width="329" height="5"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <font key="titleFont" metaFont="system"/>
                     </box>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="wlE-3a-66Q">
-                        <rect key="frame" x="818" y="143" width="30" height="17"/>
+                        <rect key="frame" x="827" y="143" width="30" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="油:" id="2lX-Lz-EJP">
                             <font key="font" metaFont="system"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="83p-Lp-3TG">
-                        <rect key="frame" x="847" y="143" width="58" height="17"/>
+                        <rect key="frame" x="856" y="143" width="58" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123,456" id="bM9-qa-rm4">
                             <font key="font" metaFont="system"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="tNY-jd-hY3">
-                        <rect key="frame" x="818" y="120" width="30" height="17"/>
+                        <rect key="frame" x="827" y="120" width="30" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="弾:" id="Hts-4x-xuz">
                             <font key="font" metaFont="system"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="yaS-Ma-KLp">
-                        <rect key="frame" x="847" y="120" width="58" height="17"/>
+                        <rect key="frame" x="856" y="120" width="58" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123,456" id="Q4N-S6-4sL">
                             <font key="font" metaFont="system"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="9HQ-8B-ieL">
-                        <rect key="frame" x="908" y="143" width="56" height="17"/>
+                        <rect key="frame" x="917" y="143" width="56" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="鉄:" id="hx1-zd-w7u">
                             <font key="font" metaFont="system"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="1zJ-rT-2I1">
-                        <rect key="frame" x="963" y="143" width="58" height="17"/>
+                        <rect key="frame" x="972" y="143" width="58" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123,456" id="FDS-eS-Zca">
                             <font key="font" metaFont="system"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="0Tk-ny-1i7">
-                        <rect key="frame" x="908" y="120" width="56" height="17"/>
+                        <rect key="frame" x="917" y="120" width="56" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="ボーキ:" id="SbC-a7-1dA">
                             <font key="font" metaFont="system"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="KlT-Sx-042">
-                        <rect key="frame" x="963" y="120" width="58" height="17"/>
+                        <rect key="frame" x="972" y="120" width="58" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="123,456" id="nZq-Hg-c2o">
                             <font key="font" metaFont="system"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="FCg-0H-Nvw">
-                        <rect key="frame" x="908" y="97" width="56" height="17"/>
+                        <rect key="frame" x="917" y="97" width="56" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="バケツ:" id="UMF-ir-SiJ">
                             <font key="font" metaFont="system"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="mhB-PE-JUV">
-                        <rect key="frame" x="963" y="97" width="50" height="17"/>
+                        <rect key="frame" x="972" y="97" width="50" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="12,345" id="VNf-6W-K66">
                             <font key="font" metaFont="system"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="a6e-RR-7BC">
-                        <rect key="frame" x="1024" y="120" width="69" height="17"/>
+                        <rect key="frame" x="1033" y="120" width="69" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="改修資材:" id="sQJ-9J-da5">
                             <font key="font" metaFont="system"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="7R8-yE-6jR">
-                        <rect key="frame" x="1092" y="121" width="41" height="17"/>
+                        <rect key="frame" x="1101" y="121" width="41" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1,234" id="kNL-81-hK8">
                             <font key="font" metaFont="system"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="cZg-Bw-yUE">
-                        <rect key="frame" x="1024" y="97" width="69" height="17"/>
+                        <rect key="frame" x="1033" y="97" width="69" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="バーナー:" id="AsI-rq-T2u">
                             <font key="font" metaFont="system"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="mU2-vd-vlM">
-                        <rect key="frame" x="1092" y="97" width="41" height="17"/>
+                        <rect key="frame" x="1101" y="97" width="41" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1,234" id="L6I-0D-5bY">
                             <font key="font" metaFont="system"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Mtl-WL-S3k">
-                        <rect key="frame" x="1092" y="143" width="41" height="17"/>
+                        <rect key="frame" x="1101" y="143" width="41" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="1,234" id="ltg-UP-epN">
                             <font key="font" metaFont="system"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="4BJ-pP-F69">
-                        <rect key="frame" x="1024" y="143" width="69" height="17"/>
+                        <rect key="frame" x="1033" y="143" width="69" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="開発:" id="83W-h0-qFL">
                             <font key="font" metaFont="system"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="iuy-QP-cwC">
-                        <rect key="frame" x="909" y="67" width="61" height="17"/>
+                        <rect key="frame" x="918" y="67" width="61" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="999/999" id="Ysd-ie-6KJ" customClass="HMStrokeTextFieldCell">
                             <font key="font" metaFont="system"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="IeS-oA-anB">
-                        <rect key="frame" x="818" y="67" width="95" height="17"/>
+                        <rect key="frame" x="827" y="67" width="95" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="艦娘入居状況:" id="9q8-dO-oGH">
                             <font key="font" metaFont="system"/>
                         </textFieldCell>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="Kaq-lg-pME">
-                        <rect key="frame" x="1072" y="67" width="61" height="17"/>
+                        <rect key="frame" x="1081" y="67" width="61" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="999/999" id="kuE-T2-PrK">
                             <font key="font" metaFont="system"/>
                         </connections>
                     </textField>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="6Fd-uC-k3S">
-                        <rect key="frame" x="1007" y="67" width="69" height="17"/>
+                        <rect key="frame" x="1016" y="67" width="69" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="倉庫状況:" id="XAa-Go-U3j">
                             <font key="font" metaFont="system"/>
                         </textFieldCell>
                     </textField>
                     <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="CHt-wF-HCb">
-                        <rect key="frame" x="982" y="63" width="15" height="22"/>
+                        <rect key="frame" x="991" y="63" width="15" height="22"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="9" id="rt4-Af-iDD"/>
                         <connections>
                         </connections>
                     </stepper>
                     <textField focusRingType="none" verticalHuggingPriority="750" id="mYb-X1-79h">
-                        <rect key="frame" x="971" y="65" width="15" height="19"/>
+                        <rect key="frame" x="980" y="65" width="15" height="19"/>
                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" alignment="right" title="9" drawsBackground="YES" id="6jC-if-UYu">
                             <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="309" maximumFractionDigits="3" id="Z67-ZX-FCm"/>
                             <binding destination="-2" name="value" keyPath="minimumColoredShipCount" id="QAn-eC-rf8"/>
                         </connections>
                     </textField>
+                    <tabView initialItem="ETl-Gs-mBL" id="fK1-fC-Xdm">
+                        <rect key="frame" x="813" y="165" width="343" height="611"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <font key="font" metaFont="system"/>
+                        <tabViewItems>
+                            <tabViewItem label="状況" identifier="1" id="ETl-Gs-mBL">
+                                <view key="view" id="nff-Ek-C9h">
+                                    <rect key="frame" x="10" y="33" width="323" height="565"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                </view>
+                            </tabViewItem>
+                            <tabViewItem label="編成支援" identifier="2" id="vnl-eb-0bM">
+                                <view key="view" id="HTH-7g-xfp">
+                                    <rect key="frame" x="10" y="33" width="323" height="565"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                </view>
+                            </tabViewItem>
+                            <tabViewItem label="近代化改修支援" identifier="3" id="Ops-Am-LiF">
+                                <view key="view" id="ytJ-Qj-RCn">
+                                    <rect key="frame" x="10" y="33" width="323" height="565"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                </view>
+                            </tabViewItem>
+                        </tabViewItems>
+                    </tabView>
                 </subviews>
             </view>
             <connections>
                 </binding>
                 <outlet property="delegate" destination="-2" id="4"/>
             </connections>
-            <point key="canvasLocation" x="176.5" y="-663"/>
+            <point key="canvasLocation" x="180.5" y="-663"/>
         </window>
         <webView id="tgB-GD-Aq9">
             <rect key="frame" x="0.0" y="0.0" width="900" height="700"/>
index f83e0ac..632d040 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6250"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HMDocksViewController">
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="vGg-MO-rzn">
-            <rect key="frame" x="0.0" y="0.0" width="346" height="424"/>
+            <rect key="frame" x="0.0" y="0.0" width="323" height="424"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
             <subviews>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qbt-Mz-eoZ">
-                    <rect key="frame" x="18" y="399" width="43" height="17"/>
+                    <rect key="frame" x="10" y="399" width="43" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="遠征:" id="7QQ-hS-weZ">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -26,7 +26,7 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0Uz-o8-NQM">
-                    <rect key="frame" x="18" y="298" width="82" height="17"/>
+                    <rect key="frame" x="10" y="298" width="82" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="入渠ドック:" id="b5U-Dj-col">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -34,7 +34,7 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qbt-tg-Tzc">
-                    <rect key="frame" x="26" y="376" width="65" height="17"/>
+                    <rect key="frame" x="18" y="376" width="65" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第2艦隊:" id="fFX-LQ-9is">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -42,7 +42,7 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1Z4-bD-0N0">
-                    <rect key="frame" x="153" y="376" width="155" height="17"/>
+                    <rect key="frame" x="145" y="376" width="155" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="遠征場所00000" id="EIG-mO-Bl7">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -57,7 +57,7 @@
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sTn-uJ-Phx">
-                    <rect key="frame" x="87" y="376" width="62" height="17"/>
+                    <rect key="frame" x="79" y="376" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="BJE-Ig-1at">
                         <customFormatter key="formatter" id="9Rm-sQ-KzG" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
@@ -73,7 +73,7 @@
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ImV-DF-NX7">
-                    <rect key="frame" x="26" y="275" width="78" height="17"/>
+                    <rect key="frame" x="18" y="275" width="78" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第1ドック:" id="ax3-cD-jlq">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -81,7 +81,7 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="U7b-9S-sWb">
-                    <rect key="frame" x="100" y="275" width="62" height="17"/>
+                    <rect key="frame" x="92" y="275" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="iv8-oM-0Fo">
                         <customFormatter key="formatter" id="uTW-Si-vAP" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
@@ -98,7 +98,7 @@
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ROJ-cy-pfs">
-                    <rect key="frame" x="18" y="175" width="82" height="17"/>
+                    <rect key="frame" x="10" y="175" width="82" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="建造ドック:" id="jJs-Zj-Eku">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fyi-lA-fL1">
-                    <rect key="frame" x="26" y="152" width="78" height="17"/>
+                    <rect key="frame" x="18" y="152" width="78" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第1ドック:" id="HCM-6h-iZC">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1j4-Kg-am8">
-                    <rect key="frame" x="100" y="152" width="62" height="17"/>
+                    <rect key="frame" x="92" y="152" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="5SQ-4h-gVc">
                         <customFormatter key="formatter" id="fOY-bM-qRR" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k1d-jn-V0r">
-                    <rect key="frame" x="166" y="275" width="142" height="17"/>
+                    <rect key="frame" x="158" y="275" width="142" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Bismarck zwei" id="00K-BC-hE3">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="78z-RY-MYG">
-                    <rect key="frame" x="26" y="353" width="65" height="17"/>
+                    <rect key="frame" x="18" y="353" width="65" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第3艦隊:" id="yqL-gH-ywX">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ozB-6d-jdP">
-                    <rect key="frame" x="153" y="353" width="155" height="17"/>
+                    <rect key="frame" x="145" y="353" width="155" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="遠征場所00000" id="hsi-5v-SGu">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YPL-iZ-5QI">
-                    <rect key="frame" x="87" y="353" width="62" height="17"/>
+                    <rect key="frame" x="79" y="353" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="uZ7-H0-10h">
                         <customFormatter key="formatter" id="XJq-qE-ggs" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cSE-HO-9tA">
-                    <rect key="frame" x="26" y="330" width="65" height="17"/>
+                    <rect key="frame" x="18" y="330" width="65" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第4艦隊:" id="kJb-mN-M4Q">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HMF-e4-15i">
-                    <rect key="frame" x="153" y="330" width="155" height="17"/>
+                    <rect key="frame" x="145" y="330" width="155" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="遠征場所00000" id="aSL-uz-w7C">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aaL-Hq-rXW">
-                    <rect key="frame" x="87" y="330" width="62" height="17"/>
+                    <rect key="frame" x="79" y="330" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="KdJ-xQ-eVC">
                         <customFormatter key="formatter" id="lcg-8G-Dru" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mOt-g2-cwL">
-                    <rect key="frame" x="26" y="252" width="78" height="17"/>
+                    <rect key="frame" x="18" y="252" width="78" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第2ドック:" id="n0V-Uv-9Zj">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mAQ-lg-uXF">
-                    <rect key="frame" x="100" y="252" width="62" height="17"/>
+                    <rect key="frame" x="92" y="252" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="oco-u5-uot">
                         <customFormatter key="formatter" id="n6E-LC-O0m" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TaR-MT-gwt">
-                    <rect key="frame" x="166" y="252" width="142" height="17"/>
+                    <rect key="frame" x="158" y="252" width="142" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="阿賀野航改二" id="fPQ-pb-CKr">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fkC-bB-UBd">
-                    <rect key="frame" x="26" y="229" width="78" height="17"/>
+                    <rect key="frame" x="18" y="229" width="78" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第3ドック:" id="JDi-Sd-mg3">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0Ep-sM-xII">
-                    <rect key="frame" x="100" y="229" width="62" height="17"/>
+                    <rect key="frame" x="92" y="229" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="YbO-M6-FUI">
                         <customFormatter key="formatter" id="XN3-A0-NNc" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TFq-Xl-orn">
-                    <rect key="frame" x="166" y="229" width="142" height="17"/>
+                    <rect key="frame" x="158" y="229" width="142" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="阿賀野航改二" id="Jjl-TA-ODo">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EME-Mj-KxR">
-                    <rect key="frame" x="26" y="206" width="78" height="17"/>
+                    <rect key="frame" x="18" y="206" width="78" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第4ドック:" id="zOe-3P-h4L">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zee-D4-ZGG">
-                    <rect key="frame" x="100" y="206" width="62" height="17"/>
+                    <rect key="frame" x="92" y="206" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="rFg-0M-tbw">
                         <customFormatter key="formatter" id="aaT-2p-6sV" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="U2e-ln-Ord">
-                    <rect key="frame" x="166" y="206" width="142" height="17"/>
+                    <rect key="frame" x="158" y="206" width="142" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="阿賀野航改二" id="jas-Ub-XVx">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Pw-Qt-MRs">
-                    <rect key="frame" x="26" y="129" width="78" height="17"/>
+                    <rect key="frame" x="18" y="129" width="78" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第2ドック:" id="gSL-UE-kuw">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="txP-dd-uyL">
-                    <rect key="frame" x="100" y="129" width="62" height="17"/>
+                    <rect key="frame" x="92" y="129" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="Bnk-cQ-3F5">
                         <customFormatter key="formatter" id="pyU-qN-RwB" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="06L-NN-Abk">
-                    <rect key="frame" x="172" y="152" width="78" height="17"/>
+                    <rect key="frame" x="164" y="152" width="78" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第3ドック:" id="ubh-cI-QPF">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VoE-sV-bbn">
-                    <rect key="frame" x="246" y="152" width="62" height="17"/>
+                    <rect key="frame" x="238" y="152" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="769-Rr-iNm">
                         <customFormatter key="formatter" id="wwc-Kj-i2T" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2Hd-Hd-R3Y">
-                    <rect key="frame" x="172" y="129" width="78" height="17"/>
+                    <rect key="frame" x="164" y="129" width="78" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="第4ドック:" id="Nhl-yc-qQd">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cB6-7z-cj7">
-                    <rect key="frame" x="246" y="129" width="62" height="17"/>
+                    <rect key="frame" x="238" y="129" width="62" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="IP7-Yh-Z7X">
                         <customFormatter key="formatter" id="5gk-HQ-Ks2" customClass="HMTimerCountFormatter"/>
                         <font key="font" size="13" name="AquaKana"/>
                     </connections>
                 </textField>
                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SDh-rD-4Hk">
-                    <rect key="frame" x="26" y="41" width="282" height="51"/>
+                    <rect key="frame" x="18" y="41" width="282" height="51"/>
                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" id="gFh-Ud-DOy">
                         <font key="font" metaFont="system"/>
                         <string key="title">Multiline
@@ -430,7 +430,7 @@ ffff</string>
                     </connections>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="x0u-i0-Nnm">
-                    <rect key="frame" x="18" y="98" width="43" height="17"/>
+                    <rect key="frame" x="10" y="98" width="43" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="出撃:" id="qFP-DB-9fz">
                         <font key="font" size="13" name="AquaKana"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
index c2420b5..ab701c2 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6245"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HMPowerUpSupportViewController">
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="1">
-            <rect key="frame" x="0.0" y="0.0" width="346" height="424"/>
+            <rect key="frame" x="0.0" y="0.0" width="323" height="424"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="3B2-Jy-NLq">
-                    <rect key="frame" x="20" y="10" width="306" height="352"/>
+                    <rect key="frame" x="6" y="8" width="311" height="354"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
                     <clipView key="contentView" id="gHP-Wh-ryl">
                         <rect key="frame" x="1" y="17" width="304" height="334"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="powerupsupportview" headerView="xz8-nE-DgQ" id="HLz-Kp-DN2">
+                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="powerupsupportview" headerView="xz8-nE-DgQ" id="HLz-Kp-DN2">
                                 <rect key="frame" x="0.0" y="0.0" width="304" height="19"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
-                                    <tableColumn identifier="no" editable="NO" width="33" minWidth="33" maxWidth="1000" id="sNi-c1-2zU">
+                                    <tableColumn identifier="no" editable="NO" width="30" minWidth="30" maxWidth="30" id="sNi-c1-2zU">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="No.">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -48,7 +48,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.master_ship.sortno" id="HdN-nH-86V"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn identifier="name" editable="NO" width="76" minWidth="40" maxWidth="1000" id="82a-ca-AZb">
+                                    <tableColumn identifier="name" editable="NO" width="83" minWidth="83" maxWidth="83" id="82a-ca-AZb">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="名前">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <connections>
-                                            <binding destination="b8v-Gn-JZD" name="textColor" keyPath="arrangedObjects.planColor" id="UHh-9X-yQ0"/>
-                                            <binding destination="b8v-Gn-JZD" name="fontBold" keyPath="arrangedObjects.sally_area" id="XLY-9p-IPT">
+                                            <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.name" id="Wdl-aY-u3L">
                                                 <dictionary key="options">
-                                                    <string key="NSValueTransformerName">HMPlanToShowsBoldFontTransformer</string>
+                                                    <bool key="NSConditionallySetsEditable" value="YES"/>
                                                 </dictionary>
                                             </binding>
-                                            <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.name" id="Wdl-aY-u3L">
+                                            <binding destination="b8v-Gn-JZD" name="textColor" keyPath="arrangedObjects.planColor" id="UHh-9X-yQ0"/>
+                                            <binding destination="b8v-Gn-JZD" name="fontBold" keyPath="arrangedObjects.sally_area" id="XLY-9p-IPT">
                                                 <dictionary key="options">
-                                                    <bool key="NSConditionallySetsEditable" value="YES"/>
+                                                    <string key="NSValueTransformerName">HMPlanToShowsBoldFontTransformer</string>
                                                 </dictionary>
                                             </binding>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn identifier="lv" editable="NO" width="31" minWidth="10" maxWidth="3.4028234663852886e+38" id="u6A-sR-Kyv">
+                                    <tableColumn identifier="lv" editable="NO" width="38" minWidth="10" maxWidth="3.4028234663852886e+38" id="u6A-sR-Kyv">
                                         <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"/>
@@ -90,7 +90,7 @@
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.lv" id="qEu-ub-xiv"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn identifier="karyoku" editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="G9R-OQ-qxc">
+                                    <tableColumn identifier="karyoku" editable="NO" width="28" minWidth="28" maxWidth="3.4028234663852886e+38" id="G9R-OQ-qxc">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="火力">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.isMaxKaryoku" id="kFw-53-Ztq"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn identifier="raisou" editable="NO" width="28" minWidth="22" maxWidth="3.4028234663852886e+38" id="h1X-yX-kBd">
+                                    <tableColumn identifier="raisou" editable="NO" width="28" minWidth="28" maxWidth="3.4028234663852886e+38" id="h1X-yX-kBd">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="雷装">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.isMaxRaisou" id="4Et-xX-GBO"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn identifier="taiku" editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="kOg-s3-rC4">
+                                    <tableColumn identifier="taiku" editable="NO" width="28" minWidth="28" maxWidth="3.4028234663852886e+38" id="kOg-s3-rC4">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="対空">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.isMaxTaiku" id="Fbm-nQ-g0X"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn identifier="soukou" editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="whd-ZR-lLz">
+                                    <tableColumn identifier="soukou" editable="NO" width="28" minWidth="28" maxWidth="3.4028234663852886e+38" id="whd-ZR-lLz">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="装甲">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.isMaxSoukou" id="rId-U9-Y9l"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn identifier="lucky" editable="NO" width="28" minWidth="10" maxWidth="3.4028234663852886e+38" id="zY7-Tf-YmF">
+                                    <tableColumn identifier="lucky" editable="NO" width="28" minWidth="28" maxWidth="3.4028234663852886e+38" id="zY7-Tf-YmF">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="運">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                         </subviews>
                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </clipView>
-                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="edk-ob-MlH">
+                    <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="edk-ob-MlH">
                         <rect key="frame" x="1" y="335" width="304" height="16"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     </tableHeaderView>
                 </scrollView>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="FZQ-ab-vfc">
-                    <rect key="frame" x="18" y="399" width="66" height="17"/>
+                    <rect key="frame" x="4" y="399" width="66" height="17"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="999 Ships" id="TeI-HB-SYu">
                         <font key="font" metaFont="system"/>
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" id="oAr-IJ-cOj">
-                    <rect key="frame" x="18" y="368" width="310" height="24"/>
+                    <rect key="frame" x="4" y="368" width="315" height="24"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="b1J-je-IDl">
                         <font key="font" metaFont="system"/>
                         <segments>
-                            <segment label="All" width="34" selected="YES"/>
-                            <segment label="駆逐" width="38" tag="1"/>
-                            <segment label="軽巡" width="38" tag="2"/>
-                            <segment label="重巡" width="38" tag="3"/>
-                            <segment label="空母" width="38" tag="4"/>
+                            <segment label="All" width="35" selected="YES"/>
+                            <segment label="駆逐" width="39" tag="1"/>
+                            <segment label="軽巡" width="39" tag="2"/>
+                            <segment label="重巡" width="39" tag="3"/>
+                            <segment label="空母" width="39" tag="4"/>
                             <segment label="戦艦" width="38" tag="5"/>
                             <segment label="潜水" width="38" tag="6"/>
                             <segment label="他" width="35" tag="7"/>
                     </connections>
                 </segmentedControl>
                 <button id="1zs-Vq-5x3">
-                    <rect key="frame" x="101" y="398" width="48" height="18"/>
+                    <rect key="frame" x="90" y="398" width="48" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="火力" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="dhe-tG-3cL">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                     </connections>
                 </button>
                 <button id="bme-k0-rWL">
-                    <rect key="frame" x="149" y="398" width="48" height="18"/>
+                    <rect key="frame" x="138" y="398" width="48" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="雷装" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="VHm-25-m9p">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                     </connections>
                 </button>
                 <button id="6XO-ev-1Mj">
-                    <rect key="frame" x="197" y="398" width="48" height="18"/>
+                    <rect key="frame" x="186" y="398" width="48" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="対空" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="uwe-h9-3aH">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                     </connections>
                 </button>
                 <button id="jGM-rA-FMz">
-                    <rect key="frame" x="245" y="398" width="48" height="18"/>
+                    <rect key="frame" x="234" y="398" width="48" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="装甲" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="hFv-rt-7rt">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                     </connections>
                 </button>
                 <button id="aEI-HV-qk7">
-                    <rect key="frame" x="293" y="398" width="35" height="18"/>
+                    <rect key="frame" x="282" y="398" width="35" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="check" title="運" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Uzw-uL-ANY">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                     </connections>
                 </button>
             </subviews>
+            <point key="canvasLocation" x="139.5" y="154"/>
         </customView>
         <arrayController mode="entity" entityName="Ship" editable="NO" automaticallyPreparesContent="YES" automaticallyRearrangesObjects="YES" id="b8v-Gn-JZD" userLabel="Ship">
             <connections>
index 97c4f81..797f546 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <deployment version="1070" defaultVersion="1090" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
+        <deployment version="1070" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HMShipViewController">
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="1">
-            <rect key="frame" x="0.0" y="0.0" width="346" height="424"/>
+            <rect key="frame" x="0.0" y="0.0" width="323" height="424"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="3B2-Jy-NLq">
-                    <rect key="frame" x="20" y="10" width="306" height="352"/>
+                    <rect key="frame" x="6" y="8" width="311" height="354"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
                     <clipView key="contentView" id="gHP-Wh-ryl">
                         <rect key="frame" x="1" y="17" width="304" height="334"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="shipviewtable1" headerView="xz8-nE-DgQ" id="HLz-Kp-DN2">
-                                <rect key="frame" x="0.0" y="0.0" width="304" height="334"/>
+                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="shipviewtable21" headerView="xz8-nE-DgQ" id="HLz-Kp-DN2">
+                                <rect key="frame" x="0.0" y="0.0" width="304" height="19"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.exp" id="f1g-3G-oep"/>
                                         </connections>
                                     </tableColumn>
-                                    <tableColumn identifier="next" editable="NO" width="49" minWidth="10" maxWidth="3.4028234663852886e+38" id="whd-ZR-lLz">
+                                    <tableColumn identifier="next" editable="NO" width="54" minWidth="10" maxWidth="3.4028234663852886e+38" id="whd-ZR-lLz">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Next">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="B9P-a1-x7u">
-                        <rect key="frame" x="-100" y="-100" width="16" height="0.0"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" id="xz8-nE-DgQ">
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="FZQ-ab-vfc">
-                    <rect key="frame" x="18" y="399" width="113" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="TeI-HB-SYu">
-                        <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="b8v-Gn-JZD" name="displayPatternValue1" keyPath="arrangedObjects.@count" id="ElJ-BE-vFz">
-                            <dictionary key="options">
-                                <string key="NSDisplayPattern">%{value1}@ ships</string>
-                            </dictionary>
-                        </binding>
-                    </connections>
-                </textField>
                 <segmentedControl verticalHuggingPriority="750" id="oAr-IJ-cOj">
-                    <rect key="frame" x="18" y="368" width="310" height="24"/>
+                    <rect key="frame" x="4" y="368" width="315" height="24"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <segmentedCell key="cell" alignment="left" style="rounded" trackingMode="selectOne" id="b1J-je-IDl">
+                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="b1J-je-IDl">
                         <font key="font" metaFont="system"/>
                         <segments>
-                            <segment label="All" width="34" selected="YES"/>
-                            <segment label="駆逐" width="38" tag="1"/>
-                            <segment label="軽巡" width="38" tag="2"/>
-                            <segment label="重巡" width="38" tag="3"/>
-                            <segment label="空母" width="38" tag="4"/>
+                            <segment label="All" width="35" selected="YES"/>
+                            <segment label="駆逐" width="39" tag="1"/>
+                            <segment label="軽巡" width="39" tag="2"/>
+                            <segment label="重巡" width="39" tag="3"/>
+                            <segment label="空母" width="39" tag="4"/>
                             <segment label="戦艦" width="38" tag="5"/>
                             <segment label="潜水" width="38" tag="6"/>
                             <segment label="他" width="35" tag="7"/>
                     </connections>
                 </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" id="ii6-Wq-Zpd">
-                    <rect key="frame" x="173" y="396" width="155" height="20"/>
+                    <rect key="frame" x="164" y="396" width="155" height="20"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <segmentedCell key="cell" controlSize="small" alignment="left" style="rounded" trackingMode="selectOne" id="fvt-PE-zAC">
+                    <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="fvt-PE-zAC">
                         <font key="font" metaFont="smallSystem"/>
                         <segments>
                             <segment label="経験値" width="49" selected="YES"/>
                         <action selector="changeView:" target="-2" id="rr6-EF-geN"/>
                     </connections>
                 </segmentedControl>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="FZQ-ab-vfc">
+                    <rect key="frame" x="4" y="399" width="113" height="17"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="TeI-HB-SYu">
+                        <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="b8v-Gn-JZD" name="displayPatternValue1" keyPath="arrangedObjects.@count" id="ElJ-BE-vFz">
+                            <dictionary key="options">
+                                <string key="NSDisplayPattern">%{value1}@ ships</string>
+                            </dictionary>
+                        </binding>
+                    </connections>
+                </textField>
             </subviews>
         </customView>
         <arrayController mode="entity" entityName="Ship" editable="NO" automaticallyPreparesContent="YES" automaticallyRearrangesObjects="YES" id="b8v-Gn-JZD" userLabel="Ship">
         </arrayController>
         <userDefaultsController representsSharedInstance="YES" id="Ai5-X2-MeM"/>
         <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="nJW-R6-f00">
-            <rect key="frame" x="0.0" y="0.0" width="306" height="352"/>
+            <rect key="frame" x="0.0" y="0.0" width="311" height="352"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
             <clipView key="contentView" id="V5p-7l-cBF">
                 <rect key="frame" x="1" y="17" width="304" height="334"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="shipviewtable2" headerView="QxO-zY-mjX" id="Ze3-Gd-1Qe">
-                        <rect key="frame" x="0.0" y="0.0" width="304" height="334"/>
+                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="shipviewtable22" headerView="QxO-zY-mjX" id="Ze3-Gd-1Qe">
+                        <rect key="frame" x="0.0" y="0.0" width="304" height="19"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <size key="intercellSpacing" width="3" height="2"/>
                         <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </binding>
                                 </connections>
                             </tableColumn>
-                            <tableColumn identifier="karyoku" editable="NO" width="34" minWidth="22" maxWidth="3.4028234663852886e+38" id="HJD-3v-pYl">
+                            <tableColumn identifier="karyoku" editable="NO" width="35" minWidth="22" maxWidth="3.4028234663852886e+38" id="HJD-3v-pYl">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="火力">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                     <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.karyoku_0" id="R31-Fj-OrS"/>
                                 </connections>
                             </tableColumn>
-                            <tableColumn identifier="soukou" editable="NO" width="34" minWidth="10" maxWidth="3.4028234663852886e+38" id="d4u-ni-SBZ">
+                            <tableColumn identifier="soukou" editable="NO" width="35" minWidth="10" maxWidth="3.4028234663852886e+38" id="d4u-ni-SBZ">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="装甲">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                     <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.soukou_0" id="d4i-fH-Oc9"/>
                                 </connections>
                             </tableColumn>
-                            <tableColumn identifier="raisou" editable="NO" width="34" minWidth="10" maxWidth="3.4028234663852886e+38" id="c2Z-Gz-ccl">
+                            <tableColumn identifier="raisou" editable="NO" width="35" minWidth="10" maxWidth="3.4028234663852886e+38" id="c2Z-Gz-ccl">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="雷装">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                     <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.raisou_0" id="TVv-7C-S29"/>
                                 </connections>
                             </tableColumn>
-                            <tableColumn identifier="kaihi" editable="NO" width="34" minWidth="10" maxWidth="3.4028234663852886e+38" id="J7e-62-cUm">
+                            <tableColumn identifier="kaihi" editable="NO" width="35" minWidth="10" maxWidth="3.4028234663852886e+38" id="J7e-62-cUm">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="回避">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                     <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.kaihi_0" id="hZB-W6-Op7"/>
                                 </connections>
                             </tableColumn>
-                            <tableColumn identifier="taiku" editable="NO" width="34" minWidth="10" maxWidth="3.4028234663852886e+38" id="3cA-40-8P3">
+                            <tableColumn identifier="taiku" editable="NO" width="35" minWidth="10" maxWidth="3.4028234663852886e+38" id="3cA-40-8P3">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="対空">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
             <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="aIa-sY-bEH">
-                <rect key="frame" x="-15" y="17" width="16" height="0.0"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
             <tableHeaderView key="headerView" id="QxO-zY-mjX">
                 <rect key="frame" x="0.0" y="0.0" width="304" height="17"/>
                 <autoresizingMask key="autoresizingMask"/>
             </tableHeaderView>
+            <point key="canvasLocation" x="348.5" y="611"/>
         </scrollView>
         <scrollView autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="edK-En-P6H">
-            <rect key="frame" x="0.0" y="0.0" width="306" height="352"/>
+            <rect key="frame" x="0.0" y="0.0" width="311" height="352"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
             <clipView key="contentView" id="qkK-9C-mZ5">
                 <rect key="frame" x="1" y="17" width="304" height="334"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="shipviewtable3" headerView="dJx-c5-qhN" id="qaM-It-e1l">
-                        <rect key="frame" x="0.0" y="0.0" width="304" height="334"/>
+                    <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveName="shipviewtable23" headerView="dJx-c5-qhN" id="qaM-It-e1l">
+                        <rect key="frame" x="0.0" y="0.0" width="304" height="19"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <size key="intercellSpacing" width="3" height="2"/>
                         <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </binding>
                                 </connections>
                             </tableColumn>
-                            <tableColumn identifier="maxhp" editable="NO" width="34" minWidth="22" maxWidth="3.4028234663852886e+38" id="XBP-7Q-86k">
+                            <tableColumn identifier="maxhp" editable="NO" width="35" minWidth="22" maxWidth="3.4028234663852886e+38" id="XBP-7Q-86k">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="耐久">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                     <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.maxhp" id="Ela-zb-V7T"/>
                                 </connections>
                             </tableColumn>
-                            <tableColumn identifier="cond" editable="NO" width="34" minWidth="10" maxWidth="3.4028234663852886e+38" id="UTt-vy-S3S">
+                            <tableColumn identifier="cond" editable="NO" width="35" minWidth="10" maxWidth="3.4028234663852886e+38" id="UTt-vy-S3S">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="体調">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                     <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.cond" id="SdR-5F-6F3"/>
                                 </connections>
                             </tableColumn>
-                            <tableColumn identifier="taisen" editable="NO" width="34" minWidth="10" maxWidth="3.4028234663852886e+38" id="aaq-4b-AS5">
+                            <tableColumn identifier="taisen" editable="NO" width="35" minWidth="10" maxWidth="3.4028234663852886e+38" id="aaq-4b-AS5">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="対潜">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                     <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.taisen_0" id="TuS-Oh-Lcc"/>
                                 </connections>
                             </tableColumn>
-                            <tableColumn identifier="sakuteki" editable="NO" width="34" minWidth="10" maxWidth="3.4028234663852886e+38" id="roP-4x-mhA">
+                            <tableColumn identifier="sakuteki" editable="NO" width="35" minWidth="10" maxWidth="3.4028234663852886e+38" id="roP-4x-mhA">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="索敵">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                     <binding destination="b8v-Gn-JZD" name="value" keyPath="arrangedObjects.sakuteki_0" id="YoF-5x-rND"/>
                                 </connections>
                             </tableColumn>
-                            <tableColumn identifier="lucky" editable="NO" width="34" minWidth="10" maxWidth="3.4028234663852886e+38" id="Ycr-qT-Abn">
+                            <tableColumn identifier="lucky" editable="NO" width="35" minWidth="10" maxWidth="3.4028234663852886e+38" id="Ycr-qT-Abn">
                                 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="運">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
             <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="ikf-kJ-ufE">
-                <rect key="frame" x="-15" y="17" width="16" height="0.0"/>
                 <autoresizingMask key="autoresizingMask"/>
             </scroller>
             <tableHeaderView key="headerView" id="dJx-c5-qhN">
                 <rect key="frame" x="0.0" y="0.0" width="304" height="17"/>
                 <autoresizingMask key="autoresizingMask"/>
             </tableHeaderView>
+            <point key="canvasLocation" x="548.5" y="177"/>
         </scrollView>
     </objects>
 </document>