護衛退避のUIの準備

diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj
index 37fea01..a814ec7 100644 (file)
--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -193,6 +193,7 @@
                F4E7802818DBD2A00011BC4C /* HMGetShipCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4E7802718DBD2A00011BC4C /* HMGetShipCommand.m */; };
                F4E7802B18DC3A820011BC4C /* HMLocalDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = F4E7802A18DC3A820011BC4C /* HMLocalDataStore.m */; };
                F4E7802E18DC3AF00011BC4C /* LocalData.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F4E7802C18DC3AF00011BC4C /* LocalData.xcdatamodeld */; };
+               F4ED5D2A1B78D0CA00D1BDEF /* HMHaihiView.m in Sources */ = {isa = PBXBuildFile; fileRef = F4ED5D291B78D0CA00D1BDEF /* HMHaihiView.m */; };
                F4F6E8081B2B17E50008B66E /* HMStrengthenListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F6E8061B2B17E50008B66E /* HMStrengthenListViewController.m */; };
                F4F6E8091B2B17E50008B66E /* HMStrengthenListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4F6E8071B2B17E50008B66E /* HMStrengthenListViewController.xib */; };
                F4F6E80C1B2BC81C0008B66E /* HMPeriodicNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F6E80B1B2BC81C0008B66E /* HMPeriodicNotifier.m */; };
@@ -551,6 +552,8 @@
                F4E7802918DC3A820011BC4C /* HMLocalDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMLocalDataStore.h; sourceTree = "<group>"; };
                F4E7802A18DC3A820011BC4C /* HMLocalDataStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMLocalDataStore.m; sourceTree = "<group>"; };
                F4E7802D18DC3AF00011BC4C /* LocalData.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = LocalData.xcdatamodel; sourceTree = "<group>"; };
+               F4ED5D281B78D0CA00D1BDEF /* HMHaihiView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMHaihiView.h; sourceTree = "<group>"; };
+               F4ED5D291B78D0CA00D1BDEF /* HMHaihiView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMHaihiView.m; sourceTree = "<group>"; };
                F4F6E8051B2B17E50008B66E /* HMStrengthenListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMStrengthenListViewController.h; sourceTree = "<group>"; };
                F4F6E8061B2B17E50008B66E /* HMStrengthenListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMStrengthenListViewController.m; sourceTree = "<group>"; };
                F4F6E8071B2B17E50008B66E /* HMStrengthenListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HMStrengthenListViewController.xib; sourceTree = "<group>"; };
@@ -896,6 +899,8 @@
                                F4D6BCA61AA298FD00742FEB /* HMShipDetailViewController.h */,
                                F4D6BCA71AA298FD00742FEB /* HMShipDetailViewController.m */,
                                F4BEF00A1B11A5DE004702B8 /* HMShipDetailViewController.xib */,
+                               F4ED5D281B78D0CA00D1BDEF /* HMHaihiView.h */,
+                               F4ED5D291B78D0CA00D1BDEF /* HMHaihiView.m */,
                                F4D6BCB71AA32BEA00742FEB /* HMFleetViewController.h */,
                                F4D6BCB81AA32BEA00742FEB /* HMFleetViewController.m */,
                                F4BEF0071B11A5D3004702B8 /* HMFleetViewController.xib */,
@@ -1208,6 +1213,7 @@
                        buildActionMask = 2147483647;
                        files = (
                                F499E88D1B5BCA7300189029 /* HMAnchorageRepairManager.m in Sources */,
+                               F4ED5D2A1B78D0CA00D1BDEF /* HMHaihiView.m in Sources */,
                                F4513EE818B77A5300073552 /* HMMemberKDockCommand.m in Sources */,
                                F426802B194D0F4800B2C27F /* HMMemberShip2Command.m in Sources */,
                                F4AA06101931869E00844688 /* HMBattleResultCommand.m in Sources */,

diff --git a/KCD/HMHaihiView.h b/KCD/HMHaihiView.h
new file mode 100644 (file)
index 0000000..e5da576
--- /dev/null
+++ b/KCD/HMHaihiView.h
@@ -0,0 +1,13 @@
+//
+//  HMHaihiView.h
+//  KCD
+//
+//  Created by Hori,Masaki on 2015/08/10.
+//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface HMHaihiView : NSView
+
+@end

diff --git a/KCD/HMHaihiView.m b/KCD/HMHaihiView.m
new file mode 100644 (file)
index 0000000..7f45604
--- /dev/null
+++ b/KCD/HMHaihiView.m
@@ -0,0 +1,74 @@
+//
+//  HMHaihiView.m
+//  KCD
+//
+//  Created by Hori,Masaki on 2015/08/10.
+//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+#import "HMHaihiView.h"
+
+@implementation HMHaihiView
+
+- (void)drawRect:(NSRect)dirtyRect {
+    [super drawRect:dirtyRect];
+       
+       NSRect frame = self.frame;
+       
+       NSBezierPath *fillPath = [NSBezierPath bezierPathWithRect:frame];
+       [[NSColor colorWithCalibratedWhite:0.9 alpha:0.8] set];
+       [fillPath fill];
+       
+       NSAffineTransform *rotate = [NSAffineTransform transform];
+       [rotate translateXBy:0.0 yBy:65.0];
+       [rotate rotateByDegrees:-27];
+       [rotate concat];
+       
+       const CGFloat width = 50;
+       const CGFloat height = 100;
+       NSRect rect = NSMakeRect(
+                                                        (NSInteger)((frame.size.width - width) * 0.5),
+                                                        (NSInteger)((frame.size.height - height) * 0.5),
+                                                        width, height);
+       
+       NSBezierPath *path = [NSBezierPath bezierPathWithRect:rect];
+       
+       
+       NSShadow *shadow = [NSShadow new];
+       shadow.shadowOffset = NSMakeSize(1, -3);
+       shadow.shadowColor = [NSColor darkGrayColor];
+       shadow.shadowBlurRadius = 5;
+       [shadow set];
+       
+       [[NSColor whiteColor] set];
+       [path fill];
+       
+       shadow = [NSShadow new];
+       [shadow set];
+       
+       [[NSColor blackColor] set];
+       [path stroke];
+       
+       rect = NSInsetRect(rect, 3, 3);
+       path = [NSBezierPath bezierPathWithRect:rect];
+       path.lineWidth = 2;
+       [path stroke];
+       
+       NSDictionary *taiAttr = @{
+                                                         NSForegroundColorAttributeName : [NSColor colorWithCalibratedRed:0 green:204 / 255.0 blue:255 / 255.0 alpha:1],
+                                                         NSFontAttributeName : [NSFont boldSystemFontOfSize:width - 10],
+                                                         };
+       NSAttributedString *tai = [[NSAttributedString alloc] initWithString:@"退" attributes:taiAttr];
+       
+       NSAttributedString *hi = [[NSAttributedString alloc] initWithString:@"避" attributes:taiAttr];
+       
+       rect = NSInsetRect(rect, 2, 2);
+       rect.origin.y += 4;
+       rect.size.height -= 2;
+       [tai drawInRect:rect];
+       rect.size.height *= 0.5;
+//     rect.size.height += 2;
+       [hi drawInRect:rect];
+}
+
+@end

diff --git a/KCD/HMShipDetailViewController.h b/KCD/HMShipDetailViewController.h
index 7b497ca..78b1fc8 100644 (file)
--- a/KCD/HMShipDetailViewController.h
+++ b/KCD/HMShipDetailViewController.h
@@ -14,4 +14,6 @@
 
 @property (strong) HMKCShipObject *ship;
 
+@property BOOL taihi;
+
 @end

diff --git a/KCD/HMShipDetailViewController.m b/KCD/HMShipDetailViewController.m
index 7f11360..883ed5a 100644 (file)
--- a/KCD/HMShipDetailViewController.m
+++ b/KCD/HMShipDetailViewController.m
@@ -17,6 +17,7 @@
 
 @property (nonatomic, weak) IBOutlet HMSuppliesView *supply;
 
+@property (nonatomic, weak) IBOutlet NSView *taihiOverlayView;
 @end
 
 @implementation HMShipDetailViewController