Modify edit text & graphics to use pencil

bitmaps_png/CMakeLists.txt

@@ -389,7 +389,6 @@ set( BMAPS_MID
     reload2
     reload
     render_mode
-    reset_text
     rescue
     right
     router_len_tuner
@@ -448,6 +447,7 @@ set( BMAPS_MID
     swap_layer
     switch_corner_rounding_shape
     text
+    text_edit
     text_sketch
     three_d
     tool_ratsnest

bitmaps_png/cpp_24/reset_text.cpp

@@ -1,42 +0,0 @@
-
-/* Do not modify this file, it was automatically generated by the
- * PNG2cpp CMake script, using a *.png file as input.
- */
-
-#include <bitmaps_png/bitmaps_list.h>
-
-static const unsigned char png[] = {
- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
- 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
- 0xf8, 0x00, 0x00, 0x01, 0x96, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x05, 0xe4,
- 0x80, 0x90, 0x90, 0x90, 0xff, 0xc4, 0xe2, 0x11, 0x6a, 0x01, 0x3e, 0x0b, 0x69, 0x1e, 0x27, 0xa3,
- 0x16, 0x10, 0x65, 0xc1, 0x21, 0x4d, 0x5b, 0xc9, 0x7d, 0x6a, 0x8e, 0x6d, 0xfb, 0xd5, 0x1c, 0x2f,
- 0x00, 0xf1, 0x17, 0x20, 0xfe, 0x7c, 0x40, 0xdd, 0xf1, 0xec, 0x01, 0x35, 0xc7, 0xc6, 0xfd, 0x6a,
- 0x0e, 0x22, 0x14, 0x59, 0xb0, 0x5f, 0xdd, 0x21, 0x1a, 0x6a, 0xe8, 0x7f, 0x1c, 0xf8, 0x03, 0xd0,
- 0x92, 0x00, 0xb2, 0x2c, 0xa8, 0x76, 0xf1, 0x05, 0x19, 0xf0, 0x0f, 0x8f, 0xe1, 0x60, 0x0c, 0xf4,
- 0xdd, 0xdf, 0x7d, 0xea, 0x8e, 0xfe, 0x24, 0x59, 0x10, 0xef, 0x1f, 0xf4, 0x7f, 0xb7, 0x06, 0xc2,
- 0x90, 0x63, 0xf6, 0xe1, 0xff, 0x1f, 0xad, 0xda, 0xf2, 0xff, 0x6c, 0x54, 0x1e, 0x98, 0xff, 0xe2,
- 0xc8, 0xa9, 0xff, 0x1f, 0x1e, 0x3f, 0xfb, 0xff, 0x70, 0xe5, 0xe6, 0xff, 0x47, 0x2c, 0x02, 0x40,
- 0x62, 0xef, 0xf7, 0x68, 0x38, 0x0b, 0x13, 0x6d, 0x41, 0x9f, 0xb5, 0x27, 0x8a, 0xe1, 0xef, 0x6e,
- 0xdd, 0xfd, 0xff, 0xf5, 0xeb, 0xd7, 0xff, 0x77, 0x66, 0x2c, 0x81, 0x5b, 0x00, 0xe2, 0x83, 0xf0,
- 0x8b, 0x83, 0x27, 0x60, 0x3e, 0xa9, 0x23, 0xda, 0x82, 0x75, 0xba, 0x2e, 0x18, 0x86, 0xbf, 0x3c,
- 0x7e, 0xf6, 0xff, 0x21, 0x43, 0x2f, 0xb8, 0xc5, 0x67, 0xc2, 0x73, 0xc0, 0xe2, 0x9f, 0x5e, 0xbe,
- 0x86, 0x8a, 0x39, 0x9c, 0x22, 0xca, 0x82, 0x50, 0xa0, 0x05, 0x7b, 0xd5, 0x1d, 0xff, 0x1f, 0xd4,
- 0x76, 0xfd, 0xff, 0xf9, 0xdd, 0x7b, 0xb8, 0x4b, 0x71, 0xe1, 0x27, 0x9b, 0xf7, 0xc0, 0x2c, 0x7d,
- 0x47, 0xb4, 0x05, 0x7b, 0x34, 0x9c, 0xfe, 0x1f, 0xd4, 0x75, 0xff, 0xff, 0xe5, 0xc3, 0x07, 0x9c,
- 0x06, 0x7f, 0x7a, 0xf1, 0xea, 0xff, 0xa3, 0xd5, 0x5b, 0xfe, 0x1f, 0x32, 0x06, 0x27, 0x86, 0xff,
- 0xc0, 0x64, 0xfb, 0x96, 0xe8, 0x88, 0xde, 0xaf, 0xe6, 0x74, 0x0d, 0xa4, 0xe9, 0x84, 0x6b, 0xcc,
- 0xff, 0xf7, 0x0f, 0x1e, 0x83, 0x0d, 0x7c, 0x7e, 0xe8, 0xe4, 0xff, 0x43, 0x06, 0x5e, 0x78, 0x52,
- 0x14, 0x91, 0x41, 0x04, 0x02, 0xc0, 0x64, 0xd7, 0x05, 0xd3, 0x78, 0x1c, 0x68, 0xc9, 0x87, 0x87,
- 0x10, 0x4b, 0xee, 0x4c, 0x5d, 0x88, 0xd3, 0x02, 0x60, 0xe6, 0xab, 0x25, 0xda, 0x82, 0x5d, 0xea,
- 0xae, 0x52, 0xc8, 0x19, 0x0c, 0x64, 0xc9, 0xd3, 0xed, 0xfb, 0xff, 0x9f, 0x4b, 0x2c, 0xc1, 0x65,
- 0xc1, 0xbb, 0x1d, 0xda, 0xee, 0x42, 0x24, 0x65, 0xb8, 0x7d, 0xaa, 0x8e, 0x51, 0x24, 0x64, 0x34,
- 0x3f, 0xb2, 0xca, 0xa5, 0x03, 0xaa, 0x4e, 0x91, 0xa0, 0xb2, 0x07, 0x8f, 0x05, 0xef, 0xc9, 0x36,
- 0x1c, 0x06, 0xf6, 0x28, 0x3a, 0x8b, 0xef, 0x57, 0x77, 0x6a, 0x01, 0x46, 0xfc, 0x39, 0xa8, 0x65,
- 0x9f, 0x80, 0xf8, 0x0c, 0x30, 0x52, 0xeb, 0xd1, 0x73, 0x2f, 0x00, 0x87, 0xd2, 0x16, 0xbe, 0x2d,
- 0xad, 0x8b, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
-};
-
-const BITMAP_OPAQUE reset_text_xpm[1] = {{ png, sizeof( png ), "reset_text_xpm" }};
-
-//EOF

bitmaps_png/cpp_24/text.cpp

@@ -8,12 +8,10 @@
 static const unsigned char png[] = {
  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
  0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
- 0x73, 0x00, 0x00, 0x00, 0x44, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0xa0, 0x1b, 0x08,
+ 0x73, 0x00, 0x00, 0x00, 0x1f, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0xa0, 0x1b, 0x08,
- 0xdd, 0x1a, 0xf2, 0x1f, 0x37, 0x0c, 0xdd, 0x8a, 0xa1, 0x21, 0x64, 0x1b, 0x3e, 0x0d, 0x21, 0xdb,
+ 0xf9, 0x8f, 0x1f, 0x0e, 0x80, 0x06, 0x6c, 0x9a, 0x49, 0xf6, 0xcf, 0xa8, 0x86, 0x51, 0x0d, 0xa3,
- 0x30, 0x6d, 0xa8, 0x0e, 0x59, 0x07, 0x87, 0x4f, 0xc0, 0x8a, 0x9e, 0x20, 0x44, 0x42, 0xab, 0xf1,
+ 0x1a, 0xa8, 0x0c, 0x00, 0x58, 0xb2, 0x99, 0x9d, 0x26, 0x22, 0x82, 0x53, 0x00, 0x00, 0x00, 0x00,
- 0x3a, 0x2f, 0x64, 0x35, 0x58, 0xc3, 0x6a, 0xa2, 0xfd, 0x33, 0xaa, 0x61, 0x54, 0xc3, 0x70, 0xd6,
+ 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
- 0xb0, 0x0a, 0xac, 0x61, 0x15, 0xc3, 0x80, 0x00, 0x00, 0xf1, 0x3a, 0x88, 0xe9, 0x7d, 0xa9, 0x28,
- 0x7c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
 const BITMAP_OPAQUE text_xpm[1] = {{ png, sizeof( png ), "text_xpm" }};

bitmaps_png/cpp_24/text_edit.cpp

@@ -0,0 +1,37 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.h>
+
+static const unsigned char png[] = {
+ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+ 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d,
+ 0xf8, 0x00, 0x00, 0x01, 0x41, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x18, 0x76, 0x20,
+ 0x24, 0x24, 0xe4, 0x3f, 0x25, 0x78, 0x04, 0x58, 0x40, 0xac, 0xc5, 0x34, 0x8f, 0x9b, 0x51, 0x0b,
+ 0x06, 0xd6, 0x82, 0xd8, 0x80, 0xe0, 0xff, 0xfb, 0xd5, 0x9d, 0x5a, 0xf6, 0xab, 0x39, 0x9e, 0x07,
+ 0xe2, 0x2f, 0x10, 0xec, 0x74, 0x6e, 0xbf, 0xba, 0x43, 0xf3, 0x4e, 0x65, 0x37, 0x31, 0x8a, 0x2c,
+ 0xa8, 0x70, 0xf5, 0xfb, 0xbf, 0x53, 0xc3, 0xe9, 0x3f, 0xd0, 0x50, 0x5c, 0xf8, 0x13, 0xd0, 0xa2,
+ 0x10, 0xb2, 0x2c, 0x00, 0x19, 0xbe, 0x0f, 0x87, 0xc1, 0x07, 0xb4, 0x5c, 0xff, 0xbf, 0xd8, 0xb4,
+ 0xfb, 0xff, 0x97, 0x5b, 0xf7, 0xfe, 0x9f, 0x70, 0x8d, 0xfd, 0x47, 0xb2, 0x25, 0xa0, 0x60, 0xc1,
+ 0xe5, 0x72, 0x90, 0xe1, 0xaf, 0x76, 0x1e, 0xfa, 0x0f, 0x03, 0xef, 0x4f, 0x5e, 0xf8, 0x7f, 0x40,
+ 0xcd, 0xf1, 0xe3, 0x21, 0x15, 0x5b, 0x51, 0xa2, 0x2d, 0xe8, 0xb1, 0xf5, 0x26, 0xca, 0x70, 0x10,
+ 0xb8, 0xd3, 0x39, 0x1d, 0x2c, 0xb7, 0x4f, 0xd5, 0xb1, 0x89, 0x68, 0x0b, 0x56, 0xeb, 0xb9, 0x60,
+ 0x1a, 0xae, 0xe9, 0xfc, 0xff, 0xe5, 0xe6, 0xbd, 0x28, 0x86, 0xdf, 0x9f, 0xb4, 0x00, 0x49, 0x8d,
+ 0xd3, 0x39, 0xa2, 0x2d, 0xd8, 0x85, 0x16, 0x3c, 0x20, 0xc3, 0x5f, 0x6c, 0xda, 0x83, 0x62, 0xf8,
+ 0xc3, 0x59, 0xcb, 0x30, 0x22, 0x9c, 0x68, 0x0b, 0xd0, 0xc3, 0xff, 0xe9, 0xb2, 0x8d, 0xa8, 0x2e,
+ 0x9f, 0xb2, 0x10, 0xd3, 0x87, 0xc0, 0x78, 0x20, 0x3e, 0x88, 0xf4, 0x5d, 0xe1, 0x1a, 0x41, 0x2e,
+ 0x3d, 0xe9, 0x1e, 0xf7, 0xff, 0xe7, 0xab, 0x37, 0x10, 0x97, 0xcf, 0x5e, 0x8e, 0x23, 0xc9, 0x92,
+ 0x10, 0x44, 0xdd, 0xb6, 0x5e, 0x70, 0x8d, 0xb0, 0xe0, 0x38, 0xe5, 0x95, 0xf0, 0xff, 0x6e, 0xcf,
+ 0x2c, 0x9c, 0x79, 0x02, 0xe8, 0x83, 0x46, 0xb2, 0x92, 0x29, 0x9e, 0x30, 0x47, 0xc6, 0x1f, 0xf6,
+ 0xab, 0x39, 0x88, 0x90, 0x94, 0xd1, 0xca, 0x5d, 0x7d, 0x71, 0x66, 0x34, 0x34, 0xfc, 0x0f, 0x98,
+ 0x44, 0x83, 0xc8, 0x2a, 0x32, 0x40, 0x39, 0x14, 0x14, 0x79, 0xf8, 0x5c, 0x4e, 0xb6, 0xe1, 0x30,
+ 0x00, 0xca, 0xa1, 0xa0, 0x4c, 0x74, 0x40, 0xdd, 0xf1, 0x2c, 0xd0, 0xc0, 0xcf, 0x20, 0x0c, 0x62,
+ 0x83, 0xc2, 0x1c, 0x3d, 0x58, 0x00, 0x6c, 0x37, 0x2e, 0x2a, 0x04, 0x2e, 0x6c, 0xb6, 0x00, 0x00,
+ 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE text_edit_xpm[1] = {{ png, sizeof( png ), "text_edit_xpm" }};
+
+//EOF

bitmaps_png/include/bitmaps_png/bitmaps_list.h

@@ -402,7 +402,6 @@ EXTERN_BITMAP( render_mode_xpm )
 EXTERN_BITMAP( reload2_xpm )
 EXTERN_BITMAP( reload_xpm )
 EXTERN_BITMAP( repaint_xpm )
-EXTERN_BITMAP( reset_text_xpm )
 EXTERN_BITMAP( resize_sheet_xpm )
 EXTERN_BITMAP( rescue_xpm )
 EXTERN_BITMAP( right_xpm )
@@ -466,6 +465,7 @@ EXTERN_BITMAP( svg_file_xpm )
 EXTERN_BITMAP( swap_layer_xpm )
 EXTERN_BITMAP( switch_corner_rounding_shape_xpm )
 EXTERN_BITMAP( text_xpm )
+EXTERN_BITMAP( text_edit_xpm )
 EXTERN_BITMAP( text_sketch_xpm )
 EXTERN_BITMAP( three_d_xpm )
 EXTERN_BITMAP( tool_ratsnest_xpm )

bitmaps_png/sources/text.svg

@@ -22,13 +22,13 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1609"
+     inkscape:window-width="2806"
-     inkscape:window-height="1286"
+     inkscape:window-height="1511"
      id="namedview30"
      showgrid="true"
      inkscape:zoom="27.961538"
-     inkscape:cx="3.3259971"
+     inkscape:cx="7.2871158"
-     inkscape:cy="13"
+     inkscape:cy="13.174665"
      inkscape:window-x="0"
      inkscape:window-y="37"
      inkscape:window-maximized="0"
@@ -81,6 +81,7 @@
      id="title27351">text</title>
   <path
      class="cls-1"
-     d="M 19.71,4.6813 H 13.6683 V 21.9961 H 10.3317 V 4.6813 H 4.29 V 2.0039 h 15.42 z"
+     d="M 20,5 H 14 V 22 H 10 V 5 H 4 V 2 h 16 z"
-     id="path27353" />
+     id="path27353"
+     sodipodi:nodetypes="ccccccccc" />
 </svg>

bitmaps_png/sources/text_edit.svg

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="text_edit.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2806"
+     inkscape:window-height="1511"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="27.961538"
+     inkscape:cx="7.2871158"
+     inkscape:cy="13.174665"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>text</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs27349">
+    <style
+       id="style27347">.cls-1{fill:#545454;}</style>
+  </defs>
+  <title
+     id="title27351">text</title>
+  <path
+     class="cls-1"
+     d="M 20,5 H 14 V 22 H 10 V 5 H 4 V 2 h 16 z"
+     id="path27353"
+     sodipodi:nodetypes="ccccccccc" />
+  <ellipse
+     class="cls-3"
+     cx="17"
+     cy="17"
+     id="circle843"
+     style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:0.999999"
+     r="7.9999995" />
+  <circle
+     class="cls-3"
+     cx="17.000002"
+     cy="17.000002"
+     id="ellipse22-5"
+     style="display:inline;fill:#bf2641;stroke-width:0.999999"
+     r="7" />
+  <path
+     class="cls-4"
+     d="M 21.539701,13 20.89452,12.354822 c -0.401771,-0.40166 -1.053052,-0.40166 -1.454825,0 l -5.316089,5.34082 2.100005,2.100132 5.31609,-5.340946 c 0.401658,-0.401772 0.401658,-1.053056 0,-1.454828 z"
+     id="path25-6"
+     style="display:inline;fill:#ffffff;stroke-width:0.999999"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     id="polygon27"
+     style="display:inline;fill:#ffffff;stroke-width:0.999999"
+     d="m 13,21 h 3 c -0.779315,-0.772295 -2.28388,-2.275534 -3,-3 z"
+     sodipodi:nodetypes="cccc" />
+</svg>

eeschema/tools/ee_actions.cpp

@@ -474,7 +474,7 @@ TOOL_ACTION EE_ACTIONS::editTextAndGraphics( "eeschema.InteractiveEdit.editTextA
         AS_GLOBAL, 0, "",
         _( "Edit Text & Graphics Properties..." ),
         _( "Edit text and graphics properties globally across schematic" ),
-        reset_text_xpm );
+        text_edit_xpm );
 
 TOOL_ACTION EE_ACTIONS::symbolProperties( "eeschema.InteractiveEdit.symbolProperties",
         AS_GLOBAL, 0, "",

pcbnew/tools/pcb_actions.cpp

@@ -432,7 +432,7 @@ TOOL_ACTION PCB_ACTIONS::editTextAndGraphics( "pcbnew.GlobalEdit.editTextAndGrap
         AS_GLOBAL, 0, "",
         _( "Edit Text & Graphics Properties..." ),
         _( "Edit Text and graphics properties globally across board" ),
-        reset_text_xpm );
+        text_edit_xpm );
 
 TOOL_ACTION PCB_ACTIONS::globalDeletions( "pcbnew.GlobalEdit.globalDeletions",
         AS_GLOBAL, 0, "",