Swift5

Graphic Analysis 2/Document.swift

@@ -42,7 +42,7 @@ class Document: NSDocument {
     }
     
     override var windowNibName: NSNib.Name? {
-        return NSNib.Name(rawValue: "Document")
+        return "Document"
     }
 
     override func read(from fileWrapper: FileWrapper, ofType typeName: String) throws {
@@ -103,8 +103,8 @@ class Document: NSDocument {
     override func printOperation(withSettings printSettings: [NSPrintInfo.AttributeKey : Any]) throws -> NSPrintOperation {
         let printOperation: NSPrintOperation = NSPrintOperation(view: collectionViewMonth)
         printOperation.printInfo.orientation = .landscape
-        printOperation.printInfo.horizontalPagination = .fitPagination
-        printOperation.printInfo.verticalPagination = .fitPagination
+        printOperation.printInfo.horizontalPagination = .fit
+        printOperation.printInfo.verticalPagination = .fit
         printOperation.printInfo.topMargin = 1
         printOperation.printInfo.rightMargin = 1
         printOperation.printInfo.bottomMargin = 1

Graphic Analysis 2/GraphWindow.swift

@@ -24,7 +24,7 @@ class GraphWindow: NSWindowController {
     let loadingQueue4: OperationQueue = OperationQueue()
     
    override var windowNibName: NSNib.Name? {
-    return NSNib.Name(rawValue: "GraphWindow")
+    return "GraphWindow"
     }
 
     required init?(coder: NSCoder) {

Graphic Analysis 2/Info.plist

@@ -44,7 +44,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.1</string>
 	<key>CFBundleVersion</key>
-	<string>496</string>
+	<string>499</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

Graphic Analysis 2/PDFDraw.swift

@@ -48,7 +48,7 @@ class PDFDraw: NSWindowController {
     
     //override var windowNibName: NSNib.Name! {
     override var windowNibName: NSNib.Name? {
-        return NSNib.Name(rawValue: "PDFDraw")
+        return "PDFDraw"
     }
     
     required init?(coder: NSCoder)

Graphic Analysis 2/PDFItemViewController.swift

@@ -25,14 +25,14 @@ class PDFItemViewController: NSViewController {
     }
     
     init(dayFW: FileWrapper?, day: Int, monthName: String) {
-        super.init(nibName: NSNib.Name(rawValue: "PDFItemViewController"), bundle: Bundle.main)
+        super.init(nibName: "PDFItemViewController", bundle: Bundle.main)
         self.dayFW = dayFW
         self.dayI = day
         self.monthName = monthName
     }
     
     init(dayFW: FileWrapper?, day: Int) {
-        super.init(nibName: NSNib.Name(rawValue: "PDFItemViewController"), bundle: Bundle.main)
+        super.init(nibName: "PDFItemViewController", bundle: Bundle.main)
         self.dayFW = dayFW
         self.dayI = day
     }

Graphic Analysis 2/PDFTitle.swift

@@ -31,7 +31,7 @@ class PDFTitle: NSWindowController {
     }
     
     override var windowNibName: NSNib.Name? {
-        return NSNib.Name(rawValue: "PDFTitle")
+        return "PDFTitle"
     }
     
     required init?(coder: NSCoder)

Graphic Analysis 2/buildnum.ver

@@ -1,2 +1,2 @@
 version 2.1
-build 496
+build 499