From 512c3411648b24505165d555a04e82ba689f8aed Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Sun, 19 Aug 2018 22:14:10 -0400
Subject: integrate inx generation into ink/stitch proper

---
 templates/object_commands.inx | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 templates/object_commands.inx

(limited to 'templates/object_commands.inx')

diff --git a/templates/object_commands.inx b/templates/object_commands.inx
new file mode 100644
index 00000000..bba8602b
--- /dev/null
+++ b/templates/object_commands.inx
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Attach Commands</_name>
+    <id>org.inkstitch.commands</id>
+    <dependency type="executable" location="extensions">inkstitch.py</dependency>
+    <dependency type="executable" location="extensions">inkex.py</dependency>
+    <param name="fill_start" type="boolean" _gui-text="Fill stitch starting position">false</param>
+    <param name="fill_end" type="boolean" _gui-text="Fill stitch ending position">false</param>
+    <param name="stop" type="boolean" _gui-text="Stop after sewing this object">false</param>
+    <param name="trim" type="boolean" _gui-text="Trim thread after sewing this object">false</param>
+    <param name="ignore_object" type="boolean" _gui-text="Ignore this object (do not stitch)">false</param>
+    <param name="extension" type="string" gui-hidden="true">object_commands</param>
+    <effect>
+        <object-type>all</object-type>
+        <effects-menu>
+            <submenu _name="Embroidery" />
+        </effects-menu>
+    </effect>
+    <script>
+        <command reldir="extensions" interpreter="python">inkstitch.py</command>
+    </script>
+</inkscape-extension>
-- 
cgit v1.2.3


From 871358d990d4a06b2eaaf0e405f2d18e26753d52 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 20 Aug 2018 15:49:19 -0400
Subject: gettextify INX templates

---
 templates/object_commands.inx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'templates/object_commands.inx')

diff --git a/templates/object_commands.inx b/templates/object_commands.inx
index bba8602b..71f9d0b3 100644
--- a/templates/object_commands.inx
+++ b/templates/object_commands.inx
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Attach Commands</_name>
+    <name>{% trans %}Attach Commands{% endtrans %}</name>
     <id>org.inkstitch.commands</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
-    <param name="fill_start" type="boolean" _gui-text="Fill stitch starting position">false</param>
-    <param name="fill_end" type="boolean" _gui-text="Fill stitch ending position">false</param>
-    <param name="stop" type="boolean" _gui-text="Stop after sewing this object">false</param>
-    <param name="trim" type="boolean" _gui-text="Trim thread after sewing this object">false</param>
-    <param name="ignore_object" type="boolean" _gui-text="Ignore this object (do not stitch)">false</param>
-    <param name="extension" type="string" gui-hidden="true">object_commands</param>
+    {% for command, description in object_commands %}
+    <param name="{{ object }}" type="boolean" gui-text="{{ _(description ) }}">false</param>
+    {% endfor %}
     <effect>
         <object-type>all</object-type>
         <effects-menu>
-            <submenu _name="Embroidery" />
+            <submenu name="Ink/Stitch" />
         </effects-menu>
     </effect>
     <script>
-- 
cgit v1.2.3


From a2cad1f522074b84895897632ac69dcb5deda340 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Mon, 20 Aug 2018 20:42:02 -0400
Subject: generate INX files for all languages

---
 templates/object_commands.inx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'templates/object_commands.inx')

diff --git a/templates/object_commands.inx b/templates/object_commands.inx
index 71f9d0b3..024a694b 100644
--- a/templates/object_commands.inx
+++ b/templates/object_commands.inx
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Attach Commands{% endtrans %}</name>
-    <id>org.inkstitch.commands</id>
+    <name>{% trans %}Attach Commands{% endtrans %}</_name>
+    <id>org.inkstitch.commands.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     {% for command, description in object_commands %}
-    <param name="{{ object }}" type="boolean" gui-text="{{ _(description ) }}">false</param>
+    <param name="{{ object }}" type="boolean" _gui-text="{{ _(description ) }}">false</param>
     {% endfor %}
     <effect>
         <object-type>all</object-type>
-        <effects-menu>
-            <submenu name="Ink/Stitch" />
-        </effects-menu>
+        <submenu name="Ink/Stitch">
+            <submenu name="Ink/Stitch">
+                <submenu name="{% trans %}English{% endtrans %}" />
+            </submenu>
+        </submenu>
     </effect>
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
-- 
cgit v1.2.3


From 8f700007fc7d3b7866d4e4a3dac6a36bb3e1be2a Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Tue, 21 Aug 2018 16:37:47 -0400
Subject: fix leftover </_name>

---
 templates/object_commands.inx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/object_commands.inx')

diff --git a/templates/object_commands.inx b/templates/object_commands.inx
index 024a694b..5807dc47 100644
--- a/templates/object_commands.inx
+++ b/templates/object_commands.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Attach Commands{% endtrans %}</_name>
+    <name>{% trans %}Attach Commands{% endtrans %}</name>
     <id>org.inkstitch.commands.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
-- 
cgit v1.2.3


From d2f16f0666e4e294b5050a5e70449da8c23b9ea2 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Thu, 23 Aug 2018 20:53:30 -0400
Subject: fix layer and object commands templates

---
 templates/object_commands.inx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'templates/object_commands.inx')

diff --git a/templates/object_commands.inx b/templates/object_commands.inx
index 5807dc47..6de2a3fc 100644
--- a/templates/object_commands.inx
+++ b/templates/object_commands.inx
@@ -5,15 +5,16 @@
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
     {% for command, description in object_commands %}
-    <param name="{{ object }}" type="boolean" _gui-text="{{ _(description ) }}">false</param>
+    <param name="{{ command }}" type="boolean" _gui-text="{{ _(description ) }}">false</param>
     {% endfor %}
+    <param name="extension" type="string" gui-hidden="true">object_commands</param>
     <effect>
         <object-type>all</object-type>
-        <submenu name="Ink/Stitch">
+        <effects-menu>
             <submenu name="Ink/Stitch">
                 <submenu name="{% trans %}English{% endtrans %}" />
             </submenu>
-        </submenu>
+        </effects-menu>
     </effect>
     <script>
         <command reldir="extensions" interpreter="python">inkstitch.py</command>
-- 
cgit v1.2.3


From 53f92df05635668783a6b9407a01326de14a1291 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Fri, 24 Aug 2018 16:29:13 -0400
Subject: add 'Add Commands' extension

---
 templates/object_commands.inx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'templates/object_commands.inx')

diff --git a/templates/object_commands.inx b/templates/object_commands.inx
index 6de2a3fc..68535db2 100644
--- a/templates/object_commands.inx
+++ b/templates/object_commands.inx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <name>{% trans %}Attach Commands{% endtrans %}</name>
+    <name>{% trans %}Attach Commands to Selected Objects{% endtrans %}</name>
     <id>org.inkstitch.commands.{{ locale }}</id>
     <dependency type="executable" location="extensions">inkstitch.py</dependency>
     <dependency type="executable" location="extensions">inkex.py</dependency>
@@ -12,7 +12,9 @@
         <object-type>all</object-type>
         <effects-menu>
             <submenu name="Ink/Stitch">
-                <submenu name="{% trans %}English{% endtrans %}" />
+                <submenu name="{% trans %}English{% endtrans %}">
+                    <submenu name="{% trans %}Commands{% endtrans %}" />
+                </submenu>
             </submenu>
         </effects-menu>
     </effect>
-- 
cgit v1.2.3