Commit: 7399f8a5498109ba7c2251b2cc63baff75d48952 - GoInto (git)

macOSのスクリーンショットの保存場所を変更するメニュバーエクストラ

Commit MetaInfo

• Revision: 7399f8a5498109ba7c2251b2cc63baff75d48952 (tree)
• Time: 2017-11-04 23:17:10
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

Seledctorを静的定数として持たず直接与えるようにした

Change Summary

• modified: GoInto/ChooseFolderItem.swift
• modified: GoInto/FolderItem.swift
• modified: GoInto/ImageTypeItem.swift
• modified: GoInto/QuitItem.swift

Incremental Difference

--- a/GoInto/ChooseFolderItem.swift
+++ b/GoInto/ChooseFolderItem.swift
@@ -25,9 +25,6 @@ extension ActionListener {
         owner.urlSelector(url)
     }
 }
-extension Selector {
-    static let selectFolder = #selector(ActionListener.selectFolder(_:))
-}
 
 class ChooseFolderItem: StatusItem {
     let menuItem = NSMenuItem()
@@ -37,7 +34,7 @@ class ChooseFolderItem: StatusItem {
     init(_ handler: @escaping ((URL) -> Void)) {
         urlSelector = handler
         menuItem.title = NSLocalizedString("Choose Folder", comment: "Choose Folder MenuItem")
-        menuItem.action = .selectFolder
+        menuItem.action = #selector(ActionListener.selectFolder(_:))
         menuItem.target = listener
         listener.owner = self
     }

--- a/GoInto/FolderItem.swift
+++ b/GoInto/FolderItem.swift
@@ -14,9 +14,6 @@ extension ActionListener {
         owner.set()
     }
 }
-extension Selector {
-    static let changeFolder = #selector(ActionListener.changeFolder(_:))
-}
 
 final class FolderItem: StatusItem {
     let url: URL
@@ -35,7 +32,7 @@ final class FolderItem: StatusItem {
         
         let work = NSWorkspace.shared()
         menuItem.image = fitSize(work.icon(forFile: url.path))
-        menuItem.action = .changeFolder
+        menuItem.action = #selector(ActionListener.changeFolder(_:))
         menuItem.target = listener
         listener.owner = self
     }

--- a/GoInto/ImageTypeItem.swift
+++ b/GoInto/ImageTypeItem.swift
@@ -17,9 +17,6 @@ extension ActionListener {
         owner.set(typeName)
     }
 }
-extension Selector {
-    static let selectType = #selector(ActionListener.selectType(_:))
-}
 
 private func loadImageTypes() -> [String] {
     guard let url = Bundle.main.url(forResource: "ImageType", withExtension: "plist"),
@@ -46,7 +43,7 @@ class ImageTypeItem: StatusItem {
             .map {
                 let item = NSMenuItem()
                 item.title = ws.localizedDescription(forType: $0) ?? "Never Use Default Value"
-                item.action = .selectType
+                item.action = #selector(ActionListener.selectType(_:))
                 item.target = listener
                 item.representedObject = ws.preferredFilenameExtension(forType: $0)
                 return item

--- a/GoInto/QuitItem.swift
+++ b/GoInto/QuitItem.swift
@@ -14,10 +14,6 @@ extension ActionListener {
     }
 }
 
-extension Selector {
-    static let quit = #selector(ActionListener.quit(_:))
-}
-
 class QuitItem: StatusItem {
     let menuItem = NSMenuItem()
     private let listener = ActionListener()
@@ -25,7 +21,7 @@ class QuitItem: StatusItem {
     init() {
         let format = NSLocalizedString("Quit %@", comment: "Quit Menu Item")
         menuItem.title = String(format: format, AppDelegate.appName)
-        menuItem.action = .quit
+        menuItem.action = #selector(ActionListener.quit(_:))
         menuItem.target = listener
     }
 }