Skip to content

K
kicad-source-mirror
Commit 8a82c615 authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Icons update

parent 2c251196
Hide whitespace changes
Inline Side-by-side
Showing with 919 additions and 306 deletions
bitmaps_png/CMakeLists.txt
View file @ 8a82c615
...@@ -289,6 +289,7 @@ set( BMAPS_MID ...@@ -289,6 +289,7 @@ set( BMAPS_MID
load_module_lib load_module_lib
local_ratsnest local_ratsnest
locked locked
macros_record
mirepcb mirepcb
mirror_h mirror_h
mirror_v mirror_v
......
bitmaps_png/sources/macros_record.svg 0 → 100644
View file @ 8a82c615
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="48"
id="svg2"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="0.48.1 "
sodipodi:docname="macros_record.svg"
sodipodi:version="0.32"
version="1.0"
width="48">
<metadata
id="metadata3">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:title>Lapo Calamandrei</dc:title>
<dc:description />
<dc:subject>
<rdf:Bag>
<rdf:li>cassette</rdf:li>
<rdf:li>media</rdf:li>
<rdf:li>tape</rdf:li>
<rdf:li>backup</rdf:li>
<rdf:li>dds</rdf:li>
</rdf:Bag>
</dc:subject>
<dc:publisher>
<cc:Agent
rdf:about="http://www.openclipart.org/">
<dc:title>Open Clip Art Library, Source: GNOME Icon Theme, Source: GNOME Icon Theme, Source: GNOME Icon Theme, Source: GNOME Icon Theme</dc:title>
</cc:Agent>
</dc:publisher>
<dc:creator>
<cc:Agent>
<dc:title>Lapo Calamandrei</dc:title>
</cc:Agent>
</dc:creator>
<dc:rights>
<cc:Agent>
<dc:title>Lapo Calamandrei</dc:title>
</cc:Agent>
</dc:rights>
<dc:date />
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:language>en</dc:language>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4">
<linearGradient
id="linearGradient2870"
inkscape:collect="always">
<stop
id="stop2872"
offset="0"
style="stop-color:#3465a4;stop-opacity:1" />
<stop
id="stop2874"
offset="1"
style="stop-color:#204a87;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient1970">
<stop
id="stop1972"
offset="0"
style="stop-color:#204a87;stop-opacity:1" />
<stop
id="stop1974"
offset="1"
style="stop-color:#204a87;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient2975">
<stop
id="stop2977"
offset="0"
style="stop-color:#d3d7cf;stop-opacity:1" />
<stop
id="stop2979"
offset="1"
style="stop-color:white;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient2966"
inkscape:collect="always">
<stop
id="stop2968"
offset="0"
style="stop-color:black;stop-opacity:1;" />
<stop
id="stop2970"
offset="1"
style="stop-color:black;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient2949"
inkscape:collect="always">
<stop
id="stop2951"
offset="0"
style="stop-color:#babdb6;stop-opacity:1" />
<stop
id="stop2954"
offset="1"
style="stop-color:#555753;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient2885">
<stop
id="stop2887"
offset="0"
style="stop-color:black;stop-opacity:0;" />
<stop
id="stop2893"
offset="0.5"
style="stop-color:black;stop-opacity:1;" />
<stop
id="stop2889"
offset="1"
style="stop-color:black;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient2871"
inkscape:collect="always">
<stop
id="stop2873"
offset="0"
style="stop-color:black;stop-opacity:1;" />
<stop
id="stop2875"
offset="1"
style="stop-color:black;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient2851"
inkscape:collect="always">
<stop
id="stop2853"
offset="0"
style="stop-color:#204a87;stop-opacity:1;" />
<stop
id="stop2855"
offset="1"
style="stop-color:#204a87;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient2843"
inkscape:collect="always">
<stop
id="stop2845"
offset="0"
style="stop-color:white;stop-opacity:1;" />
<stop
id="stop2847"
offset="1"
style="stop-color:white;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient3061">
<stop
id="stop3063"
offset="0"
style="stop-color:black;stop-opacity:1;" />
<stop
id="stop3069"
offset="0.5"
style="stop-color:#474946;stop-opacity:1;" />
<stop
id="stop3065"
offset="1"
style="stop-color:black;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient3053"
inkscape:collect="always">
<stop
id="stop3055"
offset="0"
style="stop-color:white;stop-opacity:1;" />
<stop
id="stop3057"
offset="1"
style="stop-color:white;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient3009">
<stop
id="stop3011"
offset="0"
style="stop-color:#3465a4;stop-opacity:1" />
<stop
id="stop3013"
offset="1"
style="stop-color:#888a85;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient2972">
<stop
id="stop2974"
offset="0"
style="stop-color:#3465a4;stop-opacity:1" />
<stop
id="stop2976"
offset="1"
style="stop-color:#888a85;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient2951">
<stop
id="stop2953"
offset="0"
style="stop-color:white;stop-opacity:0;" />
<stop
id="stop1976"
offset="0.2"
style="stop-color:white;stop-opacity:1;" />
<stop
id="stop1978"
offset="0.5566265"
style="stop-color:white;stop-opacity:1;" />
<stop
id="stop2955"
offset="1"
style="stop-color:white;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient2941">
<stop
id="stop2943"
offset="0"
style="stop-color:#2e3436;stop-opacity:1" />
<stop
id="stop2945"
offset="1"
style="stop-color:#eeeeec;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient2931"
inkscape:collect="always">
<stop
id="stop2933"
offset="0"
style="stop-color:white;stop-opacity:1;" />
<stop
id="stop2935"
offset="1"
style="stop-color:white;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient2907"
inkscape:collect="always">
<stop
id="stop2909"
offset="0"
style="stop-color:#555753;stop-opacity:1" />
<stop
id="stop2911"
offset="1"
style="stop-color:#2e3436;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient2899"
inkscape:collect="always">
<stop
id="stop2901"
offset="0"
style="stop-color:#1a1a1a;stop-opacity:1;" />
<stop
id="stop2903"
offset="1"
style="stop-color:#555753;stop-opacity:1" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0.9984,0,0,1,-49.9128,0)"
gradientUnits="userSpaceOnUse"
id="linearGradient2905"
inkscape:collect="always"
x1="90.598061"
x2="65.869003"
xlink:href="#linearGradient2899"
y1="12.11433"
y2="10.434952" />
<radialGradient
cx="65.359207"
cy="7.6079164"
fx="65.359207"
fy="7.6079164"
gradientTransform="matrix(1.978344,0,0,0.173638,-107.4175,7.676856)"
gradientUnits="userSpaceOnUse"
id="radialGradient2913"
inkscape:collect="always"
r="19.032827"
xlink:href="#linearGradient2907" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient2937"
inkscape:collect="always"
x1="66.75"
x2="52.625"
xlink:href="#linearGradient2931"
y1="55.5"
y2="-4.875" />
<linearGradient
gradientTransform="translate(-50,0)"
gradientUnits="userSpaceOnUse"
id="linearGradient2947"
inkscape:collect="always"
x1="87.1875"
x2="87.1875"
xlink:href="#linearGradient2941"
y1="24.746109"
y2="29.582914" />
<linearGradient
gradientTransform="translate(-50,0)"
gradientUnits="userSpaceOnUse"
id="linearGradient2957"
inkscape:collect="always"
x1="79.3125"
x2="80.6875"
xlink:href="#linearGradient1970"
y1="20.309416"
y2="22.875" />
<linearGradient
gradientTransform="translate(-50,0)"
gradientUnits="userSpaceOnUse"
id="linearGradient2985"
inkscape:collect="always"
x1="70.216614"
x2="75.291542"
xlink:href="#linearGradient2972"
y1="8.8990822"
y2="42.916157" />
<linearGradient
gradientTransform="translate(-50,0)"
gradientUnits="userSpaceOnUse"
id="linearGradient2988"
inkscape:collect="always"
x1="70.216614"
x2="75.291542"
xlink:href="#linearGradient3009"
y1="8.8990822"
y2="42.916157" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient3059"
inkscape:collect="always"
x1="26.125"
x2="26.125"
xlink:href="#linearGradient3053"
y1="25.907301"
y2="21.723757" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient3067"
inkscape:collect="always"
x1="15.904867"
x2="16.907635"
xlink:href="#linearGradient3061"
y1="28.589727"
y2="24.847351" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient2849"
inkscape:collect="always"
x1="23.069899"
x2="6.980577"
xlink:href="#linearGradient2843"
y1="30.631689"
y2="30.631689" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient2857"
inkscape:collect="always"
x1="23"
x2="46.880234"
xlink:href="#linearGradient2851"
y1="23.5"
y2="23.5" />
<radialGradient
cx="2"
cy="36"
fx="2"
fy="36"
gradientTransform="matrix(2,0,0,2,-10,-108)"
gradientUnits="userSpaceOnUse"
id="radialGradient2900"
inkscape:collect="always"
r="2"
xlink:href="#linearGradient2871" />
<radialGradient
cx="2"
cy="36"
fx="2"
fy="36"
gradientTransform="matrix(2,0,0,2,38,-36)"
gradientUnits="userSpaceOnUse"
id="radialGradient2902"
inkscape:collect="always"
r="2"
xlink:href="#linearGradient2871" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient2904"
inkscape:collect="always"
x1="14.0625"
x2="14.0625"
xlink:href="#linearGradient2885"
y1="32"
y2="40.001007" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient2956"
inkscape:collect="always"
x1="16.4375"
x2="16.4375"
xlink:href="#linearGradient2949"
y1="28.703588"
y2="25.648201" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient2973"
inkscape:collect="always"
x1="17.9375"
x2="17.4375"
xlink:href="#linearGradient2966"
y1="29.124975"
y2="25.249989" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient2981"
inkscape:collect="always"
x1="17.0625"
x2="17.0625"
xlink:href="#linearGradient2975"
y1="25.373756"
y2="28.593903" />
<linearGradient
gradientTransform="translate(-50,0)"
gradientUnits="userSpaceOnUse"
id="linearGradient1968"
inkscape:collect="always"
x1="83.8125"
x2="86.3125"
xlink:href="#linearGradient2951"
y1="19.496916"
y2="36" />
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient2876"
inkscape:collect="always"
x1="35.1875"
x2="32.8125"
xlink:href="#linearGradient2870"
y1="42.312241"
y2="22.157804" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2966"
id="linearGradient3091"
gradientUnits="userSpaceOnUse"
x1="17.9375"
y1="29.124975"
x2="17.4375"
y2="25.249989" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2966"
id="linearGradient3093"
gradientUnits="userSpaceOnUse"
x1="17.9375"
y1="29.124975"
x2="17.4375"
y2="25.249989" />
</defs>
<sodipodi:namedview
bordercolor="#afafaf"
borderlayer="false"
borderopacity="1"
height="48px"
id="base"
inkscape:current-layer="layer1"
inkscape:cx="24"
inkscape:cy="24.75"
inkscape:document-units="px"
inkscape:grid-points="true"
inkscape:object-paths="false"
inkscape:object-points="false"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:showpageshadow="true"
inkscape:window-height="968"
inkscape:window-width="1280"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:zoom="18.863636"
pagecolor="#ffffff"
showborder="true"
showgrid="false"
width="48px"
inkscape:window-maximized="1">
<inkscape:grid
id="GridFromPre046Settings"
type="xygrid"
originx="0px"
originy="0px"
spacingx="0.5px"
spacingy="0.5px"
color="#0000ff"
empcolor="#0000ff"
opacity="0.2"
empopacity="0.4"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Livello 1">
<path
d="m 6.4968,7.5 -1.9968,2 0,15.5 39,0 0,-15.5 -0.0624,0 -1.9968,-2 -34.944,0 z"
id="rect2853"
style="color:#000000;fill:url(#linearGradient2905);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:1.20000057;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<path
d="M 6.616789,7.9946858 4.998544,9.7052704 5.005131,10.001073 43.058594,10 43.0642,9.7734375 41.39985,8 6.616789,7.9946858 z"
id="path2862"
sodipodi:nodetypes="ccccccc"
style="color:#000000;fill:url(#radialGradient2913);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000024;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<path
d="m 56.90625,8.46875 -1.4375,1.4375 0,14.125 37.125,0 0,-14.0625 -1.5,-1.5 -34.1875,0 z"
id="path2919"
inkscape:original="M 56.5 7.5 L 54.5 9.5 L 54.5 25 L 93.5625 25 L 93.5625 9.5 L 93.5 9.5 L 91.5 7.5 L 56.5 7.5 z "
inkscape:radius="-0.96875"
sodipodi:type="inkscape:offset"
style="opacity:0.1;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:1.20000057;marker:none;visibility:visible;display:inline;overflow:visible"
transform="translate(-50,0)" />
<g
id="g2895"
style="opacity:0.7"
transform="translate(0,-0.5)">
<rect
height="8"
id="rect2869"
rx="0.25"
ry="0.33333334"
style="fill:url(#radialGradient2900);fill-opacity:1;stroke:none"
transform="scale(-1,-1)"
width="4"
x="-6"
y="-40" />
<rect
height="8"
id="rect2879"
rx="0.25"
ry="0.33333334"
style="fill:url(#radialGradient2902);fill-opacity:1;stroke:none"
width="4"
x="42"
y="32" />
<rect
height="8"
id="rect2883"
style="fill:url(#linearGradient2904);fill-opacity:1;stroke:none"
width="36"
x="6"
y="32" />
</g>
<path
d="m 6.5,11.5 0,5 -2,0 0,19.96875 c 0,0.566049 0.4652,1.031251 1.03125,1.03125 l 36.9375,0 c 0.56605,0 1.031252,-0.465202 1.03125,-1.03125 l 0,-19.96875 -1,0 0,-5 c -0.01027,-3.08e-4 -0.02092,0 -0.03125,0 L 6.5,11.5 z"
id="rect1879"
style="color:#000000;fill:url(#linearGradient2988);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2876);stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:1.20000057;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<path
d="m 8.5,35.5 0,-17.999994 31.999973,0 0,17.999994"
id="rect2774"
sodipodi:nodetypes="cccc"
style="opacity:0.6;color:#000000;fill:none;stroke:url(#linearGradient2957);stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:1.20000057;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<path
d="m 9,24 0,6 16.34375,0 C 25.764262,28.994106 26.000001,27.895117 26,26.75 26,25.79336 25.829472,24.863923 25.53125,24 L 9,24 z"
id="path2827"
style="color:#000000;fill:url(#linearGradient3067);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.94752491000000005;marker:none;visibility:visible;display:inline;overflow:visible;opacity:1"
inkscape:connector-curvature="0" />
<path
d="m 35.90625,27.046875 a 3.796875,3.546875 0 1 1 -7.59375,0 3.796875,3.546875 0 1 1 7.59375,0 z"
id="path2778"
sodipodi:cx="32.109375"
sodipodi:cy="27.046875"
sodipodi:rx="3.796875"
sodipodi:ry="3.546875"
sodipodi:type="arc"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:0.94752491;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:1.20000057;marker:none;visibility:visible;display:inline;overflow:visible"
transform="matrix(1.053505,0,0,1.057278,-1.32736,-1.846054)" />
<path
d="m 35.90625,27.046875 a 3.796875,3.546875 0 1 1 -7.59375,0 3.796875,3.546875 0 1 1 7.59375,0 z"
id="path2815"
sodipodi:cx="32.109375"
sodipodi:cy="27.046875"
sodipodi:rx="3.796875"
sodipodi:ry="3.546875"
sodipodi:type="arc"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#d3d7cf;stroke-width:0.94752491;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:1.20000057;marker:none;visibility:visible;display:inline;overflow:visible"
transform="matrix(1.053505,0,0,1.057278,-17.32736,-1.846054)" />
<path
d="m 9,18 0,6 31,0 0,-6 -31,0 z m 0,12 0,7 31,0 0,-7 -31,0 z"
id="rect2829"
style="color:#000000;fill:url(#linearGradient2985);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<path
d="m 57.5,12.5 0,4 a 1.0001,1.0001 0 0 1 -1,1 l -1,0 0,18.96875 c 0,0.01816 0.01309,0.03125 0.03125,0.03125 l 36.9375,0 c 0.01816,0 0.03125,-0.0131 0.03125,-0.03125 L 92.5,17.5 a 1.0001,1.0001 0 0 1 -1,-1 l 0,-4 -34,0 z"
id="path2838"
inkscape:original="M 56.5 11.5 L 56.5 16.5 L 54.5 16.5 L 54.5 36.46875 C 54.5 37.034799 54.9652 37.500001 55.53125 37.5 L 92.46875 37.5 C 93.0348 37.5 93.500002 37.034798 93.5 36.46875 L 93.5 16.5 L 92.5 16.5 L 92.5 11.5 C 92.489734 11.499692 92.479085 11.5 92.46875 11.5 L 56.5 11.5 z "
inkscape:radius="-1"
sodipodi:type="inkscape:offset"
style="opacity:0.15;color:#000000;fill:none;stroke:url(#linearGradient2937);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:1.20000057;marker:none;visibility:visible;display:inline;overflow:visible"
transform="translate(-50,0)" />
<path
d="m 9.5,23.5 30,0"
id="path2990"
style="opacity:0.4;fill:#204a87;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2857);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
inkscape:connector-curvature="0" />
<path
d="m 39.5,30.5 -30,0"
id="path2992"
style="opacity:0.2;fill:none;stroke:url(#linearGradient2849);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
inkscape:connector-curvature="0" />
<path
d="m 16,24.5 0,0.9375 c -0.147207,0.048 -0.283915,0.10148 -0.40625,0.1875 l -0.78125,-0.4375 -0.5,0.875 0.71875,0.40625 C 15.011257,26.560269 15,26.652966 15,26.75 c 0,0.09703 0.01126,0.189732 0.03125,0.28125 l -0.71875,0.40625 0.5,0.875 0.78125,-0.4375 C 15.716085,27.96102 15.852793,28.014497 16,28.0625 L 16,29 l 1,0 0,-0.9375 c 0.147207,-0.048 0.283915,-0.10148 0.40625,-0.1875 l 0.78125,0.4375 0.5,-0.875 -0.71875,-0.40625 C 17.988743,26.939732 18,26.847034 18,26.75 18,26.65297 17.98874,26.560268 17.96875,26.46875 l 0.71875,-0.40625 -0.5,-0.875 -0.78125,0.4375 C 17.283915,25.53898 17.147207,25.485503 17,25.4375 l 0,-0.9375 -1,0 z m 16,0 0,0.9375 c -0.147207,0.048 -0.283915,0.10148 -0.40625,0.1875 l -0.78125,-0.4375 -0.5,0.875 0.71875,0.40625 C 31.011257,26.560269 31,26.652966 31,26.75 c 0,0.09703 0.01126,0.189732 0.03125,0.28125 l -0.71875,0.40625 0.5,0.875 0.78125,-0.4375 C 31.716085,27.96102 31.852793,28.014497 32,28.0625 L 32,29 l 1,0 0,-0.9375 c 0.147207,-0.048 0.283915,-0.10148 0.40625,-0.1875 l 0.78125,0.4375 0.5,-0.875 -0.71875,-0.40625 C 33.988743,26.939732 34,26.847034 34,26.75 34,26.65297 33.98874,26.560268 33.96875,26.46875 l 0.71875,-0.40625 -0.5,-0.875 -0.78125,0.4375 C 33.283915,25.53898 33.147207,25.485503 33,25.4375 l 0,-0.9375 -1,0 z"
id="path2780"
style="color:#000000;fill:url(#linearGradient2956);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2981);stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:1.20000057;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<rect
height="2"
id="rect3039"
rx="1"
ry="1"
style="opacity:0.06410256;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
width="12"
x="9"
y="14" />
<g
id="g2993"
style="opacity:0.4">
<path
d="m 35,13 0,3 c 2.5,0 2.5,-3 0,-3 z"
id="path3026"
sodipodi:nodetypes="ccc"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<path
d="m 39,14 c 0.0051,-1.000109 2,-1 2,-1 l 0,3 -2,0 c 3,-1 0,-1.093615 0,-2 z"
id="path3031"
sodipodi:nodetypes="ccccc"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
<path
d="m 37,13 0,3 c 2.5,0 2.5,-3 0,-3 z"
id="path2859"
sodipodi:nodetypes="ccc"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
</g>
<g
id="g2962"
style="opacity:0.1;fill-opacity:1;stroke:url(#linearGradient2973)">
<path
d="m 35.90625,27.046875 a 3.796875,3.546875 0 1 1 -7.59375,0 3.796875,3.546875 0 1 1 7.59375,0 z"
id="path2958"
sodipodi:cx="32.109375"
sodipodi:cy="27.046875"
sodipodi:rx="3.796875"
sodipodi:ry="3.546875"
sodipodi:type="arc"
style="color:#000000;fill:none;stroke:url(#linearGradient3091);stroke-width:0.4097665;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.40976651, 0.81953301;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
transform="matrix(0.731214,0,0,0.733036,9.021239,6.923655)" />
<path
d="m 35.90625,27.046875 a 3.796875,3.546875 0 1 1 -7.59375,0 3.796875,3.546875 0 1 1 7.59375,0 z"
id="path2960"
sodipodi:cx="32.109375"
sodipodi:cy="27.046875"
sodipodi:rx="3.796875"
sodipodi:ry="3.546875"
sodipodi:type="arc"
style="color:#000000;fill:none;stroke:url(#linearGradient3093);stroke-width:0.4097665;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:0.40976651, 0.81953301;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
transform="matrix(0.731214,0,0,0.733036,-6.97876,6.923655)" />
</g>
<path
d="m 8.5,17.500006 31.999973,0 0,17.999994"
id="path1966"
sodipodi:nodetypes="ccc"
style="opacity:0.3;color:#000000;fill:none;stroke:url(#linearGradient1968);stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:1.20000057;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:connector-curvature="0" />
</g>
</svg>
pcbnew/menubar_pcbframe.cpp
View file @ 8a82c615
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
void PCB_EDIT_FRAME::ReCreateMenuBar() void PCB_EDIT_FRAME::ReCreateMenuBar()
{ {
wxString text; wxString text;
wxMenuItem* item;
wxMenuBar* menuBar = GetMenuBar(); wxMenuBar* menuBar = GetMenuBar();
if( ! menuBar ) if( ! menuBar )
...@@ -37,11 +36,10 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -37,11 +36,10 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
wxMenu* filesMenu = new wxMenu; wxMenu* filesMenu = new wxMenu;
// New // New
item = new wxMenuItem( filesMenu, ID_NEW_BOARD, AddMenuItem( filesMenu, ID_NEW_BOARD,
_( "&New" ), _( "&New" ),
_( "Clear current board and initialize a new one" ) ); _( "Clear current board and initialize a new one" ),
SET_BITMAP( KiBitmap( new_xpm ) ); KiBitmap( new_xpm ) );
filesMenu->Append( item );
// Open // Open
text = AddHotkeyName( _( "&Open" ), g_Board_Editor_Hokeys_Descr, text = AddHotkeyName( _( "&Open" ), g_Board_Editor_Hokeys_Descr,
...@@ -68,11 +66,10 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -68,11 +66,10 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// Pcbnew Board // Pcbnew Board
item = new wxMenuItem( filesMenu, ID_APPEND_FILE, AddMenuItem( filesMenu, ID_APPEND_FILE,
_( "&Append Board" ), _( "&Append Board" ),
_( "Append another Pcbnew board to the current loaded board" ) ); _( "Append another Pcbnew board to the current loaded board" ),
SET_BITMAP( KiBitmap( import_xpm ) ); KiBitmap( import_xpm ) );
filesMenu->Append( item );
// Separator // Separator
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
...@@ -81,59 +78,52 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -81,59 +78,52 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
text = AddHotkeyName( _( "&Save" ), g_Board_Editor_Hokeys_Descr, text = AddHotkeyName( _( "&Save" ), g_Board_Editor_Hokeys_Descr,
HK_SAVE_BOARD ); HK_SAVE_BOARD );
AddMenuItem( filesMenu, ID_SAVE_BOARD, text, AddMenuItem( filesMenu, ID_SAVE_BOARD, text,
_( "Save current board" ), _( "Save current board" ),
KiBitmap( save_xpm ) ); KiBitmap( save_xpm ) );
// Save As // Save As
item = new wxMenuItem( filesMenu, ID_SAVE_BOARD_AS, AddMenuItem( filesMenu, ID_SAVE_BOARD_AS,
_( "Save as..." ), _( "Save as..." ),
_( "Save the current board as.." ) ); _( "Save the current board as.." ),
SET_BITMAP( KiBitmap( save_as_xpm ) ); KiBitmap( save_as_xpm ) );
filesMenu->Append( item );
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
// Revert // Revert
item = new wxMenuItem( filesMenu, ID_MENU_READ_LAST_SAVED_VERSION_BOARD, AddMenuItem( filesMenu, ID_MENU_READ_LAST_SAVED_VERSION_BOARD,
_( "&Revert" ), _( "&Revert" ),
_( "Clear board and get previous saved version of board" ) ); _( "Clear board and get previous saved version of board" ),
SET_BITMAP( KiBitmap( jigsaw_xpm ) ); KiBitmap( jigsaw_xpm ) );
filesMenu->Append( item );
// Rescue // Rescue
item = new wxMenuItem( filesMenu, ID_MENU_RECOVER_BOARD, _( "&Rescue" ), AddMenuItem( filesMenu, ID_MENU_RECOVER_BOARD, _( "&Rescue" ),
_( "Clear old board and get last rescue file" ) ); _( "Clear old board and get last rescue file" ),
SET_BITMAP( KiBitmap( hammer_xpm ) ); KiBitmap( hammer_xpm ) );
filesMenu->Append( item );
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
/* Fabrication Outputs submenu */ /* Fabrication Outputs submenu */
wxMenu* fabricationOutputsMenu = new wxMenu; wxMenu* fabricationOutputsMenu = new wxMenu;
item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE, AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE,
_( "&Modules Position File" ), _( "&Modules Position File" ),
_( "Generate modules position file for pick and place" ) ); _( "Generate modules position file for pick and place" ),
SET_BITMAP( KiBitmap( post_compo_xpm ) ); KiBitmap( post_compo_xpm ) );
fabricationOutputsMenu->Append( item );
item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE, AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE,
_( "&Drill File" ), _( "&Drill File" ),
_( "Generate excellon2 drill file" ) ); _( "Generate excellon2 drill file" ),
SET_BITMAP( KiBitmap( post_drill_xpm ) ); KiBitmap( post_drill_xpm ) );
fabricationOutputsMenu->Append( item );
// Component File // Component File
item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_CMP_FILE, AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_CMP_FILE,
_( "&Component File" ), _( "&Component File" ),
_( "(Re)create components file (*.cmp) for CvPcb" ) ); _( "(Re)create components file (*.cmp) for CvPcb" ),
SET_BITMAP( KiBitmap( create_cmp_file_xpm ) ); KiBitmap( create_cmp_file_xpm ) );
fabricationOutputsMenu->Append( item );
// BOM File // BOM File
item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_BOM_FILE_FROM_BOARD, AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_BOM_FILE_FROM_BOARD,
_( "&BOM File" ), _( "&BOM File" ),
_( "Create a bill of materials from schematic" ) ); _( "Create a bill of materials from schematic" ),
SET_BITMAP( KiBitmap( tools_xpm ) ); KiBitmap( tools_xpm ) );
fabricationOutputsMenu->Append( item );
// Fabrications Outputs submenu append // Fabrications Outputs submenu append
AddMenuItem( filesMenu, fabricationOutputsMenu, AddMenuItem( filesMenu, fabricationOutputsMenu,
...@@ -142,52 +132,45 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -142,52 +132,45 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
KiBitmap( fabrication_xpm ) ); KiBitmap( fabrication_xpm ) );
/** Import submenu **/ /** Import submenu **/
wxMenu* submenuImport = new wxMenu(); wxMenu* submenuImport = new wxMenu();
// Specctra Session // Specctra Session
item = new wxMenuItem( submenuImport, ID_GEN_IMPORT_SPECCTRA_SESSION, AddMenuItem( submenuImport, ID_GEN_IMPORT_SPECCTRA_SESSION,
_( "&Specctra Session" ), _( "&Specctra Session" ),
_( "Import a routed \"Specctra Session\" (*.ses) file" ) ); _( "Import a routed \"Specctra Session\" (*.ses) file" ),
SET_BITMAP( KiBitmap( import_xpm ) ); // @todo need better bitmap KiBitmap( import_xpm ) );
submenuImport->Append( item );
AddMenuItem( filesMenu, submenuImport, AddMenuItem( filesMenu, submenuImport,
ID_GEN_IMPORT_FILE, _( "Import" ), ID_GEN_IMPORT_FILE, _( "Import" ),
_( "Import files" ), KiBitmap( import_xpm ) ); _( "Import files" ), KiBitmap( import_xpm ) );
/** Export submenu **/ /** Export submenu **/
wxMenu* submenuexport = new wxMenu(); wxMenu* submenuexport = new wxMenu();
// Specctra DSN // Specctra DSN
item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_SPECCTRA, AddMenuItem( submenuexport, ID_GEN_EXPORT_SPECCTRA,
_( "&Specctra DSN" ), _( "&Specctra DSN" ),
_( "Export the current board to a \"Specctra DSN\" file" ) ); _( "Export the current board to a \"Specctra DSN\" file" ),
SET_BITMAP( KiBitmap( export_xpm ) ); KiBitmap( export_xpm ) );
submenuexport->Append( item );
// GenCAD // GenCAD
item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_GENCADFORMAT, AddMenuItem( submenuexport, ID_GEN_EXPORT_FILE_GENCADFORMAT,
_( "&GenCAD" ), _( "Export GenCAD format" ) ); _( "&GenCAD" ), _( "Export GenCAD format" ),
SET_BITMAP( KiBitmap( export_xpm ) ); KiBitmap( export_xpm ) );
submenuexport->Append( item );
// Module Report // Module Report
item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_MODULE_REPORT, AddMenuItem( submenuexport, ID_GEN_EXPORT_FILE_MODULE_REPORT,
_( "&Module Report" ), _( "&Module Report" ),
_( "Create a report of all modules on the current board" ) ); _( "Create a report of all modules on the current board" ),
SET_BITMAP( KiBitmap( tools_xpm ) ); KiBitmap( tools_xpm ) );
submenuexport->Append( item );
// VRML // VRML
item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_VRML, AddMenuItem( submenuexport, ID_GEN_EXPORT_FILE_VRML,
_( "&VRML" ), _( "&VRML" ),
_( "Export a VRML board representation" ) ); _( "Export a VRML board representation" ),
SET_BITMAP( KiBitmap( three_d_xpm ) ); KiBitmap( three_d_xpm ) );
submenuexport->Append( item );
AddMenuItem( filesMenu, submenuexport, AddMenuItem( filesMenu, submenuexport,
ID_GEN_EXPORT_FILE, _( "&Export" ), ID_GEN_EXPORT_FILE, _( "&Export" ),
...@@ -196,49 +179,43 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -196,49 +179,43 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
// Page settings // Page settings
item = new wxMenuItem( filesMenu, ID_SHEET_SET, AddMenuItem( filesMenu, ID_SHEET_SET,
_( "&Page settings" ), _( "&Page settings" ),
_( "Page settings for paper size and texts" ) ); _( "Page settings for paper size and texts" ),
SET_BITMAP( KiBitmap( sheetset_xpm ) ); KiBitmap( sheetset_xpm ) );
filesMenu->Append( item );
// Print // Print
item = new wxMenuItem( filesMenu, wxID_PRINT, AddMenuItem( filesMenu, wxID_PRINT,
_( "&Print" ), _( "&Print" ), _( "Print board" ),
_( "Print board" ) ); KiBitmap( print_button_xpm ) );
SET_BITMAP( KiBitmap( print_button_xpm ) );
filesMenu->Append( item );
// Create SVG file // Create SVG file
item = new wxMenuItem( filesMenu, ID_GEN_PLOT_SVG, AddMenuItem( filesMenu, ID_GEN_PLOT_SVG,
_( "Print S&VG" ), _( "Print S&VG" ),
_( "Plot board in Scalable Vector Graphics format" ) ); _( "Plot board in Scalable Vector Graphics format" ),
SET_BITMAP( KiBitmap( print_button_xpm ) ); KiBitmap( print_button_xpm ) );
filesMenu->Append( item );
// Plot // Plot
item = new wxMenuItem( filesMenu, ID_GEN_PLOT, AddMenuItem( filesMenu, ID_GEN_PLOT,
_( "&Plot" ), _( "&Plot" ),
_( "Plot board in HPGL, PostScript or Gerber RS-274X format)" ) ); _( "Plot board in HPGL, PostScript or Gerber RS-274X format)" ),
SET_BITMAP( KiBitmap( plot_xpm ) ); KiBitmap( plot_xpm ) );
filesMenu->Append( item );
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
wxMenu* submenuarchive = new wxMenu(); wxMenu* submenuarchive = new wxMenu();
// Archive New Footprints // Archive New Footprints
item = new wxMenuItem( submenuarchive, ID_MENU_ARCHIVE_NEW_MODULES, AddMenuItem( submenuarchive, ID_MENU_ARCHIVE_NEW_MODULES,
_( "Archive New Footprints" ), _( "Archive New Footprints" ),
_( "Archive new footprints only in a library (keep other footprints in this lib)" ) ); _( "Archive new footprints only in a library (keep other footprints in this lib)" ),
SET_BITMAP( KiBitmap( library_update_xpm ) ); KiBitmap( library_update_xpm ) );
submenuarchive->Append( item );
// Create FootPrint Archive // Create FootPrint Archive
item = new wxMenuItem( submenuarchive, ID_MENU_ARCHIVE_ALL_MODULES, AddMenuItem( submenuarchive, ID_MENU_ARCHIVE_ALL_MODULES,
_( "Create Footprint Archive" ), _( "Create Footprint Archive" ),
_( "Archive all footprints in a library (old library will be deleted)" ) ); _( "Archive all footprints in a library (old library will be deleted)" ),
SET_BITMAP( KiBitmap( library_xpm ) ); KiBitmap( library_xpm ) );
submenuarchive->Append( item );
AddMenuItem( filesMenu, submenuarchive, AddMenuItem( filesMenu, submenuarchive,
ID_MENU_ARCHIVE_MODULES, ID_MENU_ARCHIVE_MODULES,
...@@ -248,56 +225,47 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -248,56 +225,47 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
/* Quit */ /* Quit */
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ), _( "Quit Pcbnew" ) ); AddMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ), _( "Quit Pcbnew" ),
SET_BITMAP( KiBitmap( exit_xpm ) ); KiBitmap( exit_xpm ) );
filesMenu->Append( item );
/** Create Edit menu **/ /** Create Edit menu **/
wxMenu* editMenu = new wxMenu; wxMenu* editMenu = new wxMenu;
// Undo // Undo
text = AddHotkeyName( _( "Undo" ), g_Pcbnew_Editor_Hokeys_Descr, HK_UNDO ); text = AddHotkeyName( _( "Undo" ), g_Pcbnew_Editor_Hokeys_Descr, HK_UNDO );
item = new wxMenuItem( editMenu, wxID_UNDO, text, AddMenuItem( editMenu, wxID_UNDO, text,
HELP_UNDO, wxITEM_NORMAL ); HELP_UNDO, KiBitmap( undo_xpm ) );
SET_BITMAP( KiBitmap( undo_xpm ) );
editMenu->Append( item );
// Redo // Redo
text = AddHotkeyName( _( "Redo" ), g_Pcbnew_Editor_Hokeys_Descr, HK_REDO ); text = AddHotkeyName( _( "Redo" ), g_Pcbnew_Editor_Hokeys_Descr, HK_REDO );
item = new wxMenuItem( editMenu, wxID_REDO, text, AddMenuItem( editMenu, wxID_REDO, text,
HELP_REDO, wxITEM_NORMAL ); HELP_REDO, KiBitmap( redo_xpm ) );
SET_BITMAP( KiBitmap( redo_xpm ) );
editMenu->Append( item );
// Delete // Delete
item = new wxMenuItem( editMenu, ID_PCB_DELETE_ITEM_BUTT, AddMenuItem( editMenu, ID_PCB_DELETE_ITEM_BUTT,
_( "Delete" ), _( "Delete" ), _( "Delete items" ),
_( "Delete items" ) ); KiBitmap( delete_body_xpm ) );
SET_BITMAP( KiBitmap( delete_body_xpm ) );
editMenu->Append( item );
editMenu->AppendSeparator(); editMenu->AppendSeparator();
// Find // Find
text = AddHotkeyName( _( "&Find" ), g_Pcbnew_Editor_Hokeys_Descr, HK_FIND_ITEM ); text = AddHotkeyName( _( "&Find" ), g_Pcbnew_Editor_Hokeys_Descr, HK_FIND_ITEM );
item = new wxMenuItem( editMenu, ID_FIND_ITEMS, AddMenuItem( editMenu, ID_FIND_ITEMS,
text, HELP_FIND ); text, HELP_FIND , KiBitmap( find_xpm ) );
SET_BITMAP( KiBitmap( find_xpm ) );
editMenu->Append( item );
editMenu->AppendSeparator(); editMenu->AppendSeparator();
// Global Deletions // Global Deletions
item = new wxMenuItem( editMenu, ID_PCB_GLOBAL_DELETE, AddMenuItem( editMenu, ID_PCB_GLOBAL_DELETE,
_( "Global &Deletions" ), _( "Global &Deletions" ),
_( "Delete tracks, modules, texts... on board" ) ); _( "Delete tracks, modules, texts... on board" ),
SET_BITMAP( KiBitmap( general_deletions_xpm ) ); KiBitmap( general_deletions_xpm ) );
editMenu->Append( item );
// Cleanup Tracks and Vias // Cleanup Tracks and Vias
item = new wxMenuItem( editMenu, ID_MENU_PCB_CLEAN, AddMenuItem( editMenu, ID_MENU_PCB_CLEAN,
_( "&Cleanup Tracks and Vias" ), _( "&Cleanup Tracks and Vias" ),
_( "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" ) ); _( "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" ),
SET_BITMAP( KiBitmap( delete_body_xpm ) ); KiBitmap( delete_body_xpm ) );
editMenu->Append( item );
// Swap Layers // Swap Layers
AddMenuItem( editMenu, ID_MENU_PCB_SWAP_LAYERS, AddMenuItem( editMenu, ID_MENU_PCB_SWAP_LAYERS,
...@@ -306,20 +274,16 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -306,20 +274,16 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
KiBitmap( swap_layer_xpm ) ); KiBitmap( swap_layer_xpm ) );
// Reset module reference sizes // Reset module reference sizes
item = new wxMenuItem( editMenu, AddMenuItem( editMenu, ID_MENU_PCB_RESET_TEXTMODULE_REFERENCE_SIZES,
ID_MENU_PCB_RESET_TEXTMODULE_REFERENCE_SIZES, _( "Reset Module &Reference Sizes" ),
_( "Reset Module &Reference Sizes" ), _( "Reset text size and width of all module references to current defaults" ),
_( "Reset text size and width of all module references to current defaults" ) ); KiBitmap( reset_text_xpm ) );
SET_BITMAP( KiBitmap( reset_text_xpm ) );
editMenu->Append( item );
// Reset module value sizes // Reset module value sizes
item = new wxMenuItem( editMenu, AddMenuItem( editMenu, ID_MENU_PCB_RESET_TEXTMODULE_VALUE_SIZES,
ID_MENU_PCB_RESET_TEXTMODULE_VALUE_SIZES, _( "Reset Module &Value Sizes" ),
_( "Reset Module &Value Sizes" ), _( "Reset text size and width of all module values to current defaults" ),
_( "Reset text size and width of all module values to current defaults" ) ); KiBitmap( reset_text_xpm ) );
SET_BITMAP( KiBitmap( reset_text_xpm ) );
editMenu->Append( item );
/** Create View menu **/ /** Create View menu **/
wxMenu* viewMenu = new wxMenu; wxMenu* viewMenu = new wxMenu;
...@@ -338,215 +302,164 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -338,215 +302,164 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// Zoom In // Zoom In
text = AddHotkeyName( _( "Zoom In" ), g_Pcbnew_Editor_Hokeys_Descr, text = AddHotkeyName( _( "Zoom In" ), g_Pcbnew_Editor_Hokeys_Descr,
HK_ZOOM_IN, IS_ACCELERATOR ); HK_ZOOM_IN, IS_ACCELERATOR );
item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN, wxITEM_NORMAL ); AddMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN, KiBitmap( zoom_in_xpm ) );
SET_BITMAP( KiBitmap( zoom_in_xpm ) );
viewMenu->Append( item );
// Zoom Out // Zoom Out
text = AddHotkeyName( _( "Zoom Out" ), g_Pcbnew_Editor_Hokeys_Descr, text = AddHotkeyName( _( "Zoom Out" ), g_Pcbnew_Editor_Hokeys_Descr,
HK_ZOOM_OUT, IS_ACCELERATOR ); HK_ZOOM_OUT, IS_ACCELERATOR );
item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, wxITEM_NORMAL ); AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) );
SET_BITMAP( KiBitmap( zoom_out_xpm ) );
viewMenu->Append( item );
// Fit on Screen // Fit on Screen
text = AddHotkeyName( _( "Fit on Screen" ), g_Pcbnew_Editor_Hokeys_Descr, text = AddHotkeyName( _( "Fit on Screen" ), g_Pcbnew_Editor_Hokeys_Descr,
HK_ZOOM_AUTO ); HK_ZOOM_AUTO );
item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, wxITEM_NORMAL ); AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT,
SET_BITMAP( KiBitmap( zoom_fit_in_page_xpm ) ); KiBitmap( zoom_fit_in_page_xpm ) );
viewMenu->Append( item );
viewMenu->AppendSeparator(); viewMenu->AppendSeparator();
// Redraw // Redraw
text = AddHotkeyName( _( "Redraw" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_REDRAW ); text = AddHotkeyName( _( "Redraw" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_REDRAW );
item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW, text, AddMenuItem( viewMenu, ID_ZOOM_REDRAW, text,
HELP_ZOOM_REDRAW, wxITEM_NORMAL ); HELP_ZOOM_REDRAW, KiBitmap( zoom_redraw_xpm ) );
SET_BITMAP( KiBitmap( zoom_redraw_xpm ) );
viewMenu->Append( item );
viewMenu->AppendSeparator(); viewMenu->AppendSeparator();
// 3D Display // 3D Display
item = new wxMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME, AddMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME,
_( "3D Display" ), _( "3D Display" ),_( "Show board in 3D viewer" ),
_( "Show board in 3D viewer" ) ); KiBitmap( three_d_xpm ) );
SET_BITMAP( KiBitmap( three_d_xpm ) );
viewMenu->Append( item );
// List Nets // List Nets
item = new wxMenuItem( viewMenu, ID_MENU_LIST_NETS, AddMenuItem( viewMenu, ID_MENU_LIST_NETS,
_( "&List Nets" ), _( "&List Nets" ), _( "View a list of nets with names and id's" ),
_( "View a list of nets with names and id's" ) ); KiBitmap( tools_xpm ) );
SET_BITMAP( KiBitmap( tools_xpm ) );
viewMenu->Append( item );
/** Create Place Menu **/ /** Create Place Menu **/
wxMenu* placeMenu = new wxMenu; wxMenu* placeMenu = new wxMenu;
// Module // Module
text = AddHotkeyName( _( "Module" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ADD_MODULE, IS_ACCELERATOR ); text = AddHotkeyName( _( "Module" ), g_Pcbnew_Editor_Hokeys_Descr,
item = new wxMenuItem( placeMenu, ID_PCB_MODULE_BUTT, text, HK_ADD_MODULE, IS_ACCELERATOR );
_( "Add modules" ), wxITEM_NORMAL ); AddMenuItem( placeMenu, ID_PCB_MODULE_BUTT, text,
_( "Add modules" ), KiBitmap( module_xpm ) );
SET_BITMAP( KiBitmap( module_xpm ) );
placeMenu->Append( item );
// Track // Track
text = AddHotkeyName( _( "Track" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ADD_NEW_TRACK, IS_ACCELERATOR ); text = AddHotkeyName( _( "Track" ), g_Pcbnew_Editor_Hokeys_Descr,
item = new wxMenuItem( placeMenu, ID_TRACK_BUTT, text, HK_ADD_NEW_TRACK, IS_ACCELERATOR );
_( "Add tracks and vias" ), wxITEM_NORMAL ); AddMenuItem( placeMenu, ID_TRACK_BUTT, text,
_( "Add tracks and vias" ), KiBitmap( add_tracks_xpm ) );
SET_BITMAP( KiBitmap( add_tracks_xpm ) );
placeMenu->Append( item );
// Zone // Zone
item = new wxMenuItem( placeMenu, ID_PCB_ZONES_BUTT, AddMenuItem( placeMenu, ID_PCB_ZONES_BUTT,
_( "Zone" ), _( "Zone" ), _( "Add filled zones" ), KiBitmap( add_zone_xpm ) );
_( "Add filled zones" ));
SET_BITMAP( KiBitmap( add_zone_xpm ) );
placeMenu->Append( item );
// Text // Text
item = new wxMenuItem( placeMenu, ID_PCB_ADD_TEXT_BUTT, AddMenuItem( placeMenu, ID_PCB_ADD_TEXT_BUTT,
_( "Text" ), _( "Text" ), _( "Add text on copper layers or graphic text" ),
_( "Add text on copper layers or graphic text" ) ); KiBitmap( add_text_xpm ) );
SET_BITMAP( KiBitmap( add_text_xpm ) );
placeMenu->Append( item );
// Graphic Arc // Graphic Arc
item = new wxMenuItem( placeMenu, ID_PCB_ARC_BUTT, AddMenuItem( placeMenu, ID_PCB_ARC_BUTT,
_( "Arc" ), _( "Arc" ), _( "Add graphic arc" ),KiBitmap( add_arc_xpm ) );
_( "Add graphic arc" ) );
SET_BITMAP( KiBitmap( add_arc_xpm ) );
placeMenu->Append( item );
// Graphic Circle // Graphic Circle
item = new wxMenuItem( placeMenu, ID_PCB_CIRCLE_BUTT, AddMenuItem( placeMenu, ID_PCB_CIRCLE_BUTT,
_( "Circle" ), _( "Circle" ), _( "Add graphic circle" ),
_( "Add graphic circle" )); KiBitmap( add_circle_xpm ) );
SET_BITMAP( KiBitmap( add_circle_xpm ) );
placeMenu->Append( item );
// Line or Polygon // Line or Polygon
item = new wxMenuItem( placeMenu, ID_PCB_ADD_LINE_BUTT, AddMenuItem( placeMenu, ID_PCB_ADD_LINE_BUTT,
_( "Line or Polygon" ), _( "Line or Polygon" ),
_( "Add graphic line or polygon" )); _( "Add graphic line or polygon" ),
SET_BITMAP( KiBitmap( add_dashed_line_xpm ) ); KiBitmap( add_dashed_line_xpm ) );
placeMenu->Append( item );
placeMenu->AppendSeparator(); placeMenu->AppendSeparator();
// Dimension // Dimension
item = new wxMenuItem( placeMenu, ID_PCB_DIMENSION_BUTT, AddMenuItem( placeMenu, ID_PCB_DIMENSION_BUTT,
_( "Dimension" ), _( "Dimension" ), _( "Add dimension" ),
_( "Add dimension" ) ); KiBitmap( add_dimension_xpm ) );
SET_BITMAP( KiBitmap( add_dimension_xpm ) );
placeMenu->Append( item );
// Layer alignment target // Layer alignment target
item = new wxMenuItem( placeMenu, ID_PCB_MIRE_BUTT, AddMenuItem( placeMenu, ID_PCB_MIRE_BUTT,
_( "Layer alignment target" ), _( "Layer alignment target" ), _( "Add layer alignment target" ),
_( "Add layer alignment target" )); KiBitmap( add_mires_xpm ) );
SET_BITMAP( KiBitmap( add_mires_xpm ) );
placeMenu->Append( item );
placeMenu->AppendSeparator(); placeMenu->AppendSeparator();
// Drill & Place Offset // Drill & Place Offset
item = new wxMenuItem( placeMenu, ID_PCB_PLACE_OFFSET_COORD_BUTT, AddMenuItem( placeMenu, ID_PCB_PLACE_OFFSET_COORD_BUTT,
_( "Drill and Place Offset" ), _( "Drill and Place Offset" ),
_( "Place the origin point for drill and place files" )); _( "Place the origin point for drill and place files" ),
SET_BITMAP( KiBitmap( pcb_offset_xpm ) ); KiBitmap( pcb_offset_xpm ) );
placeMenu->Append( item );
// Grid Origin // Grid Origin
item = new wxMenuItem( placeMenu, ID_PCB_PLACE_GRID_COORD_BUTT, AddMenuItem( placeMenu, ID_PCB_PLACE_GRID_COORD_BUTT,
_( "Grid Origin" ), _( "Grid Origin" ),
_( "Set the origin point for the grid" )); _( "Set the origin point for the grid" ),
SET_BITMAP( KiBitmap( grid_select_axis_xpm ) ); KiBitmap( grid_select_axis_xpm ) );
placeMenu->Append( item );
/* Create Preferences and configuration menu */
/** Create Preferences and configuration menu **/
wxMenu* configmenu = new wxMenu; wxMenu* configmenu = new wxMenu;
// Library // Library
item = new wxMenuItem( configmenu, ID_CONFIG_REQ, AddMenuItem( configmenu, ID_CONFIG_REQ,
_( "&Library" ), _( "&Library" ), _( "Setting libraries, directories and others..." ),
_( "Setting libraries, directories and others..." ) ); KiBitmap( library_xpm ) );
SET_BITMAP( KiBitmap( library_xpm ) );
configmenu->Append( item );
// Colors and Visibility are also handled by the layers manager toolbar // Colors and Visibility are also handled by the layers manager toolbar
item = new wxMenuItem( configmenu, ID_MENU_PCB_SHOW_HIDE_LAYERS_MANAGER_DIALOG, AddMenuItem( configmenu, ID_MENU_PCB_SHOW_HIDE_LAYERS_MANAGER_DIALOG,
m_show_layer_manager_tools ? m_show_layer_manager_tools ?
_( "Hide &Layers Manager" ) : _("Show &Layers Manager" ), _( "Hide &Layers Manager" ) : _("Show &Layers Manager" ),
HELP_SHOW_HIDE_LAYERMANAGER ); HELP_SHOW_HIDE_LAYERMANAGER,
SET_BITMAP( KiBitmap( layers_manager_xpm ) ); KiBitmap( layers_manager_xpm ) );
configmenu->Append( item );
// General // General
#ifdef __WXMAC__ #ifdef __WXMAC__
configmenu->Append(wxID_PREFERENCES); configmenu->Append(wxID_PREFERENCES);
#else #else
item = new wxMenuItem( configmenu, wxID_PREFERENCES, AddMenuItem( configmenu, wxID_PREFERENCES,
_( "&General" ), _( "&General" ), _( "Select general options for Pcbnew" ),
_( "Select general options for Pcbnew" ) ); KiBitmap( preference_xpm ) );
SET_BITMAP( KiBitmap( preference_xpm ) );
configmenu->Append( item );
#endif #endif
// Display // Display
item = new wxMenuItem( configmenu, ID_PCB_DISPLAY_OPTIONS_SETUP, AddMenuItem( configmenu, ID_PCB_DISPLAY_OPTIONS_SETUP,
_( "&Display" ), _( "&Display" ),
_( "Select how items (pads, tracks texts ... ) are displayed" ) ); _( "Select how items (pads, tracks texts ... ) are displayed" ),
SET_BITMAP( KiBitmap( display_options_xpm ) ); KiBitmap( display_options_xpm ) );
configmenu->Append( item );
// Create Dimensions submenu // Create Dimensions submenu
wxMenu* dimensionsMenu = new wxMenu; wxMenu* dimensionsMenu = new wxMenu;
// Grid // Grid
item = new wxMenuItem( dimensionsMenu, ID_PCB_USER_GRID_SETUP, AddMenuItem( dimensionsMenu, ID_PCB_USER_GRID_SETUP,
_( "Grid" ), _( "Grid" ),_( "Adjust user grid dimensions" ),
_( "Adjust user grid dimensions" ) ); KiBitmap( grid_xpm ) );
SET_BITMAP( KiBitmap( grid_xpm ) );
dimensionsMenu->Append( item );
// Text and Drawings // Text and Drawings
item = new wxMenuItem( dimensionsMenu, ID_PCB_DRAWINGS_WIDTHS_SETUP, AddMenuItem( dimensionsMenu, ID_PCB_DRAWINGS_WIDTHS_SETUP,
_( "Texts and Drawings" ), _( "Texts and Drawings" ),
_( "Adjust dimensions for texts and drawings" ) ); _( "Adjust dimensions for texts and drawings" ),
SET_BITMAP( KiBitmap( options_text_xpm ) ); KiBitmap( options_text_xpm ) );
dimensionsMenu->Append( item );
// Pads // Pads
item = new wxMenuItem( dimensionsMenu, ID_PCB_PAD_SETUP, AddMenuItem( dimensionsMenu, ID_PCB_PAD_SETUP,
_( "Pads" ), _( "Pads" ), _( "Adjust default pad characteristics" ),
_( "Adjust default pad characteristics" ) ); KiBitmap( pad_xpm ) );
SET_BITMAP( KiBitmap( pad_xpm ) );
dimensionsMenu->Append( item );
// Pads Mask Clearance // Pads Mask Clearance
item = new wxMenuItem( dimensionsMenu, ID_PCB_MASK_CLEARANCE, AddMenuItem( dimensionsMenu, ID_PCB_MASK_CLEARANCE,
_( "Pads Mask Clearance" ), _( "Pads Mask Clearance" ),
_( "Adjust the global clearance between pads and the solder resist mask" ) ); _( "Adjust the global clearance between pads and the solder resist mask" ),
SET_BITMAP( KiBitmap( pads_mask_layers_xpm ) ); KiBitmap( pads_mask_layers_xpm ) );
dimensionsMenu->Append( item );
// Save dimension preferences // Save dimension preferences
dimensionsMenu->AppendSeparator(); dimensionsMenu->AppendSeparator();
item = new wxMenuItem( dimensionsMenu, ID_CONFIG_SAVE, AddMenuItem( dimensionsMenu, ID_CONFIG_SAVE,
_( "&Save" ), _( "&Save" ), _( "Save dimension preferences" ),
_( "Save dimension preferences" ) ); KiBitmap( save_xpm ) );
SET_BITMAP( KiBitmap( save_xpm ) );
dimensionsMenu->Append( item );
// Append dimension menu to config menu // Append dimension menu to config menu
AddMenuItem( configmenu, dimensionsMenu, AddMenuItem( configmenu, dimensionsMenu,
...@@ -564,15 +477,13 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -564,15 +477,13 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// Macros submenu // Macros submenu
wxMenu* macrosMenu = new wxMenu; wxMenu* macrosMenu = new wxMenu;
item = new wxMenuItem( macrosMenu, ID_PREFRENCES_MACROS_SAVE, AddMenuItem( macrosMenu, ID_PREFRENCES_MACROS_SAVE,
_( "Save macros" ), _( "Save macros" ),
_( "Save macros to file" ) ); _( "Save macros to file" ) );
macrosMenu->Append( item );
item = new wxMenuItem( macrosMenu, ID_PREFRENCES_MACROS_READ, AddMenuItem( macrosMenu, ID_PREFRENCES_MACROS_READ,
_( "Read macros" ), _( "Read macros" ),
_( "Read macros from file" ) ); _( "Read macros from file" ) );
macrosMenu->Append( item );
// Append macros menu to config menu // Append macros menu to config menu
AddMenuItem( configmenu, macrosMenu, AddMenuItem( configmenu, macrosMenu,
...@@ -583,18 +494,16 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -583,18 +494,16 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
configmenu->AppendSeparator(); configmenu->AppendSeparator();
// Save Preferences // Save Preferences
item = new wxMenuItem( configmenu, ID_CONFIG_SAVE, AddMenuItem( configmenu, ID_CONFIG_SAVE,
_( "&Save Preferences" ), _( "&Save Preferences" ),
_( "Save application preferences" ) ); _( "Save application preferences" ),
SET_BITMAP( KiBitmap( save_setup_xpm ) ); KiBitmap( save_setup_xpm ) );
configmenu->Append( item );
// Read Preferences // Read Preferences
item = new wxMenuItem( configmenu, ID_CONFIG_READ, AddMenuItem( configmenu, ID_CONFIG_READ,
_( "&Read Preferences" ), _( "&Read Preferences" ),
_( "Read application preferences" ) ); _( "Read application preferences" ),
SET_BITMAP( KiBitmap( read_setup_xpm ) ); KiBitmap( read_setup_xpm ) );
configmenu->Append( item );
/** /**
* Tools menu * Tools menu
...@@ -602,50 +511,40 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -602,50 +511,40 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
wxMenu* toolsMenu = new wxMenu; wxMenu* toolsMenu = new wxMenu;
/* Netlist */ /* Netlist */
item = new wxMenuItem( toolsMenu, ID_GET_NETLIST, AddMenuItem( toolsMenu, ID_GET_NETLIST,
_( "Netlist" ), _( "Netlist" ),
_( "Read the netlist and update board connectivity" ) ); _( "Read the netlist and update board connectivity" ),
SET_BITMAP( KiBitmap( netlist_xpm ) ); KiBitmap( netlist_xpm ) );
toolsMenu->Append( item );
/* Layer pair */ /* Layer pair */
AddMenuItem( toolsMenu, ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, AddMenuItem( toolsMenu, ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR,
_( "Layer Pair" ), _( "Layer Pair" ), _( "Change the active layer pair" ),
_( "Change the active layer pair" ), KiBitmap( select_layer_pair_xpm ) );
KiBitmap( select_layer_pair_xpm ) );
/* DRC */ /* DRC */
item = new wxMenuItem( toolsMenu, ID_DRC_CONTROL, AddMenuItem( toolsMenu, ID_DRC_CONTROL,
_( "DRC" ), _( "DRC" ),
_( "Perform design rules check" ) ); _( "Perform design rules check" ), KiBitmap( erc_xpm ) );
SET_BITMAP( KiBitmap( erc_xpm ) );
toolsMenu->Append( item );
/* FreeRoute */ /* FreeRoute */
item = new wxMenuItem( toolsMenu, ID_TOOLBARH_PCB_FREEROUTE_ACCESS, AddMenuItem( toolsMenu, ID_TOOLBARH_PCB_FREEROUTE_ACCESS,
_( "FreeRoute" ), _( "FreeRoute" ),
_( "Fast access to the Web Based FreeROUTE advanced router" ) ); _( "Fast access to the Web Based FreeROUTE advanced router" ),
SET_BITMAP( KiBitmap( web_support_xpm ) ); KiBitmap( web_support_xpm ) );
toolsMenu->Append( item );
/** /* Design Rules menu
* Design Rules menu
*/ */
wxMenu* designRulesMenu = new wxMenu; wxMenu* designRulesMenu = new wxMenu;
// Design Rules // Design Rules
item = new wxMenuItem( designRulesMenu, ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG, AddMenuItem( designRulesMenu, ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG,
_( "Design Rules" ), _( "Design Rules" ),
_( "Open the design rules editor" ) ); _( "Open the design rules editor" ), KiBitmap( hammer_xpm ) );
SET_BITMAP( KiBitmap( hammer_xpm ) );
designRulesMenu->Append( item );
// Layers Setup // Layers Setup
item = new wxMenuItem( configmenu, ID_PCB_LAYERS_SETUP, AddMenuItem( configmenu, ID_PCB_LAYERS_SETUP,
_( "&Layers Setup" ), _( "&Layers Setup" ), _( "Enable and set layer properties" ),
_( "Enable and set layer properties" ) ); KiBitmap( copper_layers_setup_xpm ) );
SET_BITMAP( KiBitmap( copper_layers_setup_xpm ) );
designRulesMenu->Append( item );
/** /**
* Help menu * Help menu
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment