Extensions. Consistency fix and UI improvements (Render submenu, part 2).

(bzr r9751)

9 files changed, 159 insertions, 153 deletions

diff --git a/share/extensions/draw_from_triangle.inx b/share/extensions/draw_from_triangle.inx
index 5b57e2c49..5c645bf26 100644
--- a/share/extensions/draw_from_triangle.inx
+++ b/share/extensions/draw_from_triangle.inx
@@ -29,14 +29,14 @@
             <param name="nagel_pt"        type="boolean" _gui-text="Nagel Point"></param>
         </page>
         <page name="Custom" _gui-text="Custom Points and Options">
-            <param name="mode" type="optiongroup" _gui-text="Custom Point Specified By:">
-                <_option value="trilin">Trilinear Coordinates</_option>
-                <_option value="tcf">Triangle Function</_option>
+            <param name="mode" type="enum" _gui-text="Custom Point Specified By:">
+                <_item value="trilin">Trilinear Coordinates</_item>
+                <_item value="tcf">Triangle Function</_item>
             </param>
-            <param name="cust_str"      type="string"  _gui-text="Point At">cos(a_a):cos(a_b):cos(a_c)</param>
+            <param name="cust_str"      type="string"  _gui-text="Point At:">cos(a_a):cos(a_b):cos(a_c)</param>
             <param name="cust_pt"       type="boolean" _gui-text="Draw Marker At This Point"></param>
             <param name="cust_radius"   type="boolean" _gui-text="Draw Circle Around This Point"></param>
-            <param name="radius"        type="string"  _gui-text="Radius / px">s_a*s_b*s_c/(4*area)</param>
+            <param name="radius"        type="string"  _gui-text="Radius (px):">s_a*s_b*s_c/(4*area)</param>
             <param name="isogonal_conj" type="boolean" _gui-text="Draw Isogonal Conjugate"></param>
             <param name="isotomic_conj" type="boolean" _gui-text="Draw Isotomic Conjugate"></param>
             <param name="report" type="boolean" _gui-text="Report this triangle's properties"></param>
@@ -68,9 +68,9 @@ You can specify the radius of a circle around a custom point using a formula, wh
     </param>
     <effect>
         <object-type>all</object-type>
-                <effects-menu>
-                    <submenu _name="Render"/>
-                </effects-menu>
+        <effects-menu>
+            <submenu _name="Render"/>
+        </effects-menu>
     </effect>
     <script>
         <command reldir="extensions" interpreter="python">draw_from_triangle.py</command>
diff --git a/share/extensions/funcplot.inx b/share/extensions/funcplot.inx
index 6af6595c9..3867cab82 100644
--- a/share/extensions/funcplot.inx
+++ b/share/extensions/funcplot.inx
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-  <_name>Function Plotter</_name>
-  <id>org.inkscape.effect.funcplot</id>
-  <dependency type="executable" location="extensions">funcplot.py</dependency>
-  <dependency type="executable" location="extensions">inkex.py</dependency>
-  <param name="tab" type="notebook">
-    <page name="sampling" _gui-text="Range and sampling">
-      <param name="xstart" type="float" min="-1000.0" max="1000.0" _gui-text="Start X value">0.0</param>
-      <param name="xend" type="float" min="-1000.0" max="1000.0" _gui-text="End X value">1.0</param>
-      <param name="times2pi" type="boolean" _gui-text="Multiply X range by 2*pi">false</param>
-      <param name="ybottom" type="float" min="-1000.0" max="1000.0" _gui-text="Y value of rectangle's bottom">0.0</param>
-      <param name="ytop" type="float" min="-1000.0" max="1000.0" _gui-text="Y value of rectangle's top">1.0</param>
-      <param name="samples" type="int" min="2" max="1000" _gui-text="Number of samples">8</param>
-      <param name="isoscale" type="boolean" _gui-text="Isotropic scaling (uses smallest of width/xrange or height/yrange)">false</param>
-      <param name="polar" type="boolean" _gui-text="Use polar coordinates">true</param>
-    </page>
-    <page name="use" _gui-text="Use">
-      <_param name="funcplotuse" type="description" xml:space="preserve">Select a rectangle before calling the extension,
+    <_name>Function Plotter</_name>
+    <id>org.inkscape.effect.funcplot</id>
+    <dependency type="executable" location="extensions">funcplot.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="tab" type="notebook">
+        <page name="sampling" _gui-text="Range and sampling">
+            <param name="xstart" type="float" min="-1000.0" max="1000.0" _gui-text="Start X value:">0.0</param>
+            <param name="xend" type="float" min="-1000.0" max="1000.0" _gui-text="End X value:">1.0</param>
+            <param name="times2pi" type="boolean" _gui-text="Multiply X range by 2*pi">false</param>
+            <param name="ybottom" type="float" min="-1000.0" max="1000.0" _gui-text="Y value of rectangle's bottom:">0.0</param>
+            <param name="ytop" type="float" min="-1000.0" max="1000.0" _gui-text="Y value of rectangle's top:">1.0</param>
+            <param name="samples" type="int" min="2" max="1000" _gui-text="Number of samples:">8</param>
+            <param name="isoscale" type="boolean" _gui-text="Isotropic scaling">false</param>
+            <_param name="isoscaledesc" type="description">When set, Isotropic scaling uses smallest of width/xrange or height/yrange</_param>
+            <param name="polar" type="boolean" _gui-text="Use polar coordinates">true</param>
+        </page>
+        <page name="use" _gui-text="Use">
+            <_param name="funcplotuse" type="description" xml:space="preserve">Select a rectangle before calling the extension,
 it will determine X and Y scales.
 
 With polar coordinates:
@@ -24,9 +25,9 @@ With polar coordinates:
    X scale is set so that left and right edges of rectangle are at +/-1.
    Isotropic scaling is disabled.
    First derivative is always determined numerically.</_param>
-    </page>
-    <page name="desc" _gui-text="Functions">
-      <_param name="pythonfunctions" type="description" xml:space="preserve">Standard Python math functions are available:
+        </page>
+        <page name="desc" _gui-text="Functions">
+            <_param name="pythonfunctions" type="description" xml:space="preserve">Standard Python math functions are available:
 
 ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); 
 modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); 
@@ -35,20 +36,20 @@ cos(x); sin(x); tan(x); degrees(x); radians(x);
 cosh(x); sinh(x); tanh(x).
 
 The constants pi and e are also available.</_param>
-    </page>
-  </param>
-  <param name="fofx" type="string" _gui-text="Function">exp(-x*x)</param>
-  <param name="fponum" type="boolean" _gui-text="Calculate first derivative numerically">true</param>
-  <param name="fpofx" type="string" _gui-text="First derivative">x</param>
-  <param name="remove" type="boolean" _gui-text="Remove rectangle">true</param>
-  <param name="drawaxis" type="boolean" _gui-text="Draw Axes">false</param>
-  <effect>
-    <object-type>rect</object-type>
-    <effects-menu>
-      <submenu _name="Render"/>
-    </effects-menu>
-  </effect>
-  <script>
-    <command reldir="extensions" interpreter="python">funcplot.py</command>
-  </script>
+        </page>
+    </param>
+    <param name="fofx" type="string" _gui-text="Function:">exp(-x*x)</param>
+    <param name="fponum" type="boolean" _gui-text="Calculate first derivative numerically">true</param>
+    <param name="fpofx" type="string" _gui-text="First derivative:">x</param>
+    <param name="remove" type="boolean" _gui-text="Remove rectangle">true</param>
+    <param name="drawaxis" type="boolean" _gui-text="Draw Axes">false</param>
+    <effect>
+        <object-type>rect</object-type>
+        <effects-menu>
+            <submenu _name="Render"/>
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">funcplot.py</command>
+    </script>
 </inkscape-extension>
diff --git a/share/extensions/lindenmayer.inx b/share/extensions/lindenmayer.inx
index 4cebaf3fe..6dba2d5f9 100644
--- a/share/extensions/lindenmayer.inx
+++ b/share/extensions/lindenmayer.inx
@@ -4,19 +4,19 @@
     <id>org.ekips.filter.turtle.lindenmayer</id>
 	<dependency type="executable" location="extensions">lindenmayer.py</dependency>
 	<dependency type="executable" location="extensions">inkex.py</dependency>
-  <param name="tab" type="notebook">
-    <page name="rules" _gui-text="Axiom and rules">
-	<param name="axiom" type="string" _gui-text="Axiom">++F</param>
-	<param name="rules" type="string" _gui-text="Rules">F=FF-[-F+F+F]+[+F-F-F]</param>
-	<param name="order" type="int" min="0" max="100" _gui-text="Order">3</param>
-	<param name="step" type="float" min="0.0" max="1000.0" _gui-text="Step length (px)">25.0</param>
-	<param name="randomizestep" type="float" min="0.0" max="100.0" _gui-text="Randomize step (%)">0.0</param>
-	<param name="langle" type="float" min="0.0" max="360.0" _gui-text="Left angle">16.0</param>
-	<param name="rangle" type="float" min="0.0" max="360.0" _gui-text="Right angle">16.0</param>
-	<param name="randomizeangle" type="float" min="0.0" max="100.0" _gui-text="Randomize angle (%)">0.0</param>
-    </page>
-    <page name="help" _gui-text="Help">
-      <_param name="lhelp" type="description" xml:space="preserve">
+    <param name="tab" type="notebook">
+        <page name="rules" _gui-text="Axiom and rules">
+	        <param name="axiom" type="string" _gui-text="Axiom:">++F</param>
+	        <param name="rules" type="string" _gui-text="Rules:">F=FF-[-F+F+F]+[+F-F-F]</param>
+	        <param name="order" type="int" min="0" max="100" _gui-text="Order:">3</param>
+	        <param name="step" type="float" min="0.0" max="1000.0" _gui-text="Step length (px):">25.0</param>
+	        <param name="randomizestep" type="float" min="0.0" max="100.0" _gui-text="Randomize step (%):">0.0</param>
+	        <param name="langle" type="float" min="0.0" max="360.0" _gui-text="Left angle:">16.0</param>
+	        <param name="rangle" type="float" min="0.0" max="360.0" _gui-text="Right angle:">16.0</param>
+	        <param name="randomizeangle" type="float" min="0.0" max="100.0" _gui-text="Randomize angle (%):">0.0</param>
+        </page>
+        <page name="help" _gui-text="Help">
+            <_param name="lhelp" type="description" xml:space="preserve">
 The path is generated by applying the 
 substitutions of Rules to the Axiom, 
 Order times. The following commands are 
@@ -36,15 +36,15 @@ Any of G,H,I,J,K,L: move forward
 
 ]: return to remembered point
 </_param>
-    </page>
-  </param>
-  <effect>
+        </page>
+    </param>
+    <effect>
 		<object-type>all</object-type>
-                <effects-menu>
-                    <submenu _name="Render"/>
-                </effects-menu>						    		
-  </effect>
-  <script>
-    <command reldir="extensions" interpreter="python">lindenmayer.py</command>
-  </script>
+            <effects-menu>
+                <submenu _name="Render"/>
+            </effects-menu>						    		
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">lindenmayer.py</command>
+    </script>
 </inkscape-extension>
diff --git a/share/extensions/param_curves.inx b/share/extensions/param_curves.inx
index 82a1df2af..25018c5e5 100644
--- a/share/extensions/param_curves.inx
+++ b/share/extensions/param_curves.inx
@@ -15,12 +15,15 @@
             <param name="ytop"     type="float" min="-1000.0" max="1000.0" _gui-text="y-value of rectangle's top:">1.0</param>
             <param name="samples"  type="int"   min="2"       max="1000"   _gui-text="Samples:">30</param>
             <param name="isoscale" type="boolean" _gui-text="Isotropic scaling">false</param>
-            <_param name="isoscaledesc" type="description">When set, Isotropic scaling uses smallest: width/xrange or height/yrange.</_param>
+            <_param name="isoscaledesc" type="description">When set, Isotropic scaling uses smallest of width/xrange or height/yrange</_param>
         </page>
-        <page name="help" _gui-text="Help">
-            <_param name="funcplotuse" type="description" xml:space="preserve">Select a rectangle before calling the extension, it will determine X and Y scales. First derivatives are always determined numerically.
+        <page name="use" _gui-text="Use">
+            <_param name="funcplotuse" type="description" xml:space="preserve">Select a rectangle before calling the extension, it will determine X and Y scales.
+First derivatives are always determined numerically.</_param>
+        </page>
+        <page name="desc" _gui-text="Functions">
+            <_param name="pythonfunctions" type="description" xml:space="preserve">Standard Python math functions are available:
 
-Standard Python math functions are available:
 ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); 
 modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); 
 acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y); 
diff --git a/share/extensions/polyhedron_3d.inx b/share/extensions/polyhedron_3d.inx
index 10a054f8a..7dccc47f8 100644
--- a/share/extensions/polyhedron_3d.inx
+++ b/share/extensions/polyhedron_3d.inx
@@ -6,29 +6,29 @@
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <param name="tab" type="notebook">
         <page name="common" _gui-text="Model file">
-            <param name="obj" type="optiongroup" appearance="minimal" _gui-text="Object:">
-                <_option value="cube">Cube</_option>
-                <_option value="trunc_cube">Truncated Cube</_option>
-                <_option value="snub_cube">Snub Cube</_option>
-                <_option value="cuboct">Cuboctahedron</_option>
-                <_option value="tet">Tetrahedron</_option>
-                <_option value="trunc_tet">Truncated Tetrahedron</_option>
-                <_option value="oct">Octahedron</_option>
-                <_option value="trunc_oct">Truncated Octahedron</_option>
-                <_option value="icos">Icosahedron</_option>
-                <_option value="trunc_icos">Truncated Icosahedron</_option>
-                <_option value="small_triam_icos">Small Triambic Icosahedron</_option>
-                <_option value="dodec">Dodecahedron</_option>
-                <_option value="trunc_dodec">Truncated Dodecahedron</_option>
-                <_option value="snub_dodec">Snub Dodecahedron</_option>
-                <_option value="great_dodec">Great Dodecahedron</_option>
-                <_option value="great_stel_dodec">Great Stellated Dodecahedron</_option>
-                <_option value="from_file">Load from file</_option>
+            <param name="obj" type="enum" _gui-text="Object:">
+                <_item value="cube">Cube</_item>
+                <_item value="trunc_cube">Truncated Cube</_item>
+                <_item value="snub_cube">Snub Cube</_item>
+                <_item value="cuboct">Cuboctahedron</_item>
+                <_item value="tet">Tetrahedron</_item>
+                <_item value="trunc_tet">Truncated Tetrahedron</_item>
+                <_item value="oct">Octahedron</_item>
+                <_item value="trunc_oct">Truncated Octahedron</_item>
+                <_item value="icos">Icosahedron</_item>
+                <_item value="trunc_icos">Truncated Icosahedron</_item>
+                <_item value="small_triam_icos">Small Triambic Icosahedron</_item>
+                <_item value="dodec">Dodecahedron</_item>
+                <_item value="trunc_dodec">Truncated Dodecahedron</_item>
+                <_item value="snub_dodec">Snub Dodecahedron</_item>
+                <_item value="great_dodec">Great Dodecahedron</_item>
+                <_item value="great_stel_dodec">Great Stellated Dodecahedron</_item>
+                <_item value="from_file">Load from file</_item>
                 </param>
-            <param name="spec_file" type="string"  _gui-text="Filename:">great_rhombicuboct.obj</param>
-            <param name="type" type="optiongroup" appearance="minimal" _gui-text="Object Type">
-                <_option value="face">Face-Specified</_option>
-                <_option value="edge">Edge-Specified</_option></param>
+            <param name="spec_file" type="string" _gui-text="Filename:">great_rhombicuboct.obj</param>
+            <param name="type" type="enum" _gui-text="Object Type:">
+                <_item value="face">Face-Specified</_item>
+                <_item value="edge">Edge-Specified</_item></param>
             <param name="cw_wound"  type="boolean" _gui-text="Clockwise wound object">0</param>
          </page>
          <page name="view" _gui-text="View">
@@ -36,61 +36,62 @@
                 <_option value="x">X-Axis</_option>
                 <_option value="y">Y-Axis</_option>
                 <_option value="z">Z-Axis</_option></param>
-            <param name="r1_ang"  type="float"   min="-360" max="360"   _gui-text="Rotation, degrees">0</param>
+            <param name="r1_ang" type="float" min="-360" max="360" _gui-text="Rotation (degrees):">0</param>
             <param name="r2_ax" type="optiongroup" appearance="minimal" _gui-text="Then rotate around:">
                 <_option value="x">X-Axis</_option>
                 <_option value="y">Y-Axis</_option>
                 <_option value="z">Z-Axis</_option></param>
-            <param name="r2_ang"  type="float"   min="-360" max="360"   _gui-text="Rotation, degrees">0</param>
+            <param name="r2_ang" type="float" min="-360" max="360" _gui-text="Rotation (degrees):">0</param>
             <param name="r3_ax" type="optiongroup" appearance="minimal" _gui-text="Then rotate around:">
                 <_option value="x">X-Axis</_option>
                 <_option value="y">Y-Axis</_option>
                 <_option value="z">Z-Axis</_option></param>
-            <param name="r3_ang"  type="float"   min="-360" max="360"   _gui-text="Rotation, degrees">0</param>
+            <param name="r3_ang" type="float" min="-360" max="360" _gui-text="Rotation(degrees):">0</param>
             <param name="r4_ax" type="optiongroup" appearance="minimal" _gui-text="Then rotate around:">
                 <_option value="x">X-Axis</_option>
                 <_option value="y">Y-Axis</_option>
                 <_option value="z">Z-Axis</_option></param>
-            <param name="r4_ang"  type="float"   min="-360" max="360"   _gui-text="Rotation, degrees">0</param>
+            <param name="r4_ang" type="float" min="-360" max="360" _gui-text="Rotation(degrees):">0</param>
             <param name="r5_ax" type="optiongroup" appearance="minimal" _gui-text="Then rotate around:">
                 <_option value="x">X-Axis</_option>
                 <_option value="y">Y-Axis</_option>
                 <_option value="z">Z-Axis</_option></param>
-            <param name="r5_ang"  type="float"   min="-360" max="360"   _gui-text="Rotation, degrees">0</param>
+            <param name="r5_ang" type="float" min="-360" max="360" _gui-text="Rotation(degrees):">0</param>
             <param name="r6_ax" type="optiongroup" appearance="minimal" _gui-text="Then rotate around:">
                 <_option value="x">X-Axis</_option>
                 <_option value="y">Y-Axis</_option>
                 <_option value="z">Z-Axis</_option></param>
-            <param name="r6_ang"  type="float"   min="-360" max="360"   _gui-text="Rotation, degrees">0</param>
+            <param name="r6_ang" type="float" min="-360" max="360" _gui-text="Rotation(degrees):">0</param>
         </page>
         <page name="style" _gui-text="Style">
-            <param name="scl"    type="float"   min="0"    max="10000" _gui-text="Scaling factor">100</param>
-            <param name="f_r"  type="int"   min="0" max="255" _gui-text="Fill color, Red">255</param>
-            <param name="f_g"  type="int"   min="0" max="255" _gui-text="Fill color, Green">0</param>
-            <param name="f_b"  type="int"   min="0" max="255" _gui-text="Fill color, Blue">0</param>
-            <param name="f_opac" type="int" min="0" max="100" _gui-text="Fill opacity, %">100</param>
-            <param name="s_opac" type="int" min="0" max="100" _gui-text="Stroke opacity, %">100</param>
-            <param name="th"   type="float" min="0" max="100" _gui-text="Stroke width, px">2</param>
-            <param name="shade"  type="boolean" _gui-text="Shading">1</param>
-            <param name="lv_x" type="float" min="-100" max="100" _gui-text="Light X">1</param>
-            <param name="lv_y" type="float" min="-100" max="100" _gui-text="Light Y">1</param>
-            <param name="lv_z" type="float" min="-100" max="100" _gui-text="Light Z">-2</param>
-            <param name="show" type="optiongroup" appearance="minimal" _gui-text="Show:">
-                <_option value="fce">Faces</_option></param>
-                <_option value="edg">Edges</_option>
-                <_option value="vtx">Vertices</_option>
-            <param name="back"  type="boolean" _gui-text="Draw back-facing polygons">0</param>
-            <param name="z_sort" type="optiongroup" appearance="minimal" _gui-text="Z-sort faces by:">
-                <_option value="max">Maximum</_option>
-                <_option value="min">Minimum</_option>
-                <_option value="mean">Mean</_option></param>
+            <param name="scl" type="float" min="0" max="10000" _gui-text="Scaling factor:">100</param>
+            <param name="f_r" type="int" min="0" max="255" _gui-text="Fill color, Red:">255</param>
+            <param name="f_g" type="int" min="0" max="255" _gui-text="Fill color, Green:">0</param>
+            <param name="f_b" type="int" min="0" max="255" _gui-text="Fill color, Blue:">0</param>
+            <param name="f_opac" type="int" min="0" max="100" _gui-text="Fill opacity (%):">100</param>
+            <param name="s_opac" type="int" min="0" max="100" _gui-text="Stroke opacity (%):">100</param>
+            <param name="th" type="float" min="0" max="100" _gui-text="Stroke width (px):">2</param>
+            <param name="shade" type="boolean" _gui-text="Shading">1</param>
+            <param name="lv_x" type="float" min="-100" max="100" _gui-text="Light X:">1</param>
+            <param name="lv_y" type="float" min="-100" max="100" _gui-text="Light Y:">1</param>
+            <param name="lv_z" type="float" min="-100" max="100" _gui-text="Light Z:">-2</param>
+            <param name="show" type="enum" _gui-text="Show:">
+                <_item value="fce">Faces</_item>
+                <_item value="edg">Edges</_item>
+                <_item value="vtx">Vertices</_item>
+            </param>
+            <param name="back"  type="boolean" _gui-text="Draw back-facing polygons:">0</param>
+            <param name="z_sort" type="enum"  _gui-text="Z-sort faces by:">
+                <_item value="max">Maximum</_item>
+                <_item value="min">Minimum</_item>
+                <_item value="mean">Mean</_item></param>
         </page>
     </param>
     <effect>
         <object-type>all</object-type>
-                <effects-menu>
-                    <submenu _name="Render"/>
-                </effects-menu>
+        <effects-menu>
+            <submenu _name="Render"/>
+        </effects-menu>
     </effect>
     <script>
         <command reldir="extensions" interpreter="python">polyhedron_3d.py</command>
diff --git a/share/extensions/render_alphabetsoup.inx b/share/extensions/render_alphabetsoup.inx
index e1c919c71..58bc938f0 100644
--- a/share/extensions/render_alphabetsoup.inx
+++ b/share/extensions/render_alphabetsoup.inx
@@ -5,9 +5,9 @@
 	<dependency type="executable" location="extensions">render_alphabetsoup.py</dependency>
     <dependency type="executable" location="extensions">render_alphabetsoup_config.py</dependency>
 	<dependency type="executable" location="extensions">inkex.py</dependency>
-	<param name="text" type="string" _gui-text="Text">Inkscape</param>
-	<param name="zoom" type="float" min="0.0" max="1000.0" _gui-text="Scale">8.0</param>
-	<param name="seed" type="int" min="0" max="65535" _gui-text="Random Seed">0</param>
+	<param name="text" type="string" _gui-text="Text:">Inkscape</param>
+	<param name="zoom" type="float" min="0.0" max="1000.0" _gui-text="Scale:">8.0</param>
+	<param name="seed" type="int" min="0" max="65535" _gui-text="Random Seed:">0</param>
     <effect>
         <object-type>all</object-type>
         <effects-menu>
diff --git a/share/extensions/spirograph.inx b/share/extensions/spirograph.inx
index 84e13c5d6..612643336 100644
--- a/share/extensions/spirograph.inx
+++ b/share/extensions/spirograph.inx
@@ -4,15 +4,15 @@
     <id>org.ekips.filter.spirograph</id>
 	<dependency type="executable" location="extensions">spirograph.py</dependency>
 	<dependency type="executable" location="extensions">inkex.py</dependency>
-	<param name="primaryr" type="float" min="0.0" max="1000.0" _gui-text="R - Ring Radius (px)">100.0</param>
-	<param name="secondaryr" type="float" min="0.0" max="1000.0" _gui-text="r - Gear Radius (px)">60.0</param>
-	<param name="penr" type="float" min="0.0" max="1000.0" _gui-text="d - Pen Radius (px)">50.0</param>
-    <param name="gearplacement" type="optiongroup" _gui-text="Gear Placement">
-        <_option value="inside">Inside (Hypotrochoid)</_option>
-        <_option value="outside">Outside (Epitrochoid)</_option>
+	<param name="primaryr" type="float" min="0.0" max="1000.0" _gui-text="R - Ring Radius (px):">100.0</param>
+	<param name="secondaryr" type="float" min="0.0" max="1000.0" _gui-text="r - Gear Radius (px):">60.0</param>
+	<param name="penr" type="float" min="0.0" max="1000.0" _gui-text="d - Pen Radius (px):">50.0</param>
+    <param name="gearplacement" type="enum" _gui-text="Gear Placement:">
+        <_item value="inside">Inside (Hypotrochoid)</_item>
+        <_item value="outside">Outside (Epitrochoid)</_item>
     </param>
-    <param name="rotation" type="float" min="-360.0" max="360.0" _gui-text="Rotation (deg)">0.0</param>
-    <param name="quality" type="int" min="1" max="100" _gui-text="Quality (Default = 16)">16</param>
+    <param name="rotation" type="float" min="-360.0" max="360.0" _gui-text="Rotation (deg):">0.0</param>
+    <param name="quality" type="int" min="1" max="100" _gui-text="Quality (Default = 16):">16</param>
 	<effect>
 		<object-type>all</object-type>
 		<effects-menu>
diff --git a/share/extensions/triangle.inx b/share/extensions/triangle.inx
index 3c79ca42c..0c66ed907 100644
--- a/share/extensions/triangle.inx
+++ b/share/extensions/triangle.inx
@@ -4,23 +4,24 @@
     <id>math.triangle</id>
     <dependency type="executable" location="extensions">triangle.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
-    <param name="s_a"       type="float"   min="0.01" max="10000" _gui-text="Side Length a / px">100.0</param>
-    <param name="s_b"       type="float"   min="0.01" max="10000" _gui-text="Side Length b / px">100.0</param>
-    <param name="s_c"       type="float"   min="0.01" max="10000" _gui-text="Side Length c / px">100.0</param>
-    <param name="a_a"       type="float"   min="0"    max="180"   _gui-text="Angle a / deg">60</param>
-    <param name="a_b"       type="float"   min="0"    max="180"   _gui-text="Angle b / deg">30</param>
-    <param name="a_c"       type="float"   min="0"    max="180"   _gui-text="Angle c / deg">90</param>
-    <param name="mode"      type="optiongroup"                    _gui-text="Mode"  appearance="minimal">
-        <_option value="3_sides">From Three Sides</_option>
-        <_option value="s_ab_a_c">From Sides a, b and Angle c</_option>
-        <_option value="s_ab_a_a">From Sides a, b and Angle a</_option>
-        <_option value="s_a_a_ab">From Side a and Angles a, b</_option>
-        <_option value="s_c_a_ab">From Side c and Angles a, b</_option></param>
+    <param name="s_a"       type="float"   min="0.01" max="10000" _gui-text="Side Length a (px):">100.0</param>
+    <param name="s_b"       type="float"   min="0.01" max="10000" _gui-text="Side Length b (px):">100.0</param>
+    <param name="s_c"       type="float"   min="0.01" max="10000" _gui-text="Side Length c (px):">100.0</param>
+    <param name="a_a"       type="float"   min="0"    max="180"   _gui-text="Angle a (deg):">60</param>
+    <param name="a_b"       type="float"   min="0"    max="180"   _gui-text="Angle b (deg):">30</param>
+    <param name="a_c"       type="float"   min="0"    max="180"   _gui-text="Angle c (deg):">90</param>
+    <param name="mode"      type="enum"    _gui-text="Mode:">
+        <_item value="3_sides">From Three Sides</_item>
+        <_item value="s_ab_a_c">From Sides a, b and Angle c</_item>
+        <_item value="s_ab_a_a">From Sides a, b and Angle a</_item>
+        <_item value="s_a_a_ab">From Side a and Angles a, b</_item>
+        <_item value="s_c_a_ab">From Side c and Angles a, b</_item>
+    </param>
     <effect>
         <object-type>all</object-type>
-                <effects-menu>
-                    <submenu _name="Render"/>
-                </effects-menu>
+        <effects-menu>
+            <submenu _name="Render"/>
+        </effects-menu>
     </effect>
     <script>
         <command reldir="extensions" interpreter="python">triangle.py</command>
diff --git a/share/extensions/wireframe_sphere.inx b/share/extensions/wireframe_sphere.inx
index 733ba8e11..6702657e3 100644
--- a/share/extensions/wireframe_sphere.inx
+++ b/share/extensions/wireframe_sphere.inx
@@ -6,11 +6,11 @@
 	<dependency type="executable" location="extensions">inkex.py</dependency>
 	<dependency type="executable" location="extensions">simplestyle.py</dependency>
 	<dependency type="executable" location="extensions">simpletransform.py</dependency>
-	<param name="num_lat" type="int" min="0" max="1000" _gui-text="Lines of latitude">19</param>
-	<param name="num_long" type="int" min="0" max="1000" _gui-text="Lines of longitude">24</param>
-	<param name="tilt" type="float" min="-90" max="90" _gui-text="Tilt [deg]">35</param>
-	<param name="rotation" type="float" min="0" max="360" _gui-text="Rotation [deg]">4</param>
-	<param name="radius" type="float" min="1" max="1000" _gui-text="Radius [px]">100.0</param>
+	<param name="num_lat" type="int" min="0" max="1000" _gui-text="Lines of latitude:">19</param>
+	<param name="num_long" type="int" min="0" max="1000" _gui-text="Lines of longitude:">24</param>
+	<param name="tilt" type="float" min="-90" max="90" _gui-text="Tilt (deg):">35</param>
+	<param name="rotation" type="float" min="0" max="360" _gui-text="Rotation (deg):">4</param>
+	<param name="radius" type="float" min="1" max="1000" _gui-text="Radius (px):">100.0</param>
 	<param name="hide_back" type="boolean" _gui-text="Hide lines behind the sphere">false</param>
 	<effect>
 		<object-type>all</object-type>