偏好设置-属性面板展开补充交互

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

@@ -1169,13 +1169,13 @@ extension KMMainViewController {
     }
     
     @objc func openRightPane() -> Void {
-        if KMPreferenceManager.shared.leftSideExpandType == 0 {
+        if (KMPreferenceManager.shared.autoExpandPropertyPanel) {
             applyLeftSideWidth(lastLeftPanWidth, rightSideWidth: defaultRightWidth)
         }
     }
     
     @objc func closeRightPane() -> Void {
-        if KMPreferenceManager.shared.leftSideExpandType == 0 {
+        if (KMPreferenceManager.shared.autoExpandPropertyPanel) {
             applyLeftSideWidth(lastLeftPanWidth, rightSideWidth: 0)
         }
     }

PDF Office/PDF Office/Class/Preference/Controller/KMPreferenceDisplayController.swift

@@ -209,7 +209,7 @@ class KMPreferenceDisplayController: NSViewController {
             self.showOutlineCheck.state = .off
         }
         
-        if (KMPreferenceManager.shared.leftSideExpandType == 0) {
+        if (KMPreferenceManager.shared.propertyPanelExpandType == .auto) {
             self.selectDisplayRadio(self.autoExpandRadio)
         } else {
             self.selectDisplayRadio(self.manualExpandRadio)
@@ -254,11 +254,11 @@ class KMPreferenceDisplayController: NSViewController {
         } else if (self.autoExpandRadio.isEqual(sender)) {
             self.selectDisplayRadio(sender)
             
-            KMPreferenceManager.shared.leftSideExpandType = 0
+            KMPreferenceManager.shared.propertyPanelExpandType = .auto
         } else if (self.manualExpandRadio.isEqual(sender)) {
             self.selectDisplayRadio(sender)
             
-            KMPreferenceManager.shared.leftSideExpandType = 1
+            KMPreferenceManager.shared.propertyPanelExpandType = .manual
         } else if (self.autoDisplayRadio.isEqual(sender)) {
             self.selectPageIndicatorRadio(sender)
             

PDF Office/PDF Office/Class/Preference/Tools/KMPreferenceEnum.swift

@@ -30,3 +30,8 @@ enum KMPreferenceLeftSideDisplayType: Int {
     case closeWhenOpenFile = 0 // 打开文件时收起
     case openAppSaveLastSelect // 打开App记住上次选择
 }
+
+enum KMPreferencePropertyPanelExpandType: Int {
+    case auto = 0
+    case manual
+}

PDF Office/PDF Office/Class/Preference/Tools/KMPreferenceManager.swift

@@ -35,6 +35,7 @@ let KMViewZoomScaleTypeKey: KMPreferenceKey = "KMViewZoomScaleTypeKey"
 let KMLeftSideDisplayTypeKey: KMPreferenceKey = "KMLeftSideDisplayTypeKey"
 let KMShowOutlineListKey: KMPreferenceKey = "KMShowOutlineListKey"
 let KMLeftSideExpandTypeKey: KMPreferenceKey = "KMLeftSideExpandTypeKey"
+let KMPropertyPanelExpandTypeKey: KMPreferenceKey = "KMPropertyPanelExpandTypeKey"
 let KMDisplayBackgroundNormalColorKey: KMPreferenceKey = "KMDisplayBackgroundNormalColorKey"
 let KMDisplayBackgroundFullScreenColorKey: KMPreferenceKey = "KMDisplayBackgroundFullScreenColorKey"
 let KMHighlightFormsKey: KMPreferenceKey = "KMHighlightFormsKey"
@@ -259,6 +260,7 @@ class KMPreferenceManager: NSObject {
                     KMLeftSideDisplayTypeKey,
                     KMShowOutlineListKey,
                     KMLeftSideExpandTypeKey,
+                    KMPropertyPanelExpandTypeKey,
                     KMDisplayBackgroundNormalColorKey,
                     KMDisplayBackgroundFullScreenColorKey,
                     KMHighlightFormsKey,
@@ -301,6 +303,7 @@ class KMPreferenceManager: NSObject {
                                                       KMLeftSideDisplayTypeKey : 0,
                                                            KMShowOutlineListKey: true,
                                                        KMLeftSideExpandTypeKey : 0,
+                                                  KMPropertyPanelExpandTypeKey : 0,
                                              KMDisplayBackgroundNormalColorKey : self.displayBackgroundNormalColorValues,
                                          KMDisplayBackgroundFullScreenColorKey : self.displayBackgroundFullScreenColorValues,
                                                            KMHighlightFormsKey : true,
@@ -614,12 +617,29 @@ extension KMPreferenceManager {
         }
     }
     
-    var leftSideExpandType: Int {
+//    var leftSideExpandType: Int {
+//        get {
+//            return self.getData(forKey: KMLeftSideExpandTypeKey) as! Int
+//        }
+//        set {
+//            let _ = self.setData(data: newValue, forKey: KMLeftSideExpandTypeKey)
+//        }
+//    }
+    
+    var propertyPanelExpandType: KMPreferencePropertyPanelExpandType {
         get {
-            return self.getData(forKey: KMLeftSideExpandTypeKey) as! Int
+            let type: Int? = self.getData(forKey: KMPropertyPanelExpandTypeKey) as? Int
+            if (type == nil || type! == 0) {
+                return .auto
+            } else if (type! == 1) {
+                return .manual
+            }
+            return .auto
         }
         set {
-            let _ = self.setData(data: newValue, forKey: KMLeftSideExpandTypeKey)
+            if (newValue == .auto || newValue == .manual) {
+                let _ = self.setData(data: newValue.rawValue, forKey: KMPropertyPanelExpandTypeKey)
+            }
         }
     }
     
@@ -873,4 +893,10 @@ extension KMPreferenceManager {
     func leftSideNeedCloseWhenOpenFile() -> Bool {
         return KMPreferenceManager.shared.leftSideDisplayType == .closeWhenOpenFile
     }
+    
+    var autoExpandPropertyPanel: Bool {
+        get {
+            return KMPreferenceManager.shared.propertyPanelExpandType == .auto
+        }
+    }
 }