From 5a8600bb59862db9becada37452483e1a1d2e397 Mon Sep 17 00:00:00 2001
From: Ariver <ar@MacBook-Air.local>
Date: Thu, 14 May 2026 23:37:36 +0800
Subject: [PATCH] Release TagLauncher 5.7.5
---
Apptag/ApptagApp.swift | 335 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 279 insertions(+), 56 deletions(-)
diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index b572f20..db83bfe 100644
--- a/Apptag/ApptagApp.swift
+++ b/Apptag/ApptagApp.swift
@@ -12,7 +12,7 @@
Settings {
PreferencesView()
}
- .defaultSize(width: 660, height: 380)
+ .defaultSize(width: 880, height: 460)
}
}
@@ -24,7 +24,9 @@
}
final class AppDelegate: NSObject, NSApplicationDelegate {
- private var statusItem: NSStatusItem!
+ private static let showMenuBarIconKey = "showMenuBarIcon"
+
+ private var statusItem: NSStatusItem?
private var overlayWindow: NSWindow?
private var settingsWindow: NSWindow? // Track Settings window to keep it above overlay
private var hotkeyRef: EventHotKeyRef?
@@ -32,6 +34,7 @@
func applicationDidFinishLaunching(_ notification: Notification) {
L10n.setup()
+ setupDefaultPreferences()
migrateDefaultGroupName()
TagDatabase.seedDefaultTags()
let showDock = UserDefaults.standard.bool(forKey: "showDockIcon")
@@ -41,7 +44,8 @@
observeOtherWindows()
observeSettingsClose()
observeEditMode()
- observeDockSetting()
+ observeChromeSettings()
+ observeLanguageChanges()
setupLaunchAtLogin()
}
@@ -69,20 +73,40 @@
// User has set a custom name — keep it
}
- /// Observe Show in Dock changes so it takes effect immediately.
- private func observeDockSetting() {
+ private func setupDefaultPreferences() {
+ if UserDefaults.standard.object(forKey: Self.showMenuBarIconKey) == nil {
+ UserDefaults.standard.set(true, forKey: Self.showMenuBarIconKey)
+ }
+ }
+
+ /// Observe Dock/menu-bar visibility changes so they take effect immediately.
+ private func observeChromeSettings() {
NotificationCenter.default.addObserver(
forName: UserDefaults.didChangeNotification,
object: nil, queue: .main
- ) { _ in
+ ) { [weak self] _ in
let show = UserDefaults.standard.bool(forKey: "showDockIcon")
NSApp.setActivationPolicy(show ? .regular : .accessory)
+ self?.setupMenuBar()
+ }
+ }
+
+ /// Keep app chrome in sync when language changes from any entry point.
+ private func observeLanguageChanges() {
+ NotificationCenter.default.addObserver(
+ forName: .appLanguageDidChange,
+ object: nil, queue: .main
+ ) { [weak self] _ in
+ self?.setupMenuBar()
}
}
// MARK: - Launch at Login (LaunchAgent, zero permissions)
private static let launchAgentLabel = "com.apptag.launcher"
+ static var supportsLaunchAtLogin: Bool {
+ ProcessInfo.processInfo.environment["APP_SANDBOX_CONTAINER_ID"] == nil
+ }
private static var launchAgentURL: URL {
FileManager.default.homeDirectoryForCurrentUser
@@ -90,6 +114,7 @@
}
static func enableLaunchAtLogin() {
+ guard supportsLaunchAtLogin else { return }
let plist: [String: Any] = [
"Label": Self.launchAgentLabel,
"ProgramArguments": ["open", Bundle.main.bundlePath, "--hide"],
@@ -107,6 +132,7 @@
}
static func disableLaunchAtLogin() {
+ guard supportsLaunchAtLogin else { return }
let uid = getuid()
let task = Process()
task.launchPath = "/bin/launchctl"
@@ -118,6 +144,12 @@
/// On first launch, enable login item by default via LaunchAgent.
/// Does NOT require App Management permission.
private func setupLaunchAtLogin() {
+ guard Self.supportsLaunchAtLogin else {
+ if UserDefaults.standard.object(forKey: "launchAtLogin") == nil {
+ UserDefaults.standard.set(false, forKey: "launchAtLogin")
+ }
+ return
+ }
let key = "launchAtLogin"
if UserDefaults.standard.object(forKey: key) == nil {
UserDefaults.standard.set(true, forKey: key)
@@ -128,17 +160,22 @@
// MARK: - Menu Bar
private func setupMenuBar() {
- // Remove old status item if re-creating (language switch, etc.)
- if let existing = statusItem {
- NSStatusBar.system.removeStatusItem(existing)
+ guard UserDefaults.standard.object(forKey: Self.showMenuBarIconKey) as? Bool ?? true else {
+ removeMenuBarItem()
+ return
}
- statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+
+ if statusItem == nil {
+ statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+ }
+ guard let statusItem else { return }
if let button = statusItem.button {
- button.image = NSImage(
- systemSymbolName: "tag.fill",
- accessibilityDescription: "TagLauncher"
- )
+ let image = makeMenuBarIcon()
+ button.image = image
+ button.imageScaling = .scaleProportionallyDown
+ button.imagePosition = .imageOnly
+ button.title = image == nil ? "T" : ""
button.toolTip = "TagLauncher — Tag-based app launcher"
button.action = #selector(toggleOverlay)
button.target = self
@@ -197,6 +234,33 @@
)
)
statusItem.menu = menu
+ }
+
+ private func removeMenuBarItem() {
+ guard let statusItem else { return }
+ NSStatusBar.system.removeStatusItem(statusItem)
+ self.statusItem = nil
+ }
+
+ private func makeMenuBarIcon() -> NSImage? {
+ let size = NSSize(width: 18, height: 18)
+ let image = NSImage(size: size)
+ image.lockFocus()
+ NSColor.black.setFill()
+ let tagPath = NSBezierPath()
+ tagPath.move(to: NSPoint(x: 2.5, y: 10.5))
+ tagPath.line(to: NSPoint(x: 8.5, y: 16.5))
+ tagPath.line(to: NSPoint(x: 15.5, y: 16.5))
+ tagPath.line(to: NSPoint(x: 15.5, y: 9.5))
+ tagPath.line(to: NSPoint(x: 8.5, y: 2.5))
+ tagPath.close()
+ tagPath.appendOval(in: NSRect(x: 10.6, y: 12.2, width: 2.6, height: 2.6))
+ tagPath.windingRule = .evenOdd
+ tagPath.fill()
+ image.unlockFocus()
+ image.isTemplate = true
+ image.accessibilityDescription = "TagLauncher"
+ return image
}
// MARK: - Overlay Window
@@ -343,8 +407,8 @@
!self.isInEditMode
else { return }
- // Settings/Preferences window → float it above overlay for real-time preview
- if NSApp.windows.contains(keyWindow) {
+ // Settings/Preferences window -> float it above overlay for real-time preview.
+ if self.isSettingsWindowCandidate(keyWindow) {
self.prepareSettingsWindow(keyWindow)
return
}
@@ -353,18 +417,71 @@
}
}
- /// Settings must always float above the overlay so changes can be previewed live.
+ /// Settings must always appear centered over the current overlay view and float above it.
private func prepareSettingsWindow(_ window: NSWindow) {
- if overlayWindow?.isVisible == true {
- let overlayLevel = overlayWindow?.level.rawValue ?? NSWindow.Level.screenSaver.rawValue
- window.level = NSWindow.Level(rawValue: overlayLevel + 1)
- window.orderFrontRegardless()
+ window.identifier = NSUserInterfaceItemIdentifier("TagLauncherPreferencesWindow")
+ let settingsSize = NSSize(width: 880, height: 460)
+ window.minSize = settingsSize
+ window.maxSize = settingsSize
+ if abs(window.frame.width - settingsSize.width) > 0.5 || abs(window.frame.height - settingsSize.height) > 0.5 {
+ window.setFrame(
+ NSRect(origin: window.frame.origin, size: settingsSize),
+ display: false
+ )
}
- if settingsWindow == nil {
- window.minSize = NSSize(width: 660, height: 380)
- window.maxSize = NSSize(width: 660, height: CGFloat.greatestFiniteMagnitude)
+
+ if let overlayWindow, overlayWindow.isVisible {
+ center(window, over: overlayWindow.frame)
+ window.level = NSWindow.Level(rawValue: overlayWindow.level.rawValue + 1)
+ attachSettingsWindow(window, to: overlayWindow)
+ } else if let screen = screenUnderMouse() {
+ center(window, over: screen.visibleFrame)
+ window.level = .floating
+ detachSettingsWindow(window)
}
+
+ window.collectionBehavior.formUnion([.canJoinAllSpaces, .fullScreenAuxiliary, .moveToActiveSpace])
+ window.makeKeyAndOrderFront(nil)
+ window.orderFrontRegardless()
settingsWindow = window
+ }
+
+ private func attachSettingsWindow(_ window: NSWindow, to overlayWindow: NSWindow) {
+ if window.parent != overlayWindow {
+ window.parent?.removeChildWindow(window)
+ overlayWindow.addChildWindow(window, ordered: .above)
+ }
+ }
+
+ private func detachSettingsWindow(_ window: NSWindow) {
+ window.parent?.removeChildWindow(window)
+ }
+
+ private func isSettingsWindowCandidate(_ window: NSWindow) -> Bool {
+ if window == settingsWindow { return true }
+ if window.identifier?.rawValue == "TagLauncherPreferencesWindow" { return true }
+ guard NSApp.windows.contains(window),
+ window != overlayWindow,
+ window.isVisible,
+ !(window is NSPanel)
+ else { return false }
+ return true
+ }
+
+ private func center(_ window: NSWindow, over rect: NSRect) {
+ let frame = window.frame
+ let origin = NSPoint(
+ x: rect.midX - frame.width / 2,
+ y: rect.midY - frame.height / 2
+ )
+ window.setFrameOrigin(origin)
+ }
+
+ private func screenUnderMouse() -> NSScreen? {
+ let mousePoint = NSEvent.mouseLocation
+ return NSScreen.screens.first(where: {
+ NSMouseInRect(mousePoint, $0.frame, false)
+ }) ?? NSScreen.main ?? NSScreen.screens.first
}
/// Clean up settingsWindow reference when the Settings window closes.
@@ -378,6 +495,7 @@
let closingWindow = notification.object as? NSWindow,
closingWindow == self.settingsWindow
else { return }
+ self.detachSettingsWindow(closingWindow)
self.settingsWindow = nil
}
}
@@ -395,11 +513,23 @@
@objc private func openPreferences() {
// Don't hide overlay — keep it visible for real-time setting preview.
+ if let overlayWindow, overlayWindow.isVisible {
+ overlayWindow.makeKeyAndOrderFront(nil)
+ overlayWindow.orderFrontRegardless()
+ }
NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
- DispatchQueue.main.async { [weak self] in
+ prepareSettingsWindowWhenAvailable(retries: 10)
+ }
+
+ private func prepareSettingsWindowWhenAvailable(retries: Int) {
+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.03) { [weak self] in
guard let self else { return }
- for window in NSApp.windows where window != self.overlayWindow {
- self.prepareSettingsWindow(window)
+ let candidates = NSApp.windows.filter { window in
+ self.isSettingsWindowCandidate(window)
+ }
+ candidates.forEach { self.prepareSettingsWindow($0) }
+ if candidates.isEmpty && retries > 0 {
+ self.prepareSettingsWindowWhenAvailable(retries: retries - 1)
}
}
}
@@ -407,8 +537,6 @@
@objc private func switchLanguage(_ sender: NSMenuItem) {
guard let code = sender.representedObject as? String else { return }
L10n.switchTo(code)
- // Rebuild menu to update checkmarks
- setupMenuBar()
}
}
@@ -488,14 +616,23 @@
// MARK: - Preferences View
struct PreferencesView: View {
+ private let settingsWindowWidth: CGFloat = 880
+ private let settingsContentWidth: CGFloat = 820
+ private let settingsLabelWidth: CGFloat = 160
+ private let widePickerWidth: CGFloat = 650
+ private let compactPickerWidth: CGFloat = 320
+
@AppStorage("tagFontSize") private var tagFontSize: Double = 18
@AppStorage("iconSize") private var iconSize: Double = 56
@AppStorage("tagPosition") private var tagPosition = "left"
@AppStorage("defaultGroupName") private var defaultGroupName = "Other"
@AppStorage("displayMode") private var displayMode = "flat"
@AppStorage("hideAppNames") private var hideAppNames = false
+ @AppStorage("showMenuBarIcon") private var showMenuBarIcon = true
@AppStorage("showDockIcon") private var showDockIcon = false
@AppStorage("launchAtLogin") private var launchAtLogin = true
+ @State private var selectedLanguage = L10n.currentCode
+ @State private var isRefreshingLanguage = false
@State private var allApps: [AppInfo] = []
@State private var tagColors: [String: Int] = [:]
@@ -523,6 +660,7 @@
try TagDatabase.exportTo(url)
} catch {
fputs("[TagLauncher] Export failed: \(error)\n", stderr)
+ showDataAlert(title: tr("settings.exportFailed"), message: error.localizedDescription)
}
}
}
@@ -539,14 +677,17 @@
scanApps()
} catch {
fputs("[TagLauncher] Import failed: \(error)\n", stderr)
- // Show alert on failure
- let alert = NSAlert()
- alert.messageText = tr("settings.importFailed")
- alert.informativeText = error.localizedDescription
- alert.alertStyle = .warning
- alert.runModal()
+ showDataAlert(title: tr("settings.importFailed"), message: error.localizedDescription)
}
}
+ }
+
+ private func showDataAlert(title: String, message: String) {
+ let alert = NSAlert()
+ alert.messageText = title
+ alert.informativeText = message
+ alert.alertStyle = .warning
+ alert.runModal()
}
private var appVersion: String {
@@ -555,21 +696,71 @@
private var buildVersion: String {
Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?"
}
+ private var languageColumns: [GridItem] {
+ [
+ GridItem(.flexible(minimum: 220), spacing: 18, alignment: .top),
+ GridItem(.flexible(minimum: 220), spacing: 18, alignment: .top),
+ ]
+ }
var body: some View {
- TabView {
- // Tab 1: General
+ ZStack {
+ TabView {
+ // Tab 1: Language
+ VStack(alignment: .leading, spacing: 10) {
+ Text(tr("settings.language"))
+ .font(.headline)
+ Text(tr("settings.languageDesc"))
+ .font(.caption)
+ .foregroundStyle(.secondary)
+
+ ScrollView {
+ LazyVGrid(columns: languageColumns, alignment: .leading, spacing: 6) {
+ ForEach(L10n.supported, id: \.code) { language in
+ Button {
+ selectedLanguage = language.code
+ } label: {
+ HStack(spacing: 8) {
+ Image(systemName: selectedLanguage == language.code ? "checkmark" : "circle")
+ .font(.system(size: 12, weight: .semibold))
+ .foregroundStyle(selectedLanguage == language.code ? Color.accentColor : Color.secondary.opacity(0.28))
+ .frame(width: 16)
+ Text(language.name)
+ .foregroundStyle(.primary)
+ .lineLimit(1)
+ .truncationMode(.tail)
+ Spacer(minLength: 0)
+ }
+ .padding(.horizontal, 8)
+ .padding(.vertical, 5)
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+ .accessibilityLabel("\(tr("settings.languagePicker")) \(language.name)")
+ }
+ }
+ .padding(.vertical, 4)
+ }
+ }
+ .frame(maxWidth: settingsContentWidth, alignment: .leading)
+ .tabItem { Label(tr("settings.language"), systemImage: "globe") }
+ .padding()
+
+ // Tab 2: General
VStack(alignment: .leading, spacing: 0) {
// Toggle row — centered as a rectangular block
HStack(spacing: 20) {
- Toggle(tr("settings.launchAtLogin"), isOn: $launchAtLogin)
- .onChange(of: launchAtLogin) { _, enabled in
- if enabled {
- AppDelegate.enableLaunchAtLogin()
- } else {
- AppDelegate.disableLaunchAtLogin()
+ if AppDelegate.supportsLaunchAtLogin {
+ Toggle(tr("settings.launchAtLogin"), isOn: $launchAtLogin)
+ .onChange(of: launchAtLogin) { _, enabled in
+ if enabled {
+ AppDelegate.enableLaunchAtLogin()
+ } else {
+ AppDelegate.disableLaunchAtLogin()
+ }
}
- }
+ }
+ Toggle(tr("settings.showMenuBarIcon"), isOn: $showMenuBarIcon)
Toggle(tr("settings.showInDock"), isOn: $showDockIcon)
Toggle(tr("settings.hideAppNames"), isOn: $hideAppNames)
}
@@ -584,7 +775,7 @@
VStack(spacing: 16) {
HStack(alignment: .top, spacing: 16) {
Text(tr("settings.appListStyle"))
- .frame(width: 130, alignment: .trailing)
+ .frame(width: settingsLabelWidth, alignment: .trailing)
VStack(alignment: .leading, spacing: 4) {
Picker("", selection: $displayMode) {
Text(tr("settings.flat")).tag("flat")
@@ -594,7 +785,7 @@
Text(tr("settings.coloredGridContainer")).tag("coloredGridContainer")
}
.pickerStyle(.segmented)
- .frame(width: 520, alignment: .leading)
+ .frame(width: widePickerWidth, alignment: .leading)
Text(tr("settings.flatDesc"))
.font(.caption).foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
@@ -602,7 +793,7 @@
}
HStack(alignment: .top, spacing: 16) {
Text(tr("settings.tagPosition"))
- .frame(width: 130, alignment: .trailing)
+ .frame(width: settingsLabelWidth, alignment: .trailing)
VStack(alignment: .leading, spacing: 4) {
Picker("", selection: $tagPosition) {
Text(tr("settings.left")).tag("left")
@@ -610,7 +801,7 @@
Text(tr("settings.top")).tag("top")
}
.pickerStyle(.segmented)
- .frame(width: 280, alignment: .leading)
+ .frame(width: compactPickerWidth, alignment: .leading)
Text(tr("settings.tagPosDesc"))
.font(.caption).foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
@@ -618,7 +809,7 @@
}
HStack(alignment: .top, spacing: 16) {
Text(tr("settings.tagFontSize"))
- .frame(width: 130, alignment: .trailing)
+ .frame(width: settingsLabelWidth, alignment: .trailing)
VStack(alignment: .leading, spacing: 4) {
Picker("", selection: $tagFontSize) {
ForEach([16.0, 18.0, 20.0, 22.0, 24.0, 26.0], id: \.self) { size in
@@ -626,7 +817,7 @@
}
}
.pickerStyle(.segmented)
- .frame(width: 280, alignment: .leading)
+ .frame(width: compactPickerWidth, alignment: .leading)
Text(tr("settings.tagFontDesc"))
.font(.caption).foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
@@ -634,7 +825,7 @@
}
HStack(alignment: .top, spacing: 16) {
Text(tr("settings.iconSize"))
- .frame(width: 130, alignment: .trailing)
+ .frame(width: settingsLabelWidth, alignment: .trailing)
VStack(alignment: .leading, spacing: 4) {
Picker("", selection: $iconSize) {
ForEach([40.0, 48.0, 56.0, 64.0, 72.0, 80.0], id: \.self) { size in
@@ -642,7 +833,7 @@
}
}
.pickerStyle(.segmented)
- .frame(width: 280, alignment: .leading)
+ .frame(width: compactPickerWidth, alignment: .leading)
Text(tr("settings.iconSizeDesc"))
.font(.caption).foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
@@ -650,10 +841,11 @@
}
}
}
+ .frame(maxWidth: settingsContentWidth, alignment: .center)
.padding()
.tabItem { Label(tr("settings.general"), systemImage: "gearshape") }
- // Tab 2: Tags
+ // Tab 3: Tags
VStack(spacing: 0) {
TagEditorView(
tagColors: $tagColors,
@@ -665,7 +857,7 @@
.tabItem { Label(tr("settings.tags"), systemImage: "tag.fill") }
.onAppear { scanApps() }
- // Tab 3: Data
+ // Tab 4: Data
Form {
Section {
HStack(spacing: 12) {
@@ -684,7 +876,7 @@
.tabItem { Label(tr("settings.data"), systemImage: "externaldrive.fill") }
.padding()
- // Tab 4: About
+ // Tab 5: About
Form {
Section {
HStack {
@@ -720,7 +912,38 @@
}
.tabItem { Label(tr("settings.about"), systemImage: "info.circle") }
.padding()
+ }
+ .onChange(of: selectedLanguage) { _, code in
+ L10n.switchTo(code)
+ }
+ .onReceive(NotificationCenter.default.publisher(for: .appLanguageDidChange)) { notification in
+ if let code = notification.userInfo?["code"] as? String {
+ selectedLanguage = code
+ }
+ showLanguageRefresh()
+ }
+
+ if isRefreshingLanguage {
+ ZStack {
+ Color(nsColor: .windowBackgroundColor)
+ .opacity(0.84)
+ Image(systemName: "arrow.clockwise")
+ .font(.system(size: 30, weight: .regular))
+ .symbolRenderingMode(.hierarchical)
+ .foregroundStyle(.secondary)
+ }
+ .transition(.opacity)
+ }
}
- .frame(minWidth: 660, maxWidth: 660, minHeight: 380)
+ .frame(width: settingsWindowWidth, height: 460)
+ }
+
+ private func showLanguageRefresh() {
+ isRefreshingLanguage = true
+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
+ withAnimation(.easeOut(duration: 0.18)) {
+ isRefreshingLanguage = false
+ }
+ }
}
}
--
Gitblit v1.9.3