diff --git a/common/bitmap_info.cpp b/common/bitmap_info.cpp index 111b1c36a8..7e951b3c7a 100644 --- a/common/bitmap_info.cpp +++ b/common/bitmap_info.cpp @@ -403,6 +403,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::annotate_increment].emplace_back( BITMAPS::annotate_increment, wxT( "annotate_increment_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_24.png" ), 24, wxT( "light" ) ); @@ -822,6 +823,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::annotate_increment].emplace_back( BITMAPS::annotate_increment, wxT( "annotate_increment_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_dark_24.png" ), 24, wxT( "dark" ) ); @@ -1241,6 +1243,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::annotate_increment].emplace_back( BITMAPS::annotate_increment, wxT( "annotate_increment_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_16.png" ), 16, wxT( "light" ) ); @@ -1660,6 +1663,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::annotate_increment].emplace_back( BITMAPS::annotate_increment, wxT( "annotate_increment_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_dark_16.png" ), 16, wxT( "dark" ) ); @@ -2079,6 +2083,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::annotate_increment].emplace_back( BITMAPS::annotate_increment, wxT( "annotate_increment_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_32.png" ), 32, wxT( "light" ) ); @@ -2498,6 +2503,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::annotate_increment].emplace_back( BITMAPS::annotate_increment, wxT( "annotate_increment_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_dark_32.png" ), 32, wxT( "dark" ) ); @@ -2917,6 +2923,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::annotate_increment].emplace_back( BITMAPS::annotate_increment, wxT( "annotate_increment_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_48.png" ), 48, wxT( "light" ) ); @@ -3336,6 +3343,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::annotate_increment].emplace_back( BITMAPS::annotate_increment, wxT( "annotate_increment_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_dark_48.png" ), 48, wxT( "dark" ) ); @@ -3755,6 +3763,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::annotate_increment].emplace_back( BITMAPS::annotate_increment, wxT( "annotate_increment_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_64.png" ), 64, wxT( "light" ) ); @@ -4174,6 +4183,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::annotate_increment].emplace_back( BITMAPS::annotate_increment, wxT( "annotate_increment_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_dark_64.png" ), 64, wxT( "dark" ) ); diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp index aac25af6cc..a5da7b9f1e 100644 --- a/eeschema/tools/ee_actions.cpp +++ b/eeschema/tools/ee_actions.cpp @@ -1065,7 +1065,9 @@ TOOL_ACTION EE_ACTIONS::incrementAnnotations( TOOL_ACTION_ARGS() .Name( "eeschema.EditorControl.incrementAnnotations" ) .Scope( AS_GLOBAL ) .FriendlyName( _( "Increment Annotations From..." ) ) - .Tooltip( _( "Increment a subset of reference designators starting at a particular symbol" ) ) ); + .Tooltip( _( "Increment a subset of reference designators starting at a particular symbol" ) ) + .Icon( BITMAPS::annotate_increment ) + ); TOOL_ACTION EE_ACTIONS::schematicSetup( TOOL_ACTION_ARGS() .Name( "eeschema.EditorControl.schematicSetup" ) diff --git a/include/bitmaps/bitmaps_list.h b/include/bitmaps/bitmaps_list.h index 69bbf61e39..153f95d1fd 100644 --- a/include/bitmaps/bitmaps_list.h +++ b/include/bitmaps/bitmaps_list.h @@ -88,6 +88,7 @@ enum class BITMAPS : unsigned int align_items_top, anchor, annotate, + annotate_increment, annotate_down_right, annotate_right_down, apply_pad_settings, diff --git a/resources/bitmaps_png/CMakeLists.txt b/resources/bitmaps_png/CMakeLists.txt index af9c28f178..2c8fa1da87 100644 --- a/resources/bitmaps_png/CMakeLists.txt +++ b/resources/bitmaps_png/CMakeLists.txt @@ -203,6 +203,7 @@ set( BMAPS_MID align_items_center align_items_middle anchor + annotate_increment annotate_down_right annotate_right_down annotate diff --git a/resources/bitmaps_png/png/annotate_increment_16.png b/resources/bitmaps_png/png/annotate_increment_16.png new file mode 100644 index 0000000000..cb31962dfd Binary files /dev/null and b/resources/bitmaps_png/png/annotate_increment_16.png differ diff --git a/resources/bitmaps_png/png/annotate_increment_24.png b/resources/bitmaps_png/png/annotate_increment_24.png new file mode 100644 index 0000000000..bbf73ec680 Binary files /dev/null and b/resources/bitmaps_png/png/annotate_increment_24.png differ diff --git a/resources/bitmaps_png/png/annotate_increment_32.png b/resources/bitmaps_png/png/annotate_increment_32.png new file mode 100644 index 0000000000..d9fc1608d9 Binary files /dev/null and b/resources/bitmaps_png/png/annotate_increment_32.png differ diff --git a/resources/bitmaps_png/png/annotate_increment_48.png b/resources/bitmaps_png/png/annotate_increment_48.png new file mode 100644 index 0000000000..974d6785f1 Binary files /dev/null and b/resources/bitmaps_png/png/annotate_increment_48.png differ diff --git a/resources/bitmaps_png/png/annotate_increment_64.png b/resources/bitmaps_png/png/annotate_increment_64.png new file mode 100644 index 0000000000..a5310f59b4 Binary files /dev/null and b/resources/bitmaps_png/png/annotate_increment_64.png differ diff --git a/resources/bitmaps_png/png/annotate_increment_dark_16.png b/resources/bitmaps_png/png/annotate_increment_dark_16.png new file mode 100644 index 0000000000..26184faca0 Binary files /dev/null and b/resources/bitmaps_png/png/annotate_increment_dark_16.png differ diff --git a/resources/bitmaps_png/png/annotate_increment_dark_24.png b/resources/bitmaps_png/png/annotate_increment_dark_24.png new file mode 100644 index 0000000000..65d00dbec1 Binary files /dev/null and b/resources/bitmaps_png/png/annotate_increment_dark_24.png differ diff --git a/resources/bitmaps_png/png/annotate_increment_dark_32.png b/resources/bitmaps_png/png/annotate_increment_dark_32.png new file mode 100644 index 0000000000..261562d6f3 Binary files /dev/null and b/resources/bitmaps_png/png/annotate_increment_dark_32.png differ diff --git a/resources/bitmaps_png/png/annotate_increment_dark_48.png b/resources/bitmaps_png/png/annotate_increment_dark_48.png new file mode 100644 index 0000000000..4afb0111d8 Binary files /dev/null and b/resources/bitmaps_png/png/annotate_increment_dark_48.png differ diff --git a/resources/bitmaps_png/png/annotate_increment_dark_64.png b/resources/bitmaps_png/png/annotate_increment_dark_64.png new file mode 100644 index 0000000000..e7acd3abc7 Binary files /dev/null and b/resources/bitmaps_png/png/annotate_increment_dark_64.png differ diff --git a/resources/bitmaps_png/sources/dark/annotate_increment.svg b/resources/bitmaps_png/sources/dark/annotate_increment.svg new file mode 100644 index 0000000000..de39a2e5d6 --- /dev/null +++ b/resources/bitmaps_png/sources/dark/annotate_increment.svg @@ -0,0 +1,209 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + id="Слой_1" + data-name="Слой 1" + viewBox="0 0 24 24" + version="1.1" + sodipodi:docname="annotate_increment.svg" + inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1009" + id="namedview965" + showgrid="true" + inkscape:zoom="39.543586" + inkscape:cx="4.817469" + inkscape:cy="16.766309" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="Слой_1" + inkscape:document-rotation="0" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + <inkscape:grid + type="xygrid" + id="grid1552" /> + </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>annotate</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="defs946"> + <marker + style="overflow:visible" + id="TriangleStart" + refX="0" + refY="0" + orient="auto-start-reverse" + inkscape:stockid="TriangleStart" + markerWidth="2" + markerHeight="2.5" + viewBox="0 0 5.3244081 6.1553851" + inkscape:isstock="true" + inkscape:collect="always" + preserveAspectRatio="none"> + <path + transform="scale(0.5)" + style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt" + d="M 5.77,0 -2.88,5 V -5 Z" + id="path135" /> + </marker> + <marker + style="overflow:visible" + id="marker4900" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleInS" + inkscape:isstock="true"> + <path + transform="scale(-0.2)" + style="fill:#f2647e;fill-opacity:1;fill-rule:evenodd;stroke:#f2647e;stroke-width:1pt;stroke-opacity:1" + d="M 5.77,0 -2.88,5 V -5 Z" + id="path4898" /> + </marker> + <marker + style="overflow:visible" + id="marker4866" + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="TriangleInS" + inkscape:isstock="true"> + <path + transform="scale(-0.2)" + style="fill-rule:evenodd;stroke:#f2647e;stroke-width:1pt;stroke-opacity:1;fill:#f2647e;fill-opacity:1" + d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " + id="path3042" /> + </marker> + <marker + style="overflow:visible" + id="TriangleInS" + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="TriangleInS" + inkscape:isstock="true"> + <path + transform="scale(-0.2)" + style="fill-rule:evenodd;stroke:#f2647e;stroke-width:1pt;stroke-opacity:1;fill:#f2647e;fill-opacity:1" + d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " + id="path1701" /> + </marker> + <marker + style="overflow:visible" + id="marker2212" + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow2Sstart" + inkscape:isstock="true"> + <path + transform="scale(0.3) translate(-2.3,0)" + d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " + style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#f2647e;stroke-opacity:1;fill:#f2647e;fill-opacity:1" + id="path2210" /> + </marker> + <marker + style="overflow:visible" + id="Arrow2Sstart" + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow2Sstart" + inkscape:isstock="true"> + <path + transform="scale(0.3) translate(-2.3,0)" + d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " + style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#f2647e;stroke-opacity:1;fill:#f2647e;fill-opacity:1" + id="path1592" /> + </marker> + <style + id="style944">.cls-1{fill:none;stroke:#f2647e;stroke-linecap:round;stroke-linejoin:round;}.cls-2{fill:#f2647e;}.cls-3{fill:#8f8f8f;}.cls-4{fill:#DED3DD;}</style> + </defs> + <title + id="title948">annotate</title> + <rect + class="cls-3" + x="0.99999994" + y="14" + width="22" + height="10" + id="rect1554" + style="fill:#1381b1;fill-opacity:1;stroke-width:1" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:condensed;font-size:11.2px;line-height:1.25;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Semi-Bold Condensed';letter-spacing:0px;word-spacing:0px" + x="11.968635" + y="23.022593" + id="text1558"><tspan + sodipodi:role="line" + id="tspan1556" + x="11.968635" + y="23.022593" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:semi-condensed;font-size:11.2px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Semi-Bold Semi-Condensed';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1">R15</tspan></text> + <path + id="line950" + style="fill:none;stroke:#58d87e;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;marker-start:url(#TriangleStart);stroke-opacity:1" + d="M 12,13 V 10" + sodipodi:nodetypes="cc" /> + <rect + class="cls-3" + x="1" + y="-1.0290528e-08" + width="22" + height="10" + id="rect954-4" + style="fill:#DED3DD;fill-opacity:1;stroke-width:1" /> + <text + xml:space="preserve" + style="font-size:11.2px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#545454;fill-opacity:1;stroke-width:1" + x="11.513285" + y="8.9973688" + id="text1530"><tspan + id="tspan5085" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:11.2px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Semi-Bold';text-align:center;text-anchor:middle;fill:#545454;fill-opacity:1;stroke-width:1">R5</tspan> </text> +</svg> diff --git a/resources/bitmaps_png/sources/light/annotate_increment.svg b/resources/bitmaps_png/sources/light/annotate_increment.svg new file mode 100644 index 0000000000..fc552554b4 --- /dev/null +++ b/resources/bitmaps_png/sources/light/annotate_increment.svg @@ -0,0 +1,239 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + id="Слой_1" + data-name="Слой 1" + viewBox="0 0 24 24" + version="1.1" + sodipodi:docname="annotate_increment.svg" + inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1009" + id="namedview965" + showgrid="true" + inkscape:zoom="39.543586" + inkscape:cx="4.8427576" + inkscape:cy="15.097265" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="Слой_1" + inkscape:document-rotation="0" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + <inkscape:grid + type="xygrid" + id="grid1552" /> + </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>annotate</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="defs946"> + <marker + style="overflow:visible" + id="marker9947" + refX="0" + refY="0" + orient="auto-start-reverse" + inkscape:stockid="TriangleStart" + markerWidth="2" + markerHeight="2.5" + viewBox="0 0 5.3244081 6.1553851" + inkscape:isstock="true" + inkscape:collect="always" + preserveAspectRatio="none"> + <path + transform="scale(0.5)" + style="fill:context-stroke;fill-rule:evenodd;stroke:context-stroke;stroke-width:1pt" + d="M 5.77,0 -2.88,5 V -5 Z" + id="path9945" /> + </marker> + <marker + style="overflow:visible" + id="marker4900" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleInS" + inkscape:isstock="true" + viewBox="0 0 2.1297632 2.462154" + markerWidth="2.1297631" + markerHeight="2.4621539" + preserveAspectRatio="xMidYMid"> + <path + transform="scale(-0.2)" + style="fill:#bf2641;fill-opacity:1;fill-rule:evenodd;stroke:#bf2641;stroke-width:1pt;stroke-opacity:1" + d="M 5.77,0 -2.88,5 V -5 Z" + id="path4898" /> + </marker> + <marker + style="overflow:visible" + id="marker4866" + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="TriangleInS" + inkscape:isstock="true"> + <path + transform="scale(-0.2)" + style="fill-rule:evenodd;stroke:#bf2641;stroke-width:1pt;stroke-opacity:1;fill:#bf2641;fill-opacity:1" + d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " + id="path3042" /> + </marker> + <marker + style="overflow:visible" + id="TriangleInS" + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="TriangleInS" + inkscape:isstock="true"> + <path + transform="scale(-0.2)" + style="fill-rule:evenodd;stroke:#bf2641;stroke-width:1pt;stroke-opacity:1;fill:#bf2641;fill-opacity:1" + d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z " + id="path1701" /> + </marker> + <marker + style="overflow:visible" + id="marker2212" + refX="0.0" + refY="0.0" + orient="auto" + inkscape:stockid="Arrow2Sstart" + inkscape:isstock="true"> + <path + transform="scale(0.3) translate(-2.3,0)" + d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " + style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#bf2641;stroke-opacity:1;fill:#bf2641;fill-opacity:1" + id="path2210" /> + </marker> + <marker + style="overflow:visible" + id="Arrow2Sstart" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow2Sstart" + inkscape:isstock="true" + viewBox="0 0 3.4652294 2.5981128" + markerWidth="3.4652293" + markerHeight="2.5981128" + preserveAspectRatio="xMidYMid"> + <path + transform="matrix(0.3,0,0,0.3,-0.69,0)" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + style="fill:#bf2641;fill-opacity:1;fill-rule:evenodd;stroke:#bf2641;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" + id="path1592" /> + </marker> + <style + id="style944">.cls-1{fill:none;stroke:#bf2641;stroke-linecap:round;stroke-linejoin:round;}.cls-2{fill:#bf2641;}.cls-3{fill:#b9b9b9;}.cls-4{fill:#545454;}</style> + <marker + style="overflow:visible" + id="marker4900-0" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="TriangleInS" + inkscape:isstock="true" + preserveAspectRatio="xMidYMid" + viewBox="0 0 2.1297632 2.462154" + markerWidth="2.1297631" + markerHeight="2.4621539"> + <path + transform="scale(-0.2)" + style="fill:#bf2641;fill-opacity:1;fill-rule:evenodd;stroke:#bf2641;stroke-width:1pt;stroke-opacity:1" + d="M 5.77,0 -2.88,5 V -5 Z" + id="path4898-7" /> + </marker> + </defs> + <title + id="title948">annotate</title> + <g + id="g1560" + transform="translate(-1.0190926,22.930015)"> + <rect + class="cls-3" + x="2.0190926" + y="-8.9300146" + width="22" + height="10" + id="rect1554" + style="fill:#1a81c4;fill-opacity:1;stroke-width:1" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:condensed;font-size:11.2px;line-height:1.25;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Semi-Bold Condensed';letter-spacing:0px;word-spacing:0px" + x="12.987727" + y="0.09257789" + id="text1558"><tspan + sodipodi:role="line" + id="tspan1556" + x="12.987727" + y="0.09257789" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:semi-condensed;font-size:11.2px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Semi-Bold Semi-Condensed';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1">R15</tspan></text> + </g> + <path + id="line950-0" + style="fill:none;stroke:#359641;stroke-width:3.00094;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker9947)" + d="M 12.56841,12.485457 V 9.4854567" + sodipodi:nodetypes="cc" /> + <rect + class="cls-3" + x="1" + y="-1.0290528e-08" + width="22" + height="10" + id="rect954-4" + style="fill:#545454;fill-opacity:1;stroke-width:1" /> + <text + xml:space="preserve" + style="font-size:11.2px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;stroke-width:1" + x="11.184533" + y="9.0226574" + id="text1530"><tspan + id="tspan2709" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:11.2px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Semi-Bold';text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1">R5</tspan> </text> +</svg>