fix: shorten icon theme copy by platform

Co-authored-by: tangheng <tangheng@tanghengdeMacBook-Pro.local>
This commit is contained in:
zipgandtangheng authored and GitHub committed 2026-07-11 21:55:11 +08:00
1 parent 8ff0f13bd4
commit 00d78d8b6a
8 files changed
+18 -10

No files matched your search

@@ -90,7 +90,7 @@ import { executableStatementRangeCacheForDoc, executableStatementRangeStartingAt
import { EMPTY_TABLE_COLUMN_TEMPLATE_DATA_TYPE, parseTableColumnTemplateFields, TABLE_COLUMN_TEMPLATE_DATABASE_TYPES } from "@/lib/table/tableColumnTemplates"; import { EMPTY_TABLE_COLUMN_TEMPLATE_DATA_TYPE, parseTableColumnTemplateFields, TABLE_COLUMN_TEMPLATE_DATABASE_TYPES } from "@/lib/table/tableColumnTemplates";
import { DEFAULT_SQL_VARIABLE_SYNTAX_TOGGLES, normalizeSqlVariableSyntaxOverrides, SQL_VARIABLE_SYNTAX_DATABASE_TYPES, SQL_VARIABLE_SYNTAX_KEYS, SQL_VARIABLE_SYNTAX_TOKENS, type SqlVariableSyntaxOverrides, type SqlVariableSyntaxToggles } from "@/lib/sql/sqlVariableSyntax"; import { DEFAULT_SQL_VARIABLE_SYNTAX_TOGGLES, normalizeSqlVariableSyntaxOverrides, SQL_VARIABLE_SYNTAX_DATABASE_TYPES, SQL_VARIABLE_SYNTAX_KEYS, SQL_VARIABLE_SYNTAX_TOKENS, type SqlVariableSyntaxOverrides, type SqlVariableSyntaxToggles } from "@/lib/sql/sqlVariableSyntax";
import { buildMcpCodexConfig, buildMcpJsonConfig, buildMcpOpenCodeConfig, buildMcpVsCodeConfig, type McpEnvEntry, type McpLaunchConfig } from "@/lib/mcp/mcpConfigTemplates"; import { buildMcpCodexConfig, buildMcpJsonConfig, buildMcpOpenCodeConfig, buildMcpVsCodeConfig, type McpEnvEntry, type McpLaunchConfig } from "@/lib/mcp/mcpConfigTemplates";
import { isWindows } from "@/lib/backend/platform"; import { isMacOS, isWindows } from "@/lib/backend/platform";
import { combineDataTypeForDatabase, dataTypeLengthInputValue, getDataTypeOptions, getDefaultLengthForType, isDataTypeLengthDisabled, splitDataType } from "@/lib/table/tableStructureEditorState"; import { combineDataTypeForDatabase, dataTypeLengthInputValue, getDataTypeOptions, getDefaultLengthForType, isDataTypeLengthDisabled, splitDataType } from "@/lib/table/tableStructureEditorState";
import { useToast } from "@/composables/useToast"; import { useToast } from "@/composables/useToast";
import type { DatabaseType, SqlSnippet } from "@/types/database"; import type { DatabaseType, SqlSnippet } from "@/types/database";
@@ -437,6 +437,7 @@ const iconThemeDescRef = {
default: ref<HTMLElement | null>(null), default: ref<HTMLElement | null>(null),
black: ref<HTMLElement | null>(null), black: ref<HTMLElement | null>(null),
}; };
const iconThemeBlackDescriptionText = computed(() => (isMacOS() ? t("settings.iconThemeBlackDescriptionMac") : t("settings.iconThemeBlackDescription")));
const layoutDescTruncated = { separated: ref<boolean>(false), classic: ref<boolean>(false) }; const layoutDescTruncated = { separated: ref<boolean>(false), classic: ref<boolean>(false) };
const layoutDescRefs = { const layoutDescRefs = {
separated: ref<HTMLElement | null>(null), separated: ref<HTMLElement | null>(null),
@@ -3101,11 +3102,11 @@ onUnmounted(cleanupPreviewEditor);
<TooltipTrigger as-child> <TooltipTrigger as-child>
<div class="w-full min-w-0 text-left"> <div class="w-full min-w-0 text-left">
<div class="text-sm font-medium">{{ t("settings.iconThemeBlack") }}</div> <div class="text-sm font-medium">{{ t("settings.iconThemeBlack") }}</div>
<div :ref="(el) => setIconThemeDescRef('black', el)" class="text-xs text-muted-foreground truncate">{{ t("settings.iconThemeBlackDescription") }}</div> <div :ref="(el) => setIconThemeDescRef('black', el)" class="text-xs text-muted-foreground truncate">{{ iconThemeBlackDescriptionText }}</div>
</div> </div>
</TooltipTrigger> </TooltipTrigger>
<TooltipContent v-if="iconThemeDescTruncated.black.value" class="max-w-[320px] text-xs leading-relaxed"> <TooltipContent v-if="iconThemeDescTruncated.black.value" class="max-w-[320px] text-xs leading-relaxed">
{{ t("settings.iconThemeBlackDescription") }} {{ iconThemeBlackDescriptionText }}
</TooltipContent> </TooltipContent>
</Tooltip> </Tooltip>
</TooltipProvider> </TooltipProvider>
+2 -1
View File
@@ -2981,7 +2981,8 @@ export default {
iconThemeDefault: "Default", iconThemeDefault: "Default",
iconThemeDefaultDescription: "Use the color DBX app icon.", iconThemeDefaultDescription: "Use the color DBX app icon.",
iconThemeBlack: "Black", iconThemeBlack: "Black",
iconThemeBlackDescription: "Use the black in-app logo. On macOS, the Dock icon keeps the color mark on a black background, while the menu bar icon follows the system appearance.", iconThemeBlackDescription: "Use the black DBX logo in the app.",
iconThemeBlackDescriptionMac: "Use the black logo in the app; Dock uses a black plate, menu bar follows the system.",
showTrayIcon: "Show tray/menu bar icon", showTrayIcon: "Show tray/menu bar icon",
showTrayIconDescription: "When disabled, no icon is shown, but closing the window still hides DBX in the background as before.", showTrayIconDescription: "When disabled, no icon is shown, but closing the window still hides DBX in the background as before.",
quitOnClose: "Quit when closing window", quitOnClose: "Quit when closing window",
+2 -1
View File
@@ -2875,7 +2875,8 @@ export default withEnglishFallback({
iconThemeDefault: "Predeterminado", iconThemeDefault: "Predeterminado",
iconThemeDefaultDescription: "Usar el icono de color de DBX.", iconThemeDefaultDescription: "Usar el icono de color de DBX.",
iconThemeBlack: "Negro", iconThemeBlack: "Negro",
iconThemeBlackDescription: "Usa el logo negro dentro de la aplicación. En macOS, el Dock conserva la marca de color sobre un fondo negro y la barra de menús sigue la apariencia del sistema.", iconThemeBlackDescription: "Usa el logo negro de DBX en la aplicación.",
iconThemeBlackDescriptionMac: "Usa el logo negro en la app; Dock usa fondo negro y la barra de menús sigue el sistema.",
showTrayIcon: "Mostrar icono en bandeja/barra de menú", showTrayIcon: "Mostrar icono en bandeja/barra de menú",
showTrayIconDescription: "Si está desactivado, no se muestra el icono, pero cerrar la ventana sigue ocultando DBX en segundo plano como antes.", showTrayIconDescription: "Si está desactivado, no se muestra el icono, pero cerrar la ventana sigue ocultando DBX en segundo plano como antes.",
quitOnClose: "Salir al cerrar la ventana", quitOnClose: "Salir al cerrar la ventana",
+2 -1
View File
@@ -2873,7 +2873,8 @@ export default withEnglishFallback({
iconThemeDefault: "Predefinito", iconThemeDefault: "Predefinito",
iconThemeDefaultDescription: "Utilizza l'icona colorata dell'app DBX.", iconThemeDefaultDescription: "Utilizza l'icona colorata dell'app DBX.",
iconThemeBlack: "Nero", iconThemeBlack: "Nero",
iconThemeBlackDescription: "Usa il logo nero nell'app. Su macOS, il Dock mantiene il marchio colorato su uno sfondo nero e l'icona della barra dei menu segue il sistema.", iconThemeBlackDescription: "Usa il logo DBX nero nell'app.",
iconThemeBlackDescriptionMac: "Usa il logo nero nell'app; il Dock usa una base nera e la barra menu segue il sistema.",
showTrayIcon: "Mostra icona nella barra delle applicazioni/menu", showTrayIcon: "Mostra icona nella barra delle applicazioni/menu",
showTrayIconDescription: "Se disattivato, non viene mostrata alcuna icona, ma la chiusura della finestra nasconderà comunque DBX in background.", showTrayIconDescription: "Se disattivato, non viene mostrata alcuna icona, ma la chiusura della finestra nasconderà comunque DBX in background.",
quitOnClose: "Esci alla chiusura della finestra", quitOnClose: "Esci alla chiusura della finestra",
+2 -1
View File
@@ -2874,7 +2874,8 @@ export default withEnglishFallback({
iconThemeDefault: "デフォルト", iconThemeDefault: "デフォルト",
iconThemeDefaultDescription: "カラーDBXアプリアイコンを使用。", iconThemeDefaultDescription: "カラーDBXアプリアイコンを使用。",
iconThemeBlack: "黒", iconThemeBlack: "黒",
iconThemeBlackDescription: "アプリ内ロゴは黒いマークを使用します。macOSのDockは黒い背景にカラーマークを表示し、メニューバーアイコンはシステム表示に従います。", iconThemeBlackDescription: "アプリ内で黒いDBXロゴを使用。",
iconThemeBlackDescriptionMac: "アプリ内は黒いロゴ、Dockは黒い背景、メニューバーはシステムに従います。",
showTrayIcon: "トレイ/メニューバーアイコンを表示", showTrayIcon: "トレイ/メニューバーアイコンを表示",
showTrayIconDescription: "無効時はアイコンが表示されませんが、ウィンドウを閉じると従来通りDBXはバックグラウンドに隠れます。", showTrayIconDescription: "無効時はアイコンが表示されませんが、ウィンドウを閉じると従来通りDBXはバックグラウンドに隠れます。",
quitOnClose: "ウィンドウを閉じるときに終了", quitOnClose: "ウィンドウを閉じるときに終了",
+2 -1
View File
@@ -2875,7 +2875,8 @@ export default withEnglishFallback({
iconThemeDefault: "Padrão", iconThemeDefault: "Padrão",
iconThemeDefaultDescription: "Usar o ícone colorido do app DBX.", iconThemeDefaultDescription: "Usar o ícone colorido do app DBX.",
iconThemeBlack: "Preto", iconThemeBlack: "Preto",
iconThemeBlackDescription: "Use o logo preto dentro do aplicativo. No macOS, o Dock mantém a marca colorida sobre fundo preto e o ícone da barra de menus segue o sistema.", iconThemeBlackDescription: "Use o logo preto da DBX no app.",
iconThemeBlackDescriptionMac: "No app, usa o logo preto; o Dock usa base preta e a barra de menus segue o sistema.",
showTrayIcon: "Mostrar ícone na bandeja/barra de menus", showTrayIcon: "Mostrar ícone na bandeja/barra de menus",
showTrayIconDescription: "Quando desativado, nenhum ícone é exibido, mas fechar a janela ainda oculta o DBX em segundo plano como antes.", showTrayIconDescription: "Quando desativado, nenhum ícone é exibido, mas fechar a janela ainda oculta o DBX em segundo plano como antes.",
quitOnClose: "Sair ao fechar a janela", quitOnClose: "Sair ao fechar a janela",
+2 -1
View File
@@ -2980,7 +2980,8 @@ export default withEnglishFallback({
iconThemeDefault: "默认", iconThemeDefault: "默认",
iconThemeDefaultDescription: "使用彩色 DBX 应用图标。", iconThemeDefaultDescription: "使用彩色 DBX 应用图标。",
iconThemeBlack: "黑色", iconThemeBlack: "黑色",
iconThemeBlackDescription: "应用内 Logo 使用黑色标识;macOS Dock 使用纯黑底板和彩色标识,菜单栏图标仍跟随系统外观。", iconThemeBlackDescription: "应用内使用黑色 DBX 标识。",
iconThemeBlackDescriptionMac: "应用内使用黑色标识;Dock 使用黑色底板,菜单栏跟随系统。",
showTrayIcon: "显示系统托盘/菜单栏图标", showTrayIcon: "显示系统托盘/菜单栏图标",
showTrayIconDescription: "关闭后不显示图标,但关闭窗口仍会像之前一样隐藏到后台。", showTrayIconDescription: "关闭后不显示图标,但关闭窗口仍会像之前一样隐藏到后台。",
quitOnClose: "关闭窗口时退出程序", quitOnClose: "关闭窗口时退出程序",
+2 -1
View File
@@ -2729,7 +2729,8 @@ export default withEnglishFallback({
iconThemeDefault: "預設", iconThemeDefault: "預設",
iconThemeDefaultDescription: "使用彩色 DBX 應用程式圖示。", iconThemeDefaultDescription: "使用彩色 DBX 應用程式圖示。",
iconThemeBlack: "黑色", iconThemeBlack: "黑色",
iconThemeBlackDescription: "應用程式內 Logo 使用黑色標誌;macOS Dock 使用純黑底板和彩色標誌,選單列圖示仍跟隨系統外觀。", iconThemeBlackDescription: "應用程式內使用黑色 DBX 標誌。",
iconThemeBlackDescriptionMac: "應用程式內使用黑色標誌;Dock 使用黑色底板,選單列跟隨系統。",
showTrayIcon: "顯示系統匣/選單欄圖示", showTrayIcon: "顯示系統匣/選單欄圖示",
showTrayIconDescription: "關閉後不顯示圖示,但關閉視窗仍會像之前一樣隱藏到後台。", showTrayIconDescription: "關閉後不顯示圖示,但關閉視窗仍會像之前一樣隱藏到後台。",
quitOnClose: "關閉視窗時退出程式", quitOnClose: "關閉視窗時退出程式",