Updated Jack version checked by configure.

Patch uploading.


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

12 files changed, 382 insertions, 34 deletions

diff --git a/configure.ac b/configure.ac
index 6d80d412..d2c6196c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,7 +220,7 @@ if test "$build_server" = "yes" -o "$monolothic_ingenuity"; then
 	
 	# Check for Jack
 	# (102.20 = MIDI API changes)
-	PKG_CHECK_MODULES(JACK, jack >= 0.102.20)
+	PKG_CHECK_MODULES(JACK, jack >= 0.103.0)
 
 	# Check for Jack MIDI
 	if test "$build_jack_midi" = "yes"; then
@@ -347,6 +347,7 @@ if test "$build_gtk_client" = "yes"; then
 	PKG_CHECK_MODULES(GNOMECANVASMM, libgnomecanvasmm-2.6)
 	PKG_CHECK_MODULES(LIBGLADEMM, libglademm-2.4)
 	PKG_CHECK_MODULES(FLOWCANVAS, flowcanvas >= 0.1.0)
+	PKG_CHECK_MODULES(CURL, curl >= 0.21, build_curl="yes", build_curl="no")
 
 	if test "$monolithic_ingenuity" = "yes"; then
 		AC_DEFINE(MONOLITHIC_INGENUITY, 1, [Whether to build an internal engine into Ingenuity])
diff --git a/src/libs/client/Loader.cpp b/src/libs/client/Loader.cpp
index ed8d4497..789b0b57 100644
--- a/src/libs/client/Loader.cpp
+++ b/src/libs/client/Loader.cpp
@@ -39,6 +39,7 @@ Loader::Loader(SharedPtr<ModelEngineInterface> engine, SharedPtr<Namespaces> nam
 	(*_namespaces)["ingen"] = "http://drobilla.net/ns/ingen#";
 	(*_namespaces)["ingenuity"] = "http://drobilla.net/ns/ingenuity#";
 	(*_namespaces)["lv2"] = "http://lv2plug.in/ontology#";
+	(*_namespaces)["doap"] = "http://usefulinc.com/ns/doap#";
 }
 
 
diff --git a/src/libs/client/ObjectModel.h b/src/libs/client/ObjectModel.h
index 1b2897d0..882ff911 100644
--- a/src/libs/client/ObjectModel.h
+++ b/src/libs/client/ObjectModel.h
@@ -58,6 +58,8 @@ public:
 	virtual ~ObjectModel();
 
 	const Atom& get_metadata(const string& key) const;
+	void set_metadata(const string& key, const Atom& value)
+		{ _metadata[key] = value; metadata_update_sig.emit(key, value); }
 
 	const MetadataMap&     metadata() const { return _metadata; }
 	inline const Path&     path()     const { return _path; }
@@ -80,10 +82,6 @@ protected:
 	void add_metadata(const MetadataMap& data);
 	
 	void set(SharedPtr<ObjectModel> model);
-	
-	void set_metadata(const string& key, const Atom& value)
-		{ _metadata[key] = value; metadata_update_sig.emit(key, value); }
-
 
 	Path                    _path;
 	SharedPtr<ObjectModel> _parent;
diff --git a/src/libs/client/Serializer.cpp b/src/libs/client/Serializer.cpp
index 1b274635..762cd061 100644
--- a/src/libs/client/Serializer.cpp
+++ b/src/libs/client/Serializer.cpp
@@ -54,6 +54,7 @@ Serializer::Serializer()
 	_writer.add_prefix("ingen", "http://drobilla.net/ns/ingen#");
 	_writer.add_prefix("ingenuity", "http://drobilla.net/ns/ingenuity#");
 	_writer.add_prefix("lv2", "http://lv2plug.in/ontology#");
+	_writer.add_prefix("doap", "http://usefulinc.com/ns/doap#");
 }
 
 
@@ -221,6 +222,15 @@ Serializer::serialize_patch(SharedPtr<PatchModel> patch, const RdfId& patch_id)
 		patch_id,
 		NS_INGEN("polyphony"),
 		Atom((int)patch->poly()));
+	
+	for (MetadataMap::const_iterator m = patch->metadata().begin(); m != patch->metadata().end(); ++m) {
+		if (_writer.expand_uri(m->first) != "") {
+			_writer.write(
+				patch_id,
+				RdfId(RdfId::RESOURCE, _writer.expand_uri(m->first.c_str()).c_str()),
+				m->second);
+		}
+	}
 
 	for (NodeModelMap::const_iterator n = patch->nodes().begin(); n != patch->nodes().end(); ++n) {
 		SharedPtr<PatchModel> patch = PtrCast<PatchModel>(n->second);
@@ -245,15 +255,6 @@ Serializer::serialize_patch(SharedPtr<PatchModel> patch, const RdfId& patch_id)
 	for (ConnectionList::const_iterator c = patch->connections().begin(); c != patch->connections().end(); ++c) {
 		serialize_connection(*c);
 	}
-	
-	for (MetadataMap::const_iterator m = patch->metadata().begin(); m != patch->metadata().end(); ++m) {
-		if (_writer.expand_uri(m->first) != "") {
-			_writer.write(
-				patch_id,
-				RdfId(RdfId::RESOURCE, _writer.expand_uri(m->first.c_str()).c_str()),
-				m->second);
-		}
-	}
 }
 
 
diff --git a/src/progs/ingenuity/LoadRemotePatchWindow.cpp b/src/progs/ingenuity/LoadRemotePatchWindow.cpp
index 19e206aa..ec49f70f 100644
--- a/src/progs/ingenuity/LoadRemotePatchWindow.cpp
+++ b/src/progs/ingenuity/LoadRemotePatchWindow.cpp
@@ -67,15 +67,15 @@ LoadRemotePatchWindow::present(SharedPtr<PatchModel> patch, MetadataMap data)
 	Namespaces namespaces;
 	namespaces["ingen"] = "http://drobilla.net/ns/ingen#";
 	namespaces["rdfs"] = "http://www.w3.org/2000/01/rdf-schema#";
+	namespaces["doap"] = "http://usefulinc.com/ns/doap#";
 
 	RDFQuery query(namespaces, Glib::ustring(
 		"SELECT DISTINCT ?name ?uri FROM <> WHERE {"
-		"  ?patch a            ingen:Patch ;"
-		"         rdfs:seeAlso ?uri ;"
-		"         ingen:name   ?name ."
+		"  ?uri a            ingen:Patch ;"
+		"       doap:name    ?name ."
 		"}"));
 
-	RDFQuery::Results results = query.run("http://drobilla.net/ingen/index.ttl");
+	RDFQuery::Results results = query.run("http://rdf.drobilla.net/ingen_patches/index.ttl");
 	
 	for (RDFQuery::Results::iterator i = results.begin(); i != results.end(); ++i) {
 		Gtk::TreeModel::iterator iter = _liststore->append();
diff --git a/src/progs/ingenuity/Makefile.am b/src/progs/ingenuity/Makefile.am
index 91066d8e..44b37c67 100644
--- a/src/progs/ingenuity/Makefile.am
+++ b/src/progs/ingenuity/Makefile.am
@@ -49,6 +49,8 @@ ingenuity_SOURCES = \
 	LoadPatchWindow.cpp \
 	LoadRemotePatchWindow.h \
 	LoadRemotePatchWindow.cpp \
+	UploadPatchWindow.h \
+	UploadPatchWindow.cpp \
 	MessagesWindow.h \
 	MessagesWindow.cpp \
 	LoadSubpatchWindow.h \
diff --git a/src/progs/ingenuity/PatchWindow.cpp b/src/progs/ingenuity/PatchWindow.cpp
index d9677317..606674bb 100644
--- a/src/progs/ingenuity/PatchWindow.cpp
+++ b/src/progs/ingenuity/PatchWindow.cpp
@@ -61,6 +61,7 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	//xml->get_widget("patch_open_into_menuitem", _menu_open_into);
 	xml->get_widget("patch_save_menuitem", _menu_save);
 	xml->get_widget("patch_save_as_menuitem", _menu_save_as);
+	xml->get_widget("patch_upload_menuitem", _menu_upload);
 	xml->get_widget("patch_cut_menuitem", _menu_cut);
 	xml->get_widget("patch_copy_menuitem", _menu_copy);
 	xml->get_widget("patch_paste_menuitem", _menu_paste);
@@ -93,6 +94,8 @@ PatchWindow::PatchWindow(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 		sigc::mem_fun(this, &PatchWindow::event_save));
 	_menu_save_as->signal_activate().connect(
 		sigc::mem_fun(this, &PatchWindow::event_save_as));
+	_menu_upload->signal_activate().connect(
+		sigc::mem_fun(this, &PatchWindow::event_upload));
 	_menu_copy->signal_activate().connect(
 		sigc::mem_fun(this, &PatchWindow::event_copy));
 	_menu_delete->signal_activate().connect(
@@ -335,6 +338,13 @@ PatchWindow::event_save_as()
 
 
 void
+PatchWindow::event_upload()
+{
+	App::instance().window_factory()->present_upload_patch(_patch);
+}
+
+
+void
 PatchWindow::event_copy()
 {
 	if (_view)
diff --git a/src/progs/ingenuity/PatchWindow.h b/src/progs/ingenuity/PatchWindow.h
index e6131581..a5ce150d 100644
--- a/src/progs/ingenuity/PatchWindow.h
+++ b/src/progs/ingenuity/PatchWindow.h
@@ -82,6 +82,7 @@ private:
 	void event_import_location();
 	void event_save();
 	void event_save_as();
+	void event_upload();
 	void event_copy();
 	void event_delete();
 	void event_quit();
@@ -105,6 +106,7 @@ private:
 	Gtk::MenuItem*      _menu_import_location;
 	Gtk::MenuItem*      _menu_save;
 	Gtk::MenuItem*      _menu_save_as;
+	Gtk::MenuItem*      _menu_upload;
 	Gtk::MenuItem*      _menu_cut;
 	Gtk::MenuItem*      _menu_copy;
 	Gtk::MenuItem*      _menu_paste;
diff --git a/src/progs/ingenuity/WindowFactory.cpp b/src/progs/ingenuity/WindowFactory.cpp
index 3b773227..14a7554f 100644
--- a/src/progs/ingenuity/WindowFactory.cpp
+++ b/src/progs/ingenuity/WindowFactory.cpp
@@ -25,6 +25,7 @@
 #include "LoadPluginWindow.h"
 #include "LoadPatchWindow.h"
 #include "LoadRemotePatchWindow.h"
+#include "UploadPatchWindow.h"
 #include "LoadSubpatchWindow.h"
 #include "RenameWindow.h"
 #include "NewSubpatchWindow.h"
@@ -36,6 +37,7 @@ WindowFactory::WindowFactory()
 : _load_plugin_win(NULL)
 , _load_patch_win(NULL)
 , _load_remote_patch_win(NULL)
+, _upload_patch_win(NULL)
 , _new_subpatch_win(NULL)
 , _load_subpatch_win(NULL)
 , _node_properties_win(NULL)
@@ -46,6 +48,7 @@ WindowFactory::WindowFactory()
 	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("upload_patch_win", _upload_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);
@@ -279,6 +282,18 @@ WindowFactory::present_load_remote_patch(SharedPtr<PatchModel> patch, MetadataMa
 
 
 void
+WindowFactory::present_upload_patch(SharedPtr<PatchModel> patch)
+{
+	PatchWindowMap::iterator w = _patch_windows.find(patch->path());
+
+	if (w != _patch_windows.end())
+		_upload_patch_win->set_transient_for(*w->second);
+
+	_upload_patch_win->present(patch);
+}
+
+
+void
 WindowFactory::present_new_subpatch(SharedPtr<PatchModel> patch, MetadataMap data)
 {
 	PatchWindowMap::iterator w = _patch_windows.find(patch->path());
diff --git a/src/progs/ingenuity/WindowFactory.h b/src/progs/ingenuity/WindowFactory.h
index 8bc22ff5..9c6cfa0a 100644
--- a/src/progs/ingenuity/WindowFactory.h
+++ b/src/progs/ingenuity/WindowFactory.h
@@ -33,6 +33,7 @@ class NodePropertiesWindow;
 class PatchPropertiesWindow;
 class LoadPatchWindow;
 class LoadRemotePatchWindow;
+class UploadPatchWindow;
 class RenameWindow;
 
 
@@ -61,6 +62,7 @@ public:
 	void present_load_plugin(SharedPtr<PatchModel> patch, MetadataMap data = MetadataMap());
 	void present_load_patch(SharedPtr<PatchModel> patch, MetadataMap data = MetadataMap());
 	void present_load_remote_patch(SharedPtr<PatchModel> patch, MetadataMap data = MetadataMap());
+	void present_upload_patch(SharedPtr<PatchModel> patch);
 	void present_new_subpatch(SharedPtr<PatchModel> patch, MetadataMap data = MetadataMap());
 	void present_load_subpatch(SharedPtr<PatchModel> patch, MetadataMap data = MetadataMap());
 	void present_rename(SharedPtr<ObjectModel> object);
@@ -86,6 +88,7 @@ private:
 	LoadPluginWindow*      _load_plugin_win;
 	LoadPatchWindow*       _load_patch_win;
 	LoadRemotePatchWindow* _load_remote_patch_win;
+	UploadPatchWindow*     _upload_patch_win;
 	NewSubpatchWindow*     _new_subpatch_win;
 	LoadSubpatchWindow*    _load_subpatch_win;
 	NodePropertiesWindow*  _node_properties_win;
diff --git a/src/progs/ingenuity/ingenuity.glade b/src/progs/ingenuity/ingenuity.glade
index 6d06f738..6c80dc08 100644
--- a/src/progs/ingenuity/ingenuity.glade
+++ b/src/progs/ingenuity/ingenuity.glade
@@ -52,7 +52,7 @@
 		      <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2088">
+			<widget class="GtkImage" id="image2123">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -75,7 +75,7 @@
 		      <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2089">
+			<widget class="GtkImage" id="image2124">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -113,7 +113,7 @@
 		      <signal name="activate" handler="on_patch_save_as_menuitem_activate" last_modification_time="Sat, 23 Oct 2004 02:16:12 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2090">
+			<widget class="GtkImage" id="image2125">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-save-as</property>
 			  <property name="icon_size">1</property>
@@ -127,6 +127,28 @@
 		  </child>
 
 		  <child>
+		    <widget class="GtkImageMenuItem" id="patch_upload_menuitem">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Upload...</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_patch_upload_menuitem_activate" last_modification_time="Fri, 13 Apr 2007 23:49:37 GMT"/>
+		      <accelerator key="U" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image2126">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-network</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+
+		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator10">
 		      <property name="visible">True</property>
 		    </widget>
@@ -141,7 +163,7 @@
 		      <signal name="activate" handler="on_patch_configuration_menuitem_activate" last_modification_time="Sun, 29 Jan 2006 21:17:26 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2091">
+			<widget class="GtkImage" id="image2127">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -274,7 +296,7 @@
 		      <accelerator key="G" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2092">
+			<widget class="GtkImage" id="image2128">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-sort-ascending</property>
 			  <property name="icon_size">1</property>
@@ -297,7 +319,7 @@
 		      <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2093">
+			<widget class="GtkImage" id="image2129">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -320,7 +342,7 @@
 		      <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2094">
+			<widget class="GtkImage" id="image2130">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-properties</property>
 			  <property name="icon_size">1</property>
@@ -352,7 +374,7 @@
 		      <signal name="activate" handler="on_patch_destroy_menuitem_activate" last_modification_time="Wed, 25 May 2005 00:22:00 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2095">
+			<widget class="GtkImage" id="image2131">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-delete</property>
 			  <property name="icon_size">1</property>
@@ -389,7 +411,7 @@
 		      <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2096">
+			<widget class="GtkImage" id="image2132">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-connect</property>
 			  <property name="icon_size">1</property>
@@ -412,7 +434,7 @@
 		      <accelerator key="T" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2097">
+			<widget class="GtkImage" id="image2133">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-index</property>
 			  <property name="icon_size">1</property>
@@ -435,7 +457,7 @@
 		      <accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2098">
+			<widget class="GtkImage" id="image2134">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-dialog-error</property>
 			  <property name="icon_size">1</property>
@@ -470,7 +492,7 @@
 		      <signal name="activate" handler="on_right-click_the_canvas_to_add_objects1_activate" last_modification_time="Fri, 16 Jun 2006 17:51:05 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image2099">
+			<widget class="GtkImage" id="image2135">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-info</property>
 			  <property name="icon_size">1</property>
@@ -3987,7 +4009,7 @@ Contributors:
 
 <widget class="GtkDialog" id="load_remote_patch_win">
   <property name="border_width">8</property>
-  <property name="title" translatable="yes">dialog1</property>
+  <property name="title" translatable="yes">Load Remote Patch</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -4139,7 +4161,7 @@ Contributors:
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">True</property>
+	      <property name="expand">False</property>
 	      <property name="fill">True</property>
 	    </packing>
 	  </child>
@@ -4154,4 +4176,297 @@ Contributors:
   </child>
 </widget>
 
+<widget class="GtkDialog" id="upload_patch_win">
+  <property name="border_width">8</property>
+  <property name="title" translatable="yes">Upload Patch</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox5">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">9</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area5">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="upload_patch_cancel_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-7</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="upload_patch_upload_button">
+	      <property name="visible">True</property>
+	      <property name="sensitive">False</property>
+	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment5">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">0</property>
+		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox72">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">2</property>
+
+		      <child>
+			<widget class="GtkImage" id="image2136">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-ok</property>
+			  <property name="icon_size">4</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label134">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Upload</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkTable" id="table19">
+	  <property name="visible">True</property>
+	  <property name="n_rows">2</property>
+	  <property name="n_columns">2</property>
+	  <property name="homogeneous">False</property>
+	  <property name="row_spacing">8</property>
+	  <property name="column_spacing">0</property>
+
+	  <child>
+	    <widget class="GtkEntry" id="upload_patch_symbol_entry">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Enter a short name suitable for use as an identifier or filename.
+
+The first character must be one of _, a-z or A-Z and subsequenct characters can be from _, a-z, A-Z or 0-9.
+</property>
+	      <property name="can_focus">True</property>
+	      <property name="editable">True</property>
+	      <property name="visibility">True</property>
+	      <property name="max_length">0</property>
+	      <property name="text" translatable="yes"></property>
+	      <property name="has_frame">True</property>
+	      <property name="invisible_char">*</property>
+	      <property name="activates_default">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">0</property>
+	      <property name="bottom_attach">1</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkEntry" id="upload_patch_short_name_entry">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Enter a short name for this patch, e.g. &quot;Mega Synth&quot;</property>
+	      <property name="can_focus">True</property>
+	      <property name="editable">True</property>
+	      <property name="visibility">True</property>
+	      <property name="max_length">0</property>
+	      <property name="text" translatable="yes"></property>
+	      <property name="has_frame">True</property>
+	      <property name="invisible_char">*</property>
+	      <property name="activates_default">True</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">1</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label135">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Symbol: </property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">0</property>
+	      <property name="bottom_attach">1</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label136">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Short Name: </property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkLabel" id="label137">
+	  <property name="visible">True</property>
+	  <property name="label" translatable="yes">Succesfully uploaded patches will be available immediately in the remote patch browser.
+
+By uploading patches, you agree to license them under the Creative Commons Attribution-Share Alike 3.0 License.
+
+Thank you for contributing.</property>
+	  <property name="use_underline">False</property>
+	  <property name="use_markup">False</property>
+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+	  <property name="wrap">True</property>
+	  <property name="selectable">False</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">4</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	  <property name="width_chars">-1</property>
+	  <property name="single_line_mode">False</property>
+	  <property name="angle">0</property>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkProgressBar" id="upload_patch_progress">
+	  <property name="visible">True</property>
+	  <property name="tooltip" translatable="yes">Upload progress</property>
+	  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+	  <property name="fraction">0</property>
+	  <property name="pulse_step">0.10000000149</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>
diff --git a/src/progs/ingenuity/ingenuity.gladep b/src/progs/ingenuity/ingenuity.gladep
index a8bd18bd..7cd9c6ce 100644
--- a/src/progs/ingenuity/ingenuity.gladep
+++ b/src/progs/ingenuity/ingenuity.gladep
@@ -2,8 +2,8 @@
 <!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
 
 <glade-project>
-  <name>OmGtk</name>
-  <program_name>om_gtk</program_name>
+  <name>Ingenuity</name>
+  <program_name>ingenuity</program_name>
   <language>C++</language>
   <gnome_support>FALSE</gnome_support>
 </glade-project>