projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
75% (?) of the way towards making mixer strips control bus sends. lots more to do
[ardour.git]
/
gtk2_ardour
/
about.cc
diff --git
a/gtk2_ardour/about.cc
b/gtk2_ardour/about.cc
index ccd4de1c0cb4e2ec32091a0759ced6b9dc7c5266..207f974d26572cc37e5352959843967d9df0912a 100644
(file)
--- a/
gtk2_ardour/about.cc
+++ b/
gtk2_ardour/about.cc
@@
-25,13
+25,16
@@
#include <ctime>
#include <cstdlib>
#include <ctime>
#include <cstdlib>
-#include <ardour/ardour.h>
-#include <ardour/version.h>
+#include "pbd/file_utils.h"
+
+#include "ardour/svn_revision.h"
+#include "ardour/ardour.h"
+#include "ardour/version.h"
+#include "ardour/filesystem_paths.h"
#include "utils.h"
#include "version.h"
#include "utils.h"
#include "version.h"
-#include "svn_revision.h"
#include "about.h"
#include "rgb_macros.h"
#include "ardour_ui.h"
#include "about.h"
#include "rgb_macros.h"
#include "ardour_ui.h"
@@
-117,47
+120,56
@@
static const gchar * paypal_xpm[] = {
#endif
static const char* authors[] = {
#endif
static const char* authors[] = {
- N_("Paul Davis"),
- N_("Jesse Chappell"),
- N_("Taybin Rutkin"),
+ N_("Brian Ahr"),
+ N_("John Anderson"),
N_("Marcus Andersson"),
N_("Marcus Andersson"),
+ N_("Nedko Arnaudov"),
+ N_("Hans Baier"),
+ N_("Ben Bell"),
+ N_("Sakari Bergen"),
+ N_("Chris Cannam"),
+ N_("Jesse Chappell"),
+ N_("Thomas Charbonnel"),
+ N_("Sam Chessman"),
+ N_("Paul Davis"),
+ N_("Gerard van Dongen"),
+ N_("Colin Fletcher"),
+ N_("Hans Fugal"),
+ N_("Christopher George"),
N_("Jeremy Hall"),
N_("Jeremy Hall"),
+ N_("Audun Halland"),
N_("Steve Harris"),
N_("Steve Harris"),
- N_("Tim Mayberry"),
- N_("Mark Stewart"),
- N_("Sam Chessman"),
- N_("Jack O'Quin"),
+ N_("Carl Hetherington"),
+ N_("Rob Holland"),
+ N_("Robert Jordens"),
+ N_("Stefan Kersten"),
+ N_("Armand Klenk"),
N_("Matt Krai"),
N_("Matt Krai"),
- N_("Ben Bell"),
- N_("Gerard van Dongen"),
- N_("Thomas Charbonnel"),
- N_("Nick Mainsbridge"),
N_("Colin Law"),
N_("Colin Law"),
- N_("Sampo Savolainen"),
N_("Joshua Leach"),
N_("Joshua Leach"),
- N_("Rob Holland"),
- N_("Per Sigmond"),
- N_("Doug Mclain"),
- N_("Petter Sundlöf"),
- N_("Thorsten Wilms"),
N_("Ben Loftis"),
N_("Ben Loftis"),
- N_("Stefan Kersten"),
- N_("Christopher George"),
- N_("Robert Jordens"),
- N_("Dave Robillard"),
- N_("Hans Fugal"),
- N_("Brian Ahr"),
+ N_("Nick Mainsbridge"),
+ N_("Tim Mayberry"),
+ N_("Doug Mclain"),
+ N_("Jack O'Quin"),
N_("Nimal Ratnayake"),
N_("Nimal Ratnayake"),
+ N_("Dave Robillard"),
+ N_("Taybin Rutkin"),
+ N_("Sampo Savolainen"),
+ N_("Per Sigmond"),
+ N_("Lincoln Spiteri"),
+ N_("Mark Stewart"),
+ N_("Roland Stigge"),
+ N_("Petter Sundlöf"),
N_("Mike Täht"),
N_("Mike Täht"),
- N_("John Anderson"),
- N_("Nedko Arnaudov"),
- N_("Carl Hetherington"),
- 0
+ N_("Thorsten Wilms"),
};
static const char* translators[] = {
N_("French:\n\tAlain Fréhel <alain.frehel@free.fr>\n\tChristophe Combelles <ccomb@free.fr>\n"),
};
static const char* translators[] = {
N_("French:\n\tAlain Fréhel <alain.frehel@free.fr>\n\tChristophe Combelles <ccomb@free.fr>\n"),
- N_("German:\n\tKarsten Petersen <kapet@kapet.de>\n\tSebastian Arnold <mail@sebastian-arnold.net>\n"),
+ N_("German:\n\tKarsten Petersen <kapet@kapet.de>\
+\n\tSebastian Arnold <mail@sebastian-arnold.net>\
+\n\tRobert Schwede<schwede@ironshark.com>\n"),
N_("Italian:\n\tFilippo Pappalardo <filippo@email.it>\n"),
N_("Portuguese:\n\tRui Nuno Capela <rncbc@rncbc.org>\n"),
N_("Brazilian Portuguese:\n\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\
N_("Italian:\n\tFilippo Pappalardo <filippo@email.it>\n"),
N_("Portuguese:\n\tRui Nuno Capela <rncbc@rncbc.org>\n"),
N_("Brazilian Portuguese:\n\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\
@@
-165,6
+177,8
@@
static const char* translators[] = {
N_("Spanish:\n\t Alex Krohn <alexkrohn@fastmail.fm>\n"),
N_("Russian:\n\t Igor Blinov <pitstop@nm.ru>\n"),
N_("Greek:\n\t Klearchos Gourgourinis <muadib@in.gr>\n"),
N_("Spanish:\n\t Alex Krohn <alexkrohn@fastmail.fm>\n"),
N_("Russian:\n\t Igor Blinov <pitstop@nm.ru>\n"),
N_("Greek:\n\t Klearchos Gourgourinis <muadib@in.gr>\n"),
+ N_("Swedish:\n\t Petter Sundlöf <petter.sundlof@gmail.com>\n"),
+ N_("Polish:\n\t Piotr Zaryk <pzaryk@gmail.com>\n"),
0
};
0
};
@@
-174,16
+188,21
@@
About::About ()
: paypal_pixmap (paypal_xpm)
#endif
{
: paypal_pixmap (paypal_xpm)
#endif
{
- set_type_hint(Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
+
//
set_type_hint(Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
string path;
string t;
string path;
string t;
- path = find_data_file ("splash.png");
+ sys::path splash_file;
+
+ SearchPath spath(ardour_search_path() + system_data_search_path());
- Glib::RefPtr<Pixbuf> pixbuf = Gdk::Pixbuf::create_from_file (path);
+ if (find_file_in_search_path (spath, "splash.png", splash_file)) {
+ set_logo (Gdk::Pixbuf::create_from_file (splash_file.to_string()));
+ } else {
+ error << "Could not find splash file" << endmsg;
+ }
- set_logo (Gdk::Pixbuf::create_from_file (path));
set_authors (authors);
for (int n = 0; translators[n]; ++n) {
set_authors (authors);
for (int n = 0; translators[n]; ++n) {
@@
-192,7
+211,7
@@
About::About ()
}
set_translator_credits (t);
}
set_translator_credits (t);
- set_copyright (_("Copyright (C) 1999-200
7
Paul Davis\n"));
+ set_copyright (_("Copyright (C) 1999-200
9
Paul Davis\n"));
set_license (_("Ardour comes with ABSOLUTELY NO WARRANTY\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions; see the file COPYING for details.\n"));
set_license (_("Ardour comes with ABSOLUTELY NO WARRANTY\n"
"This is free software, and you are welcome to redistribute it\n"
"under certain conditions; see the file COPYING for details.\n"));
@@
-201,7
+220,7
@@
About::About ()
set_website_label (_("visit http://www.ardour.org/"));
set_version ((string_compose(_("%1\n(built from revision %2)"),
VERSIONSTRING,
set_website_label (_("visit http://www.ardour.org/"));
set_version ((string_compose(_("%1\n(built from revision %2)"),
VERSIONSTRING,
-
ardour_
svn_revision)));
+ svn_revision)));
#ifdef WITH_PAYMENT_OPTIONS
#ifdef WITH_PAYMENT_OPTIONS