diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui
index 9c04701e8..4d92bce7e 160000
--- a/extensions-builtin/sdnext-modernui
+++ b/extensions-builtin/sdnext-modernui
@@ -1 +1 @@
-Subproject commit 9c04701e807f9b0102a79d124b9faa87d9b86453
+Subproject commit 4d92bce7e47276f85651478cb9619b5e6dd77d8b
diff --git a/html/locale_en.json b/html/locale_en.json
index 42ef8550e..d387c860a 100644
--- a/html/locale_en.json
+++ b/html/locale_en.json
@@ -710,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","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
Click to minimize/maximize","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"},
@@ -1005,7 +1005,7 @@
{"id":"","label":"Network parameters","localized":"","hint":""}
],
"o": [
- {"id":"txt2img_results_mobile","label":"Output","localized":"","hint":"Show/hide selection of output media: generation resuls and live previews during generation process","ui":"txt2img"},
+ {"id":"txt2img_results_mobile","label":"Output","localized":"","hint":"Generation resuls and live previews during generation process
Click to minimize/maximize","ui":"txt2img"},
{"id":"","label":"OpenCLiP","localized":"","hint":"Analyze image using CLiP model via OpenCLiP","ui":"caption"},
{"id":"","label":"ONNX","localized":"","hint":""},
{"id":"","label":"Override","localized":"","hint":"Override settings that can change server behavior and are typically applied from imported image metadata","ui":"txt2img"},
@@ -1073,7 +1073,6 @@
{"id":"","label":"Preset Block Merge","localized":"","hint":"","ui":"models_merge_tab"},
{"id":"","label":"Preview metadata","localized":"","hint":""},
{"id":"","label":"Prompt","localized":"","hint":"Describe image you want to generate","ui":"txt2img"},
- {"id":"","label":"Processed Preview","localized":"","hint":"Show/hide section from pre-processing of input images before actual generate","ui":"control"},
{"id":"","label":"PixelArt","localized":"","hint":"","ui":"extras"},
{"id":"","label":"PAG: Perturbed attention guidance","localized":"","hint":"","ui":"settings_advanced"},
{"id":"","label":"PAB: Pyramid attention broadcast","localized":"","hint":"","ui":"settings_advanced"},
@@ -1106,7 +1105,6 @@
{"id":"","label":"Processor","localized":"","hint":"Processor type to use to preprocess image used for ControlNet","ui":"control"},
{"id":"","label":"Pose confidence","localized":"","hint":"","ui":"control"},
{"id":"","label":"Parameter free","localized":"","hint":"","ui":"control"},
- {"id":"","label":"Processed","localized":"","hint":"Show/hide section with processed images","ui":"control"},
{"id":"","label":"Postprocess mask","localized":"","hint":"","ui":"extras"},
{"id":"","label":"PixelArt block size","localized":"","hint":"","ui":"extras"},
{"id":"","label":"PixelArt sharpen","localized":"","hint":"","ui":"extras"},
diff --git a/javascript/control.js b/javascript/control.js
index 06da73910..2dacbde06 100644
--- a/javascript/control.js
+++ b/javascript/control.js
@@ -10,8 +10,8 @@ function controlInputMode(inputMode, ...args) {
log('controlInputMode', { mode: inputMode, tab: inputTab, kanvas: typeof Kanvas });
if ((inputTab === 'Image') && (typeof 'Kanvas' !== 'undefined')) {
inputTab = 'Kanvas';
- const imageData = window.kanvas.getImage();
- args[0] = imageData;
+ args[0] = window.kanvas.getImage();
+ args[1] = window.kanvas.getImage(); // TODO support separate control
}
return [inputTab, ...args];
}
diff --git a/modules/ui_control.py b/modules/ui_control.py
index 56fb39599..3ba7f08bb 100644
--- a/modules/ui_control.py
+++ b/modules/ui_control.py
@@ -241,12 +241,6 @@ def create_ui(_blocks: gr.Blocks=None):
with gr.Tabs(elem_classes=['control-tabs'], elem_id='control-tab-init'):
with gr.Tab('Image', id='init-image') as tab_image_init:
init_image = gr.Image(label="Input", show_label=False, type="pil", interactive=True, tool="editor", height=gr_height, elem_classes=['control-image'])
- with gr.Tab('Video', id='init-video') as tab_video_init:
- init_video = gr.Video(label="Input", show_label=False, interactive=True, height=gr_height, elem_classes=['control-image'])
- with gr.Tab('Batch', id='init-batch') as tab_batch_init:
- init_batch = gr.File(label="Input", show_label=False, file_count='multiple', file_types=['image'], interactive=True, height=gr_height, elem_classes=['control-image'])
- with gr.Tab('Folder', id='init-folder') as tab_folder_init:
- init_folder = gr.File(label="Input", show_label=False, file_count='directory', file_types=['image'], interactive=True, height=gr_height, elem_classes=['control-image'])
with gr.Column(scale=9, elem_id='control-output-column', visible=True) as _column_output:
gr.HTML('Output')
with gr.Tabs(elem_classes=['control-tabs'], elem_id='control-tab-output') as output_tabs:
@@ -304,7 +298,7 @@ def create_ui(_blocks: gr.Blocks=None):
prompt.submit(**select_dict)
negative.submit(**select_dict)
btn_generate.click(**select_dict)
- for ctrl in [input_image, input_video, input_batch, input_folder, init_image, init_video, init_batch, init_folder, tab_image, tab_video, tab_batch, tab_folder, tab_image_init, tab_video_init, tab_batch_init, tab_folder_init]:
+ for ctrl in [input_image, input_video, input_batch, input_folder, init_image, tab_image, tab_video, tab_batch, tab_folder, tab_image_init]:
if hasattr(ctrl, 'change'):
ctrl.change(**select_dict)
if hasattr(ctrl, 'clear'):