Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -806,7 +806,7 @@ extension KMMainViewController {
             self.listView.displaysAsBook = data.boolValue
         }
         if let data = setup.object(forKey: KMMainModel.Key.kDisplayMode) as? NSNumber {
-            self.listView.displayMode = CPDFDisplayMode(rawValue: data.intValue) ?? .normal
+            self.listView.setDisplay(CPDFDisplayViewMode(rawValue: data.intValue) ?? .singlePage)
         }
         if let data = setup.object(forKey: KMMainModel.Key.kDisplayBox) as? NSNumber {
             self.listView.displayBox = CPDFDisplayBox(rawValue: data.intValue) ?? .cropBox
@@ -832,7 +832,9 @@ extension KMMainViewController {
         setup[KMMainModel.Key.kDisplayBox] = NSNumber(value: listView.displayBox.rawValue)
         setup[KMMainModel.Key.kScaleFactor] = NSNumber(value: listView.scaleFactor)
         setup[KMMainModel.Key.kAutoScales] = NSNumber(value: listView.autoScales)
-        setup[KMMainModel.Key.kDisplayMode] = NSNumber(value: listView.displayMode.rawValue)
+        setup[KMMainModel.Key.kDisplayMode] = NSNumber(value: listView.fetchDisplayViewMode().rawValue)
+        
+        KMPreferenceManager.shared.viewPageDisplayType = KMPDFDisplayType(rawValue: listView.fetchDisplayViewMode().rawValue) ?? .singlePage
         
         return setup
     }