diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f0d96240..ce7e8aa5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Update for 2026-04-29 - **Control** + - remove buttons: input/control/process - remove "processed preview" from ui preprocessor output can still be generated by clicking preview button in in control unit and it will render into normal output area diff --git a/extensions-builtin/sdnext-kanvas b/extensions-builtin/sdnext-kanvas index 9a76f2093..dbea4ea19 160000 --- a/extensions-builtin/sdnext-kanvas +++ b/extensions-builtin/sdnext-kanvas @@ -1 +1 @@ -Subproject commit 9a76f209312dc88b267af126c60fc8b368678131 +Subproject commit dbea4ea19e0605e2158bef607dc423f12261f0a8 diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index f81771717..9c04701e8 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit f81771717424299e99542b2ceb88e3cca9f7f16c +Subproject commit 9c04701e807f9b0102a79d124b9faa87d9b86453 diff --git a/html/locale_ar.json b/html/locale_ar.json index 596040792..b1c1d3cb5 100644 --- a/html/locale_ar.json +++ b/html/locale_ar.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "وسائط الإدخال", "reload": "", "hint": "إضافة صورة إدخال لاستخدامها في معالجة التحويل من صورة إلى صورة، أو التلوين (Inpaint)، أو التحكم" diff --git a/html/locale_bn.json b/html/locale_bn.json index f7fe99ac3..252670494 100644 --- a/html/locale_bn.json +++ b/html/locale_bn.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "ইনপুট মিডিয়া", "reload": "", "hint": "ইমেজ-টু-ইমেজ, ইনপেইন্ট বা কন্ট্রোল প্রসেসিংয়ের জন্য ইনপুট ছবি যোগ করুন" diff --git a/html/locale_de.json b/html/locale_de.json index 1bdd46a1a..9fa94e636 100644 --- a/html/locale_de.json +++ b/html/locale_de.json @@ -4817,7 +4817,7 @@ }, { "id": 14, - "label": "Input Media", + "label": "Input", "localized": "Eingabemedien", "reload": "", "hint": "Eingabebild hinzufügen, das für Image-to-Image-, Inpaint- oder Control-Verarbeitung verwendet werden soll" diff --git a/html/locale_en.json b/html/locale_en.json index db1f36ed2..42ef8550e 100644 --- a/html/locale_en.json +++ b/html/locale_en.json @@ -700,7 +700,6 @@ "i": [ {"id":"control_nav","label":"Images","localized":"","hint":"Create images
Unified interface
Supports T2I and I2I
With optional control guidance"}, {"id":"img2img_nav","label":"I2I","localized":"","hint":"Create image from image
Legacy interface that mimics original image-to-image interface and behavior"}, - {"id":"img2img_results_input_mobile","label":"Input","localized":"","hint":"Show/hide selection of input media used to guide generation","ui":"img2img"}, {"id":"","label":"Image","localized":"","hint":"Create image from image","ui":"img2img"}, {"id":"","label":"Inpaint","localized":"","hint":"","ui":"img2img"}, {"id":"control_params_mask","label":"Inputs","localized":"","hint":"Settings related to Input images","ui":"control"}, @@ -711,7 +710,7 @@ {"id":"","label":"Image Paths","localized":"","hint":"Settings related to image filenames, and output directories"}, {"id":"","label":"Image Metadata","localized":"","hint":"Settings related to handling of metadata that is created with generated images"}, {"id":"","label":"IP Adapters","localized":"","hint":"IP adapters are plugin models that can guide generation towards desired outcome","ui":"txt2img"}, - {"id":"","label":"Input Media","localized":"","hint":"Add input image to be used for image-to-image, inpaint or control processing","ui":"control"}, + {"id":"","label":"Input","localized":"","hint":"Add input image to be used for image-to-image, inpaint or control processing","ui":"control"}, {"id":"","label":"Input Image","localized":"","hint":"","ui":"caption"}, {"id":"","label":"IPEX","localized":"","hint":"","ui":"settings_backends"}, {"id":"","label":"Image Gallery","localized":"","hint":"","ui":"settings_saving-images"}, diff --git a/html/locale_es.json b/html/locale_es.json index 42f8f72bb..94d82fbe0 100644 --- a/html/locale_es.json +++ b/html/locale_es.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "Medios de entrada", "reload": "", "hint": "Añadir imagen de entrada para ser utilizada para el procesamiento de imagen a imagen, inpaint o control" diff --git a/html/locale_fr.json b/html/locale_fr.json index 470792ab9..5b2c37935 100644 --- a/html/locale_fr.json +++ b/html/locale_fr.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "Média d'entrée", "reload": "", "hint": "Ajouter une image d'entrée à utiliser pour le traitement image-à-image, inpaint ou control" diff --git a/html/locale_he.json b/html/locale_he.json index 8d1e7704f..27a37076b 100644 --- a/html/locale_he.json +++ b/html/locale_he.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "מדית קלט", "reload": "", "hint": "הוספת תמונת קלט לשימוש עבור עיבוד תמונה-לתמונה, מילוי או בקרה" diff --git a/html/locale_hi.json b/html/locale_hi.json index 54d213b59..8aa989b29 100644 --- a/html/locale_hi.json +++ b/html/locale_hi.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "इनपुट मीडिया", "reload": "n/a", "hint": "इमेज-टू-इमेज, इनपेंट या कंट्रोल प्रोसेसिंग के लिए उपयोग की जाने वाली इनपुट छवि जोड़ें" diff --git a/html/locale_hr.json b/html/locale_hr.json index d092a3e55..efa35485f 100644 --- a/html/locale_hr.json +++ b/html/locale_hr.json @@ -4824,7 +4824,7 @@ }, { "id": 0, - "label": "Input Media", + "label": "Input", "localized": "Ulazni medij", "reload": "", "hint": "Dodajte ulaznu sliku koja će se koristiti za image-to-image, inpaint ili kontrolnu obradu" diff --git a/html/locale_id.json b/html/locale_id.json index c13c3fe19..7450256f8 100644 --- a/html/locale_id.json +++ b/html/locale_id.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "Media Masukan", "reload": "n/a", "hint": "Tambahkan gambar masukan untuk digunakan dalam pemrosesan image-to-image, inpaint, atau kontrol" diff --git a/html/locale_it.json b/html/locale_it.json index c557311c1..034654b91 100644 --- a/html/locale_it.json +++ b/html/locale_it.json @@ -4817,7 +4817,7 @@ }, { "id": 14, - "label": "Input Media", + "label": "Input", "localized": "Media di input", "reload": "n/a", "hint": "Aggiungi un'immagine di input da utilizzare per elaborazioni image-to-image, inpaint o di controllo" diff --git a/html/locale_ja.json b/html/locale_ja.json index d16520c68..e30dba4f0 100644 --- a/html/locale_ja.json +++ b/html/locale_ja.json @@ -4817,9 +4817,9 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "入力メディア", - "reload": "Input Media", + "reload": "Input", "hint": "画像間変換、インペイント、またはコントロール処理に使用する入力画像を追加します" }, { diff --git a/html/locale_ko.json b/html/locale_ko.json index 00e3a4032..a5918ee95 100644 --- a/html/locale_ko.json +++ b/html/locale_ko.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "입력 미디어", "reload": "n/a", "hint": "이미지 대 이미지, 인페인트 또는 제어 처리에 사용할 입력 이미지 추가" diff --git a/html/locale_nb.json b/html/locale_nb.json index 1542f19f6..89e39b0f7 100644 --- a/html/locale_nb.json +++ b/html/locale_nb.json @@ -4817,8 +4817,8 @@ }, { "id": 13, - "label": "Input Media", - "localized": "Input Media", + "label": "Input", + "localized": "Input", "reload": "", "hint": "Add an image here to use it as a base for editing or guiding the AI." }, diff --git a/html/locale_po.json b/html/locale_po.json index 8d8055819..b391db6af 100644 --- a/html/locale_po.json +++ b/html/locale_po.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "Media wejściowe", "reload": "", "hint": "Dodaj obraz wejściowy do użycia w przetwarzaniu typu image-to-image, inpaint lub control" diff --git a/html/locale_pt.json b/html/locale_pt.json index db261911e..065887bf9 100644 --- a/html/locale_pt.json +++ b/html/locale_pt.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "Mídia de Entrada", "reload": "", "hint": "Adicionar imagem de entrada a ser usada para processamento de imagem-para-imagem, inpaint ou controle" diff --git a/html/locale_qq.json b/html/locale_qq.json index b033d7be9..1d351b192 100644 --- a/html/locale_qq.json +++ b/html/locale_qq.json @@ -4817,7 +4817,7 @@ }, { "id": 0, - "label": "Input Media", + "label": "Input", "localized": "Media Input", "reload": "n/a", "hint": "Addere imaginem input adhibendam pro processu imaginis-ad-imaginem, inpaint, vel moderationis" diff --git a/html/locale_ru.json b/html/locale_ru.json index db706a1a2..318e7754f 100644 --- a/html/locale_ru.json +++ b/html/locale_ru.json @@ -4817,7 +4817,7 @@ }, { "id": 14, - "label": "Input Media", + "label": "Input", "localized": "Входные медиаданные", "reload": "", "hint": "Добавить входное изображение для использования в image-to-image, inpaint или для управления генерацией" diff --git a/html/locale_sr.json b/html/locale_sr.json index d0df82d7b..2cbccaada 100644 --- a/html/locale_sr.json +++ b/html/locale_sr.json @@ -4817,7 +4817,7 @@ }, { "id": 14, - "label": "Input Media", + "label": "Input", "localized": "Ulazni medij", "reload": "", "hint": "Dodajte ulaznu sliku koja će se koristiti za obradu slike-u-sliku, inpaint ili kontrolnu obradu" diff --git a/html/locale_tb.json b/html/locale_tb.json index 53f4ad85a..bb09b9850 100644 --- a/html/locale_tb.json +++ b/html/locale_tb.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "Source Telemetry", "reload": "", "hint": "Upload and synchronize source data for recursive generation, delta-patching, or neural guidance processing" diff --git a/html/locale_tlh.json b/html/locale_tlh.json index 80e758920..a0447e4c8 100644 --- a/html/locale_tlh.json +++ b/html/locale_tlh.json @@ -4817,7 +4817,7 @@ }, { "id": 14, - "label": "Input Media", + "label": "Input", "localized": "nI' Media", "reload": "", "hint": "nI' media" diff --git a/html/locale_tr.json b/html/locale_tr.json index 275409c4c..2a0ddfd06 100644 --- a/html/locale_tr.json +++ b/html/locale_tr.json @@ -4817,7 +4817,7 @@ }, { "id": 14, - "label": "Input Media", + "label": "Input", "localized": "Giriş Medyası", "reload": "", "hint": "Görüntüden görüntüye, inpaint veya kontrol işleme için kullanılacak giriş görüntüsünü ekleyin" diff --git a/html/locale_ur.json b/html/locale_ur.json index 5063f6e7e..4edfe260a 100644 --- a/html/locale_ur.json +++ b/html/locale_ur.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "ان پٹ میڈیا", "reload": "", "hint": "تصویر سے تصویر (image-to-image)، ان پینٹ یا کنٹرول پروسیسنگ کے لیے استعمال ہونے والی ان پٹ تصویر شامل کریں" diff --git a/html/locale_vi.json b/html/locale_vi.json index 4e631bb43..06187acbd 100644 --- a/html/locale_vi.json +++ b/html/locale_vi.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "Phương tiện đầu vào", "reload": "", "hint": "Thêm hình ảnh đầu vào để sử dụng cho xử lý hình ảnh thành hình ảnh, inpaint hoặc điều khiển" diff --git a/html/locale_xx.json b/html/locale_xx.json index 5674c5994..79d813296 100644 --- a/html/locale_xx.json +++ b/html/locale_xx.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "Eniga Amaskomunikilaro", "reload": "", "hint": "Aldoni enigeblan bildon por esti uzata por bild-al-bilda, inpaint aŭ kontrola prilaborado" diff --git a/html/locale_zh.json b/html/locale_zh.json index 7aa02402e..700de6f4e 100644 --- a/html/locale_zh.json +++ b/html/locale_zh.json @@ -4817,7 +4817,7 @@ }, { "id": 13, - "label": "Input Media", + "label": "Input", "localized": "输入媒体", "reload": "", "hint": "添加用于图生图、重绘或控制处理的输入图像" diff --git a/javascript/ui.js b/javascript/ui.js index 0c973cc10..a4bf0a75e 100644 --- a/javascript/ui.js +++ b/javascript/ui.js @@ -108,10 +108,6 @@ function send_to_kanvas(gallery) { const [image] = extract_image_from_gallery(gallery); log('sendToKanvas', image); if (window.loadFromURL && image.data) window.loadFromURL(image.data); - // const inputPanelEl = gradioApp().getElementById('control-template-column-input'); - // if (inputPanelEl) inputPanelEl.classList.remove('hidden'); - const inputPanelCb = gradioApp().getElementById('control_dynamic_input'); - if (inputPanelCb && !inputPanelCb.checked) inputPanelCb.click(); } async function setTheme(val, old) { diff --git a/modules/ui_control.py b/modules/ui_control.py index 03e24470a..56fb39599 100644 --- a/modules/ui_control.py +++ b/modules/ui_control.py @@ -166,8 +166,6 @@ def create_ui(_blocks: gr.Blocks=None): state = gr.Textbox(value='', visible=False) with gr.Accordion(open=False, label="Input", elem_id="control_input", elem_classes=["small-accordion"]): - with gr.Row(): - show_input = gr.Checkbox(label="Show input", value=True, elem_id="control_show_input") with gr.Row(): input_type = gr.Radio(label="Control input type", choices=['Control only', 'Init image same as control', 'Separate init image'], value='Control only', type='index', elem_id='control_input_type') with gr.Row(): @@ -220,7 +218,7 @@ def create_ui(_blocks: gr.Blocks=None): timer.startup.record('ui-networks') with gr.Row(elem_id='control-inputs'): - with gr.Column(scale=9, elem_id='control-input-column', visible=True) as column_input: + with gr.Column(scale=9, elem_id='control-input-column', visible=True) as _column_input: gr.HTML('Input

') with gr.Tabs(elem_classes=['control-tabs'], elem_id='control-tab-input'): input_mode = gr.Label(value='select', visible=False) @@ -276,7 +274,6 @@ def create_ui(_blocks: gr.Blocks=None): btn_update = gr.Button('Update', interactive=True, visible=False, elem_id='control_update') btn_update.click(fn=get_units, inputs=controls, outputs=[], show_progress='hidden', queue=False) - show_input.change(fn=lambda x: gr.update(visible=x), inputs=[show_input], outputs=[column_input]) input_type.change(fn=lambda x: gr.update(visible=x == 2), inputs=[input_type], outputs=[column_init]) btn_prompt_counter.click( fn=call_queue.wrap_queued_call(ui_common.update_token_counter),