Commit: d7d07102bdee3ef891ac39da5db75a1d61cfd283 - KCD (git)

Mac用艦これ専用ブラウザ　おまけ機能付き

Commit MetaInfo

• Revision: d7d07102bdee3ef891ac39da5db75a1d61cfd283 (tree)
• Time: 2015-09-06 00:13:06
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

ソースコード内のマルチバイト文字をplistに追い出した

Change Summary

• modified: KCD.xcodeproj/project.pbxproj
• modified: KCD/HMFleetViewController.m
• modified: KCD/HMGuardEscapedView.m
• add: KCD/ja.lproj/Taihi.txt

Incremental Difference

--- a/KCD.xcodeproj/project.pbxproj
+++ b/KCD.xcodeproj/project.pbxproj
@@ -104,6 +104,7 @@
 		F4A3AD9219BDDD8E00FDBF80 /* HMPreferencePanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = F4A3AD9019BDDD8E00FDBF80 /* HMPreferencePanelController.m */; };
 		F4A3AD9419BDDE5500FDBF80 /* HMPreferencePanelController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4A3AD9619BDDE5500FDBF80 /* HMPreferencePanelController.xib */; };
 		F4A9B8D41B975029005786C2 /* SlotItemShortName.plist in Resources */ = {isa = PBXBuildFile; fileRef = F4A9B8D21B975029005786C2 /* SlotItemShortName.plist */; };
+		F4A9B8D71B99D5B7005786C2 /* Taihi.txt in Resources */ = {isa = PBXBuildFile; fileRef = F4A9B8D51B99D5B7005786C2 /* Taihi.txt */; };
 		F4AA05FB192B92C800844688 /* Temporary.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F4AA05F9192B92C700844688 /* Temporary.xcdatamodeld */; };
 		F4AA05FE192B932E00844688 /* HMTemporaryDataStore.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA05FD192B932E00844688 /* HMTemporaryDataStore.m */; };
 		F4AA0601192E1FE900844688 /* HMBattleCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA0600192E1FE900844688 /* HMBattleCommand.m */; };
@@ -398,6 +399,7 @@
 		F4A3AD9019BDDD8E00FDBF80 /* HMPreferencePanelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMPreferencePanelController.m; sourceTree = "<group>"; };
 		F4A3AD9519BDDE5500FDBF80 /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/HMPreferencePanelController.xib; sourceTree = "<group>"; };
 		F4A9B8D31B975029005786C2 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = ja; path = ja.lproj/SlotItemShortName.plist; sourceTree = "<group>"; };
+		F4A9B8D61B99D5B7005786C2 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text; name = ja; path = ja.lproj/Taihi.txt; sourceTree = "<group>"; };
 		F4AA05FA192B92C800844688 /* Temporary.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Temporary.xcdatamodel; sourceTree = "<group>"; };
 		F4AA05FC192B932E00844688 /* HMTemporaryDataStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMTemporaryDataStore.h; sourceTree = "<group>"; };
 		F4AA05FD192B932E00844688 /* HMTemporaryDataStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMTemporaryDataStore.m; sourceTree = "<group>"; };
@@ -733,6 +735,7 @@
 				F43E67B818BE060E0087E5B6 /* LevelUpExp.plist */,
 				F4666C6A1B29E974001840DB /* EquipmentStrengthen.plist */,
 				F4A9B8D21B975029005786C2 /* SlotItemShortName.plist */,
+				F4A9B8D51B99D5B7005786C2 /* Taihi.txt */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -1179,6 +1182,7 @@
 				F494DC6A18C8BAB900AE97E4 /* HMPowerUpSupportViewController.xib in Resources */,
 				F4BDEB51187252F30069D0CE /* InfoPlist.strings in Resources */,
 				F43E67B918BE060E0087E5B6 /* LevelUpExp.plist in Resources */,
+				F4A9B8D71B99D5B7005786C2 /* Taihi.txt in Resources */,
 				F4B3DC3018E5C81E0011B4FC /* HMHistoryWindowController.xib in Resources */,
 				F4B3DC3618E5C8650011B4FC /* HMShipWindowController.xib in Resources */,
 				F4666C571B1E0262001840DB /* HMBookmarkEditorViewController.xib in Resources */,
@@ -1443,6 +1447,14 @@
 			name = SlotItemShortName.plist;
 			sourceTree = "<group>";
 		};
+		F4A9B8D51B99D5B7005786C2 /* Taihi.txt */ = {
+			isa = PBXVariantGroup;
+			children = (
+				F4A9B8D61B99D5B7005786C2 /* ja */,
+			);
+			name = Taihi.txt;
+			sourceTree = "<group>";
+		};
 		F4B2D02D18F83A2F00542742 /* HMScreenshotWindowController.xib */ = {
 			isa = PBXVariantGroup;
 			children = (

--- a/KCD/HMFleetViewController.m
+++ b/KCD/HMFleetViewController.m
@@ -124,6 +124,8 @@ const NSInteger maxFleetNumber = 4;
 	}];
 	
 	self.fleetNumber = 1;
+	
+	self.detail04.guardEscaped = YES;
 }
 
 - (NSArray *)shipKeys

--- a/KCD/HMGuardEscapedView.m
+++ b/KCD/HMGuardEscapedView.m
@@ -9,8 +9,41 @@
 #import "HMGuardEscapedView.h"
 
 
+static NSString *taiString = nil;
+static NSString *hiString = nil;
+
 @implementation HMGuardEscapedView
 
++ (void)initialize
+{
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		NSBundle *mainBundle = [NSBundle mainBundle];
+		NSString *path  = [mainBundle pathForResource:@"Taihi" ofType:@"txt"];
+		NSError *error = nil;
+		NSString *taihiString = [[NSString alloc] initWithContentsOfFile:path
+																encoding:NSUTF8StringEncoding
+																   error:&error];
+		if(!taihiString) {
+			if(error) {
+				NSLog(@"Could not find Taihi.txt. Error -> %@", error);
+				NSBeep();
+				return;
+			}
+			NSLog(@"Could not find Taihi.txt");
+			NSBeep();
+			return;
+		}
+		
+		if(taihiString.length != 2) {
+			NSLog(@"Taihi.txt length is not two.");
+			NSBeep();
+			return;
+		}
+		taiString = [taihiString substringToIndex:1];
+		hiString = [taihiString substringFromIndex:1];
+	});
+}
 - (void)drawRect:(NSRect)dirtyRect {
     [super drawRect:dirtyRect];
 	
@@ -20,6 +53,12 @@
 	[[NSColor colorWithCalibratedWhite:0.9 alpha:0.8] set];
 	[fillPath fill];
 	
+	[self drawTaihiInrect:bounds];
+}
+
+- (void)drawTaihiInrect:(NSRect)bounds
+{
+	
 	NSAffineTransform *rotate = [NSAffineTransform transform];
 	[rotate translateXBy:0.0 yBy:65.0];
 	[rotate rotateByDegrees:-27];
@@ -49,9 +88,9 @@
 							  NSForegroundColorAttributeName : [NSColor lightGrayColor],
 							  NSFontAttributeName : [NSFont boldSystemFontOfSize:width - 10],
 							  };
-	NSAttributedString *tai = [[NSAttributedString alloc] initWithString:@"退" attributes:taiAttr];
+	NSAttributedString *tai = [[NSAttributedString alloc] initWithString:taiString attributes:taiAttr];
 	
-	NSAttributedString *hi = [[NSAttributedString alloc] initWithString:@"避" attributes:taiAttr];
+	NSAttributedString *hi = [[NSAttributedString alloc] initWithString:hiString attributes:taiAttr];
 	
 	rect = NSInsetRect(rect, 2, 2);
 	rect.origin.y += 4;

--- /dev/null
+++ b/KCD/ja.lproj/Taihi.txt
@@ -0,0 +1 @@
+退避
\ No newline at end of file