From c8a1b811bffd13dc6dfa39a7c5c0d4ee76cd11e5 Mon Sep 17 00:00:00 2001
From: Ariver <ar@MacBook-Air.local>
Date: Mon, 11 May 2026 12:53:34 +0800
Subject: [PATCH] Release TagLauncher 5.5.0

---
 Apptag/ApptagApp.swift |  563 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 418 insertions(+), 145 deletions(-)

diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index adc2a53..ff4466d 100644
--- a/Apptag/ApptagApp.swift
+++ b/Apptag/ApptagApp.swift
@@ -5,32 +5,135 @@
 // MARK: - Application Entry Point
 
 @main
-struct ApptagApp: App {
+struct TagLauncherApp: App {
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
 
     var body: some Scene {
         Settings {
             PreferencesView()
         }
+        .defaultSize(width: 880, height: 420)
     }
 }
 
 // MARK: - App Delegate (menubar + overlay window + hotkey)
 
+final class OverlayPanel: NSPanel {
+    override var canBecomeKey: Bool { true }
+    override var canBecomeMain: Bool { true }
+}
+
 final class AppDelegate: NSObject, NSApplicationDelegate {
     private var statusItem: NSStatusItem!
     private var overlayWindow: NSWindow?
+    private var settingsWindow: NSWindow?    // Track Settings window to keep it above overlay
     private var hotkeyRef: EventHotKeyRef?
     private var isInEditMode = false  // Suppress auto-dismiss during editing
 
     func applicationDidFinishLaunching(_ notification: Notification) {
         L10n.setup()
+        migrateDefaultGroupName()
+        TagDatabase.seedDefaultTags()
         let showDock = UserDefaults.standard.bool(forKey: "showDockIcon")
         NSApp.setActivationPolicy(showDock ? .regular : .accessory)
         setupMenuBar()
         registerHotkey()
         observeOtherWindows()
+        observeSettingsClose()
         observeEditMode()
+        observeDockSetting()
+        observeLanguageChanges()
+        setupLaunchAtLogin()
+    }
+
+    /// Dock icon click → show overlay (same as menubar "Show TagLauncher")
+    func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
+        showOverlay()
+        return false  // Suppress default "unhide all windows" behavior
+    }
+
+    /// Ensure defaultGroupName is always the language-neutral key "Other".
+    /// Translates known old values back to "Other" so switching languages works.
+    private func migrateDefaultGroupName() {
+        let key = "defaultGroupName"
+        let stored = UserDefaults.standard.string(forKey: key)
+        // "Other" is the neutral key — nothing to do
+        if stored == nil || stored == "Other" { return }
+        // Check if the stored value is a translated version of "group.uncategorized"
+        for (code, _) in L10n.supported {
+            let loc = L10n.loadedTranslation("group.uncategorized", for: code)
+            if stored == loc {
+                UserDefaults.standard.set("Other", forKey: key)
+                return
+            }
+        }
+        // User has set a custom name — keep it
+    }
+
+    /// Observe Show in Dock changes so it takes effect immediately.
+    private func observeDockSetting() {
+        NotificationCenter.default.addObserver(
+            forName: UserDefaults.didChangeNotification,
+            object: nil, queue: .main
+        ) { _ in
+            let show = UserDefaults.standard.bool(forKey: "showDockIcon")
+            NSApp.setActivationPolicy(show ? .regular : .accessory)
+        }
+    }
+
+    /// 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"
+
+    private static var launchAgentURL: URL {
+        FileManager.default.homeDirectoryForCurrentUser
+            .appendingPathComponent("Library/LaunchAgents/\(launchAgentLabel).plist")
+    }
+
+    static func enableLaunchAtLogin() {
+        let plist: [String: Any] = [
+            "Label": Self.launchAgentLabel,
+            "ProgramArguments": ["open", Bundle.main.bundlePath, "--hide"],
+            "RunAtLoad": true,
+        ]
+        let dir = Self.launchAgentURL.deletingLastPathComponent()
+        try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
+        (plist as NSDictionary).write(to: Self.launchAgentURL, atomically: true)
+
+        let uid = getuid()
+        let task = Process()
+        task.launchPath = "/bin/launchctl"
+        task.arguments = ["bootstrap", "gui/\(uid)", Self.launchAgentURL.path]
+        task.launch()
+    }
+
+    static func disableLaunchAtLogin() {
+        let uid = getuid()
+        let task = Process()
+        task.launchPath = "/bin/launchctl"
+        task.arguments = ["bootout", "gui/\(uid)/\(Self.launchAgentLabel)"]
+        task.launch()
+        try? FileManager.default.removeItem(at: Self.launchAgentURL)
+    }
+
+    /// On first launch, enable login item by default via LaunchAgent.
+    /// Does NOT require App Management permission.
+    private func setupLaunchAtLogin() {
+        let key = "launchAtLogin"
+        if UserDefaults.standard.object(forKey: key) == nil {
+            UserDefaults.standard.set(true, forKey: key)
+            Self.enableLaunchAtLogin()
+        }
     }
 
     // MARK: - Menu Bar
@@ -45,9 +148,9 @@
         if let button = statusItem.button {
             button.image = NSImage(
                 systemSymbolName: "tag.fill",
-                accessibilityDescription: "Apptag"
+                accessibilityDescription: "TagLauncher"
             )
-            button.toolTip = "Apptag — Tag-based app launcher"
+            button.toolTip = "TagLauncher — Tag-based app launcher"
             button.action = #selector(toggleOverlay)
             button.target = self
         }
@@ -55,7 +158,7 @@
         let menu = NSMenu()
         menu.addItem(
             NSMenuItem(
-                title: tr("menu.show"),
+                title: "\(tr("menu.show"))  ⇧⌥Space",
                 action: #selector(toggleOverlay),
                 keyEquivalent: ""
             )
@@ -118,41 +221,16 @@
     }
 
     private func showOverlay() {
-        if overlayWindow == nil {
-            // Use the screen under the mouse cursor — works in fullscreen spaces
-            let mousePoint = NSEvent.mouseLocation
-            guard let screen = NSScreen.screens.first(where: {
-                NSMouseInRect(mousePoint, $0.frame, false)
-            }) ?? NSScreen.main ?? NSScreen.screens.first else { return }
+        // Use the screen under the mouse cursor — works in fullscreen spaces
+        let mousePoint = NSEvent.mouseLocation
+        guard let screen = NSScreen.screens.first(where: {
+            NSMouseInRect(mousePoint, $0.frame, false)
+        }) ?? NSScreen.main ?? NSScreen.screens.first else { return }
 
-            overlayWindow = NSWindow(
-                contentRect: screen.frame,
-                styleMask: [.borderless, .fullSizeContentView],
-                backing: .buffered,
-                defer: false
-            )
-            overlayWindow?.level = .floating
-            overlayWindow?.collectionBehavior = [
-                .canJoinAllSpaces,
-                .fullScreenAuxiliary,
-                .ignoresCycle
-            ]
-            overlayWindow?.isOpaque = false
-            overlayWindow?.backgroundColor = .clear
-            overlayWindow?.hasShadow = false
-            overlayWindow?.titlebarAppearsTransparent = true
-            overlayWindow?.titleVisibility = .hidden
-            overlayWindow?.isReleasedWhenClosed = false
-
-            overlayWindow?.contentView = DismissibleHostingView(
-                rootView: ContentView(hideOverlay: { [weak self] in
-                    self?.hideOverlay()
-                }),
-                onBackdropTap: { [weak self] in
-                    self?.hideOverlay()
-                }
-            )
-        }
+        overlayWindow?.orderOut(nil)
+        overlayWindow = makeOverlayWindow(on: screen)
+        overlayWindow?.setFrame(screen.frame, display: true)
+        overlayWindow?.level = NSWindow.Level(rawValue: Int(CGWindowLevelForKey(.maximumWindow)))
 
         // Local key monitor: catch Escape while overlay is up
         NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
@@ -164,16 +242,53 @@
         }
 
         overlayWindow?.makeKeyAndOrderFront(nil)
-        NSApp.activate(ignoringOtherApps: true)
+        overlayWindow?.orderFrontRegardless()
     }
 
-    private func hideOverlay() {
-        guard !isInEditMode else { return }
+    private func makeOverlayWindow(on screen: NSScreen) -> NSWindow {
+        let panel = OverlayPanel(
+            contentRect: screen.frame,
+            styleMask: [.borderless, .fullSizeContentView, .nonactivatingPanel],
+            backing: .buffered,
+            defer: false
+        )
+        panel.isFloatingPanel = true
+        panel.hidesOnDeactivate = false
+        panel.collectionBehavior = [
+            .moveToActiveSpace,
+            .fullScreenAuxiliary,
+            .stationary,
+            .transient,
+            .ignoresCycle
+        ]
+        panel.isOpaque = false
+        panel.backgroundColor = .clear
+        panel.hasShadow = false
+        panel.titlebarAppearsTransparent = true
+        panel.titleVisibility = .hidden
+        panel.isReleasedWhenClosed = false
+        panel.contentView = DismissibleHostingView(
+            rootView: ContentView(hideOverlay: { [weak self] in
+                self?.hideOverlay(force: true)
+            }),
+            onBackdropTap: { [weak self] in
+                self?.hideOverlay()
+            }
+        )
+        return panel
+    }
+
+    private func hideOverlay(force: Bool = false) {
+        guard force || !isInEditMode else { return }
         overlayWindow?.orderOut(nil)
+        if force {
+            overlayWindow = nil
+        }
     }
 
     // MARK: - Global Hotkey (Shift+Option+Space)
 
+    /// Carbon RegisterEventHotKey. If it fails (sandbox, etc.), falls back to menu bar only.
     private func registerHotkey() {
         var hotkeyID = EventHotKeyID()
         hotkeyID.signature = OSType(0x41505447) // 'APTG'
@@ -193,7 +308,7 @@
         hotkeyRef = ref
 
         if status != noErr {
-            print("[Apptag] Hotkey registration failed: \(status). Falling back to menu bar only.")
+            print("[TagLauncher] Hotkey registration failed: \(status). Falling back to menu bar only.")
             return
         }
 
@@ -238,14 +353,78 @@
                   keyWindow != self.overlayWindow,
                   !self.isInEditMode
             else { return }
+
+            // Settings/Preferences window → float it above overlay for real-time preview
+            if NSApp.windows.contains(keyWindow) {
+                self.prepareSettingsWindow(keyWindow)
+                return
+            }
+
             self.hideOverlay()
+        }
+    }
+
+    /// Settings must always appear centered over the current overlay view and float above it.
+    private func prepareSettingsWindow(_ window: NSWindow) {
+        let settingsSize = NSSize(width: 880, height: max(window.frame.height, 420))
+        window.minSize = NSSize(width: 880, height: 420)
+        window.maxSize = NSSize(width: 880, height: CGFloat.greatestFiniteMagnitude)
+        if abs(window.frame.width - settingsSize.width) > 0.5 || window.frame.height < settingsSize.height {
+            window.setFrame(
+                NSRect(origin: window.frame.origin, size: settingsSize),
+                display: false
+            )
+        }
+
+        if let overlayWindow, overlayWindow.isVisible {
+            center(window, over: overlayWindow.frame)
+            window.level = NSWindow.Level(rawValue: overlayWindow.level.rawValue + 1)
+        } else if let screen = screenUnderMouse() {
+            center(window, over: screen.visibleFrame)
+            window.level = .floating
+        }
+
+        window.collectionBehavior.formUnion([.moveToActiveSpace, .fullScreenAuxiliary])
+        window.makeKeyAndOrderFront(nil)
+        window.orderFrontRegardless()
+        settingsWindow = window
+    }
+
+    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.
+    private func observeSettingsClose() {
+        NotificationCenter.default.addObserver(
+            forName: NSWindow.willCloseNotification,
+            object: nil,
+            queue: .main
+        ) { [weak self] notification in
+            guard let self,
+                  let closingWindow = notification.object as? NSWindow,
+                  closingWindow == self.settingsWindow
+            else { return }
+            self.settingsWindow = nil
         }
     }
 
     /// Track whether the overlay is in edit mode to suppress auto-dismiss.
     private func observeEditMode() {
         NotificationCenter.default.addObserver(
-            forName: .apptagEditModeChanged,
+            forName: .tagLauncherEditModeChanged,
             object: nil,
             queue: .main
         ) { [weak self] notification in
@@ -254,15 +433,27 @@
     }
 
     @objc private func openPreferences() {
-        hideOverlay()
+        // Don't hide overlay — keep it visible for real-time setting preview.
         NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
+        prepareSettingsWindowWhenAvailable(retries: 5)
+    }
+
+    private func prepareSettingsWindowWhenAvailable(retries: Int) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.03) { [weak self] in
+            guard let self else { return }
+            let candidates = NSApp.windows.filter { window in
+                window != self.overlayWindow && window.isVisible
+            }
+            candidates.forEach { self.prepareSettingsWindow($0) }
+            if candidates.isEmpty && retries > 0 {
+                self.prepareSettingsWindowWhenAvailable(retries: retries - 1)
+            }
+        }
     }
 
     @objc private func switchLanguage(_ sender: NSMenuItem) {
         guard let code = sender.representedObject as? String else { return }
         L10n.switchTo(code)
-        // Rebuild menu to update checkmarks
-        setupMenuBar()
     }
 }
 
@@ -342,6 +533,12 @@
 // 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"
@@ -349,14 +546,17 @@
     @AppStorage("displayMode") private var displayMode = "flat"
     @AppStorage("hideAppNames") private var hideAppNames = false
     @AppStorage("showDockIcon") private var showDockIcon = false
-
+    @AppStorage("launchAtLogin") private var launchAtLogin = true
+    @State private var selectedLanguage = L10n.currentCode
+    @State private var languageRefreshID = UUID()
+    @State private var isRefreshingLanguage = false
     @State private var allApps: [AppInfo] = []
     @State private var tagColors: [String: Int] = [:]
 
     private func scanApps() {
         DispatchQueue.global(qos: .userInitiated).async {
             var apps = AppIndexer.scan()
-            let store = TagDatabase.migrateFromFinderIfNeeded(apps: apps)
+            let store = TagDatabase.load()
             apps = TagEditor.annotate(apps: apps)
             let colors = store.tags.mapValues { $0.color }
             DispatchQueue.main.async {
@@ -368,22 +568,22 @@
 
     private func exportTags() {
         let panel = NSSavePanel()
-        panel.title = "Export Tags"
-        panel.nameFieldStringValue = "Apptag-tags.json"
+        panel.title = tr("settings.export")
+        panel.nameFieldStringValue = "TagLauncher-tags.json"
         panel.allowedContentTypes = [.json]
         panel.begin { response in
             guard response == .OK, let url = panel.url else { return }
             do {
                 try TagDatabase.exportTo(url)
             } catch {
-                fputs("[Apptag] Export failed: \(error)\n", stderr)
+                fputs("[TagLauncher] Export failed: \(error)\n", stderr)
             }
         }
     }
 
     private func importTags() {
         let panel = NSOpenPanel()
-        panel.title = "Import Tags"
+        panel.title = tr("settings.import")
         panel.allowedContentTypes = [.json]
         panel.allowsMultipleSelection = false
         panel.begin { response in
@@ -392,10 +592,10 @@
                 _ = try TagDatabase.importFrom(url)
                 scanApps()
             } catch {
-                fputs("[Apptag] Import failed: \(error)\n", stderr)
+                fputs("[TagLauncher] Import failed: \(error)\n", stderr)
                 // Show alert on failure
                 let alert = NSAlert()
-                alert.messageText = "Import Failed"
+                alert.messageText = tr("settings.importFailed")
                 alert.informativeText = error.localizedDescription
                 alert.alertStyle = .warning
                 alert.runModal()
@@ -411,80 +611,123 @@
     }
 
     var body: some View {
-        TabView {
-            // Tab 1: General
-            Form {
-                Section {
-                    LabeledContent("App list style:") {
-                        Picker("", selection: $displayMode) {
-                            Text("Flat").tag("flat")
-                            Text("Container").tag("container")
-                        }
-                        .pickerStyle(.segmented)
-                        .frame(width: 210)
-                    }
-                    Text("\"Flat\" shows apps directly. \"Container\" wraps each tag group in a rounded box.")
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                }
-
-                Section {
-                    LabeledContent("Tag position:") {
-                        Picker("", selection: $tagPosition) {
-                            Text("Left").tag("left")
-                            Text("Right").tag("right")
-                            Text("Top").tag("top")
-                        }
-                        .pickerStyle(.segmented)
-                        .frame(width: 210)
-                    }
-                    Text("Where the tag navigation bar appears. Left/Right puts tags in a sidebar.")
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                }
-
-                Section {
-                    LabeledContent("Tag font size:") {
-                        Picker("", selection: $tagFontSize) {
-                            ForEach([16.0, 18.0, 20.0, 22.0, 24.0, 26.0], id: \.self) { size in
-                                Text("\(Int(size))").tag(size)
+        ZStack {
+            TabView {
+                // Tab 1: Language
+                Form {
+                    Section {
+                        Picker(tr("settings.languagePicker"), selection: $selectedLanguage) {
+                            ForEach(L10n.supported, id: \.code) { language in
+                                Text(language.name).tag(language.code)
                             }
                         }
-                        .pickerStyle(.segmented)
-                        .frame(width: 280)
+                        .pickerStyle(.radioGroup)
+                    } header: {
+                        Text(tr("settings.language"))
+                    } footer: {
+                        Text(tr("settings.languageDesc"))
                     }
-                    Text("Adjust the size of group-name labels in the overlay.")
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
                 }
+                .tabItem { Label(tr("settings.language"), systemImage: "globe") }
+                .padding()
 
-                Section {
-                    LabeledContent("Icon size:") {
-                        Picker("", selection: $iconSize) {
-                            ForEach([40.0, 48.0, 56.0, 64.0, 72.0, 80.0], id: \.self) { size in
-                                Text("\(Int(size))").tag(size)
+                // 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()
                             }
                         }
-                        .pickerStyle(.segmented)
-                        .frame(width: 280)
+                    Toggle(tr("settings.showInDock"), isOn: $showDockIcon)
+                    Toggle(tr("settings.hideAppNames"), isOn: $hideAppNames)
+                }
+                .frame(maxWidth: .infinity, alignment: .center)
+                .padding(.bottom, 16)
+
+                Divider()
+                    .padding(.bottom, 16)
+
+                // Two-column layout: each row label (right-aligned) + controls (left-aligned)
+                // All pickers and descriptions share the same left edge
+                VStack(spacing: 16) {
+                    HStack(alignment: .top, spacing: 16) {
+                        Text(tr("settings.appListStyle"))
+                            .frame(width: settingsLabelWidth, alignment: .trailing)
+                        VStack(alignment: .leading, spacing: 4) {
+                            Picker("", selection: $displayMode) {
+                                Text(tr("settings.flat")).tag("flat")
+                                Text(tr("settings.container")).tag("container")
+                                Text(tr("settings.coloredContainer")).tag("coloredContainer")
+                                Text(tr("settings.gridContainer")).tag("gridContainer")
+                                Text(tr("settings.coloredGridContainer")).tag("coloredGridContainer")
+                            }
+                            .pickerStyle(.segmented)
+                            .frame(width: widePickerWidth, alignment: .leading)
+                            Text(tr("settings.flatDesc"))
+                                .font(.caption).foregroundStyle(.secondary)
+                                .fixedSize(horizontal: false, vertical: true)
+                        }
                     }
-                    Text("Icon display size. Grid columns adjust automatically.")
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                }
-
-                Section {
-                    Toggle("Show in Dock", isOn: $showDockIcon)
-                }
-
-                Section {
-                    Toggle("Hide app names", isOn: $hideAppNames)
+                    HStack(alignment: .top, spacing: 16) {
+                        Text(tr("settings.tagPosition"))
+                            .frame(width: settingsLabelWidth, alignment: .trailing)
+                        VStack(alignment: .leading, spacing: 4) {
+                            Picker("", selection: $tagPosition) {
+                                Text(tr("settings.left")).tag("left")
+                                Text(tr("settings.right")).tag("right")
+                                Text(tr("settings.top")).tag("top")
+                            }
+                            .pickerStyle(.segmented)
+                            .frame(width: compactPickerWidth, alignment: .leading)
+                            Text(tr("settings.tagPosDesc"))
+                                .font(.caption).foregroundStyle(.secondary)
+                                .fixedSize(horizontal: false, vertical: true)
+                        }
+                    }
+                    HStack(alignment: .top, spacing: 16) {
+                        Text(tr("settings.tagFontSize"))
+                            .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
+                                    Text("\(Int(size))").tag(size)
+                                }
+                            }
+                            .pickerStyle(.segmented)
+                            .frame(width: compactPickerWidth, alignment: .leading)
+                            Text(tr("settings.tagFontDesc"))
+                                .font(.caption).foregroundStyle(.secondary)
+                                .fixedSize(horizontal: false, vertical: true)
+                        }
+                    }
+                    HStack(alignment: .top, spacing: 16) {
+                        Text(tr("settings.iconSize"))
+                            .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
+                                    Text("\(Int(size))").tag(size)
+                                }
+                            }
+                            .pickerStyle(.segmented)
+                            .frame(width: compactPickerWidth, alignment: .leading)
+                            Text(tr("settings.iconSizeDesc"))
+                                .font(.caption).foregroundStyle(.secondary)
+                                .fixedSize(horizontal: false, vertical: true)
+                        }
+                    }
                 }
             }
-            .tabItem { Label("General", systemImage: "gearshape") }
+            .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,
@@ -492,69 +735,99 @@
                     onRefresh: { scanApps() }
                 )
             }
-            .tabItem { Label("Tags", systemImage: "tag.fill") }
+            .padding(.leading, 16)
+            .tabItem { Label(tr("settings.tags"), systemImage: "tag.fill") }
             .onAppear { scanApps() }
 
-            // Tab 3: Data
+            // Tab 4: Data
             Form {
                 Section {
-                    HStack {
-                        Button("Re-index Now") {
-                            NotificationCenter.default.post(name: .apptagReindex, object: nil)
-                        }
-                        .buttonStyle(.borderedProminent)
-
-                        Text("Re-scan all app directories and refresh the tag database.")
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
-                    }
-                } header: {
-                    Text("Index Management")
-                }
-
-                Section {
                     HStack(spacing: 12) {
-                        Button("Export Tags…") { exportTags() }
+                        Button(tr("settings.export")) { exportTags() }
                             .buttonStyle(.bordered)
-                        Button("Import Tags…") { importTags() }
+                        Button(tr("settings.import")) { importTags() }
                             .buttonStyle(.bordered)
                     }
-                    Text("Export saves your tag assignments to a JSON file. Import replaces the current database with one from a file.")
+                    Text(tr("settings.backupDesc"))
                         .font(.caption)
                         .foregroundStyle(.secondary)
                 } header: {
-                    Text("Backup & Restore")
+                    Text(tr("settings.backup"))
                 }
             }
-            .tabItem { Label("Data", systemImage: "externaldrive.fill") }
+            .tabItem { Label(tr("settings.data"), systemImage: "externaldrive.fill") }
             .padding()
 
-            // Tab 3: About
+            // Tab 5: About
             Form {
                 Section {
                     HStack {
                         if let icon = NSImage(named: NSImage.applicationIconName) {
                             Image(nsImage: icon)
                                 .resizable()
-                                .frame(width: 64, height: 64)
+                                .frame(width: 128, height: 128)
                         }
                         VStack(alignment: .leading, spacing: 4) {
-                            Text("Apptag")
+                            Text("TagLauncher")
                                 .font(.title2)
                                 .fontWeight(.semibold)
-                            Text("Tag-based app launcher")
+                            Text(tr("app.description"))
                                 .font(.body)
                                 .foregroundStyle(.secondary)
-                            Text("Version \(appVersion) (Build \(buildVersion))")
+                            Text("\(tr("app.version")) \(appVersion) (\(tr("app.build")) \(buildVersion))")
                                 .font(.callout)
                                 .foregroundStyle(.tertiary)
+
+                            Divider()
+                                .padding(.vertical, 4)
+
+                            Text("万物之中,希望最美")
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
+                            Text("永桔@2026-18602102518")
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
                         }
                     }
+                    .padding(.leading, 100)
                 }
             }
-            .tabItem { Label("About", systemImage: "info.circle") }
+            .tabItem { Label(tr("settings.about"), systemImage: "info.circle") }
             .padding()
+            }
+            .id(languageRefreshID)
+            .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, idealWidth: 660, minHeight: 380, idealHeight: 380)
+        .frame(minWidth: settingsWindowWidth, maxWidth: settingsWindowWidth, minHeight: 420)
+    }
+
+    private func showLanguageRefresh() {
+        isRefreshingLanguage = true
+        languageRefreshID = UUID()
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
+            withAnimation(.easeOut(duration: 0.18)) {
+                isRefreshingLanguage = false
+            }
+        }
     }
 }

--
Gitblit v1.9.3