Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: copy/paste meny actions. #75

Merged
merged 1 commit into from
Jul 17, 2017
Merged

Fix: copy/paste meny actions. #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions LinkedIdeas/CanvasViewController+NSPasteboard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Cocoa
extension CanvasViewController {
// MARK: - Pasteboard

private func writeToPasteboard(pasteboard: NSPasteboard) {
fileprivate func writeToPasteboard(pasteboard: NSPasteboard) {
guard let elements = selectedElements() else {
return
}
Expand All @@ -20,7 +20,7 @@ extension CanvasViewController {
pasteboard.writeObjects(elements.map { $0.attributedStringValue })
}

private func readFromPasteboard(pasteboard: NSPasteboard) {
fileprivate func readFromPasteboard(pasteboard: NSPasteboard) {
let rawObjects = pasteboard.readObjects(
forClasses: [NSAttributedString.self], options: [:]
) as? [NSAttributedString]
Expand All @@ -32,7 +32,7 @@ extension CanvasViewController {
pasteConcepts(fromAttributedStrings: objects)
}

private func readFromPasteboardAsPlainText(pasteboard: NSPasteboard) {
fileprivate func readFromPasteboardAsPlainText(pasteboard: NSPasteboard) {
let rawObjects = pasteboard.readObjects(forClasses: [NSString.self], options: [:]) as? [String]

guard let objects = rawObjects, objects.count != 0 else {
Expand All @@ -42,7 +42,7 @@ extension CanvasViewController {
pasteConcepts(fromAttributedStrings: objects.map { NSAttributedString(string: $0) })
}

private func pasteConcepts(fromAttributedStrings attributedStrings: [NSAttributedString]) {
fileprivate func pasteConcepts(fromAttributedStrings attributedStrings: [NSAttributedString]) {
safeTransiton {
try stateManager.toCanvasWaiting()
}
Expand Down Expand Up @@ -71,7 +71,7 @@ extension CanvasViewController {
}
}

private func createConceptFromPasteboard(attributedString: NSAttributedString, index: Int) -> Concept? {
fileprivate func createConceptFromPasteboard(attributedString: NSAttributedString, index: Int) -> Concept? {
let newConceptPadding: Int = 15
let newPoint = NSPoint(
x: CGFloat(200 + (newConceptPadding*index)),
Expand All @@ -82,7 +82,7 @@ extension CanvasViewController {

// MARK: - Interface actions

func cut(_ sender: Any?) {
@objc func cut(_ sender: Any?) {
writeToPasteboard(pasteboard: NSPasteboard.general)
if let elements = selectedElements() {
safeTransiton {
Expand All @@ -91,15 +91,15 @@ extension CanvasViewController {
}
}

func copy(_ sender: Any?) {
@objc func copy(_ sender: Any?) {
writeToPasteboard(pasteboard: NSPasteboard.general)
}

func paste(_ sender: Any?) {
@objc func paste(_ sender: Any?) {
readFromPasteboard(pasteboard: NSPasteboard.general)
}

func pasteAsPlainText(_ sender: Any?) {
@objc func pasteAsPlainText(_ sender: Any?) {
readFromPasteboardAsPlainText(pasteboard: NSPasteboard.general)
}
}