add optionals as return value

This commit is contained in:
Felix Förtsch
2018-10-11 12:58:02 +02:00
parent f09ee87b45
commit f3950041c7
7 changed files with 79 additions and 67 deletions
+10 -9
View File
@@ -8,7 +8,7 @@
import Cocoa
class StatusBarController: NSObject {
class StatusBarController: NSObject, NSMenuDelegate {
@IBOutlet weak var statusBar: NSMenu!
let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
let matchesAPI = MatchesAPI()
@@ -27,17 +27,18 @@ class StatusBarController: NSObject {
statusBar.addItem(withTitle: "Refresh", action: #selector(generateMenu), keyEquivalent: "")
statusBar.addItem(NSMenuItem.separator())
matches = matchesAPI.fetchMatches(for: "dota2")
for match in matches {
let myItem = NSMenuItem(title: match.league, action: nil, keyEquivalent: "")
statusBar.addItem(myItem)
if let matches = matchesAPI.fetchMatches(for: "dota2") {
for match in matches {
let myItem = NSMenuItem(title: match.league, action: nil, keyEquivalent: "")
statusBar.addItem(myItem)
}
statusBar.addItem(NSMenuItem.separator())
statusBar.addItem(withTitle: "Quit", action: #selector(quitClicked), keyEquivalent: "")
}
statusBar.addItem(NSMenuItem.separator())
statusBar.addItem(withTitle: "Quit", action: #selector(quitClicked), keyEquivalent: "")
}
@objc func quitClicked() {
@objc func quitClicked(_ sender: NSMenuItem) {
NSApplication.shared.terminate(self)
}
}