Replace guides creator with upstream guides creator version 2.31.

(bzr r10193.1.1)

1 files changed, 83 insertions, 34 deletions

diff --git a/share/extensions/guides_creator.inx b/share/extensions/guides_creator.inx
index 11aa84e11..34eef4fb3 100644
--- a/share/extensions/guides_creator.inx
+++ b/share/extensions/guides_creator.inx
@@ -1,44 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+<inkscape-extension>
 	<_name>Guides creator</_name>
 	<id>org.inkscape.effect.guidescreator</id>
 	<dependency type="executable" location="extensions">guides_creator.py</dependency>
 	<dependency type="executable" location="extensions">inkex.py</dependency>
-	<param name="preset" type="enum" _gui-text="Preset:">
-		<_item value="custom">Custom...</_item>
-        <_item value="golden">Golden ratio</_item>
-        <_item value="3;3">Rule-of-third</_item>
-    </param>
-    <param name="vertical_guides" type="enum" _gui-text="Vertical guide each:">
-		<_item value="0">None</_item>
-		<_item value="2">1/2</_item>
-		<_item value="3">1/3</_item>
-        <_item value="4">1/4</_item>
-		<_item value="5">1/5</_item>
-		<_item value="6">1/6</_item>
-		<_item value="7">1/7</_item>
-		<_item value="8">1/8</_item>
-        <_item value="9">1/9</_item>
-		<_item value="10">1/10</_item>
-	</param>
-	<param name="horizontal_guides" type="enum" _gui-text="Horizontal guide each:">
-		<_item value="0">None</_item>
-		<_item value="2">1/2</_item>
-		<_item value="3">1/3</_item>
-        <_item value="4">1/4</_item>
-		<_item value="5">1/5</_item>
-		<_item value="6">1/6</_item>
-		<_item value="7">1/7</_item>
-		<_item value="8">1/8</_item>
-        <_item value="9">1/9</_item>
-		<_item value="10">1/10</_item>
-	</param>
-    <param name="start_from_edges" type="boolean" _gui-text="Start from edges">false</param>
-	<param name="delete_existing_guides" type="boolean" _gui-text="Delete existing guides">false</param>
+        <param name="tab" type="notebook">
+        	<page name="regular_guides" _gui-text="Regular guides">
+                	<param name="guides_preset" type="enum" appearance="minimal" _gui-text="Guides preset">
+                		<item value="custom">Custom...</item>
+                                <item value="golden">Golden ratio</item>
+                                <item value="3;3">Rule-of-third</item>
+                        </param>
+                        <param name="vertical_guides"  type="int"   min="1" max="100" _gui-text="Columns">2</param>
+                        <param name="horizontal_guides"  type="int"   min="1" max="100" _gui-text="Rows">3</param>
+                        <param name="start_from_edges" type="boolean" _gui-text="Start from edges">false</param>
+                	<param name="delete_existing_guides" type="boolean" _gui-text="Delete existing guides">false</param>
+                </page>
+                <page name="diagonal_guides" _gui-text="Diagonal guides">
+                        <param name="ul" type="boolean" _gui-text="Upper left corner">false</param>
+                	<param name="ur" type="boolean" _gui-text="Upper right corner">false</param>
+                        <param name="ll" type="boolean" _gui-text="Lower left corner">false</param>
+                	<param name="lr" type="boolean" _gui-text="Lower right corner">false</param>
+                        <param name="delete_existing_guides2" type="boolean" _gui-text="Delete existing guides">false</param>
+                </page>
+                <page name="margins" _gui-text="Margins">
+                       <param name="margins_preset" type="enum" appearance="minimal" _gui-text="Margins preset">
+                                <item value="custom">Custom...</item>
+                                <item value="book_left">Left book page</item>
+                                <item value="book_right">Right book page</item>
+                        </param>
+                        <param name="header_margin" type="enum" appearance="minimal" _gui-text="Header margin">
+                		<item value="10">1/10</item>
+                                <item value="9">1/9</item>
+                		<item value="8">1/8</item>
+                		<item value="7">1/7</item>
+                		<item value="6">1/6</item>
+                		<item value="5">1/5</item>
+                                <item value="4">1/4</item>
+                		<item value="3">1/3</item>
+                		<item value="2">1/2</item>
+                		<item value="0">None</item>
+                	</param>
+                        <param name="footer_margin" type="enum" appearance="minimal" _gui-text="Footer margin">
+                		<item value="10">1/10</item>
+                                <item value="9">1/9</item>
+                		<item value="8">1/8</item>
+                		<item value="7">1/7</item>
+                		<item value="6">1/6</item>
+                		<item value="5">1/5</item>
+                                <item value="4">1/4</item>
+                		<item value="3">1/3</item>
+                		<item value="2">1/2</item>
+                		<item value="0">None</item>
+                	</param>
+                        <param name="left_margin" type="enum" appearance="minimal" _gui-text="Left margin">
+                		<item value="10">1/10</item>
+                                <item value="9">1/9</item>
+                		<item value="8">1/8</item>
+                		<item value="7">1/7</item>
+                		<item value="6">1/6</item>
+                		<item value="5">1/5</item>
+                                <item value="4">1/4</item>
+                		<item value="3">1/3</item>
+                		<item value="2">1/2</item>
+                		<item value="0">None</item>
+                	</param>
+                        <param name="right_margin" type="enum" appearance="minimal" _gui-text="Right margin">
+                		<item value="10">1/10</item>
+                                <item value="9">1/9</item>
+                		<item value="8">1/8</item>
+                		<item value="7">1/7</item>
+                		<item value="6">1/6</item>
+                		<item value="5">1/5</item>
+                                <item value="4">1/4</item>
+                		<item value="3">1/3</item>
+                		<item value="2">1/2</item>
+                		<item value="0">None</item>
+                	</param>
+                        
+                        <param name="vertical_subdivisions"  type="int"   min="1" max="100" _gui-text="Columns">2</param>
+                        <param name="horizontal_subdivisions"  type="int"   min="1" max="100" _gui-text="Rows">3</param>
+                        <param name="start_from_edges2" type="boolean" _gui-text="Start from edges">false</param>
+                        <param name="delete_existing_guides3" type="boolean" _gui-text="Delete existing guides">false</param>
+                
+                </page>
+        </param>
 	<effect>
 		<object-type>all</object-type>
 		<effects-menu>
-			 <submenu _name="Render"/>
+			 <submenu _name="Guides"/>
 		</effects-menu>
 	</effect>
 	<script>