From a539f6bbcaf1ed5d6035be1812053e25ca042a43 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Sun, 7 Jul 2024 10:15:15 +0900 Subject: [PATCH] improve: menu item layouts in new style menu --- glob/manager_core.py | 2 +- js/comfyui-manager.js | 47 +++++++++++++++++++++++++++++++------------ pyproject.toml | 2 +- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/glob/manager_core.py b/glob/manager_core.py index 34107d8a8..a92f99215 100644 --- a/glob/manager_core.py +++ b/glob/manager_core.py @@ -23,7 +23,7 @@ import cm_global from manager_util import * -version = [2, 45, 1] +version = [2, 46] version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '') diff --git a/js/comfyui-manager.js b/js/comfyui-manager.js index df07d435f..e22acdd17 100644 --- a/js/comfyui-manager.js +++ b/js/comfyui-manager.js @@ -1306,21 +1306,21 @@ app.registerExtension({ menu.append(separator); try { - // new style Manager button - app.menu?.saveButton.element.after(new(await import("../../scripts/ui/components/button.js")).ComfyButton({ - icon: "puzzle", - action: () => { - if(!manager_instance) - setManagerInstance(new ManagerMenuDialog()); - manager_instance.show(); - }, - tooltip: "ComfyUI Manager", - content: "ComfyUI Manager", - classList: "comfyui-button comfyui-menu-mobile-collapse primary" - }).element); + // new style Manager buttons // unload models button into new style Manager button let cmGroup = new (await import("../../scripts/ui/components/buttonGroup.js")).ComfyButtonGroup( + new(await import("../../scripts/ui/components/button.js")).ComfyButton({ + icon: "puzzle", + action: () => { + if(!manager_instance) + setManagerInstance(new ManagerMenuDialog()); + manager_instance.show(); + }, + tooltip: "ComfyUI Manager", + content: "Manager", + classList: "comfyui-button comfyui-menu-mobile-collapse primary" + }).element, new(await import("../../scripts/ui/components/button.js")).ComfyButton({ icon: "vacuum-outline", action: () => { @@ -1333,7 +1333,28 @@ app.registerExtension({ action: () => { free_models(true); }, - tooltip: "Unload Whole Cache" + tooltip: "Free model and node cache" + }).element, + new(await import("../../scripts/ui/components/button.js")).ComfyButton({ + icon: "share", + action: () => { + if (share_option === 'openart') { + showOpenArtShareDialog(); + return; + } else if (share_option === 'matrix' || share_option === 'comfyworkflows') { + showShareDialog(share_option); + return; + } else if (share_option === 'youml') { + showYouMLShareDialog(); + return; + } + + if(!ShareDialogChooser.instance) { + ShareDialogChooser.instance = new ShareDialogChooser(); + } + ShareDialogChooser.instance.show(); + }, + tooltip: "Share" }).element ); diff --git a/pyproject.toml b/pyproject.toml index 8a0d004ef..4fb76ecf5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "comfyui-manager" description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI." -version = "2.45.1" +version = "2.46" license = "LICENSE" dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]