Skip to content

Commit a6bd04f

Browse files
christian-byrnegithub-actions
christian-byrne
and
github-actions
authored
[Manager] Make dialog closeable with button and hotkey (#4179)
Co-authored-by: github-actions <[email protected]>
1 parent 5b32d2a commit a6bd04f

File tree

11 files changed

+50
-23
lines changed

11 files changed

+50
-23
lines changed

‎src/composables/useCoreCommands.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -658,19 +658,19 @@ export function useCoreCommands(): ComfyCommand[] {
658658
{
659659
id: 'Comfy.Manager.CustomNodesManager',
660660
icon: 'pi pi-puzzle',
661-
label: 'Custom Nodes Manager',
661+
label: 'Toggle the Custom Nodes Manager',
662662
versionAdded: '1.12.10',
663663
function: () => {
664-
dialogService.showManagerDialog()
664+
dialogService.toggleManagerDialog()
665665
}
666666
},
667667
{
668668
id: 'Comfy.Manager.ToggleManagerProgressDialog',
669669
icon: 'pi pi-spinner',
670-
label: 'Toggle Progress Dialog',
670+
label: 'Toggle the Custom Nodes Manager Progress Bar',
671671
versionAdded: '1.13.9',
672672
function: () => {
673-
dialogService.showManagerProgressDialog()
673+
dialogService.toggleManagerProgressDialog()
674674
}
675675
},
676676
{

‎src/locales/en/commands.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@
147147
"label": "Load Default Workflow"
148148
},
149149
"Comfy_Manager_CustomNodesManager": {
150-
"label": "Custom Nodes Manager"
150+
"label": "Toggle the Custom Nodes Manager"
151151
},
152152
"Comfy_Manager_ToggleManagerProgressDialog": {
153-
"label": "Toggle Progress Dialog"
153+
"label": "Toggle the Custom Nodes Manager Progress Bar"
154154
},
155155
"Comfy_MaskEditor_OpenMaskEditor": {
156156
"label": "Open Mask Editor for Selected Node"

‎src/locales/en/main.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,8 +828,8 @@
828828
"ComfyUI Issues": "ComfyUI Issues",
829829
"Interrupt": "Interrupt",
830830
"Load Default Workflow": "Load Default Workflow",
831-
"Custom Nodes Manager": "Custom Nodes Manager",
832-
"Toggle Progress Dialog": "Toggle Progress Dialog",
831+
"Toggle the Custom Nodes Manager": "Toggle the Custom Nodes Manager",
832+
"Toggle the Custom Nodes Manager Progress Bar": "Toggle the Custom Nodes Manager Progress Bar",
833833
"Open Mask Editor for Selected Node": "Open Mask Editor for Selected Node",
834834
"New": "New",
835835
"Clipspace": "Clipspace",

‎src/locales/es/main.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@
694694
"ComfyUI Issues": "Problemas de ComfyUI",
695695
"Contact Support": "Contactar soporte",
696696
"Convert selected nodes to group node": "Convertir nodos seleccionados en nodo de grupo",
697-
"Custom Nodes Manager": "Gestor de nodos personalizados",
698697
"Delete Selected Items": "Eliminar elementos seleccionados",
699698
"Desktop User Guide": "Guía de usuario de escritorio",
700699
"Duplicate Current Workflow": "Duplicar flujo de trabajo actual",
@@ -748,12 +747,13 @@
748747
"Toggle Logs Bottom Panel": "Alternar panel inferior de registros",
749748
"Toggle Model Library Sidebar": "Alternar barra lateral de biblioteca de modelos",
750749
"Toggle Node Library Sidebar": "Alternar barra lateral de biblioteca de nodos",
751-
"Toggle Progress Dialog": "Alternar diálogo de progreso",
752750
"Toggle Queue Sidebar": "Alternar barra lateral de cola",
753751
"Toggle Search Box": "Alternar caja de búsqueda",
754752
"Toggle Terminal Bottom Panel": "Alternar panel inferior de terminal",
755753
"Toggle Theme (Dark/Light)": "Alternar tema (Oscuro/Claro)",
756754
"Toggle Workflows Sidebar": "Alternar barra lateral de flujos de trabajo",
755+
"Toggle the Custom Nodes Manager": "Alternar el Administrador de Nodos Personalizados",
756+
"Toggle the Custom Nodes Manager Progress Bar": "Alternar la Barra de Progreso del Administrador de Nodos Personalizados",
757757
"Undo": "Deshacer",
758758
"Ungroup selected group nodes": "Desagrupar nodos de grupo seleccionados",
759759
"Workflow": "Flujo de trabajo",

‎src/locales/fr/main.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@
694694
"ComfyUI Issues": "Problèmes de ComfyUI",
695695
"Contact Support": "Contacter le support",
696696
"Convert selected nodes to group node": "Convertir les nœuds sélectionnés en nœud de groupe",
697-
"Custom Nodes Manager": "Gestionnaire de Nœuds Personnalisés",
698697
"Delete Selected Items": "Supprimer les éléments sélectionnés",
699698
"Desktop User Guide": "Guide de l'utilisateur de bureau",
700699
"Duplicate Current Workflow": "Dupliquer le flux de travail actuel",
@@ -748,12 +747,13 @@
748747
"Toggle Logs Bottom Panel": "Basculer le panneau inférieur des journaux",
749748
"Toggle Model Library Sidebar": "Basculer la barre latérale de la bibliothèque de modèles",
750749
"Toggle Node Library Sidebar": "Basculer la barre latérale de la bibliothèque de nœuds",
751-
"Toggle Progress Dialog": "Basculer la boîte de dialogue de progression",
752750
"Toggle Queue Sidebar": "Basculer la barre latérale de la file d'attente",
753751
"Toggle Search Box": "Basculer la boîte de recherche",
754752
"Toggle Terminal Bottom Panel": "Basculer le panneau inférieur du terminal",
755753
"Toggle Theme (Dark/Light)": "Basculer le thème (Sombre/Clair)",
756754
"Toggle Workflows Sidebar": "Basculer la barre latérale des flux de travail",
755+
"Toggle the Custom Nodes Manager": "Basculer le gestionnaire de nœuds personnalisés",
756+
"Toggle the Custom Nodes Manager Progress Bar": "Basculer la barre de progression du gestionnaire de nœuds personnalisés",
757757
"Undo": "Annuler",
758758
"Ungroup selected group nodes": "Dégrouper les nœuds de groupe sélectionnés",
759759
"Workflow": "Flux de travail",

‎src/locales/ja/main.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@
694694
"ComfyUI Issues": "ComfyUIの問題",
695695
"Contact Support": "サポートに連絡",
696696
"Convert selected nodes to group node": "選択したノードをグループノードに変換",
697-
"Custom Nodes Manager": "カスタムノードマネージャ",
698697
"Delete Selected Items": "選択したアイテムを削除",
699698
"Desktop User Guide": "デスクトップユーザーガイド",
700699
"Duplicate Current Workflow": "現在のワークフローを複製",
@@ -748,12 +747,13 @@
748747
"Toggle Logs Bottom Panel": "ログパネル下部を切り替え",
749748
"Toggle Model Library Sidebar": "モデルライブラリサイドバーを切り替え",
750749
"Toggle Node Library Sidebar": "ノードライブラリサイドバーを切り替え",
751-
"Toggle Progress Dialog": "進行状況ダイアログの切り替え",
752750
"Toggle Queue Sidebar": "キューサイドバーを切り替え",
753751
"Toggle Search Box": "検索ボックスの切り替え",
754752
"Toggle Terminal Bottom Panel": "ターミナルパネル下部を切り替え",
755753
"Toggle Theme (Dark/Light)": "テーマを切り替え（ダーク/ライト）",
756754
"Toggle Workflows Sidebar": "ワークフローサイドバーを切り替え",
755+
"Toggle the Custom Nodes Manager": "カスタムノードマネージャーを切り替え",
756+
"Toggle the Custom Nodes Manager Progress Bar": "カスタムノードマネージャーの進行状況バーを切り替え",
757757
"Undo": "元に戻す",
758758
"Ungroup selected group nodes": "選択したグループノードのグループ解除",
759759
"Workflow": "ワークフロー",

‎src/locales/ko/main.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@
694694
"ComfyUI Issues": "ComfyUI 이슈 페이지",
695695
"Contact Support": "고객 지원 문의",
696696
"Convert selected nodes to group node": "선택한 노드를 그룹 노드로 변환",
697-
"Custom Nodes Manager": "사용자 정의 노드 관리자",
698697
"Delete Selected Items": "선택한 항목 삭제",
699698
"Desktop User Guide": "데스크톱 사용자 가이드",
700699
"Duplicate Current Workflow": "현재 워크플로 복제",
@@ -748,12 +747,13 @@
748747
"Toggle Logs Bottom Panel": "로그 하단 패널 전환",
749748
"Toggle Model Library Sidebar": "모델 라이브러리 사이드바 전환",
750749
"Toggle Node Library Sidebar": "노드 라이브러리 사이드바 전환",
751-
"Toggle Progress Dialog": "진행 상황 대화 상자 전환",
752750
"Toggle Queue Sidebar": "실행 대기열 사이드바 전환",
753751
"Toggle Search Box": "검색 상자 전환",
754752
"Toggle Terminal Bottom Panel": "터미널 하단 패널 전환",
755753
"Toggle Theme (Dark/Light)": "테마 전환 (어두운/밝은)",
756754
"Toggle Workflows Sidebar": "워크플로 사이드바 전환",
755+
"Toggle the Custom Nodes Manager": "커스텀 노드 매니저 전환",
756+
"Toggle the Custom Nodes Manager Progress Bar": "커스텀 노드 매니저 진행률 표시줄 전환",
757757
"Undo": "실행 취소",
758758
"Ungroup selected group nodes": "선택한 그룹 노드 그룹 해제",
759759
"Workflow": "워크플로",

‎src/locales/ru/main.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@
694694
"ComfyUI Issues": "Проблемы ComfyUI",
695695
"Contact Support": "Связаться с поддержкой",
696696
"Convert selected nodes to group node": "Преобразовать выбранные ноды в групповую ноду",
697-
"Custom Nodes Manager": "Менеджер Пользовательских Узлов",
698697
"Delete Selected Items": "Удалить выбранные элементы",
699698
"Desktop User Guide": "Руководство пользователя для настольных ПК",
700699
"Duplicate Current Workflow": "Дублировать текущий рабочий процесс",
@@ -748,12 +747,13 @@
748747
"Toggle Logs Bottom Panel": "Переключение нижней панели журналов",
749748
"Toggle Model Library Sidebar": "Переключение боковой панели библиотеки моделей",
750749
"Toggle Node Library Sidebar": "Переключение боковой панели библиотеки нод",
751-
"Toggle Progress Dialog": "Переключить диалоговое окно прогресса",
752750
"Toggle Queue Sidebar": "Переключение боковой панели очереди",
753751
"Toggle Search Box": "Переключить поисковую панель",
754752
"Toggle Terminal Bottom Panel": "Переключение нижней панели терминала",
755753
"Toggle Theme (Dark/Light)": "Переключение темы (Тёмная/Светлая)",
756754
"Toggle Workflows Sidebar": "Переключение боковой панели рабочих процессов",
755+
"Toggle the Custom Nodes Manager": "Переключить менеджер пользовательских узлов",
756+
"Toggle the Custom Nodes Manager Progress Bar": "Переключить индикатор выполнения менеджера пользовательских узлов",
757757
"Undo": "Отменить",
758758
"Ungroup selected group nodes": "Разгруппировать выбранные групповые ноды",
759759
"Workflow": "Рабочий процесс",

‎src/locales/zh/main.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@
694694
"ComfyUI Issues": "ComfyUI 问题",
695695
"Contact Support": "联系支持",
696696
"Convert selected nodes to group node": "将选中节点转换为组节点",
697-
"Custom Nodes Manager": "自定义节点管理器",
698697
"Delete Selected Items": "删除选定的项目",
699698
"Desktop User Guide": "桌面端用户指南",
700699
"Duplicate Current Workflow": "复制当前工作流",
@@ -748,12 +747,13 @@
748747
"Toggle Logs Bottom Panel": "切换日志底部面板",
749748
"Toggle Model Library Sidebar": "切换模型库侧边栏",
750749
"Toggle Node Library Sidebar": "切换节点库侧边栏",
751-
"Toggle Progress Dialog": "切换进度对话框",
752750
"Toggle Queue Sidebar": "切换队列侧边栏",
753751
"Toggle Search Box": "切换搜索框",
754752
"Toggle Terminal Bottom Panel": "切换终端底部面板",
755753
"Toggle Theme (Dark/Light)": "切换主题（暗/亮）",
756754
"Toggle Workflows Sidebar": "切换工作流侧边栏",
755+
"Toggle the Custom Nodes Manager": "切换自定义节点管理器",
756+
"Toggle the Custom Nodes Manager Progress Bar": "切换自定义节点管理器进度条",
757757
"Undo": "撤销",
758758
"Ungroup selected group nodes": "解散选中组节点",
759759
"Workflow": "工作流",

‎src/services/dialogService.ts‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export const useDialogService = () => {
135135
component: ManagerDialogContent,
136136
headerComponent: ManagerHeader,
137137
dialogComponentProps: {
138-
closable: false,
138+
closable: true,
139139
pt: {
140140
header: { class: '!p-0 !m-0' },
141141
content: { class: '!px-0 h-[83vh] w-[90vw] overflow-y-hidden' }
@@ -394,6 +394,26 @@ export const useDialogService = () => {
394394
}
395395
}
396396

397+
function toggleManagerDialog(
398+
props?: InstanceType<typeof ManagerDialogContent>['$props']
399+
) {
400+
if (dialogStore.isDialogOpen('global-manager')) {
401+
dialogStore.closeDialog({ key: 'global-manager' })
402+
} else {
403+
showManagerDialog(props)
404+
}
405+
}
406+
407+
function toggleManagerProgressDialog(
408+
props?: InstanceType<typeof ManagerProgressDialogContent>['$props']
409+
) {
410+
if (dialogStore.isDialogOpen('global-manager-progress-dialog')) {
411+
dialogStore.closeDialog({ key: 'global-manager-progress-dialog' })
412+
} else {
413+
showManagerProgressDialog({ props })
414+
}
415+
}
416+
397417
return {
398418
showLoadWorkflowWarning,
399419
showMissingModelsWarning,
@@ -411,6 +431,8 @@ export const useDialogService = () => {
411431
showUpdatePasswordDialog,
412432
showExtensionDialog,
413433
prompt,
414-
confirm
434+
confirm,
435+
toggleManagerDialog,
436+
toggleManagerProgressDialog
415437
}
416438
}

0 commit comments

Comments
 (0)