aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DWA140Menu.xcodeproj/project.pbxproj6
-rw-r--r--DWA140Menu/AppDelegate.swift13
-rw-r--r--DWA140Menu/Assets.xcassets/WifiError.imageset/Contents.json24
-rw-r--r--DWA140Menu/DWA140Menu.entitlements12
4 files changed, 20 insertions, 35 deletions
diff --git a/DWA140Menu.xcodeproj/project.pbxproj b/DWA140Menu.xcodeproj/project.pbxproj
index 9fb929d..83de658 100644
--- a/DWA140Menu.xcodeproj/project.pbxproj
+++ b/DWA140Menu.xcodeproj/project.pbxproj
@@ -54,6 +54,7 @@
/* Begin PBXFileReference section */
E768B81321D4596400A25D3B /* Defaults.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Defaults.framework; sourceTree = "<group>"; };
E768B81421D4596500A25D3B /* LaunchAtLogin.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = LaunchAtLogin.framework; sourceTree = "<group>"; };
+ E7D7967F21DEB6AB0004055A /* DWA140Menu.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DWA140Menu.entitlements; sourceTree = "<group>"; };
E7DA7E46213DD9DD00931016 /* DWA140Menu.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DWA140Menu.app; sourceTree = BUILT_PRODUCTS_DIR; };
E7DA7E49213DD9DD00931016 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
E7DA7E4B213DD9DD00931016 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -128,6 +129,7 @@
isa = PBXGroup;
children = (
E7DA7E7A213DF43100931016 /* DWA140Menu-Bridging-Header.h */,
+ E7D7967F21DEB6AB0004055A /* DWA140Menu.entitlements */,
E768B81321D4596400A25D3B /* Defaults.framework */,
E768B81421D4596500A25D3B /* LaunchAtLogin.framework */,
E7DA7E49213DD9DD00931016 /* AppDelegate.swift */,
@@ -390,7 +392,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.13;
+ MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
@@ -445,7 +447,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- MACOSX_DEPLOYMENT_TARGET = 10.13;
+ MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
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>
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-13 09:12:08 +0000