【toolbar】向前向后调整为前一页后一页

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -543,28 +543,28 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                 item?.customizeView = self.zoomView;
                 
             } else if identifier == KMDocumentNextPageToolbarItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameToolbarPagepreviousNor")
-                item?.titleName = NSLocalizedString("Previous", comment: "")
-                item?.alternateImage = NSImage(named: "KMImageNameToolbarPagepreviousNor")
+                item?.image = NSImage(named: "KMImageNameToolbarPagenextNor")
+                item?.titleName = NSLocalizedString("Next", comment: "")
+                item?.alternateImage = NSImage(named: "KMImageNameToolbarPagenextNor")
                 item?.target = self
                 item?.btnTag = 2
-                item?.toolTip = NSLocalizedString("Forward", comment: "")
+                item?.toolTip = NSLocalizedString("Next", comment: "")
                 item?.boxImagePosition = .imageAbove
-                item?.btnAction = #selector(zoomPDFViewButtonAction)
+                item?.btnAction = #selector(itemAction)
                 
                 let menuItem = NSMenuItem.init(title: item?.titleName ?? "", action: #selector(zoomPDFViewButtonAction), target: self)
                 menuItem.target = self
                 menuItem.tag = item!.btnTag
                 item?.menuFormRepresentation = menuItem
             } else if identifier == KMDocumentPreviousPageToolbarItemIdentifier {
-                item?.image = NSImage(named: "KMImageNameToolbarPagenextNor")
-                item?.titleName = NSLocalizedString("Next", comment: "")
-                item?.alternateImage = NSImage(named: "KMImageNameToolbarPagenextNor")
+                item?.image = NSImage(named: "KMImageNameToolbarPagepreviousNor")
+                item?.titleName = NSLocalizedString("Previous", comment: "")
+                item?.alternateImage = NSImage(named: "KMImageNameToolbarPagepreviousNor")
                 item?.target = self
                 item?.btnTag = 3
-                item?.toolTip = NSLocalizedString("Next", comment: "")
+                item?.toolTip = NSLocalizedString("Previous", comment: "")
                 item?.boxImagePosition = .imageAbove
-                item?.btnAction = #selector(zoomPDFViewButtonAction)
+                item?.btnAction = #selector(itemAction)
                 
                 let menuItem = NSMenuItem.init(title: item!.titleName ?? "", action: #selector(zoomPDFViewButtonAction), target: self)
                 menuItem.target = self

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

@@ -2169,11 +2169,16 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     
     func changePDFViewGotoNextPageAction() {
         self.listView.km_goBack(nil)
+        if (self.listView.canGoToNextPage()) {
+            self.listView.goToNextPage(nil)
+        }
         self.updateNextAndPreViousButtonState()
     }
     
     func changePDFViewGoToPreviousPageAction() {
-        self.listView.goToPreviousPage(nil)
+        if (self.listView.canGoToPreviousPage()) {
+            self.listView.goToPreviousPage(nil)
+        }
         self.updateNextAndPreViousButtonState()
     }
     
@@ -2909,6 +2914,10 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
     func toolbarViewController(_ viewController: KMToolbarViewController, itemDidClick toolbarItem: KMToolbarItemView) {
         if toolbarItem.itemIdentifier == KMDocumentHomeToolbarItemIdentifier {
             Swift.debugPrint("KMDocumentHomeToolbarItemIdentifier ...")
+        } else if toolbarItem.itemIdentifier == KMDocumentPreviousPageToolbarItemIdentifier {
+            self.changePDFViewGoToPreviousPageAction()
+        } else if toolbarItem.itemIdentifier == KMDocumentNextPageToolbarItemIdentifier {
+            self.changePDFViewGotoNextPageAction()
         }
     }
 }

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

@@ -200,8 +200,8 @@ import Cocoa
     
     override func viewDidAppear() {
         super.viewDidAppear()
-        //刷新向前向后按钮
-        self.updateBackAndForwardButtonState()
+        //刷新前一页后一页按钮
+        self.updateNextAndPreViousButtonState()
         
         KMLightMemberManager.manager.canShowAdvancedView = false
         Task { @MainActor in
@@ -1415,16 +1415,16 @@ import Cocoa
         if self.isReadMode {
             self.readModelView.currentPageIndex = self.listView.currentPageIndex
         }
-        //刷新向前向后按钮
-        self.updateBackAndForwardButtonState()
+        //刷新前一页后一页按钮
+        self.updateNextAndPreViousButtonState()
     }
     
     func CPDFDocumentPageCountChangedNotification(_ sender: Notification) {
         if self.isReadMode {
             self.readModelView.totalPagesCount = Int(self.listView.document.pageCount)
         }
-        //刷新向前向后按钮
-        self.updateBackAndForwardButtonState()
+        //刷新前一页后一页按钮
+        self.updateNextAndPreViousButtonState()
     }
     
     func CEditPDFToolModeChangeStateUnkownNotification(_ sender: Notification) {