Updated Raptor dependency to 1.4.14 (for Turtle serialization).

Made patches serialize to Turtle instead of RDF/XML because a) it's pretty and b) I said so.
Loading of patches directly from the 'net in Ingenuity (File->Import Location).


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

1 files changed, 20 insertions, 4 deletions

diff --git a/src/progs/ingenuity/WindowFactory.cpp b/src/progs/ingenuity/WindowFactory.cpp
index ef4cb6af..3b773227 100644
--- a/src/progs/ingenuity/WindowFactory.cpp
+++ b/src/progs/ingenuity/WindowFactory.cpp
@@ -24,6 +24,7 @@
 #include "NodeControlWindow.h"
 #include "LoadPluginWindow.h"
 #include "LoadPatchWindow.h"
+#include "LoadRemotePatchWindow.h"
 #include "LoadSubpatchWindow.h"
 #include "RenameWindow.h"
 #include "NewSubpatchWindow.h"
@@ -34,6 +35,7 @@ namespace Ingenuity {
 WindowFactory::WindowFactory()
 : _load_plugin_win(NULL)
 , _load_patch_win(NULL)
+, _load_remote_patch_win(NULL)
 , _new_subpatch_win(NULL)
 , _load_subpatch_win(NULL)
 , _node_properties_win(NULL)
@@ -41,13 +43,13 @@ WindowFactory::WindowFactory()
 {
 	Glib::RefPtr<Gnome::Glade::Xml> xml = GladeFactory::new_glade_reference();
 
-	xml->get_widget_derived("load_plugin_win",   _load_plugin_win);
-	xml->get_widget_derived("load_patch_win",    _load_patch_win);
-	xml->get_widget_derived("new_subpatch_win",  _new_subpatch_win);
+	xml->get_widget_derived("load_plugin_win", _load_plugin_win);
+	xml->get_widget_derived("load_patch_win", _load_patch_win);
+	xml->get_widget_derived("load_remote_patch_win", _load_remote_patch_win);
+	xml->get_widget_derived("new_subpatch_win", _new_subpatch_win);
 	xml->get_widget_derived("load_subpatch_win", _load_subpatch_win);
 	xml->get_widget_derived("node_properties_win", _node_properties_win);
 	xml->get_widget_derived("patch_properties_win", _patch_properties_win);
-
 }
 
 
@@ -261,6 +263,20 @@ WindowFactory::present_load_patch(SharedPtr<PatchModel> patch, MetadataMap data)
 	_load_patch_win->present(patch, data);
 }
 
+	
+void
+WindowFactory::present_load_remote_patch(SharedPtr<PatchModel> patch, MetadataMap data)
+{
+	PatchWindowMap::iterator w = _patch_windows.find(patch->path());
+
+	if (w != _patch_windows.end())
+		_load_remote_patch_win->set_transient_for(*w->second);
+
+	_load_remote_patch_win->set_merge(); // Import is the only choice
+
+	_load_remote_patch_win->present(patch, data);
+}
+
 
 void
 WindowFactory::present_new_subpatch(SharedPtr<PatchModel> patch, MetadataMap data)