Fixed #78 and #80

djyde · Jan 4, 2018 · 729561e · 729561e
1 parent 2285b1e
commit 729561e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 11 deletions.
diff --git a/WebShell.xcodeproj/project.pbxproj b/WebShell.xcodeproj/project.pbxproj
@@ -53,6 +53,8 @@
 		DD593BC71FDB7F4200C15D57 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 6E2DD7DD1CC56209000FA61A /* Credits.rtf */; };
 		DD593BC81FDB7F4200C15D57 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 25B222601C25328E00F848B7 /* Main.storyboard */; };
 		DD593BD91FDB80DC00C15D57 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD593BD51FDB80CB00C15D57 /* Settings.swift */; };
+		DEC374881FFEBE4000A8B04E /* WSWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC374871FFEBE4000A8B04E /* WSWindow.swift */; };
+		DEC374891FFEBE4000A8B04E /* WSWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC374871FFEBE4000A8B04E /* WSWindow.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -85,6 +87,7 @@
 		DD0D716B1FDCF7C1002F50D1 /* WebShell-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebShell-Info.plist"; sourceTree = "<group>"; };
 		DD593BCD1FDB7F4200C15D57 /* Udemy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Udemy.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DD593BD51FDB80CB00C15D57 /* Settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
+		DEC374871FFEBE4000A8B04E /* WSWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WSWindow.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -156,6 +159,7 @@
 				DD0D71161FDCF595002F50D1 /* WSTrackpadGestures.swift */,
 				DD0D71101FDCF595002F50D1 /* WSViewController.swift */,
 				DD0D710B1FDCF595002F50D1 /* WSWebViewFunctions.swift */,
+				DEC374871FFEBE4000A8B04E /* WSWindow.swift */,
 			);
 			path = Core;
 			sourceTree = "<group>";
@@ -321,6 +325,7 @@
 				6EE64A961CCBEAA000E9DA9B /* Settings.swift in Sources */,
 				DD0D71221FDCF595002F50D1 /* WSViewController.swift in Sources */,
 				DD0D71231FDCF595002F50D1 /* WSCore.swift in Sources */,
+				DEC374881FFEBE4000A8B04E /* WSWindow.swift in Sources */,
 				DD0D711C1FDCF595002F50D1 /* WSInjector.swift in Sources */,
 				DD0D71431FDCF5FD002F50D1 /* Notifications.swift in Sources */,
 				DD0D71271FDCF595002F50D1 /* WSPageActions.swift in Sources */,
@@ -348,6 +353,7 @@
 				DD0D712D1FDCF5B6002F50D1 /* WSApplication.swift in Sources */,
 				DD0D71311FDCF5B6002F50D1 /* WSDebug.swift in Sources */,
 				DD0D712E1FDCF5B6002F50D1 /* WSBaseSettings.swift in Sources */,
+				DEC374891FFEBE4000A8B04E /* WSWindow.swift in Sources */,
 				DD0D71371FDCF5B6002F50D1 /* WSPasswordManager.swift in Sources */,
 				DD0D71461FDCF610002F50D1 /* Notifications.swift in Sources */,
 				DD0D71331FDCF5B6002F50D1 /* WSEventMonitor.swift in Sources */,

diff --git a/WebShell/Base.lproj/Main.storyboard b/WebShell/Base.lproj/Main.storyboard
@@ -351,7 +351,7 @@
         <scene sceneID="R2V-B0-nI4">
             <objects>
                 <windowController id="B8D-0N-5wS" sceneMemberID="viewController">
-                    <window key="window" title="WebShell" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="WebShellMainWindow" animationBehavior="default" id="IQv-IB-iLA">
+                    <window key="window" title="WebShell" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="WebShellMainWindow" animationBehavior="default" id="IQv-IB-iLA" customClass="WSNSWindow" customModule="Udemy" customModuleProvider="target">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
                         <windowCollectionBehavior key="collectionBehavior" transient="YES"/>
                         <rect key="contentRect" x="196" y="240" width="1000" height="640"/>
@@ -378,16 +378,6 @@
                         <rect key="frame" x="0.0" y="0.0" width="1000" height="640"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1wx-8i-Jol">
-                                <rect key="frame" x="408" y="300" width="185" height="41"/>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Launching..." id="y40-R0-LYw">
-                                    <font key="font" metaFont="system" size="34"/>
-                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <progressIndicator wantsLayer="YES" maxValue="100" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="gaZ-Ka-5Vb">
-                                <rect key="frame" x="-4" y="627" width="1007" height="20"/>
-                            </progressIndicator>
                             <webView wantsLayer="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hmw-jr-NE4">
                                 <rect key="frame" x="0.0" y="0.0" width="1000" height="640"/>
                                 <backgroundFilters>
@@ -405,6 +395,16 @@
                                     <outlet property="frameLoadDelegate" destination="XfG-lQ-9wD" id="qU6-JS-OJO"/>
                                 </connections>
                             </webView>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1wx-8i-Jol">
+                                <rect key="frame" x="408" y="300" width="185" height="41"/>
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Launching..." id="y40-R0-LYw">
+                                    <font key="font" metaFont="system" size="34"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <progressIndicator wantsLayer="YES" maxValue="100" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="gaZ-Ka-5Vb">
+                                <rect key="frame" x="-4" y="627" width="1007" height="20"/>
+                            </progressIndicator>
                         </subviews>
                         <constraints>
                             <constraint firstItem="gaZ-Ka-5Vb" firstAttribute="centerX" secondItem="hmw-jr-NE4" secondAttribute="centerX" id="2hL-FH-Wfj"/>

diff --git a/WebShell/Core/WSWebViewFunctions.swift b/WebShell/Core/WSWebViewFunctions.swift
@@ -23,6 +23,7 @@ extension WSViewController {
     func webView(_ sender: WebView!, didStartProvisionalLoadFor frame: WebFrame!) {
         // @wdg: Better progress indicator | Issue: #37
         if settings.showLoadingBar {
+            print("Started loading animation")
             progressBar.startAnimation(self)
             progressBar.maxValue = 100;
             progressBar.minValue = 1;

diff --git a/WebShell/Core/WSWindow.swift b/WebShell/Core/WSWindow.swift
@@ -0,0 +1,15 @@
+//
+//  WSWindow.swift
+//  WebShell
+//
+//  Created by Wesley de Groot on 04/01/2018.
+//  Copyright © 2018 RandyLu. All rights reserved.
+//
+
+import Foundation
+import Cocoa
+import AppKit
+
+class WSNSWindow : NSWindow {
+
+}