From 10c8589c9248a806a1773d24c548dfd619bab3e9 Mon Sep 17 00:00:00 2001
From: masakih <masakih@users.sourceforge.jp>
Date: Sun, 24 May 2015 00:34:37 +0900
Subject: [PATCH] =?utf8?q?=E3=82=B1=E3=82=99=E3=83=BC=E3=83=A0=E7=94=BB?=
 =?utf8?q?=E9=9D=A2=E4=BB=A5=E5=A4=96=E3=81=AB=E7=A7=BB=E5=8B=95=E3=81=97?=
 =?utf8?q?=E3=81=9F=E3=81=A8=E3=81=8D=E3=83=AA=E3=83=AD=E3=83=BC=E3=83=88?=
 =?utf8?q?=E3=82=99=E3=81=A6=E3=82=99=E3=82=B1=E3=82=99=E3=83=BC=E3=83=A0?=
 =?utf8?q?=E7=94=BB=E9=9D=A2=E3=81=AB=E6=88=BB=E3=82=8B=E3=82=88=E3=81=86?=
 =?utf8?q?=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 KCD/HMBroserWindowController.m       |  27 ++++++++++++++++++++++++---
 KCD/ja.lproj/Localizable.strings     | Bin 3312 -> 3524 bytes
 KCD/ja.lproj/Localizable.strings.sed |   2 ++
 Makefile                             |   2 +-
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/KCD/HMBroserWindowController.m b/KCD/HMBroserWindowController.m
index 785fa5a4..dcd7016c 100644
--- a/KCD/HMBroserWindowController.m
+++ b/KCD/HMBroserWindowController.m
@@ -38,6 +38,9 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
 	kOldStyle = 0xffffffff,
 };
 
+static NSString *gamePageURL = @"http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/";
+static NSString *loginPageURLPrefix = @"https://www.dmm.com/my/-/login/=/";
+
 @interface HMBroserWindowController ()
 @property NSPoint flashTopLeft;
 
@@ -138,9 +141,8 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
 	
 	[[[self.webView mainFrame] frameView] setAllowsScrolling:NO];
 	
-	[self.webView setApplicationNameForUserAgent:@"Version/7.1 Safari/537.85.10"];
-	[self.webView setMainFrameURL:@"http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/"];
-	//	[self.webView setMainFrameURL:@"http://www.google.com/"];
+	[self.webView setApplicationNameForUserAgent:@"Version/8.0.6 Safari/600.6.3"];
+	[self.webView setMainFrameURL:gamePageURL];
 	
 	// for Maverick
 	if(floor(NSAppKitVersionNumber) == NSAppKitVersionNumber10_9) {
@@ -180,6 +182,18 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
 
 - (IBAction)reloadContent:(id)sender
 {
+	// ゲームページでない場合はゲームページを表示する
+	NSString *currentURL = self.webView.mainFrameURL;
+	if(![currentURL isEqualToString:gamePageURL]) {
+		[self.webView setMainFrameURL:gamePageURL];
+		[self adjustFlash];
+		return;
+	}
+	if([currentURL hasPrefix:loginPageURLPrefix]) {
+		[self.webView reload:sender];
+		return;
+	}
+	
 	[self adjustFlash];
 	
 	NSDate *prevDate = HMStandardDefaults.prevReloadDate;
@@ -467,6 +481,13 @@ const CGFloat flashTopMargin = 4;
 	SEL action = menuItem.action;
 	
 	if(action == @selector(reloadContent:)) {
+		if([self.webView.mainFrameURL isEqualToString:gamePageURL]) {
+			menuItem.title = NSLocalizedString(@"Reload", @"Reload menu, reload");
+		} else if ([self.webView.mainFrameURL hasPrefix:loginPageURLPrefix]) {
+			menuItem.title = NSLocalizedString(@"Reload", @"Reload menu, reload");
+		} else {
+			menuItem.title = NSLocalizedString(@"Back To Game", @"Reload menu, back to game");
+		}
 		return YES;
 	}
 	if(action == @selector(selectView:)) {
diff --git a/KCD/ja.lproj/Localizable.strings b/KCD/ja.lproj/Localizable.strings
index 60450e35e274366a774b7b5c1488e813b260ff4c..8c098a7b51522e9a83a0a136ed3ed79141ccab97 100644
GIT binary patch
delta 191
zcmew$c|>}{bEeE7hE#?ehJ1!Zh7<+`hFl;okD-)72gptWiX}5-16d_Nc?E`aARi>J
zz@WvT&%ni?#NY&15dv1>4ppH9RAURoN(P$@{un$k$WF30=$>4|WWJf7`5B8UZYzrr
dj+uOqLtGGH&?|$tK%-7hp1?72b2&#P3jidhD@p(W

delta 25
hcmX>i{XufWbEeJl%zUhq&oX;W-pgsR*_*SH1ptV^32XoW

diff --git a/KCD/ja.lproj/Localizable.strings.sed b/KCD/ja.lproj/Localizable.strings.sed
index 29fc3a6e..fc3db986 100644
--- a/KCD/ja.lproj/Localizable.strings.sed
+++ b/KCD/ja.lproj/Localizable.strings.sed
@@ -21,3 +21,5 @@ s/%1$@ in sortie into %2$@ (%3$@)/%1$@が\\n（%3$@）%2$@\\nに出撃中/
 s/All/すべて/2
 s/Equiped/装備済み/2
 s/Unequiped/未装備/2
+s/Reload/リロード/2
+s/Back To Game/ゲームに戻る/2
diff --git a/Makefile b/Makefile
index d6f6aac0..f29d484a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ INFO_PLIST=KCD/KCD-Info.plist
 LOCALIZE_FILES=KCD/HMBroserWindowController.m KCD/HMServerDataStore.m KCD/HMKenzoDockStatus.m \
 KCD/HMMissionStatus.m KCD/HMNyukyoDockStatus.m KCD/HMCreateSlotItemCommand.m KCD/HMAppDelegate.m \
 KCD/HMScreenshotWindowController.m KCD/HMStoreCreateSlotItemHistoryCommand.m \
-KCD/HMDocksViewController.m KCD/HMSlotItemWindowController.m
+KCD/HMDocksViewController.m KCD/HMSlotItemWindowController.m KCD/HMBroserWindowController.m
 
 VER_CMD=grep -A1 'CFBundleShortVersionString' $(INFO_PLIST) | tail -1 | tr -d "'\t</string>" 
 VERSION=$(shell $(VER_CMD))
-- 
2.11.0