From 780d132e27ae9f5db14e8ea2c872610a2bc3e333 Mon Sep 17 00:00:00 2001 From: Matthias Neeracher Date: Mon, 14 Nov 2016 01:58:22 +0100 Subject: [PATCH] Fix IBAction signatures --- AVRsack/ASApplication.swift | 16 ++++++++-------- AVRsack/ASHardware.swift | 8 ++++---- AVRsack/ASProjDoc.swift | 36 ++++++++++++++++++------------------ AVRsack/ASSerialWin.swift | 8 ++++---- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/AVRsack/ASApplication.swift b/AVRsack/ASApplication.swift index f5b6e32..54fd56f 100644 --- a/AVRsack/ASApplication.swift +++ b/AVRsack/ASApplication.swift @@ -75,7 +75,7 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate { sketches = [String]() for sketchBook in UserDefaults.standard.object(forKey:"Sketchbooks") as! [String] { if FileManager.default.fileExists(atPath: sketchBook) { - ASSketchBook.addSketches(menu: menu, target: self, action: Selector(("openSketch:")), path: sketchBook, sketches: &sketches) + ASSketchBook.addSketches(menu: menu, target: self, action: #selector(ASApplication.openSketch(_:)), path: sketchBook, sketches: &sketches) } } case "Examples": @@ -83,7 +83,7 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate { examples = [String]() if let arduinoURL = NSWorkspace.shared().urlForApplication(withBundleIdentifier: "cc.arduino.Arduino") { let examplePath = arduinoURL.appendingPathComponent("Contents/Resources/Java/examples", isDirectory:true).path - ASSketchBook.addSketches(menu: menu, target: self, action: #selector(ASApplication.openExample(item:)), path: examplePath, sketches: &examples) + ASSketchBook.addSketches(menu: menu, target: self, action: #selector(ASApplication.openExample(_:)), path: examplePath, sketches: &examples) } case "Import Standard Library": menu.removeAllItems() @@ -97,14 +97,14 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate { menu.removeItem(at: 2) } for port in ASSerial.ports() { - menu.addItem(withTitle: port, action:Selector(("serialConnectMenu:")), keyEquivalent:"") + menu.addItem(withTitle: port, action:#selector(ASApplication.serialConnectMenu(_:)), keyEquivalent:"") } default: break } } - @IBAction func serialConnectMenu(port: NSMenuItem) { + @IBAction func serialConnectMenu(_ port: NSMenuItem) { ASSerialWin.showWindowWithPort(port: port.title) } @@ -148,14 +148,14 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate { } } - @IBAction func openSketch(item: NSMenuItem) { + @IBAction func openSketch(_ item: NSMenuItem) { let url = URL(fileURLWithPath: sketches[item.tag]) let doc = NSDocumentController.shared() doc.openDocument(withContentsOf: url, display: true) { (doc, alreadyOpen, error) -> Void in } } - @IBAction func openExample(item: NSMenuItem) { + @IBAction func openExample(_ item: NSMenuItem) { let url = NSURL(fileURLWithPath: examples[item.tag]) openTemplate(template: url.deletingLastPathComponent!, fromReadOnly:true) } @@ -199,7 +199,7 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate { } } - @IBAction func goToHelpPage(sender: AnyObject) { + @IBAction func goToHelpPage(_ sender: AnyObject) { let helpString: String switch sender.tag { case 0: @@ -211,7 +211,7 @@ class ASApplication: NSObject, NSApplicationDelegate, NSMenuDelegate { AHGotoPage(locBookName, helpString, nil) } - @IBAction func goToHelpURL(sender: AnyObject) { + @IBAction func goToHelpURL(_ sender: AnyObject) { let helpString: String switch sender.tag { case 0: diff --git a/AVRsack/ASHardware.swift b/AVRsack/ASHardware.swift index 068ac98..96d0cfc 100644 --- a/AVRsack/ASHardware.swift +++ b/AVRsack/ASHardware.swift @@ -177,24 +177,24 @@ class ASLibraries : NSObject { } func addStandardLibrariesToMenu(menu: NSMenu) { for (index,lib) in standardLib.enumerated() { - let menuItem = menu.addItem(withTitle: (lib as NSString).lastPathComponent, action: #selector(ASLibraries.importStandardLibrary(menuItem:)), keyEquivalent: "") + let menuItem = menu.addItem(withTitle: (lib as NSString).lastPathComponent, action: #selector(ASLibraries.importStandardLibrary(_:)), keyEquivalent: "") menuItem.target = self menuItem.tag = index } } func addContribLibrariesToMenu(menu: NSMenu) { for (index,lib) in contribLib.enumerated() { - let menuItem = menu.addItem(withTitle: (lib as NSString).lastPathComponent, action: #selector(ASLibraries.importContribLibrary(menuItem:)), keyEquivalent: "") + let menuItem = menu.addItem(withTitle: (lib as NSString).lastPathComponent, action: #selector(ASLibraries.importContribLibrary(_:)), keyEquivalent: "") menuItem.target = self menuItem.tag = index } } - @IBAction func importStandardLibrary(menuItem: AnyObject) { + @IBAction func importStandardLibrary(_ menuItem: AnyObject) { if let tag = (menuItem as? NSMenuItem)?.tag { NSApplication.shared().sendAction(#selector(ASProjDoc.importLibrary(_:)), to: nil, from: standardLib[tag]) } } - @IBAction func importContribLibrary(menuItem: AnyObject) { + @IBAction func importContribLibrary(_ menuItem: AnyObject) { if let tag = (menuItem as? NSMenuItem)?.tag { NSApplication.shared().sendAction(#selector(ASProjDoc.importLibrary(_:)), to: nil, from: contribLib[tag]) } diff --git a/AVRsack/ASProjDoc.swift b/AVRsack/ASProjDoc.swift index e72558a..1dab09d 100644 --- a/AVRsack/ASProjDoc.swift +++ b/AVRsack/ASProjDoc.swift @@ -667,14 +667,14 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa // MARK: Editor configuration - @IBAction func changeTheme(item: NSMenuItem) { + @IBAction func changeTheme(_ item: NSMenuItem) { currentTheme = ACETheme(rawValue: UInt(item.tag)) ?? .xcode editor.setTheme(currentTheme) UserDefaults.standard.set( ACEThemeNames.humanName(for: currentTheme), forKey: kThemeKey) updateChangeCount(.changeDone) } - @IBAction func changeKeyboardHandler(item: NSMenuItem) { + @IBAction func changeKeyboardHandler(_ item: NSMenuItem) { keyboardHandler = ACEKeyboardHandler(rawValue: UInt(item.tag))! UserDefaults.standard.set( ACEKeyboardHandlerNames.humanName(for: keyboardHandler), forKey: kBindingsKey) @@ -683,18 +683,18 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa override func validateUserInterfaceItem(_ anItem: NSValidatedUserInterfaceItem) -> Bool { if let menuItem = anItem as? NSMenuItem { - if menuItem.action == #selector(ASProjDoc.changeTheme(item:)) { + if menuItem.action == #selector(ASProjDoc.changeTheme(_:)) { menuItem.state = (UInt(menuItem.tag) == currentTheme.rawValue ? NSOnState : NSOffState) return true - } else if menuItem.action == #selector(ASProjDoc.changeKeyboardHandler(item:)) { + } else if menuItem.action == #selector(ASProjDoc.changeKeyboardHandler(_:)) { menuItem.state = (menuItem.tag == Int(keyboardHandler.rawValue) ? NSOnState : NSOffState) return true - } else if menuItem.action == #selector(ASProjDoc.serialConnect(sender:)) { + } else if menuItem.action == #selector(ASProjDoc.serialConnect(_:)) { menuItem.title = port return true - } else if menuItem.action == #selector(ASLibraries.importStandardLibrary(menuItem:)) || - menuItem.action == #selector(ASLibraries.importContribLibrary(menuItem:)) + } else if menuItem.action == #selector(ASLibraries.importStandardLibrary(_:)) || + menuItem.action == #selector(ASLibraries.importContribLibrary(_:)) { return mainEditor is ASFileItem } @@ -716,7 +716,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa } // MARK: Issues - @IBAction func jumpToIssue(sender: AnyObject) { + @IBAction func jumpToIssue(_ sender: AnyObject) { let direction : Int = (sender as! NSMenuItem).tag if editors.views(in: .bottom).count == 0 { editors.addView(auxEdit, in: .bottom) @@ -801,11 +801,11 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa switch menu.title { case "Boards": ASHardware.instance().buildBoardsMenu(menu: menu, recentBoards: recentBoards, - target: self, selector: #selector(ASProjDoc.selectBoard(item:))) + target: self, selector: #selector(ASProjDoc.selectBoard(_:))) boardTool.setTitle(selectedBoard) case "Programmers": ASHardware.instance().buildProgrammersMenu(menu: menu, recentProgrammers: recentProgrammers, - target: self, selector: #selector(ASProjDoc.selectProgrammer(item:))) + target: self, selector: #selector(ASProjDoc.selectProgrammer(_:))) progTool.setTitle(selectedProgrammer) default: break @@ -838,7 +838,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa } } - @IBAction func selectBoard(item: AnyObject) { + @IBAction func selectBoard(_ item: AnyObject) { selectedBoard = (item as! NSMenuItem).title } @@ -869,11 +869,11 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa } } - @IBAction func selectProgrammer(item: AnyObject) { + @IBAction func selectProgrammer(_ item: AnyObject) { selectedProgrammer = (item as! NSMenuItem).title } - @IBAction func selectPort(item: AnyObject) { + @IBAction func selectPort(_ item: AnyObject) { port = (item as! NSPopUpButton).titleOfSelectedItem! portTool.setTitle(port) } @@ -909,7 +909,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa return NSSet(objects: "hasValidPort", "hasUploadProtocol", "programmer") } - @IBAction func uploadProject(sender: AnyObject) { + @IBAction func uploadProject(_ sender: AnyObject) { builder.continuation = { self.selectNodeInOutline(selection: self.files.uploadLog) DispatchQueue.main.async(execute: { @@ -919,16 +919,16 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa buildProject(sender) } - @IBAction func uploadTerminal(sender: AnyObject) { + @IBAction func uploadTerminal(_: AnyObject) { builder.uploadProject(board: board, programmer:programmer, port:port, mode:.Interactive) } - @IBAction func burnBootloader(sender: AnyObject) { + @IBAction func burnBootloader(_: AnyObject) { self.selectNodeInOutline(selection: self.files.uploadLog) builder.uploadProject(board: board, programmer:programmer, port:port, mode:.BurnBootloader) } - @IBAction func disassembleProject(sender: AnyObject) { + @IBAction func disassembleProject(_ sender: AnyObject) { builder.continuation = { self.selectNodeInOutline(selection: self.files.disassembly) self.builder.disassembleProject(board: self.board) @@ -936,7 +936,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa buildProject(sender) } - @IBAction func serialConnect(sender: AnyObject) { + @IBAction func serialConnect(_: AnyObject) { ASSerialWin.showWindowWithPort(port: port) } } diff --git a/AVRsack/ASSerialWin.swift b/AVRsack/ASSerialWin.swift index d384a9c..df3b07c 100644 --- a/AVRsack/ASSerialWin.swift +++ b/AVRsack/ASSerialWin.swift @@ -235,7 +235,7 @@ class ASSerialWin: NSWindowController { // MARK: Editor configuration - @IBAction func changeTheme(item: NSMenuItem) { + @IBAction func changeTheme(_ item: NSMenuItem) { let userDefaults = UserDefaults.standard currentTheme = ACETheme(rawValue: UInt(item.tag)) ?? .xcode logView.setTheme(currentTheme) @@ -244,7 +244,7 @@ class ASSerialWin: NSWindowController { portDefaults["Theme"] = themeName updatePortDefaults() } - @IBAction func changeKeyboardHandler(item: NSMenuItem) { + @IBAction func changeKeyboardHandler(_ item: NSMenuItem) { keyboardHandler = ACEKeyboardHandler(rawValue: UInt(item.tag))! UserDefaults.standard.set( ACEKeyboardHandlerNames.humanName(for: keyboardHandler), forKey: "Bindings") @@ -253,10 +253,10 @@ class ASSerialWin: NSWindowController { func validateUserInterfaceItem(anItem: NSValidatedUserInterfaceItem) -> Bool { if let menuItem = anItem as? NSMenuItem { - if menuItem.action == Selector(("changeTheme:")) { + if menuItem.action == #selector(ASSerialWin.changeTheme(_:)) { menuItem.state = (UInt(menuItem.tag) == currentTheme.rawValue ? NSOnState : NSOffState) return true - } else if menuItem.action == Selector(("changeKeyboardHandler:")) { + } else if menuItem.action == #selector(ASSerialWin.changeKeyboardHandler(_:)) { menuItem.state = (menuItem.tag == Int(keyboardHandler.rawValue) ? NSOnState : NSOffState) return true }