Copyboard(Views): Add preview button for right click action

Author: khcrysalis

Copyboard/Resources/Localizable.xcstrings

@@ -449,6 +449,17 @@
         }
       }
     },
+    "Preview" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Preview"
+          }
+        }
+      }
+    },
     "Quit %@" : {
       "comment" : "Quit Copyboard",
       "extractionState" : "manual",

Copyboard/Views/Common/CBCollectionView.swift

@@ -96,7 +96,7 @@ class CBCollectionView: NSCollectionView {
 			AppDelegate.main.menuBar?.statusItem.toggleWindow()
 		case (true, _, 35): // P Key
 			if let indexPath = selectionIndexPaths.first {
-				_showPreviewPopover(for: indexPath)
+				showPreviewPopover(for: indexPath)
 			}
 		case (true, _, 3): // F Key
 			if let indexPath = selectionIndexPaths.first {
@@ -137,7 +137,7 @@ class CBCollectionView: NSCollectionView {
 		StorageManager.shared.toggleFavoriteHistory(for: item.object)
 	}
 
-	private func _showPreviewPopover(for indexPath: IndexPath) {
+	func showPreviewPopover(for indexPath: IndexPath) {
 		guard let item = item(at: indexPath) as? CBContentViewItem else { return }
 
 		// Avoid showing multiple

Copyboard/Views/Content/CBContentView.swift

@@ -197,23 +197,35 @@ extension CBContentView: CBCollectionViewDelegate {
 
 		let menu = NSMenu()
 
-		let favoriteTitle: String = item.isFavorited ? .localized("Unfavorite") : .localized("Favorite")
-		let favoriteItem = NSMenuItem(title: favoriteTitle, action: #selector(_handleFavoriteMenuItem(_:)), keyEquivalent: "f")
+		let previewItem = NSMenuItem(title: .localized("Preview"), action: #selector(_handlePreviewItem(_:)), keyEquivalent: "p")
+		previewItem.target = self
+		previewItem.representedObject = indexPath
+		menu.addItem(previewItem)
+		
+		menu.addItem(NSMenuItem.separator())
+		
+		let favoriteItem = NSMenuItem(title: item.isFavorited ? .localized("Unfavorite") : .localized("Favorite"), action: #selector(_handleFavoriteMenuItem(_:)), keyEquivalent: "f")
 		favoriteItem.target = self
 		favoriteItem.representedObject = item
 		menu.addItem(favoriteItem)
 
 		menu.addItem(NSMenuItem.separator())
 
+		let copyParentItem = NSMenuItem(title: .localized("Copy"), action: nil, keyEquivalent: "")
+		let copySubmenu = NSMenu()
+
 		let copyItem = NSMenuItem(title: .localized("Copy"), action: #selector(_handleCopyMenuItem(_:)), keyEquivalent: "")
 		copyItem.target = self
 		copyItem.representedObject = item
-		menu.addItem(copyItem)
-		
+		copySubmenu.addItem(copyItem)
+
 		let copyPlainItem = NSMenuItem(title: .localized("Copy Without Formatting"), action: #selector(_handleCopyPlainMenuItem(_:)), keyEquivalent: "")
 		copyPlainItem.target = self
 		copyPlainItem.representedObject = item
-		menu.addItem(copyPlainItem)
+		copySubmenu.addItem(copyPlainItem)
+
+		copyParentItem.submenu = copySubmenu
+		menu.addItem(copyParentItem)
 
 		menu.addItem(NSMenuItem.separator())
 
@@ -243,6 +255,11 @@ extension CBContentView: CBCollectionViewDelegate {
 		guard let object = sender.representedObject as? CBObject else { return }
 		_copyItem(for: object, asPlain: true)
 	}
+	/// Helper function for preview, for NSMenuItem
+	@objc private func _handlePreviewItem(_ sender: NSMenuItem) {
+		guard let object = sender.representedObject as? IndexPath else { return }
+		_previewItem(for: object)
+	}
 	/// Deletes history object entirely.
 	/// - Parameter object: History object
 	private func _deleteItem(for object: CBObject) {
@@ -259,6 +276,11 @@ extension CBContentView: CBCollectionViewDelegate {
 	private func _favoriteItem(for object: CBObject) {
 		StorageManager.shared.toggleFavoriteHistory(for: object)
 	}
+	/// Preview history item.
+	/// - Parameter indexPath: indexPath
+	private func _previewItem(for indexPath: IndexPath) {
+		(collectionView as? CBCollectionView)?.showPreviewPopover(for: indexPath)
+	}
 }
 
 // MARK: - CBContentView (Extension): CBSearchDelegate

Copyboard/Views/Settings/Shortcuts/CBSettingsShortcutsView.swift

@@ -27,12 +27,12 @@ struct CBSettingsShortcutsView: View {
 				#warning("unfinished")
 				Text("""
 				These are the default keybinds that can be used when you're interacting with the clipboard items.
-				• Quick Copy: `⌘ 1...9`
-				• Selection: `↑ ↓`
-				• Copy: `⏎`
-				• Preview: `⌘ + p`
-				• Favorite: `⌘ + f`
-				• Delete: `⌘ + ⌫`
+				• Quick Copy:  `⌘ + 1...9`
+				• Selection:  `↑ ↓`
+				• Copy:  `⏎`
+				• Preview:  `⌘ + p`
+				• Favorite:  `⌘ + f`
+				• Delete:  `⌘ + ⌫`
 				""").foregroundStyle(.secondary)
 			}