X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fluawindow.cc;h=89a1d387aa490cfdb1ea058c80a803842d8d1cfc;hb=7d553eea8028977021f1526b8ab538737a21767c;hp=c5df8599b123dbb13dca1645317c0292f9afbd21;hpb=05149f9bc54d0cfb8b162ba7cfac975b5eb79971;p=ardour.git

diff --git a/gtk2_ardour/luawindow.cc b/gtk2_ardour/luawindow.cc
index c5df8599b1..89a1d387aa 100644
--- a/gtk2_ardour/luawindow.cc
+++ b/gtk2_ardour/luawindow.cc
@@ -34,10 +34,12 @@
 #include "pbd/md5.h"
 
 #include "gtkmm2ext/gtk_ui.h"
-#include "gtkmm2ext/pane.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/window_title.h"
 
+#include "widgets/pane.h"
+#include "widgets/tooltips.h"
+
 #include "ardour/filesystem_paths.h"
 #include "ardour/luabindings.h"
 #include "LuaBridge/LuaBridge.h"
@@ -47,14 +49,12 @@
 #include "luainstance.h"
 #include "luawindow.h"
 #include "public_editor.h"
-#include "tooltips.h"
 #include "utils.h"
 #include "utils_videotl.h"
 
 #include "pbd/i18n.h"
 
 using namespace ARDOUR;
-using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Glib;
@@ -156,14 +156,15 @@ LuaWindow::LuaWindow ()
 	vbox->pack_start (*scrollin, true, true, 0);
 	vbox->pack_start (*hbox, false, false, 2);
 
-	Gtkmm2ext::VPane *vpane = manage (new Gtkmm2ext::VPane ());
+	ArdourWidgets::VPane *vpane = manage (new ArdourWidgets::VPane ());
 	vpane->add (*vbox);
 	vpane->add (scrollout);
+	vpane->set_divider (0, 0.75);
 
 	vpane->show_all ();
 	add (*vpane);
 	set_size_request (640, 480); // XXX
-	ARDOUR_UI_UTILS::set_tooltip (script_select, _("Select Editor Buffer"));
+	ArdourWidgets::set_tooltip (script_select, _("Select Editor Buffer"));
 
 	setup_buffers ();
 	LuaScripting::instance().scripts_changed.connect (*this, invalidator (*this), boost::bind (&LuaWindow::refresh_scriptlist, this), gui_context());
@@ -189,7 +190,7 @@ LuaWindow::hide_window (GdkEventAny *ev)
 {
 	if (!_visible) return 0;
 	_visible = false;
-	return just_hide_it (ev, static_cast<Gtk::Window *>(this));
+	return ARDOUR_UI_UTILS::just_hide_it (ev, static_cast<Gtk::Window *>(this));
 }
 
 void LuaWindow::reinit_lua ()
@@ -198,6 +199,7 @@ void LuaWindow::reinit_lua ()
 	delete lua;
 	lua = new LuaState();
 	lua->Print.connect (sigc::mem_fun (*this, &LuaWindow::append_text));
+	lua->sandbox (false);
 
 	lua_State* L = lua->getState();
 	LuaInstance::register_classes (L);
@@ -284,6 +286,12 @@ LuaWindow::run_script ()
 			}
 		} catch (luabridge::LuaException const& e) {
 			append_text (string_compose (_("LuaException: %1"), e.what()));
+		} catch (Glib::Exception const& e) {
+			append_text (string_compose (_("Glib Exception: %1"), e.what()));
+		} catch (std::exception const& e) {
+			append_text (string_compose (_("C++ Exception: %1"), e.what()));
+		} catch (...) {
+			append_text (string_compose (_("C++ Exception: %1"), "..."));
 		}
 	} else {
 		// script with factory method
@@ -302,6 +310,12 @@ LuaWindow::run_script ()
 			lua->do_command ("factory = nil;");
 		} catch (luabridge::LuaException const& e) {
 			append_text (string_compose (_("LuaException: %1"), e.what()));
+		} catch (Glib::Exception const& e) {
+			append_text (string_compose (_("Glib Exception: %1"), e.what()));
+		} catch (std::exception const& e) {
+			append_text (string_compose (_("C++ Exception: %1"), e.what()));
+		} catch (...) {
+			append_text (string_compose (_("C++ Exception: %1"), "..."));
 		}
 	}
 }