diff --git a/src/components/dialog/content/setting/KeybindingPanel.vue b/src/components/dialog/content/setting/KeybindingPanel.vue index 497074387..fd8cbba75 100644 --- a/src/components/dialog/content/setting/KeybindingPanel.vue +++ b/src/components/dialog/content/setting/KeybindingPanel.vue @@ -71,6 +71,13 @@ - + + + (() => { @@ -169,7 +177,8 @@ const commandsData = computed(() => { `commands.${normalizeI18nKey(command.id)}.label`, command.label ?? '' ), - keybinding: keybindingStore.getKeybindingByCommandId(command.id) + keybinding: keybindingStore.getKeybindingByCommandId(command.id), + source: command.source })) }) diff --git a/src/composables/useCoreCommands.ts b/src/composables/useCoreCommands.ts index da0ddcc93..8637d7419 100644 --- a/src/composables/useCoreCommands.ts +++ b/src/composables/useCoreCommands.ts @@ -55,7 +55,9 @@ export function useCoreCommands(): ComfyCommand[] { }) } - return [ + const commonProps = { source: 'System' } + + const commands = [ { id: 'Comfy.NewBlankWorkflow', icon: 'pi pi-plus', @@ -616,4 +618,6 @@ export function useCoreCommands(): ComfyCommand[] { } } ] + + return commands.map((command) => ({ ...command, ...commonProps })) } diff --git a/src/locales/en/main.json b/src/locales/en/main.json index c541a9c84..0d814b659 100644 --- a/src/locales/en/main.json +++ b/src/locales/en/main.json @@ -94,6 +94,7 @@ "name": "Name", "category": "Category", "sort": "Sort", + "source": "Source", "filter": "Filter", "apply": "Apply", "enabled": "Enabled", diff --git a/src/locales/es/main.json b/src/locales/es/main.json index 9570159a2..4a17a0d18 100644 --- a/src/locales/es/main.json +++ b/src/locales/es/main.json @@ -215,6 +215,7 @@ "settings": "Configuraciones", "showReport": "Mostrar informe", "sort": "Ordenar", + "source": "Fuente", "status": "Estado", "success": "Éxito", "systemInfo": "Información del sistema", diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json index 65879726a..16e3f7765 100644 --- a/src/locales/fr/main.json +++ b/src/locales/fr/main.json @@ -215,6 +215,7 @@ "settings": "Paramètres", "showReport": "Afficher le rapport", "sort": "Trier", + "source": "Source", "status": "Statut", "success": "Succès", "systemInfo": "Informations système", diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json index ea9245d9c..fa316a274 100644 --- a/src/locales/ja/main.json +++ b/src/locales/ja/main.json @@ -215,6 +215,7 @@ "settings": "設定", "showReport": "レポートを表示", "sort": "並び替え", + "source": "ソース", "status": "ステータス", "success": "成功", "systemInfo": "システム情報", diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json index 54268269e..9e1c297c2 100644 --- a/src/locales/ko/main.json +++ b/src/locales/ko/main.json @@ -215,6 +215,7 @@ "settings": "설정", "showReport": "보고서 보기", "sort": "정렬", + "source": "소스", "status": "상태", "success": "성공", "systemInfo": "시스템 정보", diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json index 36a5f8d39..26e33eb57 100644 --- a/src/locales/ru/main.json +++ b/src/locales/ru/main.json @@ -215,6 +215,7 @@ "settings": "Настройки", "showReport": "Показать отчёт", "sort": "Сортировать", + "source": "Источник", "status": "Статус", "success": "Успех", "systemInfo": "Информация о системе", diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json index e4ccb0aab..aaa38fde4 100644 --- a/src/locales/zh/main.json +++ b/src/locales/zh/main.json @@ -215,6 +215,7 @@ "settings": "设置", "showReport": "显示报告", "sort": "排序", + "source": "来源", "status": "状态", "success": "成功", "systemInfo": "系统信息", diff --git a/src/stores/commandStore.ts b/src/stores/commandStore.ts index 4a51a0737..214296e57 100644 --- a/src/stores/commandStore.ts +++ b/src/stores/commandStore.ts @@ -13,11 +13,10 @@ export interface ComfyCommand { label?: string | (() => string) icon?: string | (() => string) tooltip?: string | (() => string) - /** Menubar item label, if different from command label */ - menubarLabel?: string | (() => string) + menubarLabel?: string | (() => string) // Menubar item label, if different from command label versionAdded?: string - /** If non-nullish, this command will prompt for confirmation. */ - confirmation?: string + confirmation?: string // If non-nullish, this command will prompt for confirmation + source?: string } export class ComfyCommandImpl implements ComfyCommand { @@ -29,6 +28,7 @@ export class ComfyCommandImpl implements ComfyCommand { _menubarLabel?: string | (() => string) versionAdded?: string confirmation?: string + source?: string constructor(command: ComfyCommand) { this.id = command.id @@ -39,6 +39,7 @@ export class ComfyCommandImpl implements ComfyCommand { this._menubarLabel = command.menubarLabel ?? command.label this.versionAdded = command.versionAdded this.confirmation = command.confirmation + this.source = command.source } get label() { @@ -105,7 +106,10 @@ export const useCommandStore = defineStore('command', () => { const loadExtensionCommands = (extension: ComfyExtension) => { if (extension.commands) { for (const command of extension.commands) { - registerCommand(command) + registerCommand({ + ...command, + source: extension.name + }) } } } diff --git a/src/stores/workspace/bottomPanelStore.ts b/src/stores/workspace/bottomPanelStore.ts index 7b02e6df1..9e1c923e4 100644 --- a/src/stores/workspace/bottomPanelStore.ts +++ b/src/stores/workspace/bottomPanelStore.ts @@ -49,7 +49,8 @@ export const useBottomPanelStore = defineStore('bottomPanel', () => { id: `Workspace.ToggleBottomPanelTab.${tab.id}`, icon: 'pi pi-list', label: `Toggle ${tab.title} Bottom Panel`, - function: () => toggleBottomPanelTab(tab.id) + function: () => toggleBottomPanelTab(tab.id), + source: 'System' }) } diff --git a/src/stores/workspace/sidebarTabStore.ts b/src/stores/workspace/sidebarTabStore.ts index a4e3a9771..725d6e02b 100644 --- a/src/stores/workspace/sidebarTabStore.ts +++ b/src/stores/workspace/sidebarTabStore.ts @@ -33,7 +33,8 @@ export const useSidebarTabStore = defineStore('sidebarTab', () => { versionAdded: '1.3.9', function: () => { toggleSidebarTab(tab.id) - } + }, + source: 'System' }) }