[Bug #1659446] Cartesian Grid dialogue box bottom under dock.

Fixed bugs:
  - https://launchpad.net/bugs/1659446

(bzr r15457)

2 files changed, 28 insertions, 20 deletions

diff --git a/share/extensions/grid_cartesian.inx b/share/extensions/grid_cartesian.inx
index 494aabf76..f053d80bb 100644
--- a/share/extensions/grid_cartesian.inx
+++ b/share/extensions/grid_cartesian.inx
@@ -4,27 +4,32 @@
   <id>grid.cartesian</id>
   <dependency type="executable" location="extensions">grid_cartesian.py</dependency>
   <dependency type="executable" location="extensions">inkex.py</dependency>
+
   <param name="border_th"       type="float"   min="0" max="1000" _gui-text="Border Thickness (px):">3</param>
-  <_param name="x_axis" type="description" appearance="header">X Axis</_param>
-  <param name="x_divs"          type="int"     min="1" max="1000" _gui-text="Major X Divisions:">6</param>
-  <param name="dx"              type="float"   min="1" max="1000" _gui-text="Major X Division Spacing (px):">100.0</param>
-  <param name="x_subdivs"       type="int"     min="1" max="1000" _gui-text="Subdivisions per Major X Division:">2</param>
-  <param name="x_log"           type="boolean"                    _gui-text="Logarithmic X Subdiv. (Base given by entry above)">false</param>
-  <param name="x_subsubdivs"    type="int"     min="1" max="1000" _gui-text="Subsubdivs. per X Subdivision:">5</param>
-  <param name="x_half_freq"     type="int"     min="1" max="1000" _gui-text="Halve X Subsubdiv. Frequency after 'n' Subdivs. (log only):">4</param>
-  <param name="x_divs_th"       type="float"   min="0" max="1000" _gui-text="Major X Division Thickness (px):">2</param>
-  <param name="x_subdivs_th"    type="float"   min="0" max="1000" _gui-text="Minor X Division Thickness (px):">1</param>
-  <param name="x_subsubdivs_th" type="float"   min="0" max="1000" _gui-text="Subminor X Division Thickness (px):">0.3</param>
-  <_param name="y_axis" type="description" appearance="header">Y Axis</_param>
-  <param name="y_divs"          type="int"     min="1" max="1000" _gui-text="Major Y Divisions:">5</param>
-  <param name="dy"              type="float"   min="1" max="1000" _gui-text="Major Y Division Spacing (px):">100.0</param>
-  <param name="y_subdivs"       type="int"     min="1" max="1000" _gui-text="Subdivisions per Major Y Division:">1</param>
-  <param name="y_log"           type="boolean"                    _gui-text="Logarithmic Y Subdiv. (Base given by entry above)">false</param>
-  <param name="y_subsubdivs"    type="int"     min="1" max="1000" _gui-text="Subsubdivs. per Y Subdivision:">5</param>
-  <param name="y_half_freq"     type="int"     min="1" max="1000" _gui-text="Halve Y Subsubdiv. Frequency after 'n' Subdivs. (log only):">4</param>
-  <param name="y_divs_th"       type="float"   min="0" max="1000" _gui-text="Major Y Division Thickness (px):">2</param>
-  <param name="y_subdivs_th"    type="float"   min="0" max="1000" _gui-text="Minor Y Division Thickness (px):">1</param>
-  <param name="y_subsubdivs_th" type="float"   min="0" max="1000" _gui-text="Subminor Y Division Thickness (px):">0.3</param>
+  <param name="tab" type="notebook">
+    <page name="x_tab" _gui-text="X Axis">
+      <param name="x_divs"          type="int"     min="1" max="1000" _gui-text="Major X Divisions:">6</param>
+      <param name="dx"              type="float"   min="1" max="1000" _gui-text="Major X Division Spacing (px):">100.0</param>
+      <param name="x_subdivs"       type="int"     min="1" max="1000" _gui-text="Subdivisions per Major X Division:">2</param>
+      <param name="x_log"           type="boolean"                    _gui-text="Logarithmic X Subdiv. (Base given by entry above)">false</param>
+      <param name="x_subsubdivs"    type="int"     min="1" max="1000" _gui-text="Subsubdivs. per X Subdivision:">5</param>
+      <param name="x_half_freq"     type="int"     min="1" max="1000" _gui-text="Halve X Subsubdiv. Frequency after 'n' Subdivs. (log only):">4</param>
+      <param name="x_divs_th"       type="float"   min="0" max="1000" _gui-text="Major X Division Thickness (px):">2</param>
+      <param name="x_subdivs_th"    type="float"   min="0" max="1000" _gui-text="Minor X Division Thickness (px):">1</param>
+      <param name="x_subsubdivs_th" type="float"   min="0" max="1000" _gui-text="Subminor X Division Thickness (px):">0.3</param>
+    </page>
+    <page name="y_tab" _gui-text="Y Axis">
+      <param name="y_divs"          type="int"     min="1" max="1000" _gui-text="Major Y Divisions:">5</param>
+      <param name="dy"              type="float"   min="1" max="1000" _gui-text="Major Y Division Spacing (px):">100.0</param>
+      <param name="y_subdivs"       type="int"     min="1" max="1000" _gui-text="Subdivisions per Major Y Division:">1</param>
+      <param name="y_log"           type="boolean"                    _gui-text="Logarithmic Y Subdiv. (Base given by entry above)">false</param>
+      <param name="y_subsubdivs"    type="int"     min="1" max="1000" _gui-text="Subsubdivs. per Y Subdivision:">5</param>
+      <param name="y_half_freq"     type="int"     min="1" max="1000" _gui-text="Halve Y Subsubdiv. Frequency after 'n' Subdivs. (log only):">4</param>
+      <param name="y_divs_th"       type="float"   min="0" max="1000" _gui-text="Major Y Division Thickness (px):">2</param>
+      <param name="y_subdivs_th"    type="float"   min="0" max="1000" _gui-text="Minor Y Division Thickness (px):">1</param>
+      <param name="y_subsubdivs_th" type="float"   min="0" max="1000" _gui-text="Subminor Y Division Thickness (px):">0.3</param>
+    </page>
+  </param>
     
   <effect>
     <object-type>all</object-type>
diff --git a/share/extensions/grid_cartesian.py b/share/extensions/grid_cartesian.py
index 26270002d..e92509505 100755
--- a/share/extensions/grid_cartesian.py
+++ b/share/extensions/grid_cartesian.py
@@ -44,6 +44,9 @@ def draw_SVG_rect(x,y,w,h, width, fill, name, parent):
 class Grid_Polar(inkex.Effect):
     def __init__(self):
         inkex.Effect.__init__(self)
+        self.OptionParser.add_option("--tab",
+                        action="store", type="string", 
+                        dest="tab", default="x_tab") 
         self.OptionParser.add_option("--x_divs",
                         action="store", type="int", 
                         dest="x_divs", default=5,