Defer menu creation until it is actually requested (speeds up startup time-to-patch-window considerably).

Handle new plugins being presented after initialization in plugin menu and dialog.


git-svn-id: http://svn.drobilla.net/lad/ingen@1372 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 22 insertions, 15 deletions

diff --git a/src/libs/gui/LoadPluginWindow.cpp b/src/libs/gui/LoadPluginWindow.cpp
index f0754cb9..99ab54c2 100644
--- a/src/libs/gui/LoadPluginWindow.cpp
+++ b/src/libs/gui/LoadPluginWindow.cpp
@@ -36,9 +36,10 @@ namespace Ingen {
 namespace GUI {
 
 LoadPluginWindow::LoadPluginWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& xml)
-: Gtk::Window(cobject),
-  _has_shown(false),
-  _plugin_name_offset(0)
+	: Gtk::Window(cobject)
+	, _plugin_name_offset(0)
+	, _has_shown(false)
+	, _refresh_list(true)
 {
 	xml->get_widget("load_plugin_plugins_treeview", _plugins_treeview);
 	xml->get_widget("load_plugin_polyphonic_checkbutton", _polyphonic_checkbutton);
@@ -173,20 +174,16 @@ void
 LoadPluginWindow::on_show()
 {
 	if (!_has_shown) {
-		set_plugins(App::instance().store()->plugins());
-	
-		// Center on patch window
-		/*int _w, _h;
-		get_size(_w, _h);
-		
-		int parent_x, parent_y, parent_w, parent_h;
-		_patch_controller->window()->get_position(parent_x, parent_y);
-		_patch_controller->window()->get_size(parent_w, parent_h);
-		
-		move(parent_x + parent_w/2 - _w/2, parent_y + parent_h/2 - _h/2);
-		*/
+		App::instance().store()->signal_new_plugin.connect(
+				sigc::mem_fun(this, &LoadPluginWindow::add_plugin));
 		_has_shown = true;
 	}
+
+	if (_refresh_list) {
+		set_plugins(App::instance().store()->plugins());
+		_refresh_list = false;
+	}
+
 	Gtk::Window::on_show();
 }
 
@@ -248,6 +245,16 @@ LoadPluginWindow::set_plugins(const Raul::Table<string, SharedPtr<PluginModel> >
 
 
 void
+LoadPluginWindow::new_plugin(SharedPtr<PluginModel> pm)
+{
+	if (is_visible())
+		add_plugin(pm);
+	else
+		_refresh_list = true;
+}
+
+
+void
 LoadPluginWindow::add_plugin(SharedPtr<PluginModel> plugin)
 {
 	Gtk::TreeModel::iterator iter = _plugins_liststore->append();