diff --git a/LiquipediaMenu.xcworkspace/xcuserdata/felixfoertsch.xcuserdatad/UserInterfaceState.xcuserstate b/LiquipediaMenu.xcworkspace/xcuserdata/felixfoertsch.xcuserdatad/UserInterfaceState.xcuserstate index 7deccb8..184c3a5 100644 Binary files a/LiquipediaMenu.xcworkspace/xcuserdata/felixfoertsch.xcuserdatad/UserInterfaceState.xcuserstate and b/LiquipediaMenu.xcworkspace/xcuserdata/felixfoertsch.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/LiquipediaMenu.xcworkspace/xcuserdata/felixfoertsch.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/LiquipediaMenu.xcworkspace/xcuserdata/felixfoertsch.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 6194c28..ed9a9b4 100644 --- a/LiquipediaMenu.xcworkspace/xcuserdata/felixfoertsch.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/LiquipediaMenu.xcworkspace/xcuserdata/felixfoertsch.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2,22 +2,4 @@ - - - - - - diff --git a/LiquipediaMenu/Base.lproj/MainMenu.xib b/LiquipediaMenu/Base.lproj/MainMenu.xib index 30f16fc..6efd80f 100644 --- a/LiquipediaMenu/Base.lproj/MainMenu.xib +++ b/LiquipediaMenu/Base.lproj/MainMenu.xib @@ -15,11 +15,7 @@ - - - - - + @@ -682,9 +678,6 @@ - - - diff --git a/LiquipediaMenu/StatusBarController.swift b/LiquipediaMenu/StatusBarController.swift index 1115536..fb39144 100644 --- a/LiquipediaMenu/StatusBarController.swift +++ b/LiquipediaMenu/StatusBarController.swift @@ -9,6 +9,11 @@ import Cocoa class StatusBarController: NSObject, NSUserInterfaceValidations { + var statusBar = NSMenu() + let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength) + let matchesAPI = MatchesAPI() + var matches = [Match]() + func validateUserInterfaceItem(_ item: NSValidatedUserInterfaceItem) -> Bool { if let menuitem = item as? NSMenuItem { menuitem.state = .on @@ -16,12 +21,6 @@ class StatusBarController: NSObject, NSUserInterfaceValidations { return true } - - @IBOutlet weak var statusBar: NSMenu! - let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength) - let matchesAPI = MatchesAPI() - var matches = [Match]() - override func awakeFromNib() { // Set the icon of the statusbar item and put it into the statusbar let icon = NSImage(named: "statusBarIcon") @@ -42,7 +41,7 @@ class StatusBarController: NSObject, NSUserInterfaceValidations { } statusBar.addItem(NSMenuItem.separator()) - statusBar.addItem(withTitle: "Quit", action: #selector(quitClicked), keyEquivalent: "") + statusBar.addItem(withTitle: "Quit", action: #selector(self.quitClicked), keyEquivalent: "") } }