Commit: af73cc0be12127dd7a283710f470f32c8cdce740 - KanColleBrowserForOSX (git)

Commit MetaInfo

• Revisión: af73cc0be12127dd7a283710f470f32c8cdce740 (tree)
• Tiempo: 2015-07-08 22:20:36
• Autor: masakih <masakih@user...>
• Commiter: masakih

Log Message

メインブラウザウインドウを追加

Cambiar Resumen

• modified: KanColleBrowserForOSX.xcodeproj/project.pbxproj
• modified: KanColleBrowserForOSX/AppDelegate.swift
• modified: KanColleBrowserForOSX/Base.lproj/MainMenu.xib
• add: KanColleBrowserForOSX/KCBFOMainWindowController.swift
• add: KanColleBrowserForOSX/ja.lproj/KCBFOMainWindowController.xib

Diferencia incremental

--- a/KanColleBrowserForOSX.xcodeproj/project.pbxproj
+++ b/KanColleBrowserForOSX.xcodeproj/project.pbxproj
@@ -12,6 +12,9 @@
 		F4EF18BA1B4D36E60021BF8D /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4EF18B81B4D36E60021BF8D /* MainMenu.xib */; };
 		F4EF18C61B4D36E60021BF8D /* KanColleBrowserForOSXTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4EF18C51B4D36E60021BF8D /* KanColleBrowserForOSXTests.swift */; };
 		F4EF18D21B4D38BB0021BF8D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F4EF18D41B4D38BB0021BF8D /* InfoPlist.strings */; };
+		F4EF18D91B4D40160021BF8D /* KCBFOMainWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4EF18D71B4D40160021BF8D /* KCBFOMainWindowController.swift */; };
+		F4EF18DB1B4D40250021BF8D /* KCBFOMainWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4EF18DD1B4D40250021BF8D /* KCBFOMainWindowController.xib */; };
+		F4EF18DF1B4D41DE0021BF8D /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4EF18DE1B4D41DE0021BF8D /* WebKit.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -35,6 +38,9 @@
 		F4EF18C51B4D36E60021BF8D /* KanColleBrowserForOSXTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KanColleBrowserForOSXTests.swift; sourceTree = "<group>"; };
 		F4EF18D31B4D38BB0021BF8D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		F4EF18D61B4D3A220021BF8D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		F4EF18D71B4D40160021BF8D /* KCBFOMainWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KCBFOMainWindowController.swift; sourceTree = "<group>"; };
+		F4EF18DC1B4D40250021BF8D /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/KCBFOMainWindowController.xib; sourceTree = "<group>"; };
+		F4EF18DE1B4D41DE0021BF8D /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -42,6 +48,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F4EF18DF1B4D41DE0021BF8D /* WebKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -58,6 +65,7 @@
 		F4EF18A61B4D36E60021BF8D = {
 			isa = PBXGroup;
 			children = (
+				F4EF18DE1B4D41DE0021BF8D /* WebKit.framework */,
 				F4EF18B11B4D36E60021BF8D /* KanColleBrowserForOSX */,
 				F4EF18C21B4D36E60021BF8D /* KanColleBrowserForOSXTests */,
 				F4EF18B01B4D36E60021BF8D /* Products */,
@@ -77,6 +85,8 @@
 			isa = PBXGroup;
 			children = (
 				F4EF18B41B4D36E60021BF8D /* AppDelegate.swift */,
+				F4EF18D71B4D40160021BF8D /* KCBFOMainWindowController.swift */,
+				F4EF18DD1B4D40250021BF8D /* KCBFOMainWindowController.xib */,
 				F4EF18B61B4D36E60021BF8D /* Images.xcassets */,
 				F4EF18B81B4D36E60021BF8D /* MainMenu.xib */,
 				F4EF18B21B4D36E60021BF8D /* Supporting Files */,
@@ -191,6 +201,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F4EF18DB1B4D40250021BF8D /* KCBFOMainWindowController.xib in Resources */,
 				F4EF18B71B4D36E60021BF8D /* Images.xcassets in Resources */,
 				F4EF18D21B4D38BB0021BF8D /* InfoPlist.strings in Resources */,
 				F4EF18BA1B4D36E60021BF8D /* MainMenu.xib in Resources */,
@@ -211,6 +222,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F4EF18D91B4D40160021BF8D /* KCBFOMainWindowController.swift in Sources */,
 				F4EF18B51B4D36E60021BF8D /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -251,6 +263,14 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
+		F4EF18DD1B4D40250021BF8D /* KCBFOMainWindowController.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				F4EF18DC1B4D40250021BF8D /* ja */,
+			);
+			name = KCBFOMainWindowController.xib;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */

--- a/KanColleBrowserForOSX/AppDelegate.swift
+++ b/KanColleBrowserForOSX/AppDelegate.swift
@@ -10,9 +10,12 @@ import Cocoa
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
-
+	
+	var mainWindowController : KCBFOMainWindowController!
+	
 	func applicationDidFinishLaunching(aNotification: NSNotification) {
-		// Insert code here to initialize your application
+		mainWindowController = KCBFOMainWindowController.new()
+		mainWindowController.showWindow(nil)
 	}
 
 	func applicationWillTerminate(aNotification: NSNotification) {

--- a/KanColleBrowserForOSX/Base.lproj/MainMenu.xib
+++ b/KanColleBrowserForOSX/Base.lproj/MainMenu.xib
@@ -113,8 +113,16 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="View" id="HyV-fh-RgO">
                         <items>
-                            <menuItem title="Reload" keyEquivalent="r" id="CZp-hf-DCN"/>
-                            <menuItem title="Reload And Recache" keyEquivalent="R" id="nhW-uJ-3sj"/>
+                            <menuItem title="Reload" keyEquivalent="r" id="CZp-hf-DCN">
+                                <connections>
+                                    <action selector="reloadContent:" target="-1" id="S9I-xb-YsW"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Reload And Recache" keyEquivalent="R" id="nhW-uJ-3sj">
+                                <connections>
+                                    <action selector="reloadAndRecache:" target="-1" id="Mvt-Lm-ARk"/>
+                                </connections>
+                            </menuItem>
                         </items>
                     </menu>
                 </menuItem>

--- /dev/null
+++ b/KanColleBrowserForOSX/KCBFOMainWindowController.swift
@@ -0,0 +1,143 @@
+//
+//  KCBFOMainWindowController.swift
+//  KanColleBrowserForOSX
+//
+//  Created by Hori,Masaki on 2015/07/08.
+//  Copyright (c) 2015年 Hori,Masaki. All rights reserved.
+//
+
+import Cocoa
+import WebKit
+
+class KCBFOMainWindowController: NSWindowController {
+	
+	@IBOutlet var clipView : NSClipView!
+	@IBOutlet var webView : WebView!
+	
+	var flashTopLeft : NSPoint = NSMakePoint(2600, 145);
+	
+	let gamePageURL = "http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/"
+	let loginPageURLPrefix = "https://www.dmm.com/my/-/login/=/"
+	
+	override init(window: NSWindow?) {
+		super.init(window: window)
+	}
+	required init?(coder: NSCoder) {
+		super.init(coder: coder)
+	}
+	
+	override class func new() -> KCBFOMainWindowController {
+		return KCBFOMainWindowController(windowNibName: "KCBFOMainWindowController")
+	}
+	
+    override func windowDidLoad() {
+        super.windowDidLoad()
+		
+		clipView.documentView = webView
+		
+		adjustFlash()
+		
+		webView.mainFrame.frameView.allowsScrolling = false
+		webView.applicationNameForUserAgent = "Version/8.0.6 Safari/600.6.3"
+		webView.mainFrameURL = gamePageURL
+    }
+	
+	@IBAction func reloadContent(sender : AnyObject?) {
+		let currentURL = webView.mainFrameURL
+		if currentURL != gamePageURL {
+			adjustFlash()
+			webView.mainFrameURL = gamePageURL
+			return
+		}
+		adjustFlash()
+		webView.reload(nil)
+	}
+	@IBAction func reloadAndRecache(sender :AnyObject?) {
+		let cache = NSURLCache.sharedURLCache()
+		cache.removeAllCachedResponses()
+		reloadContent(sender)
+	}
+	
+	func adjustFlash() {
+		clipView.scrollToPoint(flashTopLeft)
+	}
+	
+	// MARK: - WebFrameLoadDelegate
+	override func webView(sender: WebView!, didFinishLoadForFrame frame: WebFrame!) {
+		func handler(c : JSContext! , e : JSValue!) {
+			println("caught exception in evaluateScript: -> \(e)")
+		}
+		
+		if let path = frame.dataSource?.initialRequest.URL?.path {
+			if path.hasSuffix("gadgets/ifr") {
+				let context = frame.javaScriptContext!
+				context.exceptionHandler = handler
+				context.evaluateScript(
+					[
+						"var emb = document.getElementById('flashWrap');",
+						"var rect = emb.getBoundingClientRect();",
+						"var atop = rect.top;",
+						"var aleft = rect.left;"
+					].reduce(""){ $0 + $1 }
+				)
+				let top = context.objectForKeyedSubscript("atop")
+				let left = context.objectForKeyedSubscript("aleft")
+				flashTopLeft = NSMakePoint(0, webView.frame.size.height)
+				let x = CGFloat(left.toDouble()) as CGFloat
+				let y = webView.frame.size.height - CGFloat(top.toDouble()) - 480
+				flashTopLeft = NSMakePoint(x, y)
+			}
+			
+			if path.hasSuffix("app_id=854854") {
+				let context = frame.javaScriptContext!
+				context.exceptionHandler = handler
+				context.evaluateScript(
+					[
+						"var iframe = document.getElementById('game_frame');",
+						"var validIframe = 0;",
+						"if(iframe) {",
+						"    validIframe = 1;",
+						"    var rect = iframe.getBoundingClientRect();",
+						"    var atop = rect.top;",
+						"    var aleft = rect.left;",
+						"}"
+						].reduce(""){ $0 + $1 }
+				)
+				let validIframe = context.objectForKeyedSubscript("validIframe")
+				println("\(validIframe)")
+				
+				if let validIframe = context.objectForKeyedSubscript("validIframe")?.toInt32() {
+					if validIframe == 0 { return }
+					
+					let top = context.objectForKeyedSubscript("atop")
+					let left = context.objectForKeyedSubscript("aleft")
+					let x = flashTopLeft.x + CGFloat(left.toDouble())
+					let y = flashTopLeft.y - CGFloat(top.toDouble())
+					flashTopLeft = NSMakePoint(x, y)
+					adjustFlash()
+				}
+			}
+		}
+	}
+	
+	// MARK: - WebUIDelegate
+	override func webView(sender: WebView!, contextMenuItemsForElement element: [NSObject : AnyObject]!, defaultMenuItems: [AnyObject]!) -> [AnyObject]! {
+		var items:[AnyObject] = defaultMenuItems.flatMap(){
+			item in
+			switch item.tag() {
+			case WebMenuItemTagOpenLinkInNewWindow,
+			WebMenuItemTagDownloadLinkToDisk,
+			WebMenuItemTagOpenImageInNewWindow,
+			WebMenuItemTagOpenFrameInNewWindow,
+			WebMenuItemTagGoBack,
+			WebMenuItemTagGoForward,
+			WebMenuItemTagStop,
+			WebMenuItemTagReload:
+				return []
+			default:
+				return [item]
+			}
+		}
+		return items
+	}
+}

--- /dev/null
+++ b/KanColleBrowserForOSX/ja.lproj/KCBFOMainWindowController.xib
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+        <plugIn identifier="com.apple.WebKitIBPlugin" version="7706"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="KCBFOMainWindowController" customModule="KanColleBrowserForOSX" customModuleProvider="target">
+            <connections>
+                <outlet property="clipView" destination="CE2-tS-wOP" id="e59-4N-ABH"/>
+                <outlet property="webView" destination="9oP-vl-4d9" id="S8P-5p-uZ0"/>
+                <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="OSXを起動したらそこには『艦隊これくしょん -艦これ-』の世界が広がっていたのです！？" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="F0z-JX-Cv5">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="196" y="240" width="800" height="480"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
+            <view key="contentView" id="se5-gp-TjO">
+                <rect key="frame" x="0.0" y="6" width="800" height="480"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <customView id="CE2-tS-wOP" customClass="NSClipView">
+                        <rect key="frame" x="0.0" y="0.0" width="800" height="480"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    </customView>
+                </subviews>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
+            </connections>
+            <point key="canvasLocation" x="422" y="234"/>
+        </window>
+        <webView id="9oP-vl-4d9">
+            <rect key="frame" x="0.0" y="0.0" width="6000" height="700"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12"/>
+            <connections>
+                <outlet property="UIDelegate" destination="-2" id="vms-hm-oFJ"/>
+                <outlet property="frameLoadDelegate" destination="-2" id="Qaq-jw-LUu"/>
+            </connections>
+            <point key="canvasLocation" x="199" y="1063"/>
+        </webView>
+    </objects>
+</document>