#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h"
+#include "gtkmm2ext/utils.h"
+
#ifdef check
#undef check
#endif
#include "gui_thread.h"
#include "splash.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace Gtk;
using namespace Glib;
std::string splash_file;
- if (!find_file (ardour_data_search_path(), "splash.png", splash_file)) {
+ Searchpath rc (ARDOUR::ardour_data_search_path());
+ rc.add_subdirectory_to_paths ("resources");
+
+ if (!find_file (rc, PROGRAM_NAME "-splash.png", splash_file)) {
cerr << "Cannot find splash screen image file\n";
throw failed_constructor();
}
So for OS X, we just hide ourselves.
- Oct 2014: The Windows situation is similar, although it should be possible
- to play tricks with gdk's set_type_hint() or directly hack things using
- SetWindowLong() and UpdateLayeredWindow()
+ Oct 2014: The Windows situation is similar, although it should be possible
+ to play tricks with gdk's set_type_hint() or directly hack things using
+ SetWindowLong() and UpdateLayeredWindow()
*/
(void) win;
hide();
Splash::message (const string& msg)
{
string str ("<b>");
- str += Glib::Markup::escape_text (msg).c_str();
+ str += Gtkmm2ext::markup_escape_text (msg);
str += "</b>";
show ();