diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 1f9e891993..58ff6fb459 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -398,6 +398,7 @@ import { dataGridConditionColumnOptions, dataGridConditionIdentifierQuote, dataG import { isMacOS } from "@/lib/backend/platform"; import { appendDebugLog, isDebugLoggingEnabled } from "@/lib/backend/debugLog"; import { formatShortcut } from "@/lib/editor/shortcutRegistry"; +import { formatShortcutTooltip } from "@/lib/editor/shortcutDisplay"; import { SearchableSelect } from "@/components/ui/searchable-select"; import { useDataGridColumnFormatter } from "@/composables/useDataGridColumnFormatter"; import { useDataGridTableMetadataLoaders } from "@/composables/useDataGridTableMetadataLoaders"; @@ -2212,6 +2213,7 @@ function goToColumnTriggerElement(): HTMLElement | undefined { } const goToColumnSelectedIndex = ref(0); +const goToColumnTooltip = computed(() => formatShortcutTooltip(t("grid.goToColumn"), settingsStore.editorSettings.shortcuts.goToColumn)); const columnOrderKeys = computed(() => uniqueDataGridColumnOrderKeys(props.result.columns, props.sourceColumns)); const resolvedColumnLayoutScopeKey = computed( () => @@ -12868,7 +12870,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val - {{ t("grid.goToColumn") }} + {{ goToColumnTooltip }}
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridToolbarIconTooltips.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridToolbarIconTooltips.spec.ts index dcb02e88cf..aa65fd5c81 100644 --- a/apps/desktop/src/components/grid/__tests__/DataGridToolbarIconTooltips.spec.ts +++ b/apps/desktop/src/components/grid/__tests__/DataGridToolbarIconTooltips.spec.ts @@ -205,6 +205,7 @@ describe("data grid icon-only toolbar tooltips", () => { await hover(button); expect(showsTooltip("Go to column")).toBe(true); + expect(visibleTooltipTexts().some((text) => text.includes("Go to column (") && text.includes("G)"))).toBe(true); }); }); diff --git a/apps/desktop/src/components/layout/AppToolbar.vue b/apps/desktop/src/components/layout/AppToolbar.vue index cc2d0d4d0c..12233c130c 100644 --- a/apps/desktop/src/components/layout/AppToolbar.vue +++ b/apps/desktop/src/components/layout/AppToolbar.vue @@ -14,6 +14,7 @@ import { MAC_TRAFFIC_LIGHT_X, macTrafficLightInsetPaddingForScale, shouldReserve import { useToast } from "@/composables/useToast"; import { useSettingsStore } from "@/stores/settingsStore"; import { isSystemAppThemeMode, type AppThemeMode } from "@/lib/app/appTheme"; +import { formatShortcutTooltip } from "@/lib/editor/shortcutDisplay"; const GithubIcon = { render() { @@ -96,6 +97,10 @@ const updateTooltip = computed(() => { if (props.hasUpdateAvailable && props.updateReadyToInstall) return t("updates.downloadedReady", { version: props.updateVersion ?? "" }); return t("updates.check"); }); +const sidebarExpandTooltip = computed(() => formatShortcutTooltip(t("sidebar.expand"), settingsStore.editorSettings.shortcuts.toggleSidebar)); +const newQueryTooltip = computed(() => formatShortcutTooltip(t("toolbar.newQuery"), settingsStore.editorSettings.shortcuts.newQuery)); +const aiTooltip = computed(() => formatShortcutTooltip("AI", settingsStore.editorSettings.shortcuts.toggleAiPanel)); +const settingsTooltip = computed(() => (props.hasMcpUpdateAvailable ? t("toolbar.mcpUpdateAvailable") : formatShortcutTooltip(t("settings.title"), settingsStore.editorSettings.shortcuts.openSettings))); const sqlLibrarySaveFeedbackActive = ref(false); const SQL_LIBRARY_BOOKMARK_PATH = "M10 2 L10 10 L13 7 L16 10 L16 2"; @@ -554,7 +559,7 @@ const toolbarStyle = computed(() => { - {{ t("sidebar.expand") }} + {{ sidebarExpandTooltip }} - + + + + + {{ newQueryTooltip }} +