fix(toolbar): show real keyboard shortcuts in button tooltips (#1694)

datlechin · datlechin · commit 2079963af339 · 2026-06-17T23:19:09.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - DuckDB VARIANT columns now show their value as text instead of an empty cell.
 - A new database group now appears in the connection list right away instead of only after restarting the app. (#1704)
 - The SQL formatter keeps nested indentation for UNION, UNION ALL, INTERSECT, and EXCEPT inside a derived table or CTE, and puts the closing parenthesis of a subquery on its own line instead of collapsing it onto the last SELECT. (#1698)
+- Toolbar button tooltips now show each action's real keyboard shortcut and follow your custom bindings, instead of a fixed value. The Switch Connection tooltip showed the wrong shortcut. (#1694)
 
 ## [0.51.1] - 2026-06-16
 
diff --git a/TablePro/Core/Services/Infrastructure/MainWindowToolbar+Buttons.swift b/TablePro/Core/Services/Infrastructure/MainWindowToolbar+Buttons.swift
@@ -17,7 +17,7 @@ struct ConnectionToolbarButton: View {
         } label: {
             Label("Connection", systemImage: "network")
         }
-        .help(String(localized: "Switch Connection (⌘⌥C)"))
+        .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Switch Connection"), for: .switchConnection))
         .popover(isPresented: $coordinator.isConnectionSwitcherShown, arrowEdge: .bottom) {
             ConnectionSwitcherPopover()
         }
@@ -37,7 +37,7 @@ struct DatabaseToolbarButton: View {
             } label: {
                 Label(containerName, systemImage: "cylinder")
             }
-            .help(String(format: String(localized: "Open %@ (⌘K)"), containerName))
+            .help(AppSettingsManager.shared.keyboard.shortcutHint(String(format: String(localized: "Open %@"), containerName), for: .openDatabase))
             .disabled(
                 state.connectionState != .connected
                     || PluginManager.shared.connectionMode(for: state.databaseType) == .fileBased
@@ -89,7 +89,7 @@ struct RefreshToolbarButton: View {
         } label: {
             Label("Refresh", systemImage: "arrow.clockwise")
         }
-        .help(String(localized: "Refresh (⌘R)"))
+        .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Refresh"), for: .refresh))
         .disabled(state.connectionState != .connected)
     }
 }
@@ -104,7 +104,7 @@ struct SaveChangesToolbarButton: View {
         } label: {
             Label("Save Changes", systemImage: "checkmark.circle.fill")
         }
-        .help(String(localized: "Save Changes (⌘S)"))
+        .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Save Changes"), for: .saveChanges))
         .disabled(
             !state.hasPendingChanges
                 || state.connectionState != .connected
@@ -124,7 +124,7 @@ struct QuickSwitcherToolbarButton: View {
         } label: {
             Label("Quick Switcher", systemImage: "magnifyingglass")
         }
-        .help(String(localized: "Quick Switcher (⇧⌘O)"))
+        .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Quick Switcher"), for: .quickSwitcher))
         .disabled(state.connectionState != .connected)
     }
 }
@@ -139,7 +139,7 @@ struct NewTabToolbarButton: View {
         } label: {
             Label("New Tab", systemImage: "plus.rectangle")
         }
-        .help(String(localized: "New Query Tab (⌘T)"))
+        .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "New Query Tab"), for: .newTab))
         .disabled(state.connectionState != .connected)
     }
 }
@@ -149,13 +149,14 @@ struct PreviewSQLToolbarButton: View {
 
     var body: some View {
         let state = coordinator.toolbarState
+        let langName = PluginManager.shared.queryLanguageName(for: state.databaseType)
+        let previewLabel = String(format: String(localized: "Preview %@"), langName)
         Button {
             coordinator.commandActions?.previewSQL()
         } label: {
-            let langName = PluginManager.shared.queryLanguageName(for: state.databaseType)
-            Label(String(format: String(localized: "Preview %@"), langName), systemImage: "eye")
+            Label(previewLabel, systemImage: "eye")
         }
-        .help(String(format: String(localized: "Preview %@ (⌘⇧P)"), PluginManager.shared.queryLanguageName(for: state.databaseType)))
+        .help(AppSettingsManager.shared.keyboard.shortcutHint(previewLabel, for: .previewSQL))
         .disabled(!state.hasDataPendingChanges || state.connectionState != .connected)
     }
 }
@@ -175,7 +176,7 @@ struct ResultsToolbarButton: View {
                     : "rectangle.inset.filled"
             )
         }
-        .help(String(localized: "Toggle Results (⌘⌥R)"))
+        .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Toggle Results"), for: .toggleResults))
         .disabled(state.connectionState != .connected || state.isTableTab)
     }
 }
@@ -205,7 +206,7 @@ struct HistoryToolbarButton: View {
         } label: {
             Label("History", systemImage: "clock")
         }
-        .help(String(localized: "Toggle Query History (⌘Y)"))
+        .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Toggle Query History"), for: .toggleHistory))
     }
 }
 
@@ -219,7 +220,7 @@ struct ExportToolbarButton: View {
         } label: {
             Label("Export", systemImage: "square.and.arrow.up")
         }
-        .help(String(localized: "Export Data (⌘⇧E)"))
+        .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Export Data"), for: .export))
         .disabled(state.connectionState != .connected)
     }
 }
@@ -238,7 +239,7 @@ struct ImportToolbarButton: View {
                 } label: {
                     Label("Import", systemImage: "square.and.arrow.down")
                 }
-                .help(String(localized: "Import Data (⌘⇧I)"))
+                .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Import Data"), for: .importData))
                 .disabled(isDisabled || formats.isEmpty)
             } else {
                 Menu {
@@ -250,7 +251,7 @@ struct ImportToolbarButton: View {
                 } label: {
                     Label("Import", systemImage: "square.and.arrow.down")
                 }
-                .help(String(localized: "Import Data (⌘⇧I)"))
+                .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Import Data"), for: .importData))
                 .disabled(isDisabled)
             }
         }
diff --git a/TablePro/Models/UI/KeyboardShortcutModels.swift b/TablePro/Models/UI/KeyboardShortcutModels.swift
@@ -375,6 +375,15 @@ struct KeyboardSettings: Codable, Equatable {
         return KeyboardShortcut(equivalent, modifiers: key.eventModifiers)
     }
 
+    /// A tooltip/help string that appends the action's resolved shortcut, e.g.
+    /// "Switch Connection (⌃⌘C)". Returns just the label when the shortcut is
+    /// cleared or unset. Reflects user overrides because it resolves through
+    /// `shortcut(for:)`.
+    func shortcutHint(_ label: String, for action: ShortcutAction) -> String {
+        guard let key = shortcut(for: action), !key.isCleared else { return label }
+        return "\(label) (\(key.displayString))"
+    }
+
     // MARK: - Default Shortcuts
 
     /// Default shortcuts, applied when the user has no override. An action absent
diff --git a/TablePro/Views/Components/PaginationControlsView.swift b/TablePro/Views/Components/PaginationControlsView.swift
@@ -139,10 +139,7 @@ struct PaginationControlsView: View {
     }
 
     private func helpText(_ label: String, for shortcut: ShortcutAction) -> String {
-        guard let combo = AppSettingsManager.shared.keyboard.shortcut(for: shortcut), !combo.isCleared else {
-            return label
-        }
-        return "\(label) (\(combo.displayString))"
+        AppSettingsManager.shared.keyboard.shortcutHint(label, for: shortcut)
     }
 
     private var pageIndicator: some View {
diff --git a/TablePro/Views/Editor/QueryEditorView.swift b/TablePro/Views/Editor/QueryEditorView.swift
@@ -142,10 +142,7 @@ struct QueryEditorView: View {
     // MARK: - Helpers
 
     private func shortcutHint(_ label: String, for action: ShortcutAction) -> String {
-        guard let combo = AppSettingsManager.shared.keyboard.shortcut(for: action), !combo.isCleared else {
-            return label
-        }
-        return "\(label) (\(combo.displayString))"
+        AppSettingsManager.shared.keyboard.shortcutHint(label, for: action)
     }
 
     @ViewBuilder
diff --git a/TablePro/Views/Main/Child/MainStatusBarView.swift b/TablePro/Views/Main/Child/MainStatusBarView.swift
@@ -61,11 +61,7 @@ struct MainStatusBarView: View {
     }
 
     private func helpText(_ label: String, shortcut action: ShortcutAction) -> String {
-        guard let combo = AppSettingsManager.shared.keyboard.shortcut(for: action),
-              !combo.isCleared else {
-            return label
-        }
-        return "\(label) (\(combo.displayString))"
+        AppSettingsManager.shared.keyboard.shortcutHint(label, for: action)
     }
 
     private var columnsAccessibilityLabel: String {
diff --git a/TableProTests/Models/KeyboardShortcutTests.swift b/TableProTests/Models/KeyboardShortcutTests.swift
@@ -251,3 +251,40 @@ struct KeyboardSettingsMigrationTests {
         #expect(settings.shortcut(for: .executeQuery)?.isCleared == true)
     }
 }
+
+@Suite("Shortcut hint")
+struct ShortcutHintTests {
+    @Test("Switch Connection default hint shows Control+Command+C")
+    func switchConnectionDefaultHint() {
+        let hint = KeyboardSettings.default.shortcutHint(
+            String(localized: "Switch Connection"),
+            for: .switchConnection
+        )
+        #expect(hint == "Switch Connection (⌃⌘C)")
+    }
+
+    @Test("Hint reflects a user override")
+    func hintReflectsOverride() {
+        var settings = KeyboardSettings.default
+        settings.setShortcut(.character("j", command: true), for: .switchConnection)
+        let hint = settings.shortcutHint(String(localized: "Switch Connection"), for: .switchConnection)
+        #expect(hint == "Switch Connection (⌘J)")
+    }
+
+    @Test("Cleared shortcut shows label only")
+    func clearedShortcutShowsLabelOnly() {
+        var settings = KeyboardSettings.default
+        settings.clearShortcut(for: .switchConnection)
+        let hint = settings.shortcutHint(String(localized: "Switch Connection"), for: .switchConnection)
+        #expect(hint == "Switch Connection")
+    }
+
+    @Test("Action without a default shows label only")
+    func unsetShortcutShowsLabelOnly() {
+        let hint = KeyboardSettings.default.shortcutHint(
+            String(localized: "Manage Connections"),
+            for: .manageConnections
+        )
+        #expect(hint == "Manage Connections")
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ struct ConnectionToolbarButton: View {`
`17`	`17`	`} label: {`
`18`	`18`	`Label("Connection", systemImage: "network")`
`19`	`19`	`}`
`20`		`- .help(String(localized: "Switch Connection (⌘⌥C)"))`
	`20`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Switch Connection"), for: .switchConnection))`
`21`	`21`	`.popover(isPresented: $coordinator.isConnectionSwitcherShown, arrowEdge: .bottom) {`
`22`	`22`	`ConnectionSwitcherPopover()`
`23`	`23`	`}`
`@@ -37,7 +37,7 @@ struct DatabaseToolbarButton: View {`
`37`	`37`	`} label: {`
`38`	`38`	`Label(containerName, systemImage: "cylinder")`
`39`	`39`	`}`
`40`		`- .help(String(format: String(localized: "Open %@ (⌘K)"), containerName))`
	`40`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(format: String(localized: "Open %@"), containerName), for: .openDatabase))`
`41`	`41`	`.disabled(`
`42`	`42`	`state.connectionState != .connected`
`43`	`43`	`\|\| PluginManager.shared.connectionMode(for: state.databaseType) == .fileBased`
`@@ -89,7 +89,7 @@ struct RefreshToolbarButton: View {`
`89`	`89`	`} label: {`
`90`	`90`	`Label("Refresh", systemImage: "arrow.clockwise")`
`91`	`91`	`}`
`92`		`- .help(String(localized: "Refresh (⌘R)"))`
	`92`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Refresh"), for: .refresh))`
`93`	`93`	`.disabled(state.connectionState != .connected)`
`94`	`94`	`}`
`95`	`95`	`}`
`@@ -104,7 +104,7 @@ struct SaveChangesToolbarButton: View {`
`104`	`104`	`} label: {`
`105`	`105`	`Label("Save Changes", systemImage: "checkmark.circle.fill")`
`106`	`106`	`}`
`107`		`- .help(String(localized: "Save Changes (⌘S)"))`
	`107`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Save Changes"), for: .saveChanges))`
`108`	`108`	`.disabled(`
`109`	`109`	`!state.hasPendingChanges`
`110`	`110`	`\|\| state.connectionState != .connected`
`@@ -124,7 +124,7 @@ struct QuickSwitcherToolbarButton: View {`
`124`	`124`	`} label: {`
`125`	`125`	`Label("Quick Switcher", systemImage: "magnifyingglass")`
`126`	`126`	`}`
`127`		`- .help(String(localized: "Quick Switcher (⇧⌘O)"))`
	`127`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Quick Switcher"), for: .quickSwitcher))`
`128`	`128`	`.disabled(state.connectionState != .connected)`
`129`	`129`	`}`
`130`	`130`	`}`
`@@ -139,7 +139,7 @@ struct NewTabToolbarButton: View {`
`139`	`139`	`} label: {`
`140`	`140`	`Label("New Tab", systemImage: "plus.rectangle")`
`141`	`141`	`}`
`142`		`- .help(String(localized: "New Query Tab (⌘T)"))`
	`142`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "New Query Tab"), for: .newTab))`
`143`	`143`	`.disabled(state.connectionState != .connected)`
`144`	`144`	`}`
`145`	`145`	`}`
`@@ -149,13 +149,14 @@ struct PreviewSQLToolbarButton: View {`
`149`	`149`
`150`	`150`	`var body: some View {`
`151`	`151`	`let state = coordinator.toolbarState`
	`152`	`+ let langName = PluginManager.shared.queryLanguageName(for: state.databaseType)`
	`153`	`+ let previewLabel = String(format: String(localized: "Preview %@"), langName)`
`152`	`154`	`Button {`
`153`	`155`	`coordinator.commandActions?.previewSQL()`
`154`	`156`	`} label: {`
`155`		`- let langName = PluginManager.shared.queryLanguageName(for: state.databaseType)`
`156`		`- Label(String(format: String(localized: "Preview %@"), langName), systemImage: "eye")`
	`157`	`+ Label(previewLabel, systemImage: "eye")`
`157`	`158`	`}`
`158`		`- .help(String(format: String(localized: "Preview %@ (⌘⇧P)"), PluginManager.shared.queryLanguageName(for: state.databaseType)))`
	`159`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(previewLabel, for: .previewSQL))`
`159`	`160`	`.disabled(!state.hasDataPendingChanges \|\| state.connectionState != .connected)`
`160`	`161`	`}`
`161`	`162`	`}`
`@@ -175,7 +176,7 @@ struct ResultsToolbarButton: View {`
`175`	`176`	`: "rectangle.inset.filled"`
`176`	`177`	`)`
`177`	`178`	`}`
`178`		`- .help(String(localized: "Toggle Results (⌘⌥R)"))`
	`179`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Toggle Results"), for: .toggleResults))`
`179`	`180`	`.disabled(state.connectionState != .connected \|\| state.isTableTab)`
`180`	`181`	`}`
`181`	`182`	`}`
`@@ -205,7 +206,7 @@ struct HistoryToolbarButton: View {`
`205`	`206`	`} label: {`
`206`	`207`	`Label("History", systemImage: "clock")`
`207`	`208`	`}`
`208`		`- .help(String(localized: "Toggle Query History (⌘Y)"))`
	`209`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Toggle Query History"), for: .toggleHistory))`
`209`	`210`	`}`
`210`	`211`	`}`
`211`	`212`
`@@ -219,7 +220,7 @@ struct ExportToolbarButton: View {`
`219`	`220`	`} label: {`
`220`	`221`	`Label("Export", systemImage: "square.and.arrow.up")`
`221`	`222`	`}`
`222`		`- .help(String(localized: "Export Data (⌘⇧E)"))`
	`223`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Export Data"), for: .export))`
`223`	`224`	`.disabled(state.connectionState != .connected)`
`224`	`225`	`}`
`225`	`226`	`}`
`@@ -238,7 +239,7 @@ struct ImportToolbarButton: View {`
`238`	`239`	`} label: {`
`239`	`240`	`Label("Import", systemImage: "square.and.arrow.down")`
`240`	`241`	`}`
`241`		`- .help(String(localized: "Import Data (⌘⇧I)"))`
	`242`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Import Data"), for: .importData))`
`242`	`243`	`.disabled(isDisabled \|\| formats.isEmpty)`
`243`	`244`	`} else {`
`244`	`245`	`Menu {`
`@@ -250,7 +251,7 @@ struct ImportToolbarButton: View {`
`250`	`251`	`} label: {`
`251`	`252`	`Label("Import", systemImage: "square.and.arrow.down")`
`252`	`253`	`}`
`253`		`- .help(String(localized: "Import Data (⌘⇧I)"))`
	`254`	`+ .help(AppSettingsManager.shared.keyboard.shortcutHint(String(localized: "Import Data"), for: .importData))`
`254`	`255`	`.disabled(isDisabled)`
`255`	`256`	`}`
`256`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,7 @@ struct PaginationControlsView: View {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`private func helpText(_ label: String, for shortcut: ShortcutAction) -> String {`
`142`		`- guard let combo = AppSettingsManager.shared.keyboard.shortcut(for: shortcut), !combo.isCleared else {`
`143`		`- return label`
`144`		`- }`
`145`		`- return "\(label) (\(combo.displayString))"`
	`142`	`+ AppSettingsManager.shared.keyboard.shortcutHint(label, for: shortcut)`
`146`	`143`	`}`
`147`	`144`
`148`	`145`	`private var pageIndicator: some View {`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,7 @@ struct MainStatusBarView: View {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private func helpText(_ label: String, shortcut action: ShortcutAction) -> String {`
`64`		`- guard let combo = AppSettingsManager.shared.keyboard.shortcut(for: action),`
`65`		`- !combo.isCleared else {`
`66`		`- return label`
`67`		`- }`
`68`		`- return "\(label) (\(combo.displayString))"`
	`64`	`+ AppSettingsManager.shared.keyboard.shortcutHint(label, for: action)`
`69`	`65`	`}`
`70`	`66`
`71`	`67`	`private var columnsAccessibilityLabel: String {`