提交: b8533da3c4d5cba93e257d1048779c33cb36e0ab - GoInto (git)

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

Commit MetaInfo

• 修订版: b8533da3c4d5cba93e257d1048779c33cb36e0ab (tree)
• 时间: 2018-03-10 17:55:41
• 作者: masakih <masakih@user...>
• Commiter: masakih

Log Message

ActionListenerを削除

更改概述

• modified: GoInto.xcodeproj/project.pbxproj
• delete: GoInto/ActionListener.swift
• modified: GoInto/ChooseFolderItem.swift
• modified: GoInto/FolderItem.swift
• modified: GoInto/ImageTypeItem.swift
• modified: GoInto/QuitItem.swift

差异

--- a/GoInto.xcodeproj/project.pbxproj
+++ b/GoInto.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 		F40EB6BF1EA1A55700FEE444 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = F40EB6BD1EA1A55700FEE444 /* Localizable.strings */; };
 		F40EB6C81EA1CD7A00FEE444 /* ImageTypeItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40EB6C71EA1CD7A00FEE444 /* ImageTypeItem.swift */; };
 		F40EB6CA1EA1D7B500FEE444 /* ImageType.plist in Resources */ = {isa = PBXBuildFile; fileRef = F40EB6C91EA1D7B500FEE444 /* ImageType.plist */; };
-		F40EB6D01EA26BEC00FEE444 /* ActionListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40EB6CF1EA26BEC00FEE444 /* ActionListener.swift */; };
 		F40EB6D21EA2F28100FEE444 /* Screenshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40EB6D11EA2F28100FEE444 /* Screenshot.swift */; };
 		F414DD031EABAB7300111DA7 /* UserDefaultsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F414DD021EABAB7300111DA7 /* UserDefaultsExtension.swift */; };
 		F42539E01EACCEDE0083EB9D /* UserDefaultsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F42539DF1EACCEDE0083EB9D /* UserDefaultsTest.swift */; };
@@ -44,7 +43,6 @@
 		F40EB6C61EA1A94200FEE444 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		F40EB6C71EA1CD7A00FEE444 /* ImageTypeItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageTypeItem.swift; sourceTree = "<group>"; };
 		F40EB6C91EA1D7B500FEE444 /* ImageType.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = ImageType.plist; sourceTree = "<group>"; };
-		F40EB6CF1EA26BEC00FEE444 /* ActionListener.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActionListener.swift; sourceTree = "<group>"; };
 		F40EB6D11EA2F28100FEE444 /* Screenshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Screenshot.swift; sourceTree = "<group>"; };
 		F414DD021EABAB7300111DA7 /* UserDefaultsExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDefaultsExtension.swift; sourceTree = "<group>"; };
 		F42539DF1EACCEDE0083EB9D /* UserDefaultsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDefaultsTest.swift; sourceTree = "<group>"; };
@@ -113,7 +111,6 @@
 				F47B07111EA10A3E006711D9 /* ChooseFolderItem.swift */,
 				F40EB6C71EA1CD7A00FEE444 /* ImageTypeItem.swift */,
 				F47B07171EA10A88006711D9 /* QuitItem.swift */,
-				F40EB6CF1EA26BEC00FEE444 /* ActionListener.swift */,
 				F4D346931EA644170031AFB3 /* LimitedArray.swift */,
 				F47B06EE1E9A5DF9006711D9 /* Assets.xcassets */,
 				F47B06F31E9A5DF9006711D9 /* Info.plist */,
@@ -244,7 +241,6 @@
 				F47B070C1E9A65FA006711D9 /* StatusItem.swift in Sources */,
 				F47B06EB1E9A5DF9006711D9 /* AppDelegate.swift in Sources */,
 				F47B07101EA10A1A006711D9 /* FolderItem.swift in Sources */,
-				F40EB6D01EA26BEC00FEE444 /* ActionListener.swift in Sources */,
 				F40EB6D21EA2F28100FEE444 /* Screenshot.swift in Sources */,
 				F47B07181EA10A88006711D9 /* QuitItem.swift in Sources */,
 				F40EB6C81EA1CD7A00FEE444 /* ImageTypeItem.swift in Sources */,

--- a/GoInto/ActionListener.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-//  ActionListener.swift
-//  GoInto
-//
-//  Created by Hori,Masaki on 2017/04/15.
-//  Copyright © 2017年 Hori,Masaki. All rights reserved.
-//
-
-import Cocoa
-
-/// El Capitan以前はaction targetがNSObjectを継承していなければならないため、targetとして利用する
-///
-/// extension ActionListener {
-///     @IBAction func action(_ sender: Any?) {
-///         guard let owner = owner as? Responder? else { return }
-///         owner.operate()
-///     }
-/// }
-///
-/// class Responder {
-///     let listener = ActionListener()
-///     let actionSender: AnyObject
-///
-///     init() {
-///         actionSender.action = #selector(ActionListener.action(_:))
-///         actionSender.target = listener
-///         listener.owner = self
-///     }
-///     func operate() {
-///         // do something
-///     }
-/// }
-class ActionListener: NSObject {
-    weak var owner: AnyObject?
-}

--- a/GoInto/ChooseFolderItem.swift
+++ b/GoInto/ChooseFolderItem.swift
@@ -8,9 +8,18 @@
 
 import Cocoa
 
-extension ActionListener {
+class ChooseFolderItem: StatusItem {
+    let menuItem = NSMenuItem()
+    let urlSelector: (URL) -> Void
+    
+    init(_ handler: @escaping ((URL) -> Void)) {
+        urlSelector = handler
+        menuItem.title = NSLocalizedString("Choose Folder", comment: "Choose Folder MenuItem")
+        menuItem.action = #selector(selectFolder(_:))
+        menuItem.target = self
+    }
+    
     @IBAction func selectFolder(_ sender: Any?) {
-        guard let owner = owner as? ChooseFolderItem else { return }
         let panel = NSOpenPanel()
         panel.canChooseDirectories = true
         panel.allowsMultipleSelection = false
@@ -23,20 +32,6 @@ extension ActionListener {
         NSApplication.shared.activate(ignoringOtherApps: true)
         guard panel.runModal() == NSApplication.ModalResponse(NSFileHandlingPanelOKButton),
             let url = panel.directoryURL else { return }
-        owner.urlSelector(url)
-    }
-}
-
-class ChooseFolderItem: StatusItem {
-    let menuItem = NSMenuItem()
-    let urlSelector: (URL) -> Void
-    private let listener = ActionListener()
-    
-    init(_ handler: @escaping ((URL) -> Void)) {
-        urlSelector = handler
-        menuItem.title = NSLocalizedString("Choose Folder", comment: "Choose Folder MenuItem")
-        menuItem.action = #selector(ActionListener.selectFolder(_:))
-        menuItem.target = listener
-        listener.owner = self
+        urlSelector(url)
     }
 }

--- a/GoInto/FolderItem.swift
+++ b/GoInto/FolderItem.swift
@@ -8,17 +8,9 @@
 
 import Cocoa
 
-extension ActionListener {
-    @IBAction func changeFolder(_ sender: Any?) {
-        guard let owner = owner as? FolderItem else { return }
-        owner.set()
-    }
-}
-
 final class FolderItem: StatusItem {
     let url: URL
     let menuItem = NSMenuItem()
-    private let listener = ActionListener()
     
     init(_ url: URL) {
         self.url = url
@@ -32,9 +24,8 @@ final class FolderItem: StatusItem {
         
         let work = NSWorkspace.shared
         menuItem.image = fitSize(work.icon(forFile: url.path))
-        menuItem.action = #selector(ActionListener.changeFolder(_:))
-        menuItem.target = listener
-        listener.owner = self
+        menuItem.action = #selector(changeFolder(_:))
+        menuItem.target = self
     }
     deinit {
         remove()
@@ -55,6 +46,10 @@ final class FolderItem: StatusItem {
     func update(_ url: URL) {
         menuItem.state = (self.url == url ? .on : .off)
     }
+    
+    @IBAction func changeFolder(_ sender: Any?) {
+        set()
+    }
 }
 
 func fitSize(_ image: NSImage) -> NSImage {

--- a/GoInto/ImageTypeItem.swift
+++ b/GoInto/ImageTypeItem.swift
@@ -8,16 +8,6 @@
 
 import Cocoa
 
-extension ActionListener {
-    @IBAction func selectType(_ sender: Any?) {
-        guard let owner = owner as? ImageTypeItem,
-            let item = sender as? NSMenuItem,
-            let typeName = item.representedObject as? String
-            else { return }
-        owner.set(typeName)
-    }
-}
-
 private func loadImageTypes() -> [String] {
     guard let url = Bundle.main.url(forResource: "ImageType", withExtension: "plist"),
         let array = NSArray(contentsOf: url)
@@ -28,11 +18,8 @@ private func loadImageTypes() -> [String] {
 class ImageTypeItem: StatusItem {
     let menuItem = NSMenuItem()
     private let supportTypes = loadImageTypes()
-    private let listener = ActionListener()
     
-    init() {
-        listener.owner = self
-        
+    init() {        
         menuItem.title = NSLocalizedString("Image Type", comment: "Image Type MenuItem")
         
         let ws = NSWorkspace.shared
@@ -43,8 +30,8 @@ class ImageTypeItem: StatusItem {
             .map {
                 let item = NSMenuItem()
                 item.title = ws.localizedDescription(forType: $0) ?? "Never Use Default Value"
-                item.action = #selector(ActionListener.selectType(_:))
-                item.target = listener
+                item.action = #selector(selectType(_:))
+                item.target = self
                 item.representedObject = ws.preferredFilenameExtension(forType: $0)
                 return item
             }
@@ -68,4 +55,11 @@ class ImageTypeItem: StatusItem {
             Screenshot.shared.type = typeName
         }
     }
+    
+    @IBAction func selectType(_ sender: Any?) {
+        guard let item = sender as? NSMenuItem,
+            let typeName = item.representedObject as? String
+            else { return }
+        set(typeName)
+    }
 }

--- a/GoInto/QuitItem.swift
+++ b/GoInto/QuitItem.swift
@@ -8,20 +8,17 @@
 
 import Cocoa
 
-extension ActionListener {
-    @IBAction func quit(_ sender: Any?) {
-        NSApplication.shared.terminate(nil)
-    }
-}
-
 class QuitItem: StatusItem {
     let menuItem = NSMenuItem()
-    private let listener = ActionListener()
     
     init() {
         let format = NSLocalizedString("Quit %@", comment: "Quit Menu Item")
         menuItem.title = String(format: format, AppDelegate.appName)
-        menuItem.action = #selector(ActionListener.quit(_:))
-        menuItem.target = listener
+        menuItem.action = #selector(quit(_:))
+        menuItem.target = self
+    }
+    
+    @IBAction func quit(_ sender: Any?) {
+        NSApplication.shared.terminate(nil)
     }
 }