From 3b381cf8cf03761ff956390836e7cca5a2089262 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 9 Sep 2011 21:30:59 +0200 Subject: [PATCH] Remove *.ico files and used only xpm or new pgn bitmaps for icons under Window. Fix minor other issues. Remove unused files. --- bitmap2component/bitmap2cmp_gui.cpp | 13 +- bitmap2component/bitmap2component.ico | Bin 2238 -> 0 bytes bitmap2component/bitmap2component.rc | 1 - bitmap2component/bitmap2component.xpm | 54 - bitmap2component/bitmap2component_16x16.xpm | 38 - bitmap2component/icon_bitmap2component.xpm | 465 ++++++ bitmaps_png/sources/icon_pcbcalculator.svg | 1291 ++++++++++++++--- bitmaps_xpm/icon_kicad.png | Bin 2294 -> 0 bytes bitmaps_xpm/kicad.png | Bin 2294 -> 0 bytes common/hotkeys_basic.cpp | 6 +- cvpcb/cvframe.cpp | 8 +- cvpcb/cvpcb.ico | Bin 3262 -> 0 bytes cvpcb/cvpcb.rc | 1 - eeschema/eeschema.ico | Bin 2238 -> 0 bytes eeschema/eeschema.rc | 3 - eeschema/libedit_icon.ico | Bin 3262 -> 0 bytes eeschema/libeditframe.cpp | 2 +- eeschema/schframe.cpp | 10 +- eeschema/viewlibs_icon.ico | Bin 3262 -> 0 bytes gerbview/export_to_pcbnew.cpp | 20 + gerbview/gerbview.ico | Bin 3262 -> 0 bytes gerbview/gerbview.rc | 1 - gerbview/gerbview_frame.cpp | 8 +- include/bitmaps.h | 6 +- kicad/commandframe.cpp | 68 +- kicad/kicad.h | 34 +- kicad/kicad.ico | Bin 3262 -> 0 bytes kicad/kicad.rc | 1 - kicad/mainframe.cpp | 12 +- pcb_calculator/bitmaps/icon_pcbcalculator.xpm | 54 + .../bitmaps/sources/pcb_calculator.svg | 688 --------- pcb_calculator/pcb_calculator.ico | Bin 3262 -> 0 bytes pcb_calculator/pcb_calculator.rc | 1 - pcb_calculator/pcb_calculator_frame.cpp | 16 +- pcbnew/hotkeys.cpp | 40 +- pcbnew/icon_modedit.ico | Bin 3262 -> 0 bytes pcbnew/icon_pcbnew.ico | Bin 3262 -> 0 bytes pcbnew/icon_w3d.ico | Bin 766 -> 0 bytes pcbnew/moduleframe.cpp | 4 +- pcbnew/pcbframe.cpp | 1 - pcbnew/pcbnew.rc | 3 - pcbnew/surbrill.cpp | 4 +- 42 files changed, 1757 insertions(+), 1096 deletions(-) delete mode 100644 bitmap2component/bitmap2component.ico delete mode 100644 bitmap2component/bitmap2component.xpm delete mode 100644 bitmap2component/bitmap2component_16x16.xpm create mode 100644 bitmap2component/icon_bitmap2component.xpm delete mode 100644 bitmaps_xpm/icon_kicad.png delete mode 100644 bitmaps_xpm/kicad.png delete mode 100644 cvpcb/cvpcb.ico delete mode 100644 eeschema/eeschema.ico delete mode 100644 eeschema/libedit_icon.ico delete mode 100644 eeschema/viewlibs_icon.ico delete mode 100644 gerbview/gerbview.ico delete mode 100644 kicad/kicad.ico create mode 100644 pcb_calculator/bitmaps/icon_pcbcalculator.xpm delete mode 100644 pcb_calculator/bitmaps/sources/pcb_calculator.svg delete mode 100644 pcb_calculator/pcb_calculator.ico delete mode 100644 pcbnew/icon_modedit.ico delete mode 100644 pcbnew/icon_pcbnew.ico delete mode 100644 pcbnew/icon_w3d.ico diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp index 21daf44a12..7951d9e31b 100644 --- a/bitmap2component/bitmap2cmp_gui.cpp +++ b/bitmap2component/bitmap2cmp_gui.cpp @@ -36,7 +36,9 @@ #include "potracelib.h" #include "bitmap_io.h" -#include "bitmap2component.xpm" +#ifndef USE_PNG_BITMAPS +#include "icon_bitmap2component.xpm" +#endif #include "colors_selection.h" #include "build_version.h" @@ -98,11 +100,10 @@ BM2CMP_FRAME::BM2CMP_FRAME() : BM2CMP_FRAME_BASE( NULL ) m_Config->Read( KEYWORD_LAST_INPUT_FILE, &m_BitmapFileName ); m_Config->Read( KEYWORD_LAST_OUTPUT_FILE, &m_ConvertedFileName ); - #ifdef __WINDOWS__ - SetIcon( wxICON( bitmap2component_icon ) ); - #else - SetIcon( wxICON( bitmap2component ) ); - #endif + // Give an icon + wxIcon icon; + icon.CopyFromBitmap( KiBitmap( icon_bitmap2component_xpm ) ); + SetIcon( icon ); GetSizer()->SetSizeHints( this ); diff --git a/bitmap2component/bitmap2component.ico b/bitmap2component/bitmap2component.ico deleted file mode 100644 index 476513d76f6110b8bd037cc5ed7c83c6ad845626..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmchZ&2HO96oo(8l4Z$1L>JAPXg4WP2>wCSfGmN^Bo)h+M1iC%2Owa`7U9q}DM6GI zI}5);mwko4K(~E{zCquk=%SaTtT;{GO@WTU;qabw@0@#P7J`!eR27-m`FS0l0ng=; z5Z}v_#XlLPB2xb9HRV@7@!P=X^IDDavj)E$ALD-c1Oj zXI-?^CQvQ<7cR3&n@N1aWo$FMF&HJ1pK7Q9w5&s^;c)%7OL%INs(tX9cyD~{(IMW< zzzYM~V+$vk(9Lz{R8K#HX_0TMbK=!m69?pq@d9cSo+Ue>Jw#4owwtFxnup_SYglS_;a5SOgy~EK{ zOsU^I>dCh+d&0fmXSXpT7|!v%H-vJ2vG_D?XfO;U)}?zG(dQVW?_;_lnsX|>s95$M zj@Q8SUNUe3x^9ep7IEMFfn9eloRF)-Tc+)Rz(1!WnjAC1^mUp8la8y2hJbrx$nI^M z;AId0g++)%+#fP^r7@?$z}(4swwL01cUVq}BlWvyA(F~Sr1`?5t2VG(J91BSu40pEB>i3o4DN<_Y8(4S4>!B3T?cnE z#2I_E!UpZ@9XfJJ?OhM!n>$Q3Mf0TBd59IpOs4x>O!v5n0^(#yczI5uhRk(bTZ@u4$CDe$^fT||r5;%h6%x3dBtIV;t2-o`_|h~C<&ZEc8m z`B>zy75H|YYOe2*ZG~XLrFwmRA&>360r7t;=NJ0KlIlbM3j~NA diff --git a/bitmap2component/bitmap2component.rc b/bitmap2component/bitmap2component.rc index 98ff16a927..b86c4e2265 100644 --- a/bitmap2component/bitmap2component.rc +++ b/bitmap2component/bitmap2component.rc @@ -1,2 +1 @@ -bitmap2component_icon ICON bitmap2component.ico #include "wx/msw/wx.rc" diff --git a/bitmap2component/bitmap2component.xpm b/bitmap2component/bitmap2component.xpm deleted file mode 100644 index e968612ef9..0000000000 --- a/bitmap2component/bitmap2component.xpm +++ /dev/null @@ -1,54 +0,0 @@ -/* XPM */ -const char *bitmap2component_xpm[] = { -/* columns rows colors chars-per-pixel */ -"32 32 16 1", -"@ c #592904", -"# c #974704", -"$ c #5455D0", -"o c #090915", -"- c #2E1604", -"+ c #4B4BB5", -"* c #222352", -"X c #0F1128", -": c #BE5904", -" c #0CFA0C", -"% c #FC7A04", -"= c #323378", -"; c #753704", -"O c #3C3B8F", -"& c #DF6904", -". c #050204", -/* pixels */ -" . ..", -" .", -" ", -"........................ .. ", -"........................ .. ", -" X.oO ... ", -"+++X@#.X+ $ ... .", -"...o@%&@.*$$X.o= ... ..", -"....@%%%#-..-#;.... ........", -"....@%%&%&-.#%%-.... .......", -"....@%%%%;..;%&......====O+$ ", -"....@%%:-....o..............= ", -"....@&@.... +*O ......%%%%&#.X ", -"....-..... .....%%&%%%:...", -"OO O=+ . *.%%%%%&%@X ", -" ... =.%%%%%%%#..", -" . O.%%%%&%%;.=", -".......... .....%%%%%%%-..", -"....@@..... ......%%%%%%;...", -"....@%:-....X.........###;;-.= ", -"....@%%&#...-#@...........o*$ ", -"....@%%%%&-.#%%...... $ ", -"....@%%%%#..;%%..... .......", -"....@%%&-....-..... ........", -"XXXo@%;.X+ +*=$ ... ..", -" X-.oO ... .", -" X.= ... ", -"........................ .. ", -"........................ .. ", -" ", -" .", -" . .." -}; diff --git a/bitmap2component/bitmap2component_16x16.xpm b/bitmap2component/bitmap2component_16x16.xpm deleted file mode 100644 index 2b4d283a98..0000000000 --- a/bitmap2component/bitmap2component_16x16.xpm +++ /dev/null @@ -1,38 +0,0 @@ -/* XPM */ -const char *bitmap2component_16x16_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 16 1", -"& c #128B26", -" c #0CFA0C", -"# c #A75104", -"@ c #22204C", -"O c #050304", -"; c #191327", -"X c #054306", -"* c #F27504", -"o c #0C7E0C", -": c #1ACC2E", -"$ c #51280C", -"- c #391E07", -". c #0CBE0C", -"% c #289F55", -"= c #703505", -"+ c #1C563C", -/* pixels */ -" . X", -"oooooooooooo .. ", -"oXO+ooooooXO .. ", -"@@#$+%+& XX X", -"OO#*#O#=OX XOOO", -"OO#*=O$-OO;@@@: ", -"OO=OO.%:XOO***$o", -"%:% X. ;***#X", -"ooooo . .o;***#;", -"OO=$OXooOOO###;o", -"OO#*#O#$OOX+o&: ", -"OO#*=O=-OX XOOO", -"&X=;& %% XX X", -"oX;oooooooXO .. ", -"oooooooooooo .. ", -" . X" -}; diff --git a/bitmap2component/icon_bitmap2component.xpm b/bitmap2component/icon_bitmap2component.xpm new file mode 100644 index 0000000000..19a3204488 --- /dev/null +++ b/bitmap2component/icon_bitmap2component.xpm @@ -0,0 +1,465 @@ +/* XPM */ +const char *icon_bitmap2component_xpm[] = { +/* columns rows colors chars-per-pixel */ +"32 32 427 2", +"^X c #DDDDDC", +"qX c #70726F", +"_X c Black", +"5 c #DDDDDD", +"#. c #E0E1E1", +"e c #E6E6E6", +"cO c #7C7F7D", +"- c #7C7C7C", +"G c #EFEFEF", +"mX c #828482", +"dO c #828483", +"u. c #858585", +"8X c #888988", +"#o c #8B8D8C", +"g. c #8B9090", +"EX c #A0A3A0", +"K c #A0A0A0", +"OO c #A3A4A2", +"Lo c #36393A", +"So c #ACADAB", +"-O c #ACADAC", +"M. c #A9ACAC", +"!X c #B2B2B0", +"d. c #ACADAF", +";o c #AFB1B1", +"b. c #ACADB0", +"Z c #B2B2B2", +":o c #B5B6B5", +"{X c #B5B6B6", +" o c #BBBBBA", +"A c #BBBBBB", +"dX c #BBBEBD", +"jo c #BEBFBD", +"*X c #C4C4C0", +"fX c #C1C3C2", +"]X c #C4C4C3", +"+o c #515757", +"-X c #C4C4C4", +"2. c #5A5A5A", +"GX c #CACCCA", +"[. c #D0D1D0", +"w. c #5D6162", +"4o c #D6D6D4", +"XX c #D6D6D5", +"b c #D6D6D6", +"8o c #452358", +"). c #E2E3DC", +";. c #D9DADA", +"% c #6C6C6C", +")o c #DFDFDE", +"D. c #E2E3E0", +"a c #DFDFDF", +"B. c #6C7272", +"xX c #727473", +"$. c #E2E3E3", +"S. c #E8E8E6", +"bO c #7B7D7B", +"t c #E8E8E8", +"jO c #7E817F", +"I. c #7E7E7E", +"|. c #7E8181", +"iO c #848684", +"E c #F1F1F1", +"> c #878787", +"]o c #878A89", +"0. c #878A8B", +"X c #B1B3B3", +"n c #B4B4B4", +"6o c #B7B8B6", +". c #4A4A4A", +"@X c #BABCB9", +"@O c #BDBDBB", +"V c #BDBDBD", +"%o c #C3C5C1", +"/. c #C6C6C4", +"6. c #505556", +"L c #C6C6C6", +",o c #C9CAC8", +":X c #C9CAC9", +"+ c #5C5C5C", +"7. c #595E5F", +"QX c #5F6361", +"Zo c #5C6262", +"B c #CFCFCF", +"Y. c #D2D3D2", +"yO c #656867", +"_. c #DEE0D8", +"<. c #D8D8D9", +"wX c #717271", +"K. c #E1E1DF", +"Fo c #E1E1E0", +"8 c #E1E1E1", +"Yo c #EAEAE8", +"xO c #7D7F7D", +"m. c #777A7C", +"c c #EAEAEA", +"O c #9EA09E", +"BO c #2E3131", +"eO c #A4A5A2", +"VO c #2E3134", +"wO c #A4A5A3", +";O c #A7A9A6", +"x. c #A7A9A8", +"7O c #ADAEAC", +"v. c #ADAEB0", +"vo c #28263C", +"*o c #B0B2B2", +"'X c #B6B7B6", +"7o c #B9BBB9", +"jX c #B9BBBA", +"rX c #BFC0BC", +"U c #BCBCBC", +"oo c #3D3349", +"so c #C2C4C0", +"4. c #4F5455", +"%O c #C8C9C6", +"{ c #C5C5C5", +"3. c #555959", +"iX c #C8C9C9", +"6X c #CECECB", +" X c #CBCDCB", +"3X c #CBCDCC", +"xo c #372851", +"tX c #D1D2CF", +"L. c #D1D2D0", +"# c #646464", +"`. c #DDDFD7", +"G. c #676B6A", +")X c #646769", +"R. c #E0E0DE", +"7 c #E0E0E0", +"eX c #737574", +",X c #767676", +"YX c #767977", +"AX c #707476", +"g c #E9E9E9", +"hO c #7F8280", +"uO c #858785", +"p c #F2F2F2", +"zo c #8B8F8D", +" . c #919191", +"k. c #8E9091", +"lX c #949593", +"8. c #919494", +"rO c #979997", +"IX c #A0A29B", +"go c #A0A29F", +"BX c #A0A2A1", +"}X c #A3A3A2", +"2O c #A6A7A4", +"JX c #A6A7A5", +":O c #A9ABA8", +"Ao c #A9ABAA", +"5X c #ACACAC", +"yX c #AFB0AF", +"fo c #B2B4B1", +"aX c #B2B4B4", +"8O c #B8B9B7", +"[o c #B8BCB8", +"H. c #BBBDBB", +"O. c #485050", +"#O c #C1C2BF", +"j c #BEBEBE", +"$O c #C4C6C3", +"o c #545454", +"FX c #C4C6C4", +"R c #C7C7C7", +"=O c #CACBC9", +"=o c #575B5B", +"PX c #CDCFCE", +") c #D0D0D0", +";X c #D3D4D3", +"0o c #392455", +"-o c #666C6C", +"y c #D9D9D9", +"ZX c #6F6F6F", +"9 c #E2E2E2", +"= c #787878", +"z c #EBEBEB", +"kO c #7E807F", +"N. c #818181", +"N c #F4F4F4", +"h. c #818486", +"1 c #939393", +"(o c #A5A5A3", +"LX c #A2A4A4", +"~o c #AEAEAD", +"I c #AEAEAE", +"ho c #B1B2B0", +"2o c #B1B2B1", +"#X c #B4B6B4", +"SX c #B4B6B5", +"^ c #C0C0C0", +">o c #C3C4C2", +"cX c #505454", +"uX c #C3C4C3", +"' c #C9C9C9", +"2X c #CCCDCB", +"r. c #5C6162", +"3 c #D2D2D2", +"+. c #656767", +"$ c #686868", +"io c #626668", +"H c #DBDBDB", +"&. c #DEDFDF", +"J. c #E4E4E1", +"q c #E4E4E4", +"CX c #747878", +"nO c #7A7D7B", +"}. c #7A7A7A", +"Z. c #EDEDEB", +"No c #EDEDEC", +"gO c #808280", +"M c #EDEDED", +": c #838383", +"[ c #F6F6F6", +"!. c #8C8F8E", +"j. c #898B8D", +"WX c #8F9391", +" c #FFFFFF", +"nX c #959594", +"F. c #959895", +"] c #959595", +"E. c #9B9D9A", +"eo c #9B9D9B", +"+O c #9E9E9D", +"Y c #9E9E9E", +"Jo c #282D32", +"Bo c #A1A2A1", +"ko c #A4A6A2", +"qO c #A4A6A3", +"&o c #A1A2A2", +"}o c #AAABA8", +"RX c #AAABA9", +"qo c #2E353B", +"Ro c #ADAFAC", +"MX c #B3B4B1", +"9. c #B0B0B0", +"Vo c #B3B4B2", +"c. c #ADAFB1", +"k c #B9B9B9", +"lo c #BCBDBC", +"vX c #494D4E", +"hX c #BFC1C0", +"no c #4C5152", +"To c #C2C2C1", +"| c #C2C2C2", +"O c #585858", +"do c #C8CAC7", +"gX c #C8CAC9", +"Wo c #585E5E", +"J c #CBCBCB", +"&O c #CECFCE", +"e. c #5B5F60", +"-. c #CECFCF", +"uo c #5E6363", +"'. c #DADCD4", +"]. c #D7D8D3", +"oX c #D4D4D3", +"m c #D4D4D4", +"wo c #676C6A", +">. c #D7D8D8", +"i c #6A6A6A", +"9X c #6D6E6C", +/* pixels */ +" . X o O O + @ # $ % & * * = - ; : > > , < < 1 1 1 ", +" 2 3 4 4 5 6 7 7 8 8 9 0 0 q q w e e e r r r t t t y u ", +" i p t t t t t w 0 t r r e e w w q q 0 9 8 8 7 a 6 s d ", +" i f g g g g g y h g 6 j t r r e w w q k 7 8 8 7 a s l ", +" i f z z z z z x h c v v g t t r e e b n m 9 8 8 7 M l ", +" i N s s s s s 4 B z z 8 c g g t r e e 4 q 0 9 8 7 M d ", +" i N M M m V C V V Z A S z c c g t r r e w q 0 9 8 M D ", +" i F 3 G G H J F F b B M s z z c g t r e w w q 0 9 M K ", +" i c L P 6 I q P G F U z M s s z c g t r e w q 0 9 s Y ", +" T c R E S W c E E P Q 3 F M M t Q m ! 3 3 7 w q 0 s ~ ", +" T M ^ / ( w f p p E G U ) J h _ ` 3 / / R v ' 4 0 z ] ", +" T [ w a g N N f f p p z 4 { / J V R R L } | m 7 q c . ", +" T [ N ..........N f p p E 3 8 F 9 7 a 6 5 w e w q c < ", +" T X...[ [ X.[ [ ..N f p E 3 8 F M s z c g r e w q c , ", +" o.O.+.@.#.@.$.$.@.@.#.%.&.&.*.=.-.;.:.>.>.,.<.t r w q g 1. ", +"2.3.4.5.6.7.8.9.Z 0.q.w.w.w.w.w.w.e.q.r.r.t.t.t.w.y.6 w q g u. ", +"i.p.a.s.d.f.g.h.j.k.l.z.z.z.z.d.x.c.v.v.b.d.d.n.a.m.M.w q t N. ", +"B.V.C.C.C.C.Z.A.Z.Z.Z.Z.Z.S.D.F.G.H.J.K.5 a H x ! L.P.w q t I. ", +"U.Y.T.T.K.K.K.K.R.R.R.R.E.W.Q.!.~.^./.(.)._.`.'.].[.{.w q r }. ", +"|. X.X.X.X.X.XXXXXXXXXoXOX+X@XJ #X$X%X&X*X=X-X;X;X:X>Xw q r ,X ", +"X'X'XHX]X[X{X}X^./X^X|X o.oXoooOo+o@o#o$o%o&oHX*o=o_X_X_X_X ", +"-o;o:o:o:o>o,oO O ", +",O - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bitmaps_xpm/icon_kicad.png b/bitmaps_xpm/icon_kicad.png deleted file mode 100644 index 6c3303503968204b400ecddcfbce04dc18a43699..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2294 zcmVam1?FT4q|Ot<3Zf zJEM-!j-y3J>sYFe;3$efHRX{60xXXNl0ZnZB%6?IUb}mD_ujqz12KdRflklNnLEGp z{N8hZ_sqG%vMjErN%<4!J+i9o)H6>#-l2&&Ml6CEi*ov0gTAEn7tX)@@wcZIluR#( zhWo9U9-=)E6o21U{-Cbw4J&8ndegKB(QrSJV4wBn@wU1zzCSiOA<2)V3?(eiacyn) z?)53GX0)aYL*{n|#Ch|KBtu0Dw_8Lp(pOp2OdK!k&L08qy|e-Z*eL zc546zwP5q+%>_=U^FE>3Ga!s2LD_9B9PWbmKlM{svXBiMHmsdKDa+nx$oNOjA?&Y5 zr5jaM?@(1W9pDF}5L?a^JZHCISWz`QJ9|+u7>tKPp|jy|xcS%q?BRu1h4<@^4>F9-= z!KE5w*LgC>$5;RPR5bS6@E)lnsx=Y|xA3#^5nd>LMF1Q-ww++paSn#VWW{|%CoB|m zN=pU6_U+rXgci)tM*Ml6m5XYC(gKQ|*E^B`HKAW$d%M|rt`6sIi6vkegS+>C*?;akQJV+#ruk5fHygc0j4^v|hY=@OrJVLB zw_jdO#OUDlgK5;8cQR|vYF1|E{|E?76Aa_Z^IFQwDFosZciQI1u6sjKy(s3{z)bd!@?Nc!l+u`WvyTANODzPTIAQUMtNcgpST-o1y? z(v`OcAQ%jyC@w-FjYEgdaK7OLLP|w2g19sSXY$~3+BBVT?|Dw0?V>MeaqX9*D1JO+ z!hE}XH`!@6g5d~?q9nZVAc0{RLQ!l0^z~;lVWNxv{!2t-GR4KS0N0O+BXqXaaJ;dX zur3BijQ3GI(F#To>_?RHy|6#nVl z)0=|L=0Z^}bLNbXnZ?O;w)awfi)=Hjs81hazMfl4d8?)nz0Am^yU~jg3`|99ew53SBqxcr4m3 zgQA3)nA?Zn-$tWPFe>vhnkEs88PuMtB+!*gN{W+~fKIA2nV2PUw7NRp+tc&8EX$HC z%OYl4kpuwCm*2y4&pwL?zR$GTf54fPF-R{g3%8?|#Vcph+!Cj&*G8mEr@p=shh5NA z^DR$5_AsCCtzcwY1}@Jy4xXz)kD0vl-bdZLcI|rj+IR{3z?3OdSUPPKd)D+|p8Yi! z>%JVMZ*6U+vp>S&iW8`+gkeBy%Nf4j`428M)Ua;dYG%w|j;7hLtT^LyCs49*1@|s_ z0Mj%RhVzgMiNmI$$bz?53RZbO!+Y>GVlf>6Suz0d`+Ly!Fo*W<;IZi@lk&0%=~3n^ z{yCXhSqLFv7z6o)5J-}guz=ohBf3ftOm*{ST<%nY!62i}Hi|?YJ07$k)<}6z z`|tqn&0+Rii>(|K6VwBs*!kVLq4$B8?jOZV%d$bS^L-P5-xmH=?< z-RA)a#lU$h0FL{uJFgzRUT?6lu+aJT%d3Gi3C2-V@Kt9vjSc!`8=)!@qo)xO1lP^s?zx`v-I` z#U#JC0!a>0OWGj6+1hE0&MK5-W4Q3c1L)Fa-fzq0!G|7V!q`y|4JFt}VhG2pfhBHf zDIIbUUFw${8-GyB%btDJnlOIc&7=GuG-L%TFZ8_l(5kWuOHw=AO}k~78iwhh)nB6n z1bX`X$9vtLXjrwPdXSFpJ}k>>iO1s|)h!Vkwaj=p*h?hbPax!P9S*>M0Y*rQf$Ln4 Q>;M1&07*qoM6N<$g2;7b1ONa4 diff --git a/bitmaps_xpm/kicad.png b/bitmaps_xpm/kicad.png deleted file mode 100644 index 6c3303503968204b400ecddcfbce04dc18a43699..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2294 zcmVam1?FT4q|Ot<3Zf zJEM-!j-y3J>sYFe;3$efHRX{60xXXNl0ZnZB%6?IUb}mD_ujqz12KdRflklNnLEGp z{N8hZ_sqG%vMjErN%<4!J+i9o)H6>#-l2&&Ml6CEi*ov0gTAEn7tX)@@wcZIluR#( zhWo9U9-=)E6o21U{-Cbw4J&8ndegKB(QrSJV4wBn@wU1zzCSiOA<2)V3?(eiacyn) z?)53GX0)aYL*{n|#Ch|KBtu0Dw_8Lp(pOp2OdK!k&L08qy|e-Z*eL zc546zwP5q+%>_=U^FE>3Ga!s2LD_9B9PWbmKlM{svXBiMHmsdKDa+nx$oNOjA?&Y5 zr5jaM?@(1W9pDF}5L?a^JZHCISWz`QJ9|+u7>tKPp|jy|xcS%q?BRu1h4<@^4>F9-= z!KE5w*LgC>$5;RPR5bS6@E)lnsx=Y|xA3#^5nd>LMF1Q-ww++paSn#VWW{|%CoB|m zN=pU6_U+rXgci)tM*Ml6m5XYC(gKQ|*E^B`HKAW$d%M|rt`6sIi6vkegS+>C*?;akQJV+#ruk5fHygc0j4^v|hY=@OrJVLB zw_jdO#OUDlgK5;8cQR|vYF1|E{|E?76Aa_Z^IFQwDFosZciQI1u6sjKy(s3{z)bd!@?Nc!l+u`WvyTANODzPTIAQUMtNcgpST-o1y? z(v`OcAQ%jyC@w-FjYEgdaK7OLLP|w2g19sSXY$~3+BBVT?|Dw0?V>MeaqX9*D1JO+ z!hE}XH`!@6g5d~?q9nZVAc0{RLQ!l0^z~;lVWNxv{!2t-GR4KS0N0O+BXqXaaJ;dX zur3BijQ3GI(F#To>_?RHy|6#nVl z)0=|L=0Z^}bLNbXnZ?O;w)awfi)=Hjs81hazMfl4d8?)nz0Am^yU~jg3`|99ew53SBqxcr4m3 zgQA3)nA?Zn-$tWPFe>vhnkEs88PuMtB+!*gN{W+~fKIA2nV2PUw7NRp+tc&8EX$HC z%OYl4kpuwCm*2y4&pwL?zR$GTf54fPF-R{g3%8?|#Vcph+!Cj&*G8mEr@p=shh5NA z^DR$5_AsCCtzcwY1}@Jy4xXz)kD0vl-bdZLcI|rj+IR{3z?3OdSUPPKd)D+|p8Yi! z>%JVMZ*6U+vp>S&iW8`+gkeBy%Nf4j`428M)Ua;dYG%w|j;7hLtT^LyCs49*1@|s_ z0Mj%RhVzgMiNmI$$bz?53RZbO!+Y>GVlf>6Suz0d`+Ly!Fo*W<;IZi@lk&0%=~3n^ z{yCXhSqLFv7z6o)5J-}guz=ohBf3ftOm*{ST<%nY!62i}Hi|?YJ07$k)<}6z z`|tqn&0+Rii>(|K6VwBs*!kVLq4$B8?jOZV%d$bS^L-P5-xmH=?< z-RA)a#lU$h0FL{uJFgzRUT?6lu+aJT%d3Gi3C2-V@Kt9vjSc!`8=)!@qo)xO1lP^s?zx`v-I` z#U#JC0!a>0OWGj6+1hE0&MK5-W4Q3c1L)Fa-fzq0!G|7V!q`y|4JFt}VhG2pfhBHf zDIIbUUFw${8-GyB%btDJnlOIc&7=GuG-L%TFZ8_l(5kWuOHw=AO}k~78iwhh)nB6n z1bX`X$9vtLXjrwPdXSFpJ}k>>iO1s|)h!Vkwaj=p*h?hbPax!P9S*>M0Y*rQf$Ln4 Q>;M1&07*qoM6N<$g2;7b1ONa4 diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp index d2a5364e57..d60f70f030 100644 --- a/common/hotkeys_basic.cpp +++ b/common/hotkeys_basic.cpp @@ -339,9 +339,11 @@ void DisplayHotkeyList( EDA_DRAW_FRAME* aFrame, wxString keyname; Ki_HotkeyInfo** List; - wxString msg = _( "" ); + wxString msg = wxT( "" ); + + msg += wxT( "

"); + msg += _("Hotkeys List") + wxT("

"); - msg += _( "

Hotkeys List

"); for( ; aDescList->m_HK_InfoList != NULL; aDescList++ ) { List = aDescList->m_HK_InfoList; diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp index 64885bcc22..c98cb2a53a 100644 --- a/cvpcb/cvframe.cpp +++ b/cvpcb/cvframe.cpp @@ -100,11 +100,9 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( const wxString& title, long style ) : m_DocModulesFileName = DEFAULT_FOOTPRINTS_LIST_FILENAME; // Give an icon - #ifdef __WINDOWS__ - SetIcon( wxICON( a_icon_cvpcb ) ); - #else - SetIcon( wxICON( icon_cvpcb ) ); - #endif + wxIcon icon; + icon.CopyFromBitmap( KiBitmap( icon_cvpcb_xpm ) ); + SetIcon( icon ); SetAutoLayout( true ); diff --git a/cvpcb/cvpcb.ico b/cvpcb/cvpcb.ico deleted file mode 100644 index cc83a577511d6dffcf4291d53648029ab4ceb40d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3262 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 diff --git a/eeschema/eeschema.rc b/eeschema/eeschema.rc index 04b92d0533..b86c4e2265 100644 --- a/eeschema/eeschema.rc +++ b/eeschema/eeschema.rc @@ -1,4 +1 @@ -a_icon_eeschema ICON eeschema.ico -libsch ICON libedit_icon.ico -viewlibs ICON viewlibs_icon.ico #include "wx/msw/wx.rc" diff --git a/eeschema/libedit_icon.ico b/eeschema/libedit_icon.ico deleted file mode 100644 index 13d9821138cd73d068a78f1ba19896147a42c60a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3262 zcmds(%T8KR6owDMS~VKQd)qW|(xgw|xJgHjY!j0{LTwuCu$^I_povf5unszHIwMhw zcTo|%;RO{G6j2luQUCsXA2~gUun$d|CS9CE;IR4rwbxpE?X77xzB)QIzPD>%Yc;J^ z)3oQj`AB=gTRa!m&)@zx!_5sc8JwJ8e;-?0SYC$Li?K1d-JI(8KecazgL7qPH_xjD?vVtN`=Q<#_#Uj6)ukr50J)33*^B2V}8LBQhB z(2&dJ>gnkb5*r%`2C=$&E8+LU=fnK`Z;8oCjE@@<3Vtp=2#2w=gHUMDvccoQ=qUM* zT3U+wZ}1}#?Cvs3#KVG#Vf?ShLw2x~d@pz$#7$$4UD*xaB(I}aD_VG%4`Nh%pbYNh>?RIxc z8(~=jf(j_Dos<%0|FusL*ZUpqS$9=cmGkHyO1_rBv46nw+~L;~@6UU2xObbPp|y}L*Jr%7rkudm$HEDh#hOzbeeB?Jf9P0R-ok2<%e6|0wyISR^ z)1X8$Y4GWiBK~aPen0t54Gn7l&(D!caaf*}t{?7Dfq;U4r~XqZv;T_qoIv6D1 zVTI4rg_JP(>iU$20rKnX>eT*|e|?Q?*5I30Q{iVZOdbZvudS)E#FtYjgC7b}g8Z85 z>U;QH9j5b@$d0_ow`lr#gZzh;l|}h?>OU7Hk!xA5`l8lb6C1d`2kAShe%>JeK}AJT zzES@<|HUk1BE(^mi#pdg^zMqo!&?b?7~mAhx7+P%eqjnNKe5?tF7{121?FSh@+>9auf}&($z!K4+P&WfkWKk#u1ks6agah&Q@#pf&)!R2!;*=ZxF1V=d*7SW_nh-Q z@7F!I#jqvtadN`oz7o4`gJCN$4BH3_CTu$>ZpS4P=03>(BLfb0c3V9>omSib7w&%L z?oJI0PmYXA2qk^7Zr%H(@b~xE>-DLLiAVQE0tMW^*|f>l=DqcvLZLtiO&AQPna8Pf z6u=U*XRoi9*M_xgA(oGqEn91EztzJ7a`>*H(dl#mM=xKZv9ZT@?^a#Cnj8}Y_|_|d z7-~r!SSX~hZC+k0SK!avV#LqSZ)|J~nav#vMY&ka&*7h79{(*Xi<^>?dN`IE9${sH z0pu-l&f?*^VKLya=FXivxbr4cnMf48XOA=C;Fj<-tyU|{&K5A4@?Us)%;RioB8x&j z`BMs;o|;T10};vJe=+#+@$rB?Gdam-Fpkk^VMj7Cnhr~T5faA+`}Fj5X>lrd-G>6Bl1}rB8tdvBBoetyW;7acwuuQ=$>Z^&qV|8bHI9;=gIneaH6v$t=pj;2P`y;z_v8sa zGc|?udNeqQdV0iJSxhpS8nypNVkm$E9XW(ZCWU>u(aqi6U8B*oDU}u1uNUU$dxz37 z#;k2jL%}uKJa{xdK7N+Pn(FJjT~UGCXJ(MWfSx}`z}3-#T3S$Tt*NHweo09Qk9YI( z<<^>-PNmYt#l^wFL9JE~4-7;`L~Ptf#E$AMXZb=YHq?I>{iz@|! zS1OgVtPBszU^vNUTZ;>WlT4z6m-j6+99_E=gwv1NqiFu zM)d}vPzbb>lao)>>e^ekpe|G@)e88g0X!W+1VVUV;7$Tzy|eRy0|($xf*u0*kVa!_ zZ!h3*Bqb%Pwzhls?p2hRU%hnc_iNW6v?`hGO_&SV-Q3)s_4cCCQKZ#Ex1$FSP;>LR zOx7h5@fnPt>2x#L_4?sw&pbUn7r#@!e#=1oInWIf0w@i05@f8 diff --git a/gerbview/export_to_pcbnew.cpp b/gerbview/export_to_pcbnew.cpp index 2496dfefd0..9f215f017f 100644 --- a/gerbview/export_to_pcbnew.cpp +++ b/gerbview/export_to_pcbnew.cpp @@ -8,6 +8,7 @@ #include "common.h" #include "class_drawpanel.h" #include "confirm.h" +#include "macros.h" #include "kicad_string.h" #include "gestfich.h" #include "trigo.h" @@ -57,6 +58,7 @@ GBR_TO_PCB_EXPORTER::~GBR_TO_PCB_EXPORTER() /* Export data in pcbnew format + * remember Pcbnew uses a Y reversed axis, so we must negate all Y coordinates */ void GERBVIEW_FRAME::ExportDataInPcbnewFormat( wxCommandEvent& event ) { @@ -260,6 +262,10 @@ void GBR_TO_PCB_EXPORTER::export_non_copper_item( GERBER_DRAW_ITEM* aGbrItem, in } } + // Reverse Y axis: + NEGATE( drawitem->m_Start.y ); + NEGATE( drawitem->m_End.y ); + m_pcb->Add( drawitem ); } @@ -291,6 +297,11 @@ void GBR_TO_PCB_EXPORTER::export_segline_copper_item( GERBER_DRAW_ITEM* aGbrItem newtrack->m_Start = aGbrItem->m_Start; newtrack->m_End = aGbrItem->m_End; newtrack->m_Width = aGbrItem->m_Size.x; + + // Reverse Y axis: + NEGATE( newtrack->m_Start.y ); + NEGATE( newtrack->m_End.y ); + m_pcb->Add( newtrack ); } @@ -323,6 +334,9 @@ void GBR_TO_PCB_EXPORTER::export_segarc_copper_item( GERBER_DRAW_ITEM* aGbrItem, RotatePoint( &curr_end, aGbrItem->m_ArcCentre, rot ); newtrack->m_End = curr_end; newtrack->m_Width = aGbrItem->m_Size.x; + // Reverse Y axis: + NEGATE( newtrack->m_Start.y ); + NEGATE( newtrack->m_End.y ); m_pcb->Add( newtrack ); curr_start = curr_end; } @@ -333,6 +347,9 @@ void GBR_TO_PCB_EXPORTER::export_segarc_copper_item( GERBER_DRAW_ITEM* aGbrItem, newtrack->m_Start = curr_start; newtrack->m_End = end; newtrack->m_Width = aGbrItem->m_Size.x; + // Reverse Y axis: + NEGATE( newtrack->m_Start.y ); + NEGATE( newtrack->m_End.y ); m_pcb->Add( newtrack ); } } @@ -352,5 +369,8 @@ void GBR_TO_PCB_EXPORTER::export_flashed_copper_item( GERBER_DRAW_ITEM* aGbrItem newtrack->SetDrillDefault(); newtrack->m_Start = newtrack->m_End = aGbrItem->m_Start; newtrack->m_Width = (aGbrItem->m_Size.x + aGbrItem->m_Size.y) / 2; + // Reverse Y axis: + NEGATE( newtrack->m_Start.y ); + NEGATE( newtrack->m_End.y ); m_pcb->Add( newtrack ); } diff --git a/gerbview/gerbview.ico b/gerbview/gerbview.ico deleted file mode 100644 index b4e547348678caa748ffc244c9c4b960525fafe5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3262 zcmds3eN0nV6n_O&3>AoN{a~mt1)X(%tqkUb0h=FL5H}LG$*h?%lK2(f#&-)XDn_No z6o_WN*u@$AnCJkV%u1Xlft|IU1PZtZ-NL{tEX752qE&w z5lmTGm<}H%4;>;89>kQHNlK-pM1ma-{T8uYW-p|GM^?N^m^3QWp~twPS;UUQBzoWOQFb@$?~(aZ;@n8K|x1p>4-*S zKW@d<4!qyk8!T`C9nsMP1qJxH8yhjs;2^SCtoQ~4VyI{>FHeY%-xL|SeDPwh88d)@ z*%T46CoV2eEWRX@_1wNqt7tD#3O@Ms-GBgfP7du5dcxu}t@ypY=5B*R z_58i;q4_a#w&%>CkhSafo(?}$d-diWl}aU-%j4tYgM)*)-rfn@w?ka0&z(D&lr)FS zJ+^!Ih*D{F2pDNJ0&u%gf{Oc#$C?OBXKO92VA@pN}s;?U3is5k;9yCaF|9ZJImWPaI+N{p{}-oHP?} zt@&uv*0-~aG_t*4kY%#La74f<5=<@#6^2f_8|>1ZFFh%D}+D_xXId|9^|$ zfq{9Sod^hy;$@lvmMb-1xUB>7${4Y0abSEu`F1IP^$48fm_rN(!uTxTx)EiVre z2$;>pZ`Wu%*q+~Pj=gwD< zE^2F?@nbh{-oJmp{8wu*I@>=rjdB-J&`(LD+|n#AsTNj>B_OeOk-xt{AP5r(nhFc; zmlo2XgZ;C4JaC=5x?!dS`^SMm2(Oq&K=ZJK?cuTZ<1bbo?iXagQWSQXH8>4Ire)&m z^?DA6Lodm>+2)o?G4WvtLT7MV0t<=oY+_d@y#!RiE+CmR@r#R#LqkLD2nFTZ@Z3Rg z5fCsiw7+s@U?H)3?A_g9q?r`nNTQnUh6EW(bVs|(6i*|&~(x0JI98S zfA0Qz>o#I>?70h7C1p56V*JKNC`tcdzcVZ?0r1r)UNT(=JU==S?8kvQc4~_2Jy4Py z@R|Of3>@TOxdS*1z31`cc4Y}Oo;;+7EFz%Xg8x$eIwGL97y62nc_C zR$AEv{T%6#C!4K0e}25MLQZaOcE*p5iQy+yPKr$5SQ|co!*-yL`0jGhiWPrAb!OIX ztrk8H9PDq`YNz@~jN#+haZR;A5W&rafSM-4ku_aRfsi(Uwtv?TnyDTf;wzPdRggNJ z@sZg)|I1U$mMzn0G?N{HIpR~4d3f~nofosh_Cb1wBtM}F z5N-k78MmqB$BA8sJUYe7#M;OUNI(4$};W8{F|V$0%NlP W2Dswb9&7QL@Q=lqXPf`p|9=59qb&vi diff --git a/gerbview/gerbview.rc b/gerbview/gerbview.rc index fea2dabba4..b86c4e2265 100644 --- a/gerbview/gerbview.rc +++ b/gerbview/gerbview.rc @@ -1,2 +1 @@ -a_icon_gerbview ICON "gerbview.ico" #include "wx/msw/wx.rc" diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp index b9fc48de6e..b6fb086b37 100644 --- a/gerbview/gerbview_frame.cpp +++ b/gerbview/gerbview_frame.cpp @@ -50,11 +50,9 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( wxWindow* father, DrawPanel->m_Block_Enable = true; // Give an icon -#ifdef __WINDOWS__ - SetIcon( wxICON( a_icon_gerbview ) ); -#else - SetIcon( wxICON( icon_gerbview ) ); -#endif + wxIcon icon; + icon.CopyFromBitmap( KiBitmap( icon_gerbview_xpm ) ); + SetIcon( icon ); SetScreen( ScreenPcb ); diff --git a/include/bitmaps.h b/include/bitmaps.h index 7c22a950ed..01504c8acc 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -2,7 +2,11 @@ #ifndef BITMAPS_H_ #define BITMAPS_H_ -#include +//FIXME: cannot include only this file in wxWidgets 2.9.3 +// test if it works under stable release +// #include // only to define wxBitmap +class wxBitmap; // only to define wxBitmap + #include "config.h" diff --git a/kicad/commandframe.cpp b/kicad/commandframe.cpp index 10be113537..5216d6f175 100644 --- a/kicad/commandframe.cpp +++ b/kicad/commandframe.cpp @@ -7,45 +7,51 @@ #include "kicad.h" -#include "../bitmap2component/bitmap2component.xpm" -#include "../pcb_calculator/bitmaps/pcb_calculator.xpm" +#ifndef USE_PNG_BITMAPS +#include "../bitmap2component/icon_bitmap2component.xpm" +#include "../pcb_calculator/bitmaps/icon_pcbcalculator.xpm" +#endif RIGHT_KM_FRAME::RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent ) : wxSashLayoutWindow( parent, wxID_ANY ) { - #define BUTTON_HEIGHT 32 m_Parent = parent; - m_DialogWin = NULL; + m_MessagesBox = NULL; m_ButtPanel = new wxPanel( this, wxID_ANY ); - m_ButtonSeparation = 10; // control of command buttons position - m_ButtonsListPosition.x = 10; - m_ButtonsListPosition.y = 35 + BUTTON_HEIGHT; - m_ButtonLastPosition = m_ButtonsListPosition; - m_ButtonsPanelHeight = m_ButtonsListPosition.y + 10; + m_bitmapButtons_maxHeigth = 0; + m_ButtonSeparation = 10; // control of command buttons position + m_ButtonsListPosition.x = m_ButtonSeparation; + m_ButtonsListPosition.y = m_ButtonSeparation; + m_ButtonLastPosition = m_ButtonsListPosition; + + // Add bitmap buttons to launch Kicad utilities: CreateCommandToolbar(); - m_DialogWin = new wxTextCtrl( this, wxID_ANY, wxEmptyString, + m_ButtonsPanelHeight = m_ButtonsListPosition.y + m_bitmapButtons_maxHeigth + 10; + + // Add the wxTextCtrl showaing all messages from Kicad: + m_MessagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER | wxTE_READONLY ); - } + void RIGHT_KM_FRAME::OnSize( wxSizeEvent& event ) { #define EXTRA_MARGE 4 - wxSize wsize = GetClientSize(); + wxSize wsize = GetClientSize(); wsize.x -= EXTRA_MARGE; wsize.y -= m_ButtonsPanelHeight + EXTRA_MARGE; wxPoint wpos; - wpos.x = EXTRA_MARGE/2; - wpos.y = m_ButtonsPanelHeight + (EXTRA_MARGE/2); - if( m_DialogWin ) + wpos.x = EXTRA_MARGE / 2; + wpos.y = m_ButtonsPanelHeight + (EXTRA_MARGE / 2); + if( m_MessagesBox ) { - m_DialogWin->SetSize( wsize ); - m_DialogWin->SetPosition(wpos ); + m_MessagesBox->SetSize( wsize ); + m_MessagesBox->SetPosition( wpos ); } - wpos.y = EXTRA_MARGE/2; - m_ButtPanel->SetPosition(wpos ); + wpos.y = EXTRA_MARGE / 2; + m_ButtPanel->SetPosition( wpos ); wsize.y -= m_ButtonsPanelHeight - EXTRA_MARGE; m_ButtPanel->SetSize( wsize ); m_ButtPanel->Refresh(); @@ -59,14 +65,11 @@ EVT_SIZE( RIGHT_KM_FRAME::OnSize ) END_EVENT_TABLE() -/*************************************************/ -void RIGHT_KM_FRAME::CreateCommandToolbar( void ) -/*************************************************/ - /** * Function CreateCommandToolbar * create the buttons to call eescheman cvpcb, pcbnew and gerbview */ +void RIGHT_KM_FRAME::CreateCommandToolbar( void ) { wxBitmapButton* btn; @@ -83,8 +86,9 @@ void RIGHT_KM_FRAME::CreateCommandToolbar( void ) btn->SetToolTip( _( "GerbView (Gerber viewer)" ) ); btn = AddBitmapButton( ID_TO_BITMAP_CONVERTER, KiBitmap( icon_bitmap2component_xpm ) ); - btn->SetToolTip( _( "Bitmap2Component (a tool to build a logo from a bitmap)\n\ -Creates a component (for Eeschema) or a footprint (for Pcbnew) that shows a B&W picture" ) ); + btn->SetToolTip( _( + "Bitmap2Component (a tool to build a logo from a bitmap)\n\ +Creates a component (for Eeschema) or a footprint (for Pcbnew) that shows a B&W picture" ) ); btn = AddBitmapButton( ID_TO_PCB_CALCULATOR, KiBitmap( icon_pcbcalculator_xpm ) ); btn->SetToolTip( _( "Pcb calculator" ) ); @@ -97,15 +101,19 @@ Creates a component (for Eeschema) or a footprint (for Pcbnew) that shows a B&W * @param aId = the button id * @param aBitmap = the wxBitmap used to create the button */ -wxBitmapButton* RIGHT_KM_FRAME::AddBitmapButton( wxWindowID aId, const wxBitmap & aBitmap ) +wxBitmapButton* RIGHT_KM_FRAME::AddBitmapButton( wxWindowID aId, const wxBitmap& aBitmap ) { wxPoint buttPos = m_ButtonLastPosition; - wxSize buttSize; - int btn_margin = 10; + wxSize buttSize; + int btn_margin = 0; // extra margin around the bitmap. + buttSize.x = aBitmap.GetWidth() + btn_margin; buttSize.y = aBitmap.GetHeight() + btn_margin; - buttPos.y -= buttSize.y; - wxBitmapButton* btn = new wxBitmapButton( m_ButtPanel, aId, aBitmap, buttPos, buttSize); + + if( m_bitmapButtons_maxHeigth < buttSize.y ) + m_bitmapButtons_maxHeigth = buttSize.y; + + wxBitmapButton* btn = new wxBitmapButton( m_ButtPanel, aId, aBitmap, buttPos, buttSize ); m_ButtonLastPosition.x += buttSize.x + m_ButtonSeparation; return btn; diff --git a/kicad/kicad.h b/kicad/kicad.h index 1f7503226a..c53b4ac650 100644 --- a/kicad/kicad.h +++ b/kicad/kicad.h @@ -71,10 +71,8 @@ public: private: int m_LeftWin_Width; -public: - - KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& title, - const wxPoint& pos, const wxSize& size ); +public: KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& title, + const wxPoint& pos, const wxSize& size ); ~KICAD_MANAGER_FRAME(); @@ -174,30 +172,32 @@ enum TreeFileType { class RIGHT_KM_FRAME : public wxSashLayoutWindow { public: - wxTextCtrl* m_DialogWin; + wxTextCtrl* m_MessagesBox; private: - KICAD_MANAGER_FRAME* m_Parent; + KICAD_MANAGER_FRAME* m_Parent; // a wxTextCtrl to displays messages frm Kicad int m_ButtonsPanelHeight; - wxPanel* m_ButtPanel; - int m_ButtonSeparation; // button distance in pixels - wxPoint m_ButtonsListPosition; /* position of the left bottom corner - * of the first bitmap button - */ - wxPoint m_ButtonLastPosition; // position of the last button in the window + wxPanel* m_ButtPanel; + int m_ButtonSeparation; // button distance in pixels + wxPoint m_ButtonsListPosition; /* position of the left bottom corner + * of the first bitmap button + */ + wxPoint m_ButtonLastPosition; // position of the last button in the window + int m_bitmapButtons_maxHeigth; // height of bigger bitmap buttons + // Used to calculate the height of the panel. -public: - RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent ); +public: RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent ); ~RIGHT_KM_FRAME() { }; - void OnSize( wxSizeEvent& event ); + void OnSize( wxSizeEvent& event ); private: + /** * Function CreateCommandToolbar * creates the main tool bar buttons (fast launch buttons) */ - void CreateCommandToolbar( void ); + void CreateCommandToolbar( void ); - wxBitmapButton* AddBitmapButton( wxWindowID aId, const wxBitmap & aBitmap ); + wxBitmapButton* AddBitmapButton( wxWindowID aId, const wxBitmap& aBitmap ); DECLARE_EVENT_TABLE() }; diff --git a/kicad/kicad.ico b/kicad/kicad.ico deleted file mode 100644 index 79f577f7d5c1dad13e4ae9b34bb178230b214364..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3262 zcmcJRdr(tX9>?#_?2PQp&bUK6?fzry+U;~Z?rwb*OIsdN1p^9Lh)RG&lve~3^B^G! zg+vk(h$g`V5*{Hz9w87Cl0wkP!zKurNMnjG3Mx=&k!hjYE}&HIo*2xAEQM&t zVM!lFrd=PN7?^-9_uvad@CEY#c#tistg^wJE|_rv7PQ=oj*bou4aG@&!sKv(4E8UD zckIQy41X&!cU$34D6+8S^4(X&|3C!qlsrK(n~Ibdz5Cz!WR?DxF8;3mJNYGWP#KI8 zSV`O}W4G0npX$Dc9sRc}j5j>aTgK&b zs~hyqy^}xB!ClrNLCZ}7fq=zg@ls1|`@jzm;JBim!02NE0Ret~ew#LJTJ=RZ91akV z&z5=eqtC&IYaiv7=+%acg7Z_USX@byg{K>F5r}d-McP@{*8d52M4|6-1tTINR`B2W zz-MR1Ye9s-BwiH0#P1-(i+`vd#x%lTDEl!~F_AmEu1F0M9Zd!CT0V^(P)%cRyz4lzt0!(U*GKW zPKfV65uYEUrcwDpiA*nk2_OkOMskX@~m$^v|OadDeoFXeDjK1cfd2WDjAOp0;HLqB0o#JRad zb_@nXB9Vsg+->c+++yt9w{M>(*6jnnn8&M1OYKE&{PFi_##IpJj21$z&h| z#=^tnpU)W3YV^9vYh-pLu-$!QzAYC-)|&J^5Kt zQEu!Yli8ie9AvTX8QUGo+DoJ#=YsG z@gMJgKRY@;>E@fw=G^`JUHo1yPs7O3Q7AJ_O^Z+4uX=;6OwqAYMUN+H>r~w)6P-ko z)ieXXWAe8ul^(26V9U$P%g@hu^Lu-HsR#t%n>YpBqsh|b6czS(JDD=0taeF&{Vy&0 zYt^c*oLtYbsIn*`3N;g(X|fEooWBH?HaFAL0q^(to;_dZ=Z|%C8j4PHld&b(6Sc(b zZzM7|e|ap;TC1qUL?pRYWN3_Dt98*{@c%jz9)7=}!3k+@o@;CSv9akt{a1kR#a~vb zS2-k-i{vbzLWqi{dTYA&x%0E{d+Xl% z=r8XEC1lXDSfbC4EYHt@vZat@DJC+pol5s&x=t-jCORValjHTEet6ORycN5SI=?<= z{!Qlm+wA$xF{ixd=e=1ihoh2|*o?;tg^O&?WzsPiOAJ?rAWVKos z78X#HQcpfu-$`tl-G0sHxLtc`e0=Ibw{56Ud&_RO+ibRzFo#|!!i1@iM>*>E@Next~~ zQX2Yq@kh6Z#c$ZK!PnQ<$H!*{cjXDF-<*8$Z}EBRLWRk@zUp|qN_{1s`(5?b_QL6S zlEBbA`YP(fZK0T*`;%|n`TiBvw;TWV4uiqCeP{gU-6{Lf#Fgt~^;#oHA??%|P3JXb ztF=^fnO~ucjEn^Jb9#;>>68jdtKN$%-}0RLe8C6G^R`h4T0aGC!9!0C0!Iix_0;}2 f3yyZ@bzqQ}Ib--|HU)fe%d%~8#+}#Kdu#m{PMk2u diff --git a/kicad/kicad.rc b/kicad/kicad.rc index f44e8a9f25..b86c4e2265 100644 --- a/kicad/kicad.rc +++ b/kicad/kicad.rc @@ -1,2 +1 @@ -a_kicad_icon ICON kicad.ico #include "wx/msw/wx.rc" diff --git a/kicad/mainframe.cpp b/kicad/mainframe.cpp index 7f762fe255..2dd00b8f77 100644 --- a/kicad/mainframe.cpp +++ b/kicad/mainframe.cpp @@ -48,11 +48,9 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, SetStatusWidths( 3, dims ); // Give an icon -#ifdef __WINDOWS__ - SetIcon( wxICON( a_kicad_icon ) ); -#else - SetIcon( wxICON( icon_kicad ) ); -#endif + wxIcon icon; + icon.CopyFromBitmap( KiBitmap( icon_kicad_xpm ) ); + SetIcon( icon ); clientsize = GetClientSize(); @@ -105,7 +103,7 @@ KICAD_MANAGER_FRAME::~KICAD_MANAGER_FRAME() void KICAD_MANAGER_FRAME::PrintMsg( const wxString& aText ) { - m_RightWin->m_DialogWin->AppendText( aText ); + m_RightWin->m_MessagesBox->AppendText( aText ); } @@ -256,7 +254,7 @@ void KICAD_MANAGER_FRAME::OnRefresh( wxCommandEvent& event ) void KICAD_MANAGER_FRAME::ClearMsg() { - m_RightWin->m_DialogWin->Clear(); + m_RightWin->m_MessagesBox->Clear(); } diff --git a/pcb_calculator/bitmaps/icon_pcbcalculator.xpm b/pcb_calculator/bitmaps/icon_pcbcalculator.xpm new file mode 100644 index 0000000000..14f4ca8cfd --- /dev/null +++ b/pcb_calculator/bitmaps/icon_pcbcalculator.xpm @@ -0,0 +1,54 @@ +/* XPM */ +const char *icon_pcbcalculator_xpm[] = { +/* columns rows colors chars-per-pixel */ +"32 32 16 1", +"+ c #F2F3F2", +". c #BEBCBB", +": c #E49E64", +"X c #E6E5E5", +"; c #B07038", +"@ c #978E74", +"# c #A0A97C", +"* c #95918D", +"$ c #7F7B78", +"= c #8C524C", +" c None", +"% c #686361", +"o c #A9A6A2", +"O c #BAC096", +"& c #494949", +"- c #887A64", +/* pixels */ +" ", +" ", +" .XXXXXXXXXXXXXXXX. ", +" .........oX OOOOOOOOOOOO Xo ", +" .+X++XXXXX.X OOOOOOOOO@@O Xo ", +" XXXXXXXXX.X OOOOOOOOO##O Xo ", +" XXXXXXXXX. OOOOOOOOO@## o ", +" XXXXXXXXX. o ", +" XXXXXXXXXo .. .. .. .. o ", +" XXXXXXXXXo $%& &$%*%&.=-= o ", +" XXXXXXX Xo o%% %%*o%% -%$ * ", +" XXXXXX .Xo o%% %%*o%%.$%* * ", +" X XXXX. Xo $$&.&$%$%&.%$- * ", +" X.XXXX. Xo..*o.o*o.**.ooo.* ", +" .XXXXXX. Xo.$%&.&%%*&&.%$%.* ", +" .XXXXXX. Xo.$%&.&%-*%%.--$.* ", +" .+XXXXX .Xo.o$$.*$oo$@.*@*.* ", +" .+XXXXXX.X*.%$&.%-%$**o;:;.* ", +" .+XX+X+X X*.o%-.@$*o$$.@-*.$ ", +" .+ XXX+X + *ooooooooooooo*** ", +" .X.XX X++X..........$oooo ", +" .+XXX.X+++++++++++++++* ", +" .+X ++++++++++++++++* ", +" .+XX ++++++++++++++++* ", +" .+XXX. X++++ ++ ++* ", +" .+XXX .oX+++ X+ ++* ", +" .o+XX+++X ++++++ ++++++*. ", +" .o+XX++X .X+++++X++++++*. ", +" .*XXXXXXXXX++++++++++++$. ", +" .o$$$$$$$$$$$$$$$$$$$$$o. ", +" ..................... ", +" " +}; diff --git a/pcb_calculator/bitmaps/sources/pcb_calculator.svg b/pcb_calculator/bitmaps/sources/pcb_calculator.svg deleted file mode 100644 index b21a3c3a3f..0000000000 --- a/pcb_calculator/bitmaps/sources/pcb_calculator.svg +++ /dev/null @@ -1,688 +0,0 @@ - - - - - fabrication.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - - - fabrication.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pcb_calculator/pcb_calculator.ico b/pcb_calculator/pcb_calculator.ico deleted file mode 100644 index aa351f5a466f27fcf5ea3c6679e54d41a65d80f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3262 zcma)Ba~uwG_cH=ZIyDpi)DT5w}s!C^OVCiltI4 z?ZtLX7-28UQKcS3=P?wHA|q@aoZ^f6LMgs6FT@pJXqXcx`eH18F2DBioTY2~+|wtQ z=lOnrzwhtQT{SJn@2*`M^CQ~FaZT&fG;I$Tx3q&?;r*@rRA;=z&SGz$nc8dBudZz6 z$kzAhx*gw9?dov5I=rq92bSQg#@3H-zB4!Gw824E!%Za2%};Ik?e~r5*DKB6|GcBV zMT*{@VjEeEm)V06#niU@E*d}IE}RXlbM>iN@7PQoA~}LG2$Fczj~FjrxTvJIZH~YC zO9=kfjB{+tHcPg3+R2v#Ig)%LG~QiU^%qw&nR>(#SR7R1Y!tkDy6P|b(K`w}H)ehQ zneScppny(P8Xc{5b=s-Db*sDrMeTfJ-I29eW5De{)+jz&a1ZX!BzGr`Nkb@_H$%&d zv+lFco6o&uvVp-zZpwz$pPD3OdX)(W1SAc(?bS>#mKl-y-+90%16!~n{?Vyb_s+rxeQA(sVF=gBuwlFA8>}A z)j2hJDzMJ{3l2UKRnPnO!Up9-!Xt$^LLkh-@;XH*)b zG!e_0UwEYmcy(@BS$@v~laQiK;UW=oMe+(3Gv1vP{E>oZo%H~RRPX`k4x~>Hq|Ji4 zdSmq-aP=|uWD!BInSl$@SUl97*N61{lt+>Ss4Ulq*T9jkSSpUZI$}($C4hou(fqYZ zVr2RfdmhLmh)}ef#(L3pqp(9jqu_XfP}CIelf4Xl%#Y^<8AnJ4gylZS??00cvikKQ z9SZRRiP|ne5taiY5JY7;2?HG-efo(9Afdqp@Nq%#F&K|Vb=~Yw0?QD5p}>ogBY~a` z!lu__*mlidtVgqvn$4GdjwgD04-e;njp9={=~SvVo>#B}t|-j@T)f+e?=a~V&YU+t z?=UD*p#c2#X@7Jmmmf$oULHt4)z^!`NFfD6rHk1LRxK2xKVeYg$KQ6H1&`VXp9+Oy zs_dLB`}v^}kj*x}S{TE*RDTkE5Xu=$D<}c4XLI#KIYo5*4cC0fJ9?su=D2{);)Q=D zu!aqjblR5@`=fKZKS{RmRTSJkVp7Ni3$K~Yf-B&!86mg~p}+-Lf=iyeKjRK&?5tkQ z>Vhx6=mTk-MJ~a|T9C1mWH>opGYU2{nlNa&f-I%PS6Gf0La}twb@ydtAVuiTdMpqp zy)z*?SQ9qjoK<$RplWDV(L1PAob{_^H@H%FLB1GvOQ8TfWEsq`u(JB$REkcUY3qY5 zoDzjWBR41?RY9r)pc2V%m)zgV)jMVD+pBfJp+Kl>EZX485$cF^C6_)N(u*aRgCLuw z8v5{9r2JV#>nQBHGhswPmH~@UNW_ChAC~&LS{M-`zB2(YWlPc;^pmm!I9^yK*PV8P z>6%&cp%|H1(+BB}mg@?+St^1brI2voPUy>ECe_m`Ew1rHg95bAhe=o~)S~8vytAH! z0QJmue6=TB%vOm7E-Zhu%%Cn<*G`z^kMsv-=kf|q3VXhuAIrbkpCs8ZkF%IZqDpcy zQ%&6Y4|rQE@JU6%XT}lAmNugBS@3otAL$rupb3)z&X|Eyf{*=gmb}KaExf`abdpQK zmw`~QK>3yLHh6?Z8Bve+LVXE-*vF>){~NzNY1k)BWWg#$akZUVn>=D5`XX4Rr2|WQ zC&~~RmdP>A6g}~p$c;4ASBcpf?6Nx5I1-yy~6quMAg^jL}op5XdE}JEzfaQ73I*M@L zwR#z2=dE{Jtsf7xT1y97H!6>{-m5&=idDAFYn9G;tPGetUnitScale() ); - #ifdef __WINDOWS__ - SetIcon( wxICON( pcb_calculator_icon ) ); - #else - SetIcon( wxICON( pcb_calculator ) ); - #endif + // Give an icon + wxIcon icon; + icon.CopyFromBitmap( KiBitmap( icon_pcbcalculator_xpm ) ); + SetIcon( icon ); GetSizer()->SetSizeHints( this ); diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp index 460deb4b53..7f7fb59f6c 100644 --- a/pcbnew/hotkeys.cpp +++ b/pcbnew/hotkeys.cpp @@ -153,45 +153,45 @@ static Ki_HotkeyInfo HkTrackDisplayMode( wxT( "Track Display Mode" ), static Ki_HotkeyInfo HkAddModule( wxT( "Add Module" ), HK_ADD_MODULE, 'O' ); /* Record and play macros */ -static Ki_HotkeyInfo HkRecordMacros0( wxT( "Record Macros 0" ), HK_RECORD_MACROS_0, GR_KB_CTRL+'0' ); +static Ki_HotkeyInfo HkRecordMacros0( wxT( "Record Macro 0" ), HK_RECORD_MACROS_0, GR_KB_CTRL+'0' ); -static Ki_HotkeyInfo HkCallMacros0( wxT( "Call Macross 0" ), HK_CALL_MACROS_0, '0' ); +static Ki_HotkeyInfo HkCallMacros0( wxT( "Call Macro 0" ), HK_CALL_MACROS_0, '0' ); -static Ki_HotkeyInfo HkRecordMacros1( wxT( "Record Macros 1" ), HK_RECORD_MACROS_1, GR_KB_CTRL+'1' ); +static Ki_HotkeyInfo HkRecordMacros1( wxT( "Record Macro 1" ), HK_RECORD_MACROS_1, GR_KB_CTRL+'1' ); -static Ki_HotkeyInfo HkCallMacros1( wxT( "Call Macross 1" ), HK_CALL_MACROS_1, '1' ); +static Ki_HotkeyInfo HkCallMacros1( wxT( "Call Macro 1" ), HK_CALL_MACROS_1, '1' ); -static Ki_HotkeyInfo HkRecordMacros2( wxT( "Record Macros 2" ), HK_RECORD_MACROS_2, GR_KB_CTRL+'2' ); +static Ki_HotkeyInfo HkRecordMacros2( wxT( "Record Macro 2" ), HK_RECORD_MACROS_2, GR_KB_CTRL+'2' ); -static Ki_HotkeyInfo HkCallMacros2( wxT( "Call Macross 2" ), HK_CALL_MACROS_2, '2' ); +static Ki_HotkeyInfo HkCallMacros2( wxT( "Call Macro 2" ), HK_CALL_MACROS_2, '2' ); -static Ki_HotkeyInfo HkRecordMacros3( wxT( "Record Macros 3" ), HK_RECORD_MACROS_3, GR_KB_CTRL+'3' ); +static Ki_HotkeyInfo HkRecordMacros3( wxT( "Record Macro 3" ), HK_RECORD_MACROS_3, GR_KB_CTRL+'3' ); -static Ki_HotkeyInfo HkCallMacros3( wxT( "Call Macross 3" ), HK_CALL_MACROS_3, '3' ); +static Ki_HotkeyInfo HkCallMacros3( wxT( "Call Macro 3" ), HK_CALL_MACROS_3, '3' ); -static Ki_HotkeyInfo HkRecordMacros4( wxT( "Record Macros 4" ), HK_RECORD_MACROS_4, GR_KB_CTRL+'4' ); +static Ki_HotkeyInfo HkRecordMacros4( wxT( "Record Macro 4" ), HK_RECORD_MACROS_4, GR_KB_CTRL+'4' ); -static Ki_HotkeyInfo HkCallMacros4( wxT( "Call Macross 4" ), HK_CALL_MACROS_4, '4' ); +static Ki_HotkeyInfo HkCallMacros4( wxT( "Call Macro 4" ), HK_CALL_MACROS_4, '4' ); -static Ki_HotkeyInfo HkRecordMacros5( wxT( "Record Macros 5" ), HK_RECORD_MACROS_5, GR_KB_CTRL+'5' ); +static Ki_HotkeyInfo HkRecordMacros5( wxT( "Record Macro 5" ), HK_RECORD_MACROS_5, GR_KB_CTRL+'5' ); -static Ki_HotkeyInfo HkCallMacros5( wxT( "Call Macross 5" ), HK_CALL_MACROS_5, '5' ); +static Ki_HotkeyInfo HkCallMacros5( wxT( "Call Macro 5" ), HK_CALL_MACROS_5, '5' ); -static Ki_HotkeyInfo HkRecordMacros6( wxT( "Record Macros 6" ), HK_RECORD_MACROS_6, GR_KB_CTRL+'6' ); +static Ki_HotkeyInfo HkRecordMacros6( wxT( "Record Macro 6" ), HK_RECORD_MACROS_6, GR_KB_CTRL+'6' ); -static Ki_HotkeyInfo HkCallMacros6( wxT( "Call Macross 6" ), HK_CALL_MACROS_6, '6' ); +static Ki_HotkeyInfo HkCallMacros6( wxT( "Call Macro 6" ), HK_CALL_MACROS_6, '6' ); -static Ki_HotkeyInfo HkRecordMacros7( wxT( "Record Macros 7" ), HK_RECORD_MACROS_7, GR_KB_CTRL+'7' ); +static Ki_HotkeyInfo HkRecordMacros7( wxT( "Record Macro 7" ), HK_RECORD_MACROS_7, GR_KB_CTRL+'7' ); -static Ki_HotkeyInfo HkCallMacros7( wxT( "Call Macross 7" ), HK_CALL_MACROS_7, '7' ); +static Ki_HotkeyInfo HkCallMacros7( wxT( "Call Macro 7" ), HK_CALL_MACROS_7, '7' ); -static Ki_HotkeyInfo HkRecordMacros8( wxT( "Record Macros 8" ), HK_RECORD_MACROS_8, GR_KB_CTRL+'8' ); +static Ki_HotkeyInfo HkRecordMacros8( wxT( "Record Macro 8" ), HK_RECORD_MACROS_8, GR_KB_CTRL+'8' ); -static Ki_HotkeyInfo HkCallMacros8( wxT( "Call Macross 8" ), HK_CALL_MACROS_8, '8' ); +static Ki_HotkeyInfo HkCallMacros8( wxT( "Call Macro 8" ), HK_CALL_MACROS_8, '8' ); -static Ki_HotkeyInfo HkRecordMacros9( wxT( "Record Macros 9" ), HK_RECORD_MACROS_9, GR_KB_CTRL+'9' ); +static Ki_HotkeyInfo HkRecordMacros9( wxT( "Record Macro 9" ), HK_RECORD_MACROS_9, GR_KB_CTRL+'9' ); -static Ki_HotkeyInfo HkCallMacros9( wxT( "Call Macross 9" ), HK_CALL_MACROS_9, '9' ); +static Ki_HotkeyInfo HkCallMacros9( wxT( "Call Macro 9" ), HK_CALL_MACROS_9, '9' ); // List of common hotkey descriptors Ki_HotkeyInfo* common_Hotkey_List[] = diff --git a/pcbnew/icon_modedit.ico b/pcbnew/icon_modedit.ico deleted file mode 100644 index 84852bf1bc5caccd2e463fa0b3ab5d9f01db1a2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3262 zcmeHKdrVVT7{6xObY_WBBW@1XqCk=IQsO2=D5BA+v}!1$MIIJhfLbd;3MxoDgn~*P zKA;s^UKIfw0mBv9fFg>_MWHAHh4R)4A|fqxPANS*Cr{~=B`)MPOjyZEj{}fy3EZTJCh;XoWZbucQ)*1cHN!382-2p&>;@MGT8I69~pN z(}vT1cWiL|X2ps*vUq!YL+ko4Mc<2n3Z%)!nBi1Q%LSPi_n1HQaB}>-E2&s5CY8xsr`ADRSwj>g%wXGfJBQj%Lv7(+> z$2iw`zhwqIK27%N{w@OL7%A|KFg3SXE^lmTFwVYy4MsjEZ zR)6PCqfFLRQ8C!u+)!6%YHDg>VbR&ySzKK1^1~5)Kt3fhb2@eadi(mN#Z?=EPOqlK z%nxllm6CnEtjq|m*BdmNYXt>GSy^aFNodSjHaAV0naPii*3{R7t}ZYzpc@z9F(Lrs~1_=UVJe+(J8yigUBh=Tu$2IzB!=Ha51CDIoi@yE;1| zRYt+Jg<%hg^qM+1v!LbNSZRtk;I-n>#QLNEuk~2$P_nlrqM>$8%fc}0kJp3z) z&IZT&9xg7eF#NlByNZhPjvtq%rwiiZN=3Q;%oBr(`?YepQJGh-n(OO>B9okhQlXf? zHBM(LPbh4>Qex=ofmh12-d-msr#JE8h`FgLgG|1hkkDIHWT>y7xOWdIm0h=PiG@Og z!2o54mr`wM>Bz_kq#A|!ow7<4RiY>+JJ4tX0|MR(K6`NavSlugjvmg=>l_`Io0u>d z3;^-R$Km$cs;glMT`ZM<8Qo&jRFJ4^C$(fBa$G*M2eYa8xg*D2n zRGx{CUrUW$>{nvBmA%lX^jy+eO!gk7lK8GaM((bz4{K^bM+azXdQw)FmXL5xB3nb{ zc?Bm0b2zlVJ^{O3v)Q!X zUV)w-t-D+6>e4zp1v)yk_I9nUO`x?E5CI$b>EM6@0ovQ6-CgqgX=jIgKHA!%%}v_a zp!IcHTcg!gT3MmxWm;OI#YI|Jp!s?7c*yN0my2d+X=a9|r)g@+g#YlcJ_+twVDER; z=V^eA`uWrkNFWP2{-YzROM-m}D4kRWB#?y(e=t~nr=~$uZyxVEKl_}YwlF{zm?+dj zjz1J?wijgB^34_?_{X;)an0{?q1-b6$q9u*6bzE-L~UwUi0NOH83zQpKbhpGLIPO;s0GR`995SD+Mpc&*%>91lt@rKPO%t8 zqZEly$+Ul!;2SiUPi$BH4g8a$LkfPc7h94X|HTER)09e4 zjT6PbMvcj$7TA(Z_%j)*OM?3YkWgP`0n`HJ#;%8rRgOQK<>?HY&8ctm0GrA1xWQ4U zr&S$QS#G*&ASV2|9CM5QPzEF_994@1jt6r5x~{$x4ad2bbFOAFXtEc}S~U%DHZbAm z{F;AVhXe?3yj1d4HUHdtjuQw@ICA{?JoEfE#)(>(JIcaD;SeSB7YbY#637BTEqLm( zs-ylTfuowtUo29gK>0jzPP$IH9A&d~S*L^vKhB8%^}31wj?TBBz57c{i39&4+{Z1n F{{X{pDVzWR diff --git a/pcbnew/icon_w3d.ico b/pcbnew/icon_w3d.ico deleted file mode 100644 index a446a14d489a713afbf3cfe58d40a916c5c65523..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmcIiu?oU45IseZf}oRYJNg&(&kQ&?wrfG?uVm{Y^cM;ab??$ai0@sZHmIZ5yxiTp z%gY5SGQ*c;8|(|Y%|*5%vI8<;50IxB)V`ZR5fx*+!;Vm_weT!BUE&-g03RuA7Ykxy z7uX~fS&^|3MJA?JN<~ddeV&VYARgz;lBx=>48B4DwxSnqXh;GWOHy+Anw|-{l9ReN zf61ZgTlHqIO+DYQ^Gxa(M6V1RXZdlTmwU~p^HUaLSkHIr+)3$E|4?ea4r|2s{=-uK z1VFcBfNXqcU`D`=d3WeilQwNpw0+&UzV3lR(ZCn=aL<7?_>m_NetInfo->GetCount(); ii++ ) { net = GetBoard()->m_NetInfo->GetNetItem( ii ); - wxString Line; if( !WildCompareString( netFilter, net->GetNetname(), false ) ) continue; - Line.Printf( wxT( "net_code = %3.3d [%.16s] " ), net->GetNet(), + Line.Printf( wxT( "net %3.3d: %s" ), net->GetNet(), GetChars( net->GetNetname() ) ); list.Add( Line ); }