update windows installer finish page text & link

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index e981df7d81cde7404163ae998563d89399e85b13..abdfa35877a8e461b925664e20f252b2d408bf74 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -74,7 +74,7 @@ TextReceiver text_receiver ("ardour");
 extern int curvetest (string);
 
 static ARDOUR_UI  *ui = 0;
-static const char* localedir = LOCALEDIR;
+static string localedir (LOCALEDIR);
 
 void
 gui_jack_error ()
@@ -214,11 +214,11 @@ static void console_madness_end () {}
 static void command_line_parse_error (int *argc, char** argv[]) {
        // Since we don't ordinarily have access to stdout and stderr with
        // an MSVC app, let the user know we encountered a parsing error.
-       Gtk::Main app(&argc, &argv); // Calls 'gtk_init()'
+       Gtk::Main app(argc, argv); // Calls 'gtk_init()'
 
-       Gtk::MessageDialog dlgReportParseError (_("\n   Ardour could not understand your command line      "),
+       Gtk::MessageDialog dlgReportParseError (string_compose (_("\n   %1 could not understand your command line      "), PROGRAM_NAME),
                        false, MESSAGE_ERROR, BUTTONS_CLOSE, true);
-       dlgReportParseError.set_title (_("An error was encountered while launching Ardour"));
+       dlgReportParseError.set_title (string_compose (_("An error was encountered while launching %1"), PROGRAM_NAME));
        dlgReportParseError.run ();
 }
 
@@ -228,23 +228,6 @@ static void console_madness_end () {}
 static void command_line_parse_error (int *argc, char** argv[]) {}
 #endif
 
-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 to copy them before starting to use the program?\n\n"
-                                            "\n"
-                                            "(Note that not all files will be copied, since some are no longer relevant)"),
-                                          PROGRAM_NAME, PROGRAM_VERSION, version), true);
-
-       msg.add_button (Gtk::Stock::NO, Gtk::RESPONSE_NO);
-       msg.add_button (Gtk::Stock::YES, Gtk::RESPONSE_YES);
-       msg.show_all ();
-
-       return (msg.run() == Gtk::RESPONSE_YES);
-}
-
-
 #if (defined(COMPILER_MSVC) && defined(NDEBUG) && !defined(RDC_BUILD))
 /*
  *  Release build with MSVC uses ardour_main()
@@ -268,7 +251,9 @@ int ardour_main (int argc, char *argv[])
 int main (int argc, char *argv[])
 #endif
 {
-       fixup_bundle_environment (argc, argv, &localedir);
+       ARDOUR::check_for_old_configuration_files();
+
+       fixup_bundle_environment (argc, argv, localedir);
 
        load_custom_fonts(); /* needs to happen before any gtk and pango init calls */
 
@@ -292,7 +277,7 @@ int main (int argc, char *argv[])
 #ifdef ENABLE_NLS
        cerr << "bind txt domain [" << PACKAGE << "] to " << localedir << endl;
 
-       (void) bindtextdomain (PACKAGE, localedir);
+       (void) bindtextdomain (PACKAGE, localedir.c_str());
        /* our i18n translations are all in UTF-8, so make sure
           that even if the user locale doesn't specify UTF-8,
           we use that when handling them.
@@ -335,7 +320,7 @@ int main (int argc, char *argv[])
        }
 
        if (no_splash) {
-               cerr << _("Copyright (C) 1999-2012 Paul Davis") << endl
+               cerr << _("Copyright (C) 1999-2015 Paul Davis") << endl
                     << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker, Robin Gareus") << endl
                     << endl
                     << string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl
@@ -345,7 +330,7 @@ int main (int argc, char *argv[])
                     << endl;
        }
 
-       if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
+       if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir.c_str())) {
                error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
                exit (1);
        }
@@ -361,7 +346,7 @@ int main (int argc, char *argv[])
 #endif
 
        try {
-               ui = new ARDOUR_UI (&argc, &argv, localedir);
+               ui = new ARDOUR_UI (&argc, &argv, localedir.c_str());
        } catch (failed_constructor& err) {
                error << string_compose (_("could not create %1 GUI"), PROGRAM_NAME) << endmsg;
                exit (1);