Merge remote-tracking branch 'origin/master' into simulator-timeline

1 files changed, 36 insertions, 29 deletions

diff --git a/lib/extensions/object_commands.py b/lib/extensions/object_commands.py
index 27a07969..e678890d 100644
--- a/lib/extensions/object_commands.py
+++ b/lib/extensions/object_commands.py
@@ -1,20 +1,15 @@
-import os
-import sys
 import inkex
-import simpletransform
-import cubicsuperpath
 from random import random
-from shapely import geometry as shgeo
 
 from .commands import CommandsExtension
+from ..commands import OBJECT_COMMANDS, get_command_description
 from ..i18n import _
-from ..elements import SatinColumn
-from ..svg.tags import SVG_GROUP_TAG, SVG_USE_TAG, SVG_PATH_TAG, INKSCAPE_GROUPMODE, XLINK_HREF, CONNECTION_START, CONNECTION_END, CONNECTOR_TYPE
+from ..svg.tags import SVG_PATH_TAG, CONNECTION_START, CONNECTION_END, CONNECTOR_TYPE, INKSCAPE_LABEL, SVG_GROUP_TAG, SVG_USE_TAG, XLINK_HREF
 from ..svg import get_correction_transform
 
 
 class ObjectCommands(CommandsExtension):
-    COMMANDS = ["fill_start", "fill_end", "stop", "trim", "ignore_object"]
+    COMMANDS = OBJECT_COMMANDS
 
     def add_connector(self, symbol, element):
         # I'd like it if I could position the connector endpoint nicely but inkscape just
@@ -23,18 +18,20 @@ class ObjectCommands(CommandsExtension):
         end_pos = element.shape.centroid
 
         path = inkex.etree.Element(SVG_PATH_TAG,
-            {
-                "id": self.uniqueId("connector"),
-                "d": "M %s,%s %s,%s" % (start_pos[0], start_pos[1], end_pos.x, end_pos.y),
-                "style": "stroke:#000000;stroke-width:1px;stroke-opacity:0.5;fill:none;",
-                "transform": get_correction_transform(symbol),
-                CONNECTION_START: "#%s" % symbol.get('id'),
-                CONNECTION_END: "#%s" % element.node.get('id'),
-                CONNECTOR_TYPE: "polyline",
-            }
-        )
+                                   {
+                                       "id": self.uniqueId("connector"),
+                                       "d": "M %s,%s %s,%s" % (start_pos[0], start_pos[1], end_pos.x, end_pos.y),
+                                       "style": "stroke:#000000;stroke-width:1px;stroke-opacity:0.5;fill:none;",
+                                       CONNECTION_START: "#%s" % symbol.get('id'),
+                                       CONNECTION_END: "#%s" % element.node.get('id'),
+                                       CONNECTOR_TYPE: "polyline",
+
+                                       # l10n: the name of the line that connects a command to the object it applies to
+                                       INKSCAPE_LABEL: _("connector")
+                                   }
+                                   )
 
-        symbol.getparent().insert(symbol.getparent().index(symbol), path)
+        symbol.getparent().insert(0, path)
 
     def get_command_pos(self, element, index, total):
         # Put command symbols 30 pixels out from the shape, spaced evenly around it.
@@ -71,18 +68,28 @@ class ObjectCommands(CommandsExtension):
 
             pos = self.get_command_pos(element, i, len(commands))
 
-            symbol = inkex.etree.SubElement(element.node.getparent(), SVG_USE_TAG,
-                {
-                    "id": self.uniqueId("use"),
-                    XLINK_HREF: "#inkstitch_%s" % command,
-                    "height": "100%",
-                    "width": "100%",
-                    "x": str(pos.x),
-                    "y": str(pos.y),
-                    "transform": get_correction_transform(element.node)
-                }
+            group = inkex.etree.SubElement(element.node.getparent(), SVG_GROUP_TAG,
+                                           {
+                "id": self.uniqueId("group"),
+                INKSCAPE_LABEL: _("Ink/Stitch Command") + ": %s" % get_command_description(command),
+                "transform": get_correction_transform(element.node)
+            }
             )
 
+            symbol = inkex.etree.SubElement(group, SVG_USE_TAG,
+                                            {
+                                                "id": self.uniqueId("use"),
+                                                XLINK_HREF: "#inkstitch_%s" % command,
+                                                "height": "100%",
+                                                "width": "100%",
+                                                "x": str(pos.x),
+                                                "y": str(pos.y),
+
+                                                # l10n: the name of a command symbol (example: scissors icon for trim command)
+                                                INKSCAPE_LABEL: _("command marker"),
+                                            }
+                                            )
+
             self.add_connector(symbol, element)
 
     def effect(self):