From 60bb9a9350633076cf2d83054e09e44beaf48392 Mon Sep 17 00:00:00 2001
From: suv-lp <>
Date: Thu, 23 Feb 2017 09:22:00 +0100
Subject: [Bug #1666939] Polar grid: reduce height of options dialog.

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

(bzr r15541)
---
 share/extensions/grid_polar.inx | 33 +++++++++++++++++++--------------
 share/extensions/grid_polar.py  |  3 +++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/share/extensions/grid_polar.inx b/share/extensions/grid_polar.inx
index ffc64a3d5..2fbd190e5 100644
--- a/share/extensions/grid_polar.inx
+++ b/share/extensions/grid_polar.inx
@@ -4,6 +4,7 @@
   <id>grids.polar</id>
   <dependency type="executable" location="extensions">grid_polar.py</dependency>
   <dependency type="executable" location="extensions">inkex.py</dependency>
+
   <param name="c_dot_dia"    type="float" min="1" max="1000" _gui-text="Centre Dot Diameter (px):">5.0</param>
   <param name="a_labels"     type="enum"  _gui-text="Circumferential Labels:">
     <_item msgctxt="Label" value="none">None</_item>
@@ -11,20 +12,24 @@
   </param>
   <param name="a_label_size"   type="int"   min="1" max="1000" _gui-text="Circumferential Label Size (px):">18</param>
   <param name="a_label_outset" type="float" min="0" max="1000" _gui-text="Circumferential Label Outset (px):">24</param>
-  <_param name="circ_divs_label" type="description" appearance="header">Circular Divisions</_param>
-  <param name="r_divs"       type="int"   min="1" max="1000" _gui-text="Major Circular Divisions:">5</param>
-  <param name="dr"           type="float" min="1" max="1000" _gui-text="Major Circular Division Spacing (px):">50.0</param>
-  <param name="r_subdivs"    type="int"   min="1" max="1000" _gui-text="Subdivisions per Major Circular Division:">3</param>
-  <param name="r_log"        type="boolean"                  _gui-text="Logarithmic Subdiv. (Base given by entry above)">false</param>
-  <param name="r_divs_th"    type="float" min="0" max="1000" _gui-text="Major Circular Division Thickness (px):">2</param>
-  <param name="r_subdivs_th" type="float" min="0" max="1000" _gui-text="Minor Circular Division Thickness (px):">1</param>
-  <_param name="ang_divs_label" type="description" appearance="header">Angular Divisions</_param>
-  <param name="a_divs"       type="int"   min="1" max="1000" _gui-text="Angle Divisions:">24</param>
-  <param name="a_divs_cent"  type="int"   min="1" max="1000" _gui-text="Angle Divisions at Centre:">4</param>
-  <param name="a_subdivs"    type="int"   min="1" max="1000" _gui-text="Subdivisions per Major Angular Division:">1</param>
-  <param name="a_subdivs_cent"  type="int"   min="0" max="1000" _gui-text="Minor Angle Division End 'n' Divs. Before Centre:">2</param>
-  <param name="a_divs_th"    type="float" min="0" max="1000" _gui-text="Major Angular Division Thickness (px):">2</param>
-  <param name="a_subdivs_th" type="float" min="0" max="1000" _gui-text="Minor Angular Division Thickness (px):">1</param>
+  <param name="tab" type="notebook">
+    <page name="circular_div" _gui-text="Circular Divisions">
+      <param name="r_divs"       type="int"   min="1" max="1000" _gui-text="Major Circular Divisions:">5</param>
+      <param name="dr"           type="float" min="1" max="1000" _gui-text="Major Circular Division Spacing (px):">50.0</param>
+      <param name="r_subdivs"    type="int"   min="1" max="1000" _gui-text="Subdivisions per Major Circular Division:">3</param>
+      <param name="r_log"        type="boolean"                  _gui-text="Logarithmic Subdiv. (Base given by entry above)">false</param>
+      <param name="r_divs_th"    type="float" min="0" max="1000" _gui-text="Major Circular Division Thickness (px):">2</param>
+      <param name="r_subdivs_th" type="float" min="0" max="1000" _gui-text="Minor Circular Division Thickness (px):">1</param>
+    </page>
+    <page name="angular_div" _gui-text="Angular Divisions">
+      <param name="a_divs"       type="int"   min="1" max="1000" _gui-text="Angle Divisions:">24</param>
+      <param name="a_divs_cent"  type="int"   min="1" max="1000" _gui-text="Angle Divisions at Centre:">4</param>
+      <param name="a_subdivs"    type="int"   min="1" max="1000" _gui-text="Subdivisions per Major Angular Division:">1</param>
+      <param name="a_subdivs_cent"  type="int"   min="0" max="1000" _gui-text="Minor Angle Division End 'n' Divs. Before Centre:">2</param>
+      <param name="a_divs_th"    type="float" min="0" max="1000" _gui-text="Major Angular Division Thickness (px):">2</param>
+      <param name="a_subdivs_th" type="float" min="0" max="1000" _gui-text="Minor Angular Division Thickness (px):">1</param>
+    </page>
+  </param>
     
   <effect>
     <object-type>all</object-type>
diff --git a/share/extensions/grid_polar.py b/share/extensions/grid_polar.py
index f3d5dbf41..c5a7e7062 100755
--- a/share/extensions/grid_polar.py
+++ b/share/extensions/grid_polar.py
@@ -54,6 +54,9 @@ def draw_SVG_label_centred(x, y, string, font_size, 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="circular_div") 
         self.OptionParser.add_option("--r_divs",
                         action="store", type="int", 
                         dest="r_divs", default=5,
-- 
cgit v1.2.3