Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / about.cc

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 5ecc075c30d15789798db33bb6ed5819b4ae512c..b656c29ad8175fde37d430a630095338fe0c6e93 100644 (file)
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -20,15 +20,13 @@
 #include <algorithm>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/wait.h>
 #include <cstdio>
 #include <ctime>
 #include <cstdlib>
 
 #include "pbd/file_utils.h"
 
-#include "ardour/svn_revision.h"
-#include "ardour/ardour.h"
+#include "ardour/revision.h"
 #include "ardour/version.h"
 #include "ardour/filesystem_paths.h"
 
@@ -137,7 +135,7 @@ static const char* authors[] = {
        N_("Colin Fletcher"),
        N_("Dave Flick"),
        N_("Hans Fugal"),
-        N_("Robin Gareus"),
+       N_("Robin Gareus"),
        N_("Christopher George"),
        N_("Chris Goddard"),
        N_("J. Abelardo Gutierrez"),
@@ -151,6 +149,7 @@ static const char* authors[] = {
        N_("Robert Jordens"),
        N_("Stefan Kersten"),
        N_("Armand Klenk"),
+       N_("Julien de Kozak"),
        N_("Matt Krai"),
        N_("Nick Lanham"),
        N_("Colin Law"),
@@ -165,6 +164,7 @@ static const char* authors[] = {
        N_("Taybin Rutkin"),
        N_("Andreas Ruge"),
        N_("Sampo Savolainen"),
+       N_("Rodrigo Severo"),
        N_("Per Sigmond"),
        N_("Lincoln Spiteri"),
        N_("Mike Start"),
@@ -184,7 +184,8 @@ static const char* translators[] = {
 \n\tRobert Schwede <schwede@ironshark.com>\
 \n\tBenjamin Scherrer <realhangman@web.de>\
 \n\tEdgar Aichinger <edogawa@aon.at>\
-\n\tRichard Oax <richard@pagliacciempire.de>\n"),
+\n\tRichard Oax <richard@pagliacciempire.de>\
+\n\tRobin Gloster <robin@loc-com.de>\n"),
        N_("Italian:\n\tFilippo Pappalardo <filippo@email.it>\n\tRaffaele Morelli <raffaele.morelli@gmail.com>\n"),
        N_("Portuguese:\n\tRui Nuno Capela <rncbc@rncbc.org>\n"),
        N_("Brazilian Portuguese:\n\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\
@@ -197,12 +198,13 @@ static const char* translators[] = {
        N_("Polish:\n\t Piotr Zaryk <pzaryk@gmail.com>\n"),
        N_("Czech:\n\t Pavel Fric <pavelfric@seznam.cz>\n"),
        N_("Norwegian:\n\t Eivind Ødegård\n"),
+       N_("Chinese:\n\t Rui-huai Zhang <zrhzrh@mail.ustc.edu.cn>\n"),
        0
 };
 
 static const char* gpl = X_("\n\
 Ardour comes with NO WARRANTY. It is free software, and you are welcome to redistribute it\n\
-under the terms of the GNU Public License, shown below.\n\
+under the terms of the GNU General Public License, shown below.\n\
 \n\
                    GNU GENERAL PUBLIC LICENSE\n\
                       Version 2, June 1991\n\
@@ -554,15 +556,14 @@ About::About ()
 {
        // set_type_hint(Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
 
-       string path;
        string t;
 
-       sys::path splash_file;
+       std::string splash_file;
 
-       SearchPath spath(ardour_data_search_path());
+       Searchpath spath(ardour_data_search_path());
 
        if (find_file_in_search_path (spath, "splash.png", splash_file)) {
-               set_logo (Gdk::Pixbuf::create_from_file (splash_file.to_string()));
+               set_logo (Gdk::Pixbuf::create_from_file (splash_file));
        } else {
                error << "Could not find splash file" << endmsg;
        }
@@ -575,20 +576,25 @@ About::About ()
        }
 
        set_translator_credits (t);
-       set_copyright (_("Copyright (C) 1999-2012 Paul Davis\n"));
+       set_copyright (_("Copyright (C) 1999-2013 Paul Davis\n"));
        set_license (gpl);
        set_name (X_("Ardour"));
        set_website (X_("http://ardour.org/"));
        set_website_label (_("http://ardour.org/"));
        set_version ((string_compose(_("%1\n(built from revision %2)"),
                                     VERSIONSTRING,
-                                    svn_revision)));
+                                    revision)));
 
        Gtk::Button* config_button = manage (new Button (_("Config")));
 
        get_action_area()->add (*config_button);
        get_action_area()->reorder_child (*config_button, 0);
        config_button->signal_clicked().connect (mem_fun (*this, &About::show_config_info));
+
+       Gtk::Button *btn = static_cast<Gtk::Button*>(get_widget_for_response(Gtk::RESPONSE_CANCEL));
+       if (btn) {
+               btn->signal_clicked().connect(sigc::mem_fun(static_cast<Gtk::Window*>(this), &Gtk::Window::hide));
+       }
 }
 
 About::~About ()