Commit: 45d113dc46490e79599b0ec45f305060c4c10554 - GoInto (git)

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

Commit MetaInfo

• Revision: 45d113dc46490e79599b0ec45f305060c4c10554 (tree)
• Time: 2017-04-15 19:45:35
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

El Capitanで起動しない問題を修正

Change Summary

• modified: GoInto.xcodeproj/project.pbxproj
• add: GoInto/ActionListener.swift
• modified: GoInto/ChooseFolerItem.swift
• modified: GoInto/FolderItem.swift
• modified: GoInto/ImageTypeItem.swift
• modified: GoInto/QuitItem.swift

Incremental Difference

--- a/GoInto.xcodeproj/project.pbxproj
+++ b/GoInto.xcodeproj/project.pbxproj
@@ -11,6 +11,7 @@
 		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 */; };
+		F40EB6CE1EA2218200FEE444 /* ActionListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = F40EB6CD1EA2218200FEE444 /* ActionListener.swift */; };
 		F47B06EB1E9A5DF9006711D9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47B06EA1E9A5DF9006711D9 /* AppDelegate.swift */; };
 		F47B06EF1E9A5DF9006711D9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F47B06EE1E9A5DF9006711D9 /* Assets.xcassets */; };
 		F47B06FD1E9A5DF9006711D9 /* GoIntoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F47B06FC1E9A5DF9006711D9 /* GoIntoTests.swift */; };
@@ -39,6 +40,7 @@
 		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>"; };
+		F40EB6CD1EA2218200FEE444 /* ActionListener.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActionListener.swift; sourceTree = "<group>"; };
 		F47B06E71E9A5DF9006711D9 /* GoInto.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoInto.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F47B06EA1E9A5DF9006711D9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		F47B06EE1E9A5DF9006711D9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -101,6 +103,7 @@
 				F47B07111EA10A3E006711D9 /* ChooseFolerItem.swift */,
 				F40EB6C71EA1CD7A00FEE444 /* ImageTypeItem.swift */,
 				F47B07171EA10A88006711D9 /* QuitItem.swift */,
+				F40EB6CD1EA2218200FEE444 /* ActionListener.swift */,
 				F47B06EE1E9A5DF9006711D9 /* Assets.xcassets */,
 				F47B06F31E9A5DF9006711D9 /* Info.plist */,
 				F40EB6C91EA1D7B500FEE444 /* ImageType.plist */,
@@ -229,6 +232,7 @@
 				F47B070C1E9A65FA006711D9 /* StatusItem.swift in Sources */,
 				F47B06EB1E9A5DF9006711D9 /* AppDelegate.swift in Sources */,
 				F47B07101EA10A1A006711D9 /* FolderItem.swift in Sources */,
+				F40EB6CE1EA2218200FEE444 /* ActionListener.swift in Sources */,
 				F47B07181EA10A88006711D9 /* QuitItem.swift in Sources */,
 				F40EB6C81EA1CD7A00FEE444 /* ImageTypeItem.swift in Sources */,
 				F47B070E1E9A6E55006711D9 /* StatusBar.swift in Sources */,

--- /dev/null
+++ b/GoInto/ActionListener.swift
@@ -0,0 +1,13 @@
+//
+//  ActionListener.swift
+//  GoInto
+//
+//  Created by Hori,Masaki on 2017/04/15.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//
+
+import Cocoa
+
+class ActionListener: NSObject {
+    weak var owner: AnyObject?
+}

--- a/GoInto/ChooseFolerItem.swift
+++ b/GoInto/ChooseFolerItem.swift
@@ -8,22 +8,12 @@
 
 import Cocoa
 
-extension Selector {
-    static let selectFolder = #selector(ChooseFolerItem.selectFolder(_:))
-}
+let chooseFolerItemKey = "ChooseFolerItem"
 
-class ChooseFolerItem: 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 = .selectFolder
-        menuItem.target = self
-    }
-    
+extension ActionListener {
     @IBAction func selectFolder(_ sender: Any?) {
+        guard let item = owner as? ChooseFolerItem
+            else { return }
         let panel = NSOpenPanel()
         panel.canChooseDirectories = true
         panel.allowsMultipleSelection = false
@@ -36,10 +26,24 @@ class ChooseFolerItem: StatusItem {
         
         guard panel.runModal() == NSFileHandlingPanelOKButton,
             let url = panel.directoryURL else { return }
-        urlSelector(url)
+        item.urlSelector(url)
     }
+}
+
+extension Selector {
+    static let selectFolder = #selector(ActionListener.selectFolder(_:))
+}
+
+class ChooseFolerItem: StatusItem {
+    let menuItem = NSMenuItem()
+    let urlSelector: (URL) -> Void
+    let listener = ActionListener()
     
-    func validateMenuItem(_ menuItem: NSMenuItem) -> Bool {
-        return true
+    init(_ handler: @escaping ((URL) -> Void)) {
+        urlSelector = handler
+        menuItem.title = NSLocalizedString("Choose Folder", comment: "Choose Folder MenuItem")
+        menuItem.action = .selectFolder
+        menuItem.target = listener
+        listener.owner = self
     }
 }

--- a/GoInto/FolderItem.swift
+++ b/GoInto/FolderItem.swift
@@ -8,13 +8,22 @@
 
 import Cocoa
 
+extension ActionListener {
+    @IBAction func changeFolder(_ sender: Any?) {
+        guard let item = owner as? FolderItem
+            else { return }
+        item.set()
+    }
+}
+
 extension Selector {
-    static let changeFolder = #selector(FolderItem.changeFolder(_:))
+    static let changeFolder = #selector(ActionListener.changeFolder(_:))
 }
 
 class FolderItem: StatusItem {
     let url: URL
     let menuItem = NSMenuItem()
+    let listener = ActionListener()
     
     init(_ url: URL) {
         self.url = url
@@ -30,11 +39,8 @@ class FolderItem: StatusItem {
         menuItem.image = fitSize(work.icon(forFile: url.path))
         
         menuItem.action = .changeFolder
-        menuItem.target = self
-    }
-    
-    @IBAction func changeFolder(_ : Any?) {
-        set()
+        menuItem.target = listener
+        listener.owner = self
     }
     
     func set() {
@@ -62,15 +68,6 @@ class FolderItem: StatusItem {
             menuItem.state = NSOffState
         }
     }
-    
-    func validateMenuItem(_ menuItem: NSMenuItem) -> Bool {
-        return true
-    }
-}
-extension FolderItem: Equatable {
-    static func ==(lhs: FolderItem, rhs: FolderItem) -> Bool {
-        return lhs.url == rhs.url
-    }
 }
 
 func fitSize(_ image: NSImage) -> NSImage {

--- a/GoInto/ImageTypeItem.swift
+++ b/GoInto/ImageTypeItem.swift
@@ -8,8 +8,20 @@
 
 import Cocoa
 
+
+let imageTypeItemKey = "ImageTypeItem"
+
+extension ActionListener {
+    @IBAction func selectType(_ sender: Any?) {
+        guard let imageTypeItem = owner as? ImageTypeItem,
+            let item = sender as? NSMenuItem,
+            let typeName = item.representedObject as? String
+            else { return }
+        imageTypeItem.set(typeName)
+    }
+}
 extension Selector {
-    static let selectType = #selector(ImageTypeItem.selectType(_:))
+    static let selectType = #selector(ActionListener.selectType(_:))
 }
 
 private func loadImageTypes() -> [String] {
@@ -22,8 +34,11 @@ private func loadImageTypes() -> [String] {
 class ImageTypeItem: StatusItem {
     let menuItem = NSMenuItem()
     let supportTypes = loadImageTypes()
+    let listener = ActionListener()
     
     init() {
+        listener.owner = self
+        
         menuItem.title = NSLocalizedString("Image Type", comment: "Image Type MenuItem")
         
         let ws = NSWorkspace.shared()
@@ -35,7 +50,7 @@ class ImageTypeItem: StatusItem {
                 let item = NSMenuItem()
                 item.title = ws.localizedDescription(forType: $0) ?? "H O G E"
                 item.action = .selectType
-                item.target = self
+                item.target = listener
                 item.representedObject = ws.preferredFilenameExtension(forType: $0)
                 return item
             }
@@ -74,14 +89,7 @@ class ImageTypeItem: StatusItem {
         return type
     }
     
-    @IBAction func selectType(_ sender: Any?) {
-        guard let item = sender as? NSMenuItem,
-            let typeName = item.representedObject as? String
-            else { return }
-        set(typeName)
-    }
-    
-    private func set(_ typeName: String) {
+    fileprivate func set(_ typeName: String) {
         DispatchQueue(label: "Launch defaults").async {
             let task = Process()
             task.launchPath = "/usr/bin/defaults"

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