From 143910061741bba539a45eae90c90fb5037da347 Mon Sep 17 00:00:00 2001 From: Samuel <33796679+hollowstrawberry@users.noreply.github.com> Date: Thu, 20 Apr 2023 14:35:08 -0400 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=83=E2=9D=8C=20buttons=20in=20extr?= =?UTF-8?q?a=20networks=20submenu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- javascript/extraNetworks.js | 2 ++ modules/ui_extra_networks.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js index 253221389..2f0a7de9d 100644 --- a/javascript/extraNetworks.js +++ b/javascript/extraNetworks.js @@ -5,10 +5,12 @@ function setupExtraNetworksForTab(tabname){ var tabs = gradioApp().querySelector('#'+tabname+'_extra_tabs > div') var search = gradioApp().querySelector('#'+tabname+'_extra_search textarea') var refresh = gradioApp().getElementById(tabname+'_extra_refresh') + var close = gradioApp().getElementById(tabname+'_extra_close') search.classList.add('search') tabs.appendChild(search) tabs.appendChild(refresh) + tabs.appendChild(close) search.addEventListener("input", function(evt){ searchTerm = search.value.toLowerCase() diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 99aaef6bc..16d73f186 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -14,6 +14,8 @@ from modules.generation_parameters_copypaste import image_from_url_text extra_pages = [] allowed_dirs = set() +refresh_symbol = '\U0001f504' # 🔄 +close_symbol = '\U0000274C' # ❌ def register_page(page): """registers extra networks page for the UI; recommend doing it in on_before_ui() callback for extensions""" @@ -246,7 +248,8 @@ def create_ui(container, button, tabname): ui.pages.append(page_elem) filter = gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", placeholder="Search...", visible=False) - button_refresh = gr.Button('Refresh', elem_id=tabname+"_extra_refresh") + button_refresh = gr.Button(refresh_symbol, elem_id=tabname+"_extra_refresh") + button_close = gr.Button(close_symbol, elem_id=tabname+"_extra_close") ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False) ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False) @@ -257,6 +260,7 @@ def create_ui(container, button, tabname): state_visible = gr.State(value=False) button.click(fn=toggle_visibility, inputs=[state_visible], outputs=[state_visible, container, button]) + button_close.click(fn=toggle_visibility, inputs=[state_visible], outputs=[state_visible, container]) def refresh(): res = [] From 1cf6b9186257e5d151411e06aaaa37347e491d50 Mon Sep 17 00:00:00 2001 From: Samuel <33796679+hollowstrawberry@users.noreply.github.com> Date: Thu, 20 Apr 2023 14:43:46 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Use=20smaller=20ToolButton=20for=20?= =?UTF-8?q?=F0=9F=94=83=E2=9D=8C=20in=20extra=20networks=20submenu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ui_extra_networks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 16d73f186..d5c5bb34f 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -10,6 +10,7 @@ import gradio as gr from modules import shared from modules.images import read_info_from_image from modules.generation_parameters_copypaste import image_from_url_text +from modules.ui_components import ToolButton extra_pages = [] allowed_dirs = set() @@ -248,8 +249,8 @@ def create_ui(container, button, tabname): ui.pages.append(page_elem) filter = gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", placeholder="Search...", visible=False) - button_refresh = gr.Button(refresh_symbol, elem_id=tabname+"_extra_refresh") - button_close = gr.Button(close_symbol, elem_id=tabname+"_extra_close") + button_refresh = ToolButton(refresh_symbol, elem_id=tabname+"_extra_refresh") + button_close = ToolButton(close_symbol, elem_id=tabname+"_extra_close") ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False) ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False)