Minor improvements, corrections, Swift 5

DlhSoftTeam · Mar 30, 2019 · b379ec2 · b379ec2
1 parent a51cce2
commit b379ec2
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 421 deletions.
diff --git a/Ganttis.framework/Versions/A/Ganttis b/Ganttis.framework/Versions/A/Ganttis
diff --git a/Ganttis.framework/Versions/A/Headers/Ganttis-Swift.h b/Ganttis.framework/Versions/A/Headers/Ganttis-Swift.h
@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 4.2.1 (swiftlang-1000.11.42 clang-1000.11.45.1)
+// Generated by Apple Swift version 5.0 (swiftlang-1001.0.69.5 clang-1001.0.46.3)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgcc-compat"
 
@@ -20,7 +20,7 @@
 #endif
 
 #pragma clang diagnostic ignored "-Wauto-import"
-#include <objc/NSObject.h>
+#include <Foundation/Foundation.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
@@ -163,8 +163,10 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 # define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
 #endif
 #if __has_feature(modules)
+#if __has_warning("-Watimport-in-framework-header")
+#pragma clang diagnostic ignored "-Watimport-in-framework-header"
+#endif
 @import AppKit;
-@import CoreGraphics;
 @import Foundation;
 #endif
 

diff --git a/Ganttis.framework/Versions/A/Modules/Ganttis.swiftmodule/x86_64.swiftdoc b/Ganttis.framework/Versions/A/Modules/Ganttis.swiftmodule/x86_64.swiftdoc
diff --git a/Ganttis.framework/Versions/A/Modules/Ganttis.swiftmodule/x86_64.swiftmodule b/Ganttis.framework/Versions/A/Modules/Ganttis.swiftmodule/x86_64.swiftmodule
diff --git a/Ganttis.framework/Versions/A/Resources/Info.plist b/Ganttis.framework/Versions/A/Resources/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -27,16 +27,16 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>10B61</string>
+	<string>10E125</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>18B71</string>
+	<string>18E219</string>
 	<key>DTSDKName</key>
 	<string>macosx10.14</string>
 	<key>DTXcode</key>
-	<string>1010</string>
+	<string>1020</string>
 	<key>DTXcodeBuild</key>
-	<string>10B61</string>
+	<string>10E125</string>
 </dict>
 </plist>
diff --git a/Ganttis.framework/Versions/A/_CodeSignature/CodeResources b/Ganttis.framework/Versions/A/_CodeSignature/CodeResources
diff --git a/GanttisDemo/Info.plist b/GanttisDemo/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/GanttisDemo/ViewController.swift b/GanttisDemo/ViewController.swift
@@ -101,9 +101,11 @@ class ViewController: NSViewController, GanttChartItemObserver, GanttChartConten
         itemSource = nil
     }
     func initializeGanttChart() {
-        contentController.settings.showsCompletionBarsForSummaryItems = false
         contentController.settings.allowsSelectingElements = true
         contentController.settings.selectsNewlyCreatedElements = true
+        contentController.settings.numberOfClicksRequiredToActivateElements = 2
+        contentController.settings.activationTogglesExpansionForSummaryItems = true
+        contentController.settings.showsCompletionBarsForSummaryItems = false
         contentController.settings.temporaryBarWidth = contentController.hourWidth * 24
         contentController.zoom = zoom
         headerController.settings.minZoom = 0.4
@@ -312,7 +314,7 @@ class ViewController: NSViewController, GanttChartItemObserver, GanttChartConten
     func initializeEditableValues() {
         initializeTimeline()
         rowCount = contentController.actualRowCount as NSNumber
-        defaultHourWidth = contentController.hourWidth
+        defaultHourWidth = headerController.hourWidth
         hourWidth = defaultHourWidth as NSNumber
         defaultRowHeight = contentController.rowHeight
         rowHeight = defaultRowHeight as NSNumber
@@ -381,8 +383,8 @@ class ViewController: NSViewController, GanttChartItemObserver, GanttChartConten
     @objc dynamic var hourWidth: NSNumber? {
         didSet {
             guard hourWidth != oldValue else { return }
-            guard let contentController = contentController else { return }
-            contentController.hourWidth = hourWidth as? Double ?? defaultHourWidth
+            guard let headerController = headerController else { return }
+            headerController.hourWidth = hourWidth as? Double ?? defaultHourWidth
         }
     }
     var defaultHourWidth: Double!