Merge branch 'release_candidate'

1 files changed, 21 insertions, 11 deletions

diff --git a/modules/ui_prompt_styles.py b/modules/ui_prompt_styles.py
index 85eb3a64..0d74c23f 100644
--- a/modules/ui_prompt_styles.py
+++ b/modules/ui_prompt_styles.py
@@ -4,6 +4,7 @@ from modules import shared, ui_common, ui_components, styles
 

 styles_edit_symbol = '\U0001f58c\uFE0F'  # 🖌️

 styles_materialize_symbol = '\U0001f4cb'  # 📋

+styles_copy_symbol = '\U0001f4dd'  # 📝

 

 

 def select_style(name):

@@ -52,6 +53,8 @@ def refresh_styles():
 class UiPromptStyles:

     def __init__(self, tabname, main_ui_prompt, main_ui_negative_prompt):

         self.tabname = tabname

+        self.main_ui_prompt = main_ui_prompt

+        self.main_ui_negative_prompt = main_ui_negative_prompt

 

         with gr.Row(elem_id=f"{tabname}_styles_row"):

             self.dropdown = gr.Dropdown(label="Styles", show_label=False, elem_id=f"{tabname}_styles", choices=list(shared.prompt_styles.styles), value=[], multiselect=True, tooltip="Styles")

@@ -61,13 +64,14 @@ class UiPromptStyles:
             with gr.Row():

                 self.selection = gr.Dropdown(label="Styles", elem_id=f"{tabname}_styles_edit_select", choices=list(shared.prompt_styles.styles), value=[], allow_custom_value=True, info="Styles allow you to add custom text to prompt. Use the {prompt} token in style text, and it will be replaced with user's prompt when applying style. Otherwise, style's text will be added to the end of the prompt.")

                 ui_common.create_refresh_button([self.dropdown, self.selection], shared.prompt_styles.reload, lambda: {"choices": list(shared.prompt_styles.styles)}, f"refresh_{tabname}_styles")

-                self.materialize = ui_components.ToolButton(value=styles_materialize_symbol, elem_id=f"{tabname}_style_apply", tooltip="Apply all selected styles from the style selction dropdown in main UI to the prompt.")

+                self.materialize = ui_components.ToolButton(value=styles_materialize_symbol, elem_id=f"{tabname}_style_apply_dialog", tooltip="Apply all selected styles from the style selction dropdown in main UI to the prompt.")

+                self.copy = ui_components.ToolButton(value=styles_copy_symbol, elem_id=f"{tabname}_style_copy", tooltip="Copy main UI prompt to style.")

 

             with gr.Row():

-                self.prompt = gr.Textbox(label="Prompt", show_label=True, elem_id=f"{tabname}_edit_style_prompt", lines=3)

+                self.prompt = gr.Textbox(label="Prompt", show_label=True, elem_id=f"{tabname}_edit_style_prompt", lines=3, elem_classes=["prompt"])

 

             with gr.Row():

-                self.neg_prompt = gr.Textbox(label="Negative prompt", show_label=True, elem_id=f"{tabname}_edit_style_neg_prompt", lines=3)

+                self.neg_prompt = gr.Textbox(label="Negative prompt", show_label=True, elem_id=f"{tabname}_edit_style_neg_prompt", lines=3, elem_classes=["prompt"])

 

             with gr.Row():

                 self.save = gr.Button('Save', variant='primary', elem_id=f'{tabname}_edit_style_save', visible=False)

@@ -96,15 +100,21 @@ class UiPromptStyles:
             show_progress=False,

         ).then(refresh_styles, outputs=[self.dropdown, self.selection], show_progress=False)

 

-        self.materialize.click(

-            fn=materialize_styles,

-            inputs=[main_ui_prompt, main_ui_negative_prompt, self.dropdown],

-            outputs=[main_ui_prompt, main_ui_negative_prompt, self.dropdown],

+        self.setup_apply_button(self.materialize)

+

+        self.copy.click(

+            fn=lambda p, n: (p, n),

+            inputs=[main_ui_prompt, main_ui_negative_prompt],

+            outputs=[self.prompt, self.neg_prompt],

             show_progress=False,

-        ).then(fn=None, _js="function(){update_"+tabname+"_tokens(); closePopup();}", show_progress=False)

+        )

 

         ui_common.setup_dialog(button_show=edit_button, dialog=styles_dialog, button_close=self.close)

 

-

-

-

+    def setup_apply_button(self, button):

+        button.click(

+            fn=materialize_styles,

+            inputs=[self.main_ui_prompt, self.main_ui_negative_prompt, self.dropdown],

+            outputs=[self.main_ui_prompt, self.main_ui_negative_prompt, self.dropdown],

+            show_progress=False,

+        ).then(fn=None, _js="function(){update_"+self.tabname+"_tokens(); closePopup();}", show_progress=False)