diff --git a/CHANGELOG.md b/CHANGELOG.md index 2147f87dd..923c5ef20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -159,6 +159,7 @@ And other goodies like multiple *XYZ grid* improvements, additional *Flux Contro - **video** add option `gradio_skip_video` to avoid gradio issues with displaying generated videos - add support for manually downloaded diffusers models from huggingface - **ui** + - move checkboxes `full quality, tiling, hidiffusion` to advanced section - hide token counter until tokens are known - minor ui optimizations - fix update infotext on image select diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index 0a98959a4..0a0948670 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit 0a98959a47cc7dcb9345e5a9f2f43740d0648261 +Subproject commit 0a09486705033e800d9d427f77c4e6ad2bb5f7dc diff --git a/modules/postprocess/yolo.py b/modules/postprocess/yolo.py index 82626fdd6..18b2e7096 100644 --- a/modules/postprocess/yolo.py +++ b/modules/postprocess/yolo.py @@ -277,9 +277,9 @@ class YoloRestorer(Detailer): shared.opts.detailer_iou = iou shared.log.debug(f'Detailer settings: models={shared.opts.detailer_models} strength={shared.opts.detailer_strength} conf={shared.opts.detailer_conf} max={shared.opts.detailer_max} iou={shared.opts.detailer_iou} size={shared.opts.detailer_min_size}-{shared.opts.detailer_max_size} padding={shared.opts.detailer_padding}') - with gr.Accordion(open=False, label="Detailer", elem_id=f"{tab}_detailer", elem_classes=["small-accordion"], visible=shared.native): + with gr.Accordion(open=False, label="Detailer", elem_id=f"{tab}_detailer_accordion", elem_classes=["small-accordion"], visible=shared.native): with gr.Row(): - enabled = gr.Checkbox(label="Enable detailer pass", elem_id=f"{tab}_detailer", value=False) + enabled = gr.Checkbox(label="Enable detailer pass", elem_id=f"{tab}_detailer_enabled", value=False) with gr.Row(): detailers = gr.Dropdown(label="Detailers", elem_id=f"{tab}_detailers", choices=self.list, value=shared.opts.detailer_models, multiselect=True) ui_common.create_refresh_button(detailers, self.enumerate, {}, elem_id=f"{tab}_detailers_refresh") diff --git a/modules/shared.py b/modules/shared.py index 94635f6ed..d91d2823f 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -695,7 +695,7 @@ options_templates.update(options_section(('ui', "User Interface Options"), { "gradio_theme": OptionInfo("black-teal", "UI theme", gr.Dropdown, lambda: {"choices": theme.list_themes()}, refresh=theme.refresh_themes), "font_size": OptionInfo(14, "Font size", gr.Slider, {"minimum": 8, "maximum": 32, "step": 1, "visible": True}), "tooltips": OptionInfo("UI Tooltips", "UI tooltips", gr.Radio, {"choices": ["None", "Browser default", "UI tooltips"], "visible": False}), - "aspect_ratios": OptionInfo("1:1, 4:3, 16:9, 16:10, 21:9, 3:4, 9:16, 10:16, 9:21", "Allowed aspect ratios"), + "aspect_ratios": OptionInfo("1:1, 4:3, 3:2, 16:9, 16:10, 21:9, 2:3, 3:4, 9:16, 10:16, 9:21", "Allowed aspect ratios"), "motd": OptionInfo(True, "Show MOTD"), "compact_view": OptionInfo(False, "Compact view"), "return_grid": OptionInfo(True, "Show grid in results"), diff --git a/modules/ui_sections.py b/modules/ui_sections.py index 27ea2d328..67520aa71 100644 --- a/modules/ui_sections.py +++ b/modules/ui_sections.py @@ -148,7 +148,7 @@ def create_seed_inputs(tab, reuse_visible=True): def create_cfg_inputs(tab): with gr.Row(): - cfg_scale = gr.Slider(minimum=0.0, maximum=30.0, step=0.1, label='CFG scale', value=6.0, elem_id=f"{tab}_cfg_scale") + cfg_scale = gr.Slider(minimum=0.0, maximum=30.0, step=0.1, label='Guidance scale', value=6.0, elem_id=f"{tab}_cfg_scale") cfg_end = gr.Slider(minimum=0.0, maximum=1.0, step=0.1, label='Guidance end', value=1.0, elem_id=f"{tab}_cfg_end") return cfg_scale, cfg_end diff --git a/wiki b/wiki index 87bd5adaa..c648e82c3 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 87bd5adaae34ebe5c880f64e56322ff47d0a315a +Subproject commit c648e82c3b26813bff59dad567438e877fff02a1