From 9de5efeeb21ebf7af3bff18ef5108ebaafe98fbc Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 22 May 2016 02:49:33 +0200 Subject: Reorder eraser toolbox widgets (bzr r14909) --- src/widgets/toolbox.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index f7b5e585f..8113c9619 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -499,9 +499,10 @@ static gchar const * ui_descr = " " " " " " - " " " " " " + " " + " " " " " " -- cgit v1.2.3 From c2ef91178c8773f79aebee12cf778845708448be Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Sun, 22 May 2016 14:52:37 -0400 Subject: extensions. dxf input. create new layer if not previously declared (Bug 1472429) Fixed bugs: - https://launchpad.net/bugs/1472429 (bzr r14910) --- share/extensions/dxf_input.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/extensions/dxf_input.py b/share/extensions/dxf_input.py index 30adb73f9..caeee6679 100755 --- a/share/extensions/dxf_input.py +++ b/share/extensions/dxf_input.py @@ -482,6 +482,9 @@ while line[0] and (line[1] != 'ENDSEC' or not inENTITIES): elif vals[groups['8']]: # use Common Layer Name if not vals[groups['8']][0]: vals[groups['8']][0] = '0' # use default name + if not layer_nodes.has_key(vals[groups['8']][0]): + attribs = {inkex.addNS('groupmode','inkscape'): 'layer', inkex.addNS('label','inkscape'): '%s' % vals[groups['8']][0]} + layer_nodes[vals[groups['8']][0]] = inkex.etree.SubElement(doc.getroot(), 'g', attribs) layer = layer_nodes[vals[groups['8']][0]] color = '#000000' # default color if vals[groups['8']]: -- cgit v1.2.3