Extensions. Consistency fix and UI improvements (Generate from path submenu).

(bzr r9744)

9 files changed, 108 insertions, 77 deletions

diff --git a/share/extensions/extrude.inx b/share/extensions/extrude.inx
index b282fe0d9..dfae5d825 100644
--- a/share/extensions/extrude.inx
+++ b/share/extensions/extrude.inx
@@ -4,15 +4,15 @@
     <id>org.greygreen.inkscape.effects.extrude</id>
 	<dependency type="executable" location="extensions">extrude.py</dependency>
 	<dependency type="executable" location="extensions">inkex.py</dependency>
-  <param name="mode" type="optiongroup" _gui-text="Mode:">
-     <_option>Lines</_option>
-     <_option>Polygons</_option>
-  </param>
+    <param name="mode" type="enum" _gui-text="Mode:">
+        <_item>Lines</_item>
+        <_item>Polygons</_item>
+    </param>
     <effect>
 		<object-type>path</object-type>
-                <effects-menu>
-                    <submenu _name="Generate from Path"/>
-                </effects-menu>
+            <effects-menu>
+                <submenu _name="Generate from Path"/>
+            </effects-menu>
     </effect>
     <script>
         <command reldir="extensions" interpreter="python">extrude.py</command>
diff --git a/share/extensions/generate_voronoi.inx b/share/extensions/generate_voronoi.inx
index dc0dde07d..0c1e827aa 100644
--- a/share/extensions/generate_voronoi.inx
+++ b/share/extensions/generate_voronoi.inx
@@ -5,10 +5,17 @@
 	<dependency type="executable" location="extensions">generate_voronoi.py</dependency>
 	<dependency type="executable" location="extensions">voronoi.py</dependency>
 	<dependency type="executable" location="extensions">inkex.py</dependency>
-	<_param name="title1" type="description">Generate a random pattern of Voronoi cells. The pattern will be accessible in the Fill and Stroke dialog. You must select an object or a group.</_param>
-	<_param name="title2" type="description">If border is zero, the pattern will be discontinuous at the edges. Use a positive border, preferably greater than the cell size, to produce a smooth join of the pattern at the edges. Use a negative border to reduce the size of the pattern and get an empty border.</_param>
-	<param name="size" type="int" min="2" max="200" _gui-text="Average size of cell (px)">10</param>
-	<param name="border" type="int" min="-200" max="200" _gui-text="Size of Border (px)">0</param>
+	<param name="tab" type="notebook">
+        <page name="Options" _gui-text="Options">
+	        <param name="size" type="int" min="2" max="200" _gui-text="Average size of cell (px):">10</param>
+	        <param name="border" type="int" min="-200" max="200" _gui-text="Size of Border (px):">0</param>
+        </page>
+        <page name="Help" _gui-text="Help">
+	        <_param name="title" type="description" xml:space="preserve">Generate a random pattern of Voronoi cells. The pattern will be accessible in the Fill and Stroke dialog. You must select an object or a group.
+
+If border is zero, the pattern will be discontinuous at the edges. Use a positive border, preferably greater than the cell size, to produce a smooth join of the pattern at the edges. Use a negative border to reduce the size of the pattern and get an empty border.</_param>
+        </page>
+    </param>
 	<effect>
 		<object-type>all</object-type>
 		<effects-menu>
diff --git a/share/extensions/generate_voronoi.py b/share/extensions/generate_voronoi.py
index 3d5d5e9a8..6c317c348 100644
--- a/share/extensions/generate_voronoi.py
+++ b/share/extensions/generate_voronoi.py
@@ -78,6 +78,10 @@ class Pattern(inkex.Effect):
                         action="store", type="int", 
                         dest="border", default=0,
                         help="Size of Border (px)")
+        self.OptionParser.add_option("--tab",
+                        action="store", type="string",
+                        dest="tab",
+                        help="The selected UI-tab when OK was pressed")
 
     def effect(self):
         if not self.options.ids:
diff --git a/share/extensions/interp.inx b/share/extensions/interp.inx
index 6c83f8a21..cd5d32343 100644
--- a/share/extensions/interp.inx
+++ b/share/extensions/interp.inx
@@ -4,9 +4,9 @@
     <id>org.ekips.filter.interp</id>
 	<dependency type="executable" location="extensions">interp.py</dependency>
 	<dependency type="executable" location="extensions">inkex.py</dependency>
-	<param name="exponent" type="float" min="-100.0" max="100.0" _gui-text="Exponent">0.00</param>
-	<param name="steps" type="int" min="1" max="1000" _gui-text="Interpolation steps">5</param>
-	<param name="method" type="int" min="1" max="2" _gui-text="Interpolation method">2</param>
+	<param name="exponent" type="float" min="-100.0" max="100.0" _gui-text="Exponent:">0.00</param>
+	<param name="steps" type="int" min="1" max="1000" _gui-text="Interpolation steps:">5</param>
+	<param name="method" type="int" min="1" max="2" _gui-text="Interpolation method:">2</param>
 	<param name="dup" type="boolean" _gui-text="Duplicate endpaths">true</param>
 	<param name="style" type="boolean" _gui-text="Interpolate style">false</param>
     <effect>
diff --git a/share/extensions/motion.inx b/share/extensions/motion.inx
index effeb3937..8ffeb16ce 100644
--- a/share/extensions/motion.inx
+++ b/share/extensions/motion.inx
@@ -4,8 +4,8 @@
     <id>org.ekips.filter.motion</id>
 	<dependency type="executable" location="extensions">motion.py</dependency>
 	<dependency type="executable" location="extensions">inkex.py</dependency>
-	<param name="magnitude" type="float" min="0" max="1000" _gui-text="Magnitude">100</param>
-	<param name="angle" type="float" min="0.0" max="360.0" _gui-text="Angle">45</param>
+	<param name="magnitude" type="float" min="0" max="1000" _gui-text="Magnitude:">100</param>
+	<param name="angle" type="float" min="0.0" max="360.0" _gui-text="Angle:">45</param>
     <effect>
 		<object-type>path</object-type>
                 <effects-menu>
diff --git a/share/extensions/pathalongpath.inx b/share/extensions/pathalongpath.inx
index a4ee40852..b555b9445 100644
--- a/share/extensions/pathalongpath.inx
+++ b/share/extensions/pathalongpath.inx
@@ -1,33 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-  <_name>Pattern along Path</_name>
-  <id>math.univ-lille1.barraud.pathdeform</id>
-  <dependency type="executable" location="extensions">pathmodifier.py</dependency>
-  <dependency type="executable" location="extensions">pathalongpath.py</dependency>
-  <dependency type="executable" location="extensions">inkex.py</dependency>
-  <_param name="title" type="description">This effect bends a pattern object along arbitrary "skeleton" paths. The pattern is the topmost object in the selection. (groups of paths/shapes/clones... allowed)</_param>
-  <param name="copymode" type="enum" _gui-text="Copies of the pattern:">
-    <_item value="Single">Single</_item>
-    <_item value="Single, stretched">Single, stretched</_item>
-    <_item value="Repeated">Repeated</_item>
-    <_item value="Repeated, stretched">Repeated, stretched</_item>
-  </param>
-  <param name="kind" type="enum" _gui-text="Deformation type:">
-    <_item value="Snake">Snake</_item>
-    <_item value="Ribbon">Ribbon</_item>
-  </param>
-  <param name="space" type="float" _gui-text="Space between copies:" min="-10000.0" max="10000.0">0.0</param>
-  <param name="noffset" type="float" _gui-text="Normal offset" min="-10000.0" max="10000.0">0.0</param>
-  <param name="toffset" type="float" _gui-text="Tangential offset" min="-10000.0" max="10000.0">0.0</param>
-  <param name="vertical" type="boolean" _gui-text="Pattern is vertical">false</param>
-  <param name="duplicate" type="boolean" _gui-text="Duplicate the pattern before deformation">true</param>
-  <effect>
+    <_name>Pattern along Path</_name>
+    <id>math.univ-lille1.barraud.pathdeform</id>
+    <dependency type="executable" location="extensions">pathmodifier.py</dependency>
+    <dependency type="executable" location="extensions">pathalongpath.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+	<param name="tab" type="notebook">
+        <page name="Options" _gui-text="Options">
+        <param name="copymode" type="enum" _gui-text="Copies of the pattern:">
+            <_item value="Single">Single</_item>
+            <_item value="Single, stretched">Single, stretched</_item>
+            <_item value="Repeated">Repeated</_item>
+            <_item value="Repeated, stretched">Repeated, stretched</_item>
+        </param>
+        <param name="kind" type="enum" _gui-text="Deformation type:">
+            <_item value="Snake">Snake</_item>
+            <_item value="Ribbon">Ribbon</_item>
+        </param>
+        <param name="space" type="float" _gui-text="Space between copies:" min="-10000.0" max="10000.0">0.0</param>
+        <param name="noffset" type="float" _gui-text="Normal offset:" min="-10000.0" max="10000.0">0.0</param>
+        <param name="toffset" type="float" _gui-text="Tangential offset:" min="-10000.0" max="10000.0">0.0</param>
+        <param name="vertical" type="boolean" _gui-text="Pattern is vertical">false</param>
+        <param name="duplicate" type="boolean" _gui-text="Duplicate the pattern before deformation">true</param>
+        </page>
+        <page name="Help" _gui-text="Help">
+            <_param name="title" type="description">This effect bends a pattern object along arbitrary "skeleton" paths. The pattern is the topmost object in the selection (groups of paths/shapes/clones... allowed).</_param>
+        </page>
+    </param>
+    <effect>
     <object-type>all</object-type>
-    <effects-menu>
-      <submenu _name="Generate from Path"/>
-    </effects-menu>
-  </effect>
-  <script>
-    <command reldir="extensions" interpreter="python">pathalongpath.py</command>
-  </script>
+        <effects-menu>
+            <submenu _name="Generate from Path"/>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">pathalongpath.py</command>
+    </script>
 </inkscape-extension>
diff --git a/share/extensions/pathalongpath.py b/share/extensions/pathalongpath.py
index be2e5bc19..b39f29c3a 100644
--- a/share/extensions/pathalongpath.py
+++ b/share/extensions/pathalongpath.py
@@ -117,6 +117,10 @@ class PathAlongPath(pathmodifier.Diffeo):
                         action="store", type="inkbool", 
                         dest="duplicate", default=False,
                         help="duplicate pattern before deformation")
+        self.OptionParser.add_option("--tab",
+                        action="store", type="string",
+                        dest="tab",
+                        help="The selected UI-tab when OK was pressed")
 
     def prepareSelectionList(self):
 
diff --git a/share/extensions/pathscatter.inx b/share/extensions/pathscatter.inx
index 19d2e0810..02d00a3ca 100644
--- a/share/extensions/pathscatter.inx
+++ b/share/extensions/pathscatter.inx
@@ -1,35 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-  <_name>Scatter</_name>
-  <id>math.univ-lille1.barraud.pathScatter</id>
-  <dependency type="executable" location="extensions">pathmodifier.py</dependency>
-  <dependency type="executable" location="extensions">pathscatter.py</dependency>
-  <dependency type="executable" location="extensions">inkex.py</dependency>
-  <_param name="title" type="description">This effect scatters a pattern along arbitrary "skeleton" paths. The pattern must be the topmost object in the selection. Groups of paths, shapes, clones are allowed.</_param>
-  <param name="follow" type="boolean" _gui-text="Follow path orientation">false</param>
-  <param name="stretch" type="boolean" _gui-text="Stretch spaces to fit skeleton length">false</param>
-  <param name="space" type="float" _gui-text="Space between copies:" min="-10000.0" max="10000.0">0.0</param>
-  <param name="noffset" type="float" _gui-text="Normal offset" min="-10000.0" max="10000.0">0.0</param>
-  <param name="toffset" type="float" _gui-text="Tangential offset" min="-10000.0" max="10000.0">0.0</param>
-  <param name="vertical" type="boolean" _gui-text="Pattern is vertical">false</param>
-  <param name="copymode" type="optiongroup" _gui-text="Original pattern will be:">
-    <_option value="move">Moved</_option>
-    <_option value="copy">Copied</_option>
-    <_option value="clone">Cloned</_option>
-  </param>
-  <param name="duplicate" type="boolean" _gui-text="Duplicate the pattern before deformation">true</param>
-  <param name="grouppick" type="boolean" _gui-text="If pattern is a group, pick group members">false</param>
-  <param name="pickmode" type="optiongroup" _gui-text="Pick group members:">
-    <_option value="rand">Randomly</_option>
-    <_option value="seq">Sequentially</_option>
-  </param> 
-  <effect>
-    <object-type>all</object-type>
-    <effects-menu>
-      <submenu _name="Generate from Path"/>
-    </effects-menu>
-  </effect>
-  <script>
-    <command reldir="extensions" interpreter="python">pathscatter.py</command>
-  </script>
+    <_name>Scatter</_name>
+    <id>math.univ-lille1.barraud.pathScatter</id>
+    <dependency type="executable" location="extensions">pathmodifier.py</dependency>
+    <dependency type="executable" location="extensions">pathscatter.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+	<param name="tab" type="notebook">
+        <page name="Options" _gui-text="Options">
+            <param name="follow" type="boolean" _gui-text="Follow path orientation">false</param>
+            <param name="stretch" type="boolean" _gui-text="Stretch spaces to fit skeleton length">false</param>
+            <param name="space" type="float" _gui-text="Space between copies:" min="-10000.0" max="10000.0">0.0</param>
+            <param name="noffset" type="float" _gui-text="Normal offset:" min="-10000.0" max="10000.0">0.0</param>
+            <param name="toffset" type="float" _gui-text="Tangential offset:" min="-10000.0" max="10000.0">0.0</param>
+            <param name="vertical" type="boolean" _gui-text="Pattern is vertical">false</param>
+            <param name="copymode" type="enum" _gui-text="Original pattern will be:">
+                <_item value="move">Moved</_item>
+                <_item value="copy">Copied</_item>
+                <_item value="clone">Cloned</_item>
+            </param>
+            <param name="duplicate" type="boolean" _gui-text="Duplicate the pattern before deformation">true</param>
+            <param name="grouppick" type="boolean" _gui-text="If pattern is a group, pick group members">false</param>
+            <param name="pickmode" type="enum" _gui-text="Pick group members:">
+                <_item value="rand">Randomly</_item>
+                <_item value="seq">Sequentially</_item>
+            </param> 
+        </page>
+        <page name="Help" _gui-text="Help">
+            <_param name="title" type="description">This effect scatters a pattern along arbitrary "skeleton" paths. The pattern must be the topmost object in the selection. Groups of paths, shapes, clones are allowed.</_param>
+        </page>
+    </param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Generate from Path"/>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">pathscatter.py</command>
+    </script>
 </inkscape-extension>
diff --git a/share/extensions/pathscatter.py b/share/extensions/pathscatter.py
index a7a77e1ec..b8b8e31bc 100644
--- a/share/extensions/pathscatter.py
+++ b/share/extensions/pathscatter.py
@@ -142,6 +142,10 @@ class PathScatter(pathmodifier.Diffeo):
                         action="store", type="string", 
                         dest="copymode", default="clone",
                         help="duplicate pattern before deformation")
+        self.OptionParser.add_option("--tab",
+                        action="store", type="string",
+                        dest="tab",
+                        help="The selected UI-tab when OK was pressed")
 
     def prepareSelectionList(self):