Merge branch 'master' of bitbucket.org:felixfoertsch/liquidmenu

2019-01-08 12:07:15 +01:00
parent a863d6d5a9 7de8fd2c2b
commit fdf0eab86e
12 changed files with 1032 additions and 16 deletions
@@ -10,6 +10,8 @@ import Cocoa

 class StatusBarController: NSObject, NSMenuItemValidation {
    
+    @IBOutlet weak var matchView: MatchView!
+    
    func validateMenuItem(_ menuItem: NSMenuItem) -> Bool {
        return true
    }
@@ -54,11 +56,16 @@ class StatusBarController: NSObject, NSMenuItemValidation {
                }
            }
            
+<<<<<<< HEAD
            if let matches = self.matchesAPI.fetchMatches(for: "counterstrike") {
+=======
+            if let matches = self.matchesAPI.fetchMatches(for: "starcraft2") {
+>>>>>>> 7de8fd2c2bd41baf8480580a6392c8c7869919a6
                for match in matches {
                    let newItem = MatchMenuItem.init(for: match, action: #selector(self.openStreamLink))
                    newItem.tag = 1
                    newItem.target = self
+                    newItem.view = matchView
                    self.statusBar.addItem(newItem)
                }
            } else {