fix hard-coded version in config copy dialog; use yes/no buttons, and default to yes

Multimedia / Ardour - Paul Davis [linuxaudiosystems.com] - 3 April 2015 10:35 EDT



###

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 39f1d8e..66a5efd 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);
-
- msg.add_button (Gtk::Stock::NO, Gtk::RESPONSE_NO);
+ 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.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)

f1147a3 fix hard-coded version in config copy dialog; use yes/no buttons, and default to yes
gtk2_ardour/ardour_ui.cc | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)

  • Share