diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2005-11-26 12:08:33 +0000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2005-11-26 12:08:33 +0000 |
commit | 655be077fab08c825b377feda4d743cb0bf4f06c (patch) | |
tree | cd703b7595e3df92a7d39bf35a6c5e253affd8bf /gtk2_ardour/glade_path.cc | |
parent | cd10162199173bdbde52977bca2a56d256ea8b65 (diff) |
action and glade path stuff
git-svn-id: svn://localhost/trunk/ardour2@121 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/glade_path.cc')
-rw-r--r-- | gtk2_ardour/glade_path.cc | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/gtk2_ardour/glade_path.cc b/gtk2_ardour/glade_path.cc index e922ec2e13..7ccdcc3d97 100644 --- a/gtk2_ardour/glade_path.cc +++ b/gtk2_ardour/glade_path.cc @@ -21,6 +21,8 @@ #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> +#include <ardour/ardour.h> + #include "i18n.h" #include "glade_path.h" @@ -29,31 +31,30 @@ std::string GladePath::path(const std::string& glade_file) { - std::string user_glade_dir = Glib::getenv(X_("ARDOUR_GLADE_PATH")); - std::string full_path; - - if(user_glade_dir != "") { - full_path = Glib::build_filename(user_glade_dir, glade_file); - if(Glib::file_test(full_path, Glib::FILE_TEST_EXISTS)) return full_path; - } - - // check if file ~/.ardour/glade/glade_file exists. - std::vector<std::string> path; - path.push_back(Glib::get_home_dir()); - path.push_back(X_(".ardour")); // define as a constant somewhere? - path.push_back(X_("glade")); - path.push_back(glade_file); - full_path = Glib::build_filename(path); - - // temporary debugging - std::cout << "Path to glade file" << full_path << std::endl; - - if(Glib::file_test(full_path, Glib::FILE_TEST_EXISTS)) return full_path; - - /* - If for some wierd reason the system wide glade file - doesn't exist libglademm will throw an exception - so don't bother testing if it exists etc. - */ - return Glib::build_filename(GLADEPATH, glade_file); + std::string user_glade_dir = Glib::getenv(X_("ARDOUR_GLADE_PATH")); + std::string full_path; + + if(!user_glade_dir.empty()) { + Glib::build_filename(user_glade_dir, glade_file); + if(Glib::file_test(full_path, Glib::FILE_TEST_EXISTS)) return full_path; + } + + full_path = ARDOUR::find_data_file(Glib::build_filename("glade", + glade_file)); + + // temporary debugging + std::cerr << "Path to glade file" << full_path << std::endl; + + return full_path; } + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : |