X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fabout.cc;h=02d197251153835e47dcb14fa12098e757be993f;hb=bc38f2c48969be068b93525bdbcce6c1ff4e1d7c;hp=41c5d844745ce4fe74adfb91146883014cee457a;hpb=91fac4c96dc6210dcc056da70dc608700d7eb570;p=ardour.git

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 41c5d84474..02d1972511 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -24,17 +24,19 @@
 #include <ctime>
 #include <cstdlib>
 
+#include "pbd/error.h"
 #include "pbd/file_utils.h"
+#include "pbd/openuri.h"
 
+#include "ardour/profile.h"
 #include "ardour/revision.h"
 #include "ardour/filesystem_paths.h"
 
 #include "about.h"
 #include "configinfo.h"
 #include "rgb_macros.h"
-#include "ardour_ui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef WAF_BUILD
 #include "gtk2ardour-version.h"
@@ -122,6 +124,7 @@ static const gchar * paypal_xpm[] = {
 #endif
 
 static const char* authors[] = {
+	N_("Fons Adriaensen"),
 	N_("Brian Ahr"),
 	N_("John Anderson"),
 	N_("Marcus Andersson"),
@@ -143,6 +146,7 @@ static const char* authors[] = {
 	N_("Dave Flick"),
 	N_("Hans Fugal"),
 	N_("Robin Gareus"),
+	N_("Nil Geisweiller"),
 	N_("Christopher George"),
 	N_("Chris Goddard"),
 	N_("J. Abelardo Gutierrez"),
@@ -167,9 +171,15 @@ static const char* authors[] = {
 	N_("Tim Mayberry"),
 	N_("Doug Mclain"),
 	N_("Todd Naugle"),
+	N_("André Nusser"),
+	N_("Bent Bisballe Nyeng"),
 	N_("Jack O'Quin"),
+	N_("Len Ovens"),
+	N_("Pavel Potocek"),
 	N_("Nimal Ratnayake"),
+	N_("Julien Rivaud"),
 	N_("David Robillard"),
+	N_("Julien Roger"),
 	N_("Taybin Rutkin"),
 	N_("Andreas Ruge"),
 	N_("Sampo Savolainen"),
@@ -178,11 +188,13 @@ static const char* authors[] = {
 	N_("Lincoln Spiteri"),
 	N_("Mike Start"),
 	N_("Mark Stewart"),
+	N_("Nathan Stewart"),
 	N_("Roland Stigge"),
 	N_("Petter Sundlöf"),
 	N_("Mike Täht"),
 	N_("Roy Vegard"),
 	N_("Thorsten Wilms"),
+	N_("Damien Zammit"),
 	N_("Grygorii Zharun"),
 	0
 };
@@ -573,8 +585,9 @@ About::About ()
 	std::string splash_file;
 
 	Searchpath spath(ardour_data_search_path());
+	spath.add_subdirectory_to_paths ("resources");
 
-	if (find_file (spath, "splash.png", splash_file)) {
+	if (find_file (spath, PROGRAM_NAME "-splash.png", splash_file)) {
 		set_logo (Gdk::Pixbuf::create_from_file (splash_file));
 	} else {
 		error << "Could not find splash file" << endmsg;
@@ -587,15 +600,40 @@ About::About ()
 		t += ' ';
 	}
 
+#if defined __x86_64__ || defined _M_X64
+	const std::string cpu_arch = _("Intel 64-bit");
+#elif defined __i386__  || defined _M_IX86
+	const std::string cpu_arch = _("Intel 32-bit");
+#elif defined __ppc__ && defined  __LP64__
+	const std::string cpu_arch = _("PowerPC 64-bit");
+#elif defined __ppc__
+	const std::string cpu_arch = _("PowerPC 32-bit");
+#elif defined  __LP64__
+	const std::string cpu_arch = _("64-bit");
+#else
+	const std::string cpu_arch = _("32-bit"); // ARM, ALPHA,..
+#endif
+	std::string codename = CODENAME;
+	if (ARDOUR::Profile->get_mixbus() || ARDOUR::Profile->get_trx()) {
+		codename = "";
+	}
+
+#ifndef NDEBUG
+	const std::string suffix = _(" - debug");
+#else
+	const std::string suffix = "";
+#endif
+
 	set_translator_credits (t);
-	set_copyright (_("Copyright (C) 1999-2015 Paul Davis\n"));
+	set_copyright (_("Copyright (C) 1999-2016 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%2\n(built from revision %3)"),
-				     VERSIONSTRING, CODENAME,
-				     revision)));
+	set_version ((string_compose(_("%1%2\n(rev %3)\n%4%5"),
+				     VERSIONSTRING,
+				     codename,
+				     revision, cpu_arch, suffix)));
 
 	Gtk::Button* config_button = manage (new Button (_("Config")));
 
@@ -607,6 +645,7 @@ About::About ()
 	if (btn) {
 		btn->signal_clicked().connect(sigc::mem_fun(static_cast<Gtk::Window*>(this), &Gtk::Window::hide));
 	}
+	set_url_hook (sigc::ptr_fun(&About::launch_homepage));
 }
 
 About::~About ()
@@ -625,3 +664,8 @@ About::show_config_info ()
 	config_info->hide ();
 }
 
+void
+About::launch_homepage (AboutDialog& /* about */, const Glib::ustring& website_url)
+{
+	PBD::open_uri (website_url);
+}