a few small things

git-svn-id: svn://localhost/trunk/ardour2@295 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 31 insertions, 4 deletions

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 8827bc40ce..c60fa824dd 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -58,9 +58,15 @@ void
 ActionManager::init ()
 {
 	ui_manager = UIManager::create ();
+	
+	std::string ui_file = Glib::getenv(X_("ARDOUR_UI"));
+    
+        if(!Glib::file_test(ui_file, Glib::FILE_TEST_EXISTS)) ui_file = ARDOUR::find_config_file("ardour.menus");
 
+	std::cout << "Loading UI definition file " << ui_file << std::endl;
+	
 	try {
-		ui_manager->add_ui_from_file (ARDOUR::find_config_file("ardour.menus"));
+		ui_manager->add_ui_from_file (ui_file);
 	} catch (Glib::MarkupError& err) {
 		error << "badly formatted UI definition file" << endmsg;
 	} catch (...) {
diff --git a/gtk2_ardour/ardbg b/gtk2_ardour/ardbg
index 60ada82576..a4d686a545 100755
--- a/gtk2_ardour/ardbg
+++ b/gtk2_ardour/ardbg
@@ -1,6 +1,10 @@
 #!/bin/sh
 
+export ARDOUR_RC=../ardour.rc
 export ARDOUR_GLADE_PATH=./glade
+export ARDOUR_UI=./ardour.menus
+export ARDOUR_UI_RC=./ardour2_ui.rc
+export ARDOUR_BINDINGS=./ardour.bindings
 
 if [ -x ./ardour.bin ] ; then 
     # scons executable
diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev
index 961c7534fb..e32d882d63 100755
--- a/gtk2_ardour/ardev
+++ b/gtk2_ardour/ardev
@@ -1,6 +1,11 @@
 #!/bin/sh
 
+#export G_DEBUG=fatal_criticals
+export ARDOUR_RC=../ardour.rc
 export ARDOUR_GLADE_PATH=./glade
+export ARDOUR_UI=./ardour.menus
+export ARDOUR_UI_RC=./ardour2_ui.rc
+export ARDOUR_BINDINGS=./ardour.bindings
 
 if [ -x ./ardour.bin ] ; then 
     # scons executable
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index eb700624c3..dc69ce8483 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -63,9 +63,15 @@ ARDOUR_UI::setup_keybindings ()
 {
 	install_actions ();
 	RedirectBox::register_actions ();
+	
+	std::string key_binding_file = Glib::getenv(X_("ARDOUR_BINDINGS"));
 
+	if(!Glib::file_test(key_binding_file, Glib::FILE_TEST_EXISTS)) key_binding_file = ARDOUR::find_config_file("ardour.bindings");
+
+	std::cout << "Loading key binding file " << key_binding_file << std::endl;
+	
 	try {
-		AccelMap::load (ARDOUR::find_config_file ("ardour.bindings"));
+		AccelMap::load (key_binding_file);
 	} catch (...) {
 		error << "ardour key bindings file not found" << endmsg;
 	}
diff --git a/gtk2_ardour/arval b/gtk2_ardour/arval
index 7c5c03ebd7..dd23b2801e 100755
--- a/gtk2_ardour/arval
+++ b/gtk2_ardour/arval
@@ -1,4 +1,9 @@
 #!/bin/sh
 
+export ARDOUR_GLADE_PATH=./glade
+export ARDOUR_UI=./ardour.menus
+export ARDOUR_UI_RC=./ardour2_ui.rc
+export ARDOUR_BINDINGS=./ardour.bindings
+
 export LD_LIBRARY_PATH=../libs/ardour
 exec valgrind --num-callers=12 --tool=memcheck ./ardour.bin --novst $*
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 37006b2f36..5800888d0c 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -324,6 +324,7 @@ Editor::Editor (AudioEngine& eng)
 	route_removal = false;
 	track_spacing = 0;
 	show_automatic_regions_in_region_list = true;
+	region_list_sort_type = (Editing::RegionListSortType) 0; 
 	have_pending_keyboard_selection = false;
 	_follow_playhead = true;
 	_xfade_visibility = true;
@@ -2151,9 +2152,9 @@ Editor::set_state (const XMLNode& node)
 		_xfade_visibility = !yn;
 		set_xfade_visibility (yn);
 	}
-
+	
 	if ((prop = node.property ("region-list-sort-type"))) {
-		region_list_sort_type = (Editing::RegionListSortType) -1; /* force change */
+		region_list_sort_type = (Editing::RegionListSortType) -1; // force change 
 		reset_region_list_sort_type(str2regionlistsorttype(prop->value()));
 	}