diff --git a/bitmaps/CMakeLists.txt b/bitmaps/CMakeLists.txt index a893e8a261..5c92ec39c1 100644 --- a/bitmaps/CMakeLists.txt +++ b/bitmaps/CMakeLists.txt @@ -59,6 +59,7 @@ set(BITMAP_SRCS Browse_Files.xpm cancel_tool.xpm Cancel.xpm + create_cmp_file.xpm checked_ok.xpm component_select_unit.xpm component_select_alternate_shape.xpm @@ -125,6 +126,7 @@ set(BITMAP_SRCS ercwarn.xpm erc.xpm Exit.xpm + export_footprint_names.xpm Export_Module.xpm Export_Options_Pad.xpm export.xpm @@ -171,6 +173,7 @@ set(BITMAP_SRCS icon_txt.xpm import3d.xpm import_cmp_from_lib.xpm + import_footprint_names.xpm import_hierarchical_label.xpm Import_Module.xpm import.xpm @@ -368,7 +371,6 @@ set(BITMAP_SRCS rotate-z.xpm rotate+z.xpm save_as.xpm - Save_CmpStuff.xpm Save_Library.xpm Save_NetList.xpm Save_Project.xpm @@ -381,6 +383,7 @@ set(BITMAP_SRCS shape_3d.xpm sheetset.xpm showdcode.xpm + show_footprint.xpm showmodedge.xpm showtrack.xpm Show_Zone.xpm diff --git a/bitmaps/Save_CmpStuff.xpm b/bitmaps/create_cmp_file.xpm similarity index 95% rename from bitmaps/Save_CmpStuff.xpm rename to bitmaps/create_cmp_file.xpm index 062b1c81da..e6a1a0ad5e 100644 --- a/bitmaps/Save_CmpStuff.xpm +++ b/bitmaps/create_cmp_file.xpm @@ -1,9 +1,5 @@ /* XPM */ -#ifndef XPMMAIN -extern const char *save_cmpstuff_xpm[]; - -#else -const char * save_cmpstuff_xpm[] = { +const char * create_cmp_file_xpm[] = { "16 16 99 2", " c None", ". c #160A00", @@ -120,4 +116,3 @@ const char * save_cmpstuff_xpm[] = { " @ P Q @ R v S T U V W V X X ", " @ # @ R Y Y Z ` . . ...+.", " . @ R Y @.#.G E $.N r %."}; -#endif diff --git a/bitmaps/export_footprint_names.xpm b/bitmaps/export_footprint_names.xpm new file mode 100644 index 0000000000..a92f4fb05c --- /dev/null +++ b/bitmaps/export_footprint_names.xpm @@ -0,0 +1,38 @@ +/* XPM */ +const char *export_footprint_names_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 16 1", +"+ c #4C4C54", +"& c #898AEB", +"$ c #3A397D", +"= c #0C0A06", +"o c #342A11", +"O c #695007", +"X c #6E6F71", +"# c #2D2C50", +"- c #505179", +" c None", +"@ c #BE9004", +"* c #9C9AFC", +": c #5757A1", +"; c #4040B6", +"% c #696AA9", +". c #898A8C", +/* pixels */ +" . ", +" Xo ", +" XOo ", +" .X+o@O# ", +" .oO@@@@@O+", +" X$o@@@@@@@o.", +" X%&&o@@@O+#@o#X", +"+&*&#O@@=%&-=#;#", +"$;%$=@@o$&%##;-#", +"$;;:====$;;$$..+", +"#;;;;;-$;$-.-+X+", +".+$;;;:-.X#-+#XX", +" .#;;$#-X#++.XX", +" .###++ X+ + ", +" . X+ +. ", +" ++ " +}; diff --git a/bitmaps/import_footprint_names.xpm b/bitmaps/import_footprint_names.xpm new file mode 100644 index 0000000000..514499ad2c --- /dev/null +++ b/bitmaps/import_footprint_names.xpm @@ -0,0 +1,38 @@ +/* XPM */ +const char *import_footprint_names_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 16 1", +"X c #525279", +"@ c #83848C", +"* c #242349", +"O c #4E4FB9", +" c None", +"- c #5F4A08", +": c #2B281E", +"o c #535456", +"& c #3F3E4C", +". c #6F6F6F", +"; c #C29204", +"= c #130F06", +"$ c #ACAAFC", +"+ c #8484F2", +"% c #3C3AA6", +"# c #383779", +/* pixels */ +" .XXo ", +" .XO++++OX. ", +" @O+++++++++++#@", +"#++++$+++++++O%&", +"#O@##O++*==*%%#*", +"#OOOX+X-;;-*#@@&", +"#OOOO#-;;;-&X&.o", +".X%O%-;;;:=:o:..", +" @@#*;;;=::oo ..", +" :;;-&o .o o@", +" -;;o.o o. ", +"@oo&-;;:::@ ", +" o-;;;;;=o ", +" .:;;;=. ", +" @:-=@ ", +" & " +}; diff --git a/bitmaps/show_footprint.xpm b/bitmaps/show_footprint.xpm new file mode 100644 index 0000000000..06edff5c35 --- /dev/null +++ b/bitmaps/show_footprint.xpm @@ -0,0 +1,38 @@ +/* XPM */ +char *show_footprint_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 16 1", +"* c #4E4F5E", +"O c #797C84", +"; c #4343B7", +"= c #7F7FF8", +". c #AAABB0", +"+ c #7197E4", +" c None", +"& c #62616F", +"o c #6E92B7", +"X c #95969C", +": c #363557", +"@ c #90C7EA", +"$ c #6B79B8", +"# c #7FACE8", +"% c #B4D8E6", +"- c #424286", +/* pixels */ +" .X.. ", +" .XoooOX ", +" X+@@@#$X ", +"Xo#@@@@#X ", +"X#@%%%@o$&*. ", +"X#@ oo++$$=$-O ", +"Xoo####+o=====-O", +"*.###@#+X===$;;:", +"-O.o$+#.%o$-;;-:", +"-;-X..X$&%o--OX*", +":;;;;;$;-& .&:O*", +"O*;;;;-*X&O .:&O", +" .X:;;-:*&:O. &O", +" O:::*& &X. .", +" O.&& *O.. ", +" ** .X " +}; diff --git a/bitmaps/sources/export_footprint_names.svg b/bitmaps/sources/export_footprint_names.svg new file mode 100644 index 0000000000..8ef2cc41ce --- /dev/null +++ b/bitmaps/sources/export_footprint_names.svg @@ -0,0 +1,1172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/import_footprint_names.svg b/bitmaps/sources/import_footprint_names.svg new file mode 100644 index 0000000000..6f580a6ad5 --- /dev/null +++ b/bitmaps/sources/import_footprint_names.svg @@ -0,0 +1,1172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps/sources/show_footprint.svg b/bitmaps/sources/show_footprint.svg new file mode 100644 index 0000000000..d47cff5b91 --- /dev/null +++ b/bitmaps/sources/show_footprint.svg @@ -0,0 +1,2535 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/build_version.cpp b/common/build_version.cpp index 4788eec95c..092f2d7d8f 100644 --- a/common/build_version.cpp +++ b/common/build_version.cpp @@ -6,7 +6,7 @@ #endif #ifndef KICAD_BUILD_VERSION -#define KICAD_BUILD_VERSION "(2011-03-28)" +#define KICAD_BUILD_VERSION "(2011-03-29)" #endif // uncomment this line only when creating a stable version diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp index 1d9e203384..0537b8aeb2 100644 --- a/cvpcb/menubar.cpp +++ b/cvpcb/menubar.cpp @@ -32,11 +32,9 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() // Recreate all menus: wxMenu* filesMenu = new wxMenu; - item = new wxMenuItem( filesMenu, ID_LOAD_PROJECT, - _( "&Open" ), - _( "Open a net list file" ) ); - item->SetBitmap( open_document_xpm ); - filesMenu->Append( item ); + ADD_MENUITEM_WITH_HELP( filesMenu, ID_LOAD_PROJECT, + _( "&Open" ), _( "Open a net list file" ), + open_document_xpm ); /* Open Recent submenu */ wxMenu* openRecentMenu = new wxMenu(); @@ -48,27 +46,26 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() filesMenu->AppendSeparator(); - item = new wxMenuItem( filesMenu, ID_SAVE_PROJECT, + ADD_MENUITEM_WITH_HELP( filesMenu, ID_SAVE_PROJECT, _( "&Save As..." ), - _( "Save new net list and footprint list files" ) ); - item->SetBitmap( save_xpm ); - filesMenu->Append( item ); + _( "Save new net list and footprint list files" ), + save_xpm ); /* Quit on all platforms except WXMAC */ #if !defined(__WXMAC__) filesMenu->AppendSeparator(); - item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ), _( "Quit CvPCB" ) ); - filesMenu->Append( item ); + ADD_MENUITEM_WITH_HELP( filesMenu, wxID_EXIT, + _( "&Quit" ), _( "Quit CvPCB" ), + exit_xpm ); #endif /* !defined( __WXMAC__) */ // Menu Configuration: wxMenu* configmenu = new wxMenu; - item = new wxMenuItem( configmenu, ID_CONFIG_REQ, _( "&Configuration" ), - _( "Set libraries and library search paths" ) ); - item->SetBitmap( config_xpm ); - configmenu->Append( item ); + ADD_MENUITEM_WITH_HELP( configmenu, ID_CONFIG_REQ, _( "&Configuration" ), + _( "Set libraries and library search paths" ), + config_xpm ); wxGetApp().AddMenuLanguageList( configmenu ); @@ -77,31 +74,29 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() _( "Prevent CVPcb from exiting after saving netlist file" ), wxITEM_CHECK ); configmenu->Append( item ); + configmenu->AppendSeparator(); - item = new wxMenuItem( configmenu, ID_CONFIG_SAVE, - _( "&Save Project File" ), - _( "Save changes to the project file" ) ); - item->SetBitmap( save_setup_xpm ); - configmenu->Append( item ); + ADD_MENUITEM_WITH_HELP( configmenu, ID_CONFIG_SAVE, + _( "&Save Project File" ), + _( "Save changes to the project file" ), + save_setup_xpm ); // Menu Help: wxMenu* helpMenu = new wxMenu; AddHelpVersionInfoMenuEntry( helpMenu ); - item = new wxMenuItem( helpMenu, ID_GENERAL_HELP, _( "&Contents" ), - _( "Open the cvpcb manual" ) ); - item->SetBitmap( online_help_xpm ); - helpMenu->Append( item ); + ADD_MENUITEM_WITH_HELP( helpMenu, ID_GENERAL_HELP, _( "&Contents" ), + _( "Open the cvpcb manual" ), + online_help_xpm ); /* About on all platforms except WXMAC */ #if !defined(__WXMAC__) - item = new wxMenuItem( helpMenu, ID_KICAD_ABOUT, + ADD_MENUITEM_WITH_HELP( helpMenu, ID_KICAD_ABOUT, _( "&About" ), - _( "About cvpcb schematic to pcb converter" ) ); - item->SetBitmap( info_xpm ); - helpMenu->Append( item ); + _( "About cvpcb schematic to pcb converter" ), + info_xpm ); #endif /* !defined(__WXMAC__) */ diff --git a/cvpcb/tool_cvpcb.cpp b/cvpcb/tool_cvpcb.cpp index 5b1145dae8..ad78786c01 100644 --- a/cvpcb/tool_cvpcb.cpp +++ b/cvpcb/tool_cvpcb.cpp @@ -5,7 +5,6 @@ #include "fctsys.h" #include "appl_wxstruct.h" #include "common.h" -#include "trigo.h" #include "bitmaps.h" #include "cvpcb.h" @@ -23,63 +22,64 @@ void CVPCB_MAINFRAME::ReCreateHToolbar() m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE ); m_HToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString, - wxBitmap( open_document_xpm ), - _( "Open a net list file" ) ); + wxBitmap( open_document_xpm ), + _( "Open a net list file" ) ); m_HToolBar->AddTool( ID_CVPCB_SAVEQUITCVPCB, wxEmptyString, - wxBitmap( save_xpm ), - _( "Save net list and footprint files" ) ); + wxBitmap( save_xpm ), + _( "Save net list and footprint files" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_CVPCB_CREATE_CONFIGWINDOW, wxEmptyString, - wxBitmap( config_xpm ), - _( "Configuration" ) ); + wxBitmap( config_xpm ), + _( "Configuration" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_CVPCB_CREATE_SCREENCMP, wxEmptyString, - wxBitmap( module_xpm ), - _( "View selected footprint" ) ); + wxBitmap( show_footprint_xpm ), + _( "View selected footprint" ) ); m_HToolBar->AddTool( ID_CVPCB_AUTO_ASSOCIE, wxEmptyString, - wxBitmap( auto_associe_xpm ), - _( "Perform automatic footprint association" ) ); + wxBitmap( auto_associe_xpm ), + _( "Perform automatic footprint association" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_CVPCB_GOTO_PREVIOUSNA, wxEmptyString, - wxBitmap( left_xpm ), - _( "Select previous free component" ) ); + wxBitmap( left_xpm ), + _( "Select previous free component" ) ); m_HToolBar->AddTool( ID_CVPCB_GOTO_FIRSTNA, wxEmptyString, - wxBitmap( right_xpm ), - _( "Select next free component" ) ); + wxBitmap( right_xpm ), + _( "Select next free component" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_CVPCB_DEL_ASSOCIATIONS, wxEmptyString, - wxBitmap( delete_association_xpm ), - _( "Delete all associations" ) ); + wxBitmap( delete_association_xpm ), + _( "Delete all associations" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_CVPCB_CREATE_STUFF_FILE, wxEmptyString, - wxBitmap( save_cmpstuff_xpm ), - _( "Create export file (component/footprint list, \ -used by eeschema to fill the footprint field of components)" ) ); + wxBitmap( export_footprint_names_xpm ), + _( + "Create export file (component/footprint list, \ +used by eeschema to fill the footprint field of components)" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_PCB_DISPLAY_FOOTPRINT_DOC, wxEmptyString, - wxBitmap( datasheet_xpm ), - _( "Display footprints list documentation" ) ); + wxBitmap( datasheet_xpm ), + _( "Display footprints list documentation" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator(); m_HToolBar->AddRadioTool( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST, - wxEmptyString, - wxBitmap( module_filtered_list_xpm ), - wxNullBitmap, - _( "Display the filtered footprint list for the current component" ) ); + wxEmptyString, + wxBitmap( module_filtered_list_xpm ), + wxNullBitmap, + _( "Display the filtered footprint list for the current component" ) ); m_HToolBar->AddRadioTool( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST, - wxEmptyString, wxBitmap( module_full_list_xpm ), - wxNullBitmap, - _( "Display the full footprint list (without filtering)" ) ); + wxEmptyString, wxBitmap( module_full_list_xpm ), + wxNullBitmap, + _( "Display the full footprint list (without filtering)" ) ); if( config ) { diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index 51041cc1d5..b2ece7351d 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -111,7 +111,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() m_HToolBar->AddTool( ID_GET_TOOLS, wxEmptyString, wxBitmap( tools_xpm ), _( "Generate bill of materials and/or cross references" ) ); - m_HToolBar->AddTool( ID_BACKANNO_ITEMS, wxEmptyString, wxBitmap( backanno_xpm ), + m_HToolBar->AddTool( ID_BACKANNO_ITEMS, wxEmptyString, wxBitmap( import_footprint_names_xpm ), _( "Back annotate component foot prints" ) ); // after adding the tools to the toolbar, must call Realize() to reflect the changes diff --git a/include/bitmaps.h b/include/bitmaps.h index be759ffe0a..d67a26fb7c 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -62,6 +62,7 @@ extern const char* copper_layers_setup_xpm[]; extern const char* copyblock_xpm[]; extern const char* copyComponent_xpm[]; extern const char* copy_button[]; +extern const char* create_cmp_file_xpm[]; extern const char* cursor_shape_xpm[]; extern const char* cursor_xpm[]; extern const char* cut_button[]; @@ -119,6 +120,7 @@ extern const char* erc_xpm[]; extern const char* erc_green_xpm[]; extern const char* error_xpm[]; extern const char* exit_xpm[]; +extern const char* export_footprint_names_xpm[]; extern const char* export_module_xpm[]; extern const char* export_options_pad_xpm[]; extern const char* export_xpm[]; @@ -162,6 +164,7 @@ extern const char* icon_modedit_xpm[]; extern const char* icon_txt_xpm[]; extern const char* icon_w3d_xpm[]; extern const char* import_cmp_from_lib_xpm[]; +extern const char* import_footprint_names_xpm[]; extern const char* import_hierarchical_label_xpm[]; extern const char* import_module_xpm[]; extern const char* import_xpm[]; @@ -362,7 +365,6 @@ extern const char* rotate_pos_Y_xpm[]; extern const char* rotate_neg_Z_xpm[]; extern const char* rotate_pos_Z_xpm[]; extern const char* save_as_xpm[]; -extern const char* save_cmpstuff_xpm[]; extern const char* save_library_xpm[]; extern const char* save_netlist_xpm[]; extern const char* save_part_in_mem_xpm[]; @@ -376,6 +378,7 @@ extern const char* select_w_layer_xpm[]; extern const char* sheetset_xpm[]; extern const char* show_3d_xpm[]; extern const char* show_dcodenumber_xpm[]; +extern const char* show_footprint_xpm[]; extern const char* show_mod_edge_xpm[]; extern const char* showtrack_xpm[]; extern const char* show_zone_xpm[]; diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi index c1ab359167..acbd76d0b4 100644 --- a/packaging/windows/nsis/install.nsi +++ b/packaging/windows/nsis/install.nsi @@ -17,7 +17,7 @@ ; General Product Description Definitions !define PRODUCT_NAME "KiCad" -!define PRODUCT_VERSION "2011.03.28" +!define PRODUCT_VERSION "2011.03.29" !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/" !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/" !define COMPANY_NAME "" diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index 98d75591bd..653192a767 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -118,7 +118,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_CMP_FILE, _( "&Component File" ), _( "(Re)create components file (*.cmp) for CvPcb" ) ); - item->SetBitmap( save_cmpstuff_xpm ); + item->SetBitmap( create_cmp_file_xpm ); fabricationOutputsMenu->Append( item ); // BOM File diff --git a/version.txt b/version.txt index 2cac3a21c6..fe26c6e5ad 100644 --- a/version.txt +++ b/version.txt @@ -1,4 +1,4 @@ release version: -2011 mar 17 +2011 mar 29 files (.zip,.tgz): -kicad-2011-03-28 +kicad-2011-03-29