Add a reset button for rename

ui.py

@@ -243,69 +243,86 @@ def render_speaker_samples_tab(speakerNames, raw_to_display, currFile):
             input_key   = f"inline_rename_input_{currFile}_{sp}"
             confirm_key = f"inline_rename_confirm_{currFile}_{sp}"
             cancel_key  = f"inline_rename_cancel_{currFile}_{sp}"
+            reset_key   = f"inline_rename_reset_{currFile}_{sp}"
+            form_key    = f"inline_rename_form_{currFile}_{sp}"
 
             history     = st.session_state.inline_rename_history
-            # Read the saved rename directly from speakerRenames so that
-            # current_val is "" when no rename exists, even if display_name
-            # happens to equal the raw speaker label for some other reason.
             current_val = st.session_state.speakerRenames.get(currFile, {}).get(sp, "")
 
             _NEW_OPTION = "＋ Enter a new name"
 
             with row_cols[0]:
-                if history:
-                    # Show dropdown of past names; last option triggers text input
-                    options = history + [_NEW_OPTION]
-                    default_idx = (
-                        history.index(current_val) if current_val in history
-                        else len(options) - 1
-                    )
-                    chosen = st.selectbox(
-                        "Rename",
-                        options=options,
-                        index=default_idx,
-                        key=select_key,
-                        label_visibility="collapsed",
-                    )
-                    # Only show text input when user wants a brand-new name
-                    if chosen == _NEW_OPTION:
+                # Wrap in a form so pressing Enter submits (confirms) the rename
+                with st.form(key=form_key, border=False):
+                    if history:
+                        options = history + [_NEW_OPTION]
+                        default_idx = (
+                            history.index(current_val) if current_val in history
+                            else len(options) - 1
+                        )
+                        chosen = st.selectbox(
+                            "Rename",
+                            options=options,
+                            index=default_idx,
+                            key=select_key,
+                            label_visibility="collapsed",
+                        )
+                        if chosen == _NEW_OPTION:
+                            if input_key not in st.session_state:
+                                st.session_state[input_key] = ""
+                            new_name = st.text_input(
+                                "New name",
+                                key=input_key,
+                                label_visibility="collapsed",
+                                placeholder=f"Rename {sp}…",
+                            )
+                        else:
+                            new_name = chosen
+                            st.session_state.pop(input_key, None)
+                    else:
+                        # No history yet — just a plain text input
                         if input_key not in st.session_state:
-                            st.session_state[input_key] = ""
+                            st.session_state[input_key] = current_val
                         new_name = st.text_input(
-                            "New name",
+                            "Rename",
                             key=input_key,
                             label_visibility="collapsed",
                             placeholder=f"Rename {sp}…",
                         )
-                    else:
-                        new_name = chosen
-                        st.session_state.pop(input_key, None)
-                else:
-                    # No history yet — just a plain text input
-                    if input_key not in st.session_state:
-                        st.session_state[input_key] = current_val
-                    new_name = st.text_input(
-                        "Rename",
-                        key=input_key,
-                        label_visibility="collapsed",
-                        placeholder=f"Rename {sp}…",
-                    )
 
-                btn_col1, btn_col2 = st.columns(2)
-                if btn_col1.button("✓", key=confirm_key, help="Confirm rename"):
-                    confirmed = (new_name or "").strip()
-                    apply_inline_rename(currFile, sp, confirmed)
-                    if confirmed and confirmed not in st.session_state.inline_rename_history:
-                        st.session_state.inline_rename_history.append(confirmed)
-                    st.session_state.inline_rename_active[edit_key] = False
-                    st.session_state.pop(select_key, None)
-                    st.session_state.pop(input_key, None)
-                    st.rerun()
-                if btn_col2.button("✕", key=cancel_key, help="Cancel"):
-                    st.session_state.inline_rename_active[edit_key] = False
-                    st.session_state.pop(select_key, None)
-                    st.session_state.pop(input_key, None)
-                    st.rerun()
+                    # Right-align the three buttons: confirm > cancel > reset
+                    st.markdown(
+                        "<style>div[data-testid='stFormSubmitButton'] {"
+                        "display:flex; justify-content:flex-end; gap:4px;}</style>",
+                        unsafe_allow_html=True,
+                    )
+                    _, btn_col1, btn_col2, btn_col3 = st.columns([4, 1, 1, 1])
+                    confirmed_submit = btn_col1.form_submit_button("✓", help="Confirm rename (or press Enter)")
+                    cancel_clicked   = btn_col2.form_submit_button("✕", help="Cancel")
+                    reset_clicked    = btn_col3.form_submit_button("⟳", help="Reset to original speaker label")
+
+                    if confirmed_submit:
+                        confirmed = (new_name or "").strip()
+                        apply_inline_rename(currFile, sp, confirmed)
+                        if confirmed and confirmed not in st.session_state.inline_rename_history:
+                            st.session_state.inline_rename_history.append(confirmed)
+                        st.session_state.inline_rename_active[edit_key] = False
+                        st.session_state.pop(select_key, None)
+                        st.session_state.pop(input_key, None)
+                        st.rerun()
+                    if cancel_clicked:
+                        st.session_state.inline_rename_active[edit_key] = False
+                        st.session_state.pop(select_key, None)
+                        st.session_state.pop(input_key, None)
+                        st.rerun()
+                    if reset_clicked:
+                        # Revert to raw speaker label — same as removing the token
+                        # from a rename entry in the sidebar
+                        apply_inline_rename(currFile, sp, "")
+                        st.session_state.inline_rename_active[edit_key] = False
+                        st.session_state.pop(select_key, None)
+                        st.session_state.pop(input_key, None)
+                        st.rerun()
         else:
             with row_cols[0]:
                 name_col, pencil_col = st.columns([4, 1])