From 6178329ac029b44b7b9b4cfd7185b65aeb3269a9 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 7 Apr 2007 02:13:23 +0000
Subject: Fixed connection to patch MIDI ports when loading deprecated patches.
 Fixes for auto-arrange in Ingen.

git-svn-id: http://svn.drobilla.net/lad/ingen@411 a436a847-0d15-0410-975c-d299462d15a1
---
 src/progs/ingenuity/PatchCanvas.cpp | 10 ++++++++++
 src/progs/ingenuity/PatchCanvas.h   |  1 +
 src/progs/ingenuity/ingenuity.glade | 19 ++++++++++---------
 3 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'src/progs/ingenuity')

diff --git a/src/progs/ingenuity/PatchCanvas.cpp b/src/progs/ingenuity/PatchCanvas.cpp
index 2279a053..13ceaac0 100644
--- a/src/progs/ingenuity/PatchCanvas.cpp
+++ b/src/progs/ingenuity/PatchCanvas.cpp
@@ -119,6 +119,16 @@ PatchCanvas::build()
 }
 
 
+void
+PatchCanvas::arrange()
+{
+	LibFlowCanvas::FlowCanvas::arrange();
+	
+	for (list<boost::shared_ptr<Item> >::iterator i = _items.begin(); i != _items.end(); ++i)
+		(*i)->store_location();
+}
+
+
 void
 PatchCanvas::add_node(SharedPtr<NodeModel> nm)
 {
diff --git a/src/progs/ingenuity/PatchCanvas.h b/src/progs/ingenuity/PatchCanvas.h
index f76e0c94..64f72881 100644
--- a/src/progs/ingenuity/PatchCanvas.h
+++ b/src/progs/ingenuity/PatchCanvas.h
@@ -61,6 +61,7 @@ public:
 	}*/
 	
 	void build();
+	void arrange();
 
 	void add_node(SharedPtr<NodeModel> nm);
 	void remove_node(SharedPtr<NodeModel> nm);
diff --git a/src/progs/ingenuity/ingenuity.glade b/src/progs/ingenuity/ingenuity.glade
index 3e578e36..16b2bd9a 100644
--- a/src/progs/ingenuity/ingenuity.glade
+++ b/src/progs/ingenuity/ingenuity.glade
@@ -49,9 +49,10 @@
 		      <property name="label" translatable="yes">_Import</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_patch_import_menuitem_activate" last_modification_time="Mon, 06 Feb 2006 06:20:27 GMT"/>
+		      <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1979">
+			<widget class="GtkImage" id="image1987">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -106,7 +107,7 @@
 		      <accelerator key="G" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1980">
+			<widget class="GtkImage" id="image1988">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -239,7 +240,7 @@
 		      <accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1981">
+			<widget class="GtkImage" id="image1989">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-sort-ascending</property>
 			  <property name="icon_size">1</property>
@@ -262,7 +263,7 @@
 		      <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1982">
+			<widget class="GtkImage" id="image1990">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -304,7 +305,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="image1983">
+			<widget class="GtkImage" id="image1991">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-delete</property>
 			  <property name="icon_size">1</property>
@@ -341,7 +342,7 @@
 		      <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1984">
+			<widget class="GtkImage" id="image1992">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-connect</property>
 			  <property name="icon_size">1</property>
@@ -364,7 +365,7 @@
 		      <accelerator key="T" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1985">
+			<widget class="GtkImage" id="image1993">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-index</property>
 			  <property name="icon_size">1</property>
@@ -387,7 +388,7 @@
 		      <accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image1986">
+			<widget class="GtkImage" id="image1994">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-dialog-error</property>
 			  <property name="icon_size">1</property>
@@ -422,7 +423,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="image1987">
+			<widget class="GtkImage" id="image1995">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-info</property>
 			  <property name="icon_size">1</property>
-- 
cgit v1.2.1