correctly (?) indicate muted status of audio regions

[ardour.git] / gtk2_ardour / about.cc

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 342f0192461180cb4e187c965d99613ce5d5acf7..3a0b362bed84eae83e80e60d67565b02ba93e5b1 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"
 
@@ -127,6 +125,7 @@ static const char* authors[] = {
        N_("Hans Baier"),
        N_("Ben Bell"),
        N_("Sakari Bergen"),
+       N_("Christian Borss"),
        N_("Chris Cannam"),
        N_("Jesse Chappell"),
        N_("Thomas Charbonnel"),
@@ -135,8 +134,9 @@ static const char* authors[] = {
        N_("Paul Davis"),
        N_("Gerard van Dongen"),
        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"),
@@ -150,7 +150,9 @@ 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"),
        N_("Joshua Leach"),
        N_("Ben Loftis"),
@@ -163,6 +165,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"),
@@ -182,7 +185,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>\
@@ -195,12 +199,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\
@@ -260,7 +265,7 @@ patent must be licensed for everyone's free use or not licensed at all.\n\
   The precise terms and conditions for copying, distribution and\n\
 modification follow.\n\
 \f\n\
-                   GNU GENERAL PUBLIC LICENSE\n\
+""                 GNU GENERAL PUBLIC LICENSE\n\
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n\
 \n\
   0. This License applies to any program or other work which contains\n\
@@ -542,7 +547,9 @@ proprietary programs.  If your program is a subroutine library, you may\n\
 consider it more useful to permit linking proprietary applications with the\n\
 library.  If this is what you want to do, use the GNU Library General\n\
 Public License instead of this License.\n\
-");
+"); /* Note that at the start of (approximately) line 265, the above license
+       text has been split into two concatenated tokens (to satisfy compilation
+       under MSVC). Hopefully this won't affect gcc */
 
 About::About ()
        : config_info (0)
@@ -552,15 +559,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_search_path() + system_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;
        }
@@ -573,20 +579,25 @@ About::About ()
        }
 
        set_translator_credits (t);
-       set_copyright (_("Copyright (C) 1999-2011 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 ()
@@ -601,6 +612,7 @@ About::show_config_info ()
                config_info = new ConfigInfoDialog;
        }
 
-       config_info->present ();
+       config_info->run ();
+       config_info->hide ();
 }