diff options
| author | FivePixels <o5pxels@gmail.com> | 2019-01-03 15:47:17 -0600 |
|---|---|---|
| committer | FivePixels <o5pxels@gmail.com> | 2019-01-03 15:47:17 -0600 |
| commit | 9440d2d7e4ac4a24872518ececa3b942eceb88c0 (patch) | |
| tree | 0d8f90e4e7f2fafe087c4de33ed9d817275d92bb /DWA140Menu | |
| parent | d77e14b07f5afb81c0b1dfc6911e209d63e17d99 (diff) | |
| download | dwa140shortcut-9440d2d7e4ac4a24872518ececa3b942eceb88c0.tar.xz dwa140shortcut-9440d2d7e4ac4a24872518ececa3b942eceb88c0.zip | |
LaunchAtLogin framework is broken, it looks like automagical opening on login will have to wait :/ I fixed a few more things tho
Diffstat (limited to 'DWA140Menu')
| -rw-r--r-- | DWA140Menu/AppDelegate.swift | 13 | ||||
| -rw-r--r-- | DWA140Menu/Assets.xcassets/WifiError.imageset/Contents.json | 24 | ||||
| -rw-r--r-- | DWA140Menu/DWA140Menu.entitlements | 12 |
3 files changed, 16 insertions, 33 deletions
diff --git a/DWA140Menu/AppDelegate.swift b/DWA140Menu/AppDelegate.swift index 155ed9a..aacb415 100644 --- a/DWA140Menu/AppDelegate.swift +++ b/DWA140Menu/AppDelegate.swift @@ -60,6 +60,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele @objc func toggleLaunchAtLogin() { let launchAtLogin = defaults[.launchAtLogin] + launchAtLoginMenuItem.title = "Start at Login" launchAtLoginMenuItem.state = !launchAtLogin ? .on : .off LaunchAtLogin.isEnabled = !launchAtLogin defaults[.launchAtLogin] = !launchAtLogin @@ -90,8 +91,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele func constructMenu() { let applicationMenu = NSMenu() - applicationMenu.addItem(NSMenuItem(title: "DWA-140 Shortcut (Source)", action: #selector(openSourcePage), keyEquivalent: "")) - launchAtLoginMenuItem = NSMenuItem(title: "Launch Application on Login", action: #selector(toggleLaunchAtLogin), keyEquivalent: "") + applicationMenu.addItem(NSMenuItem(title: "DWA-140 Shortcut", action: #selector(openSourcePage), keyEquivalent: "")) + launchAtLoginMenuItem = NSMenuItem(title: "Start at Login", action: #selector(self.toggleLaunchAtLogin), keyEquivalent: "") launchAtLoginMenuItem.state = defaults[.launchAtLogin] ? .on : .off applicationMenu.addItem(launchAtLoginMenuItem) applicationMenu.addItem(NSMenuItem.separator()) @@ -111,13 +112,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele DispatchQueue.main.async { self.setStatusIcon(icon: "WiFiConnected") } - return "USB WiFi is connected. [Interface: en0]" - } else if getInterface() == "en1" { - isDeviceInterfaceConnected = true - DispatchQueue.main.async { - self.setStatusIcon(icon: "WiFiConnected") - } - return "USB WiFi is connected. [Interface: en1]" + return "USB WiFi is connected." } else { isDeviceInterfaceConnected = false DispatchQueue.main.async { diff --git a/DWA140Menu/Assets.xcassets/WifiError.imageset/Contents.json b/DWA140Menu/Assets.xcassets/WifiError.imageset/Contents.json deleted file mode 100644 index 3f18ed4..0000000 --- a/DWA140Menu/Assets.xcassets/WifiError.imageset/Contents.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "AirPortError-1_55A54008AD1BA589AA210D2629C1DF41_0.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - }, - "properties" : { - "template-rendering-intent" : "template" - } -}
\ No newline at end of file diff --git a/DWA140Menu/DWA140Menu.entitlements b/DWA140Menu/DWA140Menu.entitlements new file mode 100644 index 0000000..625af03 --- /dev/null +++ b/DWA140Menu/DWA140Menu.entitlements @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>com.apple.security.app-sandbox</key> + <true/> + <key>com.apple.security.files.user-selected.read-only</key> + <true/> + <key>com.apple.security.network.client</key> + <true/> +</dict> +</plist> |