ADD support for drag board

ConradSun · Sep 29, 2023 · b01a808 · b01a808
1 parent af594f0
commit b01a808
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 4 deletions.
diff --git a/Docs/PasteShow.png b/Docs/PasteShow.png
diff --git a/PasteShow.xcodeproj/project.pbxproj b/PasteShow.xcodeproj/project.pbxproj
@@ -297,7 +297,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.0;
+				MARKETING_VERSION = 2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nuwastone.PasteShow;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -325,7 +325,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 2.0;
+				MARKETING_VERSION = 2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nuwastone.PasteShow;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/PasteShow/PasteboardManager.swift b/PasteShow/PasteboardManager.swift
@@ -18,13 +18,19 @@ enum ItemType: String {
     case Other = "Other"
 }
 
+enum PasteboardType: String, CaseIterable {
+    case General = "General"
+    case Drag = "Drag"
+}
+
 class PasteInfoList: ObservableObject {
     struct PasteInfo {
         var itemType = ItemType.Other
         var sourceURL = URL(string: "")
         var copiedItems = [[String: Data]]()
     }
 
+    @Published var boardType = "General"
     @Published var infoList = [PasteInfo]()
 
     func appendInfo(source: URL, items: [[String: Data]], type: ItemType) {
@@ -40,11 +46,12 @@ class PasteboardManager {
     static let shared = PasteboardManager()
     var changeCount = 0
     var pasteInfo = PasteInfoList()
-    private let pasteboard = NSPasteboard.general
+
+    private var pasteboard = NSPasteboard.init(name: .general)
     private var observerTimer = Timer()
 
     private init() {
-        setupObserverTimer()
+        setupPasteboardType(type: pasteInfo.boardType)
     }
 
     private func setupObserverTimer() {
@@ -102,6 +109,25 @@ class PasteboardManager {
         pasteInfo.appendInfo(source: sourceURL!, items: copiedItems, type: itemType)
     }
 
+    private func getBoardType(_ type: String) -> NSPasteboard.Name {
+        let pasteboardType = ["General": NSPasteboard.Name.general,
+                              "Drag": NSPasteboard.Name.drag,
+                              "Font": NSPasteboard.Name.font]
+
+        guard let name = pasteboardType[type] else {
+            return .general
+        }
+        return name
+    }
+
+    func setupPasteboardType(type: String) {
+        let boardType = getBoardType(type)
+        pasteInfo.infoList.removeAll()
+        print("setup \(boardType)")
+        pasteboard = NSPasteboard.init(name: boardType)
+        setupObserverTimer()
+    }
+
     func setDataWithoutReserve(data: String, forType type: NSPasteboard.PasteboardType) {
         pasteboard.clearContents()
         pasteboard.setString(data, forType: type)

diff --git a/PasteShow/SplitView.swift b/PasteShow/SplitView.swift
@@ -30,6 +30,9 @@ struct SidebarView: View {
                     }
                 }
         }
+        .toolbar {
+            PickerView()
+        }
     }
 }
 
@@ -138,3 +141,20 @@ struct SourceView: View {
         }
     }
 }
+
+struct PickerView: View {
+    @EnvironmentObject var info: PasteInfoList
+
+    var body: some View {
+        Picker(selection: $info.boardType) {
+            ForEach(Array(PasteboardType.allCases.enumerated()), id: \.1.rawValue) { index, type in
+                Text(type.rawValue)
+            }
+        } label: {
+            Text("\(info.boardType)")
+        }
+        .onReceive(info.$boardType) { type in
+            PasteboardManager.shared.setupPasteboardType(type: type)
+        }
+    }
+}