From 5e58d9a7eccd36b14064d233a85398d8a46ca3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20F=C3=B6rtsch?= Date: Wed, 10 Oct 2018 17:43:55 +0200 Subject: [PATCH] add menu generator, current problem: disabled menu items --- LiquipediaMenu/Base.lproj/MainMenu.xib | 16 +--------------- LiquipediaMenu/StatusBarController.swift | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/LiquipediaMenu/Base.lproj/MainMenu.xib b/LiquipediaMenu/Base.lproj/MainMenu.xib index 189e8c3..37ce54e 100644 --- a/LiquipediaMenu/Base.lproj/MainMenu.xib +++ b/LiquipediaMenu/Base.lproj/MainMenu.xib @@ -682,21 +682,7 @@ - - - - - - - - - - - - - - - + diff --git a/LiquipediaMenu/StatusBarController.swift b/LiquipediaMenu/StatusBarController.swift index d775165..51075ee 100644 --- a/LiquipediaMenu/StatusBarController.swift +++ b/LiquipediaMenu/StatusBarController.swift @@ -15,19 +15,28 @@ class StatusBarController: NSObject { var matches = [Match]() override func awakeFromNib() { + // Set the icon of the statusbar item and put it into the statusbar let icon = NSImage(named: "statusBarIcon") icon?.isTemplate = true statusItem.image = icon statusItem.menu = statusBar + generateMenu() } - @IBAction func quitClicked(_ sender: NSMenuItem) { + @objc func generateMenu() { + statusBar.addItem(withTitle: "Refresh", action: #selector(generateMenu), keyEquivalent: "") + + matches = matchesAPI.fetchMatches(for: "dota2") + for match in matches { + let myItem = NSMenuItem(title: match.league, action: #selector(quitClicked), keyEquivalent: "") + statusBar.addItem(myItem) + } + + statusBar.addItem(withTitle: "Quit", action: #selector(quitClicked), keyEquivalent: "") + + } + + @objc func quitClicked() { NSApplication.shared.terminate(self) } - - @IBAction func request(_ sender: NSMenuItem) { - matches = matchesAPI.fetchMatches(for: "dota2") - } - - }