Skip to content

K
kicad-source-mirror
Commit 2bae7624 authored by charras's avatar charras
Browse files
Options

pcbnew: Added option in left tool bar to show/hide Layer manager tool bar

parent dcba4804
Show whitespace changes
Inline Side-by-side
Showing with 1259 additions and 722 deletions
bitmaps/CMakeLists.txt
View file @ 2bae7624
...@@ -190,6 +190,7 @@ set(BITMAP_SRCS ...@@ -190,6 +190,7 @@ set(BITMAP_SRCS
Lang_Ru.xpm Lang_Ru.xpm
Lang_Sl.xpm Lang_Sl.xpm
Language.xpm Language.xpm
layers_manager.xpm
Leave_Sheet.xpm Leave_Sheet.xpm
left.xpm left.xpm
libedit_icon.xpm libedit_icon.xpm
......
bitmaps/layers_manager.xpm 0 → 100644
View file @ 2bae7624
/* XPM */
const char *layers_manager_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"X c #3A3916",
"o c #165304",
"& c #534D52",
"; c #375884",
" c #1A6C08",
". c #AE1D04",
"O c None",
"% c #678B87",
"$ c #616E7F",
"# c #6A4E40",
"- c #587FAA",
"+ c #0A8108",
": c #9CBADC",
"@ c #796E50",
"= c #2E2320",
"* c #7699AC",
/* pixels */
" ..........XoOO",
"oo........... OO",
"X++++++++++ .oOO",
"O+++++++++++..XO",
"O ++++++++++X.oO",
"Oo++++@ ++++ .#O",
"OX++++@@@+++ $%&",
"OO+@ ++@@+++%*$X",
"OO @@@@##@+%%@+o",
"OOo+@@@@#&*%+++ ",
"OOOOOOO=$*$@OOOO",
"OOOOO=$*-$##@=OO",
"OOOO&-*-;OX@#@XO",
"OOO;:*$;OOO=@@%=",
"OOO;--;OOOOOO#@O",
"OOOO&&OOOOOOOOOO"
};
bitmaps/sources/layers_manager.svg 0 → 100644
View file @ 2bae7624
<?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"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
width="16"
height="16"
id="svg11300"
sodipodi:version="0.32"
inkscape:version="0.47 r22583"
sodipodi:docname="layers_manager.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<title
id="title2867">fabrication.svg</title>
<defs
id="defs3">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective62" />
<linearGradient
inkscape:collect="always"
id="linearGradient2250">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2252" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2254" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient2265">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop2267" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop2269" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient2257">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2259" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2261" />
</linearGradient>
<linearGradient
id="linearGradient3087">
<stop
style="stop-color:#3465a4;stop-opacity:1;"
offset="0"
id="stop3089" />
<stop
id="stop3095"
offset="0"
style="stop-color:#9fbce1;stop-opacity:1;" />
<stop
style="stop-color:#6b95ca;stop-opacity:1;"
offset="0"
id="stop2242" />
<stop
id="stop2244"
offset="0.75"
style="stop-color:#3d6aa5;stop-opacity:1;" />
<stop
style="stop-color:#386eb4;stop-opacity:1;"
offset="1"
id="stop3091" />
</linearGradient>
<linearGradient
id="linearGradient3077">
<stop
style="stop-color:#98a0a9;stop-opacity:1;"
offset="0"
id="stop3079" />
<stop
style="stop-color:#c3d0dd;stop-opacity:1;"
offset="1"
id="stop3081" />
</linearGradient>
<linearGradient
id="linearGradient3061">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3063" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3065" />
</linearGradient>
<linearGradient
id="linearGradient3049">
<stop
style="stop-color:#b6b6b6;stop-opacity:1;"
offset="0"
id="stop3051" />
<stop
id="stop2262"
offset="0.5"
style="stop-color:#f2f2f2;stop-opacity:1;" />
<stop
style="stop-color:#fafafa;stop-opacity:1;"
offset="0.67612958"
id="stop2264" />
<stop
id="stop2268"
offset="0.84051722"
style="stop-color:#d8d8d8;stop-opacity:1;" />
<stop
id="stop2266"
offset="0.875"
style="stop-color:#f2f2f2;stop-opacity:1;" />
<stop
style="stop-color:#dbdbdb;stop-opacity:1;"
offset="1"
id="stop3053" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3041">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3043" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop3045" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3041"
id="radialGradient3047"
cx="24.8125"
cy="39.125"
fx="24.8125"
fy="39.125"
r="17.6875"
gradientTransform="matrix(1,0,0,0.374558,0,24.47041)"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3061"
id="linearGradient3067"
x1="50.152931"
y1="-3.6324477"
x2="25.291086"
y2="-4.3002653"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.25783861,0,0,0.2595286,32.155794,28.984379)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3087"
id="linearGradient3093"
x1="9.7503242"
y1="32.28376"
x2="16.915297"
y2="39.443218"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.28963035,0,0,0.22349527,2.044995,37.38192)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2257"
id="linearGradient2263"
x1="12.004697"
y1="35.688461"
x2="10.650805"
y2="33.194965"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.33216589,-0.00670924,0.00869457,0.2563181,1.7338281,36.137935)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2265"
id="linearGradient2271"
x1="14.017542"
y1="36.942543"
x2="15.415793"
y2="38.268368"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.28957395,-0.0044084,0.0057129,0.22345175,1.92189,37.152949)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2250"
id="linearGradient2256"
x1="31.177404"
y1="19.821514"
x2="40.859177"
y2="9.6568537"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.3297737,0,0,0.25447215,1.2083631,36.117783)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3041"
id="radialGradient2260"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.374558,0,24.47041)"
cx="24.8125"
cy="39.125"
fx="24.8125"
fy="39.125"
r="17.6875" />
</defs>
<sodipodi:namedview
stroke="#204a87"
fill="#3465a4"
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="0.25490196"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="32"
inkscape:cx="5.730549"
inkscape:cy="7.311168"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
inkscape:window-width="1280"
inkscape:window-height="968"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid2865"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
empcolor="#0000ff"
empopacity="0.1372549"
dotted="true" />
</sodipodi:namedview>
<metadata
id="metadata4">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jakub Steiner</dc:title>
</cc:Agent>
</dc:creator>
<dc:source />
<cc:license
rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
<dc:title>fabrication.svg</dc:title>
<dc:subject>
<rdf:Bag />
</dc:subject>
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/publicdomain/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
</cc:License>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
transform="translate(0,-32)">
<path
style="color:#000000;fill:url(#linearGradient3093);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.28968632;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
d="m 4,47.21571 c 0.434176,0.372862 1.6401905,0.54156 2.1750038,-0.180652 0.2331858,-0.314894 0.6905276,-1.196733 2.7308986,-2.613753 0.3426828,-0.23772 0.7056856,-0.781518 0.3979535,-1.074855 L 8.5073723,42.731837 c -0.3258341,-0.27937 -1.2315119,-0.149058 -1.6030876,0.241972 -1.1076301,1.169603 -2.9172027,2.100637 -3.3252766,2.213098 -0.7808777,0.215204 -0.69299,1.103429 -0.1763706,1.52594 L 4,47.21571 z"
id="path2142"
sodipodi:nodetypes="ccccccscc"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
sodipodi:nodetypes="csccccscc"
id="path2270"
d="m 4.1123506,46.929462 c 0.4752915,0.444211 1.5168053,0.549973 1.8438178,-0.0943 C 6.1808455,46.3925 7.0555089,45.393372 8.6595158,44.279403 8.9289111,44.092522 9.2142805,43.665024 8.972361,43.434421 L 8.3462174,42.951254 C 8.0900679,42.731632 7.378083,42.834074 7.085974,43.141476 6.2152275,44.060942 4.2883902,45.26366 3.8226159,45.382263 3.1014687,45.565892 3.2366106,46.201994 3.6427431,46.534144 l 0.4696075,0.395318 z"
style="opacity:0.19886367;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.28968629;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
style="fill:#008000"
id="rect2932"
width="13.536558"
height="10.298958"
x="-7.8830147"
y="32.956669"
transform="matrix(1,0,0.23919332,0.97097197,0,0)"
rx="0.25089604"
ry="0.38427848"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="fill:none;stroke:#de0000;stroke-width:1.47709787px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
d="M 2.181818,33 12,33 l 2.181818,6 0,0"
id="path2934"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="color:#000000;fill:#654032;fill-opacity:1;fill-rule:nonzero;stroke:#c0754f;stroke-width:0.28968632;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
d="m 7.1135263,41.516582 6.2632577,4.944832 c 0.253425,0.223496 1.056431,0.39623 1.592967,0 0.518114,-0.382628 0.398239,-0.921917 -0.108613,-1.313035 L 8.8513085,40.17561 C 9.5932991,38.585159 8.0915464,37.249291 6.1541258,37.535572 L 5.737782,37.828908 7.0411183,38.778763 7.1135269,39.616872 6.1404167,40.30232 4.977503,40.203545 3.7827781,39.3375 c 0,0 -0.4188528,0.31934 -0.4188528,0.31934 -0.1948182,1.435556 1.7503483,2.718584 3.7496016,1.85974 z"
id="path2140"
sodipodi:nodetypes="cczcccccccccsc"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png" />
<path
sodipodi:nodetypes="cczccccccccccc"
id="path3057"
d="m 7.1830003,41.191983 6.3326047,5.09647 c 0.196185,0.173014 0.817816,0.306731 1.233161,0 0.401088,-0.296203 0.308289,-0.713682 -0.08408,-1.016456 l -6.098022,-4.99304 c 0.4946607,-1.654068 -0.6129792,-2.5459 -2.2618478,-2.514092 l -0.089082,0.06956 1.188149,0.823539 0.042924,1.06415 L 6.255036,40.561489 4.8560349,40.444888 3.8084818,39.683639 3.6921913,39.793082 c -0.1030543,1.51888 2.1407982,2.210031 3.4908092,1.398901 z"
style="opacity:0.42613639;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.28968617;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
style="opacity:0.17045456;color:#000000;fill:none;stroke:url(#linearGradient3067);stroke-width:0.29453531;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
id="rect3059"
width="6.8309965"
height="0.6073972"
x="38.866058"
y="27.72298"
rx="0.25948578"
ry="0.26118657"
transform="matrix(0.78399442,0.62076787,-0.79922251,0.60103526,0,0)"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="color:#000000;fill:#5d969f;fill-opacity:1;fill-rule:nonzero;stroke:#304279;stroke-width:0.28968632;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
d="m 8.6278738,43.783853 c 0.2748799,-0.18181 4.3806592,-3.422271 4.3806592,-3.422271 l 1.013705,-0.05588 1.592967,-1.704153 -1.327117,-0.912333 -2.063615,1.368911 0,0.782233 -4.1996404,3.366397 c -0.1991207,0.153653 0.3496145,0.74471 0.6030412,0.577089 z"
id="path2144"
sodipodi:nodetypes="ccccccccc"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
sodipodi:nodetypes="ccccccccc"
id="path3085"
d="m 8.5959495,43.519221 c 0.2132886,-0.141073 4.2951045,-3.366617 4.2951045,-3.366617 l 0.965769,-0.06312 1.389638,-1.440838 L 14.293505,38 l -1.806031,1.200465 0.05121,0.72549 -4.1802469,3.382525 c -0.1545052,0.119226 0.040879,0.340795 0.2375212,0.210732 z"
style="opacity:0.53977272;color:#000000;fill:none;stroke:url(#linearGradient2256);stroke-width:0.28968653;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
sodipodi:type="arc"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#a1a1a1;stroke-width:1.13860166;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
id="path2146"
sodipodi:cx="41.875"
sodipodi:cy="37.5"
sodipodi:rx="1.375"
sodipodi:ry="1.375"
d="m 43.25,37.5 c 0,0.759392 -0.615608,1.375 -1.375,1.375 -0.759392,0 -1.375,-0.615608 -1.375,-1.375 0,-0.759392 0.615608,-1.375 1.375,-1.375 0.759392,0 1.375,0.615608 1.375,1.375 z"
transform="matrix(0.28963038,0,0,0.22349527,2.0087911,37.409856)"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
sodipodi:type="arc"
style="opacity:0.60227272;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
id="path3101"
sodipodi:cx="19.003494"
sodipodi:cy="28.20101"
sodipodi:rx="1.767767"
sodipodi:ry="1.767767"
d="m 20.771261,28.20101 c 0,0.97631 -0.791456,1.767767 -1.767767,1.767767 -0.97631,0 -1.767767,-0.791457 -1.767767,-1.767767 0,-0.976311 0.791457,-1.767767 1.767767,-1.767767 0.976311,0 1.767767,0.791456 1.767767,1.767767 z"
transform="matrix(0.18825988,0,0,0.14527205,4.2273913,38.980877)"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="color:#000000;fill:none;stroke:url(#linearGradient2263);stroke-width:0.66468823;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
d="m 7.3681746,43.656471 c 0,0 -2.3644414,1.857549 -3.4720711,2.172441"
id="path3103"
sodipodi:nodetypes="cc"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<path
style="opacity:0.27840911;color:#000000;fill:none;stroke:url(#linearGradient2271);stroke-width:0.66468823;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
d="m 8.0757695,44.072843 c 0,0 -2.4148549,1.683945 -2.9395217,2.763579"
id="path2247"
sodipodi:nodetypes="cc"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
inkscape:export-filename="F:\kicad-sourceforge\trunk\kicad\bitmaps\sources\layers_manager.png" />
</g>
</svg>
cvpcb/init.cpp
View file @ 2bae7624
...@@ -139,7 +139,7 @@ int WinEDA_CvpcbFrame::SaveNetList( const wxString& fileName ) ...@@ -139,7 +139,7 @@ int WinEDA_CvpcbFrame::SaveNetList( const wxString& fileName )
wxFileDialog dlg( this, _( "Save Net and Component List" ), fn.GetPath(), wxFileDialog dlg( this, _( "Save Net and Component List" ), fn.GetPath(),
fn.GetFullName(), NetlistFileWildcard, fn.GetFullName(), NetlistFileWildcard,
wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); wxFD_SAVE/*| wxFD_OVERWRITE_PROMPT*/ );
if( dlg.ShowModal() == wxID_CANCEL ) if( dlg.ShowModal() == wxID_CANCEL )
return -1; return -1;
......
eeschema/tool_viewlib.cpp
View file @ 2bae7624
...@@ -126,21 +126,18 @@ void WinEDA_ViewlibFrame::ReCreateHToolbar() ...@@ -126,21 +126,18 @@ void WinEDA_ViewlibFrame::ReCreateHToolbar()
} }
// Must be AFTER Realize(): // Must be AFTER Realize():
m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, asdeMorgan );
m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, asdeMorgan );
if( asdeMorgan ) if( asdeMorgan )
{ {
m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, bool normal = m_convert <= 1;
(m_convert <= 1) ? true : false ); m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT,normal );
m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, !normal );
(m_convert >= 2) ? true : false );
m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, true );
m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, true );
} }
else else
{ {
m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, true ); m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, true );
m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, false ); m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, false );
m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, false );
m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, false );
} }
......
include/bitmaps.h
View file @ 2bae7624
...@@ -182,6 +182,7 @@ extern const char* lang_pt_xpm[]; ...@@ -182,6 +182,7 @@ extern const char* lang_pt_xpm[];
extern const char* lang_ru_xpm[]; extern const char* lang_ru_xpm[];
extern const char* lang_sl_xpm[]; extern const char* lang_sl_xpm[];
extern const char* language_xpm[]; extern const char* language_xpm[];
extern const char* layers_manager_xpm[];
extern const char* leave_sheet_xpm[]; extern const char* leave_sheet_xpm[];
extern const char* left_xpm[]; extern const char* left_xpm[];
extern const char* libedit_icon_xpm[]; extern const char* libedit_icon_xpm[];
......
include/class_board_design_settings.h
View file @ 2bae7624
...@@ -40,7 +40,7 @@ protected: ...@@ -40,7 +40,7 @@ protected:
public: public:
// Color options for screen display of the Printed Board: // Color options for screen display of the Printed Board:
int m_LayerColor[NB_LAYERS]; ///< Layer colors (tracks and graphic items) int m_LayerColor[LAYER_COUNT]; ///< Layer colors (tracks and graphic items)
int m_ViaColor[4]; // Via color (depending on is type) int m_ViaColor[4]; // Via color (depending on is type)
......
include/wxPcbStruct.h
View file @ 2bae7624
...@@ -104,6 +104,7 @@ public: ...@@ -104,6 +104,7 @@ public:
bool m_TrackAndViasSizesList_Changed; bool m_TrackAndViasSizesList_Changed;
bool m_show_microwave_tools; bool m_show_microwave_tools;
bool m_show_layer_manager_tools;
private: private:
......
internat/fr/kicad.mo
View file @ 2bae7624
No preview for this file type
internat/fr/kicad.po
View file @ 2bae7624
...@@ -2,8 +2,8 @@ msgid "" ...@@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kicad\n" "Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-20 14:38+0100\n" "POT-Creation-Date: 2010-01-21 20:46+0100\n"
"PO-Revision-Date: 2010-01-20 14:39+0100\n" "PO-Revision-Date: 2010-01-21 20:46+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n" "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -22,67 +22,6 @@ msgstr "" ...@@ -22,67 +22,6 @@ msgstr ""
"X-Poedit-SearchPath-6: 3d-viewer\n" "X-Poedit-SearchPath-6: 3d-viewer\n"
"X-Poedit-SearchPath-7: share\n" "X-Poedit-SearchPath-7: share\n"
#: pcbnew/files.cpp:21
msgid "Printed circuit board"
msgstr "Circuit imprimé"
#: pcbnew/files.cpp:71
msgid "Recovery file "
msgstr "Fichier de secours "
#: pcbnew/files.cpp:71
msgid " not found"
msgstr " non trouvé"
#: pcbnew/files.cpp:77
msgid "Ok to load Recovery file "
msgstr "Ok pour charger le fichier de secours"
#: pcbnew/files.cpp:133
msgid "Board Modified: Continue ?"
msgstr "Circuit imprimé modifié, Continuer ?"
#: pcbnew/files.cpp:152
msgid "Open Board File"
msgstr "Ouvrir Fichier C.I."
#: pcbnew/files.cpp:175
#, c-format
msgid "File <%s> not found"
msgstr "Fichier %s non trouvé"
#: pcbnew/files.cpp:195
msgid "This file was created by a more recent version of PCBnew and may not load correctly. Please consider updating!"
msgstr "Ce fichier a été créé par une version plus récente de PCBnew et peut être incorrectement chargé. SVP penser à une mise à jour!"
#: pcbnew/files.cpp:200
msgid "This file was created by an older version of PCBnew. It will be stored in the new file format when you save this file again."
msgstr "Ce fichier a été créé par une version plus ancienne de Eeschema. Il sera enregistré au nouveau format après la prochaine sauvegarde."
#: pcbnew/files.cpp:305
msgid "Save Board File"
msgstr "Sauver Fichier C.I."
#: pcbnew/files.cpp:339
msgid "Warning: unable to create backup file "
msgstr "Attention: impossible de créer un fichier backup "
#: pcbnew/files.cpp:356
msgid "Unable to create "
msgstr "Impossible de créer "
#: pcbnew/files.cpp:375
msgid "Backup file: "
msgstr "Fichier backup: "
#: pcbnew/files.cpp:379
msgid "Wrote board file: "
msgstr "Ecriture fichier CI: "
#: pcbnew/files.cpp:381
msgid "Failed to create "
msgstr "Impossible de créer fichier "
#: pcbnew/dialog_gendrill.cpp:165 #: pcbnew/dialog_gendrill.cpp:165
msgid "Millimeters" msgid "Millimeters"
msgstr "Millimètres" msgstr "Millimètres"
...@@ -420,7 +359,7 @@ msgstr "Epaisseur Contour" ...@@ -420,7 +359,7 @@ msgstr "Epaisseur Contour"
msgid "Incorrect number, no change" msgid "Incorrect number, no change"
msgstr "Nombre incorrect, pas de changement" msgstr "Nombre incorrect, pas de changement"
#: pcbnew/tool_pcb.cpp:30 #: pcbnew/tool_pcb.cpp:28
msgid "" msgid ""
"Show active layer selections\n" "Show active layer selections\n"
"and select layer pair for route and place via" "and select layer pair for route and place via"
...@@ -428,163 +367,164 @@ msgstr "" ...@@ -428,163 +367,164 @@ msgstr ""
"Affiche sélections couche active\n" "Affiche sélections couche active\n"
"et sélection paire de couches pour routage et placement via" "et sélection paire de couches pour routage et placement via"
#: pcbnew/tool_pcb.cpp:199 #: pcbnew/tool_pcb.cpp:202
msgid "New board" msgid "New board"
msgstr "Nouveau Circuit Imprimé" msgstr "Nouveau Circuit Imprimé"
#: pcbnew/tool_pcb.cpp:201 #: pcbnew/tool_pcb.cpp:204
msgid "Open existing board" msgid "Open existing board"
msgstr "Ouvrir C.I. existant" msgstr "Ouvrir C.I. existant"
#: pcbnew/tool_pcb.cpp:203 #: pcbnew/tool_pcb.cpp:206
msgid "Save board" msgid "Save board"
msgstr "Sauver Circuit Imprimé" msgstr "Sauver Circuit Imprimé"
#: pcbnew/tool_pcb.cpp:207 #: pcbnew/tool_pcb.cpp:210
msgid "Page settings (size, texts)" msgid "Page settings (size, texts)"
msgstr "Ajustage de la feuille de dessin (dimensions, textes)" msgstr "Ajustage de la feuille de dessin (dimensions, textes)"
#: pcbnew/tool_pcb.cpp:212 #: pcbnew/tool_pcb.cpp:215
msgid "Open module editor" msgid "Open module editor"
msgstr "Ouvrir Editeur de modules" msgstr "Ouvrir Editeur de modules"
#: pcbnew/tool_pcb.cpp:216 #: pcbnew/tool_pcb.cpp:219
msgid "Cut selected item" msgid "Cut selected item"
msgstr "Suppression des éléments sélectionnés" msgstr "Suppression des éléments sélectionnés"
#: pcbnew/tool_pcb.cpp:220 #: pcbnew/tool_pcb.cpp:223
msgid "Copy selected item" msgid "Copy selected item"
msgstr "Copie des éléments sélectionnés" msgstr "Copie des éléments sélectionnés"
#: pcbnew/tool_pcb.cpp:223 #: pcbnew/tool_pcb.cpp:226
msgid "Paste" msgid "Paste"
msgstr "Copie des éléments sauvegardés" msgstr "Copie des éléments sauvegardés"
#: pcbnew/tool_pcb.cpp:228 #: pcbnew/tool_pcb.cpp:231
msgid "Undo last edition" msgid "Undo last edition"
msgstr "Défait dernière édition" msgstr "Défait dernière édition"
#: pcbnew/tool_pcb.cpp:230 #: pcbnew/tool_pcb.cpp:233
msgid "Redo the last undo command" msgid "Redo the last undo command"
msgstr "Refait la dernière commande defaite" msgstr "Refait la dernière commande defaite"
#: pcbnew/tool_pcb.cpp:234 #: pcbnew/tool_pcb.cpp:237
msgid "Print board" msgid "Print board"
msgstr "Imprimer C.I." msgstr "Imprimer C.I."
#: pcbnew/tool_pcb.cpp:236 #: pcbnew/tool_pcb.cpp:239
msgid "Plot (HPGL, PostScript, or GERBER format)" msgid "Plot (HPGL, PostScript, or GERBER format)"
msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER" msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER"
#: pcbnew/tool_pcb.cpp:239 #: pcbnew/tool_pcb.cpp:242
msgid "Zoom in" msgid "Zoom in"
msgstr "Zoom +" msgstr "Zoom +"
#: pcbnew/tool_pcb.cpp:244 #: pcbnew/tool_pcb.cpp:247
msgid "Zoom out" msgid "Zoom out"
msgstr "Zoom -" msgstr "Zoom -"
#: pcbnew/tool_pcb.cpp:249 #: pcbnew/tool_pcb.cpp:252
msgid "Redraw view" msgid "Redraw view"
msgstr "Redessin de l'écran" msgstr "Redessin de l'écran"
#: pcbnew/tool_pcb.cpp:254 #: pcbnew/tool_pcb.cpp:257
msgid "Zoom auto" msgid "Zoom auto"
msgstr "Zoom Automatique" msgstr "Zoom Automatique"
#: pcbnew/tool_pcb.cpp:260 #: pcbnew/tool_pcb.cpp:263
msgid "Find components and texts" msgid "Find components and texts"
msgstr "Recherche de composants et textes" msgstr "Recherche de composants et textes"
#: pcbnew/tool_pcb.cpp:268 #: pcbnew/tool_pcb.cpp:271
msgid "Read netlist" msgid "Read netlist"
msgstr "Lire Netliste" msgstr "Lire Netliste"
#: pcbnew/tool_pcb.cpp:270 #: pcbnew/tool_pcb.cpp:273
msgid "Perform design rules check" msgid "Perform design rules check"
msgstr "Exécute le contrôle des règles de conception" msgstr "Exécute le contrôle des règles de conception"
#: pcbnew/tool_pcb.cpp:283 #: pcbnew/tool_pcb.cpp:286
msgid "Manual and automatic move or place of modules" msgid "Manual and automatic move or place of modules"
msgstr "Mode module: déplacements ou placement manuel ou automatique des modules" msgstr "Mode module: déplacements ou placement manuel ou automatique des modules"
#: pcbnew/tool_pcb.cpp:287 #: pcbnew/tool_pcb.cpp:290
msgid "Mode Track and Autorouting" msgid "Mode Track and Autorouting"
msgstr "Mode Pistes et Autoroutage" msgstr "Mode Pistes et Autoroutage"
#: pcbnew/tool_pcb.cpp:293 #: pcbnew/tool_pcb.cpp:296
msgid "Fast access to theWeb Based FreeROUTE advanced router" msgid "Fast access to theWeb Based FreeROUTE advanced router"
msgstr "Acces rapide au routeur avancé FreeROUTE sur le Web" msgstr "Acces rapide au routeur avancé FreeROUTE sur le Web"
#: pcbnew/tool_pcb.cpp:313 #: pcbnew/tool_pcb.cpp:316
msgid "Enable design rule checking" msgid "Enable design rule checking"
msgstr "Active le contrôle des règles de conception" msgstr "Active le contrôle des règles de conception"
#: pcbnew/tool_pcb.cpp:317 #: pcbnew/tool_pcb.cpp:320
msgid "Hide grid" msgid "Hide grid"
msgstr "Ne pas afficher la grille" msgstr "Ne pas afficher la grille"
#: pcbnew/tool_pcb.cpp:320 #: pcbnew/tool_pcb.cpp:323
msgid "Display polar coordinates" msgid "Display polar coordinates"
msgstr "Affichage coord polaires" msgstr "Affichage coord polaires"
#: pcbnew/tool_pcb.cpp:323 #: pcbnew/tool_pcb.cpp:326
msgid "Units in inches" msgid "Units in inches"
msgstr "Unités en pouces" msgstr "Unités en pouces"
#: pcbnew/tool_pcb.cpp:326 #: pcbnew/tool_pcb.cpp:329
msgid "Units in millimeters" msgid "Units in millimeters"
msgstr "Unités en millimètres" msgstr "Unités en millimètres"
#: pcbnew/tool_pcb.cpp:329 #: pcbnew/tool_pcb.cpp:332
msgid "Change cursor shape" msgid "Change cursor shape"
msgstr "Changer la forme du curseur" msgstr "Changer la forme du curseur"
#: pcbnew/tool_pcb.cpp:334 #: pcbnew/tool_pcb.cpp:337
msgid "Show board ratsnest" msgid "Show board ratsnest"
msgstr "Montrer le chevelu général" msgstr "Montrer le chevelu général"
#: pcbnew/tool_pcb.cpp:337 #: pcbnew/tool_pcb.cpp:340
msgid "Show module ratsnest when moving" msgid "Show module ratsnest when moving"
msgstr "Montrer le chevelu du module pendant le déplacement" msgstr "Montrer le chevelu du module pendant le déplacement"
#: pcbnew/tool_pcb.cpp:343 #: pcbnew/tool_pcb.cpp:346
msgid "Enable automatic track deletion" msgid "Enable automatic track deletion"
msgstr "Active l'effacement de piste automatique lorsque l'on recrée une piste." msgstr "Active l'effacement de piste automatique lorsque l'on recrée une piste."
#: pcbnew/tool_pcb.cpp:349 #: pcbnew/tool_pcb.cpp:352
msgid "Show filled areas in zones" msgid "Show filled areas in zones"
msgstr "Afficher les surfaces remplies dans les zones" msgstr "Afficher les surfaces remplies dans les zones"
#: pcbnew/tool_pcb.cpp:354 #: pcbnew/tool_pcb.cpp:357
msgid "Do not show filled areas in zones" msgid "Do not show filled areas in zones"
msgstr "Ne pas afficher les surfaces remplies dans les zones" msgstr "Ne pas afficher les surfaces remplies dans les zones"
#: pcbnew/tool_pcb.cpp:359 #: pcbnew/tool_pcb.cpp:362
msgid "Show outlines of filled areas only in zones" msgid "Show outlines of filled areas only in zones"
msgstr "Afficher uniquement les contours des surfaces remplies dans les zones" msgstr "Afficher uniquement les contours des surfaces remplies dans les zones"
#: pcbnew/tool_pcb.cpp:364 #: pcbnew/tool_pcb.cpp:367
msgid "Show pads in outline mode" msgid "Show pads in outline mode"
msgstr "Afficher pastilles en mode contour" msgstr "Afficher pastilles en mode contour"
#: pcbnew/tool_pcb.cpp:368 #: pcbnew/tool_pcb.cpp:371
msgid "Show vias in outline mode" msgid "Show vias in outline mode"
msgstr "Afficher pastilles en mode contour" msgstr "Afficher pastilles en mode contour"
#: pcbnew/tool_pcb.cpp:372 #: pcbnew/tool_pcb.cpp:375
msgid "Show tracks in outline mode" msgid "Show tracks in outline mode"
msgstr "Afficher pistes en mode contour" msgstr "Afficher pistes en mode contour"
#: pcbnew/tool_pcb.cpp:378 #: pcbnew/tool_pcb.cpp:381
msgid "Enable high contrast display mode" msgid "Enable high contrast display mode"
msgstr "Active le mode d'affichage haut contraste" msgstr "Active le mode d'affichage haut contraste"
#: pcbnew/tool_pcb.cpp:385 #: pcbnew/tool_pcb.cpp:388
msgid "Show invisible text" msgid "Show invisible text"
msgstr "Montrer textes invisibles" msgstr "Montrer textes invisibles"
#: pcbnew/tool_pcb.cpp:396 #: pcbnew/tool_pcb.cpp:399
#: pcbnew/tool_pcb.cpp:408
msgid "" msgid ""
"Display/remove auxiliary vertical toolbar (tools for micro wave applications)\n" "Display/remove auxiliary vertical toolbar (tools for micro wave applications)\n"
" This is a experimental feature (under development)" " This is a experimental feature (under development)"
...@@ -592,87 +532,87 @@ msgstr "" ...@@ -592,87 +532,87 @@ msgstr ""
"Affiche/supprime le toolbar vertical auxiliaire (outils pour applications micro-ondes)\n" "Affiche/supprime le toolbar vertical auxiliaire (outils pour applications micro-ondes)\n"
"C'est un outil expérimental (en cours de développement)" "C'est un outil expérimental (en cours de développement)"
#: pcbnew/tool_pcb.cpp:421 #: pcbnew/tool_pcb.cpp:432
msgid "Highlight net" msgid "Highlight net"
msgstr "Surbrillance net" msgstr "Surbrillance net"
#: pcbnew/tool_pcb.cpp:426 #: pcbnew/tool_pcb.cpp:437
msgid "Display local ratsnest" msgid "Display local ratsnest"
msgstr "Afficher le chevelu local" msgstr "Afficher le chevelu local"
#: pcbnew/tool_pcb.cpp:432 #: pcbnew/tool_pcb.cpp:443
msgid "Add modules" msgid "Add modules"
msgstr "Addition de Modules" msgstr "Addition de Modules"
#: pcbnew/tool_pcb.cpp:436 #: pcbnew/tool_pcb.cpp:447
msgid "Add tracks and vias" msgid "Add tracks and vias"
msgstr "Ajouter pistes et vias" msgstr "Ajouter pistes et vias"
#: pcbnew/tool_pcb.cpp:440 #: pcbnew/tool_pcb.cpp:451
msgid "Add zones" msgid "Add zones"
msgstr "Addition de Zones" msgstr "Addition de Zones"
#: pcbnew/tool_pcb.cpp:445 #: pcbnew/tool_pcb.cpp:456
msgid "Add graphic line or polygon" msgid "Add graphic line or polygon"
msgstr "Addition de lignes ou polygones graphiques" msgstr "Addition de lignes ou polygones graphiques"
#: pcbnew/tool_pcb.cpp:449 #: pcbnew/tool_pcb.cpp:460
msgid "Add graphic circle" msgid "Add graphic circle"
msgstr "Addition de graphiques (Cercle)" msgstr "Addition de graphiques (Cercle)"
#: pcbnew/tool_pcb.cpp:453 #: pcbnew/tool_pcb.cpp:464
msgid "Add graphic arc" msgid "Add graphic arc"
msgstr "Addition de graphiques (Arc de Cercle)" msgstr "Addition de graphiques (Arc de Cercle)"
#: pcbnew/tool_pcb.cpp:457 #: pcbnew/tool_pcb.cpp:468
msgid "Add text" msgid "Add text"
msgstr "Ajout de Texte" msgstr "Ajout de Texte"
#: pcbnew/tool_pcb.cpp:462 #: pcbnew/tool_pcb.cpp:473
msgid "Add dimension" msgid "Add dimension"
msgstr "Ajout des cotes" msgstr "Ajout des cotes"
#: pcbnew/tool_pcb.cpp:466 #: pcbnew/tool_pcb.cpp:477
msgid "Add layer alignment target" msgid "Add layer alignment target"
msgstr "Ajouter Mire de superposition" msgstr "Ajouter Mire de superposition"
#: pcbnew/tool_pcb.cpp:471 #: pcbnew/tool_pcb.cpp:482
msgid "Delete items" msgid "Delete items"
msgstr "Suppression d'éléments" msgstr "Suppression d'éléments"
#: pcbnew/tool_pcb.cpp:476 #: pcbnew/tool_pcb.cpp:487
msgid "Offset adjust for drill and place files" msgid "Offset adjust for drill and place files"
msgstr "Ajuste offset pour fichier de perçage et placement" msgstr "Ajuste offset pour fichier de perçage et placement"
#: pcbnew/tool_pcb.cpp:498 #: pcbnew/tool_pcb.cpp:509
msgid "Create line of specified length for microwave applications" msgid "Create line of specified length for microwave applications"
msgstr "Création de lignes de longueur spécifiée (pour applications micro-ondes)" msgstr "Création de lignes de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:502 #: pcbnew/tool_pcb.cpp:513
msgid "Create gap of specified length for microwave applications" msgid "Create gap of specified length for microwave applications"
msgstr "Création de gaps de longueur spécifiée (pour applications micro-ondes)" msgstr "Création de gaps de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:508 #: pcbnew/tool_pcb.cpp:519
msgid "Create stub of specified length for microwave applications" msgid "Create stub of specified length for microwave applications"
msgstr "Création de stub de longueur spécifiée (pour applications micro-ondes)" msgstr "Création de stub de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:512 #: pcbnew/tool_pcb.cpp:523
msgid "Create stub (arc) of specified length for microwave applications" msgid "Create stub (arc) of specified length for microwave applications"
msgstr "Création de stub (arc) de longueur spécifiée (pour applications micro-ondes)" msgstr "Création de stub (arc) de longueur spécifiée (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:517 #: pcbnew/tool_pcb.cpp:528
msgid "Create a polynomial shape for microwave applications" msgid "Create a polynomial shape for microwave applications"
msgstr "Création de formes polynomiales (pour applications micro-ondes)" msgstr "Création de formes polynomiales (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:569 #: pcbnew/tool_pcb.cpp:580
msgid "Current NetClass clearance value" msgid "Current NetClass clearance value"
msgstr "Valeur isolation NetClass courante" msgstr "Valeur isolation NetClass courante"
#: pcbnew/tool_pcb.cpp:578 #: pcbnew/tool_pcb.cpp:589
msgid "Name of the current NetClass" msgid "Name of the current NetClass"
msgstr "Nom de la NetClass courante" msgstr "Nom de la NetClass courante"
#: pcbnew/tool_pcb.cpp:587 #: pcbnew/tool_pcb.cpp:599
msgid "" msgid ""
"Auto track width: when starting on an existing track use its width\n" "Auto track width: when starting on an existing track use its width\n"
"otherwise, use current width setting" "otherwise, use current width setting"
...@@ -680,23 +620,23 @@ msgstr "" ...@@ -680,23 +620,23 @@ msgstr ""
"Largeur de piste automatique: si on démarre sur une piste existante, utiliser sa largeur\n" "Largeur de piste automatique: si on démarre sur une piste existante, utiliser sa largeur\n"
" sinon utiliser la largeur courante" " sinon utiliser la largeur courante"
#: pcbnew/tool_pcb.cpp:605 #: pcbnew/tool_pcb.cpp:617
msgid "Auto" msgid "Auto"
msgstr "Auto" msgstr "Auto"
#: pcbnew/tool_pcb.cpp:609 #: pcbnew/tool_pcb.cpp:621
msgid "Zoom " msgid "Zoom "
msgstr "Zoom " msgstr "Zoom "
#: pcbnew/tool_pcb.cpp:631 #: pcbnew/tool_pcb.cpp:643
msgid "Grid" msgid "Grid"
msgstr "Grille" msgstr "Grille"
#: pcbnew/tool_pcb.cpp:650 #: pcbnew/tool_pcb.cpp:662
msgid "User Grid" msgid "User Grid"
msgstr "Grille perso" msgstr "Grille perso"
#: pcbnew/tool_pcb.cpp:759 #: pcbnew/tool_pcb.cpp:770
msgid "+/- to switch" msgid "+/- to switch"
msgstr "+/- pour commuter" msgstr "+/- pour commuter"
...@@ -1088,15 +1028,119 @@ msgstr "X Pos" ...@@ -1088,15 +1028,119 @@ msgstr "X Pos"
msgid "Y pos" msgid "Y pos"
msgstr "Y pos" msgstr "Y pos"
#: pcbnew/hotkeys.cpp:599 #: pcbnew/hotkeys.cpp:595
#, c-format #, c-format
msgid "Footprint %s found, but locked" msgid "Footprint %s found, but locked"
msgstr "Module %s trouvé, mais verrouillé" msgstr "Module %s trouvé, mais verrouillé"
#: pcbnew/hotkeys.cpp:797 #: pcbnew/hotkeys.cpp:789
msgid "Delete module?" msgid "Delete module?"
msgstr "Effacer Module?" msgstr "Effacer Module?"
#: pcbnew/pcbframe.cpp:216
msgid "Through Via"
msgstr "Via Traversante"
#: pcbnew/pcbframe.cpp:216
msgid "Show through vias"
msgstr "Afficher vias traversantes"
#: pcbnew/pcbframe.cpp:217
msgid "Blind/Buried Via"
msgstr "Via Aveugle/Enterrée"
#: pcbnew/pcbframe.cpp:217
msgid "Show blind or buried vias"
msgstr "Afficher vias enterrées/aveugles"
#: pcbnew/pcbframe.cpp:218
msgid "Micro Via"
msgstr "Micro Via"
#: pcbnew/pcbframe.cpp:218
msgid "Show micro vias"
msgstr "Afficher micro vias"
#: pcbnew/pcbframe.cpp:219
msgid "Ratsnets"
msgstr "Chevelu"
#: pcbnew/pcbframe.cpp:219
msgid "Show the ratsnest"
msgstr "Montrer le chevelu"
#: pcbnew/pcbframe.cpp:220
msgid "Mod Text Back"
msgstr "Texte Mod. Dessous"
#: pcbnew/pcbframe.cpp:220
msgid "Show footprint text residing on board's back"
msgstr "Afficher les textes sur modules situés sur le dessous du ciruit imprimé"
#: pcbnew/pcbframe.cpp:221
msgid "Mod Text Front"
msgstr "Texte Mod. Dessus"
#: pcbnew/pcbframe.cpp:221
msgid "Show footprint text residing on board's front"
msgstr "Afficher les textes sur modules situés sur le dessus du ciruit imprimé"
#: pcbnew/pcbframe.cpp:222
msgid "Mod Text Hide"
msgstr "Cacher Textes Mod."
#: pcbnew/pcbframe.cpp:222
#: pcbnew/pcbframe.cpp:223
#: pcbnew/pcbframe.cpp:225
#: pcbnew/pcbframe.cpp:226
#: pcbnew/pcbframe.cpp:227
msgid "TBD"
msgstr ""
#: pcbnew/pcbframe.cpp:223
msgid "Anchors"
msgstr "Ancres"
#: pcbnew/pcbframe.cpp:225
msgid "Not Connecteds"
msgstr "Non connectés"
#: pcbnew/pcbframe.cpp:226
msgid "Modules Front"
msgstr "Modules Dessus"
#: pcbnew/pcbframe.cpp:227
msgid "Modules Back"
msgstr "Modules Dessous"
#: pcbnew/pcbframe.cpp:422
msgid "Front copper layer"
msgstr "Couche cuivre dessus"
#: pcbnew/pcbframe.cpp:430
msgid "An innner copper layer"
msgstr "Couche interne"
#: pcbnew/pcbframe.cpp:438
msgid "Back copper layer"
msgstr "Couche cuivre dessous"
#: pcbnew/pcbframe.cpp:459
msgid "Board modified, Save before exit ?"
msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?"
#: pcbnew/pcbframe.cpp:460
msgid "Confirmation"
msgstr "Confirmation"
#: pcbnew/pcbframe.cpp:499
msgid "3D Frame already opened"
msgstr "Fenêtre 3D déjà ouverte"
#: pcbnew/pcbframe.cpp:503
msgid "3D Viewer"
msgstr "Visu 3D"
#: pcbnew/netlist.cpp:118 #: pcbnew/netlist.cpp:118
#, c-format #, c-format
msgid "Netlist file %s not found" msgid "Netlist file %s not found"
...@@ -1447,11 +1491,11 @@ msgstr "Inclure Pistes Autoroutées" ...@@ -1447,11 +1491,11 @@ msgstr "Inclure Pistes Autoroutées"
msgid "Include Locked Tracks" msgid "Include Locked Tracks"
msgstr "Inclure Pistes Verrouillées" msgstr "Inclure Pistes Verrouillées"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:224 #: pcbnew/dialog_edit_module_for_Modedit.cpp:83
msgid "Use this attribute for most non smd components" msgid "Use this attribute for most non smd components"
msgstr "Utiliser cet attribut pour la plupart des composants" msgstr "Utiliser cet attribut pour la plupart des composants"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:226 #: pcbnew/dialog_edit_module_for_Modedit.cpp:86
msgid "" msgid ""
"Use this attribute for smd components.\n" "Use this attribute for smd components.\n"
"Only components with this option are put in the footprint position list file" "Only components with this option are put in the footprint position list file"
...@@ -1459,39 +1503,39 @@ msgstr "" ...@@ -1459,39 +1503,39 @@ msgstr ""
"Uiliser cet attribut pour les composants CMS.\n" "Uiliser cet attribut pour les composants CMS.\n"
"Seuls les composants avec cette option sont mis dans le fichier de position des composants" "Seuls les composants avec cette option sont mis dans le fichier de position des composants"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:228 #: pcbnew/dialog_edit_module_for_Modedit.cpp:89
msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)" msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)"
msgstr "Uiliser cet attribut pour les composants \"virtuels\" directement dessinés sur le PCB (tel que les vieux connecteurs ISA de PC)" msgstr "Uiliser cet attribut pour les composants \"virtuels\" directement dessinés sur le PCB (tel que les vieux connecteurs ISA de PC)"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:255 #: pcbnew/dialog_edit_module_for_Modedit.cpp:115
msgid "Enable hotkey move commands and Auto Placement" msgid "Enable hotkey move commands and Auto Placement"
msgstr "Autoriser les commandes clavier de déplacement et l'auto placement" msgstr "Autoriser les commandes clavier de déplacement et l'auto placement"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:257 #: pcbnew/dialog_edit_module_for_Modedit.cpp:116
msgid "Disable hotkey move commands and Auto Placement" msgid "Disable hotkey move commands and Auto Placement"
msgstr "Interdire les commandes clavier de déplacement et l'auto placement" msgstr "Interdire les commandes clavier de déplacement et l'auto placement"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:266 #: pcbnew/dialog_edit_module_for_Modedit.cpp:125
msgid "Shape Scale:" msgid "Shape Scale:"
msgstr "Echelle de la forme:" msgstr "Echelle de la forme:"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:271 #: pcbnew/dialog_edit_module_for_Modedit.cpp:129
msgid "Shape Offset:" msgid "Shape Offset:"
msgstr "Offset forme:" msgstr "Offset forme:"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:276 #: pcbnew/dialog_edit_module_for_Modedit.cpp:133
msgid "Shape Rotation:" msgid "Shape Rotation:"
msgstr "Rot de la forme" msgstr "Rot de la forme"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:382 #: pcbnew/dialog_edit_module_for_Modedit.cpp:259
msgid "3D Shape:" msgid "3D Shape:"
msgstr "Forme 3D:" msgstr "Forme 3D:"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:412 #: pcbnew/dialog_edit_module_for_Modedit.cpp:287
msgid "Use a relative path?" msgid "Use a relative path?"
msgstr "Utiliser un chemin relatif?" msgstr "Utiliser un chemin relatif?"
#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:413 #: pcbnew/dialog_edit_module_for_Modedit.cpp:288
msgid "Path type" msgid "Path type"
msgstr "Type de chemin" msgstr "Type de chemin"
...@@ -1664,17 +1708,72 @@ msgstr "Lignes de Hachure" ...@@ -1664,17 +1708,72 @@ msgstr "Lignes de Hachure"
msgid "Corners in DrawList" msgid "Corners in DrawList"
msgstr "Sommets en Liste de dessin" msgstr "Sommets en Liste de dessin"
#: pcbnew/initpcb.cpp:47 #: pcbnew/files.cpp:21
msgid "Ok to delete selected items ?" msgid "Printed circuit board"
msgstr "Ok pour effacer les éléments sélectionnés ?" msgstr "Circuit imprimé"
#: pcbnew/initpcb.cpp:156 #: pcbnew/files.cpp:71
msgid "Current Board will be lost and this operation cannot be undone. Continue ?" msgid "Recovery file "
msgstr "Le circuit actuel sera perdu et cette opération ne pourra pas être annulée. Continuer ?" msgstr "Fichier de secours "
#: pcbnew/initpcb.cpp:208 #: pcbnew/files.cpp:71
msgid "Current Footprint will be lost and this operation cannot be undone. Continue ?" #: pcbnew/librairi.cpp:248
msgstr "Le module actuel sera perdu et cette opération ne pourra pas être annulée. Continuer ?" msgid " not found"
msgstr " non trouvé"
#: pcbnew/files.cpp:77
msgid "Ok to load Recovery file "
msgstr "Ok pour charger le fichier de secours"
#: pcbnew/files.cpp:133
msgid "Board Modified: Continue ?"
msgstr "Circuit imprimé modifié, Continuer ?"
#: pcbnew/files.cpp:152
msgid "Open Board File"
msgstr "Ouvrir Fichier C.I."
#: pcbnew/files.cpp:175
#: pcbnew/librairi.cpp:74
#, c-format
msgid "File <%s> not found"
msgstr "Fichier %s non trouvé"
#: pcbnew/files.cpp:195
msgid "This file was created by a more recent version of PCBnew and may not load correctly. Please consider updating!"
msgstr "Ce fichier a été créé par une version plus récente de PCBnew et peut être incorrectement chargé. SVP penser à une mise à jour!"
#: pcbnew/files.cpp:200
msgid "This file was created by an older version of PCBnew. It will be stored in the new file format when you save this file again."
msgstr "Ce fichier a été créé par une version plus ancienne de Eeschema. Il sera enregistré au nouveau format après la prochaine sauvegarde."
#: pcbnew/files.cpp:308
msgid "Save Board File"
msgstr "Sauver Fichier C.I."
#: pcbnew/files.cpp:342
msgid "Warning: unable to create backup file "
msgstr "Attention: impossible de créer un fichier backup "
#: pcbnew/files.cpp:359
#: pcbnew/librairi.cpp:301
#: pcbnew/librairi.cpp:447
#: pcbnew/librairi.cpp:606
#: pcbnew/librairi.cpp:809
msgid "Unable to create "
msgstr "Impossible de créer "
#: pcbnew/files.cpp:378
msgid "Backup file: "
msgstr "Fichier backup: "
#: pcbnew/files.cpp:382
msgid "Wrote board file: "
msgstr "Ecriture fichier CI: "
#: pcbnew/files.cpp:384
msgid "Failed to create "
msgstr "Impossible de créer fichier "
#: pcbnew/controle.cpp:175 #: pcbnew/controle.cpp:175
#: pcbnew/modedit.cpp:81 #: pcbnew/modedit.cpp:81
...@@ -1810,9 +1909,17 @@ msgstr "Librairie existante " ...@@ -1810,9 +1909,17 @@ msgstr "Librairie existante "
msgid "Create error " msgid "Create error "
msgstr "Erreur en création " msgstr "Erreur en création "
#: pcbnew/ioascii.cpp:175 #: pcbnew/initpcb.cpp:47
msgid "Error: Unexpected end of file !" msgid "Ok to delete selected items ?"
msgstr "Erreur: Fin de fichier inattendue !" msgstr "Ok pour effacer les éléments sélectionnés ?"
#: pcbnew/initpcb.cpp:156
msgid "Current Board will be lost and this operation cannot be undone. Continue ?"
msgstr "Le circuit actuel sera perdu et cette opération ne pourra pas être annulée. Continuer ?"
#: pcbnew/initpcb.cpp:213
msgid "Current Footprint will be lost and this operation cannot be undone. Continue ?"
msgstr "Le module actuel sera perdu et cette opération ne pourra pas être annulée. Continuer ?"
#: pcbnew/clean.cpp:183 #: pcbnew/clean.cpp:183
msgid "Delete unconnected tracks:" msgid "Delete unconnected tracks:"
...@@ -1952,29 +2059,169 @@ msgstr "Chercher Marqueur" ...@@ -1952,29 +2059,169 @@ msgstr "Chercher Marqueur"
msgid "Find Next Marker" msgid "Find Next Marker"
msgstr "Marqueur Suivant" msgstr "Marqueur Suivant"
#: pcbnew/editrack.cpp:807 #: pcbnew/editrack.cpp:805
msgid "Track Len" msgid "Track Len"
msgstr "Long. Piste" msgstr "Long. Piste"
#: pcbnew/editrack.cpp:811 #: pcbnew/editrack.cpp:809
msgid "Segs Count" msgid "Segs Count"
msgstr "Nb Segms" msgstr "Nb Segms"
#: pcbnew/pcbframe.cpp:334 #: pcbnew/ioascii.cpp:175
msgid "Board modified, Save before exit ?" msgid "Error: Unexpected end of file !"
msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?" msgstr "Erreur: Fin de fichier inattendue !"
#: pcbnew/pcbframe.cpp:335 #: pcbnew/class_board.cpp:52
msgid "Confirmation" msgid "This is the default net class."
msgstr "Confirmation" msgstr "Ceci est la Netclass par défaut"
#: pcbnew/pcbframe.cpp:374 #: pcbnew/class_board.cpp:212
msgid "3D Frame already opened" msgid "Front"
msgstr "Fenêtre 3D déjà ouverte" msgstr "Dessus"
#: pcbnew/pcbframe.cpp:378 #: pcbnew/class_board.cpp:213
msgid "3D Viewer" msgid "Inner2"
msgstr "Visu 3D" msgstr "Interne2"
#: pcbnew/class_board.cpp:214
msgid "Inner3"
msgstr "Interne3"
#: pcbnew/class_board.cpp:215
msgid "Inner4"
msgstr "Interne4"
#: pcbnew/class_board.cpp:216
msgid "Inner5"
msgstr "Interne5"
#: pcbnew/class_board.cpp:217
msgid "Inner6"
msgstr "Interne6"
#: pcbnew/class_board.cpp:218
msgid "Inner7"
msgstr "Interne7"
#: pcbnew/class_board.cpp:219
msgid "Inner8"
msgstr "Interne8"
#: pcbnew/class_board.cpp:220
msgid "Inner9"
msgstr "Interne9"
#: pcbnew/class_board.cpp:221
msgid "Inner10"
msgstr "Interne10"
#: pcbnew/class_board.cpp:222
msgid "Inner11"
msgstr "Interne11"
#: pcbnew/class_board.cpp:223
msgid "Inner12"
msgstr "Interne12"
#: pcbnew/class_board.cpp:224
msgid "Inner13"
msgstr "Interne13"
#: pcbnew/class_board.cpp:225
msgid "Inner14"
msgstr "Interne14"
#: pcbnew/class_board.cpp:226
msgid "Inner15"
msgstr "Interne15"
#: pcbnew/class_board.cpp:227
msgid "Back"
msgstr "Dessous"
#: pcbnew/class_board.cpp:228
msgid "Adhes_Back"
msgstr "Adhes_Dessous"
#: pcbnew/class_board.cpp:229
msgid "Adhes_Front"
msgstr "Adhes_Dessus"
#: pcbnew/class_board.cpp:230
msgid "SoldP_Back"
msgstr "SoldP_Dessous"
#: pcbnew/class_board.cpp:231
msgid "SoldP_Front"
msgstr "SoldP_Dessus"
#: pcbnew/class_board.cpp:232
msgid "SilkS_Back"
msgstr "SilkS_Dessous"
#: pcbnew/class_board.cpp:233
msgid "SilkS_Front"
msgstr "Sérigr_Dessus"
#: pcbnew/class_board.cpp:234
msgid "Mask_Back"
msgstr "Masque_Dessous"
#: pcbnew/class_board.cpp:235
msgid "Mask_Front"
msgstr "Masque_Dessus"
#: pcbnew/class_board.cpp:236
msgid "Drawings"
msgstr "Drawings "
#: pcbnew/class_board.cpp:237
msgid "Comments"
msgstr "Commentaires "
#: pcbnew/class_board.cpp:238
msgid "Eco1"
msgstr "Eco1 "
#: pcbnew/class_board.cpp:239
msgid "Eco2"
msgstr "Eco2 "
#: pcbnew/class_board.cpp:240
msgid "PCB_Edges"
msgstr "Contours_PCB"
#: pcbnew/class_board.cpp:241
msgid "BAD INDEX"
msgstr "BAD INDEX"
#: pcbnew/class_board.cpp:761
msgid "Pads"
msgstr "Pads"
#: pcbnew/class_board.cpp:764
msgid "Vias"
msgstr "Vias"
#: pcbnew/class_board.cpp:767
msgid "Nodes"
msgstr "Nodes"
#: pcbnew/class_board.cpp:770
msgid "Nets"
msgstr "Nets"
#: pcbnew/class_board.cpp:778
msgid "Links"
msgstr "Liens"
#: pcbnew/class_board.cpp:781
msgid "Connect"
msgstr "Connect"
#: pcbnew/class_board.cpp:784
msgid "Unconnected"
msgstr "Non connecté"
#: pcbnew/pcbplot.cpp:558 #: pcbnew/pcbplot.cpp:558
msgid "Warning: Scale option set to a very small value" msgid "Warning: Scale option set to a very small value"
...@@ -1993,9 +2240,33 @@ msgstr "Fichier de tracé <%s> créé" ...@@ -1993,9 +2240,33 @@ msgstr "Fichier de tracé <%s> créé"
msgid "No layer selected" msgid "No layer selected"
msgstr "Pas de couche sélectionnée" msgstr "Pas de couche sélectionnée"
#: pcbnew/dialog_freeroute_exchange.cpp:68 #: pcbnew/dialog_freeroute_exchange.cpp:68
msgid "Freeroute Help" msgid "Freeroute Help"
msgstr "Aide Freeroute" msgstr "Aide Freeroute"
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:40
msgid "from "
msgstr "De "
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:186
msgid "Footprint library files:"
msgstr "Fichiers Library Modules:"
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:227
msgid "Library already in use"
msgstr "Librairie déjà en usage"
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:240
msgid "Default Path for Libraries"
msgstr "Chemin par Défaut des Librairies"
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:289
msgid "Path already in use"
msgstr "Chemin déjà en usage"
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:328
msgid "Footprint document file:"
msgstr "Documentation des Modules:"
#: pcbnew/swap_layers.cpp:68 #: pcbnew/swap_layers.cpp:68
msgid "Swap Layers:" msgid "Swap Layers:"
...@@ -2105,10 +2376,6 @@ msgstr "Problèmes / Marqueurs" ...@@ -2105,10 +2376,6 @@ msgstr "Problèmes / Marqueurs"
msgid "A list of unconnected pads, right click for popup menu" msgid "A list of unconnected pads, right click for popup menu"
msgstr "Pour une liste de pads non connecté, clic droit pour ouvrir un menu" msgstr "Pour une liste de pads non connecté, clic droit pour ouvrir un menu"
#: pcbnew/dialog_drc_base.cpp:171
msgid "Unconnected"
msgstr "Non connecté"
#: pcbnew/moduleframe.cpp:251 #: pcbnew/moduleframe.cpp:251
msgid "Module Editor: Module modified! Continue?" msgid "Module Editor: Module modified! Continue?"
msgstr "Editeur de Module: Module modifié! Continuer ?" msgstr "Editeur de Module: Module modifié! Continuer ?"
...@@ -3098,10 +3365,6 @@ msgstr "Via" ...@@ -3098,10 +3365,6 @@ msgstr "Via"
msgid "Blind/Buried" msgid "Blind/Buried"
msgstr "Borgne/Aveugle" msgstr "Borgne/Aveugle"
#: pcbnew/class_board_item.cpp:193
msgid "Micro Via"
msgstr "Micro Via"
#: pcbnew/class_board_item.cpp:216 #: pcbnew/class_board_item.cpp:216
msgid "Marker" msgid "Marker"
msgstr "Marqueur" msgstr "Marqueur"
...@@ -4162,30 +4425,6 @@ msgstr "Via %s" ...@@ -4162,30 +4425,6 @@ msgstr "Via %s"
msgid "Via %s; (drl %s)" msgid "Via %s; (drl %s)"
msgstr "Via %s; (perçage %s)" msgstr "Via %s; (perçage %s)"
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:40
msgid "from "
msgstr "De "
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:186
msgid "Footprint library files:"
msgstr "Fichiers Library Modules:"
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:227
msgid "Library already in use"
msgstr "Librairie déjà en usage"
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:240
msgid "Default Path for Libraries"
msgstr "Chemin par Défaut des Librairies"
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:289
msgid "Path already in use"
msgstr "Chemin déjà en usage"
#: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:328
msgid "Footprint document file:"
msgstr "Documentation des Modules:"
#: pcbnew/dialog_edit_module_text.cpp:99 #: pcbnew/dialog_edit_module_text.cpp:99
msgid "Value:" msgid "Value:"
msgstr "Valeur:" msgstr "Valeur:"
...@@ -4288,10 +4527,6 @@ msgstr "Last Change" ...@@ -4288,10 +4527,6 @@ msgstr "Last Change"
msgid "Netlist path" msgid "Netlist path"
msgstr "Chemin Netliste " msgstr "Chemin Netliste "
#: pcbnew/class_module.cpp:858
msgid "Pads"
msgstr "Pads"
#: pcbnew/class_module.cpp:865 #: pcbnew/class_module.cpp:865
msgid "Stat" msgid "Stat"
msgstr "Stat" msgstr "Stat"
...@@ -5379,66 +5614,6 @@ msgstr "jumper" ...@@ -5379,66 +5614,6 @@ msgstr "jumper"
msgid "Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus." msgid "Copper layer type for Freerouter. Power layers are removed from Freerouter's layer menus."
msgstr "Type de couches cuivre pour Freerouter. Les couches type \"Power\" sont supprimées du menu des couches de Freerouter." msgstr "Type de couches cuivre pour Freerouter. Les couches type \"Power\" sont supprimées du menu des couches de Freerouter."
#: pcbnew/dialog_layers_setup_base.cpp:199
msgid "Inner2"
msgstr "Interne2"
#: pcbnew/dialog_layers_setup_base.cpp:226
msgid "Inner3"
msgstr "Interne3"
#: pcbnew/dialog_layers_setup_base.cpp:253
msgid "Inner4"
msgstr "Interne4"
#: pcbnew/dialog_layers_setup_base.cpp:280
msgid "Inner5"
msgstr "Interne5"
#: pcbnew/dialog_layers_setup_base.cpp:307
msgid "Inner6"
msgstr "Interne6"
#: pcbnew/dialog_layers_setup_base.cpp:334
msgid "Inner7"
msgstr "Interne7"
#: pcbnew/dialog_layers_setup_base.cpp:361
msgid "Inner8"
msgstr "Interne8"
#: pcbnew/dialog_layers_setup_base.cpp:388
msgid "Inner9"
msgstr "Interne9"
#: pcbnew/dialog_layers_setup_base.cpp:415
msgid "Inner10"
msgstr "Interne10"
#: pcbnew/dialog_layers_setup_base.cpp:442
msgid "Inner11"
msgstr "Interne11"
#: pcbnew/dialog_layers_setup_base.cpp:469
msgid "Inner12"
msgstr "Interne12"
#: pcbnew/dialog_layers_setup_base.cpp:496
msgid "Inner13"
msgstr "Interne13"
#: pcbnew/dialog_layers_setup_base.cpp:523
msgid "Inner14"
msgstr "Interne14"
#: pcbnew/dialog_layers_setup_base.cpp:550
msgid "Inner15"
msgstr "Interne15"
#: pcbnew/dialog_layers_setup_base.cpp:577
msgid "Back"
msgstr "Dessous"
#: pcbnew/dialog_layers_setup_base.cpp:579 #: pcbnew/dialog_layers_setup_base.cpp:579
msgid "Layer name of back (bottom) copper layer" msgid "Layer name of back (bottom) copper layer"
msgstr "Nom de la couche sur le dessous du circuit (coté cuivre)" msgstr "Nom de la couche sur le dessous du circuit (coté cuivre)"
...@@ -5551,6 +5726,7 @@ msgstr "Pistes et vias:" ...@@ -5551,6 +5726,7 @@ msgstr "Pistes et vias:"
#: pcbnew/dialog_display_options_base.cpp:73 #: pcbnew/dialog_display_options_base.cpp:73
#: pcbnew/dialog_display_options_base.cpp:84 #: pcbnew/dialog_display_options_base.cpp:84
#: pcbnew/dialog_display_options_base.cpp:118 #: pcbnew/dialog_display_options_base.cpp:118
#: pcbnew/dialog_plot_base.cpp:97
msgid "Sketch" msgid "Sketch"
msgstr "Contour" msgstr "Contour"
...@@ -5559,6 +5735,7 @@ msgstr "Contour" ...@@ -5559,6 +5735,7 @@ msgstr "Contour"
#: pcbnew/dialog_display_options_base.cpp:73 #: pcbnew/dialog_display_options_base.cpp:73
#: pcbnew/dialog_display_options_base.cpp:84 #: pcbnew/dialog_display_options_base.cpp:84
#: pcbnew/dialog_display_options_base.cpp:118 #: pcbnew/dialog_display_options_base.cpp:118
#: pcbnew/dialog_plot_base.cpp:97
msgid "Filled" msgid "Filled"
msgstr "Plein" msgstr "Plein"
...@@ -5704,11 +5881,6 @@ msgstr "Nom Equipot" ...@@ -5704,11 +5881,6 @@ msgstr "Nom Equipot"
msgid "Net Code" msgid "Net Code"
msgstr "Net Code" msgstr "Net Code"
#: pcbnew/class_netinfo_item.cpp:164
#: pcbnew/class_board.cpp:751
msgid "Vias"
msgstr "Vias"
#: pcbnew/class_netinfo_item.cpp:167 #: pcbnew/class_netinfo_item.cpp:167
msgid "Net Length" msgid "Net Length"
msgstr "Long. Net" msgstr "Long. Net"
...@@ -5718,6 +5890,7 @@ msgid "Print Footprint" ...@@ -5718,6 +5890,7 @@ msgid "Print Footprint"
msgstr "Imprimer Module" msgstr "Imprimer Module"
#: pcbnew/dialog_print_for_modedit_base.cpp:22 #: pcbnew/dialog_print_for_modedit_base.cpp:22
#: pcbnew/dialog_plot_base.cpp:91
msgid "Scale 1" msgid "Scale 1"
msgstr "Echelle 1" msgstr "Echelle 1"
...@@ -5729,86 +5902,6 @@ msgstr "Echelle 8" ...@@ -5729,86 +5902,6 @@ msgstr "Echelle 8"
msgid "Scale 16" msgid "Scale 16"
msgstr "Echelle 16" msgstr "Echelle 16"
#: pcbnew/class_board.cpp:52
msgid "This is the default net class."
msgstr "Ceci est la Netclass par défaut"
#: pcbnew/class_board.cpp:212
msgid "Front"
msgstr "Dessus"
#: pcbnew/class_board.cpp:228
msgid "Adhes_Back"
msgstr "Adhes_Dessous"
#: pcbnew/class_board.cpp:229
msgid "Adhes_Front"
msgstr "Adhes_Dessus"
#: pcbnew/class_board.cpp:230
msgid "SoldP_Back"
msgstr "SoldP_Dessous"
#: pcbnew/class_board.cpp:231
msgid "SoldP_Front"
msgstr "SoldP_Dessus"
#: pcbnew/class_board.cpp:232
msgid "SilkS_Back"
msgstr "SilkS_Dessous"
#: pcbnew/class_board.cpp:233
msgid "SilkS_Front"
msgstr "Sérigr_Dessus"
#: pcbnew/class_board.cpp:234
msgid "Mask_Back"
msgstr "Masque_Dessous"
#: pcbnew/class_board.cpp:235
msgid "Mask_Front"
msgstr "Masque_Dessus"
#: pcbnew/class_board.cpp:236
msgid "Drawings"
msgstr "Drawings "
#: pcbnew/class_board.cpp:237
msgid "Comments"
msgstr "Commentaires "
#: pcbnew/class_board.cpp:238
msgid "Eco1"
msgstr "Eco1 "
#: pcbnew/class_board.cpp:239
msgid "Eco2"
msgstr "Eco2 "
#: pcbnew/class_board.cpp:240
msgid "PCB_Edges"
msgstr "Contours_PCB"
#: pcbnew/class_board.cpp:241
msgid "BAD INDEX"
msgstr "BAD INDEX"
#: pcbnew/class_board.cpp:754
msgid "Nodes"
msgstr "Nodes"
#: pcbnew/class_board.cpp:757
msgid "Nets"
msgstr "Nets"
#: pcbnew/class_board.cpp:765
msgid "Links"
msgstr "Liens"
#: pcbnew/class_board.cpp:768
msgid "Connect"
msgstr "Connect"
#: pcbnew/gen_modules_placefile.cpp:133 #: pcbnew/gen_modules_placefile.cpp:133
msgid "No modules for automated placement." msgid "No modules for automated placement."
msgstr "Pas de module pour placement automatisé" msgstr "Pas de module pour placement automatisé"
...@@ -5825,63 +5918,26 @@ msgstr "Fichier placement côté cuivre:" ...@@ -5825,63 +5918,26 @@ msgstr "Fichier placement côté cuivre:"
msgid "Module count" msgid "Module count"
msgstr "Nb Modules" msgstr "Nb Modules"
#: pcbnew/layer_widget.cpp:242 #: pcbnew/layer_widget.cpp:247
#, fuzzy
msgid "Show All Cu" msgid "Show All Cu"
msgstr "Tout Afficher" msgstr "Afficher toutes couches cuivre"
#: pcbnew/layer_widget.cpp:245 #: pcbnew/layer_widget.cpp:250
msgid "Hide All Cu" msgid "Hide All Cu"
msgstr "" msgstr "Cacher Cu"
#: pcbnew/layer_widget.cpp:385 #: pcbnew/layer_widget.cpp:389
msgid "Left click to select, middle click for color change, right click for menu" msgid "Left click to select, middle click for color change, right click for menu"
msgstr "Clquer sur bouton gauche pour selectionner, du milieu pour changer la couleur, drit pour le menu" msgstr "Cliquer sur bouton gauche pour selectionner, du milieu pour changer la couleur, droit pour le menu"
#: pcbnew/layer_widget.cpp:401 #: pcbnew/layer_widget.cpp:405
msgid "Enable this for visibility" msgid "Enable this for visibility"
msgstr "Activer ceci pour activer la visibilité" msgstr "Activer ceci pour activer la visibilité"
#: pcbnew/layer_widget.cpp:419 #: pcbnew/layer_widget.cpp:424
msgid "Middle click for color change" msgid "Middle click for color change"
msgstr "Clicquer sur bouton du milieu pour changer la couleur" msgstr "Clicquer sur bouton du milieu pour changer la couleur"
#: pcbnew/layer_widget.cpp:709
msgid "wxAUI Test"
msgstr ""
#: pcbnew/layer_widget.cpp:718
msgid "RED"
msgstr "ROUGE"
#: pcbnew/layer_widget.cpp:719
msgid "GREEN"
msgstr "VERT"
#: pcbnew/layer_widget.cpp:720
msgid "BROWN"
msgstr "BRUN"
#: pcbnew/layer_widget.cpp:721
msgid "BLUE"
msgstr "BLEU"
#: pcbnew/layer_widget.cpp:724
msgid "Spock here"
msgstr ""
#: pcbnew/layer_widget.cpp:726
msgid "My eyes are upon you"
msgstr ""
#: pcbnew/layer_widget.cpp:741
msgid "Pane 2 - sample text"
msgstr ""
#: pcbnew/layer_widget.cpp:746
msgid "Main content window"
msgstr ""
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:22 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:22
msgid "No Display" msgid "No Display"
msgstr "Pas d'affichage" msgstr "Pas d'affichage"
...@@ -6431,9 +6487,8 @@ msgid "Save current board" ...@@ -6431,9 +6487,8 @@ msgid "Save current board"
msgstr "Sauver le C.I. actuel" msgstr "Sauver le C.I. actuel"
#: pcbnew/menubar_pcbframe.cpp:76 #: pcbnew/menubar_pcbframe.cpp:76
#, fuzzy
msgid "Save as...\tShift+Ctrl+S" msgid "Save as...\tShift+Ctrl+S"
msgstr "&Sauver\tCtrl S" msgstr "Sauver sous...\tCtrl S"
#: pcbnew/menubar_pcbframe.cpp:77 #: pcbnew/menubar_pcbframe.cpp:77
msgid "Save the current board as.." msgid "Save the current board as.."
...@@ -6545,9 +6600,8 @@ msgid "Export board" ...@@ -6545,9 +6600,8 @@ msgid "Export board"
msgstr "Exporter le C.I." msgstr "Exporter le C.I."
#: pcbnew/menubar_pcbframe.cpp:189 #: pcbnew/menubar_pcbframe.cpp:189
#, fuzzy
msgid "&Print\tCtrl+P" msgid "&Print\tCtrl+P"
msgstr "&Ouvrir\tCtrl+O" msgstr "Imprime&r\tCtrl+O"
#: pcbnew/menubar_pcbframe.cpp:190 #: pcbnew/menubar_pcbframe.cpp:190
msgid "Print pcb board" msgid "Print pcb board"
...@@ -6623,9 +6677,8 @@ msgid "&Find" ...@@ -6623,9 +6677,8 @@ msgid "&Find"
msgstr "&Chercher" msgstr "&Chercher"
#: pcbnew/menubar_pcbframe.cpp:272 #: pcbnew/menubar_pcbframe.cpp:272
#, fuzzy
msgid "Find\tCtrl+F" msgid "Find\tCtrl+F"
msgstr "&Ouvrir\tCtrl+O" msgstr "Chercher\tCtrl+F"
#: pcbnew/menubar_pcbframe.cpp:276 #: pcbnew/menubar_pcbframe.cpp:276
msgid "Find components and text in current loaded board" msgid "Find components and text in current loaded board"
...@@ -6691,9 +6744,8 @@ msgid "Redraw" ...@@ -6691,9 +6744,8 @@ msgid "Redraw"
msgstr "Redessin de l'écran" msgstr "Redessin de l'écran"
#: pcbnew/menubar_pcbframe.cpp:358 #: pcbnew/menubar_pcbframe.cpp:358
#, fuzzy
msgid "Redraw\tCtrl+R" msgid "Redraw\tCtrl+R"
msgstr "&Nouveau\tCtrl+N" msgstr "Redessiner\tCtrl+R"
#: pcbnew/menubar_pcbframe.cpp:362 #: pcbnew/menubar_pcbframe.cpp:362
msgid "Redraw the screen of the board" msgid "Redraw the screen of the board"
...@@ -6713,7 +6765,7 @@ msgstr "&Librairie" ...@@ -6713,7 +6765,7 @@ msgstr "&Librairie"
#: pcbnew/menubar_pcbframe.cpp:392 #: pcbnew/menubar_pcbframe.cpp:392
msgid "Setting libraries, directories and others..." msgid "Setting libraries, directories and others..."
msgstr "Sélectionner les librairies , répertoires et autres" msgstr "Sélectionner les librairies, répertoires et autres"
#: pcbnew/menubar_pcbframe.cpp:398 #: pcbnew/menubar_pcbframe.cpp:398
msgid "&Colors and Visibility" msgid "&Colors and Visibility"
...@@ -7223,11 +7275,11 @@ msgstr "Le composant \" %s\" existe, Le changer ?" ...@@ -7223,11 +7275,11 @@ msgstr "Le composant \" %s\" existe, Le changer ?"
msgid "Component %s saved in library %s" msgid "Component %s saved in library %s"
msgstr "Composant %s sauvé en librairie %s" msgstr "Composant %s sauvé en librairie %s"
#: eeschema/hotkeys.cpp:337 #: eeschema/hotkeys.cpp:333
msgid "Add Component" msgid "Add Component"
msgstr "Ajout Composant" msgstr "Ajout Composant"
#: eeschema/hotkeys.cpp:361 #: eeschema/hotkeys.cpp:357
msgid "Add Wire" msgid "Add Wire"
msgstr "Ajouter Fils" msgstr "Ajouter Fils"
...@@ -8345,12 +8397,12 @@ msgid "Place a bus" ...@@ -8345,12 +8397,12 @@ msgid "Place a bus"
msgstr "Placer un bus" msgstr "Placer un bus"
#: eeschema/tool_sch.cpp:179 #: eeschema/tool_sch.cpp:179
#: eeschema/menubar.cpp:302 #: eeschema/menubar.cpp:294
msgid "Place a wire to bus entry" msgid "Place a wire to bus entry"
msgstr "Placer une Entrée de Bus (type fil vers bus)" msgstr "Placer une Entrée de Bus (type fil vers bus)"
#: eeschema/tool_sch.cpp:183 #: eeschema/tool_sch.cpp:183
#: eeschema/menubar.cpp:309 #: eeschema/menubar.cpp:301
msgid "Place a bus to bus entry" msgid "Place a bus to bus entry"
msgstr "Placer une Entrée de Bus (type bus vers bus)" msgstr "Placer une Entrée de Bus (type bus vers bus)"
...@@ -8359,7 +8411,7 @@ msgid "Place no connect flag" ...@@ -8359,7 +8411,7 @@ msgid "Place no connect flag"
msgstr "Placer symbole de non connexion" msgstr "Placer symbole de non connexion"
#: eeschema/tool_sch.cpp:192 #: eeschema/tool_sch.cpp:192
#: eeschema/menubar.cpp:321 #: eeschema/menubar.cpp:313
msgid "Place net name" msgid "Place net name"
msgstr "Place nom de net" msgstr "Place nom de net"
...@@ -8376,7 +8428,7 @@ msgid "Place a junction" ...@@ -8376,7 +8428,7 @@ msgid "Place a junction"
msgstr "Placer une jonction" msgstr "Placer une jonction"
#: eeschema/tool_sch.cpp:206 #: eeschema/tool_sch.cpp:206
#: eeschema/menubar.cpp:344 #: eeschema/menubar.cpp:336
msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" msgid "Place a hierarchical label. This label will be seen as a pin sheet in the sheet symbol"
msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole" msgstr "Placer un label hiérachique. Ce label sera vu comme une pin dans la feuille mère symbole"
...@@ -8587,9 +8639,8 @@ msgid "Open a recent opened schematic project" ...@@ -8587,9 +8639,8 @@ msgid "Open a recent opened schematic project"
msgstr "Ouvrir un projet schématique récemment ouvert" msgstr "Ouvrir un projet schématique récemment ouvert"
#: eeschema/menubar.cpp:69 #: eeschema/menubar.cpp:69
#, fuzzy
msgid "&Save Whole Schematic Project\tCtrl+S" msgid "&Save Whole Schematic Project\tCtrl+S"
msgstr "SauverTout le Projet Schématique" msgstr "Sauver Tout le Projet Schématique\tCtrl+S"
#: eeschema/menubar.cpp:70 #: eeschema/menubar.cpp:70
msgid "Save all sheets in the schematic project" msgid "Save all sheets in the schematic project"
...@@ -8604,9 +8655,8 @@ msgid "Save only current schematic sheet" ...@@ -8604,9 +8655,8 @@ msgid "Save only current schematic sheet"
msgstr "Sauver seulement la feuille active" msgstr "Sauver seulement la feuille active"
#: eeschema/menubar.cpp:81 #: eeschema/menubar.cpp:81
#, fuzzy
msgid "Save Current Sheet &as\tShift+Ctrl+S" msgid "Save Current Sheet &as\tShift+Ctrl+S"
msgstr "Sauver la Feuille Courante sous ..." msgstr "Sauver Feuille Courante &sous\tShift+Ctrl+S"
#: eeschema/menubar.cpp:82 #: eeschema/menubar.cpp:82
msgid "Save current schematic sheet as..." msgid "Save current schematic sheet as..."
...@@ -8669,176 +8719,175 @@ msgstr "Tracer les feuilles schématiques en format HPGL, POSTSCRIPT ou SVG" ...@@ -8669,176 +8719,175 @@ msgstr "Tracer les feuilles schématiques en format HPGL, POSTSCRIPT ou SVG"
msgid "Quit EESchema" msgid "Quit EESchema"
msgstr "Quitter EESchema" msgstr "Quitter EESchema"
#: eeschema/menubar.cpp:190 #: eeschema/menubar.cpp:182
#, fuzzy
msgid "&Find\tCtrl+F" msgid "&Find\tCtrl+F"
msgstr "&Ouvrir\tCtrl+O" msgstr "&Chercher\tCtrl+F"
#: eeschema/menubar.cpp:199 #: eeschema/menubar.cpp:191
msgid "Backannotate" msgid "Backannotate"
msgstr "Rétro Annotation" msgstr "Rétro Annotation"
#: eeschema/menubar.cpp:200 #: eeschema/menubar.cpp:192
msgid "Back annotated footprint fields" msgid "Back annotated footprint fields"
msgstr "Rétroannotation des champs modules" msgstr "Rétroannotation des champs modules"
#: eeschema/menubar.cpp:246 #: eeschema/menubar.cpp:238
msgid "Fit the schematic sheet on the screen" msgid "Fit the schematic sheet on the screen"
msgstr "Ajuster la feuille de schéma à l'écran" msgstr "Ajuster la feuille de schéma à l'écran"
#: eeschema/menubar.cpp:262 #: eeschema/menubar.cpp:254
msgid "Redraw the schematic view" msgid "Redraw the schematic view"
msgstr "Redessin de l'écran" msgstr "Redessin de l'écran"
#: eeschema/menubar.cpp:276 #: eeschema/menubar.cpp:268
msgid "&Component" msgid "&Component"
msgstr "&Composant" msgstr "&Composant"
#: eeschema/menubar.cpp:277 #: eeschema/menubar.cpp:269
msgid "Place the component" msgid "Place the component"
msgstr "Placer le Composant" msgstr "Placer le Composant"
#: eeschema/menubar.cpp:282 #: eeschema/menubar.cpp:274
msgid "&Power port" msgid "&Power port"
msgstr "Power Symbole" msgstr "Power Symbole"
#: eeschema/menubar.cpp:283 #: eeschema/menubar.cpp:275
msgid "Place the power port" msgid "Place the power port"
msgstr "Placer le Symbole Power" msgstr "Placer le Symbole Power"
#: eeschema/menubar.cpp:288 #: eeschema/menubar.cpp:280
msgid "&Wire" msgid "&Wire"
msgstr "&Fil" msgstr "&Fil"
#: eeschema/menubar.cpp:289 #: eeschema/menubar.cpp:281
msgid "Place the wire" msgid "Place the wire"
msgstr "Place fil" msgstr "Place fil"
#: eeschema/menubar.cpp:294 #: eeschema/menubar.cpp:286
msgid "&Bus" msgid "&Bus"
msgstr "&Bus" msgstr "&Bus"
#: eeschema/menubar.cpp:295 #: eeschema/menubar.cpp:287
msgid "Place bus" msgid "Place bus"
msgstr "Place bus" msgstr "Place bus"
#: eeschema/menubar.cpp:301 #: eeschema/menubar.cpp:293
msgid "W&ire to bus entry" msgid "W&ire to bus entry"
msgstr "Entrées de bus (type fil vers bus)" msgstr "Entrées de bus (type fil vers bus)"
#: eeschema/menubar.cpp:308 #: eeschema/menubar.cpp:300
msgid "B&us to bus entry" msgid "B&us to bus entry"
msgstr "Entrées de bus (type bus vers bus)" msgstr "Entrées de bus (type bus vers bus)"
#: eeschema/menubar.cpp:314 #: eeschema/menubar.cpp:306
msgid "No connect flag" msgid "No connect flag"
msgstr "Symbole de Non Connexion" msgstr "Symbole de Non Connexion"
#: eeschema/menubar.cpp:315 #: eeschema/menubar.cpp:307
msgid "Place a no connect flag" msgid "Place a no connect flag"
msgstr "Placer un Symbole de Non Connexion" msgstr "Placer un Symbole de Non Connexion"
#: eeschema/menubar.cpp:320 #: eeschema/menubar.cpp:312
msgid "Net name" msgid "Net name"
msgstr "Net Name" msgstr "Net Name"
#: eeschema/menubar.cpp:326 #: eeschema/menubar.cpp:318
msgid "Global label" msgid "Global label"
msgstr "Label Global" msgstr "Label Global"
#: eeschema/menubar.cpp:327 #: eeschema/menubar.cpp:319
msgid "Place a global label. Warning: all global labels with the same name are connected in whole hierarchy" msgid "Place a global label. Warning: all global labels with the same name are connected in whole hierarchy"
msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hiérarchie" msgstr "Placer un label global. Attention: tous les labels globaux avec le même nom sont connectés dans toute la hiérarchie"
#: eeschema/menubar.cpp:333 #: eeschema/menubar.cpp:325
msgid "Junction" msgid "Junction"
msgstr "Jonction" msgstr "Jonction"
#: eeschema/menubar.cpp:334 #: eeschema/menubar.cpp:326
msgid "Place junction" msgid "Place junction"
msgstr "Place jonction" msgstr "Place jonction"
#: eeschema/menubar.cpp:343 #: eeschema/menubar.cpp:335
msgid "Hierarchical label" msgid "Hierarchical label"
msgstr "Label Hiérarchique" msgstr "Label Hiérarchique"
#: eeschema/menubar.cpp:351 #: eeschema/menubar.cpp:343
msgid "Hierarchical sheet" msgid "Hierarchical sheet"
msgstr "Feuille Hiérrachique" msgstr "Feuille Hiérrachique"
#: eeschema/menubar.cpp:352 #: eeschema/menubar.cpp:344
msgid "Create a hierarchical sheet" msgid "Create a hierarchical sheet"
msgstr "Créer une Feuille Hiérachique" msgstr "Créer une Feuille Hiérachique"
#: eeschema/menubar.cpp:358 #: eeschema/menubar.cpp:350
msgid "Import Hierarchical Label" msgid "Import Hierarchical Label"
msgstr "Importer Label Hiérarchique" msgstr "Importer Label Hiérarchique"
#: eeschema/menubar.cpp:359 #: eeschema/menubar.cpp:351
msgid "Place a pin sheet created by importing a hierarchical label from sheet" msgid "Place a pin sheet created by importing a hierarchical label from sheet"
msgstr "Placer une pin hiérarchique créée par importation d'un label hiérarchique de la feuille" msgstr "Placer une pin hiérarchique créée par importation d'un label hiérarchique de la feuille"
#: eeschema/menubar.cpp:366 #: eeschema/menubar.cpp:358
msgid "Add Hierarchical Pin to Sheet" msgid "Add Hierarchical Pin to Sheet"
msgstr "Ajouter Pins de Hiérarchie dans feuille" msgstr "Ajouter Pins de Hiérarchie dans feuille"
#: eeschema/menubar.cpp:367 #: eeschema/menubar.cpp:359
msgid "Place a hierarchical pin to sheet" msgid "Place a hierarchical pin to sheet"
msgstr "Addition de pins de hiérarchie dans les feuilles symboles de hiérarchie" msgstr "Addition de pins de hiérarchie dans les feuilles symboles de hiérarchie"
#: eeschema/menubar.cpp:377 #: eeschema/menubar.cpp:369
msgid "Graphic line or polygon" msgid "Graphic line or polygon"
msgstr "Ligne ou polygone graphique" msgstr "Ligne ou polygone graphique"
#: eeschema/menubar.cpp:378 #: eeschema/menubar.cpp:370
msgid "Place graphic lines or polygons" msgid "Place graphic lines or polygons"
msgstr "Placer lignes ou polygones graphiques" msgstr "Placer lignes ou polygones graphiques"
#: eeschema/menubar.cpp:385 #: eeschema/menubar.cpp:377
msgid "Graphic text" msgid "Graphic text"
msgstr "Texte graphique" msgstr "Texte graphique"
#: eeschema/menubar.cpp:386 #: eeschema/menubar.cpp:378
msgid "Place graphic text for comment" msgid "Place graphic text for comment"
msgstr "Placer textes graphiques en commentaire." msgstr "Placer textes graphiques en commentaire."
#: eeschema/menubar.cpp:400 #: eeschema/menubar.cpp:392
msgid "Library preferences" msgid "Library preferences"
msgstr "Préférences pour Librairie" msgstr "Préférences pour Librairie"
#: eeschema/menubar.cpp:405 #: eeschema/menubar.cpp:397
msgid "&Colors" msgid "&Colors"
msgstr "&Couleurs" msgstr "&Couleurs"
#: eeschema/menubar.cpp:406 #: eeschema/menubar.cpp:398
msgid "Color preferences" msgid "Color preferences"
msgstr "Préférences de couleurs" msgstr "Préférences de couleurs"
#: eeschema/menubar.cpp:411 #: eeschema/menubar.cpp:403
msgid "&Options" msgid "&Options"
msgstr "&Options" msgstr "&Options"
#: eeschema/menubar.cpp:412 #: eeschema/menubar.cpp:404
msgid "Eeschema general options and preferences" msgid "Eeschema general options and preferences"
msgstr "Options et préférences générales de Eeschema" msgstr "Options et préférences générales de Eeschema"
#: eeschema/menubar.cpp:426 #: eeschema/menubar.cpp:418
msgid "&Save preferences" msgid "&Save preferences"
msgstr "&Sauver Préférences" msgstr "&Sauver Préférences"
#: eeschema/menubar.cpp:432 #: eeschema/menubar.cpp:424
msgid "&Read preferences" msgid "&Read preferences"
msgstr "&Lire Préférences" msgstr "&Lire Préférences"
#: eeschema/menubar.cpp:444 #: eeschema/menubar.cpp:436
msgid "Open the eeschema manual" msgid "Open the eeschema manual"
msgstr "Ouvrir la documentation de eeschema" msgstr "Ouvrir la documentation de eeschema"
#: eeschema/menubar.cpp:452 #: eeschema/menubar.cpp:444
msgid "About eeschema schematic designer" msgid "About eeschema schematic designer"
msgstr "Au sujet de Eeschema (outil de conception schématique)" msgstr "Au sujet de Eeschema (outil de conception schématique)"
#: eeschema/menubar.cpp:465 #: eeschema/menubar.cpp:457
msgid "&Place" msgid "&Place"
msgstr "&Placer" msgstr "&Placer"
...@@ -9519,10 +9568,6 @@ msgstr "Imprimer Tout" ...@@ -9519,10 +9568,6 @@ msgstr "Imprimer Tout"
msgid "Current" msgid "Current"
msgstr "Courant" msgstr "Courant"
#: eeschema/dialog_eeschema_config.cpp:224
msgid "Library files:"
msgstr "Fichiers Librairies:"
#: eeschema/eelibs_read_libraryfiles.cpp:61 #: eeschema/eelibs_read_libraryfiles.cpp:61
msgid "\n" msgid "\n"
msgstr "\n" msgstr "\n"
...@@ -10079,296 +10124,296 @@ msgstr " a été créé par une version plus ancienne de Eeschema. Il sera enreg ...@@ -10079,296 +10124,296 @@ msgstr " a été créé par une version plus ancienne de Eeschema. Il sera enreg
msgid "Done Loading " msgid "Done Loading "
msgstr "Chargement terminé " msgstr "Chargement terminé "
#: eeschema/onrightclick.cpp:117 #: eeschema/onrightclick.cpp:108
msgid "Leave Sheet" msgid "Leave Sheet"
msgstr "Quitter sous-feuille" msgstr "Quitter sous-feuille"
#: eeschema/onrightclick.cpp:132 #: eeschema/onrightclick.cpp:123
msgid "Delete Noconn" msgid "Delete Noconn"
msgstr "Supprimer Non Connexion" msgstr "Supprimer Non Connexion"
#: eeschema/onrightclick.cpp:142 #: eeschema/onrightclick.cpp:133
msgid "Move Bus Entry" msgid "Move Bus Entry"
msgstr "Déplacer Entrée de Bus" msgstr "Déplacer Entrée de Bus"
#: eeschema/onrightclick.cpp:150 #: eeschema/onrightclick.cpp:141
msgid "Set Bus Entry /" msgid "Set Bus Entry /"
msgstr "Entrée de Bus /" msgstr "Entrée de Bus /"
#: eeschema/onrightclick.cpp:153 #: eeschema/onrightclick.cpp:144
msgid "Set Bus Entry \\" msgid "Set Bus Entry \\"
msgstr "Entrée de Bus \\" msgstr "Entrée de Bus \\"
#: eeschema/onrightclick.cpp:155 #: eeschema/onrightclick.cpp:146
msgid "Delete Bus Entry" msgid "Delete Bus Entry"
msgstr "Supprimer Entrée de Bus" msgstr "Supprimer Entrée de Bus"
#: eeschema/onrightclick.cpp:252 #: eeschema/onrightclick.cpp:243
msgid "Move Field" msgid "Move Field"
msgstr "Déplace Champ" msgstr "Déplace Champ"
#: eeschema/onrightclick.cpp:258 #: eeschema/onrightclick.cpp:249
msgid "Rotate Field" msgid "Rotate Field"
msgstr "Rotation Champ" msgstr "Rotation Champ"
#: eeschema/onrightclick.cpp:263 #: eeschema/onrightclick.cpp:254
msgid "Edit Field" msgid "Edit Field"
msgstr "Editer Champ" msgstr "Editer Champ"
#: eeschema/onrightclick.cpp:291 #: eeschema/onrightclick.cpp:282
msgid "Move Component" msgid "Move Component"
msgstr "Déplace Composant" msgstr "Déplace Composant"
#: eeschema/onrightclick.cpp:296 #: eeschema/onrightclick.cpp:287
msgid "Drag Component" msgid "Drag Component"
msgstr "Drag Composant" msgstr "Drag Composant"
#: eeschema/onrightclick.cpp:309 #: eeschema/onrightclick.cpp:300
msgid "Mirror --" msgid "Mirror --"
msgstr "Miroir--" msgstr "Miroir--"
#: eeschema/onrightclick.cpp:312 #: eeschema/onrightclick.cpp:303
msgid "Mirror ||" msgid "Mirror ||"
msgstr "Miroir ||" msgstr "Miroir ||"
#: eeschema/onrightclick.cpp:320 #: eeschema/onrightclick.cpp:311
msgid "Orient Component" msgid "Orient Component"
msgstr "Oriente Composant" msgstr "Oriente Composant"
#: eeschema/onrightclick.cpp:338 #: eeschema/onrightclick.cpp:329
msgid "Footprint " msgid "Footprint "
msgstr "Empreinte: " msgstr "Empreinte: "
#: eeschema/onrightclick.cpp:354 #: eeschema/onrightclick.cpp:345
#, c-format #, c-format
msgid "Unit %d %c" msgid "Unit %d %c"
msgstr "Unité %d %c" msgstr "Unité %d %c"
#: eeschema/onrightclick.cpp:366 #: eeschema/onrightclick.cpp:357
msgid "Edit Component" msgid "Edit Component"
msgstr "Edite Composant" msgstr "Edite Composant"
#: eeschema/onrightclick.cpp:370 #: eeschema/onrightclick.cpp:361
msgid "Copy Component" msgid "Copy Component"
msgstr "Copie Composant" msgstr "Copie Composant"
#: eeschema/onrightclick.cpp:394 #: eeschema/onrightclick.cpp:385
msgid "Move Global Label" msgid "Move Global Label"
msgstr "Déplacer Label Global" msgstr "Déplacer Label Global"
#: eeschema/onrightclick.cpp:398 #: eeschema/onrightclick.cpp:389
msgid "Copy Global Label" msgid "Copy Global Label"
msgstr "Copier Label Global" msgstr "Copier Label Global"
#: eeschema/onrightclick.cpp:404 #: eeschema/onrightclick.cpp:395
msgid "Rotate Global Label" msgid "Rotate Global Label"
msgstr "Rot. Label Global" msgstr "Rot. Label Global"
#: eeschema/onrightclick.cpp:408 #: eeschema/onrightclick.cpp:399
msgid "Edit Global Label" msgid "Edit Global Label"
msgstr "Editer Label Global" msgstr "Editer Label Global"
#: eeschema/onrightclick.cpp:412 #: eeschema/onrightclick.cpp:403
msgid "Delete Global Label" msgid "Delete Global Label"
msgstr "Supprimer Label Global" msgstr "Supprimer Label Global"
#: eeschema/onrightclick.cpp:419 #: eeschema/onrightclick.cpp:410
#: eeschema/onrightclick.cpp:506 #: eeschema/onrightclick.cpp:497
#: eeschema/onrightclick.cpp:557 #: eeschema/onrightclick.cpp:548
msgid "Change to Hierarchical Label" msgid "Change to Hierarchical Label"
msgstr "Changer en Label Hiérarchique" msgstr "Changer en Label Hiérarchique"
#: eeschema/onrightclick.cpp:421 #: eeschema/onrightclick.cpp:412
#: eeschema/onrightclick.cpp:463 #: eeschema/onrightclick.cpp:454
#: eeschema/onrightclick.cpp:554 #: eeschema/onrightclick.cpp:545
msgid "Change to Label" msgid "Change to Label"
msgstr "Change en Label" msgstr "Change en Label"
#: eeschema/onrightclick.cpp:423 #: eeschema/onrightclick.cpp:414
#: eeschema/onrightclick.cpp:465 #: eeschema/onrightclick.cpp:456
#: eeschema/onrightclick.cpp:508 #: eeschema/onrightclick.cpp:499
msgid "Change to Text" msgid "Change to Text"
msgstr "Change en Texte" msgstr "Change en Texte"
#: eeschema/onrightclick.cpp:426 #: eeschema/onrightclick.cpp:417
#: eeschema/onrightclick.cpp:470 #: eeschema/onrightclick.cpp:461
#: eeschema/onrightclick.cpp:513 #: eeschema/onrightclick.cpp:504
#: eeschema/onrightclick.cpp:564 #: eeschema/onrightclick.cpp:555
msgid "Change Type" msgid "Change Type"
msgstr "Change Type" msgstr "Change Type"
#: eeschema/onrightclick.cpp:437 #: eeschema/onrightclick.cpp:428
msgid "Move Hierarchical Label" msgid "Move Hierarchical Label"
msgstr "Déplacer Label Hiérarchique" msgstr "Déplacer Label Hiérarchique"
#: eeschema/onrightclick.cpp:442 #: eeschema/onrightclick.cpp:433
msgid "Copy Hierarchical Label" msgid "Copy Hierarchical Label"
msgstr "Copier Label Hiérarchique" msgstr "Copier Label Hiérarchique"
#: eeschema/onrightclick.cpp:448 #: eeschema/onrightclick.cpp:439
#: eeschema/onrightclick.cpp:451 #: eeschema/onrightclick.cpp:442
msgid "Rotate Hierarchical Label" msgid "Rotate Hierarchical Label"
msgstr "Rot. Label Hiérarchique" msgstr "Rot. Label Hiérarchique"
#: eeschema/onrightclick.cpp:452 #: eeschema/onrightclick.cpp:443
#: eeschema/onrightclick.cpp:455 #: eeschema/onrightclick.cpp:446
msgid "Edit Hierarchical Label" msgid "Edit Hierarchical Label"
msgstr "Editer Label Hiérarchique" msgstr "Editer Label Hiérarchique"
#: eeschema/onrightclick.cpp:456 #: eeschema/onrightclick.cpp:447
msgid "Delete Hierarchical Label" msgid "Delete Hierarchical Label"
msgstr "Supprimer Label Hiérarchique" msgstr "Supprimer Label Hiérarchique"
#: eeschema/onrightclick.cpp:467 #: eeschema/onrightclick.cpp:458
#: eeschema/onrightclick.cpp:510 #: eeschema/onrightclick.cpp:501
msgid "Change to Global Label" msgid "Change to Global Label"
msgstr "Change en Label Global" msgstr "Change en Label Global"
#: eeschema/onrightclick.cpp:481 #: eeschema/onrightclick.cpp:472
msgid "Move Label" msgid "Move Label"
msgstr "Déplace Label" msgstr "Déplace Label"
#: eeschema/onrightclick.cpp:485 #: eeschema/onrightclick.cpp:476
msgid "Copy Label" msgid "Copy Label"
msgstr "Copier Label" msgstr "Copier Label"
#: eeschema/onrightclick.cpp:491 #: eeschema/onrightclick.cpp:482
msgid "Rotate Label" msgid "Rotate Label"
msgstr "Rot. Label" msgstr "Rot. Label"
#: eeschema/onrightclick.cpp:495 #: eeschema/onrightclick.cpp:486
msgid "Edit Label" msgid "Edit Label"
msgstr "Editer Label" msgstr "Editer Label"
#: eeschema/onrightclick.cpp:499 #: eeschema/onrightclick.cpp:490
msgid "Delete Label" msgid "Delete Label"
msgstr "Supprimer Label" msgstr "Supprimer Label"
#: eeschema/onrightclick.cpp:524 #: eeschema/onrightclick.cpp:515
msgid "Move Text" msgid "Move Text"
msgstr "Déplacer Texte" msgstr "Déplacer Texte"
#: eeschema/onrightclick.cpp:529 #: eeschema/onrightclick.cpp:520
msgid "Copy Text" msgid "Copy Text"
msgstr "CopierTexte" msgstr "CopierTexte"
#: eeschema/onrightclick.cpp:539 #: eeschema/onrightclick.cpp:530
msgid "Edit Text" msgid "Edit Text"
msgstr "Editer Texte" msgstr "Editer Texte"
#: eeschema/onrightclick.cpp:543 #: eeschema/onrightclick.cpp:534
msgid "Delete Text" msgid "Delete Text"
msgstr "Effacer Texte" msgstr "Effacer Texte"
#: eeschema/onrightclick.cpp:561 #: eeschema/onrightclick.cpp:552
msgid "Change to Glabel" msgid "Change to Glabel"
msgstr "Change en Label Global" msgstr "Change en Label Global"
#: eeschema/onrightclick.cpp:580 #: eeschema/onrightclick.cpp:571
#: eeschema/onrightclick.cpp:627 #: eeschema/onrightclick.cpp:618
msgid "Break Wire" msgid "Break Wire"
msgstr "Briser Fil" msgstr "Briser Fil"
#: eeschema/onrightclick.cpp:583 #: eeschema/onrightclick.cpp:574
msgid "Delete Junction" msgid "Delete Junction"
msgstr "Supprimer Jonction" msgstr "Supprimer Jonction"
#: eeschema/onrightclick.cpp:592 #: eeschema/onrightclick.cpp:583
#: eeschema/onrightclick.cpp:620 #: eeschema/onrightclick.cpp:611
msgid "Delete Node" msgid "Delete Node"
msgstr "Supprimer Noeud" msgstr "Supprimer Noeud"
#: eeschema/onrightclick.cpp:594 #: eeschema/onrightclick.cpp:585
#: eeschema/onrightclick.cpp:623 #: eeschema/onrightclick.cpp:614
msgid "Delete Connection" msgid "Delete Connection"
msgstr "Supprimer Connexion" msgstr "Supprimer Connexion"
#: eeschema/onrightclick.cpp:608 #: eeschema/onrightclick.cpp:599
msgid "Wire End" msgid "Wire End"
msgstr "Terminer Fil" msgstr "Terminer Fil"
#: eeschema/onrightclick.cpp:612 #: eeschema/onrightclick.cpp:603
msgid "Drag Wire" msgid "Drag Wire"
msgstr "Drag Fil" msgstr "Drag Fil"
#: eeschema/onrightclick.cpp:617 #: eeschema/onrightclick.cpp:608
msgid "Delete Wire" msgid "Delete Wire"
msgstr "Supprimer Fil" msgstr "Supprimer Fil"
#: eeschema/onrightclick.cpp:641 #: eeschema/onrightclick.cpp:632
#: eeschema/onrightclick.cpp:673 #: eeschema/onrightclick.cpp:664
msgid "Add Global Label" msgid "Add Global Label"
msgstr "Ajout Label Global" msgstr "Ajout Label Global"
#: eeschema/onrightclick.cpp:653 #: eeschema/onrightclick.cpp:644
msgid "Bus End" msgid "Bus End"
msgstr "Terminer Bus" msgstr "Terminer Bus"
#: eeschema/onrightclick.cpp:657 #: eeschema/onrightclick.cpp:648
msgid "Delete Bus" msgid "Delete Bus"
msgstr "Supprimer Bus" msgstr "Supprimer Bus"
#: eeschema/onrightclick.cpp:660 #: eeschema/onrightclick.cpp:651
msgid "Break Bus" msgid "Break Bus"
msgstr "Briser Bus" msgstr "Briser Bus"
#: eeschema/onrightclick.cpp:684 #: eeschema/onrightclick.cpp:675
msgid "Enter Sheet" msgid "Enter Sheet"
msgstr "Entrer dans Feuille" msgstr "Entrer dans Feuille"
#: eeschema/onrightclick.cpp:686 #: eeschema/onrightclick.cpp:677
msgid "Move Sheet" msgid "Move Sheet"
msgstr "Déplacer Feuille" msgstr "Déplacer Feuille"
#: eeschema/onrightclick.cpp:694 #: eeschema/onrightclick.cpp:685
msgid "Place Sheet" msgid "Place Sheet"
msgstr "Placer Feuille" msgstr "Placer Feuille"
#: eeschema/onrightclick.cpp:699 #: eeschema/onrightclick.cpp:690
msgid "Edit Sheet" msgid "Edit Sheet"
msgstr "Editer Feuille" msgstr "Editer Feuille"
#: eeschema/onrightclick.cpp:705 #: eeschema/onrightclick.cpp:696
msgid "Resize Sheet" msgid "Resize Sheet"
msgstr "Redimensionner Feuille" msgstr "Redimensionner Feuille"
#: eeschema/onrightclick.cpp:708 #: eeschema/onrightclick.cpp:699
msgid "Import PinSheets" msgid "Import PinSheets"
msgstr "Importer Connecteur de Hiérarchie" msgstr "Importer Connecteur de Hiérarchie"
#: eeschema/onrightclick.cpp:712 #: eeschema/onrightclick.cpp:703
msgid "Cleanup PinSheets" msgid "Cleanup PinSheets"
msgstr "Nettoyage des Pins Hiérarchiques" msgstr "Nettoyage des Pins Hiérarchiques"
#: eeschema/onrightclick.cpp:714 #: eeschema/onrightclick.cpp:705
msgid "Delete Sheet" msgid "Delete Sheet"
msgstr "Supprimer Feuille" msgstr "Supprimer Feuille"
#: eeschema/onrightclick.cpp:725 #: eeschema/onrightclick.cpp:716
msgid "Move PinSheet" msgid "Move PinSheet"
msgstr "Déplace Connecteur de hiérarchie" msgstr "Déplace Connecteur de hiérarchie"
#: eeschema/onrightclick.cpp:731 #: eeschema/onrightclick.cpp:722
msgid "Edit PinSheet" msgid "Edit PinSheet"
msgstr "Edit Connecteur de hiérarchie" msgstr "Edit Connecteur de hiérarchie"
#: eeschema/onrightclick.cpp:735 #: eeschema/onrightclick.cpp:726
msgid "Delete PinSheet" msgid "Delete PinSheet"
msgstr "Supprimer Connecteur de hiérarchie" msgstr "Supprimer Connecteur de hiérarchie"
#: eeschema/onrightclick.cpp:748 #: eeschema/onrightclick.cpp:739
msgid "Window Zoom" msgid "Window Zoom"
msgstr "Zoom sur Fenètre" msgstr "Zoom sur Fenètre"
#: eeschema/onrightclick.cpp:757 #: eeschema/onrightclick.cpp:748
msgid "Save Block" msgid "Save Block"
msgstr "Sauver Bloc" msgstr "Sauver Bloc"
#: eeschema/onrightclick.cpp:760 #: eeschema/onrightclick.cpp:751
msgid "Drag Block" msgid "Drag Block"
msgstr "Drag Bloc" msgstr "Drag Bloc"
#: eeschema/onrightclick.cpp:770 #: eeschema/onrightclick.cpp:761
msgid "Copy to Clipboard" msgid "Copy to Clipboard"
msgstr "Copie dans Presse papier" msgstr "Copie dans Presse papier"
...@@ -10456,6 +10501,10 @@ msgstr "Remplissage en &avant plan" ...@@ -10456,6 +10501,10 @@ msgstr "Remplissage en &avant plan"
msgid "Fill &background" msgid "Fill &background"
msgstr "Remplissage en a&rriere plan" msgstr "Remplissage en a&rriere plan"
#: eeschema/dialog_eeschema_config.cpp:224
msgid "Library files:"
msgstr "Fichiers Librairies:"
#: eeschema/dialog_eeschema_options_base.cpp:34 #: eeschema/dialog_eeschema_options_base.cpp:34
msgid "Mesurement &units:" msgid "Mesurement &units:"
msgstr "&Unités de mesure:" msgstr "&Unités de mesure:"
...@@ -12133,14 +12182,6 @@ msgstr "MIME type inconnu pour fichier Doc <%s>" ...@@ -12133,14 +12182,6 @@ msgstr "MIME type inconnu pour fichier Doc <%s>"
msgid "??? Via" msgid "??? Via"
msgstr "??? Via" msgstr "??? Via"
#: common/pcbcommon.cpp:64
msgid "Blind/Buried Via"
msgstr "Via Aveugle/Enterrée"
#: common/pcbcommon.cpp:66
msgid "Through Via"
msgstr "Via Traversante"
#: common/pcbcommon.cpp:84 #: common/pcbcommon.cpp:84
msgid "Kicad footprint library files (*.mod)|*.mod" msgid "Kicad footprint library files (*.mod)|*.mod"
msgstr "Fichiers Modules Kicad (*.mod)|*.mod" msgstr "Fichiers Modules Kicad (*.mod)|*.mod"
...@@ -12323,7 +12364,7 @@ msgstr "??" ...@@ -12323,7 +12364,7 @@ msgstr "??"
msgid "Load Error!" msgid "Load Error!"
msgstr "Erreur de Chargement!" msgstr "Erreur de Chargement!"
#: common/hotkeys_basic.cpp:316 #: common/hotkeys_basic.cpp:349
msgid "" msgid ""
"Current hotkey list:\n" "Current hotkey list:\n"
"\n" "\n"
...@@ -12331,87 +12372,87 @@ msgstr "" ...@@ -12331,87 +12372,87 @@ msgstr ""
"Liste des Hotkeys courantes:\n" "Liste des Hotkeys courantes:\n"
"\n" "\n"
#: common/hotkeys_basic.cpp:324 #: common/hotkeys_basic.cpp:357
msgid "key " msgid "key "
msgstr "touche: " msgstr "touche: "
#: common/hotkeys_basic.cpp:377 #: common/hotkeys_basic.cpp:410
msgid "Save Hotkey Configuration File:" msgid "Save Hotkey Configuration File:"
msgstr "Sauver Fichier Configuration des Hotkeys:" msgstr "Sauver Fichier Configuration des Hotkeys:"
#: common/hotkeys_basic.cpp:409 #: common/hotkeys_basic.cpp:442
msgid "Allowed keys:\n" msgid "Allowed keys:\n"
msgstr "Touches autorisées:\n" msgstr "Touches autorisées:\n"
#: common/hotkeys_basic.cpp:494 #: common/hotkeys_basic.cpp:527
msgid "Open Hotkey Configuration File:" msgid "Open Hotkey Configuration File:"
msgstr "Ouvrir Fichier Configuration des Hotkeys:" msgstr "Ouvrir Fichier Configuration des Hotkeys:"
#: common/hotkeys_basic.cpp:512 #: common/hotkeys_basic.cpp:545
msgid "Unable to read " msgid "Unable to read "
msgstr "Impossible de lire " msgstr "Impossible de lire "
#: common/hotkeys_basic.cpp:629 #: common/hotkeys_basic.cpp:663
msgid "List Current Keys" msgid "List Current Keys"
msgstr "Lister Touches Courantes" msgstr "Lister Touches Courantes"
#: common/hotkeys_basic.cpp:630 #: common/hotkeys_basic.cpp:664
msgid "Displays the current hotkeys list and corresponding commands" msgid "Displays the current hotkeys list and corresponding commands"
msgstr "Afficher la liste des hotkeyc courante et les commandes correspondantes" msgstr "Afficher la liste des hotkeyc courante et les commandes correspondantes"
#: common/hotkeys_basic.cpp:636 #: common/hotkeys_basic.cpp:670
msgid "(Re)create Hotkeys File" msgid "(Re)create Hotkeys File"
msgstr "(Re)créer Fichier Hotkeys" msgstr "(Re)créer Fichier Hotkeys"
#: common/hotkeys_basic.cpp:637 #: common/hotkeys_basic.cpp:672
msgid "Create or recreate the hotkey configuration file from current hotkey list" msgid "Create or recreate the hotkey configuration file from current hotkey list"
msgstr "Créer ou recréer le fichier configuration des Hotkeys à partir de la liste courante" msgstr "Créer ou recréer le fichier configuration des Hotkeys à partir de la liste courante"
#: common/hotkeys_basic.cpp:644 #: common/hotkeys_basic.cpp:679
msgid "Reload Hotkeys File" msgid "Reload Hotkeys File"
msgstr "Relire Fichiers Hotkeys" msgstr "Relire Fichiers Hotkeys"
#: common/hotkeys_basic.cpp:645 #: common/hotkeys_basic.cpp:680
msgid "Reload the hotkey configuration file" msgid "Reload the hotkey configuration file"
msgstr "Relire les fichiers configuration des hotkeys" msgstr "Relire les fichiers configuration des hotkeys"
#: common/hotkeys_basic.cpp:651 #: common/hotkeys_basic.cpp:686
msgid "Edit Hotkeys File" msgid "Edit Hotkeys File"
msgstr "Editer Fichier Hotkeys" msgstr "Editer Fichier Hotkeys"
#: common/hotkeys_basic.cpp:652 #: common/hotkeys_basic.cpp:687
msgid "Edit the hotkey configuration file in a text editor" msgid "Edit the hotkey configuration file in a text editor"
msgstr "Editer les fichiers configuration des hotkeys" msgstr "Editer les fichiers configuration des hotkeys"
#: common/hotkeys_basic.cpp:658 #: common/hotkeys_basic.cpp:693
msgid "Hotkeys" msgid "Hotkeys"
msgstr "Hotkeys" msgstr "Hotkeys"
#: common/hotkeys_basic.cpp:659 #: common/hotkeys_basic.cpp:694
msgid "Hotkeys configuration and preferences" msgid "Hotkeys configuration and preferences"
msgstr "Options et préférences générales des hotkeys" msgstr "Options et préférences générales des hotkeys"
#: common/hotkeys_basic.cpp:667 #: common/hotkeys_basic.cpp:702
msgid "Home directory" msgid "Home directory"
msgstr "Répertoire d'accueil (home)" msgstr "Répertoire d'accueil (home)"
#: common/hotkeys_basic.cpp:668 #: common/hotkeys_basic.cpp:703
msgid "Use home directory to load or store Hotkey config files" msgid "Use home directory to load or store Hotkey config files"
msgstr "Utiliser le répertoire d'accueil pour charger ou sauver les fichiers de config des Hotkeys" msgstr "Utiliser le répertoire d'accueil pour charger ou sauver les fichiers de config des Hotkeys"
#: common/hotkeys_basic.cpp:675 #: common/hotkeys_basic.cpp:710
msgid "KiCad template directory" msgid "KiCad template directory"
msgstr "kicad/template répertoire" msgstr "kicad/template répertoire"
#: common/hotkeys_basic.cpp:676 #: common/hotkeys_basic.cpp:711
msgid "Use kicad/template directory to load or store Hotkey config files" msgid "Use kicad/template directory to load or store Hotkey config files"
msgstr "Utiliser répertoire kicad/template pour charger ou sauver les fichiers de config des Hotkeys" msgstr "Utiliser répertoire kicad/template pour charger ou sauver les fichiers de config des Hotkeys"
#: common/hotkeys_basic.cpp:682 #: common/hotkeys_basic.cpp:717
msgid "Location" msgid "Location"
msgstr "Emplacement" msgstr "Emplacement"
#: common/hotkeys_basic.cpp:683 #: common/hotkeys_basic.cpp:718
msgid "Select hotkey configuration file location" msgid "Select hotkey configuration file location"
msgstr "Sélectionner l'emplacement du fichier fonfiguration des hotkeys:" msgstr "Sélectionner l'emplacement du fichier fonfiguration des hotkeys:"
...@@ -12737,10 +12778,6 @@ msgstr "Texte Module Dessus" ...@@ -12737,10 +12778,6 @@ msgstr "Texte Module Dessus"
msgid "Text Module invisible" msgid "Text Module invisible"
msgstr "Texte Module invisible" msgstr "Texte Module invisible"
#: pcbnew/set_color.h:415
msgid "Anchors"
msgstr "Ancres"
#: pcbnew/set_color.h:432 #: pcbnew/set_color.h:432
msgid "Show Noconnect" msgid "Show Noconnect"
msgstr "Montrer Non Conn" msgstr "Montrer Non Conn"
...@@ -13106,6 +13143,15 @@ msgstr "Options d'Affichage" ...@@ -13106,6 +13143,15 @@ msgstr "Options d'Affichage"
msgid "Page Settings" msgid "Page Settings"
msgstr "Ajustage opt Page" msgstr "Ajustage opt Page"
#~ msgid "RED"
#~ msgstr "ROUGE"
#~ msgid "GREEN"
#~ msgstr "VERT"
#~ msgid "BROWN"
#~ msgstr "BRUN"
#~ msgid "BLUE"
#~ msgstr "BLEU"
#, fuzzy #, fuzzy
#~ msgid "Zoom Out\t" #~ msgid "Zoom Out\t"
#~ msgstr "Zoom -" #~ msgstr "Zoom -"
......
pcbnew/class_netinfo_item.cpp
View file @ 2bae7624
...@@ -192,6 +192,7 @@ void RATSNEST_ITEM::Draw( WinEDA_DrawPanel* panel, ...@@ -192,6 +192,7 @@ void RATSNEST_ITEM::Draw( WinEDA_DrawPanel* panel,
int aDrawMode, int aDrawMode,
const wxPoint& aOffset ) const wxPoint& aOffset )
{ {
GRSetDrawMode( DC, aDrawMode );
GRLine( &panel->m_ClipBox, DC, m_PadStart->m_Pos - aOffset, GRLine( &panel->m_ClipBox, DC, m_PadStart->m_Pos - aOffset,
m_PadEnd->m_Pos - aOffset, 0, g_DesignSettings.m_RatsnestColor ); m_PadEnd->m_Pos - aOffset, 0, g_DesignSettings.m_RatsnestColor );
} }
pcbnew/dialog_general_options.cpp
View file @ 2bae7624
...@@ -256,15 +256,25 @@ void WinEDA_PcbFrame::OnSelectOptionToolbar( wxCommandEvent& event ) ...@@ -256,15 +256,25 @@ void WinEDA_PcbFrame::OnSelectOptionToolbar( wxCommandEvent& event )
break; break;
case ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1: case ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1:
m_show_microwave_tools = m_OptionsToolBar->GetToolState( id );
#if !defined(KICAD_AUIMANAGER) #if !defined(KICAD_AUIMANAGER)
// show auxiliary Vertical toolbar (Microwave tool) // show auxiliary Vertical toolbar (Microwave tool)
m_AuxVToolBar->Show(m_OptionsToolBar->GetToolState( id )); m_AuxVToolBar->Show(m_show_microwave_tools);
{ {
wxSizeEvent SizeEv( GetSize() ); wxSizeEvent SizeEv( GetSize() );
OnSize( SizeEv ); OnSize( SizeEv );
} }
#else #else
m_auimgr.GetPane( wxT( "m_AuxVToolBar" ) ).Show( m_OptionsToolBar->GetToolState( id ) ); m_auimgr.GetPane( wxT( "m_AuxVToolBar" ) ).Show( m_show_microwave_tools );
m_auimgr.Update();
#endif
break;
case ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR:
#if defined(KICAD_AUIMANAGER)
// show auxiliary Vertical layers and visibility manager toolbar
m_show_layer_manager_tools = m_OptionsToolBar->GetToolState( id );
m_auimgr.GetPane( wxT( "m_LayersManagerToolBar" ) ).Show( m_show_layer_manager_tools );
m_auimgr.Update(); m_auimgr.Update();
#endif #endif
break; break;
......
pcbnew/editrack.cpp
View file @ 2bae7624
...@@ -495,7 +495,7 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC ) ...@@ -495,7 +495,7 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
TRACK* firstTrack = g_FirstTrackSegment; TRACK* firstTrack = g_FirstTrackSegment;
int newCount = g_CurrentTrackList.GetCount(); int newCount = g_CurrentTrackList.GetCount();
// Put entire new current segment list in BOARD, ans prepare undo // Put entire new current segment list in BOARD, and prepare undo
// command // command
TRACK* track; TRACK* track;
TRACK* insertBeforeMe = g_CurrentTrackSegment->GetBestInsertPoint( TRACK* insertBeforeMe = g_CurrentTrackSegment->GetBestInsertPoint(
...@@ -526,10 +526,8 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC ) ...@@ -526,10 +526,8 @@ void WinEDA_PcbFrame::End_Route( TRACK* aTrack, wxDC* DC )
SaveCopyInUndoList( s_ItemsListPicker, UR_UNSPECIFIED ); SaveCopyInUndoList( s_ItemsListPicker, UR_UNSPECIFIED );
s_ItemsListPicker.ClearItemsList(); // s_ItemsListPicker is no more s_ItemsListPicker.ClearItemsList(); // s_ItemsListPicker is no more
// owner of picked items // owner of picked items
/* compute the new rastnest */ /* compute the new rastnest */
test_1_net_connexion( DC, netcode ); test_1_net_connexion( DC, netcode );
GetScreen()->SetModify(); GetScreen()->SetModify();
GetBoard()->DisplayInfo( this ); GetBoard()->DisplayInfo( this );
} }
......
pcbnew/layer_widget.cpp
View file @ 2bae7624
...@@ -718,7 +718,7 @@ class MYFRAME : public wxFrame ...@@ -718,7 +718,7 @@ class MYFRAME : public wxFrame
public: public:
MYFRAME( wxWindow * parent ) : MYFRAME( wxWindow * parent ) :
wxFrame( parent, -1, _( "wxAUI Test" ), wxDefaultPosition, wxFrame( parent, -1, wxT( "wxAUI Test" ), wxDefaultPosition,
wxSize( 800, 600 ), wxDEFAULT_FRAME_STYLE ) wxSize( 800, 600 ), wxDEFAULT_FRAME_STYLE )
{ {
// notify wxAUI which frame to use // notify wxAUI which frame to use
...@@ -728,19 +728,19 @@ public: ...@@ -728,19 +728,19 @@ public:
// add some layer rows // add some layer rows
static const LAYER_WIDGET::ROW layerRows[] = { static const LAYER_WIDGET::ROW layerRows[] = {
LAYER_WIDGET::ROW( wxT("layer 1"), 0, RED, _("RED"), false ), LAYER_WIDGET::ROW( wxT("layer 1"), 0, RED, wxT("RED"), false ),
LAYER_WIDGET::ROW( wxT("layer 2"), 1, GREEN, _("GREEN"), true ), LAYER_WIDGET::ROW( wxT("layer 2"), 1, GREEN, wxT("GREEN"), true ),
LAYER_WIDGET::ROW( wxT("brown_layer"), 2, BROWN, _("BROWN"), true ), LAYER_WIDGET::ROW( wxT("brown_layer"), 2, BROWN, wxT("BROWN"), true ),
LAYER_WIDGET::ROW( wxT("layer_4_you"), 3, BLUE, _("BLUE"), false ), LAYER_WIDGET::ROW( wxT("layer_4_you"), 3, BLUE, wxT("BLUE"), false ),
}; };
lw->AppendLayerRows( layerRows, DIM(layerRows) ); lw->AppendLayerRows( layerRows, DIM(layerRows) );
// add some render rows // add some render rows
static const LAYER_WIDGET::ROW renderRows[] = { static const LAYER_WIDGET::ROW renderRows[] = {
LAYER_WIDGET::ROW( wxT("With Very Large Ears"), 0, -1, _("Spock here") ), LAYER_WIDGET::ROW( wxT("With Very Large Ears"), 0, -1, wxT("Spock here") ),
LAYER_WIDGET::ROW( wxT("With Legs"), 1, YELLOW ), LAYER_WIDGET::ROW( wxT("With Legs"), 1, YELLOW ),
LAYER_WIDGET::ROW( wxT("With Oval Eyes"), 1, BROWN, _("My eyes are upon you") ), LAYER_WIDGET::ROW( wxT("With Oval Eyes"), 1, BROWN, wxT("My eyes are upon you") ),
}; };
lw->AppendRenderRows( renderRows, DIM(renderRows) ); lw->AppendRenderRows( renderRows, DIM(renderRows) );
...@@ -758,12 +758,12 @@ public: ...@@ -758,12 +758,12 @@ public:
m_mgr.AddPane( lw, li ); m_mgr.AddPane( lw, li );
wxTextCtrl* text2 = new wxTextCtrl( this, -1, _( "Pane 2 - sample text" ), wxTextCtrl* text2 = new wxTextCtrl( this, -1, wxT( "Pane 2 - sample text" ),
wxDefaultPosition, wxSize( 200, 150 ), wxDefaultPosition, wxSize( 200, 150 ),
wxNO_BORDER | wxTE_MULTILINE ); wxNO_BORDER | wxTE_MULTILINE );
m_mgr.AddPane( text2, wxBOTTOM, wxT( "Pane Number Two" ) ); m_mgr.AddPane( text2, wxBOTTOM, wxT( "Pane Number Two" ) );
wxTextCtrl* text3 = new wxTextCtrl( this, -1, _( "Main content window" ), wxTextCtrl* text3 = new wxTextCtrl( this, -1, wxT( "Main content window" ),
wxDefaultPosition, wxSize( 200, 150 ), wxDefaultPosition, wxSize( 200, 150 ),
wxNO_BORDER | wxTE_MULTILINE ); wxNO_BORDER | wxTE_MULTILINE );
m_mgr.AddPane( text3, wxCENTER ); m_mgr.AddPane( text3, wxCENTER );
......
pcbnew/pcbframe.cpp
View file @ 2bae7624
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#define PCB_MAGNETIC_PADS_OPT wxT( "PcbMagPadOpt" ) #define PCB_MAGNETIC_PADS_OPT wxT( "PcbMagPadOpt" )
#define PCB_MAGNETIC_TRACKS_OPT wxT( "PcbMagTrackOpt" ) #define PCB_MAGNETIC_TRACKS_OPT wxT( "PcbMagTrackOpt" )
#define SHOW_MICROWAVE_TOOLS wxT( "ShowMicrowaveTools" ) #define SHOW_MICROWAVE_TOOLS wxT( "ShowMicrowaveTools" )
#define SHOW_LAYER_MANAGER_TOOLS wxT( "ShowLayerManagerTools" )
BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame ) BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
EVT_SOCKET( ID_EDA_SOCKET_EVENT_SERV, WinEDA_PcbFrame::OnSockRequestServer ) EVT_SOCKET( ID_EDA_SOCKET_EVENT_SERV, WinEDA_PcbFrame::OnSockRequestServer )
...@@ -153,6 +153,8 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame ) ...@@ -153,6 +153,8 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
// Option toolbar // Option toolbar
EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END, EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END,
WinEDA_PcbFrame::OnSelectOptionToolbar ) WinEDA_PcbFrame::OnSelectOptionToolbar )
EVT_TOOL( ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
WinEDA_PcbFrame::OnSelectOptionToolbar)
// Vertical toolbar: // Vertical toolbar:
EVT_TOOL( ID_NO_SELECT_BUTT, WinEDA_PcbFrame::Process_Special_Functions ) EVT_TOOL( ID_NO_SELECT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
...@@ -241,6 +243,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father, ...@@ -241,6 +243,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father,
m_SelLayerBox = NULL; m_SelLayerBox = NULL;
m_TrackAndViasSizesList_Changed = false; m_TrackAndViasSizesList_Changed = false;
m_show_microwave_tools = false; m_show_microwave_tools = false;
m_show_layer_manager_tools = true;
m_Layers = new LYRS( this ); m_Layers = new LYRS( this );
m_Layers->AppendRenderRows( renderRows, DIM(renderRows) ); m_Layers->AppendRenderRows( renderRows, DIM(renderRows) );
...@@ -320,11 +323,16 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father, ...@@ -320,11 +323,16 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father,
m_auimgr.AddPane( m_VToolBar, m_auimgr.AddPane( m_VToolBar,
wxAuiPaneInfo( vert ).Name( wxT( "m_VToolBar" ) ).Right().Row( 1 ) ); wxAuiPaneInfo( vert ).Name( wxT( "m_VToolBar" ) ).Right().Row( 1 ) );
m_auimgr.AddPane( m_Layers, lyrs.Right().Row( 0 ) ); m_auimgr.AddPane( m_Layers, lyrs.Name( wxT( "m_LayersManagerToolBar" ) ).Right().Row( 0 ) );
if( m_OptionsToolBar ) if( m_OptionsToolBar )
{
m_auimgr.AddPane( m_OptionsToolBar, m_auimgr.AddPane( m_OptionsToolBar,
wxAuiPaneInfo( vert ).Name( wxT( "m_OptionsToolBar" ) ).Left() ); wxAuiPaneInfo( vert ).Name( wxT( "m_OptionsToolBar" ) ).Left() );
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
m_show_layer_manager_tools );
m_auimgr.GetPane( wxT( "m_LayersManagerToolBar" ) ).Show( m_show_layer_manager_tools );
}
if( DrawPanel ) if( DrawPanel )
m_auimgr.AddPane( DrawPanel, m_auimgr.AddPane( DrawPanel,
...@@ -531,6 +539,7 @@ void WinEDA_PcbFrame::LoadSettings() ...@@ -531,6 +539,7 @@ void WinEDA_PcbFrame::LoadSettings()
config->Read( PCB_MAGNETIC_PADS_OPT, &g_MagneticPadOption ); config->Read( PCB_MAGNETIC_PADS_OPT, &g_MagneticPadOption );
config->Read( PCB_MAGNETIC_TRACKS_OPT, &g_MagneticTrackOption ); config->Read( PCB_MAGNETIC_TRACKS_OPT, &g_MagneticTrackOption );
config->Read( SHOW_MICROWAVE_TOOLS, &m_show_microwave_tools ); config->Read( SHOW_MICROWAVE_TOOLS, &m_show_microwave_tools );
config->Read( SHOW_LAYER_MANAGER_TOOLS, &m_show_layer_manager_tools );
} }
...@@ -547,5 +556,8 @@ void WinEDA_PcbFrame::SaveSettings() ...@@ -547,5 +556,8 @@ void WinEDA_PcbFrame::SaveSettings()
config->Write( PCB_MAGNETIC_PADS_OPT, (long) g_MagneticPadOption ); config->Write( PCB_MAGNETIC_PADS_OPT, (long) g_MagneticPadOption );
config->Write( PCB_MAGNETIC_TRACKS_OPT, (long) g_MagneticTrackOption ); config->Write( PCB_MAGNETIC_TRACKS_OPT, (long) g_MagneticTrackOption );
config->Write( SHOW_MICROWAVE_TOOLS, ( m_AuxVToolBar && m_AuxVToolBar->IsShown() ) ? true : false ); config->Write( SHOW_MICROWAVE_TOOLS,
( m_AuxVToolBar && m_AuxVToolBar->IsShown() ) ? true : false );
config->Write( SHOW_LAYER_MANAGER_TOOLS, (long)m_show_layer_manager_tools );
} }
pcbnew/pcbnew_id.h
View file @ 2bae7624
...@@ -231,6 +231,17 @@ enum pcbnew_ids ...@@ -231,6 +231,17 @@ enum pcbnew_ids
ID_PCB_GEN_BOM_FILE_FROM_BOARD, ID_PCB_GEN_BOM_FILE_FROM_BOARD,
ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG, ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG,
ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
ID_PCB_MUWAVE_START_CMD,
ID_PCB_MUWAVE_TOOL_DISPLAY_TOOLS,
ID_PCB_MUWAVE_TOOL_SELF_CMD,
ID_PCB_MUWAVE_TOOL_GAP_CMD,
ID_PCB_MUWAVE_TOOL_STUB_CMD,
ID_PCB_MUWAVE_TOOL_STUB_ARC_CMD,
ID_PCB_MUWAVE_TOOL_FUNCTION_SHAPE_CMD,
ID_PCB_MUWAVE_END_CMD,
ID_MODEDIT_CHECK, ID_MODEDIT_CHECK,
ID_MODEDIT_SELECT_CURRENT_LIB, ID_MODEDIT_SELECT_CURRENT_LIB,
ID_MODEDIT_SAVE_LIBMODULE, ID_MODEDIT_SAVE_LIBMODULE,
...@@ -251,16 +262,7 @@ enum pcbnew_ids ...@@ -251,16 +262,7 @@ enum pcbnew_ids
ID_MODEDIT_MODULE_MIRROR, ID_MODEDIT_MODULE_MIRROR,
ID_MODEDIT_IMPORT_PART, ID_MODEDIT_IMPORT_PART,
ID_MODEDIT_EXPORT_PART, ID_MODEDIT_EXPORT_PART,
ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART, ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART
ID_PCB_MUWAVE_START_CMD,
ID_PCB_MUWAVE_TOOL_DISPLAY_TOOLS,
ID_PCB_MUWAVE_TOOL_SELF_CMD,
ID_PCB_MUWAVE_TOOL_GAP_CMD,
ID_PCB_MUWAVE_TOOL_STUB_CMD,
ID_PCB_MUWAVE_TOOL_STUB_ARC_CMD,
ID_PCB_MUWAVE_TOOL_FUNCTION_SHAPE_CMD,
ID_PCB_MUWAVE_END_CMD
}; };
#endif /* __PCBNEW_IDS_H__ */ #endif /* __PCBNEW_IDS_H__ */
pcbnew/ratsnest.cpp
View file @ 2bae7624
...@@ -529,18 +529,17 @@ void WinEDA_BasePcbFrame::DrawGeneralRatsnest( wxDC* DC, int net_code ) ...@@ -529,18 +529,17 @@ void WinEDA_BasePcbFrame::DrawGeneralRatsnest( wxDC* DC, int net_code )
return; return;
if( DC == NULL ) if( DC == NULL )
return; return;
int state = CH_VISIBLE | CH_ACTIF;
for( unsigned ii = 0; ii < m_Pcb->GetRatsnestsCount(); ii++ ) for( unsigned ii = 0; ii < m_Pcb->GetRatsnestsCount(); ii++ )
{ {
if( ( m_Pcb->m_FullRatsnest[ii].m_Status & RATSNEST_ITEM& item = m_Pcb->m_FullRatsnest[ii];
( CH_VISIBLE | CH_ACTIF ) ) != if( ( item.m_Status & state ) != state )
( CH_VISIBLE | CH_ACTIF ) )
continue; continue;
if( ( net_code <= 0 ) if( ( net_code <= 0 ) || ( net_code == item.GetNet() ) )
|| ( net_code == m_Pcb->m_FullRatsnest[ii].GetNet() ) ) {
m_Pcb->m_FullRatsnest[ii].Draw( DrawPanel, DC, GR_XOR, item.Draw( DrawPanel, DC, GR_XOR, wxPoint( 0, 0 ) );
wxPoint( 0, 0 ) ); }
} }
} }
......
pcbnew/tool_pcb.cpp
View file @ 2bae7624
...@@ -24,15 +24,14 @@ ...@@ -24,15 +24,14 @@
#include "hotkeys.h" #include "hotkeys.h"
#define MUWAVE_ENBL
#define SEL_LAYER_HELP _( \ #define SEL_LAYER_HELP _( \
"Show active layer selections\nand select layer pair for route and place via" ) "Show active layer selections\nand select layer pair for route and place via" )
/* Data to build the layer pair indicator button */ /* Data to build the layer pair indicator button */
static wxBitmap* LayerPairBitmap = NULL; static wxBitmap* LayerPairBitmap = NULL;
static const char s_BitmapLayerIcon[16][16] = { static const char s_BitmapLayerIcon[16][16] =
{
// 0 = draw pixel with active layer color // 0 = draw pixel with active layer color
// 1 = draw pixel with top layer color (top/bottom layer used in // 1 = draw pixel with top layer color (top/bottom layer used in
// autoroute and place via) // autoroute and place via)
...@@ -70,19 +69,22 @@ void WinEDA_PcbFrame::PrepareLayerIndicator() ...@@ -70,19 +69,22 @@ void WinEDA_PcbFrame::PrepareLayerIndicator()
previous_Route_Layer_BOTTOM_color, previous_via_color; previous_Route_Layer_BOTTOM_color, previous_via_color;
/* get colors, and redraw bitmap button only on changes */ /* get colors, and redraw bitmap button only on changes */
active_layer_color = g_DesignSettings.m_LayerColor[((PCB_SCREEN*)GetScreen())->m_Active_Layer]; active_layer_color =
g_DesignSettings.m_LayerColor[( (PCB_SCREEN*) GetScreen() )->m_Active_Layer];
if( previous_active_layer_color != active_layer_color ) if( previous_active_layer_color != active_layer_color )
{ {
previous_active_layer_color = active_layer_color; previous_active_layer_color = active_layer_color;
change = true; change = true;
} }
Route_Layer_TOP_color = g_DesignSettings.m_LayerColor[((PCB_SCREEN*)GetScreen())->m_Route_Layer_TOP]; Route_Layer_TOP_color =
g_DesignSettings.m_LayerColor[( (PCB_SCREEN*) GetScreen() )->m_Route_Layer_TOP];
if( previous_Route_Layer_TOP_color != Route_Layer_TOP_color ) if( previous_Route_Layer_TOP_color != Route_Layer_TOP_color )
{ {
previous_Route_Layer_TOP_color = Route_Layer_TOP_color; previous_Route_Layer_TOP_color = Route_Layer_TOP_color;
change = true; change = true;
} }
Route_Layer_BOTTOM_color = g_DesignSettings.m_LayerColor[((PCB_SCREEN*)GetScreen())->m_Route_Layer_BOTTOM]; Route_Layer_BOTTOM_color =
g_DesignSettings.m_LayerColor[( (PCB_SCREEN*) GetScreen() )->m_Route_Layer_BOTTOM];
if( previous_Route_Layer_BOTTOM_color != Route_Layer_BOTTOM_color ) if( previous_Route_Layer_BOTTOM_color != Route_Layer_BOTTOM_color )
{ {
previous_Route_Layer_BOTTOM_color = Route_Layer_BOTTOM_color; previous_Route_Layer_BOTTOM_color = Route_Layer_BOTTOM_color;
...@@ -177,7 +179,7 @@ void WinEDA_PcbFrame::PrepareLayerIndicator() ...@@ -177,7 +179,7 @@ void WinEDA_PcbFrame::PrepareLayerIndicator()
/* Creates or updates the main horizontal toolbar for the board editor /* Creates or updates the main horizontal toolbar for the board editor
*/ */
void WinEDA_PcbFrame::ReCreateHToolbar() void WinEDA_PcbFrame::ReCreateHToolbar()
{ {
wxString msg; wxString msg;
...@@ -192,8 +194,9 @@ void WinEDA_PcbFrame::ReCreateHToolbar() ...@@ -192,8 +194,9 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true ); m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, true );
m_HToolBar->SetRows( 1 ); m_HToolBar->SetRows( 1 );
#if !defined(KICAD_AUIMANAGER) #if !defined(KICAD_AUIMANAGER)
SetToolBar( (wxToolBar*)m_HToolBar ); SetToolBar( (wxToolBar*) m_HToolBar );
#endif #endif
// Set up toolbar // Set up toolbar
m_HToolBar->AddTool( ID_NEW_BOARD, wxEmptyString, wxBitmap( new_xpm ), m_HToolBar->AddTool( ID_NEW_BOARD, wxEmptyString, wxBitmap( new_xpm ),
_( "New board" ) ); _( "New board" ) );
...@@ -351,7 +354,7 @@ void WinEDA_PcbFrame::ReCreateOptToolbar() ...@@ -351,7 +354,7 @@ void WinEDA_PcbFrame::ReCreateOptToolbar()
wxEmptyString, wxEmptyString,
wxBitmap( show_zone_disable_xpm ), wxBitmap( show_zone_disable_xpm ),
wxNullBitmap, wxNullBitmap,
_( "Do not show filled areas in zones" )); _( "Do not show filled areas in zones" ) );
m_OptionsToolBar->AddRadioTool( ID_TB_OPTIONS_SHOW_ZONES_OUTLINES_ONLY, m_OptionsToolBar->AddRadioTool( ID_TB_OPTIONS_SHOW_ZONES_OUTLINES_ONLY,
wxEmptyString, wxEmptyString,
wxBitmap( show_zone_outline_only_xpm ), wxBitmap( show_zone_outline_only_xpm ),
...@@ -385,17 +388,23 @@ void WinEDA_PcbFrame::ReCreateOptToolbar() ...@@ -385,17 +388,23 @@ void WinEDA_PcbFrame::ReCreateOptToolbar()
_( "Show invisible text" ), _( "Show invisible text" ),
wxITEM_CHECK ); wxITEM_CHECK );
m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_INVISIBLE_TEXT_MODE, m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_INVISIBLE_TEXT_MODE,
g_DesignSettings.IsElementVisible( MODULE_TEXT_NOV_VISIBLE )); g_DesignSettings.IsElementVisible( MODULE_TEXT_NOV_VISIBLE ) );
#ifdef MUWAVE_ENBL
m_OptionsToolBar->AddSeparator(); m_OptionsToolBar->AddSeparator();
m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
wxEmptyString,
wxBitmap( layers_manager_xpm ),
_(
"Display/remove auxiliary vertical toolbar (tools for micro wave applications)\n This is a experimental feature (under development)" ),
wxITEM_CHECK );
m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1, m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1,
wxEmptyString, wxEmptyString,
wxBitmap( mw_toolbar_xpm ), wxBitmap( mw_toolbar_xpm ),
_( "Display/remove auxiliary vertical toolbar (tools for micro wave applications)\n This is a experimental feature (under development)" ), _(
"Display/remove auxiliary vertical toolbar (tools for micro wave applications)\n This is a experimental feature (under development)" ),
wxITEM_CHECK ); wxITEM_CHECK );
#endif
m_OptionsToolBar->Realize(); m_OptionsToolBar->Realize();
SetToolbars(); SetToolbars();
...@@ -557,7 +566,7 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar() ...@@ -557,7 +566,7 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar()
m_SelViaSizeBox = new WinEDAChoiceBox( m_AuxiliaryToolBar, m_SelViaSizeBox = new WinEDAChoiceBox( m_AuxiliaryToolBar,
ID_AUX_TOOLBAR_PCB_VIA_SIZE, ID_AUX_TOOLBAR_PCB_VIA_SIZE,
wxPoint( -1, -1 ), wxPoint( -1, -1 ),
wxSize( (LISTBOX_WIDTH*12)/10, -1 ) ); wxSize( (LISTBOX_WIDTH * 12) / 10, -1 ) );
m_AuxiliaryToolBar->AddControl( m_SelViaSizeBox ); m_AuxiliaryToolBar->AddControl( m_SelViaSizeBox );
m_AuxiliaryToolBar->AddSeparator(); m_AuxiliaryToolBar->AddSeparator();
...@@ -566,7 +575,7 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar() ...@@ -566,7 +575,7 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar()
wxEmptyString, wxPoint( -1, -1 ), wxEmptyString, wxPoint( -1, -1 ),
wxSize( LISTBOX_WIDTH + 10, -1 ), wxSize( LISTBOX_WIDTH + 10, -1 ),
wxTE_READONLY ); wxTE_READONLY );
m_ClearanceBox->SetToolTip(_("Current NetClass clearance value") ); m_ClearanceBox->SetToolTip( _( "Current NetClass clearance value" ) );
m_AuxiliaryToolBar->AddControl( m_ClearanceBox ); m_AuxiliaryToolBar->AddControl( m_ClearanceBox );
m_AuxiliaryToolBar->AddSeparator(); m_AuxiliaryToolBar->AddSeparator();
...@@ -575,7 +584,7 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar() ...@@ -575,7 +584,7 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar()
wxEmptyString, wxPoint( -1, -1 ), wxEmptyString, wxPoint( -1, -1 ),
wxSize( LISTBOX_WIDTH, -1 ), wxSize( LISTBOX_WIDTH, -1 ),
wxTE_READONLY ); wxTE_READONLY );
m_NetClassSelectedBox->SetToolTip(_("Name of the current NetClass") ); m_NetClassSelectedBox->SetToolTip( _( "Name of the current NetClass" ) );
m_AuxiliaryToolBar->AddControl( m_NetClassSelectedBox ); m_AuxiliaryToolBar->AddControl( m_NetClassSelectedBox );
m_AuxiliaryToolBar->AddSeparator(); m_AuxiliaryToolBar->AddSeparator();
...@@ -584,7 +593,8 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar() ...@@ -584,7 +593,8 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar()
m_AuxiliaryToolBar->AddTool( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH, m_AuxiliaryToolBar->AddTool( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH,
wxEmptyString, wxEmptyString,
wxBitmap( auto_track_width_xpm ), wxBitmap( auto_track_width_xpm ),
_( "Auto track width: when starting on \ _(
"Auto track width: when starting on \
an existing track use its width\notherwise, use current width setting" ), an existing track use its width\notherwise, use current width setting" ),
wxITEM_CHECK ); wxITEM_CHECK );
...@@ -604,16 +614,16 @@ an existing track use its width\notherwise, use current width setting" ), ...@@ -604,16 +614,16 @@ an existing track use its width\notherwise, use current width setting" ),
wxSize( LISTBOX_WIDTH, -1 ) ); wxSize( LISTBOX_WIDTH, -1 ) );
msg = _( "Auto" ); msg = _( "Auto" );
m_SelZoomBox->Append( msg ); m_SelZoomBox->Append( msg );
for( int i = 0; i < (int)GetScreen()->m_ZoomList.GetCount(); i++ ) for( int i = 0; i < (int) GetScreen()->m_ZoomList.GetCount(); i++ )
{ {
msg = _( "Zoom " ); msg = _( "Zoom " );
if ( (GetScreen()->m_ZoomList[i] % GetScreen()->m_ZoomScalar) == 0 ) if( (GetScreen()->m_ZoomList[i] % GetScreen()->m_ZoomScalar) == 0 )
msg << GetScreen()->m_ZoomList[i] / GetScreen()->m_ZoomScalar; msg << GetScreen()->m_ZoomList[i] / GetScreen()->m_ZoomScalar;
else else
{ {
wxString value; wxString value;
value.Printf( wxT( "%.1f" ), value.Printf( wxT( "%.1f" ),
(float)GetScreen()->m_ZoomList[i] / (float) GetScreen()->m_ZoomList[i] /
GetScreen()->m_ZoomScalar ); GetScreen()->m_ZoomScalar );
msg += value; msg += value;
} }
...@@ -628,7 +638,7 @@ an existing track use its width\notherwise, use current width setting" ), ...@@ -628,7 +638,7 @@ an existing track use its width\notherwise, use current width setting" ),
// Update displayed values // Update displayed values
m_SelGridBox->Clear(); m_SelGridBox->Clear();
wxString format = _( "Grid"); wxString format = _( "Grid" );
if( g_UnitMetric == INCHES ) if( g_UnitMetric == INCHES )
format += wxT( " %.1f" ); format += wxT( " %.1f" );
else else
...@@ -673,9 +683,9 @@ void WinEDA_PcbFrame::UpdateToolbarLayerInfo() ...@@ -673,9 +683,9 @@ void WinEDA_PcbFrame::UpdateToolbarLayerInfo()
int choice = m_SelLayerBox->GetChoice(); int choice = m_SelLayerBox->GetChoice();
int layer = GetScreen()->m_Active_Layer; int layer = GetScreen()->m_Active_Layer;
for( int listNdx=0; listNdx<count; ++listNdx ) for( int listNdx = 0; listNdx<count; ++listNdx )
{ {
if( (int) (size_t) m_SelLayerBox->GetClientData( listNdx ) == layer ) if( (int) ( size_t ) m_SelLayerBox->GetClientData( listNdx ) == layer )
{ {
if( listNdx != choice ) if( listNdx != choice )
m_SelLayerBox->SetSelection( listNdx ); m_SelLayerBox->SetSelection( listNdx );
...@@ -695,7 +705,7 @@ WinEDAChoiceBox* WinEDA_PcbFrame::ReCreateLayerBox( WinEDA_Toolbar* parent ) ...@@ -695,7 +705,7 @@ WinEDAChoiceBox* WinEDA_PcbFrame::ReCreateLayerBox( WinEDA_Toolbar* parent )
m_SelLayerBox = new WinEDAChoiceBox( parent, m_SelLayerBox = new WinEDAChoiceBox( parent,
ID_TOOLBARH_PCB_SELECT_LAYER, ID_TOOLBARH_PCB_SELECT_LAYER,
wxPoint( -1, -1 ), wxPoint( -1, -1 ),
#if defined (__UNIX__) #if defined(__UNIX__)
// Width enough for the longest // Width enough for the longest
// string: "Component (Page Down)" // string: "Component (Page Down)"
...@@ -709,20 +719,16 @@ WinEDAChoiceBox* WinEDA_PcbFrame::ReCreateLayerBox( WinEDA_Toolbar* parent ) ...@@ -709,20 +719,16 @@ WinEDAChoiceBox* WinEDA_PcbFrame::ReCreateLayerBox( WinEDA_Toolbar* parent )
parent->AddControl( m_SelLayerBox ); parent->AddControl( m_SelLayerBox );
} }
/*
int layer_mask = g_TabAllCopperLayerMask[g_DesignSettings.m_CopperLayerCount - 1];
layer_mask |= ALL_NO_CU_LAYERS;
*/
int layer_mask = g_DesignSettings.GetEnabledLayers(); int layer_mask = g_DesignSettings.GetEnabledLayers();
unsigned length = 0; unsigned length = 0;
m_SelLayerBox->Clear(); m_SelLayerBox->Clear();
for( int layer=0, listNdx=0; layer <= EDGE_N; layer++ ) for( int layer = 0, listNdx = 0; layer <= EDGE_N; layer++ )
{ {
// List to append hotkeys in layer box selection // List to append hotkeys in layer box selection
static const int HK_SwitchLayer[EDGE_N + 1] = { static const int HK_SwitchLayer[EDGE_N + 1] =
{
HK_SWITCH_LAYER_TO_COPPER, HK_SWITCH_LAYER_TO_COPPER,
HK_SWITCH_LAYER_TO_INNER1, HK_SWITCH_LAYER_TO_INNER1,
HK_SWITCH_LAYER_TO_INNER2, HK_SWITCH_LAYER_TO_INNER2,
...@@ -746,10 +752,13 @@ WinEDAChoiceBox* WinEDA_PcbFrame::ReCreateLayerBox( WinEDA_Toolbar* parent ) ...@@ -746,10 +752,13 @@ WinEDAChoiceBox* WinEDA_PcbFrame::ReCreateLayerBox( WinEDA_Toolbar* parent )
wxString msg = GetBoard()->GetLayerName( layer ); wxString msg = GetBoard()->GetLayerName( layer );
msg = AddHotkeyName( msg, s_Board_Editor_Hokeys_Descr, msg = AddHotkeyName( msg, s_Board_Editor_Hokeys_Descr,
HK_SwitchLayer[layer] ); HK_SwitchLayer[layer] );
m_SelLayerBox->Append( msg );
//D(printf("appending layername=%s, ndx=%d, layer=%d\n", CONV_TO_UTF8(msg), listNdx, layer );)
/* we are using tabs in AddHotkeyName message.
* this is not handled by m_SelLayerBox.
* so we replace them by 3 spaces
*/
msg.Replace( wxT( "\t"), wxT( " " ) );
m_SelLayerBox->Append( msg );
m_SelLayerBox->SetClientData( listNdx, (void*) layer ); m_SelLayerBox->SetClientData( listNdx, (void*) layer );
length = MAX( length, msg.Len() ); length = MAX( length, msg.Len() );
listNdx++; listNdx++;
......
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