Merge branch 'develop'

Aria2D.xcodeproj/project.pbxproj

@@ -581,7 +581,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0810;
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = xjbeta;
 				TargetAttributes = {
 					0147EDBC1D21FAD800FB4324 = {
@@ -845,6 +845,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -906,6 +907,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -958,7 +960,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
@@ -997,7 +999,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "";
 				OTHER_SWIFT_FLAGS = "";

Aria2D.xcodeproj/xcuserdata/xjbeta.xcuserdatad/xcschemes/Aria2D.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Aria2D/Aria2/Aria2Websocket.swift

@@ -237,7 +237,7 @@ extension Aria2Websocket: WebSocketDelegate {
             Log("websocket ping")
         case .pong(_):
             Log("websocket pong")
-        case .viablityChanged(_):
+        case .viabilityChanged(_):
             Log("websocket viablityChanged")
         case .reconnectSuggested(_):
             Log("websocket reconnectSuggested")

Aria2D/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -3,61 +3,61 @@
     {
       "size" : "16x16",
       "idiom" : "mac",
-      "filename" : "Round Icon 16.png",
+      "filename" : "Aria2D Icon 11MacMicro_16pt.png",
       "scale" : "1x"
     },
     {
       "size" : "16x16",
       "idiom" : "mac",
-      "filename" : "Round Icon 32.png",
+      "filename" : "Aria2D Icon 11MacMicro_16pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "32x32",
       "idiom" : "mac",
-      "filename" : "Round Icon 32-1.png",
+      "filename" : "Aria2D Icon 11MacSmall_32pt.png",
       "scale" : "1x"
     },
     {
       "size" : "32x32",
       "idiom" : "mac",
-      "filename" : "Round Icon 64.png",
+      "filename" : "Aria2D Icon 11MacSmall_32pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "128x128",
       "idiom" : "mac",
-      "filename" : "Round Icon 128.png",
+      "filename" : "Aria2D Icon 11MacMedium_128pt.png",
       "scale" : "1x"
     },
     {
       "size" : "128x128",
       "idiom" : "mac",
-      "filename" : "Round Icon 256.png",
+      "filename" : "Aria2D Icon 11MacMedium_128pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "256x256",
       "idiom" : "mac",
-      "filename" : "Round Icon 256-1.png",
+      "filename" : "Aria2D Icon 11MacLarge_256pt.png",
       "scale" : "1x"
     },
     {
       "size" : "256x256",
       "idiom" : "mac",
-      "filename" : "Round Icon 512-1.png",
+      "filename" : "Aria2D Icon 11MacLarge_256pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "512x512",
       "idiom" : "mac",
-      "filename" : "Round Icon 512.png",
+      "filename" : "Aria2D Icon 11MacHuge_512pt.png",
       "scale" : "1x"
     },
     {
       "size" : "512x512",
       "idiom" : "mac",
-      "filename" : "Round Icon.png",
+      "filename" : "Aria2D Icon 11MacHuge_512pt@2x.png",
       "scale" : "2x"
     }
   ],

Aria2D/Resources/Info.plist

@@ -13,6 +13,8 @@
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>TorrentIcon.icns</string>
+			<key>CFBundleTypeIconSystemGenerated</key>
+			<integer>1</integer>
 			<key>CFBundleTypeName</key>
 			<string>Torrent File</string>
 			<key>CFBundleTypeRole</key>

Aria2D/Source/AppDelegate.swift

@@ -105,7 +105,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             Aria2Websocket.shared.resumeTimer()
         } else {
             //Occlusion
-            Aria2Websocket.shared.suspendTimer()
+            if !Preferences.shared.showDockIconSpeed {
+                Aria2Websocket.shared.suspendTimer()
+            }
         }
     }