diff --git a/js/main.js b/js/main.js index 7e2a457c..70afabe3 100644 --- a/js/main.js +++ b/js/main.js @@ -555,6 +555,7 @@ function moveToChatTab() { newParent.insertBefore(grandParent, newParent.children[newPosition]); document.getElementById("save-character").style.display = "none"; + document.getElementById("restore-character").style.display = "none"; } function restoreOriginalPosition() { @@ -566,6 +567,7 @@ function restoreOriginalPosition() { } document.getElementById("save-character").style.display = ""; + document.getElementById("restore-character").style.display = ""; movedElement.style.display = ""; movedElement.children[0].style.minWidth = ""; } diff --git a/modules/chat.py b/modules/chat.py index f740db55..49511af1 100644 --- a/modules/chat.py +++ b/modules/chat.py @@ -1220,7 +1220,7 @@ def load_character(character, name1, name2): return name1, name2, picture, greeting, context -def reset_character_for_ui(state): +def restore_character_for_ui(state): """Reset character fields to the currently loaded character's saved values""" if state['character_menu'] and state['character_menu'] != 'None': try: diff --git a/modules/ui_chat.py b/modules/ui_chat.py index ef9330e4..d7a5ec69 100644 --- a/modules/ui_chat.py +++ b/modules/ui_chat.py @@ -122,7 +122,7 @@ def create_chat_settings_ui(): ui.create_refresh_button(shared.gradio['character_menu'], lambda: None, lambda: {'choices': utils.get_available_characters()}, 'refresh-button', interactive=not mu) shared.gradio['save_character'] = gr.Button('💾', elem_classes='refresh-button', elem_id="save-character", interactive=not mu) shared.gradio['delete_character'] = gr.Button('🗑️', elem_classes='refresh-button', interactive=not mu) - shared.gradio['reset_character'] = gr.Button('Restore character', elem_classes='refresh-button', interactive=True) + shared.gradio['restore_character'] = gr.Button('Restore character', elem_classes='refresh-button', interactive=True, elem_id='restore-character') shared.gradio['name2'] = gr.Textbox(value=shared.settings['name2'], lines=1, label='Character\'s name') shared.gradio['context'] = gr.Textbox(value=shared.settings['context'], lines=10, label='Context', elem_classes=['add_scrollbar']) @@ -320,9 +320,9 @@ def create_event_handlers(): ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then( chat.handle_save_template_click, gradio('instruction_template_str'), gradio('save_filename', 'save_root', 'save_contents', 'file_saver'), show_progress=False) - shared.gradio['reset_character'].click( + shared.gradio['restore_character'].click( ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then( - chat.reset_character_for_ui, gradio('interface_state'), gradio('interface_state', 'name2', 'context', 'greeting', 'character_picture'), show_progress=False) + chat.restore_character_for_ui, gradio('interface_state'), gradio('interface_state', 'name2', 'context', 'greeting', 'character_picture'), show_progress=False) shared.gradio['delete_template'].click(chat.handle_delete_template_click, gradio('instruction_template'), gradio('delete_filename', 'delete_root', 'file_deleter'), show_progress=False) shared.gradio['save_chat_history'].click(