From e9211fe37700fae84791b4320b3edf62b8f47993 Mon Sep 17 00:00:00 2001 From: Chenlei Hu Date: Thu, 9 Jan 2025 17:33:57 -0500 Subject: [PATCH] [Desktop] Add window style setting (#2212) Co-authored-by: github-actions --- package-lock.json | 8 ++++---- package.json | 2 +- src/extensions/core/electronAdapter.ts | 17 +++++++++++++++++ src/locales/en/settings.json | 8 ++++++++ src/locales/fr/settings.json | 8 ++++++++ src/locales/ja/settings.json | 8 ++++++++ src/locales/ko/settings.json | 8 ++++++++ src/locales/ru/settings.json | 8 ++++++++ src/locales/zh/settings.json | 8 ++++++++ 9 files changed, 70 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5893bc629..5180dbf83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "GPL-3.0-only", "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "^1.3.1", - "@comfyorg/comfyui-electron-types": "^0.4.3", + "@comfyorg/comfyui-electron-types": "^0.4.6", "@comfyorg/litegraph": "^0.8.60", "@primevue/themes": "^4.0.5", "@tiptap/core": "^2.10.4", @@ -1935,9 +1935,9 @@ "dev": true }, "node_modules/@comfyorg/comfyui-electron-types": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@comfyorg/comfyui-electron-types/-/comfyui-electron-types-0.4.3.tgz", - "integrity": "sha512-hSM3mchpsYN0e7oZ7XLWjEvFDvE1rgzaB9YkCeqIiZYZgLL78T79ssM0n5ra17Zv7Mqwl6ErZblXvbQE/36RPw==", + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/@comfyorg/comfyui-electron-types/-/comfyui-electron-types-0.4.6.tgz", + "integrity": "sha512-LY6AI7kMucMHU7UOAV9gGUPBUHrXXo1vxoabxupCL7xF2e8c14yHnJ4ngQogQrbwnLLax1mZfXNj/O9SyNtc9Q==", "license": "GPL-3.0-only" }, "node_modules/@comfyorg/litegraph": { diff --git a/package.json b/package.json index c1e935a1a..3cce77c58 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ }, "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "^1.3.1", - "@comfyorg/comfyui-electron-types": "^0.4.3", + "@comfyorg/comfyui-electron-types": "^0.4.6", "@comfyorg/litegraph": "^0.8.60", "@primevue/themes": "^4.0.5", "@tiptap/core": "^2.10.4", diff --git a/src/extensions/core/electronAdapter.ts b/src/extensions/core/electronAdapter.ts index 9f0a4f091..941982c44 100644 --- a/src/extensions/core/electronAdapter.ts +++ b/src/extensions/core/electronAdapter.ts @@ -34,6 +34,23 @@ import { electronAPI as getElectronAPI, isElectron } from '@/utils/envUtil' type: 'boolean', defaultValue: true, onChange: onChangeRestartApp + }, + { + id: 'Comfy-Desktop.WindowStyle', + category: ['Comfy-Desktop', 'General', 'Window Style'], + name: 'Window Style', + tooltip: 'Choose custom option to hide the system title bar', + type: 'combo', + defaultValue: 'default', + options: ['default', 'custom'], + onChange: ( + newValue: 'default' | 'custom', + oldValue: 'default' | 'custom' + ) => { + electronAPI.Config.setWindowStyle(newValue) + + onChangeRestartApp(newValue, oldValue) + } } ], diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json index 304a91089..471e86678 100644 --- a/src/locales/en/settings.json +++ b/src/locales/en/settings.json @@ -5,6 +5,14 @@ "Comfy-Desktop_SendStatistics": { "name": "Send anonymous crash reports" }, + "Comfy-Desktop_WindowStyle": { + "name": "Window Style", + "tooltip": "Choose custom option to hide the system title bar", + "options": { + "default": "default", + "custom": "custom" + } + }, "Comfy_ConfirmClear": { "name": "Require confirmation when clearing workflow" }, diff --git a/src/locales/fr/settings.json b/src/locales/fr/settings.json index f68641d94..70ee739d6 100644 --- a/src/locales/fr/settings.json +++ b/src/locales/fr/settings.json @@ -5,6 +5,14 @@ "Comfy-Desktop_SendStatistics": { "name": "Envoyer des rapports de plantage anonymes" }, + "Comfy-Desktop_WindowStyle": { + "name": "Style de fenêtre", + "options": { + "custom": "personnalisé", + "default": "défaut" + }, + "tooltip": "Choisissez l'option personnalisée pour masquer la barre de titre du système" + }, "Comfy_ConfirmClear": { "name": "Demander une confirmation lors de l'effacement du flux de travail" }, diff --git a/src/locales/ja/settings.json b/src/locales/ja/settings.json index beed32648..13e19a374 100644 --- a/src/locales/ja/settings.json +++ b/src/locales/ja/settings.json @@ -5,6 +5,14 @@ "Comfy-Desktop_SendStatistics": { "name": "匿名のクラッシュレポートを送信する" }, + "Comfy-Desktop_WindowStyle": { + "name": "ウィンドウスタイル", + "options": { + "custom": "カスタム", + "default": "デフォルト" + }, + "tooltip": "システムタイトルバーを非表示にするにはカスタムオプションを選択してください" + }, "Comfy_ConfirmClear": { "name": "ワークフローをクリアする際に確認を要求する" }, diff --git a/src/locales/ko/settings.json b/src/locales/ko/settings.json index feb6ff371..be07e15ba 100644 --- a/src/locales/ko/settings.json +++ b/src/locales/ko/settings.json @@ -5,6 +5,14 @@ "Comfy-Desktop_SendStatistics": { "name": "익명으로 충돌 보고서 전송" }, + "Comfy-Desktop_WindowStyle": { + "name": "창 스타일", + "options": { + "custom": "사용자 정의", + "default": "기본" + }, + "tooltip": "시스템 제목 표시 줄을 숨기려면 사용자 정의 옵션을 선택하세요" + }, "Comfy_ConfirmClear": { "name": "워크플로 비우기 시 확인 요구" }, diff --git a/src/locales/ru/settings.json b/src/locales/ru/settings.json index 013ff73ce..bec2bf2a6 100644 --- a/src/locales/ru/settings.json +++ b/src/locales/ru/settings.json @@ -5,6 +5,14 @@ "Comfy-Desktop_SendStatistics": { "name": "Отправлять анонимные отчеты о сбоях" }, + "Comfy-Desktop_WindowStyle": { + "name": "Стиль окна", + "options": { + "custom": "пользовательский", + "default": "по умолчанию" + }, + "tooltip": "Выберите пользовательский вариант, чтобы скрыть системную строку заголовка" + }, "Comfy_ConfirmClear": { "name": "Требовать подтверждение при очистке рабочего процесса" }, diff --git a/src/locales/zh/settings.json b/src/locales/zh/settings.json index cf397badd..983ff0250 100644 --- a/src/locales/zh/settings.json +++ b/src/locales/zh/settings.json @@ -5,6 +5,14 @@ "Comfy-Desktop_SendStatistics": { "name": "发送匿名崩溃报告" }, + "Comfy-Desktop_WindowStyle": { + "name": "窗口样式", + "options": { + "custom": "自定义", + "default": "默认" + }, + "tooltip": "选择自定义选项以隐藏系统标题栏" + }, "Comfy_ConfirmClear": { "name": "清除工作流时需要确认" },