change UI reorder setting to multiselect (583fb9f0) · Commits · github_fork / Stable Diffusion Webui

modules/shared.py

+5 −14

Original line number	Diff line number	Diff line
		@@ -43,19 +43,6 @@ restricted_opts = {
		"outdir_init_images"
		}

		ui_reorder_categories = [
		"inpaint",
		"sampler",
		"checkboxes",
		"hires_fix",
		"dimensions",
		"cfg",
		"seed",
		"batch",
		"override_settings",
		"scripts",
		]

		# https://huggingface.co/datasets/freddyaboulton/gradio-theme-subdomains/resolve/main/subdomains.json
		gradio_hf_hub_themes = [
		"gradio/glass",
		@@ -487,7 +474,7 @@ options_templates.update(options_section(('ui', "User interface"), {
		"quicksettings_list": OptionInfo(["sd_model_checkpoint"], "Quicksettings list", ui_components.DropdownMulti, lambda: {"choices": list(opts.data_labels.keys())}).js("info", "settingsHintsShowQuicksettings").info("setting entries that appear at the top of page rather than in settings tab").needs_restart(),
		"ui_tab_order": OptionInfo([], "UI tab order", ui_components.DropdownMulti, lambda: {"choices": list(tab_names)}).needs_restart(),
		"hidden_tabs": OptionInfo([], "Hidden UI tabs", ui_components.DropdownMulti, lambda: {"choices": list(tab_names)}).needs_restart(),
		"ui_reorder": OptionInfo(", ".join(ui_reorder_categories), "txt2img/img2img UI item order").needs_restart(),
		"ui_reorder": OptionInfo([], "txt2img/img2img UI item order", ui_components.DropdownMulti, lambda: {"choices": list(shared_items.ui_reorder_categories())}).info("selected items appear first").needs_restart(),
		"hires_fix_show_sampler": OptionInfo(False, "Hires fix: show hires sampler selection").needs_restart(),
		"hires_fix_show_prompts": OptionInfo(False, "Hires fix: show hires prompt and negative prompt").needs_restart(),
		"disable_token_counters": OptionInfo(False, "Disable prompt token counters").needs_restart(),
		@@ -638,6 +625,10 @@ class Options:
		if self.data.get('quicksettings') is not None and self.data.get('quicksettings_list') is None:
		self.data['quicksettings_list'] = [i.strip() for i in self.data.get('quicksettings').split(',')]

		# 1.4.0 ui_reorder
		if isinstance(self.data.get('ui_reorder'), str):
		self.data['ui_reorder'] = [i.strip() for i in self.data.get('ui_reorder').split(',')]

		bad_settings = 0
		for k, v in self.data.items():
		info = self.data_labels.get(k, None)

modules/shared_items.py

+17 −0

Original line number	Diff line number	Diff line
		@@ -40,3 +40,20 @@ def refresh_unet_list():

		modules.sd_unet.list_unets()


		ui_reorder_categories_builtin_items = [
		"inpaint",
		"sampler",
		"checkboxes",
		"hires_fix",
		"dimensions",
		"cfg",
		"seed",
		"batch",
		"override_settings",
		]


		def ui_reorder_categories():
		yield from ui_reorder_categories_builtin_items
		yield "scripts"

modules/ui.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ import numpy as np
		from PIL import Image, PngImagePlugin # noqa: F401
		from modules.call_queue import wrap_gradio_gpu_call, wrap_queued_call, wrap_gradio_call

		from modules import sd_hijack, sd_models, localization, script_callbacks, ui_extensions, deepbooru, sd_vae, extra_networks, ui_common, ui_postprocessing, progress, ui_loadsave, errors
		from modules import sd_hijack, sd_models, localization, script_callbacks, ui_extensions, deepbooru, sd_vae, extra_networks, ui_common, ui_postprocessing, progress, ui_loadsave, errors, shared_items
		from modules.ui_components import FormRow, FormGroup, ToolButton, FormHTML
		from modules.paths import script_path, data_path

		@@ -403,9 +403,9 @@ def create_sampler_and_steps_selection(choices, tabname):


		def ordered_ui_categories():
		user_order = {x.strip(): i * 2 + 1 for i, x in enumerate(shared.opts.ui_reorder.split(","))}
		user_order = {x.strip(): i * 2 + 1 for i, x in enumerate(shared.opts.ui_reorder)}

		for _, category in sorted(enumerate(shared.ui_reorder_categories), key=lambda x: user_order.get(x[1], x[0] * 2 + 0)):
		for _, category in sorted(enumerate(shared_items.ui_reorder_categories()), key=lambda x: user_order.get(x[1], x[0] * 2 + 0)):
		yield category

Admin message