diff --git a/src/editor/extensions/ext-star/ext-star.js b/src/editor/extensions/ext-star/ext-star.js index 2778106a..8acbcb58 100644 --- a/src/editor/extensions/ext-star/ext-star.js +++ b/src/editor/extensions/ext-star/ext-star.js @@ -77,18 +77,13 @@ export default { return 1 / Math.cos(n); } */ - const buttons = [{ + const events = { id: 'tool_star', - icon: 'star.png', - type: 'mode', - position: 12, - events: { - click () { - showPanel(true); - svgCanvas.setMode('star'); - } + click () { + showPanel(true); + svgCanvas.setMode('star'); } - }]; + }; const contextTools = [{ type: 'input', panel: 'star_panel', @@ -120,12 +115,8 @@ export default { }]; return { - newUI: true, name: strings.name, - svgicons: 'star-icons.svg', - buttons: strings.buttons.map((button, i) => { - return Object.assign(buttons[i], button); - }), + events, context_tools: strings.contextTools.map((contextTool, i) => { return Object.assign(contextTools[i], contextTool); }), diff --git a/src/editor/images/README.txt b/src/editor/images/README.txt deleted file mode 100644 index 7c5b5739..00000000 --- a/src/editor/images/README.txt +++ /dev/null @@ -1,60 +0,0 @@ -filename origin - -align-bottom.png http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-vertical-bottom.png -align-bottom.svg http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-vertical-bottom.svg -align-center.png http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-horizontal-center.png -align-center.svg http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-horizontal-center.svg -align-left.png http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-horizontal-left.png -align-left.svg http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-horizontal-left.svg -align-middle.png http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-vertical-center.png -align-middle.svg http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-vertical-center.svg -align-right.png http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-horizontal-right.png -align-right.svg http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-horizontal-right.svg -align-top.png http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-vertical-top.png -align-top.svg http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/actions/align-vertical-top.svg -bold.png -cancel.png -circle.png -clear.png -clone.png -copy.png -cut.png -delete.png -document-properties.png -dropdown.gif -ellipse.png -eye.png -flyouth.png -flyup.gif -freehand-circle.png -freehand-square.png -go-down.png -go-up.png -image.png -italic.png -line.png -logo.png -logo.svg -move_bottom.png -move_top.png -none.png -open.png -paste.png -path.png -polygon.png https://github.com/SVG-Edit/svgedit/issues/377 -polygon.svg https://github.com/SVG-Edit/svgedit/issues/377 -rect.png -redo.png -rotate.png -save.png -select.png -sep.png -shape_group_elements.png -shape_ungroup.png -source.png -square.png -text.png http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/tools/draw-text.png -text.svg http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/tools/draw-text.svg -undo.png -view-refresh.png -zoom.png http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/tools/page-magnifier.png diff --git a/src/editor/images/add_subpath.png b/src/editor/images/add_subpath.png deleted file mode 100644 index a025a78d..00000000 Binary files a/src/editor/images/add_subpath.png and /dev/null differ diff --git a/src/editor/images/add_subpath.svg b/src/editor/images/add_subpath.svg new file mode 100644 index 00000000..8de2b81a --- /dev/null +++ b/src/editor/images/add_subpath.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/align-bottom.png b/src/editor/images/align-bottom.png deleted file mode 100644 index b60fa558..00000000 Binary files a/src/editor/images/align-bottom.png and /dev/null differ diff --git a/src/editor/images/align-middle.png b/src/editor/images/align-middle.png deleted file mode 100644 index 4d945f9e..00000000 Binary files a/src/editor/images/align-middle.png and /dev/null differ diff --git a/src/editor/images/align-right.png b/src/editor/images/align-right.png deleted file mode 100644 index 2dc83ae4..00000000 Binary files a/src/editor/images/align-right.png and /dev/null differ diff --git a/src/editor/images/align-top.png b/src/editor/images/align-top.png deleted file mode 100644 index 5252723b..00000000 Binary files a/src/editor/images/align-top.png and /dev/null differ diff --git a/src/editor/images/align.png b/src/editor/images/align.png deleted file mode 100644 index a0fc147b..00000000 Binary files a/src/editor/images/align.png and /dev/null differ diff --git a/src/editor/images/align_center.png b/src/editor/images/align_center.png deleted file mode 100644 index b155461c..00000000 Binary files a/src/editor/images/align_center.png and /dev/null differ diff --git a/src/editor/images/angle.png b/src/editor/images/angle.png deleted file mode 100644 index e054a678..00000000 Binary files a/src/editor/images/angle.png and /dev/null differ diff --git a/src/editor/images/arrow_down.svg b/src/editor/images/arrow_down.svg new file mode 100644 index 00000000..15dfc805 --- /dev/null +++ b/src/editor/images/arrow_down.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/editor/images/arrow_right.png b/src/editor/images/arrow_right.png deleted file mode 100644 index 3d7a1971..00000000 Binary files a/src/editor/images/arrow_right.png and /dev/null differ diff --git a/src/editor/images/arrow_right.svg b/src/editor/images/arrow_right.svg new file mode 100644 index 00000000..c6fd63c8 --- /dev/null +++ b/src/editor/images/arrow_right.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/editor/images/arrow_right_big.png b/src/editor/images/arrow_right_big.png deleted file mode 100644 index a4847946..00000000 Binary files a/src/editor/images/arrow_right_big.png and /dev/null differ diff --git a/src/editor/images/arrow_right_big.svg b/src/editor/images/arrow_right_big.svg new file mode 100644 index 00000000..8b342985 --- /dev/null +++ b/src/editor/images/arrow_right_big.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/editor/images/c_radius.png b/src/editor/images/c_radius.png deleted file mode 100644 index f0f3a522..00000000 Binary files a/src/editor/images/c_radius.png and /dev/null differ diff --git a/src/editor/images/cancel.png b/src/editor/images/cancel.png deleted file mode 100644 index 5ee3057e..00000000 Binary files a/src/editor/images/cancel.png and /dev/null differ diff --git a/src/editor/images/clear.png b/src/editor/images/clear.png deleted file mode 100644 index 6bc5396e..00000000 Binary files a/src/editor/images/clear.png and /dev/null differ diff --git a/src/editor/images/close_path.svg b/src/editor/images/close_path.svg new file mode 100644 index 00000000..1f54dcac --- /dev/null +++ b/src/editor/images/close_path.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/closepath.png b/src/editor/images/closepath.png deleted file mode 100644 index 7364bfc3..00000000 Binary files a/src/editor/images/closepath.png and /dev/null differ diff --git a/src/editor/images/docprops.svg b/src/editor/images/docprops.svg new file mode 100644 index 00000000..8014603b --- /dev/null +++ b/src/editor/images/docprops.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/foreignobject-icons.xml b/src/editor/images/edit_foreign.svg similarity index 66% rename from src/editor/images/foreignobject-icons.xml rename to src/editor/images/edit_foreign.svg index d5cb7e61..fb2eed26 100644 --- a/src/editor/images/foreignobject-icons.xml +++ b/src/editor/images/edit_foreign.svg @@ -1,38 +1,3 @@ - - - - - - - - - - - - - - - - - - - @@ -89,8 +54,4 @@ - - - - - + \ No newline at end of file diff --git a/src/editor/images/eye.svg b/src/editor/images/eye.svg new file mode 100644 index 00000000..73d984df --- /dev/null +++ b/src/editor/images/eye.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/globe_link.svg b/src/editor/images/globe_link.svg new file mode 100644 index 00000000..c27c7b63 --- /dev/null +++ b/src/editor/images/globe_link.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/group_elements.png b/src/editor/images/group_elements.png deleted file mode 100644 index 5dbd1ce8..00000000 Binary files a/src/editor/images/group_elements.png and /dev/null differ diff --git a/src/editor/images/import.svg b/src/editor/images/import.svg new file mode 100644 index 00000000..623cbb3e --- /dev/null +++ b/src/editor/images/import.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/link_controls.svg b/src/editor/images/link_controls.svg new file mode 100644 index 00000000..566ab0fc --- /dev/null +++ b/src/editor/images/link_controls.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/editor/images/mathjax-icons.xml b/src/editor/images/mathjax-icons.xml deleted file mode 100644 index 13f6557f..00000000 --- a/src/editor/images/mathjax-icons.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/editor/images/move_bottom.svg b/src/editor/images/move_bottom.svg new file mode 100644 index 00000000..ecbc2d6f --- /dev/null +++ b/src/editor/images/move_bottom.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/move_top.png b/src/editor/images/move_top.png deleted file mode 100644 index aa8f01f0..00000000 Binary files a/src/editor/images/move_top.png and /dev/null differ diff --git a/src/editor/images/no_color.svg b/src/editor/images/no_color.svg new file mode 100644 index 00000000..330170b5 --- /dev/null +++ b/src/editor/images/no_color.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/editor/images/node_clone.png b/src/editor/images/node_clone.png deleted file mode 100755 index 8a3c8abb..00000000 Binary files a/src/editor/images/node_clone.png and /dev/null differ diff --git a/src/editor/images/node_clone.svg b/src/editor/images/node_clone.svg new file mode 100644 index 00000000..f040d0ba --- /dev/null +++ b/src/editor/images/node_clone.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/node_delete.png b/src/editor/images/node_delete.png deleted file mode 100755 index f5cb8c80..00000000 Binary files a/src/editor/images/node_delete.png and /dev/null differ diff --git a/src/editor/images/node_delete.svg b/src/editor/images/node_delete.svg new file mode 100644 index 00000000..1203dbea --- /dev/null +++ b/src/editor/images/node_delete.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/opacity.png b/src/editor/images/opacity.png deleted file mode 100644 index a141a7ac..00000000 Binary files a/src/editor/images/opacity.png and /dev/null differ diff --git a/src/editor/images/opacity.svg b/src/editor/images/opacity.svg new file mode 100644 index 00000000..cf9f8a83 --- /dev/null +++ b/src/editor/images/opacity.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/open.png b/src/editor/images/open.png deleted file mode 100644 index 0bf8ce0f..00000000 Binary files a/src/editor/images/open.png and /dev/null differ diff --git a/src/editor/images/open_path.svg b/src/editor/images/open_path.svg new file mode 100644 index 00000000..1fc258ca --- /dev/null +++ b/src/editor/images/open_path.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/paste.png b/src/editor/images/paste.png deleted file mode 100644 index 9b3bcd1c..00000000 Binary files a/src/editor/images/paste.png and /dev/null differ diff --git a/src/editor/images/placemark.png b/src/editor/images/placemark.png deleted file mode 100644 index 0756c598..00000000 Binary files a/src/editor/images/placemark.png and /dev/null differ diff --git a/src/editor/images/polygon.svg b/src/editor/images/polygon.svg index 732fa814..590101d3 100644 --- a/src/editor/images/polygon.svg +++ b/src/editor/images/polygon.svg @@ -1,14 +1,9 @@ - - - - + + - - - - + diff --git a/src/editor/images/rotate.png b/src/editor/images/rotate.png deleted file mode 100644 index c73420fe..00000000 Binary files a/src/editor/images/rotate.png and /dev/null differ diff --git a/src/editor/images/save.svg b/src/editor/images/save.svg new file mode 100644 index 00000000..aedde9ad --- /dev/null +++ b/src/editor/images/save.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/shape_group_elements.png b/src/editor/images/shape_group_elements.png deleted file mode 100644 index a6e0fcd2..00000000 Binary files a/src/editor/images/shape_group_elements.png and /dev/null differ diff --git a/src/editor/images/shape_ungroup.png b/src/editor/images/shape_ungroup.png deleted file mode 100644 index d694bcb3..00000000 Binary files a/src/editor/images/shape_ungroup.png and /dev/null differ diff --git a/src/editor/images/shapes.png b/src/editor/images/shapes.png deleted file mode 100644 index 1c303048..00000000 Binary files a/src/editor/images/shapes.png and /dev/null differ diff --git a/src/editor/images/spinbtn_updn_big.png b/src/editor/images/spinbtn_updn_big.png deleted file mode 100644 index f6a4481e..00000000 Binary files a/src/editor/images/spinbtn_updn_big.png and /dev/null differ diff --git a/src/editor/images/star.svg b/src/editor/images/star.svg index 0f429f2d..4f2d1c88 100644 --- a/src/editor/images/star.svg +++ b/src/editor/images/star.svg @@ -1,14 +1,7 @@ - - - - - - - - - - - - - + + + + Layer 1 + + diff --git a/src/editor/images/stroke.png b/src/editor/images/stroke.png deleted file mode 100644 index e69ab368..00000000 Binary files a/src/editor/images/stroke.png and /dev/null differ diff --git a/src/editor/images/stroke.svg b/src/editor/images/stroke.svg new file mode 100644 index 00000000..9298ae31 --- /dev/null +++ b/src/editor/images/stroke.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/editor/images/svg_edit_icons.svg b/src/editor/images/svg_edit_icons.svg deleted file mode 100644 index b548fe06..00000000 --- a/src/editor/images/svg_edit_icons.svg +++ /dev/null @@ -1,385 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - T - T - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/editor/images/tool_foreign.svg b/src/editor/images/tool_foreign.svg new file mode 100644 index 00000000..b10340b8 --- /dev/null +++ b/src/editor/images/tool_foreign.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/ext-imagelib.xml b/src/editor/images/tool_imagelib.svg similarity index 94% rename from src/editor/images/ext-imagelib.xml rename to src/editor/images/tool_imagelib.svg index fdc7e333..bd992b5b 100644 --- a/src/editor/images/ext-imagelib.xml +++ b/src/editor/images/tool_imagelib.svg @@ -1,5 +1,3 @@ - - @@ -9,6 +7,4 @@ - - - + \ No newline at end of file diff --git a/src/editor/images/tool_mathjax.svg b/src/editor/images/tool_mathjax.svg new file mode 100644 index 00000000..e69de29b diff --git a/src/editor/images/tool_node_link.svg b/src/editor/images/tool_node_link.svg new file mode 100644 index 00000000..e0371f09 --- /dev/null +++ b/src/editor/images/tool_node_link.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/editor/images/ungroup.svg b/src/editor/images/ungroup.svg new file mode 100644 index 00000000..218a8604 --- /dev/null +++ b/src/editor/images/ungroup.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/unlink_use.png b/src/editor/images/unlink_use.png deleted file mode 100644 index 69f27c8b..00000000 Binary files a/src/editor/images/unlink_use.png and /dev/null differ diff --git a/src/editor/images/unlink_use.svg b/src/editor/images/unlink_use.svg new file mode 100644 index 00000000..90ced493 --- /dev/null +++ b/src/editor/images/unlink_use.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/warning.svg b/src/editor/images/warning.svg new file mode 100644 index 00000000..62fb8887 --- /dev/null +++ b/src/editor/images/warning.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/editor/images/webappfind.png b/src/editor/images/webappfind.png deleted file mode 100644 index f4b4417c..00000000 Binary files a/src/editor/images/webappfind.png and /dev/null differ diff --git a/src/editor/images/webappfind-icon.svg b/src/editor/images/webappfind.svg similarity index 100% rename from src/editor/images/webappfind-icon.svg rename to src/editor/images/webappfind.svg diff --git a/src/editor/index.html b/src/editor/index.html index 1db526a3..9c363e8e 100644 --- a/src/editor/index.html +++ b/src/editor/index.html @@ -114,10 +114,10 @@ + src="./images/move_bottom.svg"> - +
@@ -146,7 +146,7 @@
- + @@ -229,8 +229,8 @@
- - + +
- +
diff --git a/src/editor/svgedit.css b/src/editor/svgedit.css index b73b1a8f..d179c8cc 100644 --- a/src/editor/svgedit.css +++ b/src/editor/svgedit.css @@ -1203,18 +1203,3 @@ ul li.current { padding-top: 5px; margin-top: 5px; } - -/* - Adding Icons - You can add icons to the context menu by adding - classes to the respective LI element(s) -*/ -/* - -.contextMenu LI.edit A { background-image: url(images/page_white_edit.png); } -.contextMenu LI.cut A { background-image: url(images/cut.png); } -.contextMenu LI.copy A { background-image: url(images/page_white_copy.png); } -.contextMenu LI.paste A { background-image: url(images/page_white_paste.png); } -.contextMenu LI.delete A { background-image: url(images/page_white_delete.png); } -.contextMenu LI.quit A { background-image: url(images/door.png); } -*/ diff --git a/src/editor/svgedit.js b/src/editor/svgedit.js index ca2fc448..7a0f6278 100644 --- a/src/editor/svgedit.js +++ b/src/editor/svgedit.js @@ -3048,9 +3048,9 @@ editor.init = () => { * * @returns {void} */ - const linkControlPoints = function () { - $('#tool_node_link').toggleClass('push_button_pressed tool_button'); - const linked = $('#tool_node_link').hasClass('push_button_pressed'); + const linkControlPoints = () => { + const linked = $id('tool_node_link').pressed; + $id('tool_node_link').pressed = !linked; path.linkControlPoints(linked); }; @@ -4088,6 +4088,7 @@ editor.init = () => { $id('tool_node_delete').addEventListener('click', deletePathNode); $id('tool_openclose_path').addEventListener('click', opencloseSubPath); $id('tool_add_subpath').addEventListener('click', addSubPath); + $id('tool_node_link').addEventListener('click', linkControlPoints); // register actions for left panel $id('tool_select').addEventListener('click', clickSelect); @@ -4196,7 +4197,6 @@ editor.init = () => { {sel: dialogSelectors.join(','), fn: cancelOverlays, evt: 'click', key: ['esc', false, false], hidekey: true}, {sel: '#tool_source_save', fn: saveSourceEditor, evt: 'click'}, - {sel: '#tool_node_link', fn: linkControlPoints, evt: 'click'}, {sel: '#tool_ungroup', fn: clickGroup, evt: 'click'}, {sel: '#tool_unlink_use', fn: clickGroup, evt: 'click'}, {sel: '#sidepanel_handle', fn: toggleSidePanel, key: ['X']},