Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added accordion settings options #13826

Merged
merged 7 commits into from
Nov 19, 2023
Merged

added accordion settings options #13826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7595153
added accordion settings options
ezxzeng Nov 3, 2023
f9c14a8
Merge branch 'dev' into ui_mobile_optimizations
ezxzeng Nov 7, 2023
a625a7b
moved nested with to single line to remove extra tabs
ezxzeng Nov 9, 2023
9aa4d09
removed changes that weren't merged properly
ezxzeng Nov 9, 2023
ff2952f
multiline with statement for readibility
ezxzeng Nov 9, 2023
5432d93
fix added accordion settings options
w-e-w Nov 10, 2023
3a4a6c4
ExitStack as alternative to suppress
ezxzeng Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/shared_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@
"hires_fix_show_sampler": OptionInfo(False, "Hires fix: show hires checkpoint and sampler selection").needs_reload_ui(),
"hires_fix_show_prompts": OptionInfo(False, "Hires fix: show hires prompt and negative prompt").needs_reload_ui(),
"disable_token_counters": OptionInfo(False, "Disable prompt token counters").needs_reload_ui(),
"txt2img_settings_accordion": OptionInfo(False, "Settings in txt2img hidden under Accordion").needs_reload_ui(),
"img2img_settings_accordion": OptionInfo(False, "Settings in img2img hidden under Accordion").needs_reload_ui(),
"compact_prompt_box": OptionInfo(False, "Compact prompt layout").info("puts prompt and negative prompt inside the Generate tab, leaving more vertical space for the image on the right").needs_reload_ui(),
}))

Expand Down
13 changes: 11 additions & 2 deletions modules/ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import sys
from functools import reduce
import warnings
from contextlib import ExitStack

import gradio as gr
import gradio.utils
Expand Down Expand Up @@ -270,7 +271,11 @@ def create_ui():
extra_tabs.__enter__()

with gr.Tab("Generation", id="txt2img_generation") as txt2img_generation_tab, ResizeHandleRow(equal_height=False):
with gr.Column(variant='compact', elem_id="txt2img_settings"):
with ExitStack() as stack:
if shared.opts.txt2img_settings_accordion:
stack.enter_context(gr.Accordion("Open for Settings", open=False))
stack.enter_context(gr.Column(variant='compact', elem_id="txt2img_settings"))

scripts.scripts_txt2img.prepare_ui()

for category in ordered_ui_categories():
Expand Down Expand Up @@ -489,7 +494,11 @@ def create_ui():
extra_tabs.__enter__()

with gr.Tab("Generation", id="img2img_generation") as img2img_generation_tab, ResizeHandleRow(equal_height=False):
with gr.Column(variant='compact', elem_id="img2img_settings"):
with ExitStack() as stack:
if shared.opts.img2img_settings_accordion:
stack.enter_context(gr.Accordion("Open for Settings", open=False))
stack.enter_context(gr.Column(variant='compact', elem_id="img2img_settings"))

copy_image_buttons = []
copy_image_destinations = {}

Expand Down