Reset RouteDialog: name edited by-user

* after each "Add" operation
* when cleaning the name field
This commit is contained in:
Robin Gareus 2017-08-22 17:07:42 +02:00
parent 28a7e4a3e0
commit 201d536ee9
3 changed files with 17 additions and 5 deletions

View file

@ -280,7 +280,7 @@ AddRouteDialog::~AddRouteDialog ()
void
AddRouteDialog::on_response (int r)
{
name_edited_by_user = false;
reset_name_edited ();
/* Don't call ArdourDialog::on_response() because that will
automatically hide the dialog.
*/
@ -421,13 +421,21 @@ AddRouteDialog::trk_template_row_selected ()
void
AddRouteDialog::name_template_entry_insertion (Glib::ustring const &,int*)
{
name_edited_by_user = true;
if (name_template ().empty ()) {
name_edited_by_user = false;
} else {
name_edited_by_user = true;
}
}
void
AddRouteDialog::name_template_entry_deletion (int, int)
{
name_edited_by_user = true;
if (name_template ().empty ()) {
name_edited_by_user = false;
} else {
name_edited_by_user = true;
}
}
void
@ -509,7 +517,8 @@ AddRouteDialog::maybe_update_name_template_entry ()
name_template_entry.set_text (VCA::default_name_template());
break;
}
name_edited_by_user = false;
/* ignore programatic change, restore false */
reset_name_edited ();
}
void
@ -698,7 +707,7 @@ void
AddRouteDialog::on_show ()
{
routes_spinner.grab_focus ();
name_edited_by_user = false;
reset_name_edited ();
refill_route_groups ();

View file

@ -86,6 +86,8 @@ public:
std::string get_template_path();
void reset_name_edited () { name_edited_by_user = false; }
private:
Gtk::Entry name_template_entry;
Gtk::Adjustment routes_adjustment;

View file

@ -4449,6 +4449,7 @@ ARDOUR_UI::add_route_dialog_response (int r)
switch (r) {
case AddRouteDialog::Add:
add_route_dialog->reset_name_edited ();
break;
case AddRouteDialog::AddAndClose:
add_route_dialog->ArdourDialog::on_response (r);