From f5354a3a4929144c1cfeb2a6eadd1a9702c65501 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 3 Dec 2010 19:58:50 +0100 Subject: [PATCH] cosmetic enhancements --- 3d-viewer/3d_canvas.cpp | 5 + bitmaps/copyComponent.xpm | 76 +- bitmaps/import_cmp_from_lib.xpm | 64 +- bitmaps/new_component.xpm | 87 +- bitmaps/sources/Add_Cotation.svg | 2903 +++++++++++++++++++ bitmaps/sources/Add_Junction.svg | 169 ++ bitmaps/sources/Add_Label.svg | 154 + bitmaps/sources/BOM.svg | 512 ++++ bitmaps/sources/Enter_Sheet.svg | 224 ++ bitmaps/sources/Export.svg | 181 ++ bitmaps/sources/addCompo.svg | 177 ++ bitmaps/sources/addVCC.svg | 155 + bitmaps/sources/copyComponent.svg | 283 ++ bitmaps/sources/import_GLabel.svg | 261 ++ bitmaps/sources/load_component_from_lib.svg | 217 ++ bitmaps/sources/new_component.svg | 182 ++ 16 files changed, 5530 insertions(+), 120 deletions(-) create mode 100644 bitmaps/sources/Add_Cotation.svg create mode 100644 bitmaps/sources/Add_Junction.svg create mode 100644 bitmaps/sources/Add_Label.svg create mode 100644 bitmaps/sources/BOM.svg create mode 100644 bitmaps/sources/Enter_Sheet.svg create mode 100644 bitmaps/sources/Export.svg create mode 100644 bitmaps/sources/addCompo.svg create mode 100644 bitmaps/sources/addVCC.svg create mode 100644 bitmaps/sources/copyComponent.svg create mode 100644 bitmaps/sources/import_GLabel.svg create mode 100644 bitmaps/sources/load_component_from_lib.svg create mode 100644 bitmaps/sources/new_component.svg diff --git a/3d-viewer/3d_canvas.cpp b/3d-viewer/3d_canvas.cpp index cbe78feb2c..da73850758 100644 --- a/3d-viewer/3d_canvas.cpp +++ b/3d-viewer/3d_canvas.cpp @@ -623,6 +623,11 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event ) if( FullFileName.IsEmpty() ) return; + + // Be sure the screen area destroyed by the file dialog is redrawn before making + // a screen copy. + // Without this call, under Linux the screen refresh is made to late. + wxYield(); } wxSize image_size = GetClientSize(); diff --git a/bitmaps/copyComponent.xpm b/bitmaps/copyComponent.xpm index e46fd80c4c..21da86cc14 100644 --- a/bitmaps/copyComponent.xpm +++ b/bitmaps/copyComponent.xpm @@ -1,38 +1,38 @@ -/* XPM */ -const char *copyComponent_xpm[] = { -/* columns rows colors chars-per-pixel */ -"16 16 16 1", -"& c #080685", -"; c #CE3338", -". c #098409", -"+ c #ABAAAA", -": c #D44751", -"* c #885684", -"$ c #9794D7", -"@ c #BFB7ED", -"- c #640650", -" c None", -"= c #F80B0C", -"O c #ECECFC", -"# c #7F6CB6", -"% c #D3CFF7", -"o c #147A04", -"X c #4E9C54", -/* pixels */ -" .......X ", -" oOOOOO X.+ ", -"oo.OO@#$@%XX ", -" +oOO$&&&$+.+ ", -" oOO$&&&&@ooo+ ", -" .O%%@$&&*.++++", -" .%====-&-;+ ", -".oo@=O%@#&&*=+ ", -"++===O#&&&&&&: ", -" +=OO#&&&&#=++", -" + =OO%#&&$@===", -" =O%%%#$%#=++", -" +=%O%%%@%;;+ ", -" ===@@@@@$:=++ ", -" ++=======;++ ", -" ++++++++ " -}; +/* XPM */ +const char *copyComponent_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 16 1", +"; c #DC4149", +"# c #9B979D", +"& c #332A95", +"% c #060383", +"O c #D2D2FB", +"o c #60AE68", +"= c #FA0606", +"X c #4C924C", +"@ c #AFAAE5", +"+ c #CDD0D4", +". c #0A840A", +"* c #A3A9A7", +" c #F8F9FC", +": c #E44A6C", +"$ c #7F74B4", +"- c #74124C", +/* pixels */ +" ......Xo ", +" . O O +o. ", +"... O@@OOXo ", +" #. O$%%&@*.+ ", +" . $%%%%+... ", +" .OOO@$%%$.**# ", +" .=====-%-X* ", +"...= $%-=+ ", +" === &%%%%%%+ ", +" *= OO&%%%%-+ ", +" =O OO&%%@=== ", +" = OOO@&@$=**#", +" =OOOOO@O;;* ", +" ===OOOOO@:=#+ ", +" #=======;#* ", +" #####**+ " +}; diff --git a/bitmaps/import_cmp_from_lib.xpm b/bitmaps/import_cmp_from_lib.xpm index 98ef533e0c..03bb5e4858 100644 --- a/bitmaps/import_cmp_from_lib.xpm +++ b/bitmaps/import_cmp_from_lib.xpm @@ -2,37 +2,37 @@ const char *import_cmp_from_lib_xpm[] = { /* columns rows colors chars-per-pixel */ "16 16 16 1", -"O c #76787C", -"$ c #979A9C", -"= c #404440", -"; c #ACB1B5", -"# c #04BA04", -"+ c #CACCCC", -"o c #F5F6F7", -". c #2E3031", -" c None", -"* c #124912", -"@ c #049304", -"& c #505355", -"X c #0C290C", -"% c #046404", -"- c #DADBDB", -": c #83888C", +"$ c #234B22", +"; c #CBAED1", +"# c #676669", +"- c #C76161", +". c #AEA8A8", +"& c #B09399", +"+ c #04B104", +"X c None", +": c #E1E0FC", +"@ c #046A04", +"o c #B97E7C", +" c #1E0D0C", +"% c #AF768C", +"O c #25311D", +"= c #CF3839", +"* c #CE4B4A", /* pixels */ -" .X ", -" ooO ", -" +o++. ", -" @#X$++.$ ", -" %#@X$+X.& ", -" *##@%%%%=&.=.. ", -" OX######%Oooo-.", -" $&*@@##%Ooo-; ", -" :;+:&%@&ooo+: ", -" O;+$*=-oo-;X ", -" =:$+.oooo+O ", -" &O-+oooo; ", -" X&++--o+: ", -" .=O$$$ ", -" .XX ", -" " +" .Xo.XXXXXXXXX", +"O+@#X#OXXXXXXXXX", +"$@+O#$@$XXXXXXXX", +".$+++@+@$XXXXXXX", +"X%$+++++ &XXXXXX", +"XX*OO$+@=-&XXXXX", +"XX*;X#@#;&=oXXXX", +"-*=X:##:::;=.XXX", +"&o=X:;:::::*-XXX", +"X.*X:::::::&=-oX", +"XX*X:::::::&=--.", +"XX*X::::::X%-&..", +"&&*;:::::X;=&.XX", +"**=.;;;;;%=-&XXX", +"X.*=====**o&.XXX", +"XXX.&&&&&&..XXXX" }; diff --git a/bitmaps/new_component.xpm b/bitmaps/new_component.xpm index 744d5529cb..f6279fd695 100644 --- a/bitmaps/new_component.xpm +++ b/bitmaps/new_component.xpm @@ -1,50 +1,37 @@ -/* XPM */ -#ifndef XPMMAIN -extern const char *new_component_xpm[]; - -#else -const char * new_component_xpm[] = { -"16 16 26 1", -" c None", -"! c black", -"# c #FEFEFE", -"$ c #090909", -"% c #B4FFE6", -"& c #D90000", -"' c #EEEEEE", -"( c #F1F1F1", -") c white", -"* c #767676", -"+ c #F0F0F0", -", c #161616", -"- c #A0A0A4", -". c #EFEFEF", -"0 c #C4C4C4", -"1 c #ECECEC", -"2 c #FFE6B4", -"3 c #FFB4B4", -"4 c #EDEDED", -"5 c #E8E8E8", -"6 c #E7E7E7", -"7 c #B8B8B8", -"8 c #E6E6E6", -"9 c #E5E5E5", -": c #E4E4E4", -"; c #E3E3E3", -" !!!!!!!!!!!! ", -"!##########$%! ", -"!#&&'(((((($%%! ", -"!#&)&&((((($*%%!", -"!&&'))&(((+$$$,!", -"!-&''()&&...''0!", -"!#&''..))&&''10!", -"!#&'''''233&&&0!", -"!#&''4223&&---0!", -"!#&'223&&--5550!", -"!&&233&--555660!", -"!-&3&&788888890!", -"!#&&--688899::0!", -"!#--'''''':;;;0!", -"!00000000000000!", -" !!!!!!!!!!!!!! "}; -#endif +/* XPM */ +const char *new_component_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 15 1", +"# c #8C8D14", +"& c #7878B0", +"= c #9797AC", +"% c #30302D", +"o c #CDCF65", +"- c #4E4E68", +"$ c #AAABF8", +" c none", +"@ c #0A090C", +"X c #D3D30B", +"* c #B4B5B4", +"; c #6C6E6C", +". c #E0E09C", +"+ c #F6F704", +"O c #BEBE1C", +/* pixels */ +" . ", +" Xo ", +" .XX ", +" oOXX++XXO.", +" oX++++Xo ", +" .O+++Xo ", +" @@@@@#+X+X. ", +" @$$$$OO##Xo ", +"%%%@$$$$o$$&%o ", +"**=@$$$$$$$$@* ", +" @$$$$$$$$-%;;", +" @$$$$$$$$-%;;", +" @$$$$$$$$%= ", +"***@$$$$$$$&@ ", +"%%@@$=$=$&-@* ", +" @@@@@@%-* " +}; diff --git a/bitmaps/sources/Add_Cotation.svg b/bitmaps/sources/Add_Cotation.svg new file mode 100644 index 0000000000..092c21a22e --- /dev/null +++ b/bitmaps/sources/Add_Cotation.svg @@ -0,0 +1,2903 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/Add_Junction.svg b/bitmaps/sources/Add_Junction.svg new file mode 100644 index 0000000000..3d0f1d59fb --- /dev/null +++ b/bitmaps/sources/Add_Junction.svg @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/Add_Label.svg b/bitmaps/sources/Add_Label.svg new file mode 100644 index 0000000000..661afe1644 --- /dev/null +++ b/bitmaps/sources/Add_Label.svg @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/bitmaps/sources/BOM.svg b/bitmaps/sources/BOM.svg new file mode 100644 index 0000000000..db556d4470 --- /dev/null +++ b/bitmaps/sources/BOM.svg @@ -0,0 +1,512 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/Enter_Sheet.svg b/bitmaps/sources/Enter_Sheet.svg new file mode 100644 index 0000000000..3507b49eda --- /dev/null +++ b/bitmaps/sources/Enter_Sheet.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/Export.svg b/bitmaps/sources/Export.svg new file mode 100644 index 0000000000..eedae57f70 --- /dev/null +++ b/bitmaps/sources/Export.svg @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/addCompo.svg b/bitmaps/sources/addCompo.svg new file mode 100644 index 0000000000..2ebfb18b97 --- /dev/null +++ b/bitmaps/sources/addCompo.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/addVCC.svg b/bitmaps/sources/addVCC.svg new file mode 100644 index 0000000000..d54143efef --- /dev/null +++ b/bitmaps/sources/addVCC.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/copyComponent.svg b/bitmaps/sources/copyComponent.svg new file mode 100644 index 0000000000..24cf16380e --- /dev/null +++ b/bitmaps/sources/copyComponent.svg @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/import_GLabel.svg b/bitmaps/sources/import_GLabel.svg new file mode 100644 index 0000000000..132074e806 --- /dev/null +++ b/bitmaps/sources/import_GLabel.svg @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/load_component_from_lib.svg b/bitmaps/sources/load_component_from_lib.svg new file mode 100644 index 0000000000..8a042021c1 --- /dev/null +++ b/bitmaps/sources/load_component_from_lib.svg @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/new_component.svg b/bitmaps/sources/new_component.svg new file mode 100644 index 0000000000..11b80ff610 --- /dev/null +++ b/bitmaps/sources/new_component.svg @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + +