From 0e578d675c248ea139147cd934970efb8c7b8fc9 Mon Sep 17 00:00:00 2001 From: Alexis Deveria Date: Thu, 29 Oct 2009 19:43:34 +0000 Subject: [PATCH] Fixed issues 269 and 307, added clone SVG icon git-svn-id: http://svg-edit.googlecode.com/svn/trunk@888 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/images/svg_edit_icons.svg | 24 ++++++++++++++++++++++++ editor/locale/lang.en.js | 4 ++-- editor/svg-editor-svgicons.html | 16 +++++++++++----- editor/svg-editor.html | 4 ++-- editor/svgcanvas.js | 5 +++++ 5 files changed, 44 insertions(+), 9 deletions(-) diff --git a/editor/images/svg_edit_icons.svg b/editor/images/svg_edit_icons.svg index 20fb2d0f..1123591b 100644 --- a/editor/images/svg_edit_icons.svg +++ b/editor/images/svg_edit_icons.svg @@ -280,6 +280,30 @@ + + + + + + + + + + + + + + + + Layer 1 + + + + + + + + \ No newline at end of file diff --git a/editor/locale/lang.en.js b/editor/locale/lang.en.js index 6bf9682f..a10547a3 100644 --- a/editor/locale/lang.en.js +++ b/editor/locale/lang.en.js @@ -92,8 +92,8 @@ {"id":"layersLable","textContent":"Layers:"}, {"id":"selectedPredefined","textContent":"Select predefined:"}, {"id":"fitToContent","textContent":"Fit to Content"}, -{"id":"tool_source_save","textContent":"Save"}, -{"id":"tool_docprops_save","textContent":"Save"}, +{"id":"tool_source_save","textContent":"Apply Changes"}, +{"id":"tool_docprops_save","textContent":"OK"}, {"id":"tool_docprops_cancel","textContent":"Cancel"}, {"id":"tool_source_cancel","textContent":"Cancel"}, {"id":"fit_to_all","textContent":"Fit to all content"}, diff --git a/editor/svg-editor-svgicons.html b/editor/svg-editor-svgicons.html index b37cf882..3f71c6df 100644 --- a/editor/svg-editor-svgicons.html +++ b/editor/svg-editor-svgicons.html @@ -55,7 +55,10 @@ $(function() { 'text':'text.png', 'image':'image.png', 'zoom':'zoom.png', - 'arrow_right':'flyouth.png', + + 'clone':'clone.png', + + 'arrow_right':'flyouth.png' }, placement: { '#tool_clear':'new_image', @@ -76,6 +79,9 @@ $(function() { '#tool_text':'text', '#tool_image':'image', '#tool_zoom':'zoom', + + '#tool_clone,#tool_clone_multi,#tool_node_clone':'clone', + '.flyout_arrow_horiz':'arrow_right' }, callback: function() { @@ -168,7 +174,7 @@ script type="text/javascript" src="locale/locale.min.js">
| - Copy +
Delete | Top @@ -197,7 +203,7 @@ script type="text/javascript" src="locale/locale.min.js">
| - Clone +
Delete | Group @@ -315,7 +321,7 @@ script type="text/javascript" src="locale/locale.min.js"> - Clone +
Delete
@@ -426,7 +432,7 @@ script type="text/javascript" src="locale/locale.min.js">
- + diff --git a/editor/svg-editor.html b/editor/svg-editor.html index dc9f4ba4..d01f8e45 100644 --- a/editor/svg-editor.html +++ b/editor/svg-editor.html @@ -347,7 +347,7 @@ script type="text/javascript" src="locale/locale.min.js">
- +
@@ -360,7 +360,7 @@ script type="text/javascript" src="locale/locale.min.js">
- + diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js index 82b25467..b69fd46f 100644 --- a/editor/svgcanvas.js +++ b/editor/svgcanvas.js @@ -1041,6 +1041,11 @@ function BatchCommand(text) { var svgCanvasToString = function() { removeUnusedGrads(); canvas.clearPath(true); + $.each(svgcontent.childNodes, function(i, node) { + if(i && node.nodeType == 8 && node.data.indexOf('Created with') != -1) { + svgcontent.insertBefore(node, svgcontent.firstChild); + } + }); svgcontent.removeAttribute('id'); var output = svgToString(svgcontent, 0); svgcontent.id = 'svgcontent';