From 318b37d8b556add13b3f156f31c9e72eca339a16 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 17 Aug 2012 02:14:07 +0000 Subject: Implement real logging system, LV2 log extension support, and purge evil/ugly/untranslatable C++ stream printing. Remove coloured log stuff from Raul. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4717 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/WidgetFactory.cpp | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'src/gui/WidgetFactory.cpp') diff --git a/src/gui/WidgetFactory.cpp b/src/gui/WidgetFactory.cpp index 31749ffe..642e3cea 100644 --- a/src/gui/WidgetFactory.cpp +++ b/src/gui/WidgetFactory.cpp @@ -17,8 +17,7 @@ #include #include -#include "raul/log.hpp" - +#include "raul/fmt.hpp" #include "ingen/runtime_paths.hpp" #include "WidgetFactory.hpp" @@ -59,25 +58,21 @@ WidgetFactory::find_ui_file() if (is_readable(ui_filename)) return; - Raul::error << "[WidgetFactory] Unable to find ingen_gui.ui in " - << INGEN_DATA_DIR << endl; - throw std::runtime_error("Unable to find UI file"); + throw std::runtime_error((Raul::fmt("Unable to find ingen_gui.ui in %1%\n") + % INGEN_DATA_DIR).str()); } Glib::RefPtr WidgetFactory::create(const string& toplevel_widget) { - if (ui_filename.empty()) + if (ui_filename.empty()) { find_ui_file(); + } - try { - if (toplevel_widget.empty()) - return Gtk::Builder::create_from_file(ui_filename); - else - return Gtk::Builder::create_from_file(ui_filename, toplevel_widget.c_str()); - } catch (const Gtk::BuilderError& ex) { - Raul::error << "[WidgetFactory] " << ex.what() << endl; - throw ex; + if (toplevel_widget.empty()) { + return Gtk::Builder::create_from_file(ui_filename); + } else { + return Gtk::Builder::create_from_file(ui_filename, toplevel_widget.c_str()); } } -- cgit v1.2.1