add MIDNAM (patchfiles) to child list so that they get installed

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index a0639b1f5ad82711414d920892772114891d11a2..ec56f35c05ae10634bc242fccf3701d8b96d93bb 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -80,13 +80,13 @@ gui_jack_error ()
                           false,
                           Gtk::MESSAGE_INFO,
                           Gtk::BUTTONS_NONE);
-win.set_secondary_text(_("There are several possible reasons:\n\
+       win.set_secondary_text(string_compose (_("There are several possible reasons:\n\
 \n\
 1) JACK is not running.\n\
 2) JACK is running as another user, perhaps root.\n\
-3) There is already another client called \"ardour\".\n\
+3) There is already another client called \"%1\".\n\
 \n\
-Please consider the possibilities, and perhaps (re)start JACK."));
+Please consider the possibilities, and perhaps (re)start JACK."), PROGRAM_NAME));
 
        win.add_button (Stock::QUIT, RESPONSE_CLOSE);
        win.set_default_response (RESPONSE_CLOSE);
@@ -178,7 +178,7 @@ fixup_bundle_environment (int, char* [])
        export_search_path (bundle_dir, "LADSPA_PATH", "/Plugins");
        export_search_path (bundle_dir, "VAMP_PATH", "/lib");
        export_search_path (bundle_dir, "SUIL_MODULE_DIR", "/lib");
-       export_search_path (bundle_dir, "GTK_PATH", "/lib/clearlooks");
+       export_search_path (bundle_dir, "GTK_PATH", "/lib/gtkengines");
 
        /* unset GTK_RC_FILES so that we only load the RC files that we define
         */
@@ -194,7 +194,7 @@ fixup_bundle_environment (int, char* [])
        */
 
        if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
-               error << string_compose (_("cannot create user ardour folder %1 (%2)"), userconfigdir, strerror (errno))
+               error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
                      << endmsg;
        } else {
                
@@ -217,6 +217,30 @@ fixup_bundle_environment (int, char* [])
        setenv ("GDK_PIXBUF_MODULE_FILE", Glib::build_filename (bundle_dir, "Resources/gdk-pixbuf.loaders").c_str(), 1);
 }
 
+#include <Carbon/Carbon.h>
+
+static void load_custom_fonts() {
+#if 0 // untested OSX code
+       std::string ardour_mono_file;
+
+       if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
+               cerr << _("Cannot find ArdourMono TrueType font") << endl;
+       }
+
+       CFStringRef ttf;
+       CFURLRef fontURL;
+       CFErrorRef error;
+       ttf = CFStringCreateWithBytes(
+                       kCFAllocatorDefault, ardour_mono_filec_str(),
+                       ardour_mono_file.length(),
+                       kCFStringEncodingUTF8, FALSE);
+       fontURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, ttf, kCFURLPOSIXPathStyle, TRUE);
+       if (CTFontManagerRegisterFontsForURL(fontURL, kCTFontManagerScopeProcess, &error) != true) {
+               cerr << _("Cannot load ArdourMono TrueType font.") << endl;
+       }
+#endif
+}
+
 #else
 
 void
@@ -276,11 +300,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
                setenv ("FONTCONFIG_FILE", "/etc/fonts/fonts.conf", 1);
                setenv ("FONTCONFIG_PATH", "/etc/fonts", 1);
        } else {
-               /* use the one included in the bundle */
-               
-               path = Glib::build_filename (dir_path, "etc/fonts/fonts.conf");
-               setenv ("FONTCONFIG_FILE", path.c_str(), 1);
-               export_search_path (dir_path, "FONTCONFIG_PATH", "/etc/fonts");
+               error << _("No fontconfig file found on your system. Things may looked very odd or ugly") << endmsg;
        }
 
        /* write a pango.rc file and tell pango to use it. we'd love
@@ -292,7 +312,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
        */
 
        if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
-               error << string_compose (_("cannot create user ardour folder %1 (%2)"), userconfigdir, strerror (errno))
+               error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
                      << endmsg;
        } else {
                
@@ -323,8 +343,6 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
 
 }
 
-#endif
-
 static void load_custom_fonts() {
        std::string ardour_mono_file;
        if (!find_file_in_search_path (ardour_data_search_path(), "ArdourMono.ttf", ardour_mono_file)) {
@@ -342,6 +360,8 @@ static void load_custom_fonts() {
        }
 }
 
+#endif
+
 static gboolean
 tell_about_jack_death (void* /* ignored */)
 {
@@ -493,7 +513,7 @@ int main (int argc, char *argv[])
        try {
                ui = new ARDOUR_UI (&argc, &argv, localedir);
        } catch (failed_constructor& err) {
-               error << _("could not create ARDOUR GUI") << endmsg;
+               error << string_compose (_("could not create %1 GUI"), PROGRAM_NAME) << endmsg;
                exit (1);
        }