From c5cbc2d2d3fe66a1c6ea5ef2cb6e0c83b960685d Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 20 Jul 2021 16:00:19 -0500 Subject: [PATCH] Playlist UI Tweaks: remind the user (more strongly) about the action they are taking --- gtk2_ardour/editor.cc | 16 ++++++---------- gtk2_ardour/editor.h | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index e233d079f6..64c6315dda 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4341,7 +4341,7 @@ Editor::restore_editing_space () } bool -Editor::stamp_new_playlist (string &name, string &pgroup, bool copy) +Editor::stamp_new_playlist (string title, string &name, string &pgroup, bool copy) { pgroup = Playlist::generate_pgroup_id (); @@ -4353,11 +4353,7 @@ Editor::stamp_new_playlist (string &name, string &pgroup, bool copy) } Prompter prompter (true); - if (copy) { - prompter.set_title (_("Copy Playlist(s)")); - } else { - prompter.set_title (_("New (Empty) Playlist(s)")); - } + prompter.set_title (title); prompter.set_prompt (_("Name for new playlist:")); prompter.set_initial_text (name); prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT); @@ -4419,7 +4415,7 @@ void Editor::new_playlists_for_all_tracks (bool copy) { string name, gid; - if (stamp_new_playlist(name,gid,copy)) { + if (stamp_new_playlist( _("New Playlist for ALL Tracks"), name,gid,copy)) { vector > playlists; _session->playlists()->get (playlists); mapover_all_routes (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), name, gid, copy, playlists)); @@ -4430,7 +4426,7 @@ void Editor::new_playlists_for_grouped_tracks (RouteUI* rui, bool copy) { string name, gid; - if (stamp_new_playlist(name,gid,copy)) { + if (stamp_new_playlist( _("New Playlist for this track/group"), name,gid,copy)) { vector > playlists; _session->playlists()->get (playlists); mapover_grouped_routes (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), name, gid, copy, playlists), rui, ARDOUR::Properties::group_select.property_id); @@ -4441,7 +4437,7 @@ void Editor::new_playlists_for_selected_tracks (bool copy) { string name, gid; - if (stamp_new_playlist(name,gid,copy)) { + if (stamp_new_playlist( _("New Playlist for Selected Tracks"), name,gid,copy)) { vector > playlists; _session->playlists()->get (playlists); mapover_selected_routes (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), name, gid, copy, playlists)); @@ -4452,7 +4448,7 @@ void Editor::new_playlists_for_armed_tracks (bool copy) { string name, gid; - if (stamp_new_playlist(name,gid,copy)) { + if (stamp_new_playlist( _("New Playlist for Armed Tracks"), name,gid,copy)) { vector > playlists; _session->playlists()->get (playlists); mapover_armed_routes (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), name, gid, copy, playlists)); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index c69918206f..af0b6161dd 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1702,7 +1702,7 @@ private: /* playlist internal ops */ - bool stamp_new_playlist (std::string &name, std::string &pgroup, bool copy); + bool stamp_new_playlist (std::string title, std::string &name, std::string &pgroup, bool copy); /* display control */