diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-23 18:25:55 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-05-23 18:25:55 +0000 |
| commit | 50194a75368e2ccbea4a0aeb457e658d3f12e4b9 (patch) | |
| tree | be2543313afffdc58aca2603591f06d811bc04a0 | |
| parent | Fixing pointwise (diff) | |
| parent | extensions. dxf input. create new layer if not previously declared (Bug 1472429) (diff) | |
| download | inkscape-50194a75368e2ccbea4a0aeb457e658d3f12e4b9.tar.gz inkscape-50194a75368e2ccbea4a0aeb457e658d3f12e4b9.zip | |
update to trunk
(bzr r13645.1.142)
| -rwxr-xr-x | share/extensions/dxf_input.py | 3 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
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']]: 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 = " <toolitem action='EraserModeAction' />" " <separator />" " <toolitem action='EraserWidthAction' />" - " <toolitem action='EraserBreakAppart' />" " <separator />" " <toolitem action='EraserMassAction' />" + " <separator />" + " <toolitem action='EraserBreakAppart' />" " </toolbar>" " <toolbar name='TextToolbar'>" |