From 66a22227509f48e1c8ac9a8b1fd9dbef0f4c6f5d Mon Sep 17 00:00:00 2001
From: David Vierra <codewarrior@hawaii.rr.com>
Date: Thu, 10 Sep 2015 12:36:27 -1000
Subject: [PATCH] Add clone tool icon

---
 .../assets/mcedit2/toolicons/clone.png        | Bin 0 -> 2377 bytes
 src/mcedit2/assets_raw/icons.svg              |  61 ++++++++++++++----
 src/mcedit2/editortools/clone.py              |   2 +-
 3 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 src/mcedit2/assets/mcedit2/toolicons/clone.png

diff --git a/src/mcedit2/assets/mcedit2/toolicons/clone.png b/src/mcedit2/assets/mcedit2/toolicons/clone.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbe218a60bc8f3fd607197cefb5e1cf086c9cc9c
GIT binary patch
literal 2377
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

literal 0
HcmV?d00001

diff --git a/src/mcedit2/assets_raw/icons.svg b/src/mcedit2/assets_raw/icons.svg
index 83836a5..95d93b9 100644
--- a/src/mcedit2/assets_raw/icons.svg
+++ b/src/mcedit2/assets_raw/icons.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.48.4 r9939"
    sodipodi:docname="icons.svg"
-   inkscape:export-filename="..\assets\mcedit2\toolicons\edit_block.png"
+   inkscape:export-filename="..\assets\mcedit2\toolicons\clone.png"
    inkscape:export-xdpi="45"
    inkscape:export-ydpi="45">
   <defs
@@ -309,15 +309,15 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-19.20624"
-     inkscape:cy="71.324472"
+     inkscape:zoom="2"
+     inkscape:cx="-24.849765"
+     inkscape:cy="50.573924"
      inkscape:document-units="px"
-     inkscape:current-layer="g6038-1"
+     inkscape:current-layer="layer12"
      showgrid="false"
-     inkscape:window-width="1672"
+     inkscape:window-width="1658"
      inkscape:window-height="1058"
-     inkscape:window-x="240"
+     inkscape:window-x="254"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      inkscape:snap-global="false"
@@ -481,7 +481,7 @@
          sodipodi:nodetypes="ccccccccccccc" />
     </g>
     <g
-       style="display:inline"
+       style="display:none"
        inkscape:label="edit block"
        id="g3110"
        inkscape:groupmode="layer">
@@ -492,11 +492,11 @@
         <path
            id="path6040-7"
            d="m 95.929916,1045.8317 30.312634,-26.2586 0,-90.40634 -33.623202,24.61889 z"
-           style="color:#000000;fill:#68512d;fill-opacity:1;stroke:none;stroke-width:5.29680729000000030;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:#68512d;fill-opacity:1;stroke:none;stroke-width:5.29680729;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ccc" />
         <path
-           style="color:#000000;fill:#816438;fill-opacity:1;stroke:none;stroke-width:5.29680729000000030;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:#816438;fill-opacity:1;stroke:none;stroke-width:5.29680729;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 5.5445717,955.42534 90.3853443,0 0,90.40636 -90.3853443,0 z"
            id="path6042-4"
            inkscape:connector-curvature="0" />
@@ -509,7 +509,7 @@
         <path
            id="path6044-0"
            d="m 95.929916,955.42534 30.312634,-26.25858 -90.385341,0 -30.3126373,26.25858"
-           style="color:#000000;fill:#679340;fill-opacity:1;stroke:none;stroke-width:5.29680729000000030;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:#679340;fill-opacity:1;stroke:none;stroke-width:5.29680729;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cccc" />
         <path
@@ -797,6 +797,45 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccc" />
     </g>
+    <g
+       inkscape:groupmode="layer"
+       id="layer12"
+       inkscape:label="clone">
+      <path
+         style="color:#000000;fill:none;stroke:#545f72;stroke-width:3.00000048;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:12.00000001, 2.99999999;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14.056349,950.5395 43.868502,0 0,43.8412 -43.868502,0 z"
+         id="rect7367-1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7372-7"
+         d="m 57.924851,950.5395 14.712229,-12.7337 -43.868501,0 -14.71223,12.7337"
+         style="color:#000000;fill:none;stroke:#545f72;stroke-width:3.00000048;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:12.00000001, 2.99999999;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         id="path7374-4"
+         d="m 57.924851,994.3807 14.712229,-12.7337 0,-43.8412"
+         style="color:#000000;fill:none;stroke:#545f72;stroke-width:3.00000048;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:12.00000001, 2.99999999;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
+      <path
+         style="color:#000000;fill:none;stroke:#81d86e;stroke-width:3.00000048000000020;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:12.00000039000000000, 3.00000008999999990;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 41.709637,984.56261 53.603624,0 0,53.58699 -53.603624,0 z"
+         id="rect7367-1-0"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7372-7-9"
+         d="m 95.313261,984.56261 17.977109,-15.56439 -53.603625,0 -17.977108,15.56439"
+         style="color:#000000;fill:none;stroke:#81d86e;stroke-width:3.00000048000000020;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:12.00000039000000000, 3.00000008999999990;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         id="path7374-4-4"
+         d="m 95.313261,1038.1496 17.977109,-15.5644 0,-53.58698"
+         style="color:#000000;fill:none;stroke:#81d86e;stroke-width:3.00000048000000020;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:12.00000039000000000, 3.00000008999999990;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/src/mcedit2/editortools/clone.py b/src/mcedit2/editortools/clone.py
index f44bb16..a77aa46 100644
--- a/src/mcedit2/editortools/clone.py
+++ b/src/mcedit2/editortools/clone.py
@@ -69,7 +69,7 @@ class CloneFinishCommand(SimpleRevisionCommand):
         self.cloneTool.currentClone = None
         
 class CloneTool(EditorTool):
-    #iconName = "clone"
+    iconName = "clone"
     name = "Clone"
 
     def __init__(self, editorSession, *args, **kwargs):