【综合】注释工具栏优化

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

@@ -122,6 +122,7 @@ class KMToolbarCustomViewController: NSViewController {
         }
         
         self._loadDefaultItems()
+        self.removeButton.isEnabled = true
         self.allowedItemsTableView.reloadData()
         self.defaultItemsTableView.reloadData()
         
@@ -150,6 +151,7 @@ class KMToolbarCustomViewController: NSViewController {
                 self.defaultItemsTableView.reloadData()
                 self.defaultItemsTableView.scrollRowToVisible(self._defaultItems.count-1)
                 self.addButton.isEnabled = false
+                self.removeButton.isEnabled = true
             } else {
                 
             }
@@ -161,10 +163,15 @@ class KMToolbarCustomViewController: NSViewController {
         if (selectedRowIndexes.count <= 0) {
             return
         }
-        for index in selectedRowIndexes {
+        for index in selectedRowIndexes.reversed() {
             if index < self._defaultItems.count {
                 self._defaultItems.remove(at: index)
             }
+            
+            if self._defaultItems.count <= 6 {
+                self.removeButton.isEnabled = false
+                break
+            }
         }
         
         self.allowedItemsTableView.reloadData()
@@ -243,7 +250,11 @@ extension KMToolbarCustomViewController: NSTableViewDelegate, NSTableViewDataSou
             self.defaultItemsTableView.selectRowIndexes(set as IndexSet, byExtendingSelection: false)
             self.removeButton.isEnabled = false
         } else if (self.defaultItemsTableView == tableView) {
-            self.removeButton.isEnabled = tableView!.selectedRowIndexes.count > 0 ? true : false
+            if self._defaultItems.count > 6 {
+                self.removeButton.isEnabled = tableView!.selectedRowIndexes.count > 0 ? true : false
+            } else {
+                self.removeButton.isEnabled = false
+            }
             let set = NSIndexSet()
             self.allowedItemsTableView.selectRowIndexes(set as IndexSet, byExtendingSelection: false)
             self.addButton.isEnabled = false

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

@@ -739,9 +739,10 @@ extension KMToolbarViewController : KMToolbarViewDelegate,NSToolbarItemValidatio
                     KMAnnotationStampToolbarItemIdentifier,
                     KMToolbarSignSignatureAnnotationItemIdentifier,
                     KMToolbarDividerItemIdentifier,
-                    KMToolbarShowToolbarItemIdentifier,
-                    
-                    KMToolbarToolRadioButtonItemIdentifier]
+                    KMToolbarShowToolbarItemIdentifier
+//
+//                    KMToolbarToolRadioButtonItemIdentifier
+            ]
         case .editPDF:
             return editPDFItemIdentifiers
         case .Page: