From f1147a30a777e7a1515c8208196e1ae4791476d6 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 3 Apr 2015 11:35:32 -0400 Subject: [PATCH] fix hard-coded version in config copy dialog; use yes/no buttons, and default to yes --- gtk2_ardour/ardour_ui.cc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 39f1d8e6bc..66a5efdb2c 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -162,14 +162,19 @@ static bool ask_about_configuration_copy (string const & old_dir, string const & new_dir, int version) { MessageDialog msg (string_compose (_("%1 %2.x has discovered configuration files from %1 %3.x.\n\n" - "Would you like these files to be copied and used for %1 4.x?\n\n" + "Would you like these files to be copied and used for %1 %2.x?\n\n" "(This will require you to restart %1.)"), - PROGRAM_NAME, PROGRAM_VERSION, version), true); + PROGRAM_NAME, PROGRAM_VERSION, version), + false, /* no markup */ + Gtk::MESSAGE_INFO, + Gtk::BUTTONS_YES_NO, + true /* modal, though it hardly matters since it is the only window */ + ); - msg.add_button (Gtk::Stock::NO, Gtk::RESPONSE_NO); + msg.set_default_response (Gtk::RESPONSE_YES); msg.show_all (); - return (msg.run() == Gtk::RESPONSE_OK); + return (msg.run() == Gtk::RESPONSE_YES); } ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)