haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new icons for zoom commands 

pcbnew: Excellon files use only ascii codes in comments (some excellon parsers do not like I18n)
This commit is contained in:
charras 2008-08-26 06:00:27 +00:00
parent 925d542d4c
commit 8bfb54bc89
25 changed files with 477 additions and 1187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d-viewer/3d_toolbar.cpp
View File

@ -45,10 +45,10 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar()
m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ),
_( "zoom - (F2)" ) ); _( "zoom - (F2)" ) );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
_( "redraw (F3)" ) ); _( "redraw (F3)" ) );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_optimal_xpm ), m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
_( "auto zoom" ) ); _( "auto zoom" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();

102
bitmaps/Repaint.xpm
View File

@ -1,102 +0,0 @@
/* XPM */
#ifndef XPMMAIN
extern const char * repaint_xpm[];
#else
const char * repaint_xpm[] = {
"16 16 78 1",
" c None",
". c #000000",
"+ c #817858",
"@ c #D6D0BD",
"# c #413C27",
"$ c #E7D8A6",
"% c #F2EDD9",
"& c #877B52",
"* c #E9DBAE",
"= c #F1EBD6",
"- c #918458",
"; c #DACD9F",
"> c #F4EED9",
", c #6B6040",
"' c #EDE4C6",
") c #0C0B07",
"! c #A29771",
"~ c #9A8F6A",
"{ c #ADA281",
"] c #D5CCAF",
"^ c #7F7862",
"/ c #A39B7B",
"( c #7B6F4A",
"_ c #CCBC85",
": c #E2CF8B",
"< c #BCAC75",
"[ c #CEBD82",
"} c #C1B178",
"| c #5B5438",
"1 c #A39878",
"2 c #918C74",
"3 c #8B8468",
"4 c #8B8365",
"5 c #91896C",
"6 c #90886A",
"7 c #6A634C",
"8 c #D1C7A8",
"9 c #E8E7E3",
"0 c #D3D2CE",
"a c #B9B8B5",
"b c #948E78",
"c c #51504F",
"d c #161616",
"e c #101010",
"f c #121211",
"g c #0E0D0B",
"h c #555555",
"i c #050505",
"j c #040404",
"k c #6B372D",
"l c #6D392E",
"m c #974E3F",
"n c #44231C",
"o c #2F2F2F",
"p c #272727",
"q c #9D5546",
"r c #6C392E",
"s c #9C5344",
"t c #964E3F",
"u c #6C382D",
"v c #542B22",
"w c #9F5647",
"x c #A75E4F",
"y c #AD5C4B",
"z c #A55C4D",
"A c #2F1813",
"B c #B35D4B",
"C c #7E4134",
"D c #8D493B",
"E c #582D24",
"F c #6C372D",
"G c #613228",
"H c #64332A",
"I c #623228",
"J c #65342A",
"K c #502921",
"L c #4C271F",
"M c #3C1E18",
" .. ",
" .+@#. ",
" .$%&. ",
" .*=-. ",
" .;>,. ",
" ...').. ",
" .!~{]^/(. ",
" ._::::<[}|. ",
" .123444567. ",
" .890a9a9ab. ",
" .cdedddfdg. ",
" .hij.k.jlm. ",
" nholpqrstu. ",
" vwxyxzxzxA ",
"BCDEFGHIJIKLM ",
" "};
#endif

66
bitmaps/Zoom_In.xpm
View File

@ -1,66 +0,0 @@
/* XPM */
#ifndef XPMMAIN
extern const char * zoom_in_xpm[];
#else
const char * zoom_in_xpm[] = {
"16 16 42 1",
" c None",
". c #000000",
"+ c #262626",
"@ c #C5C5C5",
"# c #EEEEEE",
"$ c #EDEDED",
"% c #ABABAB",
"& c #464646",
"* c #878787",
"= c #F1F1F1",
"- c #FEFEFE",
"; c #FDFDFD",
"> c #FCFCFC",
", c #EAEAEA",
"' c #707070",
") c #252525",
"! c #282828",
"~ c #FBFBFB",
"{ c #E8E8E8",
"] c #B0B0B0",
"^ c #FFFFFF",
"/ c #050505",
"( c #040404",
"_ c #FAFAFA",
": c #A4A4A4",
"< c #090909",
"[ c #242424",
"} c #E5E5E5",
"| c #E4E4E4",
"1 c #F9F9F9",
"2 c #BABABA",
"3 c #E7E7E7",
"4 c #858585",
"5 c #E3E3E3",
"6 c #6D6D6D",
"7 c #A1A1A1",
"8 c #202020",
"9 c #686868",
"0 c #343434",
"a c #797979",
"b c #3A3A3A",
"c c #1F1F1F",
" .... ",
" .+@#$%&. ",
" .*=--;>,'. ",
" &=--)!;~{& ",
".]--^/(;>_:. ",
".#-//<(([_}. ",
".$;[(../[_|. ",
".%>;;((~_12. ",
" &,~><)_13& ",
" .4{___156. ",
" .&:}|7&.... ",
" .... 88.. ",
" .90.. ",
" .ab..",
" .9c.",
" .. "};
#endif

107
bitmaps/Zoom_Optimal.xpm
View File

@ -1,107 +0,0 @@
/* XPM */
#ifndef XPMMAIN
extern const char * zoom_optimal_xpm[];
#else
const char * zoom_optimal_xpm[] = {
"16 16 83 1",
" c None",
". c #000000",
"+ c #262626",
"@ c #C5C5C5",
"# c #EEEEEE",
"$ c #EDEDED",
"% c #ABABAB",
"& c #464646",
"* c #878787",
"= c #F1F1F1",
"- c #FEFEFE",
"; c #FDFDFD",
"> c #FCFCFC",
", c #EAEAEA",
"' c #707070",
") c #FBFBFB",
"! c #E8E8E8",
"~ c #565656",
"{ c #7C7C7C",
"] c #7D7D7D",
"^ c #FAFAFA",
"/ c #A4A4A4",
"( c #747474",
"_ c #F8F2DD",
": c #DEDEDE",
"< c #E5E5E5",
"[ c #F7F1DC",
"} c #F5E9BD",
"| c #DDE0E4",
"1 c #7B7B7B",
"2 c #E4E4E4",
"3 c #535353",
"4 c #F6F0DB",
"5 c #F4E8BC",
"6 c #BCBCBC",
"7 c #C0CCD8",
"8 c #7A7A7A",
"9 c #D5D5D5",
"0 c #BABABA",
"a c #222222",
"b c #E5DFCB",
"c c #F2E6BB",
"d c #F3E7BB",
"e c #CDC5A7",
"f c #DEE3E7",
"g c #B5C2D1",
"h c #AAB5C2",
"i c #929292",
"j c #333333",
"k c #827F74",
"l c #E0D5AC",
"m c #F1E5BA",
"n c #AFAFAF",
"o c #C9D3DD",
"p c #B4C1D0",
"q c #A4B0BE",
"r c #353535",
"s c #181712",
"t c #505050",
"u c #CBCFD3",
"v c #A5B1BF",
"w c #747D87",
"x c #32363A",
"y c #F5E9BF",
"z c #817445",
"A c #17150C",
"B c #010100",
"C c #010102",
"D c #0B0E11",
"E c #191F26",
"F c #101010",
"G c #202020",
"H c #EED680",
"I c #6A6A6A",
"J c #9EB1C6",
"K c #7590AE",
"L c #686868",
"M c #343434",
"N c #C7D0D8",
"O c #617891",
"P c #797979",
"Q c #3A3A3A",
"R c #1F1F1F",
" .... ",
" .+@#$%&. ",
" .*=--;>,'. ",
" &=----;)!& ",
".~{{]{{;>^/. ",
".(-___{{:^<. ",
".([}}}{|1^2. ",
".3455567890. ",
".abcdefghi& ",
" jklmnopqr. ",
" .satuvwx.... ",
" .yzABCDE.FG.. ",
" .yHHIJKK..LM.. ",
" ....NKKKO..PQ..",
" ....... .LR.",
" .. "};
#endif

64
bitmaps/Zoom_Out.xpm
View File

@ -1,64 +0,0 @@
/* XPM */
#ifndef XPMMAIN
extern const char * zoom_out_xpm[];
#else
const char * zoom_out_xpm[] = {
"16 16 40 1",
" c None",
". c #000000",
"+ c #262626",
"@ c #C5C5C5",
"# c #EEEEEE",
"$ c #EDEDED",
"% c #ABABAB",
"& c #464646",
"* c #878787",
"= c #F1F1F1",
"- c #FEFEFE",
"; c #FDFDFD",
"> c #FCFCFC",
", c #EAEAEA",
"' c #707070",
") c #FBFBFB",
"! c #E8E8E8",
"~ c #B0B0B0",
"{ c #FFFFFF",
"] c #FAFAFA",
"^ c #A4A4A4",
"/ c #050505",
"( c #090909",
"_ c #040404",
": c #242424",
"< c #E5E5E5",
"[ c #E4E4E4",
"} c #F9F9F9",
"| c #BABABA",
"1 c #E7E7E7",
"2 c #858585",
"3 c #E3E3E3",
"4 c #6D6D6D",
"5 c #A1A1A1",
"6 c #202020",
"7 c #686868",
"8 c #343434",
"9 c #797979",
"0 c #3A3A3A",
"a c #1F1F1F",
" .... ",
" .+@#$%&. ",
" .*=--;>,'. ",
" &=----;)!& ",
".~--{--;>]^. ",
".#-//(__:]<. ",
".$;:_../:][. ",
".%>;;;>)]}|. ",
" &,)>))]}1& ",
" .2!]]]}34. ",
" .&^<[5&.... ",
" .... 66.. ",
" .78.. ",
" .90..",
" .7a.",
" .. "};
#endif

8
bitmaps/makefile.include
View File

@ -225,7 +225,6 @@ OBJECTS = \
red.o\ red.o\
reload2.o\ reload2.o\
reload.o\ reload.o\
Repaint.o\
right.o\ right.o\
Rotate_Field.o\ Rotate_Field.o\
Rotate_Module-.o\ Rotate_Module-.o\
@ -278,9 +277,10 @@ OBJECTS = \
zip.o\ zip.o\
Zoom_1.o\ Zoom_1.o\
Zoom_Center.o\ Zoom_Center.o\
Zoom_In.o\ zoom_in.o\
Zoom_Optimal.o\ zoom_auto.o\
Zoom_Out.o\ zoom_out.o\
zoom_redraw.o\
Zoom_Page.o\ Zoom_Page.o\
Zoom_Selected.o\ Zoom_Selected.o\
Zoom_Select.o\ Zoom_Select.o\

92
bitmaps/redo.xpm
View File

@ -1,31 +1,67 @@
/* XPM */ /* XPM */
#ifndef XPMMAIN
extern const char *redo_xpm[];
#else
const char *redo_xpm[] = { const char *redo_xpm[] = {
/* width height num_colors const chars_per_pixel */ /* columns rows colors chars-per-pixel */
"16 16 4 1", "16 16 45 1",
/* colors */ "p c #78B83A",
" c None", " c none",
"X c #0000E0", "> c #B6F17D",
"a c #808080", "u c #4E8F0F",
". c #404040", "w c #77D917",
"3 c #BCF387",
"* c #DFF8C5",
"2 c #CFF6A8",
"5 c #4D8D0F",
". c #4E9A06",
"% c #D4F7B1",
"8 c #87E927",
"1 c #D2F7AD",
"y c #93EB3D",
"4 c #CDEDAC",
"a c #A7DE72",
"$ c #EAFBD9",
"g c #ABEF69",
"j c #B7F17F",
"q c #B5F17B",
"9 c #6DC715",
"< c #B1F173",
"& c #BFF38D",
"e c #9DDB60",
"0 c #A4DC6F",
"s c #C4F496",
"h c #9BD860",
": c #C2F492",
"; c #D0F6AA",
"t c #D7F7B7",
", c #DEF8C3",
"O c #DEF8C4",
"- c #CEF6A6",
"X c #E3F9CE",
"i c #D3F7AF",
"7 c #DAF8BC",
"6 c #DFF9C5",
"# c #E6FAD2",
"@ c #EBFBDB",
"f c #B3F076",
"o c #E2FACA",
"= c #E9FBD7",
"+ c #A3EE5A",
"r c #A4DB6F",
"d c #63B513",
/* pixels */ /* pixels */
" ", " . ",
" ", " .. ",
" ", " .X. ",
" ", " .....oO. ",
" aXXXX.. ", " ..+@#$%&*. ",
" aX....XX.. X..", " ..%=-;:>>>,. ",
" XX ..X XX..", " ..<$123>>>>>4.",
" XX ..XXX..", " .56789999990..",
" XX ..XXXX..", " .q6weeeee9r.. ",
" XX ..XXXXX..", " .tyeu...er.. ",
" .aXX .........", " .iep. .a.. ",
" .XXXa ", " .se.. ... ",
" ", " .df. .. ",
" ", " ..g.. ",
" ", " .hj. ",
" "}; " .... "
#endif };

104
bitmaps/undo.xpm
View File

@ -1,31 +1,79 @@
/* XPM */ /* XPM */
#ifndef XPMMAIN
extern const char *undo_xpm[];
#else
const char *undo_xpm[] = { const char *undo_xpm[] = {
/* width height num_colors const chars_per_pixel */ /* columns rows colors chars-per-pixel */
"16 16 4 1", "16 16 57 1",
/* colors */ "X c #FFF9C9",
" c None", " c none",
"X c #0000E0", "n c #988F00",
"a c #808080", "8 c #FFE611",
". c #404040", "a c #F6EC9D",
"+ c #7A9402",
"= c #FFEC49",
"w c #FFEC4B",
"6 c #FFEC4D",
"5 c #FFEF65",
"# c #FFF281",
": c #FFF287",
"r c #FFF290",
", c #FFF59D",
"3 c #FFF59F",
"0 c #9C8B00",
"> c #FFF5A1",
"4 c #FFF5A5",
"s c #FFF5AB",
"y c #FFF5AD",
"g c #939000",
"o c #FFF8BD",
"@ c #FFF8BF",
"% c #FFFBD5",
"* c #FFFBD7",
"u c #FDF5AF",
"h c #BCA800",
"q c #849201",
"p c #9E8D00",
"2 c #FFF17B",
"v c #FFF181",
"x c #EBDE7A",
"1 c #FFF49B",
"b c #C6B94C",
"z c #FFF49F",
"t c #FFF4A2",
"d c #FFF7AF",
"9 c #FFF7B5",
"B c #799402",
"& c #FFFACD",
"< c #FFFAD3",
"7 c #DCC500",
"M c #FFEA39",
"- c #819302",
"e c #FFEA3D",
". c #A08F00",
"f c #FFED51",
"c c #7F9302",
"i c #FFF06D",
"; c #FFF06F",
"m c #FFF071",
"k c #7D9302",
"l c #FFF38B",
"j c #FFF6A7",
"N c #879201",
"$ c #FFF6A9",
"O c #FFF9C5",
/* pixels */ /* pixels */
" ", " . ",
" ", " .. ",
" ", " .X. ",
" ", " .oO....+ ",
" ..XXXXa ", " .@#$%&*=.- ",
"..X ..XX....Xa ", " .o;;;:>,<$.- ",
"..XX X.. ...XX ", ".1;;;;;234%5.+ ",
"..XXX ..XX ", "-.677777789@0q ",
"..XXXX ..XX ", " -.w7errtyu@i. ",
"..XXXXX ..XX ", " -.we...pasd. ",
"....... ..XXa ", " -.f. ghtj. ",
" ..aXXX ", " -.. k.yl. ",
" ", " -. .zx. ",
" ", " c.vbn ",
" ", " .mM. ",
" "}; " N..B "
#endif };

38
bitmaps/zoom_auto.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
const char *zoom_auto_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"@ c #A1BDDC",
": c #74726C",
"* c #739AC8",
"% c #5D87BC",
"= c #787A78",
"; c #585955",
" c None",
"& c #8EB0D2",
"X c #8B918E",
"O c #C0D2E1",
"$ c #537EB4",
"+ c #D9E0E7",
"# c #85A6CD",
"o c #B4BBBD",
"- c #A0A29C",
". c #898A86",
/* pixels */
" ..X..... ",
" X.oO+++o.. ",
" .XO+@@@@O+X. ",
"..O#$%##%$#OX. ",
".o+$ &% $Oo. ",
"XO@% %&&$ %@+. ",
"X+&#$&@@#**&+X ",
".+&***@@*$%&+. ",
"XO@$ $**$ $@OX ",
".o+$ $* $+o. ",
".X+@$%##$%&+.= ",
" .X+++O+O++--;; ",
" .Xo++++o..oo;;",
" .XXXXXX:;=.o;",
" ;;=-;",
" ;;;;"
};

38
bitmaps/zoom_in.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
const char *zoom_in_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"; c #9A9E98",
"# c #A0BEDD",
"% c #5883B7",
"X c #AFB8BD",
"@ c #D2DDE4",
": c #585955",
" c None",
". c #898B87",
"* c #4C7AB4",
"& c #8DB1D7",
"- c #767672",
"= c #BCC0BE",
"$ c #B3CBE1",
"+ c #909490",
"o c #C5D5E2",
"O c #E5E7EC",
/* pixels */
" ........ ",
" ..XoOOoX.. ",
" .+o@####@o+. ",
"..o$#$%%$#$o.. ",
".X@#o% %$&@X. ",
".o#$%% %%#&o. ",
".O&% *&O. ",
".O&* *&O. ",
".@#&** **&#@. ",
".X@&#% *##@=. ",
"..@@##%%$#o@.- ",
" .;@Oooo@O@;;:: ",
" ..=OOO@=..==::",
" ..+..+.-:-.X:",
" ::-;:",
" ::::"
};

38
bitmaps/zoom_out.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
const char *zoom_out_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"# c #9FBDDD",
"- c #9A9E98",
"X c #AFB8BD",
"@ c #D2DDE4",
"$ c #B2CBE2",
"; c #585955",
"o c #C4D5E4",
" c None",
". c #898B87",
"* c #4C7AB4",
"& c #5682B7",
"% c #8DB1D7",
"= c #767672",
": c #BCC0BE",
"+ c #909490",
"O c #E5E7EC",
/* pixels */
" ........ ",
" ..XoOOoX.. ",
" .+o@####o@+. ",
"..o$#$$$$#$o.. ",
".X@#o@oo$$%oX. ",
".o#$&&&&&&##o. ",
".O%& *%O. ",
".O%* *%O. ",
".@#%******%#@. ",
".X@#%######OX. ",
"..@@##$#$#o@.= ",
" .-@Oooo@O@--;; ",
" ..:OOO@:..::;;",
" ..+..+.=;=.X;",
" ;;=-;",
" ;;;;"
};

38
bitmaps/zoom_redraw.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
const char *zoom_redraw_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"$ c #7195C3",
"X c #2E5893",
": c #3E6BA4",
"- c #ACC0DC",
"O c #4774AE",
"o c #3665A0",
"@ c #597EAF",
" c None",
"# c #2F5E9C",
"= c #3C6AAC",
"+ c #6287B4",
". c #244B87",
"; c #5482BC",
"* c #A1B8D4",
"% c #81A0C9",
"& c #8EA9CE",
/* pixels */
" ........ ..",
" ..XoO+@#.. ...",
" ..#oO+$%&%X....",
" .X#...#+&**@&..",
" ..X#=...o&*--..",
" ..$=o ..&%-..",
" .o%;o ..@-*-..",
" . ..XXX#..",
" .............. ",
" .--*+.. %$..",
" .-&&.. o=$O..",
" .-*-%X.. o=OX. ",
" .*+**%@X..X... ",
" .o.X$%$@O###.. ",
" .. ..X:O=##.. ",
" .. ........ "
};

4
cvpcb/displayframe.cpp
View File

@ -125,10 +125,10 @@ void WinEDA_DisplayFrame::ReCreateHToolbar()
m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ),
_( "zoom - (F2)" ) ); _( "zoom - (F2)" ) );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
_( "redraw (F3)" ) ); _( "redraw (F3)" ) );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_optimal_xpm ), m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
_( "1:1 zoom" ) ); _( "1:1 zoom" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();

4
eeschema/menubar.cpp
View File

@ -185,7 +185,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE_BUTT, item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE_BUTT,
_( "Zoom auto" ), _( "Zoom auto" ), _( "Zoom auto" ), _( "Zoom auto" ),
wxITEM_NORMAL ); wxITEM_NORMAL );
item->SetBitmap( zoom_optimal_xpm ); item->SetBitmap( zoom_auto_xpm );
viewMenu->Append( item ); viewMenu->Append( item );
viewMenu->AppendSeparator(); viewMenu->AppendSeparator();
@ -195,7 +195,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW_BUTT, item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW_BUTT,
msg, _( "Zoom auto" ), msg, _( "Zoom auto" ),
wxITEM_NORMAL ); wxITEM_NORMAL );
item->SetBitmap( repaint_xpm ); item->SetBitmap( zoom_redraw_xpm );
viewMenu->Append( item ); viewMenu->Append( item );
// Place Menu // Place Menu

4
eeschema/tool_lib.cpp
View File

@ -173,11 +173,11 @@ void WinEDA_LibeditFrame::ReCreateHToolbar()
msg ); msg );
msg = AddHotkeyName( _( "redraw" ), s_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW ); msg = AddHotkeyName( _( "redraw" ), s_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
msg ); msg );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString,
BITMAP( zoom_optimal_xpm ), BITMAP( zoom_auto_xpm ),
_( "auto zoom" ) ); _( "auto zoom" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();

4
eeschema/tool_sch.cpp
View File

@ -98,10 +98,10 @@ void WinEDA_SchematicFrame::ReCreateHToolbar()
msg ); msg );
msg = AddHotkeyName( _( "redraw" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW ); msg = AddHotkeyName( _( "redraw" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
msg ); msg );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_optimal_xpm ), m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
_( "auto zoom" ) ); _( "auto zoom" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();

6
eeschema/tool_viewlib.cpp
View File

@ -71,12 +71,12 @@ bool asdeMorgan = FALSE, state;
_("zoom - (F2)")); _("zoom - (F2)"));
m_HToolBar->AddTool(ID_ZOOM_REDRAW_BUTT, wxEmptyString, m_HToolBar->AddTool(ID_ZOOM_REDRAW_BUTT, wxEmptyString,
BITMAP(repaint_xpm), BITMAP(zoom_redraw_xpm),
_("redraw (F3)")); _("redraw (F3)"));
m_HToolBar->AddTool(ID_ZOOM_PAGE_BUTT, wxEmptyString, m_HToolBar->AddTool(ID_ZOOM_PAGE_BUTT, wxEmptyString,
BITMAP(zoom_optimal_xpm), BITMAP(zoom_auto_xpm),
_("1:1 zoom")); _("best zoom"));
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, wxEmptyString, m_HToolBar->AddTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, wxEmptyString,

4
gerbview/tool_gerber.cpp
View File

@ -283,13 +283,13 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void )
msg ); msg );
msg = AddHotkeyName( _( "redraw" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_REDRAW ); msg = AddHotkeyName( _( "redraw" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_REDRAW );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, BITMAP( repaint_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, BITMAP( zoom_redraw_xpm ),
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject*) NULL, -1, -1, (wxObject*) NULL,
msg ); msg );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, BITMAP( zoom_optimal_xpm ), m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, BITMAP( zoom_auto_xpm ),
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject*) NULL, -1, -1, (wxObject*) NULL,

5
include/bitmaps.h
View File

@ -364,9 +364,10 @@ extern const char* zip_tool_xpm[];
extern const char* zip_xpm[]; extern const char* zip_xpm[];
extern const char* zoom_1_xpm[]; extern const char* zoom_1_xpm[];
extern const char* zoom_center_xpm[]; extern const char* zoom_center_xpm[];
extern const char* zoom_in_xpm[];
extern const char* zoomoins3d_xpm[]; extern const char* zoomoins3d_xpm[];
extern const char* zoom_optimal_xpm[]; extern const char* zoom_redraw_xpm[];
extern const char* zoom_auto_xpm[];
extern const char* zoom_in_xpm[];
extern const char* zoom_out_xpm[]; extern const char* zoom_out_xpm[];
extern const char* zoompage3d_xpm[]; extern const char* zoompage3d_xpm[];
extern const char* zoom_page_xpm[]; extern const char* zoom_page_xpm[];

BIN
internat/fr/kicad.mo
View File

Binary file not shown.

793
internat/fr/kicad.po
View File

File diff suppressed because it is too large Load Diff

129
pcbnew/gendrill.cpp
View File

@ -83,14 +83,14 @@ void WinEDA_DrillFrame::InitDisplayParams( void )
m_Choice_Precision->Enable( false ); m_Choice_Precision->Enable( false );
msg = ReturnStringFromValue( g_UnitMetric, msg = ReturnStringFromValue( g_UnitMetric,
g_DesignSettings.m_ViaDrill, g_DesignSettings.m_ViaDrill,
m_Parent->m_InternalUnits ); m_Parent->m_InternalUnits );
msg += ReturnUnitSymbol( g_UnitMetric ); msg += ReturnUnitSymbol( g_UnitMetric );
m_ViaDrillValue->SetLabel( msg ); m_ViaDrillValue->SetLabel( msg );
msg = ReturnStringFromValue( g_UnitMetric, msg = ReturnStringFromValue( g_UnitMetric,
g_DesignSettings.m_MicroViaDrill, g_DesignSettings.m_MicroViaDrill,
m_Parent->m_InternalUnits ); m_Parent->m_InternalUnits );
msg += ReturnUnitSymbol( g_UnitMetric ); msg += ReturnUnitSymbol( g_UnitMetric );
m_MicroViaDrillValue->SetLabel( msg ); m_MicroViaDrillValue->SetLabel( msg );
@ -133,8 +133,8 @@ void WinEDA_DrillFrame::InitDisplayParams( void )
m_PadsHoleCount++; m_PadsHoleCount++;
} }
else else
if( MIN( pad->m_Drill.x, pad->m_Drill.y ) != 0 ) if( MIN( pad->m_Drill.x, pad->m_Drill.y ) != 0 )
m_PadsHoleCount++; m_PadsHoleCount++;
} }
} }
@ -285,7 +285,7 @@ void WinEDA_DrillFrame::GenDrillFiles( wxCommandEvent& event )
for( ; ; ) for( ; ; )
{ {
Build_Holes_List( m_Parent->m_Pcb, s_HoleListBuffer, s_ToolListBuffer, Build_Holes_List( m_Parent->m_Pcb, s_HoleListBuffer, s_ToolListBuffer,
layer1, layer2, gen_through_holes ? false : true ); layer1, layer2, gen_through_holes ? false : true );
if( s_ToolListBuffer.size() > 0 ) //holes? if( s_ToolListBuffer.size() > 0 ) //holes?
{ {
FullFileName = m_Parent->GetScreen()->m_FileName; FullFileName = m_Parent->GetScreen()->m_FileName;
@ -305,14 +305,14 @@ void WinEDA_DrillFrame::GenDrillFiles( wxCommandEvent& event )
ChangeFileNameExt( FullFileName, layer_extend ); ChangeFileNameExt( FullFileName, layer_extend );
FullFileName = EDA_FileSelector( _( "Drill file" ), FullFileName = EDA_FileSelector( _( "Drill file" ),
wxEmptyString, /* Chemin par defaut */ wxEmptyString, /* Chemin par defaut */
FullFileName, /* nom fichier par defaut */ FullFileName, /* nom fichier par defaut */
Ext, /* extension par defaut */ Ext, /* extension par defaut */
Mask, /* Masque d'affichage */ Mask, /* Masque d'affichage */
this, this,
wxFD_SAVE, wxFD_SAVE,
TRUE TRUE
); );
if( FullFileName != wxEmptyString ) if( FullFileName != wxEmptyString )
{ {
@ -408,7 +408,7 @@ int WinEDA_DrillFrame::Create_Drill_File_EXCELLON( std::vector<HOLE_INFO>& aHol
float xt, yt; float xt, yt;
char line[1024]; char line[1024];
SetLocaleTo_C_standard( ); // Use the standard notation for float numbers SetLocaleTo_C_standard(); // Use the standard notation for float numbers
Write_Excellon_Header( dest ); Write_Excellon_Header( dest );
@ -420,10 +420,10 @@ int WinEDA_DrillFrame::Create_Drill_File_EXCELLON( std::vector<HOLE_INFO>& aHol
{ {
if( s_Unit_Drill_is_Inch ) /* does it need T01, T02 or is T1,T2 ok?*/ if( s_Unit_Drill_is_Inch ) /* does it need T01, T02 or is T1,T2 ok?*/
sprintf( line, "T%dC%.3f\n", ii + 1, sprintf( line, "T%dC%.3f\n", ii + 1,
float (aToolListBuffer[ii].m_Diameter) * s_ConversionUnits ); float (aToolListBuffer[ii].m_Diameter) * s_ConversionUnits );
else else
sprintf( line, "T%dC%.3f\n", ii + 1, sprintf( line, "T%dC%.3f\n", ii + 1,
float (aToolListBuffer[ii].m_Diameter) * s_ConversionUnits * 10.0 ); float (aToolListBuffer[ii].m_Diameter) * s_ConversionUnits * 10.0 );
fputs( line, dest ); fputs( line, dest );
} }
@ -539,7 +539,7 @@ int WinEDA_DrillFrame::Create_Drill_File_EXCELLON( std::vector<HOLE_INFO>& aHol
Write_End_Of_File_Drill( dest ); Write_End_Of_File_Drill( dest );
SetLocaleTo_Default( ); // Revert to locale float notation SetLocaleTo_Default(); // Revert to locale float notation
return holes_count; return holes_count;
} }
@ -629,7 +629,7 @@ void WinEDA_DrillFrame::Write_Excellon_Header( FILE* aFile )
/* Print the DRILL file header. The full header is: /* Print the DRILL file header. The full header is:
* M48 * M48
* ;DRILL file {PCBNEW (2007-11-29-b)} date 17/1/2008-21:02:35 * ;DRILL file {PCBNEW (2007-11-29-b)} date 17/1/2008-21:02:35
* ;FORMAT={2:4 / absolute / Pouces / Suppression zeros de t<EFBFBD>te} * ;FORMAT={ <precision> / absolute / <units> / <numbers format>}
* R,T * R,T
* VER,1 * VER,1
* FMAT,2 * FMAT,2
@ -645,22 +645,43 @@ void WinEDA_DrillFrame::Write_Excellon_Header( FILE* aFile )
if( !Minimal ) if( !Minimal )
{ {
int ii = m_Choice_Zeros_Format->GetSelection();
DateAndTime( Line ); DateAndTime( Line );
// The next 2 lines in EXCELLON files are comments:
wxString msg = g_Main_Title + wxT( " " ) + GetBuildVersion(); wxString msg = g_Main_Title + wxT( " " ) + GetBuildVersion();
fprintf( aFile, ";DRILL file {%s} date %s\n", CONV_TO_UTF8( msg ), Line ); fprintf( aFile, ";DRILL file {%s} date %s\n", CONV_TO_UTF8( msg ), Line );
msg = wxT( ";FORMAT={" ); msg = wxT( ";FORMAT={" );
msg << m_Choice_Precision->GetStringSelection() << wxT("/ absolute / "); // Print precision:
msg << m_Choice_Unit->GetStringSelection() << wxT(" / "); if ( ii > 0 )
msg << m_Choice_Zeros_Format->GetStringSelection() << wxT("}\n"); msg << m_Choice_Precision->GetStringSelection();
else
msg << wxT("-.-"); // in decimal format the precision is irrelevant
msg << wxT( "/ absolute / " );
msg << ( s_Unit_Drill_is_Inch ? wxT( "inch" ) : wxT( "metric" ) );
/* Adding numbers notation format.
* this is same as m_Choice_Zeros_Format strings, but NOT translated
* because some EXCELLON parsers do not like non ascii values
* so we use ONLY english (ascii) strings.
* if new options are added in m_Choice_Zeros_Format, they must also be added here
*/
msg << wxT( " / " );
const wxString zero_fmt[5] =
{
wxT( "decimal" ), wxT( "suppress leading zeros" ),
wxT( "suppress trailing zeros" ), wxT( "keep zeros" ),
wxT( "???" )
};
if( ii < 0 || ii > 4 )
ii = 4;
msg << zero_fmt[ii];
msg << wxT( "}\n" );
fputs( CONV_TO_UTF8( msg ), aFile ); fputs( CONV_TO_UTF8( msg ), aFile );
fputs( "R,T\nVER,1\nFMAT,2\n", aFile ); fputs( "R,T\nVER,1\nFMAT,2\n", aFile );
} }
if( s_Unit_Drill_is_Inch ) fputs( s_Unit_Drill_is_Inch ? "INCH" : "METRIC", aFile );
fputs( "INCH", aFile ); // Si unites en INCHES
else
fputs( "METRIC", aFile ); // Si unites en mm
switch( s_Zeros_Format ) switch( s_Zeros_Format )
{ {
@ -726,14 +747,14 @@ void WinEDA_DrillFrame::GenDrillMap( const wxString aFileName,
Mask += Ext; Mask += Ext;
FullFileName = EDA_FileSelector( _( "Drill Map file" ), FullFileName = EDA_FileSelector( _( "Drill Map file" ),
wxEmptyString, /* Chemin par defaut */ wxEmptyString, /* Chemin par defaut */
FullFileName, /* nom fichier par defaut */ FullFileName, /* nom fichier par defaut */
Ext, /* extension par defaut */ Ext, /* extension par defaut */
Mask, /* Masque d'affichage */ Mask, /* Masque d'affichage */
this, this,
wxFD_SAVE, wxFD_SAVE,
TRUE TRUE
); );
if( FullFileName.IsEmpty() ) if( FullFileName.IsEmpty() )
return; return;
@ -746,13 +767,13 @@ void WinEDA_DrillFrame::GenDrillMap( const wxString aFileName,
} }
GenDrillMapFile( m_Parent->m_Pcb, GenDrillMapFile( m_Parent->m_Pcb,
dest, dest,
FullFileName, FullFileName,
m_Parent->GetScreen()->m_CurrentSheetDesc->m_Size, m_Parent->GetScreen()->m_CurrentSheetDesc->m_Size,
s_HoleListBuffer, s_HoleListBuffer,
s_ToolListBuffer, s_ToolListBuffer,
s_Unit_Drill_is_Inch, s_Unit_Drill_is_Inch,
format ); format );
} }
@ -772,14 +793,14 @@ void WinEDA_DrillFrame::GenDrillReport( const wxString aFileName )
Mask += Ext; Mask += Ext;
FileName = EDA_FileSelector( _( "Drill Report file" ), FileName = EDA_FileSelector( _( "Drill Report file" ),
wxEmptyString, /* Chemin par defaut */ wxEmptyString, /* Chemin par defaut */
FileName, /* nom fichier par defaut */ FileName, /* nom fichier par defaut */
Ext, /* extension par defaut */ Ext, /* extension par defaut */
Mask, /* Masque d'affichage */ Mask, /* Masque d'affichage */
this, this,
wxFD_SAVE, wxFD_SAVE,
TRUE TRUE
); );
if( FileName.IsEmpty() ) if( FileName.IsEmpty() )
return; return;
@ -791,8 +812,8 @@ void WinEDA_DrillFrame::GenDrillReport( const wxString aFileName )
return; return;
} }
GenDrillReportFile( dest, m_Parent->m_Pcb, GenDrillReportFile( dest, m_Parent->m_Pcb,
m_Parent->GetScreen()->m_FileName, m_Parent->GetScreen()->m_FileName,
s_Unit_Drill_is_Inch, s_Unit_Drill_is_Inch,
s_HoleListBuffer, s_HoleListBuffer,
s_ToolListBuffer ); s_ToolListBuffer );
} }

4
pcbnew/tool_modedit.cpp
View File

@ -112,10 +112,10 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar()
msg ); msg );
msg = AddHotkeyName( _( "redraw" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_REDRAW ); msg = AddHotkeyName( _( "redraw" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_REDRAW );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
msg ); msg );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_optimal_xpm ), m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
_( "auto zoom" ) ); _( "auto zoom" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();

4
pcbnew/tool_pcb.cpp
View File

@ -261,10 +261,10 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
msg ); msg );
msg = AddHotkeyName( _( "redraw" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_REDRAW ); msg = AddHotkeyName( _( "redraw" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_REDRAW );
m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ), m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ),
msg ); msg );
m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_optimal_xpm ), m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ),
_( "auto zoom" ) ); _( "auto zoom" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();

4
share/zoom.cpp
View File

@ -365,8 +365,8 @@ void WinEDA_DrawPanel::AddMenuZoom( wxMenu* MasterMenu )
ADD_MENUITEM_WITH_SUBMENU( MasterMenu, zoom_choice, ADD_MENUITEM_WITH_SUBMENU( MasterMenu, zoom_choice,
ID_POPUP_ZOOM_SELECT, _( "Zoom Select" ), zoom_select_xpm ); ID_POPUP_ZOOM_SELECT, _( "Zoom Select" ), zoom_select_xpm );
ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_AUTO, _( "Auto" ), zoom_optimal_xpm ); ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_AUTO, _( "Auto" ), zoom_auto_xpm );
ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_REDRAW, _( "Redraw" ), repaint_xpm ); ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_REDRAW, _( "Redraw" ), zoom_redraw_xpm );
/* Create the basic zoom list: */ /* Create the basic zoom list: */
zoom = GetScreen()->GetZoom(); zoom = GetScreen()->GetZoom();