From ed4852501935cf85ebded5f58d0092925e38082a Mon Sep 17 00:00:00 2001 From: FivePixels Date: Sat, 5 Jan 2019 17:41:03 -0600 Subject: Icons! A window! And many changes :) --- DWA140Menu.xcodeproj/project.pbxproj | 24 -- DWA140Menu/AppDelegate.swift | 37 +-- .../AppIcon.appiconset/Contents.json | 29 +- .../AppIcon.appiconset/icon-1024.png | Bin 561535 -> 0 bytes .../AppIcon.appiconset/icon_128x128.png | Bin 0 -> 17351 bytes .../AppIcon.appiconset/icon_128x128@2x.png | Bin 0 -> 43949 bytes .../AppIcon.appiconset/icon_16x16.png | Bin 0 -> 1823 bytes .../AppIcon.appiconset/icon_16x16@2x.png | Bin 0 -> 3233 bytes .../AppIcon.appiconset/icon_256x256.png | Bin 0 -> 43949 bytes .../AppIcon.appiconset/icon_256x256@2x.png | Bin 0 -> 136129 bytes .../AppIcon.appiconset/icon_32x32.png | Bin 0 -> 3233 bytes .../AppIcon.appiconset/icon_32x32@2x.png | Bin 0 -> 6940 bytes .../AppIcon.appiconset/icon_512x512.png | Bin 0 -> 136129 bytes .../AppIcon.appiconset/icon_512x512@2x.png | Bin 0 -> 475020 bytes .../ApplicationIcon.imageset/Contents.json | 22 ++ .../ApplicationIcon.imageset/icon_512x512.png | Bin 0 -> 136129 bytes .../ApplicationIcon.imageset/icon_512x512@2x.png | Bin 0 -> 475020 bytes DWA140Menu/Base.lproj/Main.storyboard | 351 +++++++++++++++++++++ DWA140Menu/Defaults.framework/Defaults | 1 - DWA140Menu/Defaults.framework/Headers | 1 - DWA140Menu/Defaults.framework/Modules | 1 - DWA140Menu/Defaults.framework/Resources | 1 - DWA140Menu/Defaults.framework/Versions/A/Defaults | Bin 45468 -> 0 bytes .../Versions/A/Headers/Defaults-Swift.h | 189 ----------- .../A/Modules/Defaults.swiftmodule/x86_64.swiftdoc | Bin 380 -> 0 bytes .../Defaults.swiftmodule/x86_64.swiftmodule | Bin 26812 -> 0 bytes .../Versions/A/Modules/module.modulemap | 4 - .../Versions/A/Resources/Info.plist | 51 --- DWA140Menu/Defaults.framework/Versions/Current | 1 - DWA140Menu/ViewController.swift | 60 +++- 30 files changed, 452 insertions(+), 320 deletions(-) delete mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon-1024.png create mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_128x128.png create mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png create mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_16x16.png create mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png create mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_256x256.png create mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png create mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_32x32.png create mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png create mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_512x512.png create mode 100644 DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png create mode 100644 DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/Contents.json create mode 100644 DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/icon_512x512.png create mode 100644 DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/icon_512x512@2x.png delete mode 120000 DWA140Menu/Defaults.framework/Defaults delete mode 120000 DWA140Menu/Defaults.framework/Headers delete mode 120000 DWA140Menu/Defaults.framework/Modules delete mode 120000 DWA140Menu/Defaults.framework/Resources delete mode 100755 DWA140Menu/Defaults.framework/Versions/A/Defaults delete mode 100644 DWA140Menu/Defaults.framework/Versions/A/Headers/Defaults-Swift.h delete mode 100644 DWA140Menu/Defaults.framework/Versions/A/Modules/Defaults.swiftmodule/x86_64.swiftdoc delete mode 100644 DWA140Menu/Defaults.framework/Versions/A/Modules/Defaults.swiftmodule/x86_64.swiftmodule delete mode 100644 DWA140Menu/Defaults.framework/Versions/A/Modules/module.modulemap delete mode 100644 DWA140Menu/Defaults.framework/Versions/A/Resources/Info.plist delete mode 120000 DWA140Menu/Defaults.framework/Versions/Current diff --git a/DWA140Menu.xcodeproj/project.pbxproj b/DWA140Menu.xcodeproj/project.pbxproj index 83de658..37c5db8 100644 --- a/DWA140Menu.xcodeproj/project.pbxproj +++ b/DWA140Menu.xcodeproj/project.pbxproj @@ -7,10 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - E768B81C21D4794F00A25D3B /* Defaults.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E768B81321D4596400A25D3B /* Defaults.framework */; }; - E768B81D21D4794F00A25D3B /* Defaults.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E768B81321D4596400A25D3B /* Defaults.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - E768B81E21D4794F00A25D3B /* LaunchAtLogin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E768B81421D4596500A25D3B /* LaunchAtLogin.framework */; }; - E768B81F21D4794F00A25D3B /* LaunchAtLogin.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E768B81421D4596500A25D3B /* LaunchAtLogin.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; E7DA7E4A213DD9DD00931016 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7DA7E49213DD9DD00931016 /* AppDelegate.swift */; }; E7DA7E4C213DD9DD00931016 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7DA7E4B213DD9DD00931016 /* ViewController.swift */; }; E7DA7E4E213DD9DD00931016 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E7DA7E4D213DD9DD00931016 /* Assets.xcassets */; }; @@ -36,23 +32,7 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - E768B82021D4794F00A25D3B /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - E768B81F21D4794F00A25D3B /* LaunchAtLogin.framework in Embed Frameworks */, - E768B81D21D4794F00A25D3B /* Defaults.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ - E768B81321D4596400A25D3B /* Defaults.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Defaults.framework; sourceTree = ""; }; E768B81421D4596500A25D3B /* LaunchAtLogin.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = LaunchAtLogin.framework; sourceTree = ""; }; E7D7967F21DEB6AB0004055A /* DWA140Menu.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DWA140Menu.entitlements; sourceTree = ""; }; E7DA7E46213DD9DD00931016 /* DWA140Menu.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DWA140Menu.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -75,8 +55,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E768B81E21D4794F00A25D3B /* LaunchAtLogin.framework in Frameworks */, - E768B81C21D4794F00A25D3B /* Defaults.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -130,7 +108,6 @@ children = ( E7DA7E7A213DF43100931016 /* DWA140Menu-Bridging-Header.h */, E7D7967F21DEB6AB0004055A /* DWA140Menu.entitlements */, - E768B81321D4596400A25D3B /* Defaults.framework */, E768B81421D4596500A25D3B /* LaunchAtLogin.framework */, E7DA7E49213DD9DD00931016 /* AppDelegate.swift */, E7DA7E4B213DD9DD00931016 /* ViewController.swift */, @@ -169,7 +146,6 @@ E7DA7E42213DD9DD00931016 /* Sources */, E7DA7E43213DD9DD00931016 /* Frameworks */, E7DA7E44213DD9DD00931016 /* Resources */, - E768B82021D4794F00A25D3B /* Embed Frameworks */, ); buildRules = ( ); diff --git a/DWA140Menu/AppDelegate.swift b/DWA140Menu/AppDelegate.swift index 28f62d1..d7ac742 100644 --- a/DWA140Menu/AppDelegate.swift +++ b/DWA140Menu/AppDelegate.swift @@ -8,27 +8,28 @@ import Cocoa import Foundation -import Defaults -import LaunchAtLogin import SystemConfiguration -extension Defaults.Keys { - static let launchAtLogin = Defaults.Key("launchAtLogin", default: false) -} - let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength) -var launchAtLoginMenuItem = NSMenuItem() var interfaceName : String = "" let dynRef = SCDynamicStoreCreate(kCFAllocatorSystemDefault, "iked" as CFString, nil, nil) let ipv4key = SCDynamicStoreCopyValue(dynRef, "State:/Network/Global/IPv4" as CFString) var isDeviceInterfaceConnected : Bool? -var deviceIPAddress : String = "" +let applicationStoryboard = NSStoryboard(name: "Main", bundle: nil) +let mainWindowController = applicationStoryboard.instantiateController(withIdentifier: "MainWindowController") as! NSWindowController +let mainViewController = applicationStoryboard.instantiateController(withIdentifier: "MainViewController") as! NSViewController +let tabViewController = applicationStoryboard.instantiateController(withIdentifier: "TabViewController") as! NSTabViewController @NSApplicationMain class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDelegate { - @objc func openSourcePage() { - NSWorkspace.shared.open((URL(string:"https://github.com/fivepixels/dwa140shortcut") ?? nil)!) + @objc func openApplicationWindow() { + if mainWindowController.window?.isVisible == false { + mainWindowController.showWindow(self) + NSApp.activate(ignoringOtherApps: true) + } else { + NSApp.activate(ignoringOtherApps: true) + } } @objc func openDWAPreferencePane() { @@ -58,17 +59,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele exit(0) } - @objc func toggleLaunchAtLogin() { - let launchAtLogin = defaults[.launchAtLogin] - launchAtLoginMenuItem.title = "Start at Login" - launchAtLoginMenuItem.state = !launchAtLogin ? .on : .off - LaunchAtLogin.isEnabled = !launchAtLogin - defaults[.launchAtLogin] = !launchAtLogin - if !launchAtLogin { - showNotification(title: "DWA-140 Shortcut", withText: "This application now opens as soon as you login. 😀") - } - } - @objc func showNotification(title: String, withText: String) -> Void { let notification = NSUserNotification() notification.title = title @@ -91,10 +81,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele func constructMenu() { let applicationMenu = NSMenu() - 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(title: "DWA-140 Shortcut", action: #selector(openApplicationWindow), keyEquivalent: "")) applicationMenu.addItem(NSMenuItem.separator()) applicationMenu.addItem(NSMenuItem(title: isInterfaceConnected(), action: nil, keyEquivalent: "")) applicationMenu.addItem(NSMenuItem.separator()) diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/Contents.json b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/Contents.json index 307be1e..7cd4f8e 100644 --- a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,54 +1,63 @@ { "images" : [ { - "idiom" : "mac", "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16@2x.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32@2x.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128@2x.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256@2x.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "512x512", + "idiom" : "mac", + "filename" : "icon_512x512.png", "scale" : "1x" }, { "size" : "512x512", "idiom" : "mac", - "filename" : "icon-1024.png", + "filename" : "icon_512x512@2x.png", "scale" : "2x" } ], diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon-1024.png deleted file mode 100644 index 3f5aed6..0000000 Binary files a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon-1024.png and /dev/null differ diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_128x128.png new file mode 100644 index 0000000..3888958 Binary files /dev/null and b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png new file mode 100644 index 0000000..4e54d2e Binary files /dev/null and b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_16x16.png new file mode 100644 index 0000000..c7bc070 Binary files /dev/null and b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png new file mode 100644 index 0000000..483a134 Binary files /dev/null and b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_256x256.png new file mode 100644 index 0000000..4e54d2e Binary files /dev/null and b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png new file mode 100644 index 0000000..905bf9d Binary files /dev/null and b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_32x32.png new file mode 100644 index 0000000..483a134 Binary files /dev/null and b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png new file mode 100644 index 0000000..0cde3d1 Binary files /dev/null and b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_512x512.png new file mode 100644 index 0000000..905bf9d Binary files /dev/null and b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png new file mode 100644 index 0000000..c494598 Binary files /dev/null and b/DWA140Menu/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/Contents.json b/DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/Contents.json new file mode 100644 index 0000000..599d2dd --- /dev/null +++ b/DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "icon_512x512.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "icon_512x512@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/icon_512x512.png b/DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/icon_512x512.png new file mode 100644 index 0000000..905bf9d Binary files /dev/null and b/DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/icon_512x512.png differ diff --git a/DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/icon_512x512@2x.png b/DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/icon_512x512@2x.png new file mode 100644 index 0000000..c494598 Binary files /dev/null and b/DWA140Menu/Assets.xcassets/ApplicationIcon.imageset/icon_512x512@2x.png differ diff --git a/DWA140Menu/Base.lproj/Main.storyboard b/DWA140Menu/Base.lproj/Main.storyboard index 409c011..c98ce56 100644 --- a/DWA140Menu/Base.lproj/Main.storyboard +++ b/DWA140Menu/Base.lproj/Main.storyboard @@ -3,6 +3,7 @@ + @@ -659,5 +660,355 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +YnBsaXN0MDDUAQIDBAUGVVZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK8QEgcI +ExQZHh8jJCsuMTtDR0tPUlUkbnVsbNUJCgsMDQ4PEBESVk5TU2l6ZVYkY2xhc3NcTlNJbWFnZUZsYWdz +Vk5TUmVwc1dOU0NvbG9ygAKAERIgwwAAgAOAC1Z7MSwgMX3SFQoWGFpOUy5vYmplY3RzoReABIAK0hUK +Gh2iGxyABYAGgAkQANIgCiEiXxAUTlNUSUZGUmVwcmVzZW50YXRpb26AB4AITxEIxE1NACoAAAAKAAAA +EAEAAAMAAAABAAEAAAEBAAMAAAABAAEAAAECAAMAAAACAAgACAEDAAMAAAABAAEAAAEGAAMAAAABAAEA +AAEKAAMAAAABAAEAAAERAAQAAAABAAAACAESAAMAAAABAAEAAAEVAAMAAAABAAIAAAEWAAMAAAABAAEA +AAEXAAQAAAABAAAAAgEcAAMAAAABAAEAAAEoAAMAAAABAAIAAAFSAAMAAAABAAEAAAFTAAMAAAACAAEA +AYdzAAcAAAf0AAAA0AAAAAAAAAf0YXBwbAIgAABtbnRyR1JBWVhZWiAH0AACAA4ADAAAAABhY3NwQVBQ +TAAAAABub25lAAAAAAAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLWFwcGwAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVkZXNjAAAAwAAAAG9kc2NtAAABMAAABmZjcHJ0AAAH +mAAAADh3dHB0AAAH0AAAABRrVFJDAAAH5AAAAA5kZXNjAAAAAAAAABVHZW5lcmljIEdyYXkgUHJvZmls +ZQAAAAAAAAAAAAAAFUdlbmVyaWMgR3JheSBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAbWx1YwAAAAAAAAAfAAAADHNrU0sAAAAqAAABhGVuVVMAAAAoAAAB +rmNhRVMAAAAsAAAB1nZpVk4AAAAsAAACAnB0QlIAAAAqAAACLnVrVUEAAAAsAAACWGZyRlUAAAAqAAAC +hGh1SFUAAAAuAAACrnpoVFcAAAAQAAAC3G5iTk8AAAAsAAAC7GtvS1IAAAAYAAADGGNzQ1oAAAAkAAAD +MGhlSUwAAAAgAAADVHJvUk8AAAAkAAADdGRlREUAAAA6AAADmGl0SVQAAAAuAAAD0nN2U0UAAAAuAAAE +AHpoQ04AAAAQAAAELmphSlAAAAAWAAAEPmVsR1IAAAAkAAAEVHB0UE8AAAA4AAAEeG5sTkwAAAAqAAAE +sGVzRVMAAAAoAAAE2nRoVEgAAAAkAAAFAnRyVFIAAAAiAAAFJmZpRkkAAAAsAAAFSGhySFIAAAA6AAAF +dHBsUEwAAAA2AAAFrnJ1UlUAAAAmAAAF5GFyRUcAAAAoAAAGCmRhREsAAAA0AAAGMgBWAWEAZQBvAGIA +ZQBjAG4A/QAgAHMAaQB2AP0AIABwAHIAbwBmAGkAbABHAGUAbgBlAHIAaQBjACAARwByAGEAeQAgAFAA +cgBvAGYAaQBsAGUAUABlAHIAZgBpAGwAIABkAGUAIABnAHIAaQBzACAAZwBlAG4A6AByAGkAYwBDHqUA +dQAgAGgA7ABuAGgAIABNAOAAdQAgAHgA4QBtACAAQwBoAHUAbgBnAFAAZQByAGYAaQBsACAAQwBpAG4A +egBhACAARwBlAG4A6QByAGkAYwBvBBcEMAQzBDAEOwRMBD0EOAQ5ACAEPwRABD4ERAQwBDkEOwAgAEcA +cgBhAHkAUAByAG8AZgBpAGwAIABnAOkAbgDpAHIAaQBxAHUAZQAgAGcAcgBpAHMAwQBsAHQAYQBsAOEA +bgBvAHMAIABzAHoA/AByAGsAZQAgAHAAcgBvAGYAaQBskBp1KHBwlo6Ccl9pY8+P8ABHAGUAbgBlAHIA +aQBzAGsAIABnAHIA5QB0AG8AbgBlAHAAcgBvAGYAaQBsx3y8GAAgAEcAcgBhAHkAINUEuFzTDMd8AE8A +YgBlAGMAbgD9ACABYQBlAGQA/QAgAHAAcgBvAGYAaQBsBeQF6AXVBeQF2QXcACAARwByAGEAeQAgBdsF +3AXcBdkAUAByAG8AZgBpAGwAIABnAHIAaQAgAGcAZQBuAGUAcgBpAGMAQQBsAGwAZwBlAG0AZQBpAG4A +ZQBzACAARwByAGEAdQBzAHQAdQBmAGUAbgAtAFAAcgBvAGYAaQBsAFAAcgBvAGYAaQBsAG8AIABnAHIA +aQBnAGkAbwAgAGcAZQBuAGUAcgBpAGMAbwBHAGUAbgBlAHIAaQBzAGsAIABnAHIA5QBzAGsAYQBsAGUA +cAByAG8AZgBpAGxmbpAacHBepmPPj/Blh072TgCCLDCwMOwwpDDXMO0w1TChMKQw6wOTA7UDvQO5A7oD +zAAgA8ADwQO/A8YDrwO7ACADswO6A8EDuQBQAGUAcgBmAGkAbAAgAGcAZQBuAOkAcgBpAGMAbwAgAGQA +ZQAgAGMAaQBuAHoAZQBuAHQAbwBzAEEAbABnAGUAbQBlAGUAbgAgAGcAcgBpAGoAcwBwAHIAbwBmAGkA +ZQBsAFAAZQByAGYAaQBsACAAZwByAGkAcwAgAGcAZQBuAOkAcgBpAGMAbw5CDhsOIw5EDh8OJQ5MDioO +NQ5ADhcOMg4XDjEOSA4nDkQOGwBHAGUAbgBlAGwAIABHAHIAaQAgAFAAcgBvAGYAaQBsAGkAWQBsAGUA +aQBuAGUAbgAgAGgAYQByAG0AYQBhAHAAcgBvAGYAaQBpAGwAaQBHAGUAbgBlAHIAaQENAGsAaQAgAHAA +cgBvAGYAaQBsACAAcwBpAHYAaQBoACAAdABvAG4AbwB2AGEAVQBuAGkAdwBlAHIAcwBhAGwAbgB5ACAA +cAByAG8AZgBpAGwAIABzAHoAYQByAG8BWwBjAGkEHgQxBEkEOAQ5ACAEQQQ1BEAESwQ5ACAEPwRABD4E +RAQ4BDsETAZFBkQGQQAgBioGOQYxBkoGQQAgAEcAcgBhAHkAIAYnBkQGOQYnBkUARwBlAG4AZQByAGUA +bAAgAGcAcgDlAHQAbwBuAGUAYgBlAHMAawByAGkAdgBlAGwAcwBlAAB0ZXh0AAAAAENvcHlyaWdodCAy +MDA3IEFwcGxlIEluYy4sIGFsbCByaWdodHMgcmVzZXJ2ZWQuAFhZWiAAAAAAAADzUQABAAAAARbMY3Vy +dgAAAAAAAAABAc0AANIlJicoWiRjbGFzc25hbWVYJGNsYXNzZXNfEBBOU0JpdG1hcEltYWdlUmVwoycp +KlpOU0ltYWdlUmVwWE5TT2JqZWN00iUmLC1XTlNBcnJheaIsKtIlJi8wXk5TTXV0YWJsZUFycmF5oy8s +KtUyMzQ1CjY3ODk6V05TV2hpdGVcTlNDb21wb25lbnRzXE5TQ29sb3JTcGFjZV8QEk5TQ3VzdG9tQ29s +b3JTcGFjZUQwIDAAQzAgMBADgAyAENQ8PT4KP0BBQlROU0lEVU5TSUNDV05TTW9kZWwQCYANEACAD9JE +CkVGV05TLmRhdGFPERFoAAARaGFwcGwCAAAAbW50ckdSQVlYWVogB9wACAAXAA8ALgAPYWNzcEFQUEwA +AAAAbm9uZQAAAAAAAAAAAAAAAAAAAAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFZGVzYwAAAMAAAAB5ZHNjbQAAATwAAAfoY3BydAAACSQA +AAAjd3RwdAAACUgAAAAUa1RSQwAACVwAAAgMZGVzYwAAAAAAAAAfR2VuZXJpYyBHcmF5IEdhbW1hIDIu +MiBQcm9maWxlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG1sdWMAAAAAAAAAHwAAAAxza1NLAAAALgAAAYRk +YURLAAAAOAAAAbJjYUVTAAAAOAAAAep2aVZOAAAAQAAAAiJwdEJSAAAASgAAAmJ1a1VBAAAALAAAAqxm +ckZVAAAAPgAAAthodUhVAAAANAAAAxZ6aFRXAAAAHgAAA0puYk5PAAAAOgAAA2hjc0NaAAAAKAAAA6Jo +ZUlMAAAAJAAAA8ppdElUAAAATgAAA+5yb1JPAAAAKgAABDxkZURFAAAATgAABGZrb0tSAAAAIgAABLRz +dlNFAAAAOAAAAbJ6aENOAAAAHgAABNZqYUpQAAAAJgAABPRlbEdSAAAAKgAABRpwdFBPAAAAUgAABURu +bE5MAAAAQAAABZZlc0VTAAAATAAABdZ0aFRIAAAAMgAABiJ0clRSAAAAJAAABlRmaUZJAAAARgAABnho +ckhSAAAAPgAABr5wbFBMAAAASgAABvxydVJVAAAAOgAAB0ZlblVTAAAAPAAAB4BhckVHAAAALAAAB7wA +VgFhAGUAbwBiAGUAYwBuAOEAIABzAGkAdgDhACAAZwBhAG0AYQAgADIALAAyAEcAZQBuAGUAcgBpAHMA +awAgAGcAcgDlACAAMgAsADIAIABnAGEAbQBtAGEAcAByAG8AZgBpAGwARwBhAG0AbQBhACAAZABlACAA +ZwByAGkAcwBvAHMAIABnAGUAbgDoAHIAaQBjAGEAIAAyAC4AMgBDHqUAdQAgAGgA7ABuAGgAIABNAOAA +dQAgAHgA4QBtACAAQwBoAHUAbgBnACAARwBhAG0AbQBhACAAMgAuADIAUABlAHIAZgBpAGwAIABHAGUA +bgDpAHIAaQBjAG8AIABkAGEAIABHAGEAbQBhACAAZABlACAAQwBpAG4AegBhAHMAIAAyACwAMgQXBDAE +MwQwBDsETAQ9BDAAIABHAHIAYQB5AC0EMwQwBDwEMAAgADIALgAyAFAAcgBvAGYAaQBsACAAZwDpAG4A +6QByAGkAcQB1AGUAIABnAHIAaQBzACAAZwBhAG0AbQBhACAAMgAsADIAwQBsAHQAYQBsAOEAbgBvAHMA +IABzAHoA/AByAGsAZQAgAGcAYQBtAG0AYQAgADIALgAykBp1KHBwlo5RSV6mACAAMgAuADIAIIJyX2lj +z4/wAEcAZQBuAGUAcgBpAHMAawAgAGcAcgDlACAAZwBhAG0AbQBhACAAMgAsADIALQBwAHIAbwBmAGkA +bABPAGIAZQBjAG4A4QAgAWEAZQBkAOEAIABnAGEAbQBhACAAMgAuADIF0gXQBd4F1AAgBdAF5AXVBegA +IAXbBdwF3AXZACAAMgAuADIAUAByAG8AZgBpAGwAbwAgAGcAcgBpAGcAaQBvACAAZwBlAG4AZQByAGkA +YwBvACAAZABlAGwAbABhACAAZwBhAG0AbQBhACAAMgAsADIARwBhAG0AYQAgAGcAcgBpACAAZwBlAG4A +ZQByAGkAYwEDACAAMgAsADIAQQBsAGwAZwBlAG0AZQBpAG4AZQBzACAARwByAGEAdQBzAHQAdQBmAGUA +bgAtAFAAcgBvAGYAaQBsACAARwBhAG0AbQBhACAAMgAsADLHfLwYACDWjMDJACCsELnIACAAMgAuADIA +INUEuFzTDMd8Zm6QGnBwXqZ8+2VwACAAMgAuADIAIGPPj/Blh072TgCCLDCwMOwwpDCsMPMw3gAgADIA +LgAyACAw1zDtMNUwoTCkMOsDkwO1A70DuQO6A8wAIAOTA7oDwQO5ACADkwOsA7wDvAOxACAAMgAuADIA +UABlAHIAZgBpAGwAIABnAGUAbgDpAHIAaQBjAG8AIABkAGUAIABjAGkAbgB6AGUAbgB0AG8AcwAgAGQA +YQAgAEcAYQBtAG0AYQAgADIALAAyAEEAbABnAGUAbQBlAGUAbgAgAGcAcgBpAGoAcwAgAGcAYQBtAG0A +YQAgADIALAAyAC0AcAByAG8AZgBpAGUAbABQAGUAcgBmAGkAbAAgAGcAZQBuAOkAcgBpAGMAbwAgAGQA +ZQAgAGcAYQBtAG0AYQAgAGQAZQAgAGcAcgBpAHMAZQBzACAAMgAsADIOIw4xDgcOKg41DkEOAQ4hDiEO +Mg5ADgEOIw4iDkwOFw4xDkgOJw5EDhsAIAAyAC4AMgBHAGUAbgBlAGwAIABHAHIAaQAgAEcAYQBtAGEA +IAAyACwAMgBZAGwAZQBpAG4AZQBuACAAaABhAHIAbQBhAGEAbgAgAGcAYQBtAG0AYQAgADIALAAyACAA +LQBwAHIAbwBmAGkAaQBsAGkARwBlAG4AZQByAGkBDQBrAGkAIABHAHIAYQB5ACAARwBhAG0AbQBhACAA +MgAuADIAIABwAHIAbwBmAGkAbABVAG4AaQB3AGUAcgBzAGEAbABuAHkAIABwAHIAbwBmAGkAbAAgAHMA +egBhAHIAbwFbAGMAaQAgAGcAYQBtAG0AYQAgADIALAAyBB4EMQRJBDAETwAgBEEENQRABDAETwAgBDME +MAQ8BDwEMAAgADIALAAyAC0EPwRABD4ERAQ4BDsETABHAGUAbgBlAHIAaQBjACAARwByAGEAeQAgAEcA +YQBtAG0AYQAgADIALgAyACAAUAByAG8AZgBpAGwAZQY6BicGRQYnACAAMgAuADIAIAZEBkgGRgAgBjEG +RQYnBi8GSgAgBjkGJwZFdGV4dAAAAABDb3B5cmlnaHQgQXBwbGUgSW5jLiwgMjAxMgAAWFlaIAAAAAAA +APNRAAEAAAABFsxjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQA +WQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA +8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEB +uQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsEC +ywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAE +LQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF +5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH ++AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQK +agqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYN +QA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQ +fhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYU +JxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsY +QBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMc +zBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEh +ziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgn +SSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwt +QS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38z +uDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6 +sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5C +MEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBK +N0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxS +x1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb +5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1l +kmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv +0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6 +pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauG +DoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiS +EZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCe +rp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr +6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5 +wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/I +Pci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjX +XNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbn +H+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3 +ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//4AO0iUmSEldTlNNdXRhYmxlRGF0YaNISipWTlNE +YXRh0iUmTE1cTlNDb2xvclNwYWNlok4qXE5TQ29sb3JTcGFjZdIlJlBRV05TQ29sb3KiUCrSJSZTVFdO +U0ltYWdlolMqXxAPTlNLZXllZEFyY2hpdmVy0VdYVHJvb3SAAQAIABEAGgAjAC0AMgA3AEwAUgBdAGQA +awB4AH8AhwCJAIsAkACSAJQAmwCgAKsArQCvALEAtgC5ALsAvQC/AMEAxgDdAN8A4QmpCa4JuQnCCdUJ +2QnkCe0J8gn6Cf0KAgoRChUKIAooCjUKQgpXClwKYApiCmQKZgpvCnQKegqCCoQKhgqICooKjwqXHAMc +BRwKHBgcHBwjHCgcNRw4HEUcShxSHFUcWhxiHGUcdxx6HH8AAAAAAAACAQAAAAAAAABZAAAAAAAAAAAA +AAAAAAAcgQ + + + diff --git a/DWA140Menu/Defaults.framework/Defaults b/DWA140Menu/Defaults.framework/Defaults deleted file mode 120000 index dcb2762..0000000 --- a/DWA140Menu/Defaults.framework/Defaults +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Defaults \ No newline at end of file diff --git a/DWA140Menu/Defaults.framework/Headers b/DWA140Menu/Defaults.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/DWA140Menu/Defaults.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/DWA140Menu/Defaults.framework/Modules b/DWA140Menu/Defaults.framework/Modules deleted file mode 120000 index 5736f31..0000000 --- a/DWA140Menu/Defaults.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/DWA140Menu/Defaults.framework/Resources b/DWA140Menu/Defaults.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/DWA140Menu/Defaults.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/DWA140Menu/Defaults.framework/Versions/A/Defaults b/DWA140Menu/Defaults.framework/Versions/A/Defaults deleted file mode 100755 index b4d1b19..0000000 Binary files a/DWA140Menu/Defaults.framework/Versions/A/Defaults and /dev/null differ diff --git a/DWA140Menu/Defaults.framework/Versions/A/Headers/Defaults-Swift.h b/DWA140Menu/Defaults.framework/Versions/A/Headers/Defaults-Swift.h deleted file mode 100644 index 38bd706..0000000 --- a/DWA140Menu/Defaults.framework/Versions/A/Headers/Defaults-Swift.h +++ /dev/null @@ -1,189 +0,0 @@ -// Generated by Apple Swift version 4.2.1 effective-4.1.50 (swiftlang-1000.11.42 clang-1000.11.45.1) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -typedef double swift_double4 __attribute__((__ext_vector_type__(4))); -typedef int swift_int2 __attribute__((__ext_vector_type__(2))); -typedef int swift_int3 __attribute__((__ext_vector_type__(3))); -typedef int swift_int4 __attribute__((__ext_vector_type__(4))); -typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); -typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); -typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); -#endif - -#if !defined(SWIFT_PASTE) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#if !defined(SWIFT_METATYPE) -# define SWIFT_METATYPE(X) Class -#endif -#if !defined(SWIFT_CLASS_PROPERTY) -# if __has_feature(objc_class_property) -# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ -# else -# define SWIFT_CLASS_PROPERTY(...) -# endif -#endif - -#if __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility))) -# else -# define SWIFT_ENUM_ATTR(_extensibility) -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type -# else -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility) -# endif -#endif -#if !defined(SWIFT_UNAVAILABLE) -# define SWIFT_UNAVAILABLE __attribute__((unavailable)) -#endif -#if !defined(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if __has_feature(modules) -@import Foundation; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="Defaults",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/DWA140Menu/Defaults.framework/Versions/A/Modules/Defaults.swiftmodule/x86_64.swiftdoc b/DWA140Menu/Defaults.framework/Versions/A/Modules/Defaults.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 0a87fad..0000000 Binary files a/DWA140Menu/Defaults.framework/Versions/A/Modules/Defaults.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/DWA140Menu/Defaults.framework/Versions/A/Modules/Defaults.swiftmodule/x86_64.swiftmodule b/DWA140Menu/Defaults.framework/Versions/A/Modules/Defaults.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index a044703..0000000 Binary files a/DWA140Menu/Defaults.framework/Versions/A/Modules/Defaults.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/DWA140Menu/Defaults.framework/Versions/A/Modules/module.modulemap b/DWA140Menu/Defaults.framework/Versions/A/Modules/module.modulemap deleted file mode 100644 index 3724766..0000000 --- a/DWA140Menu/Defaults.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -framework module Defaults { - header "Defaults-Swift.h" - requires objc -} diff --git a/DWA140Menu/Defaults.framework/Versions/A/Resources/Info.plist b/DWA140Menu/Defaults.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index d5977e5..0000000 --- a/DWA140Menu/Defaults.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,51 +0,0 @@ - - - - - BuildMachineOSBuild - 18C54 - CFBundleDevelopmentRegion - en - CFBundleExecutable - Defaults - CFBundleIdentifier - com.Defaults.Defaults-macOS - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Defaults - CFBundlePackageType - FMWK - CFBundleShortVersionString - 0.2.2 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 10B61 - DTPlatformVersion - GM - DTSDKBuild - 18B71 - DTSDKName - macosx10.14 - DTXcode - 1010 - DTXcodeBuild - 10B61 - NSHumanReadableCopyright - MIT License © Sindre Sorhus - UIDeviceFamily - - 1 - 2 - - - diff --git a/DWA140Menu/Defaults.framework/Versions/Current b/DWA140Menu/Defaults.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/DWA140Menu/Defaults.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/DWA140Menu/ViewController.swift b/DWA140Menu/ViewController.swift index 79d01c9..ea3fe55 100644 --- a/DWA140Menu/ViewController.swift +++ b/DWA140Menu/ViewController.swift @@ -2,26 +2,62 @@ // ViewController.swift // DWA140Menu // -// Created by Dylan Bolger on 9/3/18. // Copyright © 2018 Dylan Bolger. All rights reserved. // import Cocoa class ViewController: NSViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. + + @IBOutlet weak var versionLabel: NSTextField! + @IBOutlet weak var loginButton: NSButton! + @IBOutlet weak var awesomeSubtitle: NSTextField! + @IBOutlet weak var loginSubtitle: NSTextField! + + let defaults : UserDefaults = .standard + let delegate = NSApplication.shared.delegate as! AppDelegate + var loginLaunch = UserDefaults.standard.bool(forKey: "loginLaunch") + + override func viewDidAppear() { + loginButton.state = loginLaunch ? .on : .off + versionLabel.stringValue = "Version " + (Bundle.main.infoDictionary!["CFBundleShortVersionString"] as? String)! + if loginLaunch { + loginSubtitle.stringValue = "This application will launch when you login." + } } - - override var representedObject: Any? { - didSet { - // Update the view, if already loaded. + + func toggleLoginLaunch() { + loginButton.state = !loginLaunch ? .on : .off + defaults.set(!loginLaunch, forKey: "loginLaunch") + loginLaunch = !loginLaunch + } + + @IBAction func loginButtonPressed(_ sender: NSButton) { + toggleLoginLaunch() + if loginLaunch { + loginSubtitle.stringValue = "This application will launch when you login." + } else { + loginSubtitle.stringValue = "An even easier way to get connected, faster." } } - - + @IBAction func triedAwesome(_ sender: NSButton) { + // it's an invisible button on top of the disabled checkbox. + awesomeSubtitle.stringValue = "You can't change the fact that you're awesome." + DispatchQueue.main.asyncAfter(deadline: .now() + 3.0) { + self.awesomeSubtitle.stringValue = "It's just a fact." + } + } + + @IBAction func sourceButtonPressed(_ sender: NSButton) { + NSWorkspace.shared.open((URL(string:"https://github.com/fivepixels/dwa140shortcut") ?? nil)!) + } + + @IBAction func coffeePressed(_ sender: NSButton) { + NSWorkspace.shared.open((URL(string: "https://paypal.me/fivepixels") ?? nil)!) + } + + @IBAction func loveButtonPressed(_ sender: NSButton) { + NSWorkspace.shared.open((URL(string:"https://twitter.com/o5pxels") ?? nil)!) + } } -- cgit v1.2.3